From 840cb1e3448867a3d56bafc980dce39189d4814f Mon Sep 17 00:00:00 2001 From: sr55 Date: Thu, 26 Dec 2013 17:02:32 +0000 Subject: [PATCH] WinGui: Some more minor tweaks to the new source menu and tidyup on the options screen. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5941 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Model/VideoScaler.cs | 2 +- .../AttachedProperties/DriveMenu.cs | 142 ----------------- .../Controls/SourceSelection.xaml | 18 +-- win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 1 - .../Properties/Resources.Designer.cs | 12 +- win/CS/HandBrakeWPF/Properties/Resources.resx | 9 +- .../HandBrakeWPF/ViewModels/MainViewModel.cs | 148 ++---------------- .../ViewModels/OptionsViewModel.cs | 27 ++++ win/CS/HandBrakeWPF/Views/MainView.xaml | 47 +----- win/CS/HandBrakeWPF/Views/OptionsView.xaml | 5 +- 10 files changed, 57 insertions(+), 354 deletions(-) delete mode 100644 win/CS/HandBrakeWPF/AttachedProperties/DriveMenu.cs diff --git a/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs b/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs index 9772494cf..ded9f06bd 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs @@ -16,7 +16,7 @@ namespace HandBrake.ApplicationServices.Model /// public enum VideoScaler { - [Display(Name = "Lanczos")] + [Display(Name = "Lanczos (default)")] Lanczos = 0, // [Display(Name = "Bicubic")] diff --git a/win/CS/HandBrakeWPF/AttachedProperties/DriveMenu.cs b/win/CS/HandBrakeWPF/AttachedProperties/DriveMenu.cs deleted file mode 100644 index ffe8fe634..000000000 --- a/win/CS/HandBrakeWPF/AttachedProperties/DriveMenu.cs +++ /dev/null @@ -1,142 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// -// -// The drive menu. -// -// -------------------------------------------------------------------------------------------------------------------- - -namespace HandBrakeWPF.AttachedProperties -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Windows; - using System.Windows.Controls; - - using HandBrake.ApplicationServices.Exceptions; - using HandBrake.ApplicationServices.Utilities; - - using HandBrakeWPF.Commands; - using HandBrakeWPF.Model; - using HandBrakeWPF.ViewModels; - - /// - /// The drive menu. - /// - public class DriveMenu - { - /// - /// The show available drives property. - /// - public static readonly DependencyProperty ShowAvailableDrivesProperty = DependencyProperty.RegisterAttached( - "ShowAvailableDrives", - typeof(bool), - typeof(DriveMenu), - new PropertyMetadata(false, OnShowAvailableDrivesChanged)); - - /// - /// The get show available drives. - /// - /// - /// The element. - /// - /// - /// The . - /// - public static Boolean GetShowAvailableDrives(MenuItem element) - { - bool result; - return bool.TryParse(element.GetValue(ShowAvailableDrivesProperty).ToString(), out result) && result; - } - - /// - /// The set show available drives. - /// - /// - /// The element. - /// - /// - /// The value. - /// - public static void SetShowAvailableDrives(MenuItem element, Boolean value) - { - element.SetValue(ShowAvailableDrivesProperty, value); - } - - /// - /// The on show available drives changed. - /// - /// - /// The d. - /// - /// - /// The e. - /// - private static void OnShowAvailableDrivesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) - { - MenuItem menu = d as MenuItem; - if (menu != null) - { - menu.SubmenuOpened -= MenuMouseDown; - menu.SubmenuOpened += MenuMouseDown; - } - } - - /// - /// The menu_ mouse down. - /// - /// - /// The sender. - /// - /// - /// The e. - /// - private static void MenuMouseDown(object sender, RoutedEventArgs e) - { - MenuItem menu = sender as MenuItem; - MenuItem childMenuItem = e.OriginalSource as MenuItem; - if (childMenuItem != null && "Title Specific Scan".Equals(childMenuItem.Header)) - { - return; // Skip, it's just a child menu. - } - - if (menu != null) - { - MainViewModel mvm = menu.DataContext as MainViewModel; - if (mvm != null) - { - List remove = mvm.SourceMenu.Where(s => s.IsDrive).ToList(); - foreach (var item in remove) - { - mvm.SourceMenu.Remove(item); - } - - foreach (SourceMenuItem menuItem in from item in GeneralUtilities.GetDrives() - let driveInformation = item - select new SourceMenuItem - { - Text = string.Format("{0} ({1})", item.RootDirectory, item.VolumeLabel), - Command = new SourceMenuCommand(() => mvm.ProcessDrive(driveInformation)), - Tag = item, - IsDrive = true - }) - { - mvm.SourceMenu.Add(menuItem); - } - } - else - { - throw new GeneralApplicationException( - "DEBUG - Datacontext wasn't set!", "Please report this on the forum.", null); - } - } - else - { - throw new GeneralApplicationException( - "DEBUG - Source Menu wasn't set!", "Please report this on the forum.", null); - } - } - } -} diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml index 437cb1c73..7385f9102 100644 --- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml +++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml @@ -16,27 +16,29 @@ - + - + + Minimum="0" Maximum="1000" Number="{Binding TitleSpecificScan, Mode=TwoWay}" /> - + + + - - - - - - - - - - - - - - - - - - - - - +