Meik/CustomerPanel-Test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Polish UI alignment, navigation, info layout, and localization

Browse Source
This commit is contained in:
Meik
2026-03-05 13:39:19 +01:00
parent 041e3abf76
commit 3432166a8e
9 changed files with 111 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MainWindow.xaml
View File

@@ -492,8 +492,8 @@
<Button Visibility="Hidden" <Button Visibility="Hidden"
x:Name="BtnBack" x:Name="BtnBack"
Tag="100" Tag="100"
Canvas.Top="10" Canvas.Top="14.5"
Canvas.Left="4" Canvas.Left="6.5"
Width="62" Width="62"
Height="62" Height="62"
BorderThickness="0" BorderThickness="0"
@@ -538,7 +538,7 @@
Panel.ZIndex="1000" Panel.ZIndex="1000"
Width="62" Width="62"
Height="62" Height="62"
Canvas.Left="4" Canvas.Left="6.5"
Canvas.Top="0"> Canvas.Top="0">
<Button.Template> <Button.Template>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
@@ -573,8 +573,8 @@
Margin="14" Margin="14"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform> <Grid.RenderTransform>
<ScaleTransform ScaleX="1.1" <ScaleTransform ScaleX="1.2"
ScaleY="1.1" /> ScaleY="1.2" />
</Grid.RenderTransform> </Grid.RenderTransform>
<Image Source="{DynamicResource nav_appbar_newspaper}" <Image Source="{DynamicResource nav_appbar_newspaper}"
Panel.ZIndex="18" Panel.ZIndex="18"
@@ -619,7 +619,7 @@
Canvas.Top="0" Canvas.Top="0"
Width="62" Width="62"
Height="62" Height="62"
Canvas.Left="4"> Canvas.Left="6.5">
<Button.Template> <Button.Template>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Grid ClipToBounds="False"> <Grid ClipToBounds="False">
@@ -651,8 +651,8 @@
Margin="14" Margin="14"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform> <Grid.RenderTransform>
<ScaleTransform ScaleX="1.1" <ScaleTransform ScaleX="1.2"
ScaleY="1.1" /> ScaleY="1.2" />
</Grid.RenderTransform> </Grid.RenderTransform>
<Image Source="{DynamicResource nav_appbar_clipboard_variant_text}" <Image Source="{DynamicResource nav_appbar_clipboard_variant_text}"
x:Name="icoInc" x:Name="icoInc"
@@ -695,7 +695,7 @@
Canvas.Top="0" Canvas.Top="0"
Width="62" Width="62"
Height="62" Height="62"
Canvas.Left="4"> Canvas.Left="6.5">
<Button.Template> <Button.Template>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Grid ClipToBounds="false"> <Grid ClipToBounds="false">
@@ -726,8 +726,8 @@
Margin="14" Margin="14"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform> <Grid.RenderTransform>
<ScaleTransform ScaleX="1.1" <ScaleTransform ScaleX="1.2"
ScaleY="1.1" /> ScaleY="1.2" />
</Grid.RenderTransform> </Grid.RenderTransform>
<Image Source="{DynamicResource nav_appbar_cart}" <Image Source="{DynamicResource nav_appbar_cart}"
x:Name="icoSSP" x:Name="icoSSP"
@@ -770,7 +770,7 @@
Canvas.Top="0" Canvas.Top="0"
Width="62" Width="62"
Height="62" Height="62"
Canvas.Left="4" Canvas.Left="6.5"
Panel.ZIndex="1000"> Panel.ZIndex="1000">
<Button.Template> <Button.Template>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
@@ -802,8 +802,8 @@
Margin="14" Margin="14"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform> <Grid.RenderTransform>
<ScaleTransform ScaleX="1.1" <ScaleTransform ScaleX="1.2"
ScaleY="1.1" /> ScaleY="1.2" />
</Grid.RenderTransform> </Grid.RenderTransform>
<Image Source="{DynamicResource nav_appbar_star}" <Image Source="{DynamicResource nav_appbar_star}"
x:Name="icoCustomLinks" x:Name="icoCustomLinks"
@@ -846,7 +846,7 @@
Canvas.Top="0" Canvas.Top="0"
Width="62" Width="62"
Height="62" Height="62"
Canvas.Left="4" Canvas.Left="6.5"
Panel.ZIndex="1000"> Panel.ZIndex="1000">
<Button.Template> <Button.Template>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
@@ -878,8 +878,8 @@
Margin="14" Margin="14"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform> <Grid.RenderTransform>
<ScaleTransform ScaleX="1.1" <ScaleTransform ScaleX="1.2"
ScaleY="1.1" /> ScaleY="1.2" />
</Grid.RenderTransform> </Grid.RenderTransform>
<Image Source="{DynamicResource nav_appbar_information}" <Image Source="{DynamicResource nav_appbar_information}"
x:Name="icoInfo" x:Name="icoInfo"

2
MainWindow.xaml.cs
View File

@@ -636,7 +636,7 @@ namespace C4IT_CustomerPanel
private void RefreshTrayMenu(bool ActivateFirstEntry) private void RefreshTrayMenu(bool ActivateFirstEntry)
{ {
var TopMarginCount = 0; var TopMarginCount = 0;
const int railTopOffset = 10; const double railTopOffset = 14.5;
foreach (var entry in MainFunctionButtons) foreach (var entry in MainFunctionButtons)
{ {
try try

12
Properties/Resources.de.resx
View File

@@ -122,7 +122,7 @@
<value /> <value />
</data> </data>
<data name="announcement" xml:space="preserve"> <data name="announcement" xml:space="preserve">
<value>Ankündigung</value> <value>Ankündigungen</value>
</data> </data>
<data name="computername" xml:space="preserve"> <data name="computername" xml:space="preserve">
<value>Computername:</value> <value>Computername:</value>
@@ -182,7 +182,7 @@
<value>Informationen zu meinem Asset</value> <value>Informationen zu meinem Asset</value>
</data> </data>
<data name="mo_ssp" xml:space="preserve"> <data name="mo_ssp" xml:space="preserve">
<value>Portalsuche, Links zum Self-Service-Portal und zu Meine Dienste</value> <value>Portalsuche, Links zum Self-Service-Portal und zu Meinen Diensten</value>
</data> </data>
<data name="Converter_ConvertImageToWpfImage_Image_darf_nicht_null_sein_" xml:space="preserve"> <data name="Converter_ConvertImageToWpfImage_Image_darf_nicht_null_sein_" xml:space="preserve">
<value>Image darf nicht null sein.</value> <value>Image darf nicht null sein.</value>
@@ -218,7 +218,7 @@
<value>Notifier anzeigen</value> <value>Notifier anzeigen</value>
</data> </data>
<data name="dndActivate" xml:space="preserve"> <data name="dndActivate" xml:space="preserve">
<value>keine Benachrichtigungen</value> <value>Keine Benachrichtigungen</value>
</data> </data>
<data name="showNotifierExample" xml:space="preserve"> <data name="showNotifierExample" xml:space="preserve">
<value>Notifier Beispiel zeigen</value> <value>Notifier Beispiel zeigen</value>
@@ -281,7 +281,7 @@
<value>Ticket pausiert</value> <value>Ticket pausiert</value>
</data> </data>
<data name="ticketPostedback" xml:space="preserve"> <data name="ticketPostedback" xml:space="preserve">
<value>An Rolle zurückgegben</value> <value>An Rolle zurückgegeben</value>
</data> </data>
<data name="LowServerVersion" xml:space="preserve"> <data name="LowServerVersion" xml:space="preserve">
<value> / Server Konfigurationsversion zu niedrig</value> <value> / Server Konfigurationsversion zu niedrig</value>
@@ -293,7 +293,7 @@
<value>Zu Ihren Tickets gibt es neue Informationen.</value> <value>Zu Ihren Tickets gibt es neue Informationen.</value>
</data> </data>
<data name="NewTicketInfoTitle" xml:space="preserve"> <data name="NewTicketInfoTitle" xml:space="preserve">
<value>Neue Ticket Informationen</value> <value>Neue Ticketinformationen</value>
</data> </data>
<data name="CustomLink" xml:space="preserve"> <data name="CustomLink" xml:space="preserve">
<value>Nützliche Links</value> <value>Nützliche Links</value>
@@ -302,7 +302,7 @@
<value>Markierung entfernen</value> <value>Markierung entfernen</value>
</data> </data>
<data name="removeMarkups" xml:space="preserve"> <data name="removeMarkups" xml:space="preserve">
<value>Alle Markierungen entfernen</value> <value>Alle als gelesen markieren</value>
</data> </data>
<data name="ticketTakover" xml:space="preserve"> <data name="ticketTakover" xml:space="preserve">
<value>Ticket übernommen</value> <value>Ticket übernommen</value>

4
Properties/Resources.resx
View File

@@ -383,7 +383,7 @@
<value>There is new information about your tickets.</value> <value>There is new information about your tickets.</value>
</data> </data>
<data name="NewTicketInfoTitle" xml:space="preserve"> <data name="NewTicketInfoTitle" xml:space="preserve">
<value>New ticket informations</value> <value>New ticket information</value>
</data> </data>
<data name="appbar_star" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="appbar_star" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\light\appbar.star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons\light\appbar.star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -395,7 +395,7 @@
<value>Remove markup</value> <value>Remove markup</value>
</data> </data>
<data name="removeMarkups" xml:space="preserve"> <data name="removeMarkups" xml:space="preserve">
<value>Remove all markups</value> <value>Mark all as read</value>
</data> </data>
<data name="ticketTakover" xml:space="preserve"> <data name="ticketTakover" xml:space="preserve">
<value /> <value />

41
UserControls/Announcements.xaml
View File

@@ -7,6 +7,41 @@
xmlns:resx="clr-namespace:C4IT_CustomerPanel.Properties" xmlns:resx="clr-namespace:C4IT_CustomerPanel.Properties"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="500" d:DesignWidth="800"> d:DesignHeight="500" d:DesignWidth="800">
<UserControl.Resources>
<Style x:Key="ReadAllIconStyle"
TargetType="{x:Type Image}">
<Setter Property="Cursor"
Value="Hand" />
<Setter Property="Width"
Value="24" />
<Setter Property="Height"
Value="24" />
<Setter Property="Opacity"
Value="0.92" />
<Setter Property="RenderTransformOrigin"
Value="0.5,0.5" />
<Setter Property="RenderTransform">
<Setter.Value>
<ScaleTransform ScaleX="1"
ScaleY="1" />
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
<Setter Property="Opacity"
Value="1" />
<Setter Property="RenderTransform">
<Setter.Value>
<ScaleTransform ScaleX="1.06"
ScaleY="1.06" />
</Setter.Value>
</Setter>
</Trigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Grid x:Name="GridMain" <Grid x:Name="GridMain"
x:FieldModifier="private" x:FieldModifier="private"
Width="500"> Width="500">
@@ -71,13 +106,11 @@
<Image Source="{DynamicResource appbar_list_check}" <Image Source="{DynamicResource appbar_list_check}"
x:Name="buttonReadAllAnnouncements" x:Name="buttonReadAllAnnouncements"
x:FieldModifier="private" x:FieldModifier="private"
Style="{StaticResource ReadAllIconStyle}"
ToolTip="{x:Static resx:Resources.removeMarkups}"
Tag="readAllAnnouncements" Tag="readAllAnnouncements"
Cursor="Hand"
PreviewMouseDown="ReadAll_PreviewMouseDown" PreviewMouseDown="ReadAll_PreviewMouseDown"
Grid.Column="2" Grid.Column="2"
RenderTransformOrigin="1.536,1.429"
Height="24"
Width="24"
Canvas.Left="338" Canvas.Left="338"
Canvas.Top="14" /> Canvas.Top="14" />
</Canvas> </Canvas>

10
UserControls/ComputerInformation.xaml
View File

@@ -59,7 +59,9 @@
<Setter Property="BorderThickness" <Setter Property="BorderThickness"
Value="1" /> Value="1" />
<Setter Property="Padding" <Setter Property="Padding"
Value="8,4" /> Value="8,0" />
<Setter Property="VerticalContentAlignment"
Value="Center" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}"> <ControlTemplate TargetType="{x:Type TextBox}">
@@ -99,13 +101,13 @@
<Setter Property="Height" <Setter Property="Height"
Value="20" /> Value="20" />
<Setter Property="VerticalContentAlignment" <Setter Property="VerticalContentAlignment"
Value="Top" /> Value="Center" />
<Setter Property="HorizontalContentAlignment" <Setter Property="HorizontalContentAlignment"
Value="Left" /> Value="Left" />
<Setter Property="Canvas.Left" <Setter Property="Canvas.Left"
Value="30" /> Value="30" />
<Setter Property="Canvas.Top" <Setter Property="Canvas.Top"
Value="-1" /> Value="2" />
</Style> </Style>
<Style x:Key="InfoRowValueStyle" <Style x:Key="InfoRowValueStyle"
@@ -120,7 +122,7 @@
<Setter Property="Canvas.Left" <Setter Property="Canvas.Left"
Value="12" /> Value="12" />
<Setter Property="Canvas.Top" <Setter Property="Canvas.Top"
Value="22" /> Value="21" />
</Style> </Style>
<Style x:Key="InfoRowCopyStyle" <Style x:Key="InfoRowCopyStyle"

4
UserControls/ComputerInformation.xaml.cs
View File

@@ -183,8 +183,12 @@ namespace C4IT_CustomerPanel.UserControls
Label lb = new Label Label lb = new Label
{ {
HorizontalAlignment = HorizontalAlignment.Stretch, HorizontalAlignment = HorizontalAlignment.Stretch,
VerticalAlignment = VerticalAlignment.Center,
HorizontalContentAlignment = HorizontalAlignment.Center, HorizontalContentAlignment = HorizontalAlignment.Center,
VerticalContentAlignment = VerticalAlignment.Center,
FontSize = 11, FontSize = 11,
Height = 20,
Margin = new Thickness(0),
Padding = new Thickness(2, 0, 2, 0) Padding = new Thickness(2, 0, 2, 0)
}; };
StackPanel sp = new StackPanel StackPanel sp = new StackPanel

3
UserControls/CustomProgressBar.xaml
View File

@@ -15,6 +15,7 @@
Width="100" Width="100"
HorizontalAlignment="Left" HorizontalAlignment="Left"
CornerRadius="8" CornerRadius="8"
Background="{DynamicResource accentColor}" /> Opacity="0.88"
Background="{DynamicResource activeButtonColor}" />
</Grid> </Grid>
</UserControl> </UserControl>

38
UserControls/Incidents.xaml
View File

@@ -47,6 +47,39 @@
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style x:Key="ReadAllIconStyle"
TargetType="{x:Type Image}">
<Setter Property="Cursor"
Value="Hand" />
<Setter Property="Width"
Value="24" />
<Setter Property="Height"
Value="24" />
<Setter Property="Opacity"
Value="0.92" />
<Setter Property="RenderTransformOrigin"
Value="0.5,0.5" />
<Setter Property="RenderTransform">
<Setter.Value>
<ScaleTransform ScaleX="1"
ScaleY="1" />
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
<Setter Property="Opacity"
Value="1" />
<Setter Property="RenderTransform">
<Setter.Value>
<ScaleTransform ScaleX="1.06"
ScaleY="1.06" />
</Setter.Value>
</Setter>
</Trigger>
</Style.Triggers>
</Style>
</UserControl.Resources> </UserControl.Resources>
@@ -122,12 +155,9 @@
Margin="0" /> Margin="0" />
<Image Source="{DynamicResource appbar_list_check}" <Image Source="{DynamicResource appbar_list_check}"
x:Name="buttonReadAllTickets" x:Name="buttonReadAllTickets"
Style="{StaticResource ReadAllIconStyle}"
Tag="readAllTickets" Tag="readAllTickets"
Cursor="Hand"
PreviewMouseDown="ReadAll_PreviewMouseDown" PreviewMouseDown="ReadAll_PreviewMouseDown"
RenderTransformOrigin="1.536,1.429"
Height="24"
Width="24"
Canvas.Left="338" Canvas.Left="338"
Canvas.Top="14" Canvas.Top="14"
ToolTip="{x:Static resx:Resources.removeMarkups}" /> ToolTip="{x:Static resx:Resources.removeMarkups}" />