krjan02/TeamsNetphoneLink
krjan02/TeamsNetphoneLink
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

changed release archive name / fixed log scrollbar
All checks were successful
Build and Relase / build-release (push) Successful in 1m22s
Details
Build and Relase / create-release (push) Successful in 38s
Details

Browse Source
This commit is contained in:
krjan02 2025-03-26 17:25:10 +01:00
parent efbcaa773f
commit 55ca9934df
5 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-release.yml vendored
View File

@ -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}}

12
TeamsNetphoneLinkWPF/App.xaml.cs
View File

@ -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

22
TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml
View File

@ -74,6 +74,9 @@
<Setter Property="Height" Value="32"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="IsHitTestVisible" Value="False"/>
<Setter Property="Focusable" Value="False"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/>
</Style>
</Window.Resources>
@ -92,7 +95,7 @@
<!-- Header -->
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,15">
<TextBlock FontSize="24" FontWeight="Bold" Text="{Binding AppTitle2}" Foreground="White"/>
<Border Visibility="{Binding VersionVisibility}" Background="{Binding VersionBackground}" CornerRadius="12" Padding="12,4" Margin="15,0">
<Border Visibility="{Binding VersionVisibility}" Background="{Binding VersionBackground}" CornerRadius="12" Padding="12,4" Margin="15,0" MouseDown="VersionBorder_MouseDown">
<TextBlock Text="{Binding VersionText}" Foreground="White" FontSize="16"/>
</Border>
</StackPanel>
@ -176,7 +179,13 @@
ItemsSource="{Binding LogEntries}"
Margin="10,0,10,10"
VirtualizingPanel.IsVirtualizing="True"
IsHitTestVisible="False">
>
<ListView.ItemContainerStyle>
<Style TargetType="{x:Type ListViewItem}">
<Setter Property="Focusable" Value="False"/>
<Setter Property="IsHitTestVisible" Value="False"/>
</Style>
</ListView.ItemContainerStyle>
<ListView.View>
<GridView>
<GridViewColumn Width="80" Header="Time">
@ -224,6 +233,9 @@
<DataTrigger Binding="{Binding Subsystem}" Value="TeamsLocalAPI">
<Setter Property="Foreground" Value="#4E5FBF"/>
</DataTrigger>
<DataTrigger Binding="{Binding Subsystem}" Value="Syncronisation">
<Setter Property="Foreground" Value="#5ed602"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
@ -232,7 +244,7 @@
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Width="Auto" Header="Message"
<GridViewColumn Width="475" Header="Message"
DisplayMemberBinding="{Binding Message}"/>
</GridView>
</ListView.View>
@ -256,8 +268,8 @@
<TextBlock Text="Entwickelt von Jan Krampitz"
VerticalAlignment="Center"
Foreground="White"
FontSize="10"
Margin="15,0"/>
FontSize="14"
Margin="15,0" MouseDown="Credit_MouseDown"/>
</StackPanel>
</Grid>
</Window>

23
TeamsNetphoneLinkWPF/WPF/DashboardWindow.xaml.cs
View File

@ -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 });
}
}
}

4
TeamsNetphoneLinkWPF/WPF/UpdateWindow.xaml.cs
View File

@ -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;