From 29af23fa46b726dd101eac211ca8326593ef38e9 Mon Sep 17 00:00:00 2001 From: WeeXnes <54072019+WeeXnes@users.noreply.github.com> Date: Thu, 10 Nov 2022 21:05:31 +0100 Subject: [PATCH 01/12] Create dotnet-framework.yml --- .github/workflows/dotnet-framework.yml | 37 ++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/dotnet-framework.yml diff --git a/.github/workflows/dotnet-framework.yml b/.github/workflows/dotnet-framework.yml new file mode 100644 index 0000000..62a4245 --- /dev/null +++ b/.github/workflows/dotnet-framework.yml @@ -0,0 +1,37 @@ +name: .NET Framework + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1 + + - name: Setup NuGet + uses: NuGet/setup-nuget@v1.1.1 + + - name: Navigate to Workspace + run: cd $GITHUB_WORKSPACE + + - name: Format Xaml to XML + run: (gc Weexnes\WeeXnes.csproj) -replace ' ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"', '' | Out-File -encoding ASCII formatted.csproj + shell: pwsh + + - uses: bbonkr/get-version-action@v1.0.4 + id: get_version + with: + project: "formatted.csproj" + - name: logging + run: | + echo "Version=${{ steps.get_version.outputs.version }}" + From 1f3a5fe70dca4dbd3a36ca5a818f70e7501164e4 Mon Sep 17 00:00:00 2001 From: WeeXnes <54072019+WeeXnes@users.noreply.github.com> Date: Thu, 10 Nov 2022 21:09:33 +0100 Subject: [PATCH 02/12] Update dotnet-framework.yml --- .github/workflows/dotnet-framework.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-framework.yml b/.github/workflows/dotnet-framework.yml index 62a4245..3878a1c 100644 --- a/.github/workflows/dotnet-framework.yml +++ b/.github/workflows/dotnet-framework.yml @@ -23,6 +23,14 @@ jobs: - name: Navigate to Workspace run: cd $GITHUB_WORKSPACE + - name: Restore Packages + run: nuget restore WeeXnes.sln + + - name: Build Solution + run: | + msbuild.exe WeeXnes.sln /p:DeleteExistingFiles=True /p:platform="Any CPU" /p:configuration="Release" + + - name: Format Xaml to XML run: (gc Weexnes\WeeXnes.csproj) -replace ' ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"', '' | Out-File -encoding ASCII formatted.csproj shell: pwsh @@ -34,4 +42,5 @@ jobs: - name: logging run: | echo "Version=${{ steps.get_version.outputs.version }}" - + + From 1c50d0fc105c2ee2a5e9cc384de92f0678bce159 Mon Sep 17 00:00:00 2001 From: WeeXnes <54072019+WeeXnes@users.noreply.github.com> Date: Thu, 10 Nov 2022 21:14:19 +0100 Subject: [PATCH 03/12] Update dotnet-framework.yml --- .github/workflows/dotnet-framework.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/dotnet-framework.yml b/.github/workflows/dotnet-framework.yml index 3878a1c..86174e4 100644 --- a/.github/workflows/dotnet-framework.yml +++ b/.github/workflows/dotnet-framework.yml @@ -30,6 +30,17 @@ jobs: run: | msbuild.exe WeeXnes.sln /p:DeleteExistingFiles=True /p:platform="Any CPU" /p:configuration="Release" + - name: List Folder 1 + run: dir D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\ + - name: List Folder 2 + run: dir D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes_UAC\bin\Release\ + - name: List Folder 3 + run: dir D:\a\WeeXnesSuite\WeeXnesSuite\Autostart\bin\Release\ + - name: List Folder 4 + run: dir D:\a\WeeXnesSuite\WeeXnesSuite\Update\bin\Release\ + - name: List Folder 5 + run: dir D:\a\WeeXnesSuite\WeeXnesSuite\Release_Tool\bin\Release\ + - name: Format Xaml to XML run: (gc Weexnes\WeeXnes.csproj) -replace ' ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"', '' | Out-File -encoding ASCII formatted.csproj From f71d888685e326a7fba7c44f2d88cd77120d37ee Mon Sep 17 00:00:00 2001 From: WeeXnes <54072019+WeeXnes@users.noreply.github.com> Date: Thu, 10 Nov 2022 21:23:59 +0100 Subject: [PATCH 04/12] Update dotnet-framework.yml --- .github/workflows/dotnet-framework.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/dotnet-framework.yml b/.github/workflows/dotnet-framework.yml index 86174e4..1cc654a 100644 --- a/.github/workflows/dotnet-framework.yml +++ b/.github/workflows/dotnet-framework.yml @@ -53,5 +53,21 @@ jobs: - name: logging run: | echo "Version=${{ steps.get_version.outputs.version }}" + + - name: Packing Zip + run: Compress-Archive + D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\WeeXnes.exe, + D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes_UAC\bin\Release\WeeXnes_UAC.exe, + D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\DiscordRPC.dll, + D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\Newtonsoft.Json.dll, + D:\a\WeeXnesSuite\WeeXnesSuite\Autostart\bin\Release\Autostart.exe, + Update\bin\Release\Update.exe + -CompressionLevel Optimal -DestinationPath packed.zip + shell: pwsh + + + - name: Check for Zip + run: dir + From 7fffd247191ad74985ddf0223e344bdce4f762fe Mon Sep 17 00:00:00 2001 From: WeeXnes <54072019+WeeXnes@users.noreply.github.com> Date: Thu, 10 Nov 2022 21:31:25 +0100 Subject: [PATCH 05/12] Update dotnet-framework.yml --- .github/workflows/dotnet-framework.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/dotnet-framework.yml b/.github/workflows/dotnet-framework.yml index 1cc654a..850e5c3 100644 --- a/.github/workflows/dotnet-framework.yml +++ b/.github/workflows/dotnet-framework.yml @@ -69,5 +69,26 @@ jobs: - name: Check for Zip run: dir + + + - name: release + uses: actions/create-release@v1 + id: create_release + with: + draft: false + prerelease: false + release_name: v${{ steps.get_version.outputs.version }} + tag_name: ${{ steps.get_version.outputs.version }} + env: + GITHUB_TOKEN: ${{ github.token }} + - name: upload windows artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: D:\a\WeeXnesSuite\WeeXnesSuite\packed.zip + asset_name: currentRelease_${{ steps.get_version.outputs.version }}.zip + asset_content_type: application/zip From dfc72ed8c7707b6c2e489523ed8ece1b63b0c707 Mon Sep 17 00:00:00 2001 From: WeeXnes Date: Fri, 11 Nov 2022 00:02:25 +0100 Subject: [PATCH 06/12] adjusted responsive ui --- WeeXnes/Core/Globals.cs | 2 +- WeeXnes/MVVM/View/KeyManagerView.xaml | 15 ++++++++------- WeeXnes/MainWindow.xaml | 8 +++++++- WeeXnes/WeeXnes.csproj | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs index 572a4bc..aa2f9d7 100644 --- a/WeeXnes/Core/Globals.cs +++ b/WeeXnes/Core/Globals.cs @@ -16,7 +16,7 @@ namespace WeeXnes.Core public static string encryptionKey = "8zf5#RdyQ]$4x4_"; public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes"); public static string SettingsFileName = "settings.ini"; - public static string version = "3.6.4"; + public static string version = "3.6.6"; public static bool info_isRpcRunning = false; public static bool info_RpcAutoStart; public static string apiUrl = "http://weexnes.com:5169/"; diff --git a/WeeXnes/MVVM/View/KeyManagerView.xaml b/WeeXnes/MVVM/View/KeyManagerView.xaml index 9a24634..261fdaa 100644 --- a/WeeXnes/MVVM/View/KeyManagerView.xaml +++ b/WeeXnes/MVVM/View/KeyManagerView.xaml @@ -45,6 +45,7 @@ + - + + Background="#1c1e23" Tag="Name"/> + Background="#1c1e23" Tag="Value"/> - + + + diff --git a/WeeXnes/MVVM/View/KeyManagerView.xaml b/WeeXnes/MVVM/View/KeyManagerView.xaml index 261fdaa..0a9bde3 100644 --- a/WeeXnes/MVVM/View/KeyManagerView.xaml +++ b/WeeXnes/MVVM/View/KeyManagerView.xaml @@ -82,6 +82,7 @@ Margin="15,0,0,0" Click="AddButton_Click" Content="Add" + Foreground="DarkGray" Background="#1c1e23" Style="{StaticResource UniversalMaterialButton}" /> diff --git a/WeeXnes/MVVM/View/SettingView.xaml b/WeeXnes/MVVM/View/SettingView.xaml index ad84bea..fbecb0a 100644 --- a/WeeXnes/MVVM/View/SettingView.xaml +++ b/WeeXnes/MVVM/View/SettingView.xaml @@ -66,6 +66,7 @@ Style="{StaticResource UniversalMaterialButton}" Content="Check for Updates" Background="#2f313b" + Foreground="DarkGray" Height="25" Click="CheckForUpdateBtn_OnClick" Margin="4,10,4,0"/> @@ -74,6 +75,7 @@ Style="{StaticResource UniversalMaterialButton}" Content="Create Startmenu Entry" Background="#2f313b" + Foreground="DarkGray" Height="25" Click="CreateShortcut_OnClick" Margin="4,10,4,0"/> @@ -82,6 +84,7 @@ Style="{StaticResource UniversalMaterialButton}" Content="Open AppData Folder" Background="#2f313b" + Foreground="DarkGray" Height="25" Margin="4,10,4,0" Click="OpenAppdataFolder_Click"/> @@ -139,6 +142,7 @@ Style="{StaticResource UniversalMaterialButton}" Content="Set Default ClientID" Background="#2f313b" + Foreground="DarkGray" Height="25" Click="SaveDefaultID_Click" Margin="4,10,4,0"/> @@ -166,6 +170,7 @@ Style="{StaticResource UniversalMaterialButton}" Content="Set Rpc Files Path" Background="#2f313b" + Foreground="DarkGray" Height="25" Click="SetRpcLocation_OnClick" Margin="4,10,4,0"/> @@ -173,6 +178,7 @@ Style="{StaticResource UniversalMaterialButton}" Content="Set Default Path" Background="#2f313b" + Foreground="DarkGray" Height="25" Click="SetRpcLocationDefault_OnClick" Margin="4,10,4,0"/> @@ -233,6 +239,7 @@ Style="{StaticResource UniversalMaterialButton}" Content="Set Key Files Path" Background="#2f313b" + Foreground="DarkGray" Height="25" Click="SetKeyLocation_OnClick" Margin="4,10,4,0"/> @@ -240,6 +247,7 @@ Style="{StaticResource UniversalMaterialButton}" Content="Set Default Path" Background="#2f313b" + Foreground="DarkGray" Height="25" Click="SetKeyLocationDefault_OnClick" Margin="4,10,4,0"/> diff --git a/WeeXnes/Misc/CriticalMessage.xaml b/WeeXnes/Misc/CriticalMessage.xaml index 3aaee94..9ae1eac 100644 --- a/WeeXnes/Misc/CriticalMessage.xaml +++ b/WeeXnes/Misc/CriticalMessage.xaml @@ -44,6 +44,7 @@ Content="OK" Width="140" Height="40" + Foreground="DarkGray" Background="#520b16" Name="okButton" Click="okButton_Click" diff --git a/WeeXnes/Misc/Message.xaml b/WeeXnes/Misc/Message.xaml index f612030..51c96f0 100644 --- a/WeeXnes/Misc/Message.xaml +++ b/WeeXnes/Misc/Message.xaml @@ -45,6 +45,7 @@ Width="140" Height="40" Background="#2f313b" + Foreground="DarkGray" Name="okButton" Click="okButton_Click" Margin="0,0,0,20"/> diff --git a/WeeXnes/Misc/UpdateMessage.xaml b/WeeXnes/Misc/UpdateMessage.xaml index f6fcb77..750bccc 100644 --- a/WeeXnes/Misc/UpdateMessage.xaml +++ b/WeeXnes/Misc/UpdateMessage.xaml @@ -58,6 +58,7 @@ Content="OK" Width="140" Height="40" + Foreground="DarkGray" Background="#2f313b" Name="okButton" Click="OkButton_OnClick" @@ -67,6 +68,7 @@ Content="CANCEL" Width="140" Height="40" + Foreground="DarkGray" Background="#2f313b" Name="cancelButton" Click="CancelButton_OnClick" diff --git a/WeeXnes/Theme/ControlButtonTheme.xaml b/WeeXnes/Theme/ControlButtonTheme.xaml index ec41277..16608aa 100644 --- a/WeeXnes/Theme/ControlButtonTheme.xaml +++ b/WeeXnes/Theme/ControlButtonTheme.xaml @@ -64,7 +64,7 @@ + Foreground="{TemplateBinding Foreground}"/> diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj index bc71dd0..9102a7c 100644 --- a/WeeXnes/WeeXnes.csproj +++ b/WeeXnes/WeeXnes.csproj @@ -4,7 +4,7 @@ Debug AnyCPU - 3.6.7 + 3.6.8 {4B33CEE7-C74D-43B9-B99A-8B273D5195BC} WinExe WeeXnes From 67a5085f9a7b64c8f7da11714250f28bba8cc1b1 Mon Sep 17 00:00:00 2001 From: WeeXnes Date: Fri, 11 Nov 2022 17:48:00 +0100 Subject: [PATCH 09/12] added missing gui changes --- WeeXnes/Core/Globals.cs | 2 +- WeeXnes/MVVM/View/DiscordRpcView.xaml | 14 +- WeeXnes/MVVM/View/KeyManagerView.xaml | 36 +++- WeeXnes/MVVM/View/SettingView.xaml | 296 +++++++++++++++++++++++++- WeeXnes/MVVM/View/SettingView.xaml.cs | 2 +- WeeXnes/WeeXnes.csproj | 2 +- 6 files changed, 335 insertions(+), 17 deletions(-) diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs index bedbdcc..d623a2f 100644 --- a/WeeXnes/Core/Globals.cs +++ b/WeeXnes/Core/Globals.cs @@ -16,7 +16,7 @@ namespace WeeXnes.Core public static string encryptionKey = "8zf5#RdyQ]$4x4_"; public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes"); public static string SettingsFileName = "settings.ini"; - public static string version = "3.6.8"; + public static string version = "3.6.9"; public static bool info_isRpcRunning = false; public static bool info_RpcAutoStart; public static string apiUrl = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest"; diff --git a/WeeXnes/MVVM/View/DiscordRpcView.xaml b/WeeXnes/MVVM/View/DiscordRpcView.xaml index 60b4822..b05ba3f 100644 --- a/WeeXnes/MVVM/View/DiscordRpcView.xaml +++ b/WeeXnes/MVVM/View/DiscordRpcView.xaml @@ -151,7 +151,8 @@ Margin="20,0,0,5" Foreground="DarkGray" Background="#212329" - Content="Save"> + Content="Save" + Cursor="Hand"> @@ -192,7 +193,7 @@ - diff --git a/WeeXnes/MVVM/View/SettingView.xaml b/WeeXnes/MVVM/View/SettingView.xaml index fbecb0a..e0883e0 100644 --- a/WeeXnes/MVVM/View/SettingView.xaml +++ b/WeeXnes/MVVM/View/SettingView.xaml @@ -69,7 +69,42 @@ Foreground="DarkGray" Height="25" Click="CheckForUpdateBtn_OnClick" - Margin="4,10,4,0"/> + Margin="4,10,4,0" + Cursor="Hand"> + + + + + + + + + + + + + + + + + + + + + + @@ -145,7 +250,42 @@ Foreground="DarkGray" Height="25" Click="SaveDefaultID_Click" - Margin="4,10,4,0"/> + Margin="4,10,4,0" + Cursor="Hand"> + + + + + + + + + + + + + + + + + + + + + + + Margin="4,10,4,0" + Cursor="Hand"> + + + + + + + + + + + + + + + + + + + + + + @@ -242,7 +452,42 @@ Foreground="DarkGray" Height="25" Click="SetKeyLocation_OnClick" - Margin="4,10,4,0"/> + Margin="4,10,4,0" + Cursor="Hand"> + + + + + + + + + + + + + + + + + + + + + + diff --git a/WeeXnes/MVVM/View/SettingView.xaml.cs b/WeeXnes/MVVM/View/SettingView.xaml.cs index 73b068b..3722287 100644 --- a/WeeXnes/MVVM/View/SettingView.xaml.cs +++ b/WeeXnes/MVVM/View/SettingView.xaml.cs @@ -306,7 +306,7 @@ namespace WeeXnes.MVVM.View } catch (Exception ex) { - Misc.Message error = new Misc.Message(ex.ToString()); + Misc.CriticalMessage error = new Misc.CriticalMessage(ex.ToString()); error.Show(); } diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj index 9102a7c..2f57a2e 100644 --- a/WeeXnes/WeeXnes.csproj +++ b/WeeXnes/WeeXnes.csproj @@ -4,7 +4,7 @@ Debug AnyCPU - 3.6.8 + 3.6.9 {4B33CEE7-C74D-43B9-B99A-8B273D5195BC} WinExe WeeXnes From 623a8acdf75c2c6284a9f3b54bab4aa2193cd03a Mon Sep 17 00:00:00 2001 From: WeeXnes Date: Tue, 15 Nov 2022 09:24:13 +0100 Subject: [PATCH 10/12] finished gui overhaul --- WeeXnes/Core/Globals.cs | 2 +- WeeXnes/MainWindow.xaml | 60 ++++++++++++++++++++++++++- WeeXnes/Theme/ControlButtonTheme.xaml | 4 +- WeeXnes/WeeXnes.csproj | 2 +- 4 files changed, 62 insertions(+), 6 deletions(-) diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs index d623a2f..485e280 100644 --- a/WeeXnes/Core/Globals.cs +++ b/WeeXnes/Core/Globals.cs @@ -16,7 +16,7 @@ namespace WeeXnes.Core public static string encryptionKey = "8zf5#RdyQ]$4x4_"; public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes"); public static string SettingsFileName = "settings.ini"; - public static string version = "3.6.9"; + public static string version = "3.7.0"; public static bool info_isRpcRunning = false; public static bool info_RpcAutoStart; public static string apiUrl = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest"; diff --git a/WeeXnes/MainWindow.xaml b/WeeXnes/MainWindow.xaml index 4dd8140..5d2dc60 100644 --- a/WeeXnes/MainWindow.xaml +++ b/WeeXnes/MainWindow.xaml @@ -162,9 +162,37 @@ HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,50,0" + Background="#25272e" Style="{StaticResource ModernMinimizeButton}" Grid.Column="1" - Visibility="Hidden"/> + Visibility="Hidden" + Cursor="Hand"> + + + + + + + + + + + + + + + + + + + + + Background="{TemplateBinding Property=Background}"> + Background="{TemplateBinding Property=Background}"> Debug AnyCPU - 3.6.9 + 3.7.0 {4B33CEE7-C74D-43B9-B99A-8B273D5195BC} WinExe WeeXnes From 277541a20ce5ca6cccc1ef1156ab575dcbb691ab Mon Sep 17 00:00:00 2001 From: WeeXnes Date: Tue, 15 Nov 2022 10:50:16 +0100 Subject: [PATCH 11/12] added custom context menu for listbox/listview --- WeeXnes/Core/Globals.cs | 2 +- WeeXnes/MVVM/View/DiscordRpcView.xaml | 30 +++++++++++++++++++++++- WeeXnes/MVVM/View/DiscordRpcView.xaml.cs | 29 +++++++++++++++++++++++ WeeXnes/MVVM/View/KeyManagerView.xaml | 27 +++++++++++++++++++++ WeeXnes/MVVM/View/KeyManagerView.xaml.cs | 29 +++++++++++++++++++++++ WeeXnes/MainWindow.xaml | 20 ++++++++++++++++ WeeXnes/WeeXnes.csproj | 2 +- 7 files changed, 136 insertions(+), 3 deletions(-) diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs index 485e280..dbcb936 100644 --- a/WeeXnes/Core/Globals.cs +++ b/WeeXnes/Core/Globals.cs @@ -16,7 +16,7 @@ namespace WeeXnes.Core public static string encryptionKey = "8zf5#RdyQ]$4x4_"; public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes"); public static string SettingsFileName = "settings.ini"; - public static string version = "3.7.0"; + public static string version = "3.7.1"; public static bool info_isRpcRunning = false; public static bool info_RpcAutoStart; public static string apiUrl = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest"; diff --git a/WeeXnes/MVVM/View/DiscordRpcView.xaml b/WeeXnes/MVVM/View/DiscordRpcView.xaml index b05ba3f..0d30e9b 100644 --- a/WeeXnes/MVVM/View/DiscordRpcView.xaml +++ b/WeeXnes/MVVM/View/DiscordRpcView.xaml @@ -41,7 +41,35 @@ Name="RpcItemList" Foreground="White" SelectionChanged="RpcItemList_SelectionChanged" - MouseDoubleClick="RpcItemList_MouseDoubleClick"/> + MouseDoubleClick="RpcItemList_MouseDoubleClick"> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WeeXnes/MVVM/View/DiscordRpcView.xaml.cs b/WeeXnes/MVVM/View/DiscordRpcView.xaml.cs index 2ff76f5..2727530 100644 --- a/WeeXnes/MVVM/View/DiscordRpcView.xaml.cs +++ b/WeeXnes/MVVM/View/DiscordRpcView.xaml.cs @@ -228,6 +228,11 @@ namespace WeeXnes.MVVM.View Games.Add(game); } } + else + { + Games.Clear(); + } + } public void LoadGamesIntoListBox() { @@ -258,12 +263,26 @@ namespace WeeXnes.MVVM.View } } + private void clearInputs() + { + tb_FormClient.Text = ""; + tb_FormDetails.Text = ""; + tb_FormName.Text = ""; + tb_FormState.Text = ""; + tb_FormPName.Text = ""; + tb_FormLargeImgKey.Text = ""; + tb_FormLargeImgTxt.Text = ""; + tb_FormSmallImgKey.Text = ""; + tb_FormSmallImgTxt.Text = ""; + } + private void RpcItemList_MouseDoubleClick(object sender, MouseButtonEventArgs e) { if (RpcItemList.SelectedItem != null) { deleteGameFile((Game)RpcItemList.SelectedItem); } + clearInputs(); Refresh(); } @@ -315,6 +334,16 @@ namespace WeeXnes.MVVM.View { } + + private void MenuItem_OnClick(object sender, RoutedEventArgs e) + { + if (RpcItemList.SelectedItem != null) + { + deleteGameFile((Game)RpcItemList.SelectedItem); + } + clearInputs(); + Refresh(); + } } } diff --git a/WeeXnes/MVVM/View/KeyManagerView.xaml b/WeeXnes/MVVM/View/KeyManagerView.xaml index 8beeeec..994e3b1 100644 --- a/WeeXnes/MVVM/View/KeyManagerView.xaml +++ b/WeeXnes/MVVM/View/KeyManagerView.xaml @@ -38,6 +38,33 @@ BorderThickness="0" SelectionChanged="KeyListView_SelectionChanged" MouseDoubleClick="KeyListView_MouseDoubleClick" > + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WeeXnes/MVVM/View/KeyManagerView.xaml.cs b/WeeXnes/MVVM/View/KeyManagerView.xaml.cs index 8bf604d..0fa1ac4 100644 --- a/WeeXnes/MVVM/View/KeyManagerView.xaml.cs +++ b/WeeXnes/MVVM/View/KeyManagerView.xaml.cs @@ -249,6 +249,35 @@ namespace WeeXnes.MVVM.View tb.Text = censored_string; } } + + private void MenuItem_OnClick(object sender, RoutedEventArgs e) + { + + KeyItem selectedItem = (KeyItem)KeyListView.SelectedItem; + Console.WriteLine("Doubleclicked " + selectedItem.name); + KeyManagerLib.KeyList.Remove(selectedItem); + string[] files = SaveInterface.GetFilesInDir(Globals.settings_KeyManagerItemsPath.Value); + foreach (string file in files) + { + Console.WriteLine(file); + try + { + wxfile inifile = new wxfile(file); + string name = inifile.GetName(); + string value = inifile.GetValue(); + if(name == selectedItem.name) + { + File.Delete(file); + Console.WriteLine("Removed File: " + file); + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + } + } + FillList(); + } } public static class SaveInterface { diff --git a/WeeXnes/MainWindow.xaml b/WeeXnes/MainWindow.xaml index 5d2dc60..159b828 100644 --- a/WeeXnes/MainWindow.xaml +++ b/WeeXnes/MainWindow.xaml @@ -270,6 +270,26 @@ + + + + + + + + + + + + + + + + + + + diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj index b3c2bee..7e7a5e7 100644 --- a/WeeXnes/WeeXnes.csproj +++ b/WeeXnes/WeeXnes.csproj @@ -4,7 +4,7 @@ Debug AnyCPU - 3.7.0 + 3.7.1 {4B33CEE7-C74D-43B9-B99A-8B273D5195BC} WinExe WeeXnes From 5bc18c02e08c4ffe6f6d59b100ab5437c1ebe87a Mon Sep 17 00:00:00 2001 From: WeeXnes <54072019+WeeXnes@users.noreply.github.com> Date: Fri, 25 Nov 2022 15:29:06 +0100 Subject: [PATCH 12/12] Update dotnet-framework.yml --- .github/workflows/dotnet-framework.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dotnet-framework.yml b/.github/workflows/dotnet-framework.yml index 850e5c3..12e847f 100644 --- a/.github/workflows/dotnet-framework.yml +++ b/.github/workflows/dotnet-framework.yml @@ -57,6 +57,8 @@ jobs: - name: Packing Zip run: Compress-Archive D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\WeeXnes.exe, + D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\System.Drawing.Common.dll, + D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\Wpf.Ui.dll, D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes_UAC\bin\Release\WeeXnes_UAC.exe, D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\DiscordRPC.dll, D:\a\WeeXnesSuite\WeeXnesSuite\WeeXnes\bin\Release\Newtonsoft.Json.dll,