From 2208ff1ca3702b0cc4d5cfbcdad46a4889db91a8 Mon Sep 17 00:00:00 2001
From: Christoph Hofmann <oss@hoffe.org>
Date: Tue, 20 Jul 2021 21:27:51 +0200
Subject: [PATCH] Minor UI improvements #201 #131

Signed-off-by: Christoph Hofmann <oss@hoffe.org>
---
 src/openHAB.Core/Strings/de-de/Resources.resw |   2 +-
 src/openHAB.Core/Strings/en-us/Resources.resw |   2 +-
 .../Controls/ConnectionDialog.xaml            |   6 +-
 src/openHAB.Windows/Styles/DefaultTheme.xaml  |   6 +-
 src/openHAB.Windows/View/LogViewerPage.xaml   |  14 +-
 src/openHAB.Windows/View/MainPage.xaml        |  23 +-
 src/openHAB.Windows/View/SettingsPage.xaml    | 521 +++++++++---------
 .../ViewModel/LogsViewModel.cs                |  15 +
 8 files changed, 306 insertions(+), 283 deletions(-)

diff --git a/src/openHAB.Core/Strings/de-de/Resources.resw b/src/openHAB.Core/Strings/de-de/Resources.resw
index e25e2f7b..e51f46df 100644
--- 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
index 8ae09297..670fc53d 100644
--- 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
index 237cc055..a7edfca7 100644
--- 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
index d1517ddf..8aeb8fb7 100644
--- 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
index 50d97dc3..d0622a4e 100644
--- 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
index 5911b9d6..3111119e 100644
--- 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" />
diff --git a/src/openHAB.Windows/View/SettingsPage.xaml b/src/openHAB.Windows/View/SettingsPage.xaml
index 0f34b914..9e66a60b 100644
--- a/src/openHAB.Windows/View/SettingsPage.xaml
+++ b/src/openHAB.Windows/View/SettingsPage.xaml
@@ -1,266 +1,259 @@
 <Page x:Class="OpenHAB.Windows.View.SettingsPage"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:converters="using:OpenHAB.Windows.Converters"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:core="using:Microsoft.Xaml.Interactions.Core"
-	  xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-	  xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-	  mc:Ignorable="d"
-	  x:Name="SettingsView">
-
-	<Page.Background>
-		<ImageBrush ImageSource="/Assets/background.jpg"
-					Stretch="UniformToFill" />
-	</Page.Background>
-	<Page.Resources>
-		<converters:ReverseBoolConverter x:Key="ReverseBoolConverter" />
-
-		<Style x:Name="SettingsMenuItem"
-			   TargetType="ListViewItem">
-			<Setter Property="Foreground"
-					Value="White" />
-			<Setter Property="FontSize"
-					Value="16" />
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="ListViewItem">
-
-						<ListViewItemPresenter 	CheckBrush="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
-												ContentMargin="{TemplateBinding Padding}"
-												CheckMode="Overlay"
-												ContentTransitions="{TemplateBinding ContentTransitions}"
-												CheckBoxBrush="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
-												DragForeground="{ThemeResource ListViewItemDragForegroundThemeBrush}"
-												DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
-												DragBackground="{ThemeResource ListViewItemDragBackgroundThemeBrush}"
-												DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
-												FocusBorderBrush="{ThemeResource SystemControlForegroundAltHighBrush}"
-												FocusSecondaryBorderBrush="{ThemeResource SystemControlForegroundBaseHighBrush}"
-												HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-												PointerOverForeground="#FFFF5722"
-												PressedBackground="{ThemeResource SystemControlHighlightListMediumBrush}"
-												PlaceholderBackground="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}"
-												PointerOverBackground="{ThemeResource SystemControlHighlightListLowBrush}"
-												ReorderHintOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-												SelectedPressedBackground="{ThemeResource SystemControlHighlightListAccentHighBrush}"
-												SelectionCheckMarkVisualEnabled="True"
-												SelectedForeground="#FFFF5722"
-												SelectedPointerOverBackground="{ThemeResource SystemControlHighlightListAccentMediumBrush}"
-												SelectedBackground="#344040"
-												VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style>
-	</Page.Resources>
-	<Grid>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<CommandBar Grid.Row="0"
-					Background="{StaticResource DarkColor}"
-					DefaultLabelPosition="Right">
-			<AppBarButton  x:Uid="SettingsSaveButton"
-						   Icon="Save"
-						   Foreground="White"
-						   Command="{x:Bind Vm.SaveCommand}" />
-			<AppBarButton  x:Uid="SettingsCancelButton"
-						   Foreground="White"
-						   Icon="Cancel">
-				<interactivity:Interaction.Behaviors>
-					<core:EventTriggerBehavior EventName="Tapped">
-						<core:NavigateToPageAction TargetPage="OpenHAB.Windows.View.MainPage" />
-					</core:EventTriggerBehavior>
-				</interactivity:Interaction.Behaviors>
-			</AppBarButton>
-			<CommandBar.Content>
-				<StackPanel Orientation="Horizontal">
-					<SymbolIcon Symbol="Setting"
-								Margin="10,5,0,0"
-								VerticalAlignment="Center"
-								Foreground="{StaticResource OpenHABMenuColor}" />
-					<TextBlock x:Uid="SettingsHeader"
-							   Margin="10,0,0,0"
-							   FontSize="28"
-							   VerticalAlignment="Center"
-							   TextWrapping="Wrap"
-							   Foreground="White" />
-				</StackPanel>
-			</CommandBar.Content>
-		</CommandBar>
-
-		<SplitView  Grid.Row="1"
-					IsPaneOpen="True"
-					DisplayMode="CompactInline"
-					OpenPaneLength="256"
-					PaneBackground="{ThemeResource DarkColor}">
-			<SplitView.Pane>
-				<ListView x:Name="SettingOptionsListView"
-						  Margin="0,10,0,0"
-						  ItemContainerStyle="{StaticResource SettingsMenuItem}">
-					<ListViewItem x:Uid="MenuAppSettings"
-								  Tapped="AppSettingsListViewItem_Tapped" />
-					<ListViewItem x:Uid="MenuConnectionSettings"
-								  Tapped="ConnectionSettingsListViewItem_Tapped" />
-					<ListViewItem x:Uid="MenuLogsView">
-						<interactivity:Interaction.Behaviors>
-							<core:EventTriggerBehavior EventName="Tapped">
-								<core:NavigateToPageAction TargetPage="OpenHAB.Windows.View.LogViewerPage" />
-							</core:EventTriggerBehavior>
-						</interactivity:Interaction.Behaviors>
-					</ListViewItem>
-				</ListView>
-			</SplitView.Pane>
-			<ScrollViewer VerticalScrollBarVisibility="Auto">
-				<Grid Margin="10">
-					<Grid.RowDefinitions>
-						<RowDefinition Height="*" />
-						<RowDefinition Height="auto" />
-					</Grid.RowDefinitions>
-					<StackPanel Grid.Row="0"
-								Orientation="Vertical">
-						<!-- App Settings -->
-						<StackPanel x:Name="AppSettings">
-							<StackPanel Margin="0,0,0,25"
-										Padding="12"
-										Background="{ThemeResource OpenHABLightColor}">
-								<TextBlock x:Uid="AppSettings"
-										   Style="{StaticResource TitleTextBlockStyle}"
-										   Margin="0,0,0,10" />
-								<TextBlock x:Uid="AppAutostart"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch x:Name="AppAutostartSwitch"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsEnabled="{Binding Settings.CanAppAutostartEnabled, Mode=TwoWay}"
-											  IsOn="{Binding Settings.IsAppAutostartEnabled, Mode=TwoWay}" />
-								<TextBlock x:Uid="StartAppMinimized"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch x:Name="StartAppMinimizedSwitch"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.StartAppMinimized, Mode=TwoWay}" />
-								<TextBlock x:Uid="AppLanguage"
-										   Margin="0,0,0,10" />
-								<ComboBox Margin="0,0,0,12"
-										  ItemsSource="{Binding Settings.AppLanguages}"
-										  DisplayMemberPath="Name"
-										  SelectedItem="{Binding Settings.SelectedAppLanguage, Mode=TwoWay}" />
-							</StackPanel>
-
-							<StackPanel Margin="0,0,0,25"
-										Padding="12"
-										Background="{ThemeResource OpenHABLightColor}">
-								<TextBlock x:Uid="NotificationSetting"
-										   Style="{StaticResource TitleTextBlockStyle}"
-										   Margin="0,0,0,10" />
-								<TextBlock x:Uid="EnableWindowsNotifications"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.NotificationsEnable, Mode=TwoWay}" />
-							</StackPanel>
-
-							<StackPanel Margin="0,0,0,25"
-										Padding="12"
-										Background="{ThemeResource OpenHABLightColor}">
-								<TextBlock x:Uid="SitemapSetting"
-										   Style="{StaticResource TitleTextBlockStyle}"
-										   Margin="0,0,0,10" />
-								<TextBlock x:Uid="ShowDefaultSitemap"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch x:Name="CheckBoxHideDefaultSitemap"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.ShowDefaultSitemap, Mode=TwoWay}" />
-								<TextBlock x:Uid="SVGIcons"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch x:Name="CheckBoxSVGIcons"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.UseSVGIcons, Mode=TwoWay}" />
-								<TextBlock x:Uid="ClearIconCache"
-										   Margin="0,0,0,10" />
-								<Button x:Uid="ClearIconCacheButton"
-										Margin="0,0,0,12"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Center"
-										Command="{x:Bind Vm.ClearIconCacheCommand}" />
-							</StackPanel>
-						</StackPanel>
-
-
-
-						<!-- Connection Settings -->
-						<Grid x:Name="ConnectionSettings"
-							  Margin="0,0,0,25"
-							  Padding="12"
-							  Background="{ThemeResource OpenHABLightColor}"
-							  Visibility="Collapsed">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<StackPanel Grid.Row="0">
-								<TextBlock x:Uid="ConnectionSettings"
-										   Style="{StaticResource TitleTextBlockStyle}"
-										   Margin="0,0,0,10" />
-								<TextBlock x:Uid="DemoModeHeader" />
-								<ToggleSwitch x:Name="CheckBoxDemoMode"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.IsRunningInDemoMode, Mode=TwoWay}" />
-							</StackPanel>
-							<StackPanel Grid.Row="1">
-								<Button Margin="10"
-										HorizontalAlignment="Stretch"
-										VerticalAlignment="Stretch"
-										HorizontalContentAlignment="Left"
-										DataContext="{Binding Path=Settings.LocalConnection}"
-										IsEnabled="{x:Bind CheckBoxDemoMode.IsOn, Converter={StaticResource ReverseBoolConverter}, Mode=OneWay}"
-										Click="OpenLocalConnectionButton_Click">
-									<StackPanel HorizontalAlignment="Left">
-										<TextBlock x:Uid="LocalSettings"
-												   FontSize="16" />
-										<TextBlock Text="{Binding Subtitle}" />
-									</StackPanel>
-								</Button>
-								<Button Margin="10"
-										HorizontalAlignment="Stretch"
-										VerticalAlignment="Stretch"
-										HorizontalContentAlignment="Left"
-										DataContext="{Binding Path=Settings.RemoteConnection}"
-										IsEnabled="{x:Bind CheckBoxDemoMode.IsOn, Converter={StaticResource ReverseBoolConverter}, Mode=OneWay}"
-										Click="OpenRemoteConnectionButton_Click">
-									<StackPanel>
-										<TextBlock x:Uid="RemoteSettings"
-												   FontSize="16" />
-										<TextBlock Text="{Binding Subtitle}" />
-									</StackPanel>
-								</Button>
-							</StackPanel>
-						</Grid>
-
-					</StackPanel>
-					<muxc:InfoBar x:Name="SettingsNotification"
-								  Grid.Row="1"
-								  Margin="10"
-								  IsClosable="True"
-								  Severity="Error"
-								  HorizontalAlignment="Stretch"
-								  VerticalAlignment="Center" />
-				</Grid>
-			</ScrollViewer>
-		</SplitView>
-	</Grid>
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:converters="using:OpenHAB.Windows.Converters"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+      mc:Ignorable="d"
+      x:Name="SettingsView">
+    <Page.Background>
+        <ImageBrush ImageSource="/Assets/background.jpg"
+                    Stretch="UniformToFill" />
+    </Page.Background>
+    <Page.Resources>
+        <converters:ReverseBoolConverter x:Key="ReverseBoolConverter" />
+        <Style x:Name="SettingsMenuItem"
+               TargetType="ListViewItem">
+            <Setter Property="Foreground"
+                    Value="White" />
+            <Setter Property="FontSize"
+                    Value="16" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListViewItem">
+                        <ListViewItemPresenter 	CheckBrush="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
+                                                ContentMargin="{TemplateBinding Padding}"
+                                                CheckMode="Overlay"
+                                                ContentTransitions="{TemplateBinding ContentTransitions}"
+                                                CheckBoxBrush="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
+                                                DragForeground="{ThemeResource ListViewItemDragForegroundThemeBrush}"
+                                                DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
+                                                DragBackground="{ThemeResource ListViewItemDragBackgroundThemeBrush}"
+                                                DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
+                                                FocusBorderBrush="{ThemeResource SystemControlForegroundAltHighBrush}"
+                                                FocusSecondaryBorderBrush="{ThemeResource SystemControlForegroundBaseHighBrush}"
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                PointerOverForeground="#FFFF5722"
+                                                PressedBackground="{ThemeResource SystemControlHighlightListMediumBrush}"
+                                                PlaceholderBackground="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}"
+                                                PointerOverBackground="{ThemeResource SystemControlHighlightListLowBrush}"
+                                                ReorderHintOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                SelectedPressedBackground="{ThemeResource SystemControlHighlightListAccentHighBrush}"
+                                                SelectionCheckMarkVisualEnabled="True"
+                                                SelectedForeground="#FFFF5722"
+                                                SelectedPointerOverBackground="{ThemeResource SystemControlHighlightListAccentMediumBrush}"
+                                                SelectedBackground="#344040"
+                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Page.Resources>
+    <Grid>
+        <SplitView IsPaneOpen="True"
+                   DisplayMode="CompactInline"
+                   OpenPaneLength="256"
+                   PaneBackground="{ThemeResource DarkAcrylicColor}">
+            <SplitView.Pane>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="100*" />
+                        <RowDefinition Height="auto" />
+                    </Grid.RowDefinitions>
+                    <StackPanel Grid.Row="0"
+                                Orientation="Horizontal">
+                        <SymbolIcon Symbol="Setting"
+                                    Margin="10,5,0,0"
+                                    VerticalAlignment="Center"
+                                    Foreground="{StaticResource OpenHABMenuColor}" />
+                        <TextBlock x:Uid="SettingsHeader"
+                                   Margin="10,0,0,0"
+                                   FontSize="28"
+                                   VerticalAlignment="Center"
+                                   TextWrapping="Wrap"
+                                   Foreground="White" />
+                    </StackPanel>
+                    <ListView Grid.Row="1"
+                              x:Name="SettingOptionsListView"
+                              Margin="0,10,0,0"
+                              ItemContainerStyle="{StaticResource SettingsMenuItem}">
+                        <ListViewItem x:Uid="MenuAppSettings"
+                                      Tapped="AppSettingsListViewItem_Tapped" />
+                        <ListViewItem x:Uid="MenuConnectionSettings"
+                                      Tapped="ConnectionSettingsListViewItem_Tapped" />
+                        <ListViewItem x:Uid="MenuLogsView">
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Tapped">
+                                    <core:NavigateToPageAction TargetPage="OpenHAB.Windows.View.LogViewerPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </ListViewItem>
+                    </ListView>
+                    <CommandBar Grid.Row="2"
+                                Background="Transparent"
+                                HorizontalAlignment="Left"
+                                DefaultLabelPosition="Right">
+                        <AppBarButton x:Uid="SettingsSaveButton"
+                                       Icon="Save"
+                                       Foreground="White"
+                                       Command="{x:Bind Vm.SaveCommand}" />
+                        <AppBarButton  x:Uid="SettingsCancelButton"
+                                       Foreground="White"
+                                       Icon="Cancel">
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Tapped">
+                                    <core:NavigateToPageAction TargetPage="OpenHAB.Windows.View.MainPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </AppBarButton>
+                    </CommandBar>
+                </Grid>
+            </SplitView.Pane>
+            <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <Grid Margin="20,20,50,50">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="auto" />
+                    </Grid.RowDefinitions>
+                    <StackPanel Grid.Row="0"
+                                Orientation="Vertical">
+                        <!-- App Settings -->
+                        <StackPanel x:Name="AppSettings">
+                            <StackPanel Margin="0,0,0,25"
+                                        Padding="12"
+                                        Background="{ThemeResource OpenHABLightColor}">
+                                <TextBlock x:Uid="AppSettings"
+                                           Style="{StaticResource TitleTextBlockStyle}"
+                                           Margin="0,0,0,10" />
+                                <TextBlock x:Uid="AppAutostart"
+                                           Margin="0,0,0,10" />
+                                <ToggleSwitch x:Name="AppAutostartSwitch"
+                                              Margin="0,0,0,12"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Stretch"
+                                              IsEnabled="{Binding Settings.CanAppAutostartEnabled, Mode=TwoWay}"
+                                              IsOn="{Binding Settings.IsAppAutostartEnabled, Mode=TwoWay}" />
+                                <TextBlock x:Uid="StartAppMinimized"
+                                           Margin="0,0,0,10" />
+                                <ToggleSwitch x:Name="StartAppMinimizedSwitch"
+                                              Margin="0,0,0,12"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Stretch"
+                                              IsOn="{Binding Settings.StartAppMinimized, Mode=TwoWay}" />
+                                <TextBlock x:Uid="AppLanguage"
+                                           Margin="0,0,0,10" />
+                                <ComboBox Margin="0,0,0,12"
+                                          ItemsSource="{Binding Settings.AppLanguages}"
+                                          DisplayMemberPath="Name"
+                                          SelectedItem="{Binding Settings.SelectedAppLanguage, Mode=TwoWay}" />
+                            </StackPanel>
+                            <StackPanel Margin="0,0,0,25"
+                                        Padding="12"
+                                        Background="{ThemeResource OpenHABLightColor}">
+                                <TextBlock x:Uid="NotificationSetting"
+                                           Style="{StaticResource TitleTextBlockStyle}"
+                                           Margin="0,0,0,10" />
+                                <TextBlock x:Uid="EnableWindowsNotifications"
+                                           Margin="0,0,0,10" />
+                                <ToggleSwitch Margin="0,0,0,12"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Stretch"
+                                              IsOn="{Binding Settings.NotificationsEnable, Mode=TwoWay}" />
+                            </StackPanel>
+                            <StackPanel Margin="0,0,0,25"
+                                        Padding="12"
+                                        Background="{ThemeResource OpenHABLightColor}">
+                                <TextBlock x:Uid="SitemapSetting"
+                                           Style="{StaticResource TitleTextBlockStyle}"
+                                           Margin="0,0,0,10" />
+                                <TextBlock x:Uid="ShowDefaultSitemap"
+                                           Margin="0,0,0,10" />
+                                <ToggleSwitch x:Name="CheckBoxHideDefaultSitemap"
+                                              Margin="0,0,0,12"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Stretch"
+                                              IsOn="{Binding Settings.ShowDefaultSitemap, Mode=TwoWay}" />
+                                <TextBlock x:Uid="SVGIcons"
+                                           Margin="0,0,0,10" />
+                                <ToggleSwitch x:Name="CheckBoxSVGIcons"
+                                              Margin="0,0,0,12"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Stretch"
+                                              IsOn="{Binding Settings.UseSVGIcons, Mode=TwoWay}" />
+                                <TextBlock x:Uid="ClearIconCache"
+                                           Margin="0,0,0,10" />
+                                <Button x:Uid="ClearIconCacheButton"
+                                        Margin="0,0,0,12"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Command="{x:Bind Vm.ClearIconCacheCommand}" />
+                            </StackPanel>
+                        </StackPanel>
+                        <!-- Connection Settings -->
+                        <Grid x:Name="ConnectionSettings"
+                              Margin="0,0,0,25"
+                              Padding="12"
+                              Background="{ThemeResource OpenHABLightColor}"
+                              Visibility="Collapsed">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <StackPanel Grid.Row="0">
+                                <TextBlock x:Uid="ConnectionSettings"
+                                           Style="{StaticResource TitleTextBlockStyle}"
+                                           Margin="0,0,0,10" />
+                                <TextBlock x:Uid="DemoModeHeader" />
+                                <ToggleSwitch x:Name="CheckBoxDemoMode"
+                                              Margin="0,0,0,12"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Stretch"
+                                              IsOn="{Binding Settings.IsRunningInDemoMode, Mode=TwoWay}" />
+                            </StackPanel>
+                            <StackPanel Grid.Row="1">
+                                <Button Margin="10"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalContentAlignment="Left"
+                                        DataContext="{Binding Path=Settings.LocalConnection}"
+                                        IsEnabled="{x:Bind CheckBoxDemoMode.IsOn, Converter={StaticResource ReverseBoolConverter}, Mode=OneWay}"
+                                        Click="OpenLocalConnectionButton_Click">
+                                    <StackPanel HorizontalAlignment="Left">
+                                        <TextBlock x:Uid="LocalSettings"
+                                                   FontSize="16" />
+                                        <TextBlock Text="{Binding Subtitle}" />
+                                    </StackPanel>
+                                </Button>
+                                <Button Margin="10"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalContentAlignment="Left"
+                                        DataContext="{Binding Path=Settings.RemoteConnection}"
+                                        IsEnabled="{x:Bind CheckBoxDemoMode.IsOn, Converter={StaticResource ReverseBoolConverter}, Mode=OneWay}"
+                                        Click="OpenRemoteConnectionButton_Click">
+                                    <StackPanel>
+                                        <TextBlock x:Uid="RemoteSettings"
+                                                   FontSize="16" />
+                                        <TextBlock Text="{Binding Subtitle}" />
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
+                        </Grid>
+                    </StackPanel>
+                    <muxc:InfoBar x:Name="SettingsNotification"
+                                  Grid.Row="1"
+                                  Margin="10"
+                                  IsClosable="True"
+                                  Severity="Error"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Center" />
+                </Grid>
+            </ScrollViewer>
+        </SplitView>
+    </Grid>
 </Page>
\ No newline at end of file
diff --git a/src/openHAB.Windows/ViewModel/LogsViewModel.cs b/src/openHAB.Windows/ViewModel/LogsViewModel.cs
index cf8e3285..62fb4749 100644
--- a/src/openHAB.Windows/ViewModel/LogsViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/LogsViewModel.cs
@@ -63,6 +63,21 @@ public string LogFilePath
             }
         }
 
+        /// <summary>Gets the log file name including extension.</summary>
+        /// <value>The log file.</value>
+        public string LogFile
+        {
+            get
+            {
+                if (_logFile != null)
+                {
+                    return _logFile.Name;
+                }
+
+                return string.Empty;
+            }
+        }
+
         private async Task LoadLogfileAsync()
         {
             await LoadLogFileContent().ConfigureAwait(false);