summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices
diff options
context:
space:
mode:
authorsr55 <[email protected]>2012-02-18 22:09:26 +0000
committersr55 <[email protected]>2012-02-18 22:09:26 +0000
commit68395c181bbf629c33607829aa971cf12c19c29d (patch)
tree6fae1b33a36a3a16ac70ce11b33de868fd152597 /win/CS/HandBrake.ApplicationServices
parentbe861eb1e625b3e903d76bf60cdfb4bae8f8b1df (diff)
WinGui: (WPF) General work hooking up various aspects of the new WPF UI, bug fixes and improvements.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4456 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs9
-rw-r--r--win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs9
2 files changed, 14 insertions, 4 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs
index e4105565e..00eac35f0 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs
@@ -5,14 +5,23 @@
namespace HandBrake.ApplicationServices.Model.Encoding
{
+ using System.ComponentModel.DataAnnotations;
+
/// <summary>
/// Point to Point Mode
/// </summary>
public enum PointToPointMode
{
+ [Display(Name = "Chapters")]
Chapters = 0,
+
+ [Display(Name = "Seconds")]
Seconds,
+
+ [Display(Name = "Frames")]
Frames,
+
+ [Display(Name = "Preview")]
Preview,
}
}
diff --git a/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs b/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs
index a932feee5..02ed05a9d 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs
@@ -18,6 +18,10 @@ namespace HandBrake.ApplicationServices.Services
/// </summary>
public class UpdateService
{
+ /*
+ * TODO: Refactor this to use Caliburn Invocation
+ */
+
/// <summary>
/// Begins checking for an update to HandBrake.
/// </summary>
@@ -36,10 +40,7 @@ namespace HandBrake.ApplicationServices.Services
/// <param name="skipBuild">
/// The skip Build.
/// </param>
- /// <param name="currentVersion">
- /// The current Version.
- /// </param>
- public static void BeginCheckForUpdates(AsyncCallback callback, bool debug, string url, int currentBuild, int skipBuild, string currentVersion)
+ public static void BeginCheckForUpdates(AsyncCallback callback, bool debug, string url, int currentBuild, int skipBuild)
{
ThreadPool.QueueUserWorkItem(delegate
{