finalization of work related with WPF app for EPF Archive manager

mrpetro · Mar 1, 2020 · c5240dd · c5240dd
1 parent f0b79a8
commit c5240dd
Show file tree

Hide file tree

Showing 40 changed files with 112 additions and 139 deletions.
diff --git a/src/EPFArchive.UI.WPF/App.xaml b/src/EPFArchive.UI.WPF/App.xaml
@@ -1,8 +1,8 @@
-<Application x:Class="EPFArchive.UI.WPF.App"
+<Application x:Class="EPFArchive.UI.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:EPFArchive.UI.WPF"
-             StartupUri="MainWindow.xaml">
+             xmlns:local="clr-namespace:EPFArchive.UI"
+             StartupUri="Forms\MainWindow.xaml">
     <Application.Resources>
 
     </Application.Resources>

diff --git a/src/EPFArchive.UI.WPF/App.xaml.cs b/src/EPFArchive.UI.WPF/App.xaml.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace EPFArchive.UI.WPF
+namespace EPFArchive.UI
 {
     /// <summary>
     /// Interaction logic for App.xaml

diff --git a/src/EPFArchive.UI.WPF/Controls/EPFArchiveEntityListCtrl.xaml b/src/EPFArchive.UI.WPF/Controls/EPFArchiveEntityListCtrl.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="EPFArchive.UI.WPF.Controls.EPFArchiveEntityListCtrl"
+<UserControl x:Class="EPFArchive.UI.Controls.EPFArchiveEntityListCtrl"
              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" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:EPFArchive.UI.WPF.Controls"
+             xmlns:local="clr-namespace:EPFArchive.UI.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <DataGrid ItemsSource="{Binding Entries}" AutoGenerateColumns="False" EnableRowVirtualization="False">

diff --git a/src/EPFArchive.UI.WPF/Controls/EPFArchiveEntityListCtrl.xaml.cs b/src/EPFArchive.UI.WPF/Controls/EPFArchiveEntityListCtrl.xaml.cs
@@ -13,7 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace EPFArchive.UI.WPF.Controls
+namespace EPFArchive.UI.Controls
 {
     /// <summary>
     /// Interaction logic for EPFArchiveEntityListCtrl.xaml

diff --git a/src/EPFArchive.UI.WPF/Converters/ColorConverter.cs b/src/EPFArchive.UI.WPF/Converters/ColorConverter.cs
@@ -6,7 +6,7 @@
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace EPFArchive.UI.WPF.Converters
+namespace EPFArchive.UI.Converters
 {
     public class ColorConverter : IValueConverter
     {

diff --git a/src/EPFArchive.UI.WPF/Converters/InverseBooleanConverter.cs b/src/EPFArchive.UI.WPF/Converters/InverseBooleanConverter.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace EPFArchive.UI.WPF.Converters
+namespace EPFArchive.UI.Converters
 {
     [ValueConversion(typeof(bool), typeof(bool))]
     public class InverseBooleanConverter : IValueConverter

diff --git a/src/EPFArchive.UI.WPF/Converters/VisibilityConverter.cs b/src/EPFArchive.UI.WPF/Converters/VisibilityConverter.cs
@@ -6,7 +6,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace EPFArchive.UI.WPF.Converters
+namespace EPFArchive.UI.Converters
 {
     public class VisibilityConverter : IValueConverter
     {

diff --git a/src/EPFArchive.UI.WPF/DialogProvider.cs b/src/EPFArchive.UI.WPF/DialogProvider.cs
@@ -1,4 +1,4 @@
-using EPF.UI;
+using EPF.VM;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@
 using System.Windows;
 using System.Windows.Forms;
 
-namespace EPFArchive.UI.WPF
+namespace EPFArchive.UI
 {
     public class DialogProvider : IDialogProvider
     {

diff --git a/src/EPFArchive.UI.WPF/EPFArchive.UI.WPF.csproj b/src/EPFArchive.UI.WPF/EPFArchive.UI.WPF.csproj
@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{BF4D9B2D-2A66-425D-AB94-6C26F2C1A93C}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>EPFArchive.UI.WPF</RootNamespace>
+    <RootNamespace>EPFArchive.UI</RootNamespace>
     <AssemblyName>EPFArchive.UI.WPF</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -61,7 +61,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="MainWindow.xaml">
+    <Page Include="Forms\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -76,7 +76,7 @@
     <Compile Include="Converters\InverseBooleanConverter.cs" />
     <Compile Include="Converters\VisibilityConverter.cs" />
     <Compile Include="DialogProvider.cs" />
-    <Compile Include="MainWindow.xaml.cs">
+    <Compile Include="Forms\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
@@ -103,13 +103,11 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
-    <Folder Include="Forms\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EPFArchive.UI\EPFArchive.UI.csproj">
+    <ProjectReference Include="..\EPFArchive.UI\EPFArchive.VM.csproj">
       <Project>{04b5ddf4-509c-4e32-9aa2-b8a8e143e7e6}</Project>
-      <Name>EPFArchive.UI</Name>
+      <Name>EPFArchive.VM</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/EPFArchive.UI.WPF/MainWindow.xaml → src/EPFArchive.UI.WPF/Forms/MainWindow.xaml b/src/EPFArchive.UI.WPF/MainWindow.xaml → src/EPFArchive.UI.WPF/Forms/MainWindow.xaml
@@ -3,17 +3,17 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:EPFArchive.UI.WPF"
-        xmlns:Converters="clr-namespace:EPFArchive.UI.WPF.Converters"
-        xmlns:Controls="clr-namespace:EPFArchive.UI.WPF.Controls"
-        x:Class="EPFArchive.UI.WPF.MainWindow"
+        xmlns:local="clr-namespace:EPFArchive.UI"
+        xmlns:Converters="clr-namespace:EPFArchive.UI.Converters"
+        xmlns:Controls="clr-namespace:EPFArchive.UI.Controls"
+        x:Class="EPFArchive.UI.Forms.MainWindow"
         mc:Ignorable="d"
         Title="{Binding AppLabel}" Height="450" Width="800" >
     <Window.Resources>
-        <BitmapImage x:Key="AddIcon" UriSource="Resources\Add.png" />
-        <BitmapImage x:Key="ExtractAllIcon" UriSource="Resources\ExtractAll.png" />
-        <BitmapImage x:Key="ExtractSelection" UriSource="Resources\ExtractSelection.png" />
-        <BitmapImage x:Key="RemoveIcon" UriSource="Resources\Remove.png" />
+        <BitmapImage x:Key="AddIcon" UriSource="..\Resources\Add.png" />
+        <BitmapImage x:Key="ExtractAllIcon" UriSource="..\Resources\ExtractAll.png" />
+        <BitmapImage x:Key="ExtractSelection" UriSource="..\Resources\ExtractSelection.png" />
+        <BitmapImage x:Key="RemoveIcon" UriSource="..\Resources\Remove.png" />
         <Converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
         <Converters:ColorConverter x:Key="ColorConverter" />
         <Converters:VisibilityConverter x:Key="VisibilityConverter" />

diff --git a/src/EPFArchive.UI.WPF/MainWindow.xaml.cs → ...PFArchive.UI.WPF/Forms/MainWindow.xaml.cs b/src/EPFArchive.UI.WPF/MainWindow.xaml.cs → ...PFArchive.UI.WPF/Forms/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-using EPF.UI.ViewModel;
+using EPF.VM;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +14,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace EPFArchive.UI.WPF
+namespace EPFArchive.UI.Forms
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml

diff --git a/src/EPFArchive.UI.WPF/Properties/Resources.Designer.cs b/src/EPFArchive.UI.WPF/Properties/Resources.Designer.cs
diff --git a/src/EPFArchive.UI.WPF/Properties/Settings.Designer.cs b/src/EPFArchive.UI.WPF/Properties/Settings.Designer.cs
diff --git a/src/EPFArchive.UI.WinForms/Controls/DGVMultiSelectCheckBoxFunc.cs b/src/EPFArchive.UI.WinForms/Controls/DGVMultiSelectCheckBoxFunc.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace EPF.UI.WinForms.Controls
+namespace EPF.UI.Controls
 {
     /// <summary>
     /// This class adds multiselection of checkboxes (in DataGridViewCheckBox columns) function to DataGridView.

diff --git a/src/EPFArchive.UI.WinForms/Controls/EPFArchiveEntryListCtrl.Designer.cs b/src/EPFArchive.UI.WinForms/Controls/EPFArchiveEntryListCtrl.Designer.cs
diff --git a/src/EPFArchive.UI.WinForms/Controls/EPFArchiveEntryListCtrl.cs b/src/EPFArchive.UI.WinForms/Controls/EPFArchiveEntryListCtrl.cs
@@ -1,10 +1,10 @@
-using EPF.UI.ViewModel;
+using EPF.VM;
 using System;
 using System.ComponentModel;
 using System.Globalization;
 using System.Windows.Forms;
 
-namespace EPF.UI.WinForms.Controls
+namespace EPF.UI.Controls
 {
     public partial class EPFArchiveEntryListCtrl : UserControl
     {

diff --git a/src/EPFArchive.UI.WinForms/Controls/ToolStripButtonEx.cs b/src/EPFArchive.UI.WinForms/Controls/ToolStripButtonEx.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace EPF.UI.WinForms.Controls
+namespace EPF.UI.Controls
 {
     class ToolStripButtonEx : ToolStripButton, IBindableComponent
     {

diff --git a/src/EPFArchive.UI.WinForms/Controls/ToolStripMenuItemEx.cs b/src/EPFArchive.UI.WinForms/Controls/ToolStripMenuItemEx.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace EPF.UI.WinForms.Controls
+namespace EPF.UI.Controls
 {
     public class ToolStripMenuItemEx : ToolStripMenuItem, IBindableComponent
     {

diff --git a/src/EPFArchive.UI.WinForms/Controls/ToolStripProgressBarEx.cs b/src/EPFArchive.UI.WinForms/Controls/ToolStripProgressBarEx.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace EPF.UI.WinForms.Controls
+namespace EPF.UI.Controls
 {
     /// <summary>
     /// This class extends ToolStripProgressBar control with usage of DataBindings features

diff --git a/src/EPFArchive.UI.WinForms/Controls/ToolStripStatusLabelEx.cs b/src/EPFArchive.UI.WinForms/Controls/ToolStripStatusLabelEx.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace EPF.UI.WinForms.Controls
+namespace EPF.UI.Controls
 {
     /// <summary>
     /// This class extends ToolStripStatusLabel control with usage of DataBindings features

diff --git a/src/EPFArchive.UI.WinForms/DialogProvider.cs b/src/EPFArchive.UI.WinForms/DialogProvider.cs
@@ -1,11 +1,12 @@
-using System;
+using EPF.VM;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace EPF.UI.WinForms
+namespace EPF.UI
 {
     public class DialogProvider : IDialogProvider
     {

diff --git a/src/EPFArchive.UI.WinForms/EPFArchive.UI.WinForms.csproj b/src/EPFArchive.UI.WinForms/EPFArchive.UI.WinForms.csproj
@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{96699164-F716-47F6-9436-7961E80530C7}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>EPF.UI.WinForms</RootNamespace>
+    <RootNamespace>EPF.UI</RootNamespace>
     <AssemblyName>EPFArchive.UI.WinForms</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -97,9 +97,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EPFArchive.UI\EPFArchive.UI.csproj">
+    <ProjectReference Include="..\EPFArchive.UI\EPFArchive.VM.csproj">
       <Project>{04b5ddf4-509c-4e32-9aa2-b8a8e143e7e6}</Project>
-      <Name>EPFArchive.UI</Name>
+      <Name>EPFArchive.VM</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/EPFArchive.UI.WinForms/Extensions.cs b/src/EPFArchive.UI.WinForms/Extensions.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace EPF.UI.WinForms
+namespace EPF.UI
 {
     public static class Extensions
     {