Skip to content

Commit 96caa0b

Browse files
rocksdanisterrocksdanister
committed
patch
1 parent 2798b71 commit 96caa0b

15 files changed

+32
-33
lines changed

‎src/livelywpf/UWP/livelyPages/livelyPages.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
</ItemGroup>
134134
<ItemGroup>
135135
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
136-
<Version>6.2.12</Version>
136+
<Version>6.2.13</Version>
137137
</PackageReference>
138138
</ItemGroup>
139139
<ItemGroup>

‎src/livelywpf/UWP/livelyUserControls/livelyUserControls.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
</ItemGroup>
138138
<ItemGroup>
139139
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
140-
<Version>6.2.12</Version>
140+
<Version>6.2.13</Version>
141141
</PackageReference>
142142
</ItemGroup>
143143
<ItemGroup>

‎src/livelywpf/livelywpf/Core/Wallpapers/WebProcess.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public WebProcess(string path, ILibraryModel model, ILivelyScreen display, strin
6868
ProcessStartInfo start = new ProcessStartInfo
6969
{
7070
Arguments = cmdArgs.ToString(),
71-
FileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "plugins", "cef", "LivelyCefSharp.exe"),
71+
FileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "plugins", "cef", "Lively.PlayerCefSharp.exe"),
7272
RedirectStandardInput = true,
7373
RedirectStandardOutput = true,
7474
RedirectStandardError = true,

‎src/livelywpf/livelywpf/Core/WinDesktopCore.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using livelywpf.Views;
1414
using livelywpf.Views.Dialogues;
1515
using Microsoft.Extensions.DependencyInjection;
16+
using Microsoft.Win32;
1617
using System;
1718
using System.Collections.Generic;
1819
using System.Collections.ObjectModel;
@@ -63,14 +64,17 @@ public WinDesktopCore(IUserSettingsService userSettings,
6364
ScreenHelper.DisplayUpdated += DisplaySettingsChanged_Hwnd;
6465
WallpaperChanged += SetupDesktop_WallpaperChanged;
6566

66-
/*
6767
SystemEvents.SessionSwitch += (s, e) => {
6868
if (e.Reason == SessionSwitchReason.SessionUnlock)
6969
{
70-
ResetWallpaper();
70+
//Issue: https://github.com/rocksdanister/lively/issues/802
71+
if (!(IntPtr.Equals(DesktopWorkerW, IntPtr.Zero) || NativeMethods.IsWindow(DesktopWorkerW)))
72+
{
73+
Logger.Info("WorkerW invalid after unlock, resetting..");
74+
ResetWallpaper();
75+
}
7176
}
7277
};
73-
*/
7478
}
7579

7680
/// <summary>

‎src/livelywpf/livelywpf/Program.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static void Main()
5757
try
5858
{
5959
var server = new PipeServer(Constants.SingleInstance.PipeServerName);
60-
server.MessageReceived += Server_MessageReceived1;
60+
server.MessageReceived += (s, e) => App.Services.GetRequiredService<ICommandHandler>().ParseArgs(e);
6161
}
6262
catch (Exception e)
6363
{
@@ -84,11 +84,6 @@ public static void Main()
8484
}
8585
}
8686

87-
private static void Server_MessageReceived1(object sender, string[] msg)
88-
{
89-
App.Services.GetRequiredService<ICommandHandler>().ParseArgs(msg);
90-
}
91-
9287

9388
private static Views.SetupWizard.SetupView setupWizard = null;
9489
private static void App_Startup(object sender, StartupEventArgs e)

‎src/livelywpf/livelywpf/Services/ScreensaverService.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ private void ShowScreensavers()
187187
-1, //topmost
188188
userSettings.Settings.WallpaperArrangement != WallpaperArrangement.span ? item.Screen.Bounds.Left : 0,
189189
userSettings.Settings.WallpaperArrangement != WallpaperArrangement.span ? item.Screen.Bounds.Top : 0,
190-
0,
191-
0,
192-
0x0001))
190+
item.Screen.Bounds.Width,
191+
item.Screen.Bounds.Height,
192+
userSettings.Settings.WallpaperArrangement != WallpaperArrangement.span ? 0x0040 : 0x0001)) //ignore WxH if span
193193
{
194194
LogUtil.LogWin32Error("Failed to show screensaver");
195195
}

‎src/livelywpf/livelywpf/Systray.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private void CreateContextMenu()
106106

107107
_notifyIcon.ContextMenuStrip.Items.Add(new CustomContextMenu.StripSeparatorCustom().stripSeparator);
108108
_notifyIcon.ContextMenuStrip.Items.Add(Properties.Resources.TextSupport, Properties.Icons.icons8_heart_48).Click += (s, e) =>
109-
Helpers.LinkHandler.OpenBrowser("https://ko-fi.com/rocksdanister");
109+
Helpers.LinkHandler.OpenBrowser("https://rocksdanister.github.io/lively/coffee/");
110110
_notifyIcon.ContextMenuStrip.Items.Add(new CustomContextMenu.StripSeparatorCustom().stripSeparator);
111111
_notifyIcon.ContextMenuStrip.Items.Add(Properties.Resources.TitleReportBug, Properties.Icons.icons8_bug_50).Click += (s, e) =>
112112
Helpers.LinkHandler.OpenBrowser("https://github.com/rocksdanister/lively/wiki/Common-Problems");

‎src/livelywpf/livelywpf/ViewModels/AboutViewModel.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public RelayCommand LicenseDocCommand
9191
if (_licenseDocCommand == null)
9292
{
9393
_licenseDocCommand = new RelayCommand(
94-
param => ShowRtfDocDialog(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Docs", "license.rtf")));
94+
param => LinkHandler.OpenBrowser("https://github.com/rocksdanister/lively/blob/core-separation/LICENSE"));
9595
}
9696
return _licenseDocCommand;
9797
}
@@ -105,7 +105,7 @@ public RelayCommand AttribDocCommand
105105
if (_attribDocCommand == null)
106106
{
107107
_attribDocCommand = new RelayCommand(
108-
param => ShowRtfDocDialog(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Docs", "attribution.rtf")));
108+
param => LinkHandler.OpenBrowser("https://rocksdanister.github.io/lively/attribution/"));
109109
}
110110
return _attribDocCommand;
111111
}
@@ -119,7 +119,7 @@ public RelayCommand PrivacyDocCommand
119119
if (_privacyDocCommand == null)
120120
{
121121
_privacyDocCommand = new RelayCommand(
122-
param => LinkHandler.OpenBrowser("https://github.com/rocksdanister/lively/blob/dev-v1.0-fluent-netcore/PRIVACY.md"));
122+
param => LinkHandler.OpenBrowser("https://github.com/rocksdanister/lively/blob/core-separation/PRIVACY.md"));
123123
}
124124
return _privacyDocCommand;
125125
}

‎src/livelywpf/livelywpf/ViewModels/HelpViewModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public RelayCommand SupportCommand
8888
if (_supportCommand == null)
8989
{
9090
_supportCommand = new RelayCommand(
91-
param => LinkHandler.OpenBrowser("https://ko-fi.com/rocksdanister"));
91+
param => LinkHandler.OpenBrowser("https://rocksdanister.github.io/lively/coffee/"));
9292
}
9393
return _supportCommand;
9494
}

‎src/livelywpf/livelywpf/ViewModels/SettingsViewModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ public int SelectedScreensaverWaitIndex
901901
ScreensaverIdleTime.min45 => 2700000,
902902
ScreensaverIdleTime.min60 => 3600000,
903903
ScreensaverIdleTime.min120 => 7200000,
904-
_ => 300000,
904+
_ => 0,
905905
};
906906
if (idleTime != 0)
907907
{

‎src/livelywpf/livelywpf/Views/Dialogues/LibraryPreviewView.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,4 @@
132132
</ScrollViewer>
133133

134134
</Grid>
135-
</Window>
135+
</Window>

‎src/livelywpf/livelywpf/Views/MainWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@
7878
Margin="5,5,5,5"
7979
Navigating="ContentFrame_Navigating" />
8080
</Grid>
81-
</Window>
81+
</Window>

‎src/livelywpf/livelywpf/Views/MainWindow.xaml.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public MainWindow(IUserSettingsService userSettings, IDesktopCore desktopCore, S
4646
this.settingsVm = settingsVm;
4747

4848
InitializeComponent();
49-
wallpaperStatusText.Text = desktopCore.Wallpapers.Count.ToString();
49+
wallpaperStatusText.Text = $"{desktopCore.Wallpapers.Count} Active Wallpaper(s)";
5050
desktopCore.WallpaperChanged += SetupDesktop_WallpaperChanged;
5151
Logger.Debug("MainWindow ctor initialized..");
5252
}
@@ -222,7 +222,7 @@ private void SetupDesktop_WallpaperChanged(object sender, EventArgs e)
222222
{
223223
this.Activate();
224224
}
225-
wallpaperStatusText.Text = desktopCore.Wallpapers.Count.ToString();
225+
wallpaperStatusText.Text = $"{desktopCore.Wallpapers.Count} Active Wallpaper(s)";
226226
}));
227227
}
228228

‎src/livelywpf/livelywpf/livelywpf.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<StartupObject>livelywpf.Program</StartupObject>
1111
<ApplicationIcon>appicon.ico</ApplicationIcon>
1212
<Version>1.0.0</Version>
13-
<AssemblyVersion>1.7.4.2</AssemblyVersion>
13+
<AssemblyVersion>1.7.5.2</AssemblyVersion>
1414
</PropertyGroup>
1515

1616
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
@@ -28,25 +28,25 @@
2828
<ItemGroup>
2929
<PackageReference Include="CommandLineParser" Version="2.8.0" />
3030
<PackageReference Include="DesktopBridge.Helpers" Version="1.2.2" />
31-
<PackageReference Include="Downloader" Version="2.3.0" />
32-
<PackageReference Include="H.Hooks" Version="1.4.14" />
33-
<PackageReference Include="Magick.NET-Q16-x86" Version="8.4.0" />
31+
<PackageReference Include="Downloader" Version="2.3.3" />
32+
<PackageReference Include="H.Hooks" Version="1.4.21" />
33+
<PackageReference Include="Magick.NET-Q16-x86" Version="11.1.0" />
3434
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
3535
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
3636
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.1.2" />
3737
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.1.2" />
38-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1054.31" />
38+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1185.39" />
3939
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
4040
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22000.196" />
4141
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
4242
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
43-
<PackageReference Include="NLog" Version="4.7.12" />
43+
<PackageReference Include="NLog" Version="4.7.15" />
4444
<PackageReference Include="Octokit" Version="0.50.0" />
4545
<PackageReference Include="RawInput.Sharp" Version="0.0.4" />
4646
<PackageReference Include="ScreenRecorderLib" Version="3.1.2" />
4747
<PackageReference Include="Sentinel.NLogViewer" Version="1.3.3" />
4848
<PackageReference Include="SharpZipLib" Version="1.3.3" />
49-
<PackageReference Include="YoutubeExplode" Version="6.0.5" />
49+
<PackageReference Include="YoutubeExplode" Version="6.1.2" />
5050
</ItemGroup>
5151

5252
<ItemGroup>

‎src/livelywpf/rootuwp/rootuwp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
</ItemGroup>
148148
<ItemGroup>
149149
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
150-
<Version>6.2.12</Version>
150+
<Version>6.2.13</Version>
151151
</PackageReference>
152152
<PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
153153
<Version>6.1.3</Version>

0 commit comments

Comments
 (0)