diff options
| author | sr55 <[email protected]> | 2008-07-07 22:05:18 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-07-07 22:05:18 +0000 |
| commit | e102ca7f6cfd706c1f153b2ea7ec6b2f58ba1720 (patch) | |
| tree | e6dd8fe4edfb45853a3f6910b676a1a5207eaf74 /win/C#/Properties | |
| parent | b87f5a6f8535c6fd6d86fa90079eb9185a457620 (diff) | |
WinGui:
- Version information now pulled from the CLI (any problems with this breaking on Vista let me know plz!)
- GUI startup optimized to counter the effect of the slightly sluggish version check from CLI (above)
- Added "Format" box just like the macgui. Move the Video Codec dropdown to the correct position on the video tab.
- Few other changes to mimic the macgui.
- Changed Functions.CLI to Functions.Encode
- Cleaned up and added icons to the source menu.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1558 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/Properties')
| -rw-r--r-- | win/C#/Properties/Resources.Designer.cs | 14 | ||||
| -rw-r--r-- | win/C#/Properties/Resources.resx | 6 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.Designer.cs | 4 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.settings | 4 |
4 files changed, 24 insertions, 4 deletions
diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs index ff3fd0b26..60a12a5c2 100644 --- a/win/C#/Properties/Resources.Designer.cs +++ b/win/C#/Properties/Resources.Designer.cs @@ -67,6 +67,13 @@ namespace Handbrake.Properties { }
}
+ internal static System.Drawing.Bitmap ActivityWindow_small {
+ get {
+ object obj = ResourceManager.GetObject("ActivityWindow_small", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap AddToQueue {
get {
object obj = ResourceManager.GetObject("AddToQueue", resourceCulture);
@@ -88,6 +95,13 @@ namespace Handbrake.Properties { }
}
+ internal static System.Drawing.Bitmap disc_small {
+ get {
+ object obj = ResourceManager.GetObject("disc_small", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap Emoticon {
get {
object obj = ResourceManager.GetObject("Emoticon", resourceCulture);
diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx index 081c86c1e..7f07815fc 100644 --- a/win/C#/Properties/Resources.resx +++ b/win/C#/Properties/Resources.resx @@ -181,4 +181,10 @@ <data name="AddToQueue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\AddToQueue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="disc_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\disc_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="ActivityWindow_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\activitywindow_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 2b5849b42..0e4f389aa 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -73,7 +73,7 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("SVN1544")]
+ [global::System.Configuration.DefaultSettingValueAttribute("{hb_version}")]
public string hb_version {
get {
return ((string)(this["hb_version"]));
@@ -121,7 +121,7 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("2008053100")]
+ [global::System.Configuration.DefaultSettingValueAttribute("0")]
public int hb_build {
get {
return ((int)(this["hb_build"]));
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 21ce3ceed..ccaf53b1f 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -15,7 +15,7 @@ <Value Profile="(Default)">Checked</Value>
</Setting>
<Setting Name="hb_version" Type="System.String" Scope="User">
- <Value Profile="(Default)">SVN1544</Value>
+ <Value Profile="(Default)">{hb_version}</Value>
</Setting>
<Setting Name="tooltipEnable" Type="System.String" Scope="User">
<Value Profile="(Default)">Checked</Value>
@@ -27,7 +27,7 @@ <Value Profile="(Default)">Checked</Value>
</Setting>
<Setting Name="hb_build" Type="System.Int32" Scope="User">
- <Value Profile="(Default)">2008053100</Value>
+ <Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="skipversion" Type="System.Int32" Scope="User">
<Value Profile="(Default)">0</Value>
|