Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 66 additions & 0 deletions ShinRyuModManager-CE/Language/Views/MessageBoxWindow.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions ShinRyuModManager-CE/Language/Views/MessageBoxWindow.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>

<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">

</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>1.3</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Btn_Ok" xml:space="preserve">
<value>OK</value>
</data>
<data name="Btn_Cancel" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="Btn_DontRemindAgain" xml:space="preserve">
<value>Don't Remind Again</value>
</data>
</root>
5 changes: 2 additions & 3 deletions ShinRyuModManager-CE/ShinRyuModManager-CE.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>

<!-- Versioning -->
<AssemblyVersion>1.4.10</AssemblyVersion>
<AssemblyVersion>1.4.11</AssemblyVersion>
<VersionPrefix>$(AssemblyVersion)</VersionPrefix>
<AssemblyTitle>ShinRyuModManager-CE</AssemblyTitle>
<Company>SRMM Studio</Company>
<Product>ShinRyuModManager-CE</Product>
<Copyright>2025 SRMM Studio</Copyright>
<Copyright>2026 SRMM Studio</Copyright>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
</PropertyGroup>

Expand All @@ -31,7 +31,6 @@
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<VersionSuffix>$(BuildSuffix)</VersionSuffix>
<DebugType>embedded</DebugType>
<!--<PublishTrimmed Condition="'$(SelfContained)' == 'true'">true</PublishTrimmed>-->
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion ShinRyuModManager-CE/UserInterface/Assets/changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
> ### **%{color:gold} Version 1.4.10 %** ###
> ### **%{color:gold} Version 1.4.11 %** ###
* Various internal improvements to message boxes
* Added message for Linux users, directing to the wiki

---

> ### **%{color:orange} Version 1.4.10 %** ###
* Fixed logic bug in check for Version.dll
* Massive improvements in memory usage for CPK repacking

Expand Down
7 changes: 7 additions & 0 deletions ShinRyuModManager-CE/UserInterface/MessageBoxResult.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace ShinRyuModManager.UserInterface;

public enum MessageBoxResult {
Ok,
Cancel,
DontRemind
}
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private async void InstallOrUpdate_OnClick(object sender, RoutedEventArgs e) {
Log.Fatal(ex, "Failed to install library!");

var window = TopLevel.GetTopLevel(this) as Window;
_ = await MessageBoxWindow.Show(window, "Fatal", "An error has occurred.\nPlease check\"srmm_errors.txt\" for more info.");
await MessageBoxWindow.Show(window, "Fatal", "An error has occurred.\nPlease check\"srmm_errors.txt\" for more info.");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
namespace ShinRyuModManager.UserInterface.ViewModels;

public partial class MessageBoxWindowViewModel : ViewModelBase {
[ObservableProperty] private string _messageText;
[ObservableProperty] private bool _isVisible;
[ObservableProperty] private bool _showCancel;
[ObservableProperty] private bool _showDontRemind;

public MessageBoxWindowViewModel() { }
public MessageBoxWindowViewModel() {
ShowCancel = true;
ShowDontRemind = true;
}

public MessageBoxWindowViewModel(string messageText, bool isVisible) {
MessageText = messageText;
IsVisible = isVisible;
public MessageBoxWindowViewModel(bool showCancel, bool dontRemindButton) {
ShowCancel = showCancel;
ShowDontRemind = dontRemindButton;
}
}
Loading
Loading