diff --git a/.gitmodules b/.gitmodules index d231f8a..6599cee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "FloatingStatusWindowLibrary/Common.Wpf"] - path = FloatingStatusWindowLibrary/Common.Wpf +[submodule "Library/Common.Wpf"] + path = Library/Common.Wpf url = https://github.com/ckaczor/Common.Wpf.git diff --git a/FloatingStatusWindowLibrary.sln b/FloatingStatusWindow.sln similarity index 92% rename from FloatingStatusWindowLibrary.sln rename to FloatingStatusWindow.sln index 1d32091..fb40a91 100644 --- a/FloatingStatusWindowLibrary.sln +++ b/FloatingStatusWindow.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FloatingStatusWindowLibrary", "FloatingStatusWindowLibrary\FloatingStatusWindowLibrary.csproj", "{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FloatingStatusWindow", "Library\FloatingStatusWindow.csproj", "{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWindow", "TestWindow\TestWindow.csproj", "{0C541788-8FFD-47B6-8E6B-653A884CFA55}" EndProject @@ -14,9 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{C4 README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Wpf", "FloatingStatusWindowLibrary\Common.Wpf\Common.Wpf.csproj", "{0074C983-550E-4094-9E8C-F566FB669297}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Wpf", "Library\Common.Wpf\Common.Wpf.csproj", "{0074C983-550E-4094-9E8C-F566FB669297}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Native", "FloatingStatusWindowLibrary\Common.Wpf\Common.Native\Common.Native.csproj", "{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Native", "Library\Common.Wpf\Common.Native\Common.Native.csproj", "{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/FloatingStatusWindowLibrary/App.config b/Library/App.config similarity index 100% rename from FloatingStatusWindowLibrary/App.config rename to Library/App.config diff --git a/FloatingStatusWindowLibrary/AppearanceWindow.xaml b/Library/AppearanceWindow.xaml similarity index 100% rename from FloatingStatusWindowLibrary/AppearanceWindow.xaml rename to Library/AppearanceWindow.xaml diff --git a/FloatingStatusWindowLibrary/AppearanceWindow.xaml.cs b/Library/AppearanceWindow.xaml.cs similarity index 100% rename from FloatingStatusWindowLibrary/AppearanceWindow.xaml.cs rename to Library/AppearanceWindow.xaml.cs diff --git a/FloatingStatusWindowLibrary/Common.Wpf b/Library/Common.Wpf similarity index 100% rename from FloatingStatusWindowLibrary/Common.Wpf rename to Library/Common.Wpf diff --git a/FloatingStatusWindowLibrary/FloatingStatusWindow.cs b/Library/FloatingStatusWindow.cs similarity index 100% rename from FloatingStatusWindowLibrary/FloatingStatusWindow.cs rename to Library/FloatingStatusWindow.cs diff --git a/FloatingStatusWindowLibrary/FloatingStatusWindowLibrary.csproj b/Library/FloatingStatusWindow.csproj similarity index 100% rename from FloatingStatusWindowLibrary/FloatingStatusWindowLibrary.csproj rename to Library/FloatingStatusWindow.csproj diff --git a/FloatingStatusWindowLibrary/IWindowSource.cs b/Library/IWindowSource.cs similarity index 100% rename from FloatingStatusWindowLibrary/IWindowSource.cs rename to Library/IWindowSource.cs diff --git a/FloatingStatusWindowLibrary/MainWindow.xaml b/Library/MainWindow.xaml similarity index 100% rename from FloatingStatusWindowLibrary/MainWindow.xaml rename to Library/MainWindow.xaml diff --git a/FloatingStatusWindowLibrary/MainWindow.xaml.cs b/Library/MainWindow.xaml.cs similarity index 100% rename from FloatingStatusWindowLibrary/MainWindow.xaml.cs rename to Library/MainWindow.xaml.cs diff --git a/FloatingStatusWindowLibrary/Properties/AssemblyInfo.cs b/Library/Properties/AssemblyInfo.cs similarity index 100% rename from FloatingStatusWindowLibrary/Properties/AssemblyInfo.cs rename to Library/Properties/AssemblyInfo.cs diff --git a/FloatingStatusWindowLibrary/Properties/Resources.Designer.cs b/Library/Properties/Resources.Designer.cs similarity index 100% rename from FloatingStatusWindowLibrary/Properties/Resources.Designer.cs rename to Library/Properties/Resources.Designer.cs diff --git a/FloatingStatusWindowLibrary/Properties/Resources.resx b/Library/Properties/Resources.resx similarity index 100% rename from FloatingStatusWindowLibrary/Properties/Resources.resx rename to Library/Properties/Resources.resx diff --git a/FloatingStatusWindowLibrary/Resources/gear.ico b/Library/Resources/gear.ico similarity index 100% rename from FloatingStatusWindowLibrary/Resources/gear.ico rename to Library/Resources/gear.ico diff --git a/FloatingStatusWindowLibrary/StartManager.cs b/Library/StartManager.cs similarity index 100% rename from FloatingStatusWindowLibrary/StartManager.cs rename to Library/StartManager.cs diff --git a/FloatingStatusWindowLibrary/WindowManager.cs b/Library/WindowManager.cs similarity index 100% rename from FloatingStatusWindowLibrary/WindowManager.cs rename to Library/WindowManager.cs diff --git a/FloatingStatusWindowLibrary/WindowSettings.cs b/Library/WindowSettings.cs similarity index 100% rename from FloatingStatusWindowLibrary/WindowSettings.cs rename to Library/WindowSettings.cs diff --git a/TestWindow/TestWindow.csproj b/TestWindow/TestWindow.csproj index 3f3ca71..02f6565 100644 --- a/TestWindow/TestWindow.csproj +++ b/TestWindow/TestWindow.csproj @@ -92,7 +92,7 @@ - + {f023a16c-2f13-4a87-a8b7-22c43c4a58a4} FloatingStatusWindowLibrary