]> granicus.if.org Git - handbrake/commitdiff
WinGui: Remove the experimental embedded queue. It's not been working right for a...
authorsr55 <sr55.hb@outlook.com>
Sun, 14 Jul 2019 20:57:32 +0000 (21:57 +0100)
committersr55 <sr55.hb@outlook.com>
Sun, 14 Jul 2019 20:57:49 +0000 (21:57 +0100)
12 files changed:
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
win/CS/HandBrakeWPF/Properties/Resources.resx
win/CS/HandBrakeWPF/UserSettingConstants.cs
win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueViewModel.cs
win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
win/CS/HandBrakeWPF/Views/OptionsView.xaml
win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml [deleted file]
win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml.cs [deleted file]
win/CS/HandBrakeWPF/defaultsettings.xml

index 00a853bef526db69204063492f962d1fb6b3c0a1..e612bb8e4b2d6f156b7c488de9fc6ae189ffeed8 100644 (file)
     <Compile Include="Views\MiniView.xaml.cs">\r
       <DependentUpon>MiniView.xaml</DependentUpon>\r
     </Compile>\r
-    <Compile Include="Views\Queue\Embedded.xaml.cs">\r
-      <DependentUpon>Embedded.xaml</DependentUpon>\r
-    </Compile>\r
     <Compile Include="Views\ShellView.xaml.cs">\r
       <DependentUpon>ShellView.xaml</DependentUpon>\r
     </Compile>\r
       <Generator>MSBuild:Compile</Generator>\r
       <SubType>Designer</SubType>\r
     </Page>\r
-    <Page Include="Views\Queue\Embedded.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
     <Page Include="Views\ShellView.xaml">\r
       <SubType>Designer</SubType>\r
       <Generator>MSBuild:Compile</Generator>\r
index 9ad37148db0e9165e6bce2886b8b861515478cc4..38f971306ee66e76dbfcf28e40deb0cd6f472fb6 100644 (file)
@@ -2976,15 +2976,6 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Show Queue in line with the main UI. (Experimental Feature).
-        /// </summary>
-        public static string Options_ShowQueueInline {
-            get {
-                return ResourceManager.GetString("Options_ShowQueueInline", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Show &apos;Add All to Queue&apos; on the toolbar.
         /// </summary>
index e707d01e7bc31d6f2121156ffb3ec2f6b15c6547..01f9b9c538bdab903d1197f7acf14f219e7a5d34 100644 (file)
@@ -1300,9 +1300,6 @@ Would you like to overwrite it?</value>
   <data name="Options_ShowExperimentalQueueDesign" xml:space="preserve">\r
     <value>Show the new experimental queue design.</value>\r
   </data>\r
-  <data name="Options_ShowQueueInline" xml:space="preserve">\r
-    <value>Show Queue in line with the main UI. (Experimental Feature)</value>\r
-  </data>\r
   <data name="Options_TitleCase" xml:space="preserve">\r
     <value>Change case to Title Case</value>\r
   </data>\r
index c5c9d5ad78598751a0d2a1fd5d8b9aef0fdb0eec..c591443b50b351ef0db33fa175f13371a173f05b 100644 (file)
@@ -53,7 +53,6 @@ namespace HandBrakeWPF
         public const string SaveLogWithVideo = "SaveLogWithVideo";\r
         public const string SaveLogCopyDirectory = "SaveLogCopyDirectory";\r
         public const string ClearCompletedFromQueue = "ClearCompletedFromQueue";\r
-        public const string ShowQueueInline = "ShowQueueInline";\r
         public const string ForcePresetReset = "ForcePresetReset";\r
         public const string PresetExpandedStateList = "PresetExpandedStateList";\r
         public const string ShowStatusInTitleBar = "ShowStatusInTitleBar";\r
index 0ee439e816525de9480fe6bf969173e85135f90a..d01353376f14a1b997053065384365b2496227d7 100644 (file)
@@ -16,8 +16,6 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     /// </summary>\r
     public interface IQueueViewModel\r
     {\r
-        bool IsInline { set; }\r
-\r
         /// <summary>\r
         /// The when done action after a queue completes.\r
         /// </summary>\r
index 731a2e0903422b90fedfb107710ae4381c15e061..8fc0dde5986e465be0168464f3df6c4c471bc007 100644 (file)
@@ -1265,41 +1265,22 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void OpenQueueWindow()\r
         {\r
-            bool showQueueInline = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowQueueInline) && VersionHelper.IsNightly();\r
-            this.QueueViewModel.IsInline = showQueueInline;\r
+            this.IsQueueShowingInLine = false;\r
+            this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);\r
 \r
-            if (showQueueInline)\r
+            Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueView));\r
+            if (window != null)\r
             {\r
-                this.IsQueueShowingInLine = !this.IsQueueShowingInLine;\r
-                if (this.IsQueueShowingInLine)\r
-                {\r
-                    this.QueueViewModel.Activate();\r
-                }\r
-                else\r
+                if (window.WindowState == WindowState.Minimized)\r
                 {\r
-                    this.QueueViewModel.Deactivate();\r
+                    window.WindowState = WindowState.Normal;\r
                 }\r
-                this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);\r
+\r
+                window.Activate();\r
             }\r
             else\r
             {\r
-                this.IsQueueShowingInLine = false;\r
-                this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);\r
-\r
-                Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueView));\r
-                if (window != null)\r
-                {\r
-                    if (window.WindowState == WindowState.Minimized)\r
-                    {\r
-                        window.WindowState = WindowState.Normal;\r
-                    }\r
-\r
-                    window.Activate();\r
-                }\r
-                else\r
-                {\r
-                    this.windowManager.ShowWindow(IoC.Get<IQueueViewModel>());\r
-                }\r
+                this.windowManager.ShowWindow(IoC.Get<IQueueViewModel>());\r
             }\r
         }\r
 \r
index b8d9b89f23b2f9fa9dbf03808bf851a24e71abee..4d44d192e3c181cb8420f57593db9a813b9d6e7f 100644 (file)
@@ -91,7 +91,6 @@ namespace HandBrakeWPF.ViewModels
         private bool removePunctuation;\r
         private bool resetWhenDoneAction;\r
         private bool enableQuickSyncDecoding;\r
-        private bool showQueueInline;\r
         private bool pauseOnLowDiskspace;\r
         private long pauseOnLowDiskspaceLevel;\r
         private bool useQsvDecodeForNonQsvEnc;\r
@@ -387,26 +386,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether show queue inline.\r
-        /// </summary>\r
-        public bool ShowQueueInline\r
-        {\r
-            get\r
-            {\r
-                return this.showQueueInline;\r
-            }\r
-            set\r
-            {\r
-                if (value == this.showQueueInline)\r
-                {\r
-                    return;\r
-                }\r
-                this.showQueueInline = value;\r
-                this.NotifyOfPropertyChange(() => this.ShowQueueInline);\r
-            }\r
-        }\r
-\r
         /// <summary>\r
         /// Gets or sets a value indicating whether to show encode status in the tile bar.\r
         /// </summary>\r
@@ -1470,7 +1449,6 @@ namespace HandBrakeWPF.ViewModels
                 this.CheckForUpdatesFrequency = 1;\r
             }\r
 \r
-            this.ShowQueueInline = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowQueueInline);\r
             this.ShowStatusInTitleBar = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowStatusInTitleBar);\r
             this.ShowPreviewOnSummaryTab = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowPreviewOnSummaryTab);\r
             this.ShowAddAllToQueue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAddAllToQueue);\r
@@ -1683,9 +1661,6 @@ namespace HandBrakeWPF.ViewModels
             this.userSettingService.SetUserSetting(UserSettingConstants.ShowAddAllToQueue, this.ShowAddAllToQueue);\r
             this.userSettingService.SetUserSetting(UserSettingConstants.ShowAddSelectionToQueue, this.ShowAddSelectionToQueue);\r
 \r
-            /* Experiments */\r
-            this.userSettingService.SetUserSetting(UserSettingConstants.ShowQueueInline, this.ShowQueueInline);\r
-\r
             /* When Done */\r
             this.userSettingService.SetUserSetting(UserSettingConstants.WhenCompleteAction, (int)this.WhenDone);\r
             this.userSettingService.SetUserSetting(UserSettingConstants.ResetWhenDoneAction, this.ResetWhenDoneAction);\r
index f82ec962144d7731c2891c06668192f24da83aa1..0cb68435e597d29d0744c2c699cd749776d5cb20 100644 (file)
@@ -248,8 +248,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        public bool IsInline { get; set; }\r
-\r
         public bool StatsVisible\r
         {\r
             get\r
index ce1db7a3bc635092dd25a5a78be7b00781b70a0a..3069acccb0a859438038e9acb1464d783c88d700 100644 (file)
                             <CheckBox Content="{x:Static Properties:Resources.Options_ClearCompleted}" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />\r
                             <CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowStatusInTitleBar}" IsChecked="{Binding ShowStatusInTitleBar}" />\r
                             <CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowPreviewOnSummaryTab}" IsChecked="{Binding ShowPreviewOnSummaryTab}" />\r
-                            <CheckBox Content="{x:Static Properties:Resources.Options_ShowQueueInline}" IsChecked="{Binding ShowQueueInline}" />\r
                         </StackPanel>\r
 \r
 \r
diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
deleted file mode 100644 (file)
index 85c52e8..0000000
+++ /dev/null
@@ -1,284 +0,0 @@
-<UserControl x:Class="HandBrakeWPF.Views.Queue.Embedded"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:cal="http://www.caliburnproject.org"
-        xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
-        xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"
-        xmlns:video="clr-namespace:HandBrakeWPF.Converters.Video"
-        xmlns:commands="clr-namespace:HandBrakeWPF.Commands"
-        xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
-        xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
-        xmlns:queue="clr-namespace:HandBrakeWPF.Converters.Queue"
-        MinWidth="350"
-        MinHeight="250"
-        TextOptions.TextFormattingMode="Display"
-        mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
-        <Converters:FullPathToFileNameConverter x:Key="filePathToFilenameConverter" />
-        <Converters:EnumComboConverter x:Key="enumComboConverter" />
-        <Converters:QueueStatusToVisibilityConverter x:Key="queueStatusVisConverter" />
-        <Audio:AudioQueueDisplayConverter x:Key="audioTrackDisplayConverter" />
-        <Subtitles:SubtitlesQueueDisplayConverter x:Key="subtitleTrackDisplayConverter" />
-        <video:EncoderOptionsTooltipConverter x:Key="encoderOptionsTooltipConverter" />
-        <video:VideoOptionsTooltipConverter x:Key="videoOptionsTooltipConverter" />
-        <queue:PictureSettingsDescConveter x:Key="pictureSettingsDescConverter" />
-        <Converters:ThemeImageConverter x:Key="themeConverter" />
-
-        <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
-            <Setter Property="ToolTipService.ShowDuration" Value="10000" />
-        </Style>
-
-    </UserControl.Resources>
-
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <ListBox Grid.Row="2" Tag="{Binding}"
-                 Margin="10,5,0,1"
-                 dd:DragDrop.DropHandler="{Binding}"
-                 dd:DragDrop.IsDragSource="True"
-                 dd:DragDrop.IsDropTarget="True"
-                 ItemsSource="{Binding QueueTasks, Mode=OneWay}"
-                 helpers:ListBoxHelper.SelectedItems="{Binding SelectedItems}" 
-                 SelectionMode="Extended">
-
-            <i:Interaction.Triggers>
-                <commands:InputBindingTrigger>
-                    <commands:InputBindingTrigger.InputBinding>
-                        <KeyBinding Key="Delete"/>
-                    </commands:InputBindingTrigger.InputBinding>
-                    <cal:ActionMessage MethodName="RemoveSelectedJobs" />
-                </commands:InputBindingTrigger>
-            </i:Interaction.Triggers>
-
-            <ListBox.ContextMenu>
-                <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}">
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:Resources.QueueView_Start}" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:Resources.QueueView_Pause}" />
-                    <Separator />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />                 
-                    <Separator />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />
-                </ContextMenu>
-            </ListBox.ContextMenu>
-
-            <ListBox.ItemContainerStyle>
-                <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                    <Setter Property="Margin" Value="0,0,0,1" />
-                    <Setter Property="ToolTip">
-                        <Setter.Value>
-                            <Grid MaxWidth="650" Margin="0,5,0,5" Style="{StaticResource LongToolTipHolder}">
-                                <Grid.Resources>
-                                    <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
-                                        <Setter Property="Margin" Value="0,5,0,5" />
-                                    </Style>
-                                </Grid.Resources>
-
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="95" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
-                                <TextBlock Text="{Binding Task.Source}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
-
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
-                                <TextBlock Text="{Binding Task.Destination}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
-
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
-                                <TextBlock Text="{Binding Task, Converter={StaticResource pictureSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1"  />
-
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Video}" Grid.Row="3" Grid.Column="0" />
-                                <TextBlock Text="{Binding Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="3" Grid.Column="1" TextWrapping="Wrap"  />
-
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Audio}"  Grid.Row="4" Grid.Column="0"/>
-                                <TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"
-                                           Grid.Row="4" Grid.Column="1"/>
-
-                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_Subtitles}" Grid.Row="5" Grid.Column="0"  />
-                                <TextBlock Text="{Binding Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}"
-                                           Grid.Row="5" Grid.Column="1" />
-
-                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="{x:Static Properties:Resources.QueueView_Advanced}" />
-                                <TextBlock Text="{Binding Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap"  />
-                            </Grid>
-
-                        </Setter.Value>
-                    </Setter>
-          
-                </Style>
-            </ListBox.ItemContainerStyle>
-
-            <ListBox.ItemTemplate>
-                <DataTemplate x:Name="QueueItemTemplate">
-
-                    <Grid HorizontalAlignment="Stretch">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <!--  Marker  -->
-                        <Image Grid.Column="0"
-                               Width="16"
-                               Height="16"
-                               Margin="10,0,10,0">
-                            <Image.Style>
-                                <Style TargetType="{x:Type Image}">
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
-                                            <Setter Property="Source" Value="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Source.png'}" />
-                                        </DataTrigger>
-                                        <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="In Progress">
-                                            <Setter Property="Source" Value="..\Images\Working0.png" />
-                                        </DataTrigger>
-                                        <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Completed">
-                                            <Setter Property="Source" Value="..\Images\Complete.png" />
-                                        </DataTrigger>
-                                        <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error">
-                                            <Setter Property="Source" Value="..\Images\WarningSmall.png" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Image.Style>
-                        </Image>
-
-                        <!--  Settings  -->
-                        <StackPanel Grid.Column="1"
-                                    Margin="0,5,0,5"
-                                    HorizontalAlignment="Stretch">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock FontWeight="Bold" Text="Title: " />
-                                <TextBlock Text="{Binding Task.Title}" />
-
-                                <TextBlock Margin="10,0,0,0"
-                                           FontWeight="Bold"
-                                           Text="{Binding Task.PointToPointMode}" />
-                                <TextBlock Text=": " />
-                                <TextBlock Text="{Binding Task.StartPoint}" />
-                                <TextBlock Margin="5,0,5,0" Text="to" />
-                                <TextBlock Text="{Binding Task.EndPoint}" />
-                            </StackPanel>
-
-                            <!--  TODO Support Drive Label Name  -->
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" />
-                                <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}" />
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" />
-                                <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" />
-                            </StackPanel>
-                        </StackPanel>
-
-                        <!--  Delete  -->
-                        <Grid Grid.Column="2"
-                              Margin="10,0,10,0"
-                              VerticalAlignment="Center">
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <Button Visibility="{Binding Status, Converter={StaticResource queueStatusVisConverter}}"
-                                    Grid.Row="0" Grid.Column="0" Margin="0,5,0,0">
-                                <Button.Template>
-                                    <ControlTemplate>
-                                        <Image Width="20"  
-                                               Height="20" VerticalAlignment="Center"
-                                               Source="../Images/Refresh.ico"
-                                               ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
-                                        </Image>
-                                    </ControlTemplate>
-                                </Button.Template>
-                                <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="Click">
-                                        <cal:ActionMessage MethodName="RetryJob">
-                                            <cal:Parameter Value="{Binding}" />
-                                        </cal:ActionMessage>
-                                    </i:EventTrigger>
-                                </i:Interaction.Triggers>
-                            </Button>
-
-                            <Button Grid.Row="0" Grid.Column="1" Margin="10,5,0,0">
-                                <Button.Template>
-                                    <ControlTemplate>
-                                        <Image Width="20" 
-                                               Height="20" VerticalAlignment="Center"
-                                               Source="../Images/Options24.png"
-                                               ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}">
-                                        </Image>
-                                    </ControlTemplate>
-                                </Button.Template>
-                                <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="Click">
-                                        <cal:ActionMessage MethodName="EditJob">
-                                            <cal:Parameter Value="{Binding}" />
-                                        </cal:ActionMessage>
-                                    </i:EventTrigger>
-                                </i:Interaction.Triggers>
-                            </Button>
-
-                            <Button Grid.Row="0" Grid.Column="2" Margin="10,5,0,0">
-                                <Button.Template>
-                                    <ControlTemplate>
-                                        <Image Width="20" 
-                                               Height="20" VerticalAlignment="Center" 
-                                               Source="../Images/close64.png"
-                                               ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">
-                                        </Image>
-                                    </ControlTemplate>
-                                </Button.Template>
-                                <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="Click">
-                                        <cal:ActionMessage MethodName="RemoveJob">
-                                            <cal:Parameter Value="{Binding}" />
-                                        </cal:ActionMessage>
-                                    </i:EventTrigger>
-                                </i:Interaction.Triggers>
-                            </Button>
-
-
-                        </Grid>
-
-                    </Grid>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-
-
-    </Grid>
-</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml.cs b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml.cs
deleted file mode 100644 (file)
index 74109f7..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Embedded.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Interaction logic for Embedded.xaml
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Views.Queue
-{
-    using System.Windows.Controls;
-
-    /// <summary>
-    /// Interaction logic for VideoView
-    /// </summary>
-    public partial class Embedded : UserControl
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Embedded"/> class.
-        /// </summary>
-        public Embedded()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
index 08ef765575fae5162a129600b701a5f8bd99ea20..48918c95ec92dc0da7e157bcdb2a9d4df6d53f15 100644 (file)
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>\r
     </value>\r
   </item>\r
-  <item>\r
-    <key>\r
-      <string>ShowQueueInline</string>\r
-    </key>\r
-    <value>\r
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>\r
-    </value>\r
-  </item>\r
   <item>\r
     <key>\r
       <string>PauseOnLowDiskspace</string>\r