Minor UI improvements #201 #131

Signed-off-by: Christoph Hofmann <[email protected]>
openhab · Jul 20, 2021 · 2208ff1 · 2208ff1
1 parent bfd6d69
commit 2208ff1
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 283 deletions.
diff --git a/src/openHAB.Core/Strings/de-de/Resources.resw b/src/openHAB.Core/Strings/de-de/Resources.resw
@@ -252,7 +252,7 @@ Bitte wählen Sie den Demo Modus oder die Lokalen/Remote Verbindunsinformation z
     <value>Zurück</value>
   </data>
   <data name="Log.Text" xml:space="preserve">
-    <value>Log</value>
+    <value>Log:</value>
   </data>
   <data name="MenuAppSettings.Content" xml:space="preserve">
     <value>App Einstellungen</value>

diff --git a/src/openHAB.Core/Strings/en-us/Resources.resw b/src/openHAB.Core/Strings/en-us/Resources.resw
@@ -256,7 +256,7 @@ Please select demo mode or configure local/remote connection.</value>
     <value>Back</value>
   </data>
   <data name="Log.Text" xml:space="preserve">
-    <value>Log</value>
+    <value>Log:</value>
   </data>
   <data name="MenuAppSettings.Content" xml:space="preserve">
     <value>App Settings</value>

diff --git a/src/openHAB.Windows/Controls/ConnectionDialog.xaml b/src/openHAB.Windows/Controls/ConnectionDialog.xaml
@@ -9,7 +9,7 @@
 			   xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
 			   xmlns:converters="using:OpenHAB.Windows.Converters"
 			   mc:Ignorable="d"
-			   Background="{StaticResource OpenHABLightColor}">
+               Background="{StaticResource OpenHABLightColor}">
 
 	<ContentDialog.Resources>
 		<converters:NullToBooleanConverter x:Key="NullToBooleanConverter" />
@@ -84,14 +84,14 @@
 					  IsChecked="{Binding WillIgnoreSSLHostname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 			<Grid BorderBrush="Gray"
 				  BorderThickness="1"
-				  Background="{StaticResource OpenHABLightGreyBrush}">
+                  Background="{StaticResource OpenHABLightColor}">
 				<Grid.RowDefinitions>
 					<RowDefinition/>
 					<RowDefinition/>
 					<RowDefinition/>
 					<RowDefinition/>
 				</Grid.RowDefinitions>
-				<TextBlock Grid.Row="0" x:Uid="ServiceInstanceInfo" Margin="5,0,0,5" FontSize="14" FontWeight="Bold" />
+				<TextBlock Grid.Row="0" x:Uid="ServiceInstanceInfo" Margin="5,0,0,5" FontSize="14" FontWeight="Bold"/>
 				<StackPanel Grid.Row="1" Margin="5,0,0,0" Orientation="Horizontal">
 					<TextBlock x:Uid="VersionNumber"
 						   Margin="0,0,5,0"

diff --git a/src/openHAB.Windows/Styles/DefaultTheme.xaml b/src/openHAB.Windows/Styles/DefaultTheme.xaml
@@ -23,15 +23,15 @@
 
     <media:AcrylicBrush x:Key="DarkAcrylicColor"
                         BackgroundSource="Backdrop"
-                        TintOpacity="1"
+                        TintOpacity="0.7"
                         FallbackColor="{StaticResource DarkColor}"
                         TintColor="{StaticResource DarkColor}" />
 
     <media:AcrylicBrush x:Key="OpenHABLightColor"
                         BackgroundSource="Backdrop"
                         TintOpacity="0.5"
-                        FallbackColor="Silver"
-                        TintColor="Silver"
+                        FallbackColor="{StaticResource OpenHABLightGrey}"
+                        TintColor="{StaticResource OpenHABLightGrey}"
                         AlwaysUseFallback="False" />
 
     <media:AcrylicBrush x:Key="ErrorNotificationBackground"

diff --git a/src/openHAB.Windows/View/LogViewerPage.xaml b/src/openHAB.Windows/View/LogViewerPage.xaml
@@ -18,7 +18,7 @@
             <RowDefinition Height="95*" />
         </Grid.RowDefinitions>
         <CommandBar Grid.Row="0"
-                    Background="{StaticResource DarkColor}"
+                    Background="{StaticResource DarkAcrylicColor}"
                     DefaultLabelPosition="Right"  OverflowButtonVisibility="Collapsed">
             <AppBarButton  x:Uid="LogsFolderOpen"
                            Foreground="White"
@@ -46,18 +46,20 @@
                                TextWrapping="Wrap"
                                Foreground="White" />
                 </StackPanel>
-              
+
             </CommandBar.Content>
         </CommandBar>
 
-        <Grid Grid.Row="1" Margin="10,0,10  ,0" Background="{ThemeResource OpenHABLightColor}">
+        <Grid Grid.Row="1" Margin="10" Background="{ThemeResource OpenHABLightColor}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="6*" />
                 <RowDefinition Height="94*" />
             </Grid.RowDefinitions>
-            <TextBlock x:Uid="Log" Grid.Row="0" 
-                                   Style="{StaticResource TitleTextBlockStyle}"
-                                   Margin="10,10,0,5" />
+            <StackPanel Grid.Row="0" Margin="10,10,0,5" Orientation="Horizontal">
+                <TextBlock x:Uid="Log" Margin="0,0,10,0" Style="{StaticResource TitleTextBlockStyle}"/>
+                <TextBlock Style="{StaticResource TitleTextBlockStyle}"
+                           Text="{Binding Path=LogFile}" />
+            </StackPanel>
             <ScrollViewer Grid.Row="1">
                 <TextBlock ScrollViewer.VerticalScrollBarVisibility="Visible"
                        ScrollViewer.ZoomMode="Enabled"

diff --git a/src/openHAB.Windows/View/MainPage.xaml b/src/openHAB.Windows/View/MainPage.xaml
@@ -9,8 +9,9 @@
 	  xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
 	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	  xmlns:viewModel="using:OpenHAB.Windows.ViewModel"
-	  xmlns:controls="using:OpenHAB.Windows.Controls"
-	  mc:Ignorable="d"
+	  xmlns:controls="using:OpenHAB.Windows.Controls" 
+      xmlns:media="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      mc:Ignorable="d"
 	  Name="Page">
 	<Page.Background>
 		<ImageBrush ImageSource="/Assets/background.jpg"
@@ -32,12 +33,24 @@
 		</Style>
 
 		<!-- Navigation View Styling -->
-		<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground"
+		<!--<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground"
 						 Color="{StaticResource DarkColor}" />
 		<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground"
-						 Color="{StaticResource DarkColor}" />
+						 Color="{StaticResource DarkColor}" />-->
+
+        <media:AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
+                        BackgroundSource="Backdrop"
+                        TintOpacity="0.7"
+                        FallbackColor="{StaticResource DarkColor}"
+                        TintColor="{StaticResource DarkColor}" />
+
+        <media:AcrylicBrush x:Key="NavigationViewExpandedPaneBackground"
+                        BackgroundSource="Backdrop"
+                        TintOpacity="0.7"
+                        FallbackColor="{StaticResource DarkColor}"
+                        TintColor="{StaticResource DarkColor}" />
 
-		<SolidColorBrush x:Key="NavigationViewItemForeground"
+        <SolidColorBrush x:Key="NavigationViewItemForeground"
 						 Color="White" />
 		<SolidColorBrush x:Key="NavigationViewItemForegroundPointerOver"
 						 Color="#FFFF5722" />