CDT-28: Delete profile functionality

Move CDTag.View namespace to CDTag.Views Add GetInputWindow
judwhite · Feb 26, 2012 · 82bdb25 · 82bdb25
1 parent 6a441b9
commit 82bdb25
Show file tree

Hide file tree

Showing 41 changed files with 301 additions and 82 deletions.
diff --git a/CDTag.Common/ApplicationServices/IDialogService.cs b/CDTag.Common/ApplicationServices/IDialogService.cs
@@ -1,6 +1,6 @@
 using System;
 using CDTag.Common.Wpf;
-using CDTag.View.Interfaces;
+using CDTag.Views.Interfaces;
 
 namespace CDTag.Common.ApplicationServices
 {

diff --git a/CDTag.Common/Events/MessageBoxEvent.cs b/CDTag.Common/Events/MessageBoxEvent.cs
@@ -1,5 +1,5 @@
 using System.Windows;
-using CDTag.View.Interfaces;
+using CDTag.Views.Interfaces;
 
 namespace CDTag.Common.Events
 {

diff --git a/CDTag.Common/MVVM/ViewModelBase.cs b/CDTag.Common/MVVM/ViewModelBase.cs
@@ -52,6 +52,9 @@ public abstract class ViewModelBase : IViewModelBase
         /// <summary>Path service.</summary>
         protected static readonly IPathService _pathService;
 
+        /// <summary>Dialog service.</summary>
+        protected static readonly IDialogService _dialogService;
+
         /// <summary>Occurs when a property value changes.</summary>
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -67,6 +70,7 @@ static ViewModelBase()
         {
             _dispatcher = IoC.Resolve<IDispatcher>();
             _pathService = IoC.Resolve<IPathService>();
+            _dialogService = IoC.Resolve<IDialogService>();
         }
 
         /// <summary>

diff --git a/CDTag.Model/Settings/SettingsFile.cs b/CDTag.Model/Settings/SettingsFile.cs
@@ -3,7 +3,6 @@
 using System.Text;
 using CDTag.Common.ApplicationServices;
 using CDTag.Common.Json;
-using CDTag.View;
 
 namespace CDTag.Common.Settings
 {

diff --git a/CDTag.View.Interfaces/About/IAboutWindow.cs b/CDTag.View.Interfaces/About/IAboutWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.About
+namespace CDTag.Views.Interfaces.About
 {
     /// <summary>
     /// IAboutWindow

diff --git a/CDTag.View.Interfaces/CDTag.View.Interfaces.csproj b/CDTag.View.Interfaces/CDTag.View.Interfaces.csproj
@@ -52,6 +52,7 @@
     <Compile Include="About\IAboutWindow.cs" />
     <Compile Include="Checksum\IChecksumWindow.cs" />
     <Compile Include="Checksum\IVerifyEACLogWindow.cs" />
+    <Compile Include="General\IGetInputWindow.cs" />
     <Compile Include="IWindow.cs" />
     <Compile Include="Options\IOptionsWindow.cs" />
     <Compile Include="Profile\EditProfile\IEditProfileWindow.cs" />

diff --git a/CDTag.View.Interfaces/Checksum/IChecksumWindow.cs b/CDTag.View.Interfaces/Checksum/IChecksumWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Checksum
+namespace CDTag.Views.Interfaces.Checksum
 {
     /// <summary>
     /// IChecksumWindow

diff --git a/CDTag.View.Interfaces/Checksum/IVerifyEACLogWindow.cs b/CDTag.View.Interfaces/Checksum/IVerifyEACLogWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Checksum
+namespace CDTag.Views.Interfaces.Checksum
 {
     /// <summary>
     /// IVerifyEACLogWindow

diff --git a/CDTag.View.Interfaces/General/IGetInputWindow.cs b/CDTag.View.Interfaces/General/IGetInputWindow.cs
@@ -0,0 +1,9 @@
+namespace CDTag.Views.Interfaces.General
+{
+    /// <summary>
+    /// IGetInputWindow
+    /// </summary>
+    public interface IGetInputWindow : IWindow
+    {
+    }
+}
diff --git a/CDTag.View.Interfaces/IWindow.cs b/CDTag.View.Interfaces/IWindow.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace CDTag.View.Interfaces
+namespace CDTag.Views.Interfaces
 {
     /// <summary>
     /// IWindow

diff --git a/CDTag.View.Interfaces/Options/IOptionsWindow.cs b/CDTag.View.Interfaces/Options/IOptionsWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Options
+namespace CDTag.Views.Interfaces.Options
 {
     /// <summary>
     /// IOptionsWindow

diff --git a/CDTag.View.Interfaces/Profile/EditProfile/IEditProfileWindow.cs b/CDTag.View.Interfaces/Profile/EditProfile/IEditProfileWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Profile.EditProfile
+namespace CDTag.Views.Interfaces.Profile.EditProfile
 {
     /// <summary>
     /// IEditProfileWindow

diff --git a/CDTag.View.Interfaces/Profile/NewProfile/INewProfileWindow.cs b/CDTag.View.Interfaces/Profile/NewProfile/INewProfileWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Profile.NewProfile
+namespace CDTag.Views.Interfaces.Profile.NewProfile
 {
     /// <summary>
     /// INewProfileWindow

diff --git a/CDTag.View.Interfaces/Tag/EditTag/IEditTagWindow.cs b/CDTag.View.Interfaces/Tag/EditTag/IEditTagWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Tag.EditTag
+namespace CDTag.Views.Interfaces.Tag.EditTag
 {
     /// <summary>
     /// IEditTagWindow

diff --git a/CDTag.View.Interfaces/Tag/MassTag/IMassTagWindow.cs b/CDTag.View.Interfaces/Tag/MassTag/IMassTagWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Tag.MassTag
+namespace CDTag.Views.Interfaces.Tag.MassTag
 {
     /// <summary>
     /// IMassTagWindow

diff --git a/CDTag.View.Interfaces/Tag/TagAlbum/ITagAlbumWindow.cs b/CDTag.View.Interfaces/Tag/TagAlbum/ITagAlbumWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Tag.TagAlbum
+namespace CDTag.Views.Interfaces.Tag.TagAlbum
 {
     /// <summary>
     /// ITagAlbumWindow

diff --git a/CDTag.View.Interfaces/Tools/IEncodingInspectorWindow.cs b/CDTag.View.Interfaces/Tools/IEncodingInspectorWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Tools
+namespace CDTag.Views.Interfaces.Tools
 {
     /// <summary>
     /// IEncodingInspectorWindow

diff --git a/CDTag.View.Interfaces/Tools/ISplitCueWindow.cs b/CDTag.View.Interfaces/Tools/ISplitCueWindow.cs
@@ -1,4 +1,4 @@
-namespace CDTag.View.Interfaces.Tools
+namespace CDTag.Views.Interfaces.Tools
 {
     /// <summary>
     /// ISplitCueWindow

diff --git a/CDTag.View/About/AboutWindow.xaml.cs b/CDTag.View/About/AboutWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.About;
-using CDTag.ViewModels.About;
+using CDTag.ViewModels.About;
+using CDTag.Views.Interfaces.About;
 
 namespace CDTag.Views.About
 {

diff --git a/CDTag.View/CDTag.View.csproj b/CDTag.View/CDTag.View.csproj
@@ -86,6 +86,9 @@
     <Compile Include="Converters\PlayLengthConverter.cs" />
     <Compile Include="Converters\ShortFileNameConverter.cs" />
     <Compile Include="DialogService.cs" />
+    <Compile Include="General\GetInputWindow.xaml.cs">
+      <DependentUpon>GetInputWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
@@ -167,6 +170,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="General\GetInputWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/CDTag.View/Checksum/ChecksumWindow.xaml.cs b/CDTag.View/Checksum/ChecksumWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.Checksum;
-using CDTag.ViewModels.Checksum;
+using CDTag.ViewModels.Checksum;
+using CDTag.Views.Interfaces.Checksum;
 
 namespace CDTag.Views.Checksum
 {

diff --git a/CDTag.View/Checksum/VerifyEACLogWindow.xaml.cs b/CDTag.View/Checksum/VerifyEACLogWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.Checksum;
-using CDTag.ViewModels.Checksum;
+using CDTag.ViewModels.Checksum;
+using CDTag.Views.Interfaces.Checksum;
 
 namespace CDTag.Views.Checksum
 {

diff --git a/CDTag.View/DialogService.cs b/CDTag.View/DialogService.cs
@@ -8,11 +8,10 @@
 using CDTag.Common.Wpf;
 using CDTag.Controls;
 using CDTag.FileBrowser.Events;
-using CDTag.View.Interfaces;
-using CDTag.Views;
+using CDTag.Views.Interfaces;
 using Microsoft.Win32;
 
-namespace CDTag.View
+namespace CDTag.Views
 {
     public class DialogService : IDialogService
     {

diff --git a/CDTag.View/General/GetInputWindow.xaml b/CDTag.View/General/GetInputWindow.xaml
@@ -0,0 +1,42 @@
+<Views:WindowViewBase 
+    x:Class="CDTag.Views.General.GetInputWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    xmlns:Views="clr-namespace:CDTag.Views"
+    Title="{Binding WindowTitle, Mode=OneWay}" 
+    MinHeight="200"
+    MinWidth="200"
+    Height="200"
+    Width="350"
+    CurrentVisualState="{Binding CurrentVisualState}"
+    FocusManager.FocusedElement="{Binding ElementName=InputTextBox}"
+>
+    <Grid Margin="8">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Text="{Binding LabelText, Mode=OneWay}" Margin="0,0,8,0" />
+        <TextBox x:Name="InputTextBox" Text="{Binding InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" />
+
+        <Path Grid.Row="1" Grid.ColumnSpan="2" Data="M0,0 L1,0" Stroke="#CCCCCC" Stretch="Fill" Margin="0,8" />
+
+        <Grid Grid.Row="2" Grid.ColumnSpan="2" Grid.IsSharedSizeScope="True">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" SharedSizeGroup="BottomButtons" MinWidth="80" />
+                <ColumnDefinition Width="Auto" SharedSizeGroup="BottomButtons" MinWidth="80" />
+            </Grid.ColumnDefinitions>
+
+            <Button Grid.Column="1" Content="_OK" Command="{Binding OKCommand}" Padding="7,2" Margin="8,0,0,0" />
+            <Button Grid.Column="2" Content="_Cancel" IsCancel="True" Padding="7,2" Margin="8,0,0,0" />
+        </Grid>
+
+    </Grid>
+</Views:WindowViewBase>
diff --git a/CDTag.View/General/GetInputWindow.xaml.cs b/CDTag.View/General/GetInputWindow.xaml.cs
@@ -0,0 +1,15 @@
+using CDTag.Views.Interfaces.General;
+
+namespace CDTag.Views.General
+{
+    /// <summary>
+    /// Interaction logic for GetInputWindow.xaml
+    /// </summary>
+    public partial class GetInputWindow : WindowViewBase, IGetInputWindow
+    {
+        public GetInputWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/CDTag.View/Options/OptionsWindow.xaml.cs b/CDTag.View/Options/OptionsWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.Options;
-using CDTag.ViewModel.Options;
+using CDTag.ViewModel.Options;
+using CDTag.Views.Interfaces.Options;
 
 namespace CDTag.Views.Options
 {

diff --git a/CDTag.View/Profile/EditProfile/EditProfileWindow.xaml b/CDTag.View/Profile/EditProfile/EditProfileWindow.xaml
@@ -1,13 +1,14 @@
-<Views:WindowViewBase 
+<Views:WindowViewBase
     x:Class="CDTag.Views.Profile.EditProfile.EditProfileWindow"
     x:Name="editProfileWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-    xmlns:Views="clr-namespace:CDTag.Views" xmlns:EditProfile="clr-namespace:CDTag.Views.Profile.EditProfile"
+    xmlns:Views="clr-namespace:CDTag.Views" 
+    xmlns:EditProfile="clr-namespace:CDTag.Views.Profile.EditProfile"
     Title="{Binding WindowTitle, Mode=OneWay}" 
-    MinHeight="540" 
+    MinHeight="540"
     MinWidth="600"
-    Height="580" 
+    Height="580"
     Width="780"
     CurrentVisualState="{Binding CurrentVisualState}"
     FocusManager.FocusedElement="{Binding ElementName=ProfileNameTextBox}"

diff --git a/CDTag.View/Profile/EditProfile/EditProfileWindow.xaml.cs b/CDTag.View/Profile/EditProfile/EditProfileWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.Profile.EditProfile;
-using CDTag.ViewModels.Profile.EditProfile;
+using CDTag.ViewModels.Profile.EditProfile;
+using CDTag.Views.Interfaces.Profile.EditProfile;
 
 namespace CDTag.Views.Profile.EditProfile
 {

diff --git a/CDTag.View/Profile/NewProfile/NewProfileWindow.xaml.cs b/CDTag.View/Profile/NewProfile/NewProfileWindow.xaml.cs
@@ -1,6 +1,6 @@
 using System;
-using CDTag.View.Interfaces.Profile.NewProfile;
 using CDTag.ViewModels.Profile.NewProfile;
+using CDTag.Views.Interfaces.Profile.NewProfile;
 
 namespace CDTag.Views.Profile.NewProfile
 {

diff --git a/CDTag.View/Tag/EditTag/ID3v2Window.xaml.cs b/CDTag.View/Tag/EditTag/ID3v2Window.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using CDTag.Model.Tag;
-using CDTag.View.Interfaces.Tag.EditTag;
 using CDTag.ViewModels.Tag.EditTag;
+using CDTag.Views.Interfaces.Tag.EditTag;
 using IdSharp.Common.Events;
 using Microsoft.Win32;
 

diff --git a/CDTag.View/Tag/MassTag/MassTagWindow.xaml.cs b/CDTag.View/Tag/MassTag/MassTagWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.Tag.MassTag;
-using CDTag.ViewModels.Tag.MassTag;
+using CDTag.ViewModels.Tag.MassTag;
+using CDTag.Views.Interfaces.Tag.MassTag;
 
 namespace CDTag.Views.Tag.MassTag
 {

diff --git a/CDTag.View/Tag/TagAlbum/TagAlbumWindow.xaml.cs b/CDTag.View/Tag/TagAlbum/TagAlbumWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.Tag.TagAlbum;
-using CDTag.ViewModels.Tag.TagAlbum;
+using CDTag.ViewModels.Tag.TagAlbum;
+using CDTag.Views.Interfaces.Tag.TagAlbum;
 
 namespace CDTag.Views.Tag.TagAlbum
 {

diff --git a/CDTag.View/Tools/EncodingInspectorWindow.xaml.cs b/CDTag.View/Tools/EncodingInspectorWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.Tools;
-using CDTag.ViewModels.Tools;
+using CDTag.ViewModels.Tools;
+using CDTag.Views.Interfaces.Tools;
 
 namespace CDTag.Views.Tools
 {

diff --git a/CDTag.View/Tools/SplitCueWindow.xaml.cs b/CDTag.View/Tools/SplitCueWindow.xaml.cs
@@ -1,5 +1,5 @@
-using CDTag.View.Interfaces.Tools;
-using CDTag.ViewModels.Tools;
+using CDTag.ViewModels.Tools;
+using CDTag.Views.Interfaces.Tools;
 
 namespace CDTag.Views.Tools
 {

diff --git a/CDTag.View/WindowViewBase.cs b/CDTag.View/WindowViewBase.cs
@@ -3,11 +3,10 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using CDTag.Common;
 using CDTag.Common.Events;
 using CDTag.Common.Mvvm;
 using CDTag.Common.Settings;
-using CDTag.View.Interfaces;
+using CDTag.Views.Interfaces;
 using IdSharp.Common.Events;
 
 namespace CDTag.Views