using System.Drawing;\r
using System.Globalization;\r
using System.IO;\r
+ using System.Linq;\r
using System.Threading;\r
using System.Windows.Forms;\r
+\r
+ using DevExpress.Utils.Menu;\r
+\r
using Functions;\r
\r
using HandBrake.ApplicationServices.EventArgs;\r
using Handbrake.ToolWindows;\r
\r
using Model;\r
- using Presets;\r
using Properties;\r
\r
using Main = Handbrake.Functions.Main;\r
{\r
// Objects which may be used by one or more other objects *************\r
private IQueueProcessor queueProcessor = new QueueProcessor(Program.InstanceId);\r
- private PresetsHandler presetHandler = new PresetsHandler();\r
+ private PresetService presetHandler = new PresetService();\r
\r
// Windows ************************************************************\r
private frmQueue queueWindow;\r
public frmMain(string[] args)\r
{\r
InitializeComponent();\r
+ this.presetsToolStrip.Renderer = new ToolStripRenderOverride();\r
\r
// We can use LibHB, if the library hb.dll exists.\r
this.SourceScan = File.Exists("hb.dll") ? (IScan)new LibScan() : new ScanService();\r
\r
#endregion\r
\r
- #region Presets Menu\r
-\r
- /// <summary>\r
- /// Reset the Built in Presets\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void mnu_presetReset_Click(object sender, EventArgs e)\r
- {\r
- presetHandler.UpdateBuiltInPresets();\r
- LoadPresetPanel();\r
- if (treeView_presets.Nodes.Count == 0)\r
- MessageBox.Show(\r
- "Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!",\r
- "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
- else\r
- MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
-\r
- treeView_presets.ExpandAll();\r
- }\r
+ #region Help Menu (Toolbar)\r
\r
/// <summary>\r
- /// Delete the selected preset\r
+ /// Menu - Display the User Guide Web Page\r
/// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void mnu_delete_preset_Click(object sender, EventArgs e)\r
- {\r
- presetHandler.RemoveBuiltInPresets();\r
- LoadPresetPanel(); // Reload the preset panel\r
- }\r
-\r
- /// <summary>\r
- /// Select the Normal preset\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void mnu_SelectDefault_Click(object sender, EventArgs e)\r
- {\r
- loadNormalPreset();\r
- }\r
-\r
- /// <summary>\r
- /// Import a plist Preset\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void mnu_importMacPreset_Click(object sender, EventArgs e)\r
- {\r
- ImportPreset();\r
- }\r
-\r
- /// <summary>\r
- /// Export a Plist Preset\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void mnu_exportMacPreset_Click(object sender, EventArgs e)\r
- {\r
- ExportPreset();\r
- }\r
-\r
- /// <summary>\r
- /// Create a new Preset\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void btn_new_preset_Click(object sender, EventArgs e)\r
- {\r
- Form preset = new frmAddPreset(this, presetHandler);\r
- if (preset.ShowDialog() == DialogResult.OK)\r
- {\r
- TreeNode presetTreeview = new TreeNode(presetHandler.LastPresetAdded.Name) { ForeColor = Color.Black };\r
- treeView_presets.Nodes.Add(presetTreeview);\r
- presetHandler.LastPresetAdded = null;\r
- }\r
- }\r
-\r
- #endregion\r
-\r
- #region Help Menu\r
-\r
- /// <summary>\r
- /// Menu - Display the User Guide Web Page\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void mnu_user_guide_Click(object sender, EventArgs e)\r
+ /// <param name="sender">The Sender</param>\r
+ /// <param name="e">The EventArgs</param>\r
+ private void MnuUserGuide_Click(object sender, EventArgs e)\r
{\r
Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");\r
}\r
\r
/// <summary>\r
- /// Menu - Check for Updates\r
+ /// Check for Updates\r
/// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void mnu_UpdateCheck_Click(object sender, EventArgs e)\r
+ /// <param name="sender">The Sender</param>\r
+ /// <param name="e">The EventArgs</param>\r
+ private void MnuCheckForUpdates_Click(object sender, EventArgs e)\r
{\r
lbl_updateCheck.Visible = true;\r
Settings.Default.lastUpdateCheckDate = DateTime.Now;\r
/// <summary>\r
/// Menu - Display the About Window\r
/// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void mnu_about_Click(object sender, EventArgs e)\r
+ /// <param name="sender">The Sender</param>\r
+ /// <param name="e">The EventArgs</param>\r
+ private void MnuAboutHandBrake_Click(object sender, EventArgs e)\r
{\r
using (frmAbout About = new frmAbout())\r
{\r
/// </param>\r
private void pmnu_saveChanges_Click(object sender, EventArgs e)\r
{\r
- // TODO this requires a re-think since the Query Editor has changed.\r
DialogResult result =\r
MessageBox.Show(\r
"Do you wish to include picture settings when updating the preset: " +\r
treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel,\r
MessageBoxIcon.Question);\r
- if (result == DialogResult.Yes)\r
- presetHandler.Update(treeView_presets.SelectedNode.Text,\r
- QueryGenerator.GenerateQueryForPreset(this, QueryPictureSettingsMode.SourceMaximum, true, 0, 0), true);\r
- else if (result == DialogResult.No)\r
- presetHandler.Update(treeView_presets.SelectedNode.Text,\r
- QueryGenerator.GenerateQueryForPreset(this, QueryPictureSettingsMode.SourceMaximum, true, 0, 0), false);\r
+\r
+ Preset preset = new Preset\r
+ {\r
+ Name = this.treeView_presets.SelectedNode.Text,\r
+ Query =\r
+ QueryGenerator.GenerateQueryForPreset(this, QueryPictureSettingsMode.SourceMaximum, true, 0, 0),\r
+ CropSettings = (result == DialogResult.Yes)\r
+ };\r
+\r
+ presetHandler.Update(preset);\r
}\r
\r
/// <summary>\r
{\r
if (treeView_presets.SelectedNode != null)\r
{\r
- presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
+ presetHandler.Remove((Preset)treeView_presets.SelectedNode.Tag);\r
treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);\r
}\r
treeView_presets.Select();\r
\r
// Now enable the save menu if the selected preset is a user preset\r
if (treeView_presets.SelectedNode != null)\r
- if (presetHandler.CheckIfUserPresetExists(treeView_presets.SelectedNode.Text))\r
+ if (presetHandler.CheckIfPresetExists(treeView_presets.SelectedNode.Text))\r
pmnu_saveChanges.Enabled = true;\r
\r
treeView_presets.Select();\r
\r
// Presets Management\r
\r
- /// <summary>\r
- /// Button - Add a preset\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void btn_addPreset_Click(object sender, EventArgs e)\r
+ private void BtnAddPreset_Click(object sender, EventArgs e)\r
{\r
Form preset = new frmAddPreset(this, presetHandler);\r
if (preset.ShowDialog() == DialogResult.OK)\r
}\r
}\r
\r
- /// <summary>\r
- /// Button - remove a Preset\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void btn_removePreset_Click(object sender, EventArgs e)\r
+ private void BtnRemovePreset_Click(object sender, EventArgs e)\r
{\r
DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",\r
MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
{\r
if (treeView_presets.SelectedNode != null)\r
{\r
- presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
+ presetHandler.Remove((Preset)treeView_presets.SelectedNode.Tag);\r
treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);\r
}\r
}\r
treeView_presets.Select();\r
}\r
\r
- /// <summary>\r
- /// Button - Set the selected preset as the default\r
- /// </summary>\r
- /// <param name="sender">\r
- /// The sender.\r
- /// </param>\r
- /// <param name="e">\r
- /// The e.\r
- /// </param>\r
- private void btn_setDefault_Click(object sender, EventArgs e)\r
+\r
+ private void MnuSetDefaultPreset_Click(object sender, EventArgs e)\r
{\r
if (treeView_presets.SelectedNode != null)\r
{\r
MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
}\r
\r
+ private void MnuImportPreset_Click(object sender, EventArgs e)\r
+ {\r
+ this.ImportPreset();\r
+ }\r
+\r
+ private void MnuExportPreset_Click(object sender, EventArgs e)\r
+ {\r
+ this.ExportPreset();\r
+ }\r
+\r
+ private void MnuResetBuiltInPresets_Click(object sender, EventArgs e)\r
+ {\r
+ presetHandler.UpdateBuiltInPresets(string.Empty);\r
+ LoadPresetPanel();\r
+ if (treeView_presets.Nodes.Count == 0)\r
+ MessageBox.Show(\r
+ "Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!",\r
+ "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+ else\r
+ MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+\r
+ treeView_presets.ExpandAll();\r
+ }\r
+\r
/// <summary>\r
/// PresetBar Mouse Down event\r
/// </summary>\r
if (result == DialogResult.Yes)\r
{\r
if (treeView_presets.SelectedNode != null)\r
- presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
+ presetHandler.Remove((Preset)treeView_presets.SelectedNode.Tag);\r
\r
// Remember each nodes expanded status so we can reload it\r
List<bool> nodeStatus = new List<bool>();\r
if (openPreset.ShowDialog() == DialogResult.OK)\r
{\r
EncodeTask parsed = PlistPresetHandler.Import(openPreset.FileName);\r
- if (presetHandler.CheckIfUserPresetExists(parsed.PresetName + " (Imported)"))\r
+ if (presetHandler.CheckIfPresetExists(parsed.PresetName + " (Imported)"))\r
{\r
DialogResult result =\r
MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?",\r
if (result == DialogResult.Yes)\r
{\r
PresetLoader.LoadPreset(this, parsed, parsed.PresetName);\r
- presetHandler.Update(parsed.PresetName + " (Imported)",\r
- QueryGenerator.GenerateFullQuery(this),\r
- parsed.UsesPictureSettings);\r
+\r
+ Preset preset = new Preset\r
+ {\r
+ Name = parsed.PresetName + " (Imported)",\r
+ Query = QueryGenerator.GenerateFullQuery(this),\r
+ CropSettings = parsed.UsesPictureSettings\r
+ };\r
+\r
+ presetHandler.Update(preset);\r
}\r
}\r
else\r
{\r
PresetLoader.LoadPreset(this, parsed, parsed.PresetName);\r
- if (presetHandler.Add(parsed.PresetName + " (Imported)",\r
- QueryGenerator.GenerateFullQuery(this),\r
- parsed.UsesPictureSettings, string.Empty))\r
+\r
+ Preset preset = new Preset\r
+ {\r
+ Name = parsed.PresetName + " (Imported)",\r
+ Query = QueryGenerator.GenerateFullQuery(this),\r
+ CropSettings = parsed.UsesPictureSettings\r
+ };\r
+\r
+ if (presetHandler.Add(preset))\r
{\r
TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)")\r
{\r
switch (DVD_Save.FilterIndex)\r
{\r
case 1:\r
- if (\r
- !Path.GetExtension(DVD_Save.FileName).Equals(".mp4",\r
- StringComparison.InvariantCultureIgnoreCase))\r
- if (Properties.Settings.Default.useM4v)\r
+ if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))\r
+ if (Properties.Settings.Default.useM4v == 2 || Properties.Settings.Default.useM4v == 0)\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 (\r
- !Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))\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
break;\r
default:\r
switch (drop_format.SelectedIndex)\r
{\r
case 0:\r
- if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked ||\r
- AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
- SetExtension(".m4v");\r
- else\r
- SetExtension(".mp4");\r
+ SetExtension(".mp4");\r
break;\r
case 1:\r
SetExtension(".mkv");\r
public void SetExtension(string newExtension)\r
{\r
if (newExtension == ".mp4" || newExtension == ".m4v")\r
- if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() ||\r
- Subtitles.RequiresM4V())\r
- newExtension = ".m4v";\r
+ if (Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V() || Properties.Settings.Default.useM4v == 2) \r
+ newExtension = Properties.Settings.Default.useM4v == 1 ? ".mp4" : ".m4v";\r
else\r
newExtension = ".mp4";\r
\r
}\r
else\r
{\r
- if (drop_format.SelectedIndex != 1 && !Properties.Settings.Default.useM4v)\r
+ if (drop_format.SelectedIndex != 1)\r
SetExtension(".mp4");\r
data_chpt.Enabled = false;\r
btn_importChapters.Enabled = false;\r
return;\r
}\r
\r
- labelSource.Text = string.Format("Processing Title: {0} of {1}", e.CurrentTitle, e.Titles); \r
+ labelSource.Text = string.Format("Processing Title: {0} of {1}", e.CurrentTitle, e.Titles);\r
}\r
\r
/// <summary>\r
"HandBrake has determined your built-in presets are out of date... These presets will now be updated.",\r
"Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
\r
- presetHandler.GetPresetPanel(ref treeView_presets);\r
+ // Clear the old presets\r
+ treeView_presets.Nodes.Clear();\r
+\r
+\r
+ string category = string.Empty; // The category we are currnetly processing\r
+ TreeNode rootNode = null;\r
+ foreach (Preset preset in this.presetHandler.Presets.Where(p => p.IsBuildIn))\r
+ {\r
+ // If the category of this preset doesn't match the current category we are processing\r
+ // Then we need to create a new root node.\r
+ if (preset.Category != category)\r
+ {\r
+ rootNode = new TreeNode(preset.Category) { ForeColor = Color.DarkBlue };\r
+ treeView_presets.Nodes.Add(rootNode);\r
+ category = preset.Category;\r
+ }\r
+\r
+ if (preset.Category == category && rootNode != null)\r
+ rootNode.Nodes.Add(new TreeNode(preset.Name) { ToolTipText = preset.Description, ForeColor = Color.DarkBlue });\r
+ }\r
+\r
+ rootNode = null;\r
+ category = null;\r
+ foreach (Preset preset in this.presetHandler.Presets.Where(p => !p.IsBuildIn)) // User Presets\r
+ {\r
+ if (preset.Category != category && preset.Category != string.Empty)\r
+ {\r
+ rootNode = new TreeNode(preset.Category) { ForeColor = Color.Black };\r
+ treeView_presets.Nodes.Add(rootNode);\r
+ category = preset.Category;\r
+ }\r
+\r
+ if (preset.Category == category && rootNode != null)\r
+ rootNode.Nodes.Add(new TreeNode(preset.Name) { ForeColor = Color.Black, ToolTipText = preset.Description });\r
+ else\r
+ treeView_presets.Nodes.Add(new TreeNode(preset.Name) { ForeColor = Color.Black, ToolTipText = preset.Description });\r
+ }\r
+\r
treeView_presets.Update();\r
}\r
\r
}\r
\r
if (SourceScan.IsScanning)\r
- { \r
+ {\r
SourceScan.Stop();\r
}\r
\r
OSDN Git Service
