Add Big Sur themes and update translations

t1m0thyj · Jun 25, 2020 · ba67cae · ba67cae
1 parent 44ccd6c
commit ba67cae
Show file tree

Hide file tree

Showing 30 changed files with 103 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Changelog
+
+## `4.2.0`
+
+* Add Big Sur and Big Sur Abstract themes
+* Add Bulgarian and Japanese translations (thanks Marin and Syoyusensation)
+* Improve error checking for theme JSON when new themes are installed
+* Fix check for updates failing on Windows 7
diff --git a/src/AboutDialog.cs b/src/AboutDialog.cs
@@ -33,7 +33,7 @@ public AboutDialog()
         private void AboutDialog_Load(object sender, EventArgs e)
         {
             iconBox.Image = (new Icon(Properties.Resources.AppIcon, 64, 64)).ToBitmap();
-            richTextBox1.Rtf = GetRtfText();
+            richTextBox1.Rtf = GetRtfUnicodeEscapedString(GetRtfText());
         }
 
         private string GetRtfLink(string href, string linkText = null)
@@ -68,6 +68,20 @@ private string GetRtfText()
                 @"\par }";
         }
 
+        // Code from https://stackoverflow.com/questions/1368020/how-to-output-unicode-string-to-rtf-using-c
+        private string GetRtfUnicodeEscapedString(string s)
+        {
+            var sb = new StringBuilder();
+            foreach (var c in s)
+            {
+                if (c <= 0x7f)
+                    sb.Append(c);
+                else
+                    sb.Append("\\u" + Convert.ToUInt32(c) + "?");
+            }
+            return sb.ToString();
+        }
+
         private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
         {
             System.Diagnostics.Process.Start(e.LinkText);

diff --git a/src/Localization.cs b/src/Localization.cs
@@ -68,9 +68,11 @@ private static void LoadLanguages()
             AddLanguage("Română", "ro");  // Romanian
             AddLanguage("Pусский", "ru");  // Russian
             AddLanguage("Türkçe", "tr");  // Turkish
+            AddLanguage("Български", "bg");  // Bulgarian
             AddLanguage("हिन्दी", "hi");  // Hindi
             AddLanguage("বাংলা", "bn");  // Bengali
             AddLanguage("中文 (简体)", "zh-Hans");  // Chinese (Simplified)
+            AddLanguage("日本語", "ja");  // Japanese
         }
 
         private static void AddLanguage(string languageName, string languageCode)

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("4.1.1")]
+[assembly: AssemblyVersion("4.2.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Properties/Resources.Designer.cs b/src/Properties/Resources.Designer.cs
diff --git a/src/Properties/Resources.resx b/src/Properties/Resources.resx
@@ -181,4 +181,16 @@
   <data name="locale_pt_br" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\locale\pt-br.mo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Big_Sur_Abstract_thumbnail" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\Big_Sur_Abstract_thumbnail.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Big_Sur_thumbnail" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\Big_Sur_thumbnail.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="locale_bg" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\locale\bg.mo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="locale_ja" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\locale\ja.mo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
diff --git a/src/WinDynamicDesktop.csproj b/src/WinDynamicDesktop.csproj
@@ -202,6 +202,7 @@
       <DependentUpon>ThemeDialog.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.manifest" />
+    <None Include="locale\bg.mo" />
     <None Include="locale\bn.mo" />
     <None Include="locale\cs.mo" />
     <None Include="locale\de.mo" />
@@ -211,6 +212,7 @@
     <None Include="locale\hi.mo" />
     <None Include="locale\id.mo" />
     <None Include="locale\it.mo" />
+    <None Include="locale\ja.mo" />
     <None Include="locale\mk.mo" />
     <None Include="locale\pl.mo" />
     <None Include="locale\pt-br.mo" />
@@ -239,14 +241,18 @@
     <None Include="resources\Solar_Gradients_thumbnail.jpg" />
     <None Include="resources\WinDynamicDesktop.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="resources\Big_Sur_Abstract_thumbnail.jpg" />
+    <Content Include="resources\Big_Sur_thumbnail.jpg" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
     <Error Condition="!Exists('packages\PropertyChanged.Fody.3.2.8\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\PropertyChanged.Fody.3.2.8\build\PropertyChanged.Fody.props'))" />
-    <Error Condition="!Exists('packages\Fody.6.1.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.1.2\build\Fody.targets'))" />
+    <Error Condition="!Exists('packages\Fody.6.2.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.2.0\build\Fody.targets'))" />
   </Target>
-  <Import Project="packages\Fody.6.1.2\build\Fody.targets" Condition="Exists('packages\Fody.6.1.2\build\Fody.targets')" />
+  <Import Project="packages\Fody.6.2.0\build\Fody.targets" Condition="Exists('packages\Fody.6.2.0\build\Fody.targets')" />
 </Project>
diff --git a/src/locale/bg.mo b/src/locale/bg.mo
diff --git a/src/locale/bn.mo b/src/locale/bn.mo
diff --git a/src/locale/cs.mo b/src/locale/cs.mo
diff --git a/src/locale/de.mo b/src/locale/de.mo
diff --git a/src/locale/el.mo b/src/locale/el.mo
diff --git a/src/locale/es.mo b/src/locale/es.mo
diff --git a/src/locale/fr.mo b/src/locale/fr.mo
diff --git a/src/locale/hi.mo b/src/locale/hi.mo
diff --git a/src/locale/id.mo b/src/locale/id.mo
diff --git a/src/locale/it.mo b/src/locale/it.mo
diff --git a/src/locale/ja.mo b/src/locale/ja.mo
diff --git a/src/locale/mk.mo b/src/locale/mk.mo
diff --git a/src/locale/pl.mo b/src/locale/pl.mo
diff --git a/src/locale/pt-br.mo b/src/locale/pt-br.mo
diff --git a/src/locale/ro.mo b/src/locale/ro.mo
diff --git a/src/locale/ru.mo b/src/locale/ru.mo
diff --git a/src/locale/tr.mo b/src/locale/tr.mo
diff --git a/src/locale/zh-Hans.mo b/src/locale/zh-Hans.mo
diff --git a/src/packages.config b/src/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Costura.Fody" version="4.1.0" targetFramework="net472" />
   <package id="DesktopBridge.Helpers" version="1.2.2" targetFramework="net472" />
-  <package id="Fody" version="6.1.2" targetFramework="net472" developmentDependency="true" />
+  <package id="Fody" version="6.2.0" targetFramework="net472" developmentDependency="true" />
   <package id="ImageListView" version="13.8.2" targetFramework="net472" />
   <package id="NamedPipeWrapper" version="1.5.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />

diff --git a/src/resources/Big_Sur_Abstract_thumbnail.jpg b/src/resources/Big_Sur_Abstract_thumbnail.jpg
diff --git a/src/resources/Big_Sur_thumbnail.jpg b/src/resources/Big_Sur_thumbnail.jpg
diff --git a/src/resources/default_themes.yaml b/src/resources/default_themes.yaml
@@ -1,11 +1,23 @@
+Big_Sur:
+- https://github.com/t1m0thyj/WDD-mac-themes/releases/download/big-sur/Big_Sur.ddw
+- https://onedrive.live.com/download?cid=CC2E3BD0360C1775&resid=CC2E3BD0360C1775%216182&authkey=AA94LmSmEKl9rhM
+
+Big_Sur_Abstract:
+- https://github.com/t1m0thyj/WDD-mac-themes/releases/download/big-sur/Big_Sur_Abstract.ddw
+- https://bitbucket.org/t1m0thyj/wdd-themes/downloads/Big_Sur_Abstract.ddw
+- https://onedrive.live.com/download?cid=CC2E3BD0360C1775&resid=CC2E3BD0360C1775%216183&authkey=ADevG8ifoBg_74Q
+
 Catalina:
-- https://onedrive.live.com/download?cid=CC2E3BD0360C1775&resid=CC2E3BD0360C1775%216180&authkey=AH0mox59q_XNNAA
+- https://github.com/t1m0thyj/WDD-mac-themes/releases/download/catalina/Catalina.ddw
 - https://bitbucket.org/t1m0thyj/wdd-themes/downloads/Catalina.ddw
+- https://onedrive.live.com/download?cid=CC2E3BD0360C1775&resid=CC2E3BD0360C1775%216180&authkey=AH0mox59q_XNNAA
 
 Mojave_Desert:
-- https://onedrive.live.com/download?cid=CC2E3BD0360C1775&resid=CC2E3BD0360C1775%216178&authkey=AOIt0bB-rq11U34
+- https://github.com/t1m0thyj/WDD-mac-themes/releases/download/mojave/Mojave_Desert.ddw
 - https://bitbucket.org/t1m0thyj/wdd-themes/downloads/Mojave_Desert.ddw
+- https://onedrive.live.com/download?cid=CC2E3BD0360C1775&resid=CC2E3BD0360C1775%216178&authkey=AOIt0bB-rq11U34
 
 Solar_Gradients:
-- https://onedrive.live.com/download?cid=CC2E3BD0360C1775&resid=CC2E3BD0360C1775%216179&authkey=AHKnzpdn1Ulhpb8
+- https://github.com/t1m0thyj/WDD-mac-themes/releases/download/mojave/Solar_Gradients.ddw
 - https://bitbucket.org/t1m0thyj/wdd-themes/downloads/Solar_Gradients.ddw
+- https://onedrive.live.com/download?cid=CC2E3BD0360C1775&resid=CC2E3BD0360C1775%216179&authkey=AHKnzpdn1Ulhpb8
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:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap uap3 mp rescap desktop">
-  <Identity Name="38719TimothyJohnson.WinDynamicDesktop" Publisher="CN=3C822DA5-D64C-40A9-A84A-5502C3EDD8CD" Version="4.1.1.0" />
+  <Identity Name="38719TimothyJohnson.WinDynamicDesktop" Publisher="CN=3C822DA5-D64C-40A9-A84A-5502C3EDD8CD" Version="4.2.0.0" />
   <Properties>
     <DisplayName>WinDynamicDesktop</DisplayName>
     <PublisherDisplayName>Timothy Johnson</PublisherDisplayName>