Merge pull request #12 from rocksdanister/dev-build

Dev build
rocksdanister · Feb 8, 2020 · 40f20a4 · 40f20a4
2 parents 412fa54 + b2a74fc
commit 40f20a4
Show file tree

Hide file tree

Showing 38 changed files with 2,229 additions and 508 deletions.
diff --git a/README.md b/README.md
@@ -49,10 +49,10 @@ Help translate lively to other languages: <a href="https://github.com/rocksdanis
 ![demo-gif7](/resources/html.gif?raw=true "html")
 
 <a href="http://louie.co.nz/25th_hour/"> 25th Hour</a> by Loius Coyle
-* Chromium Embedded Framework.
 * Load HTML file or web address as wallpaper.
 * Runs webgl, javascript .. basically anything that works on chrome.
 * Audio Reactive Wallpaper support, create wallpapers that react to <a href="https://github.com/rocksdanister/lively/wiki/Web-Guide-II-:-System-Audio-Data">system audio</a>
+* Customisation support, <a href="https://github.com/rocksdanister/lively/wiki/Web-Guide-IV-:-Interaction">documentation.</a>
 #### Shaders
 ![demo-gif7](/resources/shadertoy.gif?raw=true "htmlshadertoy") 
 
@@ -75,6 +75,7 @@ Help translate lively to other languages: <a href="https://github.com/rocksdanis
 * Experimentail, works for some.
 #### & more:
 - Easy to use, Just drag & drop media files & webpages into lively window to set it as wallpaper.
+- Real-time customisable web wallpaper support.
 - Easy to share Lively-zip format, just drag & drop the zip file to import it into Library, use the built-in creator to make them (ensures compatibility).
 - Hardware accelerated video playback, with option to use external Directshow codec of your choice. ( LAV(recommended), K-Lite, Kawaii Codec..)
 - Library to browse and preview wallpapers.
@@ -96,13 +97,13 @@ 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.6.5.0 (Windows 10, 8.1)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v0.6.5.0)
-- [`setup.exe`][direct-full-win32]  
-   _98MB, Web wallpaper support & some sample wallpapers included._
-
-**From v0.6.5 onwards lively will be in installer form, new userdata & plugins location is “Documents\Lively Wallpaper”.**
+##### Latest version: v0.8.0.0 (Windows 10, 8.1)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v0.8.0.0)
+- [`Download`][direct-full-win32]  
+   _90MB, Web wallpaper support & some sample wallpapers included._
+   
+**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.6.5.0/lively_setup_x86_full_v0650.exe
+[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v0.8.0.0/lively_setup_x86_full_v0800.exe
 
 [Trouble Getting started? ](https://github.com/rocksdanister/lively/wiki/Getting-Started)
 

diff --git a/src/lively setup/Inno.iss b/src/lively setup/Inno.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Lively Wallpaper"
-#define MyAppVersion "0.6.5.0"
+#define MyAppVersion "0.8.0.0"
 #define MyAppPublisher "rocksdanister"
 #define MyAppURL "https://github.com/rocksdanister/lively"
 #define MyAppExeName "livelywpf.exe"
@@ -94,17 +94,26 @@ Name: "cef"; Description: "Web Wallpaper Support"; Types: full
 Name: "wallpapers"; Description: "Sample Wallpapers"; Types: full
 
 [Files]
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 Source: "Release\livelywpf.exe"; DestDir: "{app}"; Flags: ignoreversion;Components: program
 Source: "Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: program
 Source: "Lively Wallpaper\external\cef\*"; DestDir: "{userdocs}\Lively Wallpaper\external\cef"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: cef
-Source: "Lively Wallpaper\wallpapers\*"; DestDir: "{userdocs}\Lively Wallpaper\wallpapers"; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist uninsneveruninstall; Components: wallpapers
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: "Lively Wallpaper\wallpapers\*"; DestDir: "{userdocs}\Lively Wallpaper\wallpapers"; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist uninsneveruninstall; Components: wallpapers; Check: ShouldInstallWallpapers
+; pushing new set of wp's with customisation to existing users, shouldInstallWallpaper check will be added from later version onwards..
+Source: "Lively Wallpaper\wallpapers new\*"; DestDir: "{userdocs}\Lively Wallpaper\wallpapers"; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist uninsneveruninstall; Components: wallpapers;
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall 
+;skipifsilent
+
 [Code]
+var
+  isAlreadyInstalled: Boolean;
+
 // event fired when the uninstall step is changed: https://stackoverflow.com/revisions/12645836/1
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 begin
@@ -123,12 +132,6 @@ begin
   end;
 end;
 
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall 
-;skipifsilent
-
-[Code]
-
 //Uninstall previous install: https://stackoverflow.com/questions/2000296/inno-setup-how-to-automatically-uninstall-previous-installed-version
 //note: Inno does not delete files, it just overwrites & keeps the old ones if they have different name..it can get accumulated/confusing when program structure change?!
 function GetUninstallString(): String;
@@ -164,16 +167,22 @@ begin
 
   // default return value
   Result := 0;
-
   // get the uninstall string of the old app
   sUnInstallString := GetUninstallString();
   if sUnInstallString <> '' then begin
     sUnInstallString := RemoveQuotes(sUnInstallString);
     if Exec(sUnInstallString, '/VERYSILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
-      Result := 3
+      begin
+        isAlreadyInstalled := True;
+        Result := 3;
+      end
     else
+      begin
+      isAlreadyInstalled := True;
       Result := 2;
+      end
   end else
+    isAlreadyInstalled := False;
     Result := 1;
 end;
 
@@ -189,3 +198,7 @@ begin
   end;
 end;
 
+function ShouldInstallWallpapers: Boolean;
+begin
+    Result := not isAlreadyInstalled;
+end;
diff --git a/src/livelywpf/livelywpf/App.xaml.cs b/src/livelywpf/livelywpf/App.xaml.cs
@@ -107,11 +107,22 @@ protected override void OnStartup(StartupEventArgs e)
             // you can then use the current theme and custom accent instead set a new theme
             Tuple<AppTheme, Accent> appStyle = ThemeManager.DetectAppStyle(Application.Current);
 
-
-            // setting accent & theme
-            ThemeManager.ChangeAppStyle(Application.Current,
+            //white theme disabled temp: for v0.8
+            if (SaveData.config.Theme == 9 || SaveData.config.Theme == 10)
+            {
+                SaveData.config.Theme = 0;
+                SaveData.SaveConfig();
+                ThemeManager.ChangeAppStyle(Application.Current,
                                         ThemeManager.GetAccent(SaveData.livelyThemes[SaveData.config.Theme].Accent),
                                         ThemeManager.GetAppTheme(SaveData.livelyThemes[SaveData.config.Theme].Base)); // or appStyle.Item1
+            }
+            else
+            {
+                // setting accent & theme
+                ThemeManager.ChangeAppStyle(Application.Current,
+                                            ThemeManager.GetAccent(SaveData.livelyThemes[SaveData.config.Theme].Accent),
+                                            ThemeManager.GetAppTheme(SaveData.livelyThemes[SaveData.config.Theme].Base)); // or appStyle.Item1
+            }
 
             // now change app style to the custom accent and current theme
             //ThemeManager.ChangeAppStyle(Application.Current, ThemeManager.GetAccent("CustomAccent1"), ThemeManager.GetAppTheme(SaveData.livelyThemes[SaveData.config.Theme].Base));