From 55ca9934dfd588fec11e12c2b0a693a25741a379 Mon Sep 17 00:00:00 2001 From: krjan02 Date: Wed, 26 Mar 2025 17:25:10 +0100 Subject: [PATCH] changed release archive name / fixed log scrollbar --- .github/workflows/build-release.yml | 4 ++-- TeamsNetphoneLinkWPF/App.xaml.cs | 12 +--------- TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml | 24 ++++++++++++++----- .../WPF/DashboardWindow.xaml.cs | 23 +++++++++++------- TeamsNetphoneLinkWPF/WPF/UpdateWindow.xaml.cs | 4 ++-- 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 7e211e5..b9ec005 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -53,13 +53,13 @@ jobs: path: ${{ github.workspace }}/artifact - name: Archive Release - run: (cd ${{ github.workspace }}/artifact && zip -r ${{ github.workspace }}/artifact/NetphoneTeamsLink${{github.ref_name}}.zip .) + run: (cd ${{ github.workspace }}/artifact && zip -r ${{ github.workspace }}/artifact/TeamsNetphoneLink${{github.ref_name}}.zip .) - name: Release uses: akkuman/gitea-release-action@v1 with: name: "Netphone Teams Link ${{github.ref_name}}" files: |- - ${{ github.workspace }}/artifact/NetphoneTeamsLink${{github.ref_name}}.zip + ${{ github.workspace }}/artifact/TeamsNetphoneLink${{github.ref_name}}.zip token: '${{secrets.KRJAN02_RELEASE_TOKEN}}' tag_name: ${{github.ref_name}} \ No newline at end of file diff --git a/TeamsNetphoneLinkWPF/App.xaml.cs b/TeamsNetphoneLinkWPF/App.xaml.cs index 2179704..6196115 100644 --- a/TeamsNetphoneLinkWPF/App.xaml.cs +++ b/TeamsNetphoneLinkWPF/App.xaml.cs @@ -1,16 +1,6 @@ -using Azure.Identity.Broker; -using Microsoft.Identity.Client; -using Microsoft.Identity.Client.NativeInterop; -using System; -using System.Configuration; -using System.Data; -using System.Printing; -using System.Reflection; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; using System.Windows; -using System.Windows.Interop; using System.Windows.Media; -using TeamsNetphoneLink.WPF; using TeamsNetphoneLink.WPF.MVVM; namespace TeamsNetphoneLink diff --git a/TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml b/TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml index bd2e1aa..f3daf66 100644 --- a/TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml +++ b/TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml @@ -74,6 +74,9 @@ + + + @@ -92,7 +95,7 @@ - + @@ -171,12 +174,18 @@ FontWeight="Bold" Foreground="White" Margin="15,10"/> - + + > + + + @@ -224,6 +233,9 @@ + + + @@ -232,7 +244,7 @@ - @@ -256,8 +268,8 @@ + FontSize="14" + Margin="15,0" MouseDown="Credit_MouseDown"/> \ No newline at end of file diff --git a/TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml.cs b/TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml.cs index 688d411..c79b7db 100644 --- a/TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml.cs +++ b/TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml.cs @@ -1,6 +1,8 @@ -using System.Windows; +using System.Diagnostics; +using System.Windows; using System.Windows.Controls; using System.Windows.Input; +using System.Windows.Media; using TeamsNetphoneLink.WPF.MVVM; namespace TeamsNetphoneLink.WPF @@ -80,16 +82,21 @@ namespace TeamsNetphoneLink.WPF } } - private void LogListView_UpdateColumnsWidth(object sender, SizeChangedEventArgs e) + private void VersionBorder_MouseDown(object sender, MouseButtonEventArgs e) { - ListView _ListView = sender as ListView; - GridView _GridView = _ListView.View as GridView; - var _ActualWidth = _ListView.ActualWidth - SystemParameters.VerticalScrollBarWidth; - for (Int32 i = 1; i < _GridView.Columns.Count; i++) + if(UpdateCheck.UpdateAvailable) { - _ActualWidth = _ActualWidth - _GridView.Columns[i].ActualWidth; + var latestTag = UpdateCheck.GetLatestReleaseTagAsync().GetAwaiter().GetResult(); + var currentTag = UpdateCheck.GetCurrentVersion(); + // Erstellen und Anzeigen des Update-Fensters + var updateWindow = new WPF.UpdateWindow(currentTag, latestTag); + updateWindow.ShowDialog(); } - _GridView.Columns[0].Width = _ActualWidth; + } + + private void Credit_MouseDown(object sender, MouseButtonEventArgs e) + { + Process.Start(new ProcessStartInfo("https://jan.sx") { UseShellExecute = true }); } } } \ No newline at end of file diff --git a/TeamsNetphoneLinkWPF/WPF/UpdateWindow.xaml.cs b/TeamsNetphoneLinkWPF/WPF/UpdateWindow.xaml.cs index 54a0cf5..7c26e79 100644 --- a/TeamsNetphoneLinkWPF/WPF/UpdateWindow.xaml.cs +++ b/TeamsNetphoneLinkWPF/WPF/UpdateWindow.xaml.cs @@ -116,7 +116,7 @@ namespace TeamsNetphoneLink.WPF UpdateProgress.Value = 0; // Step 2: Download the new release - string downloadUrl = $"https://git.jan.sx/krjan02/TeamsNetphoneLink/releases/download/latest/NetphoneTeamsLink{_latestVersion}.zip"; + string downloadUrl = $"https://git.jan.sx/krjan02/TeamsNetphoneLink/releases/download/latest/TeamsNetphoneLink{_latestVersion}.zip"; var tempZipPath = Path.GetTempFileName(); tempZipPath = tempZipPath + ".TEAMSNETPHONEUPDATE"; Console.WriteLine(tempZipPath); @@ -182,7 +182,7 @@ namespace TeamsNetphoneLink.WPF foreach (JsonElement asset in assets.EnumerateArray()) { string name = asset.GetProperty("name").GetString(); - if (name == $"NetphoneTeamsLink{_latestVersion}.zip") + if (name == $"TeamsNetphoneLink{_latestVersion}.zip") { long size = asset.GetProperty("size").GetInt64(); return size;