Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Manual Download & Allow Ignoring Out of Date #14

Merged
merged 2 commits into from
Dec 30, 2024
Merged

Fix Manual Download & Allow Ignoring Out of Date #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94ae413
fix update manual download link
DEATHB4DEFEAT Dec 30, 2024
d2577da
allow ignoring out of date message
DEATHB4DEFEAT Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SS14.Launcher/Assets/Locale/en-US/text.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ main-window-out-of-date-desc-steam =
This launcher is out of date.
Please allow Steam to update the game.
main-window-out-of-date-exit = Exit
main-window-out-of-date-ignore = Ignore
main-window-out-of-date-download-manual = Download (manual)
main-window-early-access-title = Heads up!
main-window-early-access-desc = Space Station 14 is still very much in alpha. We hope you like what you see, and maybe even stick around, but make sure to keep your expectations modest for the time being.
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/ConfigConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static class ConfigConstants
public const string AccountRegisterUrl = $"{AccountBaseUrl}Register";
public const string AccountResendConfirmationUrl = $"{AccountBaseUrl}ResendEmailConfirmation";
public const string WebsiteUrl = "https://simplestation.org";
public const string DownloadUrl = "https://spacestation14.com/about/nightlies/";
public const string DownloadUrl = "https://github.com/Simple-Station/SimpleStationLauncher/releases/";
public const string NewsFeedUrl = "https://spacestation14.com/post/index.xml";
public const string TranslateUrl = "https://docs.spacestation14.com/en/general-development/contributing-translations.html";

Expand Down
5 changes: 5 additions & 0 deletions SS14.Launcher/ViewModels/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
{
// await Task.Delay(1000);
if (!ConfigConstants.DoVersionCheck)
return;

Check warning on line 175 in SS14.Launcher/ViewModels/MainWindowViewModel.cs

View workflow job for this annotation

GitHub Actions / build 

Unreachable code detected

Check warning on line 175 in SS14.Launcher/ViewModels/MainWindowViewModel.cs

View workflow job for this annotation

GitHub Actions / build 

Unreachable code detected

await _infoManager.LoadTask;
if (_infoManager.Model == null)
Expand All @@ -187,6 +187,11 @@
Log.Debug("Launcher out of date? {Value}", OutOfDate);
}

public void IgnorePressed()
{
OutOfDate = false;
}

public void ExitPressed()
{
Control?.Close();
Expand Down
4 changes: 3 additions & 1 deletion SS14.Launcher/Views/MainWindowContent.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
Text="{loc:Loc main-window-out-of-date-desc}" />
<DockPanel LastChildFill="False">
<Button DockPanel.Dock="Right" Content="{loc:Loc main-window-out-of-date-exit}"
Command="{Binding ExitPressed}" />
Command="{Binding ExitPressed}" Classes="OpenLeft" />
<Button DockPanel.Dock="Right" Content="{loc:Loc main-window-out-of-date-ignore}"
Command="{Binding IgnorePressed}" Classes="OpenRight" />
<Button DockPanel.Dock="Left" Content="{loc:Loc main-window-out-of-date-download-manual}"
Command="{Binding DownloadPressed}" />
</DockPanel>
Expand Down
Loading