Merge pull request #31 from rocksdanister/dev-build

src v0.9.5
rocksdanister · Mar 26, 2020 · 2232b4d · 2232b4d
2 parents 6278d81 + fc5f452
commit 2232b4d
Show file tree

Hide file tree

Showing 22 changed files with 1,857 additions and 149 deletions.
diff --git a/README.md b/README.md
@@ -97,17 +97,17 @@ 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: v0.9.0.0 (Windows 10, 8.1)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v0.9.0.0)
+##### Latest version: v0.9.5.0 (Windows 10, 8.1)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v0.9.5.0)
 - [`Download Lively Installer`][direct-full-win32]  
    _102MB, Web wallpaper support & some sample wallpapers included._
 - [`Download Lively Portable`][direct-full-portable-win32]  
   _111MB, (No Installation) Web wallpaper support & some sample wallpapers included._
 
 **Portable build: Latest Visual C++ Redistributable is required: [vc_redist.x86.exe](https://aka.ms/vs/16/release/vc_redist.x86.exe)**
 
-[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v0.9.0.0/lively_setup_x86_full_v0900.exe
+[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v0.9.5.0/lively_setup_x86_full_v0950.exe
 
-[direct-full-portable-win32]: https://github.com/rocksdanister/lively/releases/download/v0.9.0.0/lively_portable_x86_full_v0900.zip
+[direct-full-portable-win32]: https://github.com/rocksdanister/lively/releases/download/v0.9.5.0/lively_portable_x86_full_v0950.zip
 
 **Installer will give Smartscreen warning, [discussion.](https://github.com/rocksdanister/lively/issues/9)**
 

diff --git a/src/livelywpf/livelywpf/App.config b/src/livelywpf/livelywpf/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 <!--
   <system.diagnostics>
@@ -34,4 +34,19 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
     </startup>
 
+  <runtime>
+
+       <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
+            <dependentAssembly>
+
+                 <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+
+                 <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+
+            </dependentAssembly>
+
+       </assemblyBinding>
+
+  </runtime>
 </configuration>
diff --git a/src/livelywpf/livelywpf/MainWindow.xaml b/src/livelywpf/livelywpf/MainWindow.xaml
@@ -449,7 +449,7 @@
                                 (3) Foreground Process algorithm has some limitations, check wiki for more information.<LineBreak/>(4) Application Rules has the highest priority.
                                 <LineBreak/>(5) Web browser is being minimized instead of pausing, so you will see wallpaper temporarily reverting to default in some cases; fix is coming soon.</TextBlock>-->
 
-                                <Label Content="Audio:" Style="{StaticResource labelGreenH1}"/>
+                                <Label Content="Audio" Style="{StaticResource labelGreenH1}"/>
                                 <Controls:ToggleSwitch Name="audioFocusedToggle" Header="{x:Static p:Resources.txtOtherAppsFocus}" ></Controls:ToggleSwitch>
                                 <ScrollViewer Height="180" Visibility="Collapsed" >
                                     <TextBlock TextWrapping="WrapWithOverflow" Foreground="{DynamicResource AccentColorBrush2}" Text="{x:Static p:Resources.txtNotes}"  />
@@ -503,7 +503,14 @@
                             </StackPanel>
 
                             <StackPanel Orientation="Vertical" Margin="15,5,0,0" Width="265" Height="500">
-
+                                <Label Content="Interaction" Style="{StaticResource labelGreenH1}"/>
+                                <ComboBox Name="comboBoxWpInputSettings">
+                                    <ComboBoxItem Content="{x:Static p:Resources.txtOff}" />
+                                    <ComboBoxItem IsSelected="True" Content="{x:Static p:Resources.txtMouse}"/>
+                                    <ComboBoxItem IsEnabled="False" Content="Mouse + KB"/>
+                                </ComboBox>
+                                <Label Content="{x:Static p:Resources.txtOtherAppsFocus}" FontSize="14.667" />
+                                <CheckBox Name="chkboxMouseOtherAppsFocus" Margin="2.5,2.5,0,0" Content="{x:Static p:Resources.txtMouse}"/>
                             </StackPanel>
 
                             <StackPanel Orientation="Vertical" Margin="15,5,0,0" Width="265" Height="500">

diff --git a/src/livelywpf/livelywpf/MainWindow.xaml.cs b/src/livelywpf/livelywpf/MainWindow.xaml.cs
@@ -57,6 +57,7 @@ public partial class MainWindow : MetroWindow
 
         private Release gitRelease = null;
         private string gitUrl = null;
+        RawInputDX DesktopInputForward = null;
 
         public MainWindow()
         {
@@ -166,6 +167,7 @@ public MainWindow()
                 Logger.Info("Skipping all-process algorthm on multiscreen(in-development)");
                 comboBoxPauseAlgorithm.SelectedIndex = (int)ProcessMonitorAlgorithm.foreground; //event will save settings.
             }
+
         }
 
         private async void RestoreSaveSettings()
@@ -248,6 +250,33 @@ private async void RestoreSaveSettings()
             update_traybtn.Enabled = true;
         }
 
+        #region wp_input_setup
+        private void WallpaperInputForwardingToggle(bool isEnable)
+        {
+            if (isEnable)
+            {
+                if (DesktopInputForward == null)
+                {
+                    DesktopInputForward = new RawInputDX();
+                    DesktopInputForward.Closing += DesktopInputForward_Closing;
+                    DesktopInputForward.Show();
+                }
+            }
+            else
+            {
+                if (DesktopInputForward != null)
+                {
+                    DesktopInputForward.Close();
+                }
+            }
+        }
+
+        private void DesktopInputForward_Closing(object sender, CancelEventArgs e)
+        {
+            DesktopInputForward = null;
+        }
+        #endregion
+
         #region git_update
 
         Dialogues.AppUpdate appUpdateWindow = null;
@@ -1509,6 +1538,25 @@ await this.ShowMessageAsync(Properties.Resources.msgDeletionFailureTitle, Proper
             wallpapersLV.SelectedIndex = -1; //clears selectedTile info panel.
 
             FileOperations.DeleteDirectoryAsync(selection.LivelyInfoDirectoryLocation);
+            try
+            {   
+                //Delete LivelyProperties.info copy folder.
+                string[] wpdataDir = Directory.GetDirectories(Path.Combine(App.PathData, "SaveData", "wpdata"));
+                var wpFolderName = new System.IO.DirectoryInfo(selection.LivelyInfoDirectoryLocation).Name;
+                for (int i = 0; i < wpdataDir.Length; i++)
+                {
+                    var item = new System.IO.DirectoryInfo(wpdataDir[i]).Name;
+                    if (wpFolderName.Equals(item, StringComparison.Ordinal))
+                    {
+                        FileOperations.DeleteDirectoryAsync(wpdataDir[i]);
+                        break;
+                    }
+                }
+            }
+            catch(Exception ex)
+            {
+                Logger.Error(ex.ToString());
+            }
         }
 
         #endregion wallpaper_library
@@ -2606,6 +2654,29 @@ private void SubcribeUI()
             comboBoxVideoPlayerScaling.SelectionChanged += ComboBoxVideoPlayerScaling_SelectionChanged;
             comboBoxGIFPlayerScaling.SelectionChanged += ComboBoxGIFPlayerScaling_SelectionChanged;
             comboBoxBatteryPerf.SelectionChanged += ComboBoxBatteryPerf_SelectionChanged;
+            comboBoxWpInputSettings.SelectionChanged += ComboBoxWpInputSettings_SelectionChanged;
+            chkboxMouseOtherAppsFocus.Checked += ChkboxMouseOtherAppsFocus_Checked;
+            chkboxMouseOtherAppsFocus.Unchecked += ChkboxMouseOtherAppsFocus_Checked;
+        }
+
+        private void ChkboxMouseOtherAppsFocus_Checked(object sender, RoutedEventArgs e)
+        {
+            SaveData.config.MouseInputMovAlways = chkboxMouseOtherAppsFocus.IsChecked.Value;
+            SaveData.SaveConfig();
+        }
+
+        private void ComboBoxWpInputSettings_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if(comboBoxWpInputSettings.SelectedIndex == 0)
+            {
+                WallpaperInputForwardingToggle(false);
+            }
+            else if(comboBoxWpInputSettings.SelectedIndex == 1)
+            {
+                WallpaperInputForwardingToggle(true);
+            }
+            SaveData.config.InputForwardMode = comboBoxWpInputSettings.SelectedIndex;
+            SaveData.SaveConfig();
         }
 
         private void ComboBoxBatteryPerf_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -2698,11 +2769,28 @@ private void AppMuteToggle_IsCheckedChanged(object sender, EventArgs e)
 
         private void RestoreMenuSettings()
         {
-            if(!App.isPortableBuild)
+            chkboxMouseOtherAppsFocus.IsChecked = SaveData.config.MouseInputMovAlways;
+
+            if (SaveData.config.InputForwardMode == 1)
             {
-                lblPortableTxt.Visibility = Visibility.Collapsed;
+                WallpaperInputForwardingToggle(true);
             }
 
+            try
+            {
+                comboBoxWpInputSettings.SelectedIndex = SaveData.config.InputForwardMode;
+            }
+            catch(ArgumentOutOfRangeException)
+            {
+                SaveData.config.InputForwardMode = 1;
+                SaveData.SaveConfig();
+                comboBoxWpInputSettings.SelectedIndex = 1;
+            }
+
+            if (!App.isPortableBuild)
+            {
+                lblPortableTxt.Visibility = Visibility.Collapsed;
+            }
 
             if (SaveData.config.AppTransparency)
             {

diff --git a/src/livelywpf/livelywpf/Properties/AssemblyInfo.cs b/src/livelywpf/livelywpf/Properties/AssemblyInfo.cs
@@ -51,5 +51,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("0.9.0.0")]
+[assembly: AssemblyVersion("0.9.5.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/livelywpf/livelywpf/Properties/Resources.Designer.cs b/src/livelywpf/livelywpf/Properties/Resources.Designer.cs
diff --git a/src/livelywpf/livelywpf/Properties/Resources.es.resx b/src/livelywpf/livelywpf/Properties/Resources.es.resx
@@ -548,6 +548,9 @@ Para solo aplicar un archivo como fondo de pantalla, esto no es necesario; solo
   <data name="txtLabelAppName" xml:space="preserve">
     <value>Lively</value>
   </data>
+  <data name="txtLabelInteraction" xml:space="preserve">
+    <value>Interacción</value>
+  </data>
   <data name="txtLabelRule" xml:space="preserve">
     <value>Regla</value>
   </data>
@@ -609,6 +612,9 @@ NO inicie programas como CHROME o STEAM.. que crean múltiples subprocesos.
   <data name="txtMoreWp" xml:space="preserve">
     <value>Más fondos de pantalla ...</value>
   </data>
+  <data name="txtMouse" xml:space="preserve">
+    <value>Ratón</value>
+  </data>
   <data name="txtMsgFillAllFields" xml:space="preserve">
     <value>Rellene todos los espacios requeridos.</value>
   </data>

diff --git a/src/livelywpf/livelywpf/Properties/Resources.hi.resx b/src/livelywpf/livelywpf/Properties/Resources.hi.resx
@@ -722,4 +722,10 @@ CHROME, STEAM .. जैसे कार्यक्रम न चलाएं,
   <data name="txtMoreWp" xml:space="preserve">
     <value>अधिक वॉलपेपर ...</value>
   </data>
+  <data name="txtLabelInteraction" xml:space="preserve">
+    <value>इंटरेक्शन</value>
+  </data>
+  <data name="txtMouse" xml:space="preserve">
+    <value>चूहा</value>
+  </data>
 </root>
diff --git a/src/livelywpf/livelywpf/Properties/Resources.it.resx b/src/livelywpf/livelywpf/Properties/Resources.it.resx
@@ -548,6 +548,9 @@ Per far partire il file come wallpaper, non è un requistio; sposta il file e ri
   <data name="txtLabelAppName" xml:space="preserve">
     <value>Lively</value>
   </data>
+  <data name="txtLabelInteraction" xml:space="preserve">
+    <value>Interazione</value>
+  </data>
   <data name="txtLabelRule" xml:space="preserve">
     <value>Regola/e</value>
   </data>
@@ -609,6 +612,9 @@ CI SARANNO BUGS &amp; CRASHES, CONTINUA CON PRUDENZA!!!</value>
   <data name="txtMoreWp" xml:space="preserve">
     <value>Più sfondi ...</value>
   </data>
+  <data name="txtMouse" xml:space="preserve">
+    <value>topo</value>
+  </data>
   <data name="txtMsgFillAllFields" xml:space="preserve">
     <value>Riempi tutti i requisiti scritti.</value>
   </data>

diff --git a/src/livelywpf/livelywpf/Properties/Resources.ja.resx b/src/livelywpf/livelywpf/Properties/Resources.ja.resx
@@ -548,6 +548,9 @@ Windows 7が設定されている場合-最適な外観と調整適用します
   <data name="txtLabelAppName" xml:space="preserve">
     <value>活気のある</value>
   </data>
+  <data name="txtLabelInteraction" xml:space="preserve">
+    <value>インタラクション</value>
+  </data>
   <data name="txtLabelRule" xml:space="preserve">
     <value>ルール</value>
   </data>
@@ -609,6 +612,9 @@ Windows 7が設定されている場合-最適な外観と調整適用します
   <data name="txtMoreWp" xml:space="preserve">
     <value>その他の壁紙...</value>
   </data>
+  <data name="txtMouse" xml:space="preserve">
+    <value>マウス</value>
+  </data>
   <data name="txtMsgFillAllFields" xml:space="preserve">
     <value>必要なすべてのテキストフィールドに入力します。</value>
   </data>