Fix serious bugs related to theme manager

t1m0thyj · Aug 23, 2018 · cccc183 · cccc183
1 parent aadda1b
commit cccc183
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 23 deletions.
diff --git a/src/AboutDialog.Designer.cs b/src/AboutDialog.Designer.cs
diff --git a/src/AppContext.cs b/src/AppContext.cs
@@ -46,7 +46,7 @@ private void EnforceSingleInstance()
             if (!isFirstInstance)
             {
                 MessageBox.Show("Another instance of WinDynamicDesktop is already running. " +
-                    "You can access it by right-clicking the icon in the system tray.", "Error",
+                    "You can access it by clicking on the icon in the system tray.", "Error",
                     MessageBoxButtons.OK, MessageBoxIcon.Warning);
 
                 Environment.Exit(0);
@@ -82,7 +82,7 @@ public static void RunInBackground()
             {
                 notifyIcon.BalloonTipTitle = "WinDynamicDesktop";
                 notifyIcon.BalloonTipText = "The app is still running in the background. " +
-                    "You can access it at any time by right-clicking on this icon.";
+                    "You can access it at any time by clicking on the icon in the system tray.";
                 notifyIcon.ShowBalloonTip(10000);
 
                 JsonConfig.firstRun = false;    // Don't show this message again

diff --git a/src/InputDialog.Designer.cs b/src/InputDialog.Designer.cs
diff --git a/src/JsonConfig.cs b/src/JsonConfig.cs
@@ -43,6 +43,12 @@ public static void LoadConfig()
             {
                 lastJson = File.ReadAllText("settings.conf");
                 settings = JsonConvert.DeserializeObject<AppConfig>(lastJson);
+
+                // TEMPORARY HACK TO FIX BUG INTRODUCED IN LAST VERSION
+                if (settings.themeName == "")
+                {
+                    settings.themeName = "Mojave_Desert";
+                }
             }
         }
 
@@ -71,7 +77,7 @@ public static ThemeConfig LoadTheme(string name)
             }
             else
             {
-                themeJson = File.ReadAllText(name + ".json");
+                themeJson = File.ReadAllText(Path.Combine("themes", name + ".json"));
             }
 
             ThemeConfig theme = JsonConvert.DeserializeObject<ThemeConfig>(themeJson);

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyVersion("2.0.1")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/ThemeDialog.Designer.cs b/src/ThemeDialog.Designer.cs
diff --git a/src/ThemeDialog.cs b/src/ThemeDialog.cs
@@ -171,7 +171,7 @@ private void darkModeCheckbox_CheckedChanged(object sender, EventArgs e)
 
         private void okButton_Click(object sender, EventArgs e)
         {
-            JsonConfig.settings.themeName = listView1.SelectedItems[0].Name.Replace(' ', '_');
+            JsonConfig.settings.themeName = listView1.SelectedItems[0].Text.Replace(' ', '_');
 
             if (selectedIndex > 0)
             {

diff --git a/uwp/Package.appxmanifest b/uwp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap mp rescap desktop">
-  <Identity Name="38719TimothyJohnson.WinDynamicDesktop" Publisher="CN=3C822DA5-D64C-40A9-A84A-5502C3EDD8CD" Version="2.0.0.0" />
+  <Identity Name="38719TimothyJohnson.WinDynamicDesktop" Publisher="CN=3C822DA5-D64C-40A9-A84A-5502C3EDD8CD" Version="2.0.1.0" />
   <Properties>
     <DisplayName>WinDynamicDesktop</DisplayName>
     <PublisherDisplayName>Timothy Johnson</PublisherDisplayName>