diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..661a922
--- /dev/null
+++ 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
index cf94fc2..7f29e45 100644
--- 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
index 9730973..4b5041c 100644
--- 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
index 5764afc..ea080d0 100644
--- 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
index df19c6a..57b0959 100644
--- a/src/Properties/Resources.Designer.cs
+++ b/src/Properties/Resources.Designer.cs
@@ -70,6 +70,26 @@ internal static System.Drawing.Icon AppIcon {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap Big_Sur_Abstract_thumbnail {
+ get {
+ object obj = ResourceManager.GetObject("Big_Sur_Abstract_thumbnail", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap Big_Sur_thumbnail {
+ get {
+ object obj = ResourceManager.GetObject("Big_Sur_thumbnail", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -90,6 +110,16 @@ internal static byte[] default_themes {
}
}
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] locale_bg {
+ get {
+ object obj = ResourceManager.GetObject("locale_bg", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Byte[].
///
@@ -180,6 +210,16 @@ internal static byte[] locale_it {
}
}
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] locale_ja {
+ get {
+ object obj = ResourceManager.GetObject("locale_ja", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Byte[].
///
diff --git a/src/Properties/Resources.resx b/src/Properties/Resources.resx
index 7798283..dcdcd6a 100644
--- a/src/Properties/Resources.resx
+++ b/src/Properties/Resources.resx
@@ -181,4 +181,16 @@
..\locale\pt-br.mo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\resources\Big_Sur_Abstract_thumbnail.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\resources\Big_Sur_thumbnail.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\locale\bg.mo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\locale\ja.mo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
\ No newline at end of file
diff --git a/src/WinDynamicDesktop.csproj b/src/WinDynamicDesktop.csproj
index 3792778..a9a1e9e 100644
--- a/src/WinDynamicDesktop.csproj
+++ b/src/WinDynamicDesktop.csproj
@@ -202,6 +202,7 @@
ThemeDialog.cs
+
@@ -211,6 +212,7 @@
+
@@ -239,6 +241,10 @@
+
+
+
+
@@ -246,7 +252,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/locale/bg.mo b/src/locale/bg.mo
new file mode 100644
index 0000000..111b8ae
Binary files /dev/null and b/src/locale/bg.mo differ
diff --git a/src/locale/bn.mo b/src/locale/bn.mo
index f588276..0c409cb 100644
Binary files a/src/locale/bn.mo and b/src/locale/bn.mo differ
diff --git a/src/locale/cs.mo b/src/locale/cs.mo
index 6d588dc..9dd5ba8 100644
Binary files a/src/locale/cs.mo and b/src/locale/cs.mo differ
diff --git a/src/locale/de.mo b/src/locale/de.mo
index 7f1f3fc..861a2e3 100644
Binary files a/src/locale/de.mo and b/src/locale/de.mo differ
diff --git a/src/locale/el.mo b/src/locale/el.mo
index 1179f02..ba96b7a 100644
Binary files a/src/locale/el.mo and b/src/locale/el.mo differ
diff --git a/src/locale/es.mo b/src/locale/es.mo
index 0eaa265..3923013 100644
Binary files a/src/locale/es.mo and b/src/locale/es.mo differ
diff --git a/src/locale/fr.mo b/src/locale/fr.mo
index f6b9045..ad94b02 100644
Binary files a/src/locale/fr.mo and b/src/locale/fr.mo differ
diff --git a/src/locale/hi.mo b/src/locale/hi.mo
index 234102d..12713e1 100644
Binary files a/src/locale/hi.mo and b/src/locale/hi.mo differ
diff --git a/src/locale/id.mo b/src/locale/id.mo
index 95e23f8..c57e5cb 100644
Binary files a/src/locale/id.mo and b/src/locale/id.mo differ
diff --git a/src/locale/it.mo b/src/locale/it.mo
index db08b0c..1f0ecaa 100644
Binary files a/src/locale/it.mo and b/src/locale/it.mo differ
diff --git a/src/locale/ja.mo b/src/locale/ja.mo
new file mode 100644
index 0000000..16bfdc4
Binary files /dev/null and b/src/locale/ja.mo differ
diff --git a/src/locale/mk.mo b/src/locale/mk.mo
index 99e2ee5..467d9b0 100644
Binary files a/src/locale/mk.mo and b/src/locale/mk.mo differ
diff --git a/src/locale/pl.mo b/src/locale/pl.mo
index dcd07cb..4bd934e 100644
Binary files a/src/locale/pl.mo and b/src/locale/pl.mo differ
diff --git a/src/locale/pt-br.mo b/src/locale/pt-br.mo
index f539a79..30c5028 100644
Binary files a/src/locale/pt-br.mo and b/src/locale/pt-br.mo differ
diff --git a/src/locale/ro.mo b/src/locale/ro.mo
index e2ce238..c049226 100644
Binary files a/src/locale/ro.mo and b/src/locale/ro.mo differ
diff --git a/src/locale/ru.mo b/src/locale/ru.mo
index 40dcdb0..28d6976 100644
Binary files a/src/locale/ru.mo and b/src/locale/ru.mo differ
diff --git a/src/locale/tr.mo b/src/locale/tr.mo
index fbeed5e..d022d8a 100644
Binary files a/src/locale/tr.mo and b/src/locale/tr.mo differ
diff --git a/src/locale/zh-Hans.mo b/src/locale/zh-Hans.mo
index 44e03a1..23712ce 100644
Binary files a/src/locale/zh-Hans.mo and b/src/locale/zh-Hans.mo differ
diff --git a/src/packages.config b/src/packages.config
index bbd8d67..993fe47 100644
--- a/src/packages.config
+++ b/src/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/src/resources/Big_Sur_Abstract_thumbnail.jpg b/src/resources/Big_Sur_Abstract_thumbnail.jpg
new file mode 100644
index 0000000..b2c74b5
Binary files /dev/null and b/src/resources/Big_Sur_Abstract_thumbnail.jpg differ
diff --git a/src/resources/Big_Sur_thumbnail.jpg b/src/resources/Big_Sur_thumbnail.jpg
new file mode 100644
index 0000000..68934e0
Binary files /dev/null and b/src/resources/Big_Sur_thumbnail.jpg differ
diff --git a/src/resources/default_themes.yaml b/src/resources/default_themes.yaml
index 0f2b3ab..10c3bb9 100644
--- 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
index f2b3588..90d9cc4 100644
--- a/uwp/Package.appxmanifest
+++ b/uwp/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
WinDynamicDesktop
Timothy Johnson