diff options
| author | sr55 <[email protected]> | 2009-07-04 19:34:25 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-07-04 19:34:25 +0000 |
| commit | 39236e31497de99fe8e29458bab51d7a9d28a27d (patch) | |
| tree | 208d81d44cfb8be24d1992903a840bcfd575672e /win | |
| parent | 499dbe37cfa932362827622bb04132ecd2371f96 (diff) | |
WinGui:
- Some fixes to the Picture settings panel and preset loader.
- Small UI tweak to options.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2664 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/Controls/PictureSettings.cs | 61 | ||||
| -rw-r--r-- | win/C#/Controls/PictureSettings.resx | 22 | ||||
| -rw-r--r-- | win/C#/Functions/PresetLoader.cs | 39 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 103 | ||||
| -rw-r--r-- | win/C#/frmMain.resx | 6 | ||||
| -rw-r--r-- | win/C#/frmOptions.Designer.cs | 79 |
6 files changed, 147 insertions, 163 deletions
diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs index e490c2e63..bd367d464 100644 --- a/win/C#/Controls/PictureSettings.cs +++ b/win/C#/Controls/PictureSettings.cs @@ -8,7 +8,7 @@ namespace Handbrake.Controls // TODO
// - Tie in the cropping controls.
// - Cleanup this code. It's a bit messy.
-
+
public partial class PictureSettings : UserControl
{
private static readonly CultureInfo Culture = new CultureInfo("en-US", false);
@@ -56,7 +56,7 @@ namespace Handbrake.Controls else if (drp_anamorphic.SelectedIndex == 1 || drp_anamorphic.SelectedIndex == 3)
{
heightModJumpGaurd = true;
- text_height.Value = selectedTitle.Resolution.Height - (int) crop_top.Value - (int) crop_bottom.Value;
+ text_height.Value = selectedTitle.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;
}
else if (drp_anamorphic.SelectedIndex == 2)
{
@@ -86,9 +86,10 @@ namespace Handbrake.Controls // Basic Picture Setting Controls
private void text_width_ValueChanged(object sender, EventArgs e)
{
+
maxWidth = 0;
setMax();
-
+
// Get the Modulus
int mod;
int.TryParse(drop_modulus.SelectedItem.ToString(), out mod);
@@ -115,7 +116,8 @@ namespace Handbrake.Controls }
// A Picture Setting has changed so raise a PictureSettingsChanged event.
if (this.PictureSettingsChanged != null)
- this.PictureSettingsChanged(this, new EventArgs());
+ this.PictureSettingsChanged(this, new EventArgs());
+
}
private void text_height_ValueChanged(object sender, EventArgs e)
{
@@ -166,7 +168,7 @@ namespace Handbrake.Controls // A Picture Setting has changed so raise a PictureSettingsChanged event.
if (this.PictureSettingsChanged != null)
- this.PictureSettingsChanged(this, new EventArgs());
+ this.PictureSettingsChanged(this, new EventArgs());
}
private void check_KeepAR_CheckedChanged(object sender, EventArgs e)
{
@@ -196,12 +198,13 @@ namespace Handbrake.Controls check_KeepAR.CheckState = CheckState.Checked;
check_KeepAR.Enabled = true;
disableCustomAnaControls();
+ check_KeepAR.Enabled = true;
if (selectedTitle != null)
{
- text_width.Value = selectedTitle.Resolution.Width;
- text_height.Value = selectedTitle.Resolution.Height;
+ text_width.Value = maxWidth != 0 ? maxWidth : selectedTitle.Resolution.Width;
+ text_height.Value = maxHeight != 0 ? maxHeight : selectedTitle.Resolution.Height;
+ setMax();
}
- check_KeepAR.Enabled = true;
lbl_anamorphic.Text = "";
lbl_anamprohicLbl.Visible = false;
break;
@@ -209,8 +212,10 @@ namespace Handbrake.Controls if (selectedTitle != null)
{
heightModJumpGaurd = true;
- text_width.Value = selectedTitle.Resolution.Width - (int)crop_left.Value - (int)crop_right.Value;
- text_height.Value = selectedTitle.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;
+ text_width.Value = selectedTitle.Resolution.Width - (int)crop_left.Value -
+ (int)crop_right.Value;
+ text_height.Value = selectedTitle.Resolution.Height - (int)crop_top.Value -
+ (int)crop_bottom.Value;
}
text_height.Enabled = false;
text_width.Enabled = false;
@@ -229,7 +234,8 @@ namespace Handbrake.Controls {
heightModJumpGaurd = true;
text_width.Value = selectedTitle.Resolution.Width;
- text_height.Value = selectedTitle.Resolution.Height - (int) crop_top.Value - (int) crop_bottom.Value;
+ text_height.Value = selectedTitle.Resolution.Height - (int)crop_top.Value -
+ (int)crop_bottom.Value;
}
lbl_anamorphic.Text = looseAnamorphic();
lbl_anamprohicLbl.Visible = true;
@@ -246,13 +252,15 @@ namespace Handbrake.Controls {
heightModJumpGaurd = true;
widthVal = selectedTitle.Resolution.Width;
- text_width.Value = selectedTitle.Resolution.Width - (int)crop_left.Value - (int)crop_right.Value;
- text_height.Value = selectedTitle.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;
+ text_width.Value = selectedTitle.Resolution.Width - (int)crop_left.Value -
+ (int)crop_right.Value;
+ text_height.Value = selectedTitle.Resolution.Height - (int)crop_top.Value -
+ (int)crop_bottom.Value;
txt_parWidth.Text = selectedTitle.ParVal.Width.ToString();
txt_parHeight.Text = selectedTitle.ParVal.Height.ToString();
txt_displayWidth.Text = displayWidth().ToString(Culture);
}
-
+
darValue = calculateDar();
check_KeepAR.CheckState = CheckState.Checked;
@@ -264,7 +272,8 @@ namespace Handbrake.Controls // A Picture Setting has changed so raise a PictureSettingsChanged event.
if (this.PictureSettingsChanged != null)
- this.PictureSettingsChanged(this, new EventArgs());
+ this.PictureSettingsChanged(this, new EventArgs());
+
}
// Custom Anamorphic Controls
@@ -283,7 +292,7 @@ namespace Handbrake.Controls if (e.KeyCode == Keys.Enter)
customAnamorphic(txt_parWidth);
}
-
+
// Cropping Controls
private void check_autoCrop_CheckedChanged(object sender, EventArgs e)
{
@@ -418,7 +427,7 @@ namespace Handbrake.Controls txt_displayWidth.Text = getDisplayWidthKeepDar().ToString(Culture); //Changes DISPLAY WIDTH to keep DAR
txt_parWidth.Text = txt_displayWidth.Text;
txt_parHeight.Text = cropped_width.ToString();
- break;
+ break;
case "text_width":
txt_parWidth.Text = txt_displayWidth.Text;
txt_parHeight.Text = cropped_width.ToString();
@@ -626,13 +635,13 @@ namespace Handbrake.Controls {
// Crop_Width = Title->Width - crop_Left - crop_right
// Crop_Height = Title->Height - crop_top - crop_bottom
- double crop_width = selectedTitle.Resolution.Width - (double) crop_left.Value -
- (double) crop_right.Value;
- double crop_height = selectedTitle.Resolution.Height - (double) crop_top.Value -
- (double) crop_bottom.Value;
+ double crop_width = selectedTitle.Resolution.Width - (double)crop_left.Value -
+ (double)crop_right.Value;
+ double crop_height = selectedTitle.Resolution.Height - (double)crop_top.Value -
+ (double)crop_bottom.Value;
- double new_height = (width*selectedTitle.Resolution.Width*ah*crop_height)/
- (selectedTitle.Resolution.Height*aw*crop_width);
+ double new_height = (width * selectedTitle.Resolution.Width * ah * crop_height) /
+ (selectedTitle.Resolution.Height * aw * crop_width);
new_height = drp_anamorphic.SelectedIndex == 3 ? getModulusAuto(int.Parse(drop_modulus.SelectedItem.ToString()), new_height) : getModulusAuto(16, new_height);
@@ -712,7 +721,7 @@ namespace Handbrake.Controls // Calculate storage Aspect and cache it for reuse
if (storageAspect == 0)
- storageAspect = (double)actualWidth / source_cropped_height;
+ storageAspect = (double)actualWidth / source_cropped_height;
// Calculate the new height based on the input cropped width
double hcalc = (actualWidth / storageAspect) + 0.5;
@@ -729,12 +738,12 @@ namespace Handbrake.Controls double displayWidth = (actualWidth * parW / parH);
// Now correct DisplayWidth to maintain Aspect ratio. ActualHeight was mod16'd and thus AR is slightly different than the worked out displayWidths
- return Math.Truncate(displayWidth) + "x" + newHeight;
+ return Math.Truncate(displayWidth) + "x" + newHeight;
}
return "Select a Title";
}
-
+
// GUI
private void disableCustomAnaControls()
{
diff --git a/win/C#/Controls/PictureSettings.resx b/win/C#/Controls/PictureSettings.resx index 406977e64..f9ff3dffe 100644 --- a/win/C#/Controls/PictureSettings.resx +++ b/win/C#/Controls/PictureSettings.resx @@ -725,7 +725,7 @@ <value>True</value>
</data>
<data name="check_customCrop.Location" type="System.Drawing.Point, System.Drawing">
- <value>387, 57</value>
+ <value>399, 57</value>
</data>
<data name="check_customCrop.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 17</value>
@@ -752,7 +752,7 @@ <value>True</value>
</data>
<data name="check_autoCrop.Location" type="System.Drawing.Point, System.Drawing">
- <value>387, 33</value>
+ <value>399, 33</value>
</data>
<data name="check_autoCrop.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 17</value>
@@ -779,7 +779,7 @@ <value>False</value>
</data>
<data name="crop_bottom.Location" type="System.Drawing.Point, System.Drawing">
- <value>467, 146</value>
+ <value>479, 146</value>
</data>
<data name="crop_bottom.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
@@ -803,7 +803,7 @@ <value>False</value>
</data>
<data name="crop_top.Location" type="System.Drawing.Point, System.Drawing">
- <value>467, 100</value>
+ <value>479, 100</value>
</data>
<data name="crop_top.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
@@ -827,7 +827,7 @@ <value>False</value>
</data>
<data name="crop_left.Location" type="System.Drawing.Point, System.Drawing">
- <value>416, 122</value>
+ <value>428, 122</value>
</data>
<data name="crop_left.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
@@ -851,7 +851,7 @@ <value>False</value>
</data>
<data name="crop_right.Location" type="System.Drawing.Point, System.Drawing">
- <value>518, 122</value>
+ <value>530, 122</value>
</data>
<data name="crop_right.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
@@ -878,7 +878,7 @@ <value>Verdana, 8.25pt, style=Bold</value>
</data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
- <value>384, 13</value>
+ <value>396, 13</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 13</value>
@@ -908,7 +908,7 @@ <value>Verdana, 8.25pt</value>
</data>
<data name="Label53.Location" type="System.Drawing.Point, System.Drawing">
- <value>465, 170</value>
+ <value>477, 170</value>
</data>
<data name="Label53.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 13</value>
@@ -938,7 +938,7 @@ <value>Verdana, 8.25pt</value>
</data>
<data name="Label52.Location" type="System.Drawing.Point, System.Drawing">
- <value>474, 85</value>
+ <value>486, 85</value>
</data>
<data name="Label52.Size" type="System.Drawing.Size, System.Drawing">
<value>28, 13</value>
@@ -968,7 +968,7 @@ <value>Verdana, 8.25pt</value>
</data>
<data name="Label51.Location" type="System.Drawing.Point, System.Drawing">
- <value>561, 124</value>
+ <value>573, 124</value>
</data>
<data name="Label51.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 13</value>
@@ -998,7 +998,7 @@ <value>Verdana, 8.25pt</value>
</data>
<data name="Label15.Location" type="System.Drawing.Point, System.Drawing">
- <value>384, 124</value>
+ <value>396, 124</value>
</data>
<data name="Label15.Size" type="System.Drawing.Size, System.Drawing">
<value>28, 13</value>
diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs index 28cec6805..0b72d2915 100644 --- a/win/C#/Functions/PresetLoader.cs +++ b/win/C#/Functions/PresetLoader.cs @@ -62,11 +62,11 @@ namespace Handbrake.Functions #endregion
#region Picture
-
+
if (pictureSettings) // only Load picture settings if the perset requires it
{
mainWindow.PictureSettings.check_autoCrop.Checked = true;
-
+
if (presetQuery.CropValues != null)
{
int top, bottom, left, right;
@@ -83,25 +83,19 @@ namespace Handbrake.Functions }
}
+ // Set the anamorphic mode 0,1,2,3
+ mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;
+
+ // Aspect Ratio
+ mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;
+
// Reset maxWidth and MaxHeight to 0
mainWindow.PictureSettings.maxWidth = 0;
mainWindow.PictureSettings.maxHeight = 0;
-
- // Set the width and height
+
+ // Set the Width and height as Required.
if (presetQuery.Width != 0)
mainWindow.PictureSettings.text_width.Value = presetQuery.Width;
- else if (presetQuery.MaxWidth == 0)
- {
- if (mainWindow.selectedTitle != null)
- if (mainWindow.selectedTitle.Resolution.Width != 0)
- {
- mainWindow.PictureSettings.text_width.Value = mainWindow.selectedTitle.Resolution.Width;
- if (presetQuery.Height == 0 && presetQuery.MaxHeight == 0)
- mainWindow.PictureSettings.check_KeepAR.Checked = true;
- }
- else
- mainWindow.PictureSettings.text_width.Value = 0;
- }
if (presetQuery.Height != 0)
mainWindow.PictureSettings.text_height.Value = presetQuery.Height;
@@ -118,13 +112,20 @@ namespace Handbrake.Functions mainWindow.PictureSettings.text_height.Value = presetQuery.MaxHeight;
mainWindow.PictureSettings.maxHeight = presetQuery.MaxHeight;
}
+
+ // Case where both height and max height are 0 - For built-in presets
+ if (presetQuery.MaxHeight == 0 && presetQuery.Height == 0)
+ mainWindow.PictureSettings.text_height.Value = 0;
+
+ if (presetQuery.MaxWidth == 0 && presetQuery.Width == 0)
+ if (mainWindow.selectedTitle != null && mainWindow.selectedTitle.Resolution.Width != 0)
+ mainWindow.PictureSettings.text_width.Value = mainWindow.selectedTitle.Resolution.Width;
+
mainWindow.PictureSettings.setMax();
- // Set the anamorphic mode 0,1,2,3
- mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;
+
// Custom Anamorphic Controls
- mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;
mainWindow.PictureSettings.txt_displayWidth.Text = presetQuery.displayWidthValue.ToString();
mainWindow.PictureSettings.txt_parWidth.Text = presetQuery.pixelAspectWidth.ToString();
mainWindow.PictureSettings.txt_parHeight.Text = presetQuery.pixelAspectHeight.ToString();
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index b93072ab2..720f13b04 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -43,7 +43,6 @@ namespace Handbrake System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();
this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
- this.File_Save = new System.Windows.Forms.SaveFileDialog();
this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
this.drop_chapterFinish = new System.Windows.Forms.ComboBox();
this.drop_chapterStart = new System.Windows.Forms.ComboBox();
@@ -103,6 +102,7 @@ namespace Handbrake this.Label47 = new System.Windows.Forms.Label();
this.Label3 = new System.Windows.Forms.Label();
this.tab_audio = new System.Windows.Forms.TabPage();
+ this.AudioSettings = new Handbrake.Controls.AudioPanel();
this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);
this.tab_video = new System.Windows.Forms.TabPage();
this.radio_cq = new System.Windows.Forms.RadioButton();
@@ -114,13 +114,17 @@ namespace Handbrake this.SliderValue = new System.Windows.Forms.Label();
this.Label46 = new System.Windows.Forms.Label();
this.tab_picture = new System.Windows.Forms.TabPage();
+ this.PictureSettings = new Handbrake.Controls.PictureSettings();
this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();
this.tabs_panel = new System.Windows.Forms.TabControl();
this.tab_filters = new System.Windows.Forms.TabPage();
+ this.Filters = new Handbrake.Controls.Filters();
this.tab_subtitles = new System.Windows.Forms.TabPage();
+ this.Subtitles = new Handbrake.Controls.Subtitles();
this.tab_chapters = new System.Windows.Forms.TabPage();
this.label31 = new System.Windows.Forms.Label();
this.tab_advanced = new System.Windows.Forms.TabPage();
+ this.x264Panel = new Handbrake.Controls.x264Panel();
this.tab_query = new System.Windows.Forms.TabPage();
this.btn_clear = new System.Windows.Forms.Button();
this.label34 = new System.Windows.Forms.Label();
@@ -159,11 +163,7 @@ namespace Handbrake this.lbl_source = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.groupBox_output = new System.Windows.Forms.Label();
- this.PictureSettings = new Handbrake.Controls.PictureSettings();
- this.Filters = new Handbrake.Controls.Filters();
- this.AudioSettings = new Handbrake.Controls.AudioPanel();
- this.Subtitles = new Handbrake.Controls.Subtitles();
- this.x264Panel = new Handbrake.Controls.x264Panel();
+ this.File_Save = new System.Windows.Forms.SaveFileDialog();
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
notifyIconMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
@@ -207,11 +207,6 @@ namespace Handbrake this.DVD_Save.Filter = "mp4|*.mp4|mkv|*.mkv";
this.DVD_Save.SupportMultiDottedExtensions = true;
//
- // File_Save
- //
- this.File_Save.DefaultExt = "hb";
- this.File_Save.Filter = "hb|*.hb";
- //
// ToolTip
//
this.ToolTip.Active = false;
@@ -825,6 +820,14 @@ namespace Handbrake this.tab_audio.Text = "Audio";
this.tab_audio.UseVisualStyleBackColor = true;
//
+ // AudioSettings
+ //
+ this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
+ this.AudioSettings.Location = new System.Drawing.Point(0, 0);
+ this.AudioSettings.Name = "AudioSettings";
+ this.AudioSettings.Size = new System.Drawing.Size(715, 310);
+ this.AudioSettings.TabIndex = 0;
+ //
// AudioMenuRowHeightHack
//
this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
@@ -964,6 +967,14 @@ namespace Handbrake this.tab_picture.Text = "Picture Settings";
this.tab_picture.UseVisualStyleBackColor = true;
//
+ // PictureSettings
+ //
+ this.PictureSettings.BackColor = System.Drawing.Color.Transparent;
+ this.PictureSettings.Location = new System.Drawing.Point(0, 0);
+ this.PictureSettings.Name = "PictureSettings";
+ this.PictureSettings.Size = new System.Drawing.Size(713, 310);
+ this.PictureSettings.TabIndex = 0;
+ //
// Check_ChapterMarkers
//
this.Check_ChapterMarkers.AutoSize = true;
@@ -1005,6 +1016,14 @@ namespace Handbrake this.tab_filters.Text = "Video Filters";
this.tab_filters.UseVisualStyleBackColor = true;
//
+ // Filters
+ //
+ this.Filters.BackColor = System.Drawing.Color.Transparent;
+ this.Filters.Location = new System.Drawing.Point(0, 0);
+ this.Filters.Name = "Filters";
+ this.Filters.Size = new System.Drawing.Size(713, 310);
+ this.Filters.TabIndex = 0;
+ //
// tab_subtitles
//
this.tab_subtitles.Controls.Add(this.Subtitles);
@@ -1016,6 +1035,14 @@ namespace Handbrake this.tab_subtitles.Text = "Subtitles";
this.tab_subtitles.UseVisualStyleBackColor = true;
//
+ // Subtitles
+ //
+ this.Subtitles.BackColor = System.Drawing.Color.Transparent;
+ this.Subtitles.Location = new System.Drawing.Point(0, 0);
+ this.Subtitles.Name = "Subtitles";
+ this.Subtitles.Size = new System.Drawing.Size(722, 310);
+ this.Subtitles.TabIndex = 0;
+ //
// tab_chapters
//
this.tab_chapters.BackColor = System.Drawing.Color.Transparent;
@@ -1053,6 +1080,15 @@ namespace Handbrake this.tab_advanced.Text = "Advanced";
this.tab_advanced.UseVisualStyleBackColor = true;
//
+ // x264Panel
+ //
+ this.x264Panel.BackColor = System.Drawing.Color.Transparent;
+ this.x264Panel.Location = new System.Drawing.Point(0, 0);
+ this.x264Panel.Name = "x264Panel";
+ this.x264Panel.Size = new System.Drawing.Size(720, 306);
+ this.x264Panel.TabIndex = 0;
+ this.x264Panel.x264Query = "";
+ //
// tab_query
//
this.tab_query.Controls.Add(this.btn_clear);
@@ -1450,46 +1486,10 @@ namespace Handbrake this.groupBox_output.TabIndex = 47;
this.groupBox_output.Text = "Output Settings: (Preset: None)";
//
- // PictureSettings
- //
- this.PictureSettings.BackColor = System.Drawing.Color.Transparent;
- this.PictureSettings.Location = new System.Drawing.Point(0, 0);
- this.PictureSettings.Name = "PictureSettings";
- this.PictureSettings.Size = new System.Drawing.Size(713, 310);
- this.PictureSettings.TabIndex = 0;
- //
- // Filters
- //
- this.Filters.BackColor = System.Drawing.Color.Transparent;
- this.Filters.Location = new System.Drawing.Point(0, 0);
- this.Filters.Name = "Filters";
- this.Filters.Size = new System.Drawing.Size(713, 310);
- this.Filters.TabIndex = 0;
- //
- // AudioSettings
- //
- this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
- this.AudioSettings.Location = new System.Drawing.Point(0, 0);
- this.AudioSettings.Name = "AudioSettings";
- this.AudioSettings.Size = new System.Drawing.Size(715, 310);
- this.AudioSettings.TabIndex = 0;
- //
- // Subtitles
- //
- this.Subtitles.BackColor = System.Drawing.Color.Transparent;
- this.Subtitles.Location = new System.Drawing.Point(0, 0);
- this.Subtitles.Name = "Subtitles";
- this.Subtitles.Size = new System.Drawing.Size(722, 310);
- this.Subtitles.TabIndex = 0;
- //
- // x264Panel
+ // File_Save
//
- this.x264Panel.BackColor = System.Drawing.Color.Transparent;
- this.x264Panel.Location = new System.Drawing.Point(0, 0);
- this.x264Panel.Name = "x264Panel";
- this.x264Panel.Size = new System.Drawing.Size(720, 306);
- this.x264Panel.TabIndex = 0;
- this.x264Panel.x264Query = "";
+ this.File_Save.DefaultExt = "hb";
+ this.File_Save.Filter = "hb|*.hb";
//
// frmMain
//
@@ -1526,7 +1526,6 @@ namespace Handbrake this.Controls.Add(this.frmMainMenu);
this.Controls.Add(this.StatusStrip);
this.DoubleBuffered = true;
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "frmMain";
@@ -1565,7 +1564,6 @@ namespace Handbrake #endregion
- internal System.Windows.Forms.SaveFileDialog File_Save;
internal System.Windows.Forms.ToolTip ToolTip;
internal System.Windows.Forms.ToolStripMenuItem FileToolStripMenuItem;
internal System.Windows.Forms.ToolStripMenuItem mnu_open3;
@@ -1688,6 +1686,7 @@ namespace Handbrake private Label label4;
internal Label groupBox_output;
private ToolStripStatusLabel lbl_updateCheck;
+ internal SaveFileDialog File_Save;
}
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index ffd42bef2..e34b5020e 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -126,9 +126,6 @@ <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>556, 15</value>
</metadata>
- <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>664, 15</value>
- </metadata>
<metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>18, 15</value>
</metadata>
@@ -953,4 +950,7 @@ Note: Do not change any of the chapter numbers!</value> AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
</value>
</data>
+ <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>664, 15</value>
+ </metadata>
</root>
\ No newline at end of file diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index a47d2b763..6e6a51ccd 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -76,8 +76,6 @@ namespace Handbrake this.drp_processors = new System.Windows.Forms.ComboBox();
this.Label4 = new System.Windows.Forms.Label();
this.tab_advanced = new System.Windows.Forms.TabPage();
- this.label31 = new System.Windows.Forms.Label();
- this.label15 = new System.Windows.Forms.Label();
this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();
this.check_inGuiStatus = new System.Windows.Forms.CheckBox();
this.check_disablePresetNotification = new System.Windows.Forms.CheckBox();
@@ -138,7 +136,7 @@ namespace Handbrake this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_close.Location = new System.Drawing.Point(437, 382);
+ this.btn_close.Location = new System.Drawing.Point(437, 389);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(72, 22);
this.btn_close.TabIndex = 53;
@@ -159,7 +157,7 @@ namespace Handbrake "Lock System",
"Log Off",
"Quit HandBrake"});
- this.drp_completeOption.Location = new System.Drawing.Point(114, 100);
+ this.drp_completeOption.Location = new System.Drawing.Point(114, 126);
this.drp_completeOption.Name = "drp_completeOption";
this.drp_completeOption.Size = new System.Drawing.Size(166, 21);
this.drp_completeOption.TabIndex = 43;
@@ -175,11 +173,12 @@ namespace Handbrake this.tab_options.Location = new System.Drawing.Point(12, 55);
this.tab_options.Name = "tab_options";
this.tab_options.SelectedIndex = 0;
- this.tab_options.Size = new System.Drawing.Size(497, 321);
+ this.tab_options.Size = new System.Drawing.Size(497, 328);
this.tab_options.TabIndex = 58;
//
// tab_general
//
+ this.tab_general.Controls.Add(this.drop_updateCheckDays);
this.tab_general.Controls.Add(this.check_m4v);
this.tab_general.Controls.Add(this.label7);
this.tab_general.Controls.Add(this.label5);
@@ -197,7 +196,7 @@ namespace Handbrake this.tab_general.Controls.Add(this.drp_completeOption);
this.tab_general.Location = new System.Drawing.Point(4, 22);
this.tab_general.Name = "tab_general";
- this.tab_general.Size = new System.Drawing.Size(489, 295);
+ this.tab_general.Size = new System.Drawing.Size(489, 302);
this.tab_general.TabIndex = 3;
this.tab_general.Text = "General";
this.tab_general.UseVisualStyleBackColor = true;
@@ -206,7 +205,7 @@ namespace Handbrake //
this.check_m4v.AutoSize = true;
this.check_m4v.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_m4v.Location = new System.Drawing.Point(114, 247);
+ this.check_m4v.Location = new System.Drawing.Point(114, 273);
this.check_m4v.Name = "check_m4v";
this.check_m4v.Size = new System.Drawing.Size(334, 17);
this.check_m4v.TabIndex = 82;
@@ -219,7 +218,7 @@ namespace Handbrake //
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label7.Location = new System.Drawing.Point(197, 222);
+ this.label7.Location = new System.Drawing.Point(197, 248);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(242, 12);
this.label7.TabIndex = 81;
@@ -229,7 +228,7 @@ namespace Handbrake //
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(111, 201);
+ this.label5.Location = new System.Drawing.Point(111, 227);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(52, 13);
this.label5.TabIndex = 80;
@@ -237,7 +236,7 @@ namespace Handbrake //
// txt_autoNameFormat
//
- this.txt_autoNameFormat.Location = new System.Drawing.Point(199, 198);
+ this.txt_autoNameFormat.Location = new System.Drawing.Point(199, 224);
this.txt_autoNameFormat.Name = "txt_autoNameFormat";
this.txt_autoNameFormat.Size = new System.Drawing.Size(255, 21);
this.txt_autoNameFormat.TabIndex = 79;
@@ -251,7 +250,7 @@ namespace Handbrake this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_browse.Location = new System.Drawing.Point(386, 171);
+ this.btn_browse.Location = new System.Drawing.Point(386, 197);
this.btn_browse.Name = "btn_browse";
this.btn_browse.Size = new System.Drawing.Size(68, 22);
this.btn_browse.TabIndex = 78;
@@ -263,7 +262,7 @@ namespace Handbrake //
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label10.Location = new System.Drawing.Point(111, 174);
+ this.label10.Location = new System.Drawing.Point(111, 200);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(82, 13);
this.label10.TabIndex = 77;
@@ -271,7 +270,7 @@ namespace Handbrake //
// text_an_path
//
- this.text_an_path.Location = new System.Drawing.Point(199, 171);
+ this.text_an_path.Location = new System.Drawing.Point(199, 197);
this.text_an_path.Name = "text_an_path";
this.text_an_path.Size = new System.Drawing.Size(181, 21);
this.text_an_path.TabIndex = 76;
@@ -282,7 +281,7 @@ namespace Handbrake //
this.check_autoNaming.AutoSize = true;
this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_autoNaming.Location = new System.Drawing.Point(114, 148);
+ this.check_autoNaming.Location = new System.Drawing.Point(114, 174);
this.check_autoNaming.Name = "check_autoNaming";
this.check_autoNaming.Size = new System.Drawing.Size(206, 17);
this.check_autoNaming.TabIndex = 72;
@@ -295,7 +294,7 @@ namespace Handbrake //
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label13.Location = new System.Drawing.Point(10, 149);
+ this.label13.Location = new System.Drawing.Point(10, 175);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(86, 13);
this.label13.TabIndex = 71;
@@ -306,7 +305,7 @@ namespace Handbrake this.check_tooltip.AutoSize = true;
this.check_tooltip.BackColor = System.Drawing.Color.Transparent;
this.check_tooltip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_tooltip.Location = new System.Drawing.Point(114, 41);
+ this.check_tooltip.Location = new System.Drawing.Point(114, 67);
this.check_tooltip.Name = "check_tooltip";
this.check_tooltip.Size = new System.Drawing.Size(135, 17);
this.check_tooltip.TabIndex = 70;
@@ -335,7 +334,7 @@ namespace Handbrake this.check_userDefaultSettings.AutoSize = true;
this.check_userDefaultSettings.BackColor = System.Drawing.Color.Transparent;
this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_userDefaultSettings.Location = new System.Drawing.Point(114, 64);
+ this.check_userDefaultSettings.Location = new System.Drawing.Point(114, 90);
this.check_userDefaultSettings.Name = "check_userDefaultSettings";
this.check_userDefaultSettings.Size = new System.Drawing.Size(158, 17);
this.check_userDefaultSettings.TabIndex = 69;
@@ -359,7 +358,7 @@ namespace Handbrake //
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label2.Location = new System.Drawing.Point(12, 103);
+ this.label2.Location = new System.Drawing.Point(12, 129);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(84, 13);
this.label2.TabIndex = 54;
@@ -372,7 +371,7 @@ namespace Handbrake this.tab_picture.Controls.Add(this.label29);
this.tab_picture.Location = new System.Drawing.Point(4, 22);
this.tab_picture.Name = "tab_picture";
- this.tab_picture.Size = new System.Drawing.Size(489, 295);
+ this.tab_picture.Size = new System.Drawing.Size(489, 302);
this.tab_picture.TabIndex = 5;
this.tab_picture.Text = "Picture";
this.tab_picture.UseVisualStyleBackColor = true;
@@ -430,7 +429,7 @@ namespace Handbrake this.tab_cli.Controls.Add(this.Label4);
this.tab_cli.Location = new System.Drawing.Point(4, 22);
this.tab_cli.Name = "tab_cli";
- this.tab_cli.Size = new System.Drawing.Size(489, 295);
+ this.tab_cli.Size = new System.Drawing.Size(489, 302);
this.tab_cli.TabIndex = 2;
this.tab_cli.Text = "CLI";
this.tab_cli.UseVisualStyleBackColor = true;
@@ -644,9 +643,6 @@ namespace Handbrake //
// tab_advanced
//
- this.tab_advanced.Controls.Add(this.drop_updateCheckDays);
- this.tab_advanced.Controls.Add(this.label31);
- this.tab_advanced.Controls.Add(this.label15);
this.tab_advanced.Controls.Add(this.check_trayStatusAlerts);
this.tab_advanced.Controls.Add(this.check_inGuiStatus);
this.tab_advanced.Controls.Add(this.check_disablePresetNotification);
@@ -662,30 +658,11 @@ namespace Handbrake this.tab_advanced.Location = new System.Drawing.Point(4, 22);
this.tab_advanced.Name = "tab_advanced";
this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);
- this.tab_advanced.Size = new System.Drawing.Size(489, 295);
+ this.tab_advanced.Size = new System.Drawing.Size(489, 302);
this.tab_advanced.TabIndex = 4;
this.tab_advanced.Text = "Advanced / Other";
this.tab_advanced.UseVisualStyleBackColor = true;
//
- // label31
- //
- this.label31.AutoSize = true;
- this.label31.Location = new System.Drawing.Point(73, 168);
- this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(241, 13);
- this.label31.TabIndex = 96;
- this.label31.Text = "Number of days between update checks:";
- //
- // label15
- //
- this.label15.AutoSize = true;
- this.label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label15.Location = new System.Drawing.Point(6, 168);
- this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(64, 13);
- this.label15.TabIndex = 95;
- this.label15.Text = "Updates:";
- //
// check_trayStatusAlerts
//
this.check_trayStatusAlerts.AutoSize = true;
@@ -736,7 +713,7 @@ namespace Handbrake this.check_dvdnav.AutoSize = true;
this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;
this.check_dvdnav.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_dvdnav.Location = new System.Drawing.Point(76, 247);
+ this.check_dvdnav.Location = new System.Drawing.Point(76, 212);
this.check_dvdnav.Name = "check_dvdnav";
this.check_dvdnav.Size = new System.Drawing.Size(297, 17);
this.check_dvdnav.TabIndex = 90;
@@ -748,7 +725,7 @@ namespace Handbrake //
this.label32.AutoSize = true;
this.label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label32.Location = new System.Drawing.Point(34, 248);
+ this.label32.Location = new System.Drawing.Point(34, 213);
this.label32.Name = "label32";
this.label32.Size = new System.Drawing.Size(36, 13);
this.label32.TabIndex = 89;
@@ -757,7 +734,7 @@ namespace Handbrake // label30
//
this.label30.AutoSize = true;
- this.label30.Location = new System.Drawing.Point(73, 205);
+ this.label30.Location = new System.Drawing.Point(73, 170);
this.label30.Name = "label30";
this.label30.Size = new System.Drawing.Size(230, 13);
this.label30.TabIndex = 87;
@@ -773,7 +750,7 @@ namespace Handbrake "0.50",
"0.25",
"0.20"});
- this.drop_x264step.Location = new System.Drawing.Point(323, 202);
+ this.drop_x264step.Location = new System.Drawing.Point(323, 167);
this.drop_x264step.Name = "drop_x264step";
this.drop_x264step.Size = new System.Drawing.Size(85, 21);
this.drop_x264step.TabIndex = 86;
@@ -785,7 +762,7 @@ namespace Handbrake //
this.label28.AutoSize = true;
this.label28.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label28.Location = new System.Drawing.Point(27, 205);
+ this.label28.Location = new System.Drawing.Point(27, 170);
this.label28.Name = "label28";
this.label28.Size = new System.Drawing.Size(43, 13);
this.label28.TabIndex = 85;
@@ -1210,7 +1187,7 @@ namespace Handbrake "Daily",
"Weekly",
"Monthly"});
- this.drop_updateCheckDays.Location = new System.Drawing.Point(323, 165);
+ this.drop_updateCheckDays.Location = new System.Drawing.Point(134, 40);
this.drop_updateCheckDays.Name = "drop_updateCheckDays";
this.drop_updateCheckDays.Size = new System.Drawing.Size(85, 21);
this.drop_updateCheckDays.TabIndex = 97;
@@ -1220,7 +1197,7 @@ namespace Handbrake //
// frmOptions
//
- this.ClientSize = new System.Drawing.Size(521, 413);
+ this.ClientSize = new System.Drawing.Size(521, 418);
this.Controls.Add(this.label8);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.tab_options);
@@ -1332,8 +1309,6 @@ namespace Handbrake internal System.Windows.Forms.CheckBox check_disablePresetNotification;
internal System.Windows.Forms.CheckBox check_inGuiStatus;
internal System.Windows.Forms.CheckBox check_trayStatusAlerts;
- private System.Windows.Forms.Label label15;
- private System.Windows.Forms.Label label31;
private System.Windows.Forms.Button btn_viewLogs;
private System.Windows.Forms.Button btn_clearLogs;
internal System.Windows.Forms.CheckBox check_m4v;
|