diff options
| author | sr55 <[email protected]> | 2008-12-16 18:01:48 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-12-16 18:01:48 +0000 |
| commit | 89b5566c50b3f19c760351845a85c3efa4afe10f (patch) | |
| tree | a53adf8349e8da34b95f2c61c90d1f9c09b67195 /win/C#/Properties | |
| parent | c26a35a7b7a5839946123c9670aac337c8bcf518 (diff) | |
WinGui:
- Preview Generator Window. Can generate previews form 5 to 60 seconds long. Will launch VLC (from a user specified (in options) install path) to play back the clip.
Note: Clip duration is currently waiting for a patch to the CLI, so this part won't work yet.
- Experimental in-gui VLC media player via ActiveX. (This causes a Blue Screen of Death (See comments in code), however if anyone can fix this and submit a patch, id be grateful) Alternative suggestions welcome!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2036 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 | 12 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.settings | 3 |
4 files changed, 35 insertions, 0 deletions
diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs index 0a9c4b7c4..d347dc47b 100644 --- a/win/C#/Properties/Resources.Designer.cs +++ b/win/C#/Properties/Resources.Designer.cs @@ -179,6 +179,13 @@ namespace Handbrake.Properties { }
}
+ internal static System.Drawing.Bitmap picture {
+ get {
+ object obj = ResourceManager.GetObject("picture", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap Play {
get {
object obj = ResourceManager.GetObject("Play", resourceCulture);
@@ -227,5 +234,12 @@ namespace Handbrake.Properties { return ((System.Drawing.Bitmap)(obj));
}
}
+
+ internal static System.Drawing.Bitmap window {
+ get {
+ object obj = ResourceManager.GetObject("window", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx index 7fa9934d3..db3ecbe0e 100644 --- a/win/C#/Properties/Resources.resx +++ b/win/C#/Properties/Resources.resx @@ -190,4 +190,10 @@ <data name="copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="window" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\window.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="picture" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\picture.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 c8f9f66a3..a488f9ffc 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -298,5 +298,17 @@ namespace Handbrake.Properties { this["saveLogWithVideo"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("T:\\\\Program Files\\\\VideoLAN\\\\vlc\\\\vlc.exe")]
+ public string VLC_Path {
+ get {
+ return ((string)(this["VLC_Path"]));
+ }
+ set {
+ this["VLC_Path"] = value;
+ }
+ }
}
}
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 8d4af320a..179177f14 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -71,5 +71,8 @@ <Setting Name="saveLogWithVideo" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
+ <Setting Name="VLC_Path" Type="System.String" Scope="User">
+ <Value Profile="(Default)">T:\\Program Files\\VideoLAN\\vlc\\vlc.exe</Value>
+ </Setting>
</Settings>
</SettingsFile>
\ No newline at end of file |