Skip to content

Commit

Permalink
release v1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
rocksdanister committed Jun 26, 2021
1 parent 29f985a commit ad9d7c9
Show file tree
Hide file tree
Showing 31 changed files with 217 additions and 33 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ Just drag & drop files, webpages to set as wallpaper..

**_I'm not officially affiliated with Unity technologies, godot, shadertoy;_**
## Download
##### Latest version: v1.6.0.4 (Windows 10 1903 or above)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v1.6.0.4)
##### Latest version: v1.7.0.0 (Windows 10 1903 or above)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v1.7.0.0)
- [`Installer`][direct-full-win32]

SHA256: 706f9e7176e1db242b79583aeeedcd3bad199e7d05da29775a678891601c0238
SHA256: a4fa1c2d2a61230af81a5633f06b77896ec3449d5c4b50cef41ad16d6746e21c

[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.6.0.4/lively_setup_x86_full_v1604.exe
[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.7.0.0/lively_setup_x86_full_v1700.exe

Installer will give Smartscreen warning, [discussion.](https://github.com/rocksdanister/lively/issues/9)

Expand Down
6 changes: 3 additions & 3 deletions src/installer/Script.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; https://jrsoftware.org/isinfo.php

#define MyAppName "Lively Wallpaper"
#define MyAppVersion "1.6.0.0"
#define MyAppVersion "1.7.0.0"
#define MyAppPublisher "rocksdanister"
#define MyAppURL "https://github.com/rocksdanister/lively"
#define MyAppExeName "livelywpf.exe"
Expand Down Expand Up @@ -72,7 +72,7 @@ Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType:

[Files]
Source: "VC\VC_redist.x86.exe"; DestDir: {tmp}; Flags: deleteafterinstall
Source: "dotnetcore\windowsdesktop-runtime-3.1.15-win-x86.exe"; DestDir: {tmp}; Flags: deleteafterinstall
Source: "dotnetcore\windowsdesktop-runtime-3.1.16-win-x86.exe"; DestDir: {tmp}; Flags: deleteafterinstall
Source: "dotnetcore\netcorecheck.exe"; DestDir: {tmp}; Flags: deleteafterinstall

; NOTE: Don't use "Flags: ignoreversion" on any shared system files
Expand All @@ -88,7 +88,7 @@ Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChang
;skipifsilent
Filename: "{tmp}\VC_redist.x86.exe"; Parameters: /install /quiet /norestart; Check: VCRedistNeedsInstall and DependencyInstall; StatusMsg: Installing Visual C++ Redistributable...
;todo:write loop for Check
Filename: "{tmp}\windowsdesktop-runtime-3.1.15-win-x86.exe"; Parameters: /install /quiet /norestart; Check: NetCoreNeedsInstall('3.1.7') and NetCoreNeedsInstall('3.1.8') and NetCoreNeedsInstall('3.1.9') and NetCoreNeedsInstall('3.1.10') and NetCoreNeedsInstall('3.1.11') and NetCoreNeedsInstall('3.1.12') and NetCoreNeedsInstall('3.1.13') and NetCoreNeedsInstall('3.1.14') and NetCoreNeedsInstall('3.1.15') and DependencyInstall; StatusMsg: Installing .Net Core 3.1...
Filename: "{tmp}\windowsdesktop-runtime-3.1.16-win-x86.exe"; Parameters: /install /quiet /norestart; Check: NetCoreNeedsInstall('3.1.7') and NetCoreNeedsInstall('3.1.8') and NetCoreNeedsInstall('3.1.9') and NetCoreNeedsInstall('3.1.10') and NetCoreNeedsInstall('3.1.11') and NetCoreNeedsInstall('3.1.12') and NetCoreNeedsInstall('3.1.13') and NetCoreNeedsInstall('3.1.14') and NetCoreNeedsInstall('3.1.15') and NetCoreNeedsInstall('3.1.16') and DependencyInstall; StatusMsg: Installing .Net Core 3.1...

[Code]
var
Expand Down
6 changes: 4 additions & 2 deletions src/livelywpf/livelywpf/Core/Wallpapers/VideoMpvPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,14 @@ public VideoMpvPlayer(string path, LibraryModel model, LivelyScreen display,
cmdArgs.Append("--geometry=-9999:0 ");
//always create gui window
cmdArgs.Append("--force-window=yes ");
//Don't move the window when clicking
//don't move the window when clicking
cmdArgs.Append("--no-window-dragging ");
//Don't hide cursor after sometime.
//don't hide cursor after sometime.
cmdArgs.Append("--cursor-autohide=no ");
//allow windows screensaver
cmdArgs.Append("--stop-screensaver=no ");
//disable mpv default (built-in) key bindings
cmdArgs.Append("--input-default-bindings=no ");
//video stretch algorithm
cmdArgs.Append(scalerArg + " ");
//on-screen-controller visibility
Expand Down
36 changes: 18 additions & 18 deletions src/livelywpf/livelywpf/Core/Wallpapers/WebEdge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class WebEdge : IWallpaper
{
private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
public event EventHandler<WindowInitializedArgs> WindowInitialized;
private IntPtr hwnd, hwndInput;
private IntPtr hwndWindow, hwndWebView;
private readonly WebView2Element player;
private readonly LibraryModel model;
private LivelyScreen display;
Expand Down Expand Up @@ -80,16 +80,6 @@ public void Close()
}));
}

public IntPtr GetHWND()
{
return hwnd;
}

public IntPtr GetHWNDInput()
{
return hwndInput;
}

public string GetLivelyPropertyCopyPath()
{
return livelyPropertyCopyPath;
Expand All @@ -115,16 +105,26 @@ public WallpaperType GetWallpaperType()
return model.LivelyInfo.Type;
}

public IntPtr GetHWND()
{
return hwndWindow;
}

public IntPtr GetHWNDInput()
{
return hwndWebView;
}

public void Pause()
{
//minimize browser.
NativeMethods.ShowWindow(GetHWND(), (uint)NativeMethods.SHOWWINDOW.SW_SHOWMINNOACTIVE);
NativeMethods.ShowWindow(hwndWebView, (uint)NativeMethods.SHOWWINDOW.SW_SHOWMINNOACTIVE);
}

public void Play()
{
//show minimized browser.
NativeMethods.ShowWindow(GetHWND(), (uint)NativeMethods.SHOWWINDOW.SW_SHOWNOACTIVATE);
NativeMethods.ShowWindow(hwndWebView, (uint)NativeMethods.SHOWWINDOW.SW_SHOWNOACTIVATE);
}

public void SendMessage(string msg)
Expand All @@ -139,7 +139,7 @@ public void SetScreen(LivelyScreen display)

public void SetVolume(int volume)
{

//todo
}

public async void Show()
Expand All @@ -150,7 +150,7 @@ public async void Show()
player.Closed += Player_Closed;
player.Show();
//visible window..
this.hwnd = new WindowInteropHelper(player).Handle;
this.hwndWindow = new WindowInteropHelper(player).Handle;

bool status = true;
Exception error = null;
Expand All @@ -162,12 +162,12 @@ public async void Show()
var parentHwnd = NativeMethods.FindWindowEx(tmpHwnd, IntPtr.Zero, "Chrome_WidgetWin_0", null);
if (!parentHwnd.Equals(IntPtr.Zero))
{
this.hwndInput = NativeMethods.FindWindowEx(parentHwnd, IntPtr.Zero, "Chrome_WidgetWin_1", null);
this.hwndWebView = NativeMethods.FindWindowEx(parentHwnd, IntPtr.Zero, "Chrome_WidgetWin_1", null);
}

if (this.hwndInput.Equals(IntPtr.Zero))
if (this.hwndWebView.Equals(IntPtr.Zero))
{
throw new Exception("Input handle null.");
throw new Exception("Webview input handle not found.");
}
}
catch (Exception e)
Expand Down
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.ar.resx
Original file line number Diff line number Diff line change
Expand Up @@ -843,4 +843,11 @@ Edge هو عرض الويب المدمج في windows 10.</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.ca.resx
Original file line number Diff line number Diff line change
Expand Up @@ -845,4 +845,11 @@ https://github.com/rocksdanister/lively/wiki</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.el.resx
Original file line number Diff line number Diff line change
Expand Up @@ -845,4 +845,11 @@ https://github.com/rocksdanister/lively/wiki</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Μάθε περισσότερα</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.es.resx
Original file line number Diff line number Diff line change
Expand Up @@ -845,4 +845,11 @@ https://github.com/rocksdanister/lively/wiki</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>La mayoría de pantallas modernas LCD y LED no sufren de quemado de pantalla, y por esa razón cualquier fondo de pantallas puede ser usado como salva pantallas.

Para pantallas OLED, Plasma o CRT que son susceptibles ha quemado y retención de imagen es recomendado el uso de salva pantallas con movimiento continuo, y que tenga un tema relativamente oscuro que ayuden a mitigar el quemado de la pantalla, pero la eficacia de este método no ah sido comprobado y no puede ser garantizado.

El objetivo principal del salva pantallas en Lively es ofrecer más posibilidades para personalizar tu PC. Usa el salva pantallas para proteger contra el quemado de pantalla bajo tu propio riesgo.</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.fa-IR.resx
Original file line number Diff line number Diff line change
Expand Up @@ -841,4 +841,11 @@ Edge is the built in webview of windows 10.</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.fil.resx
Original file line number Diff line number Diff line change
Expand Up @@ -843,4 +843,11 @@ https://github.com/rocksdanister/lively/wiki</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.fr.resx
Original file line number Diff line number Diff line change
Expand Up @@ -847,4 +847,11 @@ https://github.com/rocksdanister/lively/wiki</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.hi.resx
Original file line number Diff line number Diff line change
Expand Up @@ -847,4 +847,11 @@ https://github.com/rocksdanister/lively/wiki</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.hu.resx
Original file line number Diff line number Diff line change
Expand Up @@ -843,4 +843,11 @@ https://github.com/rocksdanister/lively/wiki</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.id.resx
Original file line number Diff line number Diff line change
Expand Up @@ -844,4 +844,11 @@ Semua proses: Lebih berat, memindai semua proses untuk menentukan tingkah laku p
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.it.resx
Original file line number Diff line number Diff line change
Expand Up @@ -847,4 +847,11 @@ https://github.com/rocksdanister/lively/wiki</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.ja.resx
Original file line number Diff line number Diff line change
Expand Up @@ -847,4 +847,11 @@ Edgeはwindows 10に組み込まれているWebビューです。</value>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
17 changes: 12 additions & 5 deletions src/livelywpf/livelywpf/Properties/Resources.ko.resx
Original file line number Diff line number Diff line change
Expand Up @@ -830,18 +830,25 @@ Edge는 Windows 10의 내장 웹뷰입니다.</value>
<value>소스 코드</value>
</data>
<data name="TitleScreensaver" xml:space="preserve">
<value>Screensaver</value>
<value>화면 보호기</value>
</data>
<data name="TipScreensaver" xml:space="preserve">
<value>After the selected inactivity period use the current wallpaper as your screensaver.</value>
<value>선택한 비활성 기간이 지나면 현재 배경 화면을 화면 보호기로 사용합니다.</value>
</data>
<data name="TextHours" xml:space="preserve">
<value>hours</value>
<value>시간</value>
</data>
<data name="TextMinutes" xml:space="preserve">
<value>minutes</value>
<value></value>
</data>
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
<value>더 알아보기</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/livelywpf/livelywpf/Properties/Resources.nl-NL.resx
Original file line number Diff line number Diff line change
Expand Up @@ -835,4 +835,11 @@ Alle processen: Heavier, Scant alle processen om afspeelmogelijkheden te bepalen
<data name="TextLearnMore" xml:space="preserve">
<value>Learn more</value>
</data>
<data name="DescOledScreensaverNotice" xml:space="preserve">
<value>Most modern LCD and LED displays do not suffer from burn-in issue and therefore any wallpaper can be used as screensaver.

For OLED, Plasma or CRT displays which are susceptibe to burn-in it is advised to use wallpaper with regular motion and an overall dark theme which is supposed to mitigate burn-in but this feature is untested and its effectiveness cannot be guaranteed.

The main purpose of Lively's screensavers is to add another layer of customization to your pc, use screensavers as burn-in protection at your own risk!</value>
</data>
</root>
Loading

0 comments on commit ad9d7c9

Please sign in to comment.