More cleanup

angelwzr · Jun 1, 2020 · 56e07e1 · 56e07e1
1 parent 5ad6c0d
commit 56e07e1
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 76 deletions.
diff --git a/darker.app/App.xaml b/darker.app/App.xaml
@@ -1,13 +1,10 @@
 <Application x:Class="darker.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:darker"
-             xmlns:ui="http://schemas.modernwpf.com/2019">
+             xmlns:local="clr-namespace:darker">
     <Application.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Resources/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
+
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/darker.app/Properties/Resources.Designer.cs b/darker.app/Properties/Resources.Designer.cs
diff --git a/darker.app/SettingsWindow.xaml b/darker.app/SettingsWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:res="clr-namespace:darker.Properties"
         mc:Ignorable="d"
-        Title="{x:Static res:Resources.SettingsButton}" Height="450" Width="600" ResizeMode="NoResize"
+        Title="{x:Static res:Properties.SettingsButton}" Height="450" Width="600" ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Loaded="Window_Loaded">
     <TabControl>

diff --git a/darker.setup/setup.iss b/darker.setup/setup.iss
@@ -30,6 +30,7 @@ VersionInfoProductVersion=1.1.0.0
 SourceDir=C:\Users\angel\source\repos\darker\darker.setup
 MinVersion=0,10.0.18362
 UninstallDisplayIcon={app}\darker.exe
+VersionInfoDescription=darker is a tray application for quick theme (dark/light mode) switching on Windows 10
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
@@ -43,6 +44,9 @@ Source: "C:\Users\angel\source\repos\darker\darker.app\bin\Release\netcoreapp3.1
 Source: "C:\Users\angel\source\repos\darker\darker.app\bin\Release\netcoreapp3.1\publish\NotifyIconWpf.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\angel\source\repos\darker\darker.app\bin\Release\netcoreapp3.1\publish\Onova.dll"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: "..\darker.app\bin\Release\netcoreapp3.1\publish\ru-RU\darker.resources.dll"; DestDir: "{app}\ru-RU"; Flags: ignoreversion
+Source: "..\darker.app\bin\Release\netcoreapp3.1\fr-FR\darker.resources.dll"; DestDir: "{app}\fr-FR"; Flags: ignoreversion
+Source: "..\darker.app\bin\Release\netcoreapp3.1\uk-UA\darker.resources.dll"; DestDir: "{app}\uk-UA"; Flags: ignoreversion
 
 [Icons]
 Name: "{group}\darker"; Filename: "{app}\darker.exe"