DateTime lastCheck = Properties.Settings.Default.lastUpdateCheckDate;\r
TimeSpan elapsed = now.Subtract(lastCheck);\r
if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)\r
- {\r
+ {\r
lblStatus.Text = "Checking for updates ...";\r
Application.DoEvents();\r
\r
Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false);\r
- }\r
+ }\r
}\r
\r
// Setup the GUI components\r
// Send the query from the file to the Query Parser class, then load the preset\r
QueryParser presetQuery = QueryParser.Parse(query);\r
PresetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
- \r
+\r
// The x264 widgets will need updated, so do this now:\r
x264Panel.X264_StandardizeOptString();\r
x264Panel.X264_SetCurrentSettingsInPanel();\r
}\r
private void btn_new_preset_Click(object sender, EventArgs e)\r
{\r
- Form preset = new frmAddPreset(this, queryGen.generateCLIQuery(this, 0, null), presetHandler);\r
+ Form preset = new frmAddPreset(this, queryGen.GenerateCLIQuery(this, 0, null), presetHandler);\r
preset.ShowDialog();\r
}\r
#endregion\r
{\r
DialogResult result = MessageBox.Show("Do you wish to include picture settings when updating the preset: " + treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);\r
if (result == DialogResult.Yes)\r
- presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.generateTabbedComponentsQuery(this), true);\r
+ presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.GenerateTabbedComponentsQuery(this), true);\r
else if (result == DialogResult.No)\r
- presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.generateTabbedComponentsQuery(this), false);\r
+ presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.GenerateTabbedComponentsQuery(this), false);\r
}\r
private void pmnu_delete_click(object sender, EventArgs e)\r
{\r
// Presets Management\r
private void btn_addPreset_Click(object sender, EventArgs e)\r
{\r
- Form preset = new frmAddPreset(this, QueryGenerator.generateTabbedComponentsQuery(this), presetHandler);\r
+ Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler);\r
preset.ShowDialog();\r
}\r
private void btn_removePreset_Click(object sender, EventArgs e)\r
if (result == DialogResult.Yes)\r
{\r
PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
- presetHandler.updatePreset(parsed.PresetName + " (Imported)", queryGen.generateCLIQuery(this, 0, null),\r
+ presetHandler.updatePreset(parsed.PresetName + " (Imported)", queryGen.GenerateCLIQuery(this, 0, null),\r
parsed.UsesPictureSettings);\r
}\r
}\r
else\r
{\r
PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
- presetHandler.addPreset(parsed.PresetName, queryGen.generateCLIQuery(this, 0, null), parsed.UsesPictureSettings);\r
+ presetHandler.addPreset(parsed.PresetName, queryGen.GenerateCLIQuery(this, 0, null), parsed.UsesPictureSettings);\r
\r
- if (presetHandler.addPreset(parsed.PresetName + " (Imported)", queryGen.generateCLIQuery(this, 0, null), parsed.UsesPictureSettings))\r
+ if (presetHandler.addPreset(parsed.PresetName + " (Imported)", queryGen.GenerateCLIQuery(this, 0, null), parsed.UsesPictureSettings))\r
{\r
TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black };\r
treeView_presets.Nodes.Add(preset_treeview);\r
{\r
if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text)))\r
{\r
- string generatedQuery = queryGen.generateCLIQuery(this, 0, null);\r
- string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateCLIQuery(this, 0, null);\r
+ string generatedQuery = queryGen.GenerateCLIQuery(this, 0, null);\r
+ string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : queryGen.GenerateCLIQuery(this, 0, null);\r
string query = string.Empty;\r
\r
// Check to make sure the generated query matches the GUI settings\r
MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
else\r
{\r
- String query = queryGen.generateCLIQuery(this, 0, null);\r
+ String query = queryGen.GenerateCLIQuery(this, 0, null);\r
if (rtf_query.Text != "")\r
query = rtf_query.Text;\r
\r
}\r
private void chapersChanged(object sender, EventArgs e)\r
{\r
- Control ctl = (Control) sender;\r
+ Control ctl = (Control)sender;\r
int chapterStart, chapterEnd;\r
int.TryParse(drop_chapterStart.Text, out chapterStart);\r
int.TryParse(drop_chapterFinish.Text, out chapterEnd);\r
case 1:\r
if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))\r
if (Properties.Settings.Default.useM4v)\r
- DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv",".m4v");\r
+ DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv", ".m4v");\r
else\r
DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4");\r
break;\r
case 2:\r
if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))\r
- DVD_Save.FileName = DVD_Save.FileName .Replace(".mp4", ".mkv").Replace(".m4v",".mkv");\r
+ DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".mkv").Replace(".m4v", ".mkv");\r
break;\r
default:\r
//do nothing \r
\r
// Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)\r
if (Check_ChapterMarkers.Checked && DVD_Save.FilterIndex != 2)\r
- setExtension(".m4v");\r
+ SetExtension(".m4v");\r
}\r
}\r
}\r
{\r
case 0:\r
if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
- setExtension(".m4v");\r
+ SetExtension(".m4v");\r
else\r
- setExtension(".mp4");\r
+ SetExtension(".mp4");\r
break;\r
case 1:\r
- setExtension(".mkv");\r
+ SetExtension(".mkv");\r
break;\r
}\r
\r
AudioSettings.SetContainer(drop_format.Text);\r
Subtitles.setContainer(drop_format.SelectedIndex);\r
\r
- if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))\r
+ if (drop_format.Text.Contains("MP4"))\r
{\r
if (drp_videoEncoder.Items.Contains("VP3 (Theora)"))\r
{\r
else if (drop_format.Text.Contains("MKV"))\r
drp_videoEncoder.Items.Add("VP3 (Theora)");\r
}\r
- private void setExtension(string newExtension)\r
+ public void SetExtension(string newExtension)\r
{\r
+ if (newExtension == ".mp4" || newExtension == ".m4v")\r
+ if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
+ newExtension = ".m4v" ;\r
+ else\r
+ newExtension = ".mp4";\r
+\r
text_destination.Text = text_destination.Text.Replace(".mp4", newExtension);\r
text_destination.Text = text_destination.Text.Replace(".m4v", newExtension);\r
text_destination.Text = text_destination.Text.Replace(".mkv", newExtension);\r
check_iPodAtom.Checked = false;\r
}\r
}\r
- private double _cachedCqStep = Properties.Settings.Default.x264cqstep; \r
+ private double _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
/// <summary>\r
/// Update the CQ slider for x264 for a new CQ step. This is set from option\r
/// </summary>\r
// Work out the current RF value.\r
double cqStep = _cachedCqStep;\r
double rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
- \r
+\r
// Change the maximum value for the slider\r
switch (Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US")))\r
{\r
if (Check_ChapterMarkers.Checked)\r
{\r
if (drop_format.SelectedIndex != 1)\r
- setExtension(".m4v");\r
+ SetExtension(".m4v");\r
data_chpt.Enabled = true;\r
btn_importChapters.Enabled = true;\r
}\r
else\r
{\r
if (drop_format.SelectedIndex != 1 && !Properties.Settings.Default.useM4v)\r
- setExtension(".mp4");\r
+ SetExtension(".mp4");\r
data_chpt.Enabled = false;\r
btn_importChapters.Enabled = false;\r
}\r
// Query Editor Tab\r
private void btn_generate_Query_Click(object sender, EventArgs e)\r
{\r
- rtf_query.Text = queryGen.generateCLIQuery(this, 0, null);\r
+ rtf_query.Text = queryGen.GenerateCLIQuery(this, 0, null);\r
}\r
private void btn_clear_Click(object sender, EventArgs e)\r
{\r