diff options
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
18 files changed, 54 insertions, 152 deletions
diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml index 7316ab49a..ce52f61a5 100644 --- a/win/CS/HandBrakeWPF/Views/AboutView.xaml +++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml @@ -1,6 +1,6 @@ <Window x:Class="HandBrakeWPF.Views.AboutView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:PresentationFramework="clr-namespace:Caliburn.PresentationFramework;assembly=Caliburn.PresentationFramework" xmlns:RoutedMessaging="clr-namespace:Caliburn.PresentationFramework.RoutedMessaging;assembly=Caliburn.PresentationFramework" Title="AboutView" Height="268" Width="511">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" Title="AboutView" Height="268" Width="511">
<StackPanel Orientation="Horizontal">
<Image Source="Images/logo64.png" Width="64" Height="64" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />
@@ -18,7 +18,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</TextBox>
- <Button Content="OK" RoutedMessaging:Message.Attach="[Event Click] = [Action Close]"
+ <Button Content="OK" Micro:Message.Attach="[Event Click] = [Action Close]"
HorizontalAlignment="Right" Padding="10,2" Margin="0,0,10,10" />
</StackPanel>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml index 3adb82821..9b2010852 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="HandBrakeWPF.Views.AdvancedView"
+<UserControl x:Class="HandBrakeWPF.Views.Controls.AdvancedView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs index b7ad6ef86..247100750 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs @@ -1,19 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace HandBrakeWPF.Views
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows.Controls;
+
/// <summary>
/// Interaction logic for AdvancedView.xaml
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml index 6087c7d07..0ec8c866c 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="HandBrakeWPF.Views.AudioView"
+<UserControl x:Class="HandBrakeWPF.Views.Controls.AudioView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs index 3518eea56..ad4bb96c8 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs @@ -1,19 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace HandBrakeWPF.Views
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows.Controls;
+
/// <summary>
/// Interaction logic for AudioView.xaml
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml index ac39a7062..982142385 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="HandBrakeWPF.Views.ChaptersView"
+<UserControl x:Class="HandBrakeWPF.Views.Controls.ChaptersView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs index f61b201c9..4bb0e2d1f 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs @@ -1,19 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace HandBrakeWPF.Views
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows.Controls;
+
/// <summary>
/// Interaction logic for ChaptersView.xaml
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml index 6ac8f5a10..7729dc553 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="HandBrakeWPF.Views.FiltersView"
+<UserControl x:Class="HandBrakeWPF.Views.Controls.FiltersView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs index 27f38be95..a8b26716a 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs @@ -1,19 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace HandBrakeWPF.Views
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows.Controls;
+
/// <summary>
/// Interaction logic for VideoFilters.xaml
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml index 80b82c52f..f39f61528 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"
+<UserControl x:Class="HandBrakeWPF.Views.Controls.PictureSettingsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs index 9401168dc..c86e0f8e0 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs @@ -1,19 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace HandBrakeWPF.Views
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows.Controls;
+
/// <summary>
/// Interaction logic for PictureSettingsView.xaml
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml index 694dcd8df..86d19f5ff 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="HandBrakeWPF.Views.QueryEditorView"
+<UserControl x:Class="HandBrakeWPF.Views.Controls.QueryEditorView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs index d67b7eb5c..6b1735815 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs @@ -1,19 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace HandBrakeWPF.Views
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows.Controls;
+
/// <summary>
/// Interaction logic for QueryEditorView.xaml
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml index 4594f62b5..842807931 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="HandBrakeWPF.Views.SubtitlesView"
+<UserControl x:Class="HandBrakeWPF.Views.Controls.SubtitlesView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs index 589462c40..539ae5793 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs @@ -1,19 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace HandBrakeWPF.Views
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows.Controls;
+
/// <summary>
/// Interaction logic for SubtitlesView.xaml
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml index 72ab1f67c..d1b22c15b 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="HandBrakeWPF.Views.VideoView"
+<UserControl x:Class="HandBrakeWPF.Views.Controls.VideoView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs index f59435f02..12f96979d 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs @@ -1,19 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace HandBrakeWPF.Views
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows.Controls;
+
/// <summary>
/// Interaction logic for VideoView.xaml
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index 496afc4ee..999f73c84 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -1,9 +1,7 @@ <Window x:Class="HandBrakeWPF.Views.MainView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:Views="clr-namespace:HandBrakeWPF.Views"
- xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"
- xmlns:RoutedMessaging="clr-namespace:Caliburn.PresentationFramework.RoutedMessaging;assembly=Caliburn.PresentationFramework"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"
+ xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" xmlns:Controls="clr-namespace:HandBrakeWPF.Views.Controls"
Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11">
<Grid>
@@ -14,30 +12,30 @@ <Menu Height="23" VerticalAlignment="Top" HorizontalAlignment="Stretch">
<MenuItem Header="File">
<MenuItem Header="Cancel Scan" />
- <MenuItem Header="Exit" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Exit" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
</MenuItem>
<MenuItem Header="Tools">
- <MenuItem Header="Show Queue" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
- <MenuItem Header="Activity Window" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
</MenuItem>
<MenuItem Header="Presets">
- <MenuItem Header="Reset Built-in Presets" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
- <MenuItem Header="Delete Built-in Presets" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Delete Built-in Presets" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
<Separator />
- <MenuItem Header="Save As New Preset" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
- <MenuItem Header="Import" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
- <MenuItem Header="Export" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
- <MenuItem Header="Set as Default" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Save As New Preset" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Set as Default" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
</MenuItem>
<MenuItem Header="Help">
- <MenuItem Header="HandBrake User Guide" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="HandBrake User Guide" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
<Separator />
- <MenuItem Header="Check for Updates" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="Check for Updates" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
<Separator />
- <MenuItem Header="About..." RoutedMessaging:Message.Attach="[Event Click] = [Action AboutApplication]" />
+ <MenuItem Header="About..." Micro:Message.Attach="[Event Click] = [Action AboutApplication]" />
</MenuItem>
</Menu>
@@ -144,22 +142,22 @@ <!-- Tab Control -->
<TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="330" Margin="10,10,10,10" Name="tabControl" >
<TabItem Header="Picture" Name="pictureTab">
- <Views:PictureSettingsView x:Name="pictureSettingsView"></Views:PictureSettingsView>
+ <Controls:PictureSettingsView x:Name="pictureSettingsView"></Controls:PictureSettingsView>
</TabItem>
<TabItem Header="Video Filters" Name="filtersTab">
- <Views:FiltersView></Views:FiltersView>
+ <Controls:FiltersView></Controls:FiltersView>
</TabItem>
<TabItem Header="Video" Name="videoTab">
- <Views:VideoView></Views:VideoView>
+ <Controls:VideoView></Controls:VideoView>
</TabItem>
<TabItem Header="Audio" Name="audioTab">
- <Views:AudioView></Views:AudioView>
+ <Controls:AudioView></Controls:AudioView>
</TabItem>
<TabItem Header="Chapters" Name="chaptersTab">
- <Views:ChaptersView></Views:ChaptersView>
+ <Controls:ChaptersView></Controls:ChaptersView>
</TabItem>
<TabItem Header="Advanced" Name="advancedTab">
- <Views:AdvancedView></Views:AdvancedView>
+ <Controls:AdvancedView></Controls:AdvancedView>
</TabItem>
</TabControl>
|