Refactoring: Move controls and resources in their own namespaces

christianrondeau · Jul 27, 2014 · bfd4d54 · bfd4d54
1 parent 1817c3b
commit bfd4d54
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 21 deletions.
diff --git a/GoToWindow.Api/GoToWindow.Api.csproj b/GoToWindow.Api/GoToWindow.Api.csproj
@@ -39,6 +39,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="InterceptAltTab.cs" />
     <Compile Include="IWindowEntry.cs" />
     <Compile Include="ProcessExtensions.cs" />
     <Compile Include="WindowEntry.cs" />

diff --git a/GoToWindow/InterceptAltTab.cs → GoToWindow.Api/InterceptAltTab.cs b/GoToWindow/InterceptAltTab.cs → GoToWindow.Api/InterceptAltTab.cs
@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Input;
 
-namespace GoToWindow
+namespace GoToWindow.Api
 {
 	public class InterceptAltTab : IDisposable
 	{

diff --git a/GoToWindow/App.xaml.cs b/GoToWindow/App.xaml.cs
@@ -1,4 +1,5 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using GoToWindow.Api;
+using Hardcodet.Wpf.TaskbarNotification;
 using System;
 using System.Collections.Generic;
 using System.Configuration;

diff --git a/GoToWindow/ExitCommand.cs → GoToWindow/Commands/ExitCommand.cs b/GoToWindow/ExitCommand.cs → GoToWindow/Commands/ExitCommand.cs
diff --git a/GoToWindow/OpenMainWindowCommand.cs → GoToWindow/Commands/OpenMainWindowCommand.cs b/GoToWindow/OpenMainWindowCommand.cs → GoToWindow/Commands/OpenMainWindowCommand.cs
diff --git a/GoToWindow/WindowListEntry.xaml → GoToWindow/Controls/WindowListEntry.xaml b/GoToWindow/WindowListEntry.xaml → GoToWindow/Controls/WindowListEntry.xaml
@@ -1,13 +1,13 @@
-<UserControl x:Class="GoToWindow.WindowListEntry"
+<UserControl x:Class="GoToWindow.Controls.WindowListEntry"
              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:gotowindow="clr-namespace:GoToWindow"
+             xmlns:gotowindowConverters="clr-namespace:GoToWindow.Converters"
              mc:Ignorable="d" Height="48"
              d:DesignHeight="48" d:DesignWidth="512">
     <UserControl.Resources>
-        <gotowindow:ExecutableToIconValueConverter x:Key="IconConverter" />
+        <gotowindowConverters:ExecutableToIconValueConverter x:Key="IconConverter" />
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>

diff --git a/GoToWindow/WindowListEntry.xaml.cs → GoToWindow/Controls/WindowListEntry.xaml.cs b/GoToWindow/WindowListEntry.xaml.cs → GoToWindow/Controls/WindowListEntry.xaml.cs
@@ -14,7 +14,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace GoToWindow
+namespace GoToWindow.Controls
 {
     /// <summary>
     /// Interaction logic for WindowListEntry.xaml

diff --git a/GoToWindow/ExecutableToIconValueConverter.cs → ...verters/ExecutableToIconValueConverter.cs b/GoToWindow/ExecutableToIconValueConverter.cs → ...verters/ExecutableToIconValueConverter.cs
@@ -9,13 +9,16 @@
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 
-namespace GoToWindow
+namespace GoToWindow.Converters
 {
     [ValueConversion(typeof(string), typeof(BitmapFrame))]
     public class ExecutableToIconValueConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
+            if (value == null)
+                return null;
+
             var iconStream = new MemoryStream();
 
             using(var icon = Icon.ExtractAssociatedIcon((string)value))

diff --git a/GoToWindow/GoToWindow.csproj b/GoToWindow/GoToWindow.csproj
@@ -62,27 +62,26 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="ExecutableToIconValueConverter.cs" />
-    <Compile Include="ExitCommand.cs" />
+    <Compile Include="Converters\ExecutableToIconValueConverter.cs" />
+    <Compile Include="Commands\ExitCommand.cs" />
     <Compile Include="GoToWindowContext.cs" />
-    <Compile Include="InterceptAltTab.cs" />
-    <Compile Include="OpenMainWindowCommand.cs" />
-    <Compile Include="WindowListEntry.xaml.cs">
+    <Compile Include="Commands\OpenMainWindowCommand.cs" />
+    <Compile Include="Controls\WindowListEntry.xaml.cs">
       <DependentUpon>WindowListEntry.xaml</DependentUpon>
     </Compile>
-    <Page Include="MainWindow.xaml">
+    <Page Include="Windows\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MainWindow.xaml.cs">
+    <Compile Include="Windows\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="WindowListEntry.xaml">
+    <Page Include="Controls\WindowListEntry.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -116,7 +115,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="AppIcon.ico" />
+    <Resource Include="Resources\AppIcon.ico" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GoToWindow.Api\GoToWindow.Api.csproj">

diff --git a/GoToWindow/Properties/Resources.resx b/GoToWindow/Properties/Resources.resx
@@ -119,6 +119,6 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="AppIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\AppIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\AppIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/GoToWindow/AppIcon.ico → GoToWindow/Resources/AppIcon.ico b/GoToWindow/AppIcon.ico → GoToWindow/Resources/AppIcon.ico
diff --git a/GoToWindow/MainWindow.xaml → GoToWindow/Windows/MainWindow.xaml b/GoToWindow/MainWindow.xaml → GoToWindow/Windows/MainWindow.xaml
@@ -1,13 +1,13 @@
 <Window x:Class="GoToWindow.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:gotowindow="clr-namespace:GoToWindow"
+        xmlns:gotowindowControls="clr-namespace:GoToWindow.Controls"
         Title="Go To Window" Height="Auto" Width="640"
         WindowStartupLocation="CenterScreen"
         AllowsTransparency="True"
         Background="Transparent"
         WindowStyle="None"
-        Icon="AppIcon.ico"
+        Icon="..\Resources\AppIcon.ico"
         Topmost="True"
         ShowInTaskbar="False"
         FocusManager.FocusedElement="{Binding ElementName=searchTextBox}"
@@ -85,7 +85,7 @@
                 </ListView.Style>
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <gotowindow:WindowListEntry />
+                        <gotowindowControls:WindowListEntry />
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>

diff --git a/GoToWindow/MainWindow.xaml.cs → GoToWindow/Windows/MainWindow.xaml.cs b/GoToWindow/MainWindow.xaml.cs → GoToWindow/Windows/MainWindow.xaml.cs
@@ -23,7 +23,6 @@ public partial class MainWindow : Window
     {
         public MainWindow()
         {
-
             InitializeComponent();
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ public partial class MainWindow : Window @@
         {
             public MainWindow()
             {
                 InitializeComponent();
             }
@@ Expand Down @@