diff --git a/src/DesktopMagic/App.xaml b/src/DesktopMagic/App.xaml index 2931262..fd07349 100644 --- a/src/DesktopMagic/App.xaml +++ b/src/DesktopMagic/App.xaml @@ -6,10 +6,11 @@ - + + diff --git a/src/DesktopMagic/DesktopMagic.csproj b/src/DesktopMagic/DesktopMagic.csproj index 363cd88..79a61f8 100644 --- a/src/DesktopMagic/DesktopMagic.csproj +++ b/src/DesktopMagic/DesktopMagic.csproj @@ -24,6 +24,14 @@ + + + + + + + Never + @@ -49,5 +57,6 @@ Always + \ No newline at end of file diff --git a/src/DesktopMagic/Dialogs/ColorDialog.xaml.cs b/src/DesktopMagic/Dialogs/ColorDialog.xaml.cs index fcf7c2a..f3e203d 100644 --- a/src/DesktopMagic/Dialogs/ColorDialog.xaml.cs +++ b/src/DesktopMagic/Dialogs/ColorDialog.xaml.cs @@ -116,11 +116,11 @@ public partial class ColorDialog : Window if (currentCulture.Contains("de")) { - dict.Source = new Uri("..\\Resources\\StringResources.de.xaml", UriKind.Relative); + dict.Source = new Uri("..\\Resources\\Strings\\StringResources.de.xaml", UriKind.Relative); } else { - dict.Source = new Uri("..\\Resources\\StringResources.en.xaml", UriKind.Relative); + dict.Source = new Uri("..\\Resources\\Strings\\StringResources.en.xaml", UriKind.Relative); } Resources.MergedDictionaries.Add(dict); } diff --git a/src/DesktopMagic/Dialogs/InputDialog.xaml.cs b/src/DesktopMagic/Dialogs/InputDialog.xaml.cs index 523af7f..216afd1 100644 --- a/src/DesktopMagic/Dialogs/InputDialog.xaml.cs +++ b/src/DesktopMagic/Dialogs/InputDialog.xaml.cs @@ -37,11 +37,11 @@ public partial class InputDialog : Window if (currentCulture.Contains("de")) { - dict.Source = new Uri("..\\Resources\\StringResources.de.xaml", UriKind.Relative); + dict.Source = new Uri("..\\Resources\\Strings\\StringResources.de.xaml", UriKind.Relative); } else { - dict.Source = new Uri("..\\Resources\\StringResources.en.xaml", UriKind.Relative); + dict.Source = new Uri("..\\Resources\\Strings\\StringResources.en.xaml", UriKind.Relative); } Resources.MergedDictionaries.Add(dict); } diff --git a/src/DesktopMagic/MainWindow.xaml b/src/DesktopMagic/MainWindow.xaml index 1099839..a619453 100644 --- a/src/DesktopMagic/MainWindow.xaml +++ b/src/DesktopMagic/MainWindow.xaml @@ -11,7 +11,7 @@ Closing="Window_Closing" Closed="Window_Closed" ShowInTaskbar="True" - Icon="icon.ico" + Icon="{StaticResource Icon}" Background="{DynamicResource MaterialDesignPaper}" FontFamily="{DynamicResource MaterialDesignFont}" Height="520" diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs index 8eb3098..c8501bd 100644 --- a/src/DesktopMagic/MainWindow.xaml.cs +++ b/src/DesktopMagic/MainWindow.xaml.cs @@ -669,11 +669,11 @@ namespace DesktopMagic if (currentCulture.Contains("de")) { - dict.Source = new Uri("..\\Resources\\StringResources.de.xaml", UriKind.Relative); + dict.Source = new Uri("..\\Resources\\Strings\\StringResources.de.xaml", UriKind.Relative); } else { - dict.Source = new Uri("..\\Resources\\StringResources.en.xaml", UriKind.Relative); + dict.Source = new Uri("..\\Resources\\Strings\\StringResources.en.xaml", UriKind.Relative); } Resources.MergedDictionaries.Add(dict); } diff --git a/src/DesktopMagic/Plugins/ModEntry.xaml b/src/DesktopMagic/Plugins/ModEntry.xaml index a48cbd9..89d1e8d 100644 --- a/src/DesktopMagic/Plugins/ModEntry.xaml +++ b/src/DesktopMagic/Plugins/ModEntry.xaml @@ -23,7 +23,7 @@ - + diff --git a/src/DesktopMagic/Plugins/PluginManager.xaml b/src/DesktopMagic/Plugins/PluginManager.xaml index 462fdde..7fe6ba3 100644 --- a/src/DesktopMagic/Plugins/PluginManager.xaml +++ b/src/DesktopMagic/Plugins/PluginManager.xaml @@ -24,6 +24,7 @@ + @@ -57,6 +58,10 @@ + + + + \ No newline at end of file diff --git a/src/DesktopMagic/Resources/Images/ImageResources.xaml b/src/DesktopMagic/Resources/Images/ImageResources.xaml new file mode 100644 index 0000000..a9578d0 --- /dev/null +++ b/src/DesktopMagic/Resources/Images/ImageResources.xaml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/DesktopMagic/Resources/Images/modio-cog-blue.png b/src/DesktopMagic/Resources/Images/modio-cog-blue.png new file mode 100644 index 0000000..bef9834 Binary files /dev/null and b/src/DesktopMagic/Resources/Images/modio-cog-blue.png differ diff --git a/src/DesktopMagic/Resources/Images/modio-logo-bluedark.png b/src/DesktopMagic/Resources/Images/modio-logo-bluedark.png new file mode 100644 index 0000000..8210da8 Binary files /dev/null and b/src/DesktopMagic/Resources/Images/modio-logo-bluedark.png differ diff --git a/src/DesktopMagic/Resources/StringResources.de.xaml b/src/DesktopMagic/Resources/Strings/StringResources.de.xaml similarity index 88% rename from src/DesktopMagic/Resources/StringResources.de.xaml rename to src/DesktopMagic/Resources/Strings/StringResources.de.xaml index 7445fb4..af92866 100644 --- a/src/DesktopMagic/Resources/StringResources.de.xaml +++ b/src/DesktopMagic/Resources/Strings/StringResources.de.xaml @@ -5,7 +5,7 @@ Linie Spiegeln - Plugins Neu Laden + Neu Laden Plugins Ordner Öffnen Plugin Manager Farbe: @@ -25,7 +25,9 @@ Ok Abbrechen Layoutnamen eingeben: - Layout exestiert bereits! + Layout existiert bereits! + Installieren + Entfernen Unten Mitte diff --git a/src/DesktopMagic/Resources/StringResources.en.xaml b/src/DesktopMagic/Resources/Strings/StringResources.en.xaml similarity index 91% rename from src/DesktopMagic/Resources/StringResources.en.xaml rename to src/DesktopMagic/Resources/Strings/StringResources.en.xaml index 9975992..04bb3e8 100644 --- a/src/DesktopMagic/Resources/StringResources.en.xaml +++ b/src/DesktopMagic/Resources/Strings/StringResources.en.xaml @@ -5,7 +5,7 @@ Line Mirror - Reload Plugins + Reload Open Plugins Folder Plugin Manager Color: @@ -26,6 +26,8 @@ Cancel Enter layout name Layout already exists! + Install + Remove Bottom Middle