v1.1.4 src/release.

- All video wallpapers have customizable options now. - LivelyProperties support for mpv player; customize the video player real-time! Documentation coming soon. - New mpv player gif playback option in settings - uses Integer/Nearest neighbor scaling for sharp image. - Web Browser can be muted using the global volume slider (require wallpaper restart.) - Improved some error messages related to LivelyProperties. - Updated youtube-dl binary. - Updated Magick.net and Xaml island libraries. - Updated Polish, German and Traditional Chinese translations.
rocksdanister · Nov 17, 2020 · 5e86e99 · 5e86e99
1 parent 5afefc1
commit 5e86e99
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -87,10 +87,10 @@ Help translate lively to other languages: <a href="https://github.com/rocksdanis
 
 **_I'm not officially affiliated with Unity technologies, godot, shadertoy;_**
 ## Download
-##### Latest version: v1.1.3.0 (Windows 10 1903 or above)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v1.1.3.0)
+##### Latest version: v1.1.4.0 (Windows 10 1903 or above)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v1.1.4.0)
 - [`Download Lively Wallpaper`][direct-full-win32] 
 
-[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.1.3.0/lively_setup_x86_full_v1130.exe
+[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.1.4.0/lively_setup_x86_full_v1140.exe
 
 **Installer will give Smartscreen warning, [discussion.](https://github.com/rocksdanister/lively/issues/9)**
 

diff --git a/src/livelywpf/livelywpf/Cef/LivelyProperties/Page/LivelyPropertiesView.xaml.cs b/src/livelywpf/livelywpf/Cef/LivelyProperties/Page/LivelyPropertiesView.xaml.cs
@@ -48,13 +48,18 @@ private void LoadUI()
             try
             {
                 this.livelyPropertyData = LivelyPropertiesJSON.LoadLivelyProperties(livelyPropertyPath);
-                //Path.Combine(Path.GetDirectoryName(wallpaperData.FilePath), "LivelyProperties.json"));
                 GenerateUIElements();
             }
-            catch (Exception e)
+            catch (NullReferenceException e1)
             {
-                Logger.Error(e.ToString());
-                Task.Run(() => (MessageBox.Show(e.ToString())));
+                Logger.Error(e1.ToString());
+                Task.Run(() => (MessageBox.Show("Customisation not supported/LivelyProperty file not found.\n" +
+                           "For videos only libMPV(External) player is currently supported.", Properties.Resources.TitleAppName)));
+            }
+            catch (Exception e2)
+            {
+                Logger.Error(e2.ToString());
+                Task.Run(() => (MessageBox.Show(e2.ToString(), Properties.Resources.TitleAppName)));
             }
         }
 
@@ -523,16 +528,34 @@ private void WallpaperSendMsg(string message)
             SetupDesktop.SendMessageWallpaper(screen, message);
         }
 
-        private void ReloadMenuValues()
-        {
-
-        }
-
         private bool RestoreOriginalPropertyFile()
         {
             bool status = false;
             try
             {
+                // TODO:
+                // Use DirectoryWatcher instead.
+                if (wallpaperData.LivelyInfo.Type == WallpaperType.video)
+                {
+                    var lpp = Path.Combine(wallpaperData.LivelyInfoFolderPath, "LivelyProperties.json");
+                    var dlpp = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
+                                "plugins", "libMPVPlayer", "api", "LivelyProperties.json");
+                    if (File.Exists(lpp))
+                    {
+                        if (!string.Equals(wallpaperData.LivelyPropertyPath, lpp, StringComparison.OrdinalIgnoreCase))
+                        {
+                            wallpaperData.LivelyPropertyPath = lpp;
+                        }
+                    }
+                    else
+                    {
+                        if (!string.Equals(wallpaperData.LivelyPropertyPath, dlpp, StringComparison.OrdinalIgnoreCase))
+                        {
+                            wallpaperData.LivelyPropertyPath = dlpp;
+                        }
+                    }
+                }
+
                 File.Copy(wallpaperData.LivelyPropertyPath, livelyPropertyPath, true);
                 status = true;
             }

diff --git a/src/livelywpf/livelywpf/DataJSON/ApplicationRulesJSON.cs b/src/livelywpf/livelywpf/DataJSON/ApplicationRulesJSON.cs
@@ -6,6 +6,8 @@
 
 namespace livelywpf
 {
+    // TODO:
+    // Use generics for all json save and read fn.
     class ApplicationRulesJSON
     {
         private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();

diff --git a/src/livelywpf/livelywpf/Views/Main/HelpView.xaml b/src/livelywpf/livelywpf/Views/Main/HelpView.xaml
@@ -38,11 +38,13 @@
                     Reddit
                 </Hyperlink>
                 </TextBlock>
+                <!--"
                 <TextBlock ToolTip="https://discord.gg/TwwtBCm">           
                 <Hyperlink Foreground="Gray" NavigateUri="https://discord.gg/TwwtBCm" RequestNavigate="Hyperlink_RequestNavigate">
                     Discord
                 </Hyperlink>
                 </TextBlock>
+                -->
                 <TextBlock ToolTip="https://www.deviantart.com/livelywallpaper/gallery/">           
                 <Hyperlink Foreground="Gray" NavigateUri="https://www.deviantart.com/livelywallpaper/gallery/" RequestNavigate="Hyperlink_RequestNavigate">
                     DeviantArt

diff --git a/src/livelywpf/livelywpf/livelywpf.csproj b/src/livelywpf/livelywpf/livelywpf.csproj
@@ -10,7 +10,7 @@
     <StartupObject>livelywpf.Program</StartupObject>
     <ApplicationIcon>appicon.ico</ApplicationIcon>
     <Version>1.0.0</Version>
-    <AssemblyVersion>1.1.3.2</AssemblyVersion>
+    <AssemblyVersion>1.1.4.0</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">