From 3432166a8ed1a2a1b8abdb9ab09fa20436b7ab6e Mon Sep 17 00:00:00 2001
From: Meik <meik.drechsler@consulting4it.de>
Date: Thu, 5 Mar 2026 13:39:19 +0100
Subject: [PATCH] Polish UI alignment, navigation, info layout, and
 localization

---
 MainWindow.xaml                          | 34 ++++++++++----------
 MainWindow.xaml.cs                       |  2 +-
 Properties/Resources.de.resx             | 14 ++++----
 Properties/Resources.resx                |  6 ++--
 UserControls/Announcements.xaml          | 41 +++++++++++++++++++++---
 UserControls/ComputerInformation.xaml    | 10 +++---
 UserControls/ComputerInformation.xaml.cs |  4 +++
 UserControls/CustomProgressBar.xaml      |  3 +-
 UserControls/Incidents.xaml              | 38 +++++++++++++++++++---
 9 files changed, 111 insertions(+), 41 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index b39e5ce..b01bea9 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -492,8 +492,8 @@
                     <Button  Visibility="Hidden"
                              x:Name="BtnBack"
                              Tag="100"
-                             Canvas.Top="10"
-                             Canvas.Left="4"
+                             Canvas.Top="14.5"
+                             Canvas.Left="6.5"
                              Width="62"
                              Height="62"
                              BorderThickness="0"
@@ -538,7 +538,7 @@
                              Panel.ZIndex="1000"
                              Width="62"
                              Height="62"
-                             Canvas.Left="4"
+                             Canvas.Left="6.5"
                              Canvas.Top="0">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -573,8 +573,8 @@
                                   Margin="14"
                                   RenderTransformOrigin="0.5,0.5">
                                 <Grid.RenderTransform>
-                                    <ScaleTransform ScaleX="1.1"
-                                                    ScaleY="1.1" />
+                                    <ScaleTransform ScaleX="1.2"
+                                                    ScaleY="1.2" />
                                 </Grid.RenderTransform>
                                 <Image Source="{DynamicResource nav_appbar_newspaper}"
                                        Panel.ZIndex="18"
@@ -619,7 +619,7 @@
                             Canvas.Top="0"
                             Width="62"
                             Height="62"
-                            Canvas.Left="4">
+                            Canvas.Left="6.5">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Grid ClipToBounds="False">
@@ -651,8 +651,8 @@
                                   Margin="14"
                                   RenderTransformOrigin="0.5,0.5">
                                 <Grid.RenderTransform>
-                                    <ScaleTransform ScaleX="1.1"
-                                                    ScaleY="1.1" />
+                                    <ScaleTransform ScaleX="1.2"
+                                                    ScaleY="1.2" />
                                 </Grid.RenderTransform>
                                 <Image Source="{DynamicResource nav_appbar_clipboard_variant_text}"
                                        x:Name="icoInc"
@@ -695,7 +695,7 @@
                             Canvas.Top="0"
                             Width="62"
                             Height="62"
-                            Canvas.Left="4">
+                            Canvas.Left="6.5">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Grid ClipToBounds="false">
@@ -726,8 +726,8 @@
                                   Margin="14"
                                   RenderTransformOrigin="0.5,0.5">
                                 <Grid.RenderTransform>
-                                    <ScaleTransform ScaleX="1.1"
-                                                    ScaleY="1.1" />
+                                    <ScaleTransform ScaleX="1.2"
+                                                    ScaleY="1.2" />
                                 </Grid.RenderTransform>
                                 <Image Source="{DynamicResource nav_appbar_cart}"
                                        x:Name="icoSSP"
@@ -770,7 +770,7 @@
                             Canvas.Top="0"
                             Width="62"
                             Height="62"
-                            Canvas.Left="4"
+                            Canvas.Left="6.5"
                             Panel.ZIndex="1000">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -802,8 +802,8 @@
                                   Margin="14"
                                   RenderTransformOrigin="0.5,0.5">
                                 <Grid.RenderTransform>
-                                    <ScaleTransform ScaleX="1.1"
-                                                    ScaleY="1.1" />
+                                    <ScaleTransform ScaleX="1.2"
+                                                    ScaleY="1.2" />
                                 </Grid.RenderTransform>
                                 <Image Source="{DynamicResource nav_appbar_star}"
                                        x:Name="icoCustomLinks"
@@ -846,7 +846,7 @@
                             Canvas.Top="0"
                             Width="62"
                             Height="62"
-                            Canvas.Left="4"
+                            Canvas.Left="6.5"
                             Panel.ZIndex="1000">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -878,8 +878,8 @@
                                   Margin="14"
                                   RenderTransformOrigin="0.5,0.5">
                                 <Grid.RenderTransform>
-                                    <ScaleTransform ScaleX="1.1"
-                                                    ScaleY="1.1" />
+                                    <ScaleTransform ScaleX="1.2"
+                                                    ScaleY="1.2" />
                                 </Grid.RenderTransform>
                                 <Image Source="{DynamicResource nav_appbar_information}"
                                        x:Name="icoInfo"
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 0305f78..2045286 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -636,7 +636,7 @@ namespace C4IT_CustomerPanel
         private void RefreshTrayMenu(bool ActivateFirstEntry)
         {
             var TopMarginCount = 0;
-            const int railTopOffset = 10;
+            const double railTopOffset = 14.5;
             foreach (var entry in MainFunctionButtons)
             {
                 try
diff --git a/Properties/Resources.de.resx b/Properties/Resources.de.resx
index 5a09cda..d0f3796 100644
--- a/Properties/Resources.de.resx
+++ b/Properties/Resources.de.resx
@@ -122,7 +122,7 @@
     <value />
   </data>
   <data name="announcement" xml:space="preserve">
-    <value>Ankündigung</value>
+    <value>Ankündigungen</value>
   </data>
   <data name="computername" xml:space="preserve">
     <value>Computername:</value>
@@ -182,7 +182,7 @@
     <value>Informationen zu meinem Asset</value>
   </data>
   <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 name="Converter_ConvertImageToWpfImage_Image_darf_nicht_null_sein_" xml:space="preserve">
     <value>Image darf nicht null sein.</value>
@@ -218,7 +218,7 @@
     <value>Notifier anzeigen</value>
   </data>
   <data name="dndActivate" xml:space="preserve">
-    <value>keine Benachrichtigungen</value>
+    <value>Keine Benachrichtigungen</value>
   </data>
   <data name="showNotifierExample" xml:space="preserve">
     <value>Notifier Beispiel zeigen</value>
@@ -281,7 +281,7 @@
     <value>Ticket pausiert</value>
   </data>
   <data name="ticketPostedback" xml:space="preserve">
-    <value>An Rolle zurückgegben</value>
+    <value>An Rolle zurückgegeben</value>
   </data>
   <data name="LowServerVersion" xml:space="preserve">
     <value> / Server Konfigurationsversion zu niedrig</value>
@@ -293,7 +293,7 @@
     <value>Zu Ihren Tickets gibt es neue Informationen.</value>
   </data>
   <data name="NewTicketInfoTitle" xml:space="preserve">
-    <value>Neue Ticket Informationen</value>
+    <value>Neue Ticketinformationen</value>
   </data>
   <data name="CustomLink" xml:space="preserve">
     <value>Nützliche Links</value>
@@ -302,7 +302,7 @@
     <value>Markierung entfernen</value>
   </data>
   <data name="removeMarkups" xml:space="preserve">
-    <value>Alle Markierungen entfernen</value>
+    <value>Alle als gelesen markieren</value>
   </data>
   <data name="ticketTakover" xml:space="preserve">
     <value>Ticket übernommen</value>
@@ -325,4 +325,4 @@
   <data name="ShowMoreDetailsToolTip" xml:space="preserve">
     <value>Für weitere Details hier klicken</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index af70dae..f38f1d0 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -383,7 +383,7 @@
     <value>There is new information about your tickets.</value>
   </data>
   <data name="NewTicketInfoTitle" xml:space="preserve">
-    <value>New ticket informations</value>
+    <value>New ticket information</value>
   </data>
   <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>
@@ -395,7 +395,7 @@
     <value>Remove markup</value>
   </data>
   <data name="removeMarkups" xml:space="preserve">
-    <value>Remove all markups</value>
+    <value>Mark all as read</value>
   </data>
   <data name="ticketTakover" xml:space="preserve">
     <value />
@@ -421,4 +421,4 @@
   <data name="ShowMoreDetailsToolTip" xml:space="preserve">
     <value>Click for more details</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/UserControls/Announcements.xaml b/UserControls/Announcements.xaml
index 1ff87af..e2efd57 100644
--- a/UserControls/Announcements.xaml
+++ b/UserControls/Announcements.xaml
@@ -7,6 +7,41 @@
              xmlns:resx="clr-namespace:C4IT_CustomerPanel.Properties"
              mc:Ignorable="d" 
              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"
           x:FieldModifier="private"
           Width="500">
@@ -71,13 +106,11 @@
             <Image Source="{DynamicResource appbar_list_check}"
                    x:Name="buttonReadAllAnnouncements"
                    x:FieldModifier="private"
+                   Style="{StaticResource ReadAllIconStyle}"
+                   ToolTip="{x:Static resx:Resources.removeMarkups}"
                    Tag="readAllAnnouncements"
-                   Cursor="Hand"
                    PreviewMouseDown="ReadAll_PreviewMouseDown"
                    Grid.Column="2"
-                   RenderTransformOrigin="1.536,1.429"
-                   Height="24"
-                   Width="24"
                    Canvas.Left="338"
                    Canvas.Top="14" />
         </Canvas>
diff --git a/UserControls/ComputerInformation.xaml b/UserControls/ComputerInformation.xaml
index 27685d0..1e00c5c 100644
--- a/UserControls/ComputerInformation.xaml
+++ b/UserControls/ComputerInformation.xaml
@@ -59,7 +59,9 @@
             <Setter Property="BorderThickness"
                     Value="1" />
             <Setter Property="Padding"
-                    Value="8,4" />
+                    Value="8,0" />
+            <Setter Property="VerticalContentAlignment"
+                    Value="Center" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type TextBox}">
@@ -99,13 +101,13 @@
             <Setter Property="Height"
                     Value="20" />
             <Setter Property="VerticalContentAlignment"
-                    Value="Top" />
+                    Value="Center" />
             <Setter Property="HorizontalContentAlignment"
                     Value="Left" />
             <Setter Property="Canvas.Left"
                     Value="30" />
             <Setter Property="Canvas.Top"
-                    Value="-1" />
+                    Value="2" />
         </Style>
 
         <Style x:Key="InfoRowValueStyle"
@@ -120,7 +122,7 @@
             <Setter Property="Canvas.Left"
                     Value="12" />
             <Setter Property="Canvas.Top"
-                    Value="22" />
+                    Value="21" />
         </Style>
 
         <Style x:Key="InfoRowCopyStyle"
diff --git a/UserControls/ComputerInformation.xaml.cs b/UserControls/ComputerInformation.xaml.cs
index 20db5ed..f9623b9 100644
--- a/UserControls/ComputerInformation.xaml.cs
+++ b/UserControls/ComputerInformation.xaml.cs
@@ -183,8 +183,12 @@ namespace C4IT_CustomerPanel.UserControls
                         Label lb = new Label
                         {
                             HorizontalAlignment = HorizontalAlignment.Stretch,
+                            VerticalAlignment = VerticalAlignment.Center,
                             HorizontalContentAlignment = HorizontalAlignment.Center,
+                            VerticalContentAlignment = VerticalAlignment.Center,
                             FontSize = 11,
+                            Height = 20,
+                            Margin = new Thickness(0),
                             Padding = new Thickness(2, 0, 2, 0)
                         };
                         StackPanel sp = new StackPanel
diff --git a/UserControls/CustomProgressBar.xaml b/UserControls/CustomProgressBar.xaml
index ef80ccf..cd8bf66 100644
--- a/UserControls/CustomProgressBar.xaml
+++ b/UserControls/CustomProgressBar.xaml
@@ -15,6 +15,7 @@
                 Width="100"
                 HorizontalAlignment="Left"
                 CornerRadius="8"
-                Background="{DynamicResource accentColor}" />
+                Opacity="0.88"
+                Background="{DynamicResource activeButtonColor}" />
     </Grid>
 </UserControl>
diff --git a/UserControls/Incidents.xaml b/UserControls/Incidents.xaml
index fc07530..16c3a5c 100644
--- a/UserControls/Incidents.xaml
+++ b/UserControls/Incidents.xaml
@@ -47,6 +47,39 @@
                 </Trigger>
             </Style.Triggers>
         </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>
     
     
@@ -122,12 +155,9 @@
                     Margin="0" />
             <Image Source="{DynamicResource appbar_list_check}"
                    x:Name="buttonReadAllTickets"
+                   Style="{StaticResource ReadAllIconStyle}"
                    Tag="readAllTickets"
-                   Cursor="Hand"
                    PreviewMouseDown="ReadAll_PreviewMouseDown"
-                   RenderTransformOrigin="1.536,1.429"
-                   Height="24"
-                   Width="24"
                    Canvas.Left="338"
                    Canvas.Top="14"
                    ToolTip="{x:Static resx:Resources.removeMarkups}" />