Skip to content

Commit

Permalink
release v1.7.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rocksdanister committed Nov 22, 2021
1 parent 6e04424 commit dde4d70
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 14 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ Its super easy.. barely an inconvenience, just drag & drop the files or webpages

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

SHA256: 8bf189dc5a0cdab5db905cbff4907d796d416f50df82eaedbc7e2c20e1a38cc2
SHA256: 94e57a8742a5221dab5bfbe09bcb1c91f138f6eb8e7a945fd588982b6bdd7dd4

[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.7.2.6/lively_setup_x86_full_v1726.exe
[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.7.4.0/lively_setup_x86_full_v1740.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.7.2.0"
#define MyAppVersion "1.7.4.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.19-win-x86.exe"; DestDir: {tmp}; Flags: deleteafterinstall
Source: "dotnetcore\windowsdesktop-runtime-3.1.21-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.19-win-x86.exe"; Parameters: /install /quiet /norestart; Check: NetCoreNeedsInstall('3.1.19') and DependencyInstall; StatusMsg: Installing .Net Core 3.1.19...
Filename: "{tmp}\windowsdesktop-runtime-3.1.21-win-x86.exe"; Parameters: /install /quiet /norestart; Check: NetCoreNeedsInstall('3.1.20') and DependencyInstall; StatusMsg: Installing .Net Core 3.1.21...

[Code]
var
Expand Down
12 changes: 12 additions & 0 deletions src/livelywpf/UWP/livelyPages/HelpPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@
</StackPanel>
</StackPanel>
</Button>

<!-- Starting in Windows 10, version 1607, the XAML framework provides a built in Boolean to Visibility converter.-->
<Button Visibility="{Binding Path=IsWinStore}" Style="{StaticResource ButtonRevealStyle}" BorderThickness="0" Background="Transparent" MinWidth="450" MaxWidth="450" MinHeight="50" HorizontalContentAlignment="Left" CornerRadius="5" Command="{Binding MSReviewCommand}">
<StackPanel Orientation="Horizontal">
<FontIcon Glyph="&#xEB68;" Margin="10" FontSize="25" Foreground="{ThemeResource SystemControlHighlightAltListAccentHighBrush}"/>
<StackPanel Orientation="Vertical" HorizontalAlignment="Left" MaxWidth="450">
<TextBlock Text="{x:Bind UIText.TitleStoreReview}"/>
<TextBlock Text="{x:Bind UIText.DescStoreReview}" FontSize="12" TextWrapping="Wrap" Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"/>
</StackPanel>
</StackPanel>
</Button>

</StackPanel>
</ScrollViewer>
</Grid>
Expand Down
2 changes: 2 additions & 0 deletions src/livelywpf/UWP/livelyPages/HelpPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ public class LocalizeText
public string TitleSourceCode { get; set; }
public string TitleReportBug { get; set; }
public string TitleSupport { get; set; }
public string TitleStoreReview { get; set; }
public string DescWebsite { get; set; }
public string DescDocumentation { get; set; }
public string DescCommunity { get; set; }
public string DescSourceCode { get; set; }
public string DescReportBug { get; set; }
public string DescSupport { get; set; }
public string DescStoreReview { get; set; }
}
}
}
1 change: 1 addition & 0 deletions src/livelywpf/livelyScreenSaver/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace livelyScreenSaver
{
//TODO: Make screensaver launcher run as long as screensaver is running and exit based on keyboard/mouse hook.
class Program
{
private static readonly string uniqueAppName = "LIVELY:DESKTOPWALLPAPERSYSTEM";
Expand Down
1 change: 0 additions & 1 deletion src/livelywpf/livelywpf/Core/Wallpapers/WebEdge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ private void Player_LivelyPropertiesInitialized(object sender, EventArgs e)
{
//Takes time for rendering window to spawn.. this should be enough.
_ = NativeMethods.GetWindowThreadProcessId(NativeMethods.FindWindowEx(InputHandle, IntPtr.Zero, "Intermediate D3D Window", null), out cefD3DRenderingSubProcessPid);
Logger.Debug("ID3DW: " + cefD3DRenderingSubProcessPid);
IsLoaded = true;
}

Expand Down
9 changes: 9 additions & 0 deletions src/livelywpf/livelywpf/Core/WinDesktopCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ public WinDesktopCore(IUserSettingsService userSettings,

ScreenHelper.DisplayUpdated += DisplaySettingsChanged_Hwnd;
WallpaperChanged += SetupDesktop_WallpaperChanged;

/*
SystemEvents.SessionSwitch += (s, e) => {
if (e.Reason == SessionSwitchReason.SessionUnlock)
{
ResetWallpaper();
}
};
*/
}

/// <summary>
Expand Down
2 changes: 2 additions & 0 deletions src/livelywpf/livelywpf/ViewModels/AboutViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public AboutViewModel(IAppUpdaterService appUpdater)
MenuUpdate(appUpdater.Status, appUpdater.LastCheckTime, appUpdater.LastCheckVersion);
appUpdater.UpdateChecked += AppUpdateChecked;
}

public bool IsNotWinStore => !Constants.ApplicationType.IsMSIX;

public string AppVersionText => "v" + Assembly.GetExecutingAssembly().GetName().Version.ToString() +
(Constants.ApplicationType.IsTestBuild ? "b" : (Constants.ApplicationType.IsMSIX ? " " + Properties.Resources.TitleStore : string.Empty));
Expand Down
16 changes: 15 additions & 1 deletion src/livelywpf/livelywpf/ViewModels/HelpViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace livelywpf.ViewModels
{
public class HelpViewModel : ObservableObject
{
//public bool IsWinStore => Program.IsMSIX;
public bool IsWinStore => Constants.ApplicationType.IsMSIX;

private RelayCommand _websiteCommand;
public RelayCommand WebsiteCommand
Expand Down Expand Up @@ -93,5 +93,19 @@ public RelayCommand SupportCommand
return _supportCommand;
}
}

private RelayCommand _mSReviewCommand;
public RelayCommand MSReviewCommand
{
get
{
if (_mSReviewCommand == null)
{
_mSReviewCommand = new RelayCommand(
param => LinkHandler.OpenBrowser("ms-windows-store://review/?ProductId=9NTM2QC6QWS7"));
}
return _mSReviewCommand;
}
}
}
}
12 changes: 7 additions & 5 deletions src/livelywpf/livelywpf/Views/Pages/AboutView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
Title="AboutView">

<Page.Resources>
<BooleanToVisibilityConverter x:Key="BoolToVis" />
<Storyboard x:Key="fidgetSpinner">
<DoubleAnimation
Storyboard.TargetProperty="RenderTransform.Angle"
Expand Down Expand Up @@ -66,12 +67,13 @@
MinWidth="200" MaxWidth="200" Margin="0, 0, 0, 10" Command="{Binding PrivacyDocCommand}"
ToolTip="https://github.com/rocksdanister/lively/blob/dev-v1.0-fluent-netcore/PRIVACY.md"/>
</StackPanel>

<TextBlock Text="{x:Static p:Resources.TitleUpdates}" FontSize="20" Margin="0, 25, 5, 0" TextAlignment="Center"/>
<TextBlock Text="{Binding UpdateStatusText}" Margin="0, 5, 5, 0" TextAlignment="Center"/>
<TextBlock Text="{Binding UpdateDateText}" Margin="0, 5, 5, 0" TextAlignment="Center"/>
<Button MinWidth="200" Margin="0, 5, 0, 0" HorizontalAlignment="Center" Content="{Binding UpdateCommandText}"
<StackPanel Visibility="{Binding Path=IsNotWinStore, Converter={StaticResource BoolToVis}}">
<TextBlock Text="{x:Static p:Resources.TitleUpdates}" FontSize="20" Margin="0, 25, 5, 0" TextAlignment="Center"/>
<TextBlock Text="{Binding UpdateStatusText}" Margin="0, 5, 5, 0" TextAlignment="Center"/>
<TextBlock Text="{Binding UpdateDateText}" Margin="0, 5, 5, 0" TextAlignment="Center"/>
<Button MinWidth="200" Margin="0, 5, 0, 0" HorizontalAlignment="Center" Content="{Binding UpdateCommandText}"
Command="{Binding UpdateAppCommand}"/>
</StackPanel>
</StackPanel>
</ScrollViewer>
</Grid>
Expand Down
2 changes: 2 additions & 0 deletions src/livelywpf/livelywpf/Views/Pages/HelpView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ private void HelpPageHost_ChildChanged(object sender, EventArgs e)
TitleDocumentation = Properties.Resources.TitleDocumentation,
TitleReportBug = Properties.Resources.TitleReportBug,
TitleSourceCode = Properties.Resources.TitleSourceCode,
TitleStoreReview = Properties.Resources.TitleStore,
DescStoreReview = Properties.Resources.TextStoreReview,
DescWebsite = Properties.Resources.DescOfficialWebpage,
DescReportBug = Properties.Resources.DescReportBug,
DescSourceCode = Properties.Resources.TextGitHubStar,
Expand Down
2 changes: 1 addition & 1 deletion src/livelywpf/livelywpf/livelywpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<StartupObject>livelywpf.Program</StartupObject>
<ApplicationIcon>appicon.ico</ApplicationIcon>
<Version>1.0.0</Version>
<AssemblyVersion>1.7.3.7</AssemblyVersion>
<AssemblyVersion>1.7.4.0</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
Expand Down

0 comments on commit dde4d70

Please sign in to comment.