From f01ace833c84bf5b7255c3b258e1452bc9b70384 Mon Sep 17 00:00:00 2001
From: AntonyCorbett <antony@corbetts.org.uk>
Date: Sun, 6 Jun 2021 12:56:02 +0100
Subject: [PATCH] Fix web tool header

---
 OnlyM.sln.DotSettings                         |  2 +
 OnlyM/Dialogs/StartOffsetDialog.xaml          |  2 +-
 OnlyM/MainWindow.xaml                         | 12 ------
 OnlyM/MainWindow.xaml.cs                      | 28 ------------
 .../WebNavHeaderManager/WebNavHeaderAdmin.cs  |  8 +++-
 OnlyM/Windows/MainWindow.xaml                 |  2 +-
 OnlyM/Windows/OperatorPage.xaml               | 11 ++---
 OnlyM/Windows/SettingsPage.xaml               | 43 +++++++++----------
 8 files changed, 34 insertions(+), 74 deletions(-)
 delete mode 100644 OnlyM/MainWindow.xaml
 delete mode 100644 OnlyM/MainWindow.xaml.cs

diff --git a/OnlyM.sln.DotSettings b/OnlyM.sln.DotSettings
index feea63ac9..26131a3f1 100644
--- a/OnlyM.sln.DotSettings
+++ b/OnlyM.sln.DotSettings
@@ -7,9 +7,11 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=FFME/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ffmpeg/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Fmpeg/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=HOTKEY/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=initialised/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=metafile/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Millisecs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PAGENUM/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Recents/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=reinitialise/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scroller/@EntryIndexedValue">True</s:Boolean>
diff --git a/OnlyM/Dialogs/StartOffsetDialog.xaml b/OnlyM/Dialogs/StartOffsetDialog.xaml
index bab19081f..4c87f83df 100644
--- a/OnlyM/Dialogs/StartOffsetDialog.xaml
+++ b/OnlyM/Dialogs/StartOffsetDialog.xaml
@@ -40,7 +40,7 @@
     <Border Padding="20">
         <Grid>
             <StackPanel Orientation="Vertical" Margin="0,0,0,10">
-                <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}"
+                <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}"
                            Text="{x:Static resx:Resources.SET_MEDIA_START}" />
 
                 <Grid>
diff --git a/OnlyM/MainWindow.xaml b/OnlyM/MainWindow.xaml
deleted file mode 100644
index cfada060e..000000000
--- a/OnlyM/MainWindow.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Window x:Class="WpfApp1.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WpfApp1"
-        mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
-    <Grid>
-
-    </Grid>
-</Window>
diff --git a/OnlyM/MainWindow.xaml.cs b/OnlyM/MainWindow.xaml.cs
deleted file mode 100644
index 83de7a5bf..000000000
--- a/OnlyM/MainWindow.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace WpfApp1
-{
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/OnlyM/Services/WebNavHeaderManager/WebNavHeaderAdmin.cs b/OnlyM/Services/WebNavHeaderManager/WebNavHeaderAdmin.cs
index 6cbf53bb7..4c1ba6eb3 100644
--- a/OnlyM/Services/WebNavHeaderManager/WebNavHeaderAdmin.cs
+++ b/OnlyM/Services/WebNavHeaderManager/WebNavHeaderAdmin.cs
@@ -1,4 +1,6 @@
-namespace OnlyM.Services.WebNavHeaderManager
+using System.Diagnostics;
+
+namespace OnlyM.Services.WebNavHeaderManager
 {
     using System;
     using System.Threading.Tasks;
@@ -9,7 +11,7 @@
     internal class WebNavHeaderAdmin
     {
         private const int WebHeaderHeight = 76;
-        private const int WebHeaderActionPixels = 5;
+        private const int WebHeaderActionPixels = 15;
         private readonly Grid _webNavHeader;
         private WebNavHeaderStatus _webHeaderStatus;
 
@@ -20,6 +22,8 @@ public WebNavHeaderAdmin(Grid webNavHeader)
 
         public void MouseMove(Point pos)
         {
+            Debug.WriteLine(pos.Y);
+
             switch (_webHeaderStatus)
             {
                 case WebNavHeaderStatus.NotVisible:
diff --git a/OnlyM/Windows/MainWindow.xaml b/OnlyM/Windows/MainWindow.xaml
index 511b0731f..324890d93 100644
--- a/OnlyM/Windows/MainWindow.xaml
+++ b/OnlyM/Windows/MainWindow.xaml
@@ -37,7 +37,7 @@
                 </Setter>
             </Style>
             <!--ScrollBars-->
-            <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
+            <Style TargetType="{x:Type ScrollBar}">
                 <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
                 <Setter Property="Foreground" Value="#FFE8E3F3" />
                 <Setter Property="Background" Value="Transparent" />
diff --git a/OnlyM/Windows/OperatorPage.xaml b/OnlyM/Windows/OperatorPage.xaml
index d52f428ed..23ee36332 100644
--- a/OnlyM/Windows/OperatorPage.xaml
+++ b/OnlyM/Windows/OperatorPage.xaml
@@ -4,11 +4,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:OnlyM.Windows"
              mc:Ignorable="d" 
              DataContext="{Binding Operator, Mode=OneWay, Source={StaticResource Locator}}"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              xmlns:models="clr-namespace:OnlyM.Models"
              xmlns:resx="clr-namespace:OnlyM.Properties"
              xmlns:controls="clr-namespace:OnlyM.Controls"
@@ -241,9 +239,8 @@
                                     <!-- TextBlocks generally used to show media length and duration -->
 
                                     <TextBlock Grid.Row="0" Grid.Column="0"
-                                               Style="{StaticResource MaterialDesignBody1TextBlock}"
+                                               Style="{StaticResource MaterialDesignBody2TextBlock}"
                                                Visibility="{Binding Path=HasDuration, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                               FontSize="16"
                                                Foreground="{Binding DurationColorBrush}"
                                                Text="{Binding DurationString}"/>
 
@@ -251,9 +248,8 @@
                                                 Grid.Row="1" Grid.Column="0">
 
                                         <TextBlock 
-                                               Style="{StaticResource MaterialDesignBody1TextBlock}"
+                                               Style="{StaticResource MaterialDesignBody2TextBlock}"
                                                Visibility="{Binding Path=HasDuration, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                               FontSize="16"
                                                Foreground="{Binding PlaybackTimeColorBrush}"
                                                Text="{Binding PlaybackTimeString}"/>
 
@@ -351,11 +347,12 @@
                                 <ProgressBar Grid.Row="2" 
                                            Visibility="{Binding Path=HasDurationAndIsPlaying, Converter={StaticResource BooleanToVisibilityConverter}}"
                                            Value="{Binding PlaybackPositionDeciseconds, Mode=OneWay}" 
+                                           Margin="0,2,0,0"
                                            Maximum="{Binding DurationDeciseconds}"/>
                                 <Slider Grid.Row="2" 
                                         Orientation="Horizontal"
                                         TickFrequency="1"
-                                        Margin="0,5,0,0"
+                                        Margin="0,10,0,0"
                                         SmallChange="10"
                                         LargeChange="300"
                                         Visibility="{Binding Path=IsSliderVisible, Converter={StaticResource BooleanToVisibilityConverter}}"
diff --git a/OnlyM/Windows/SettingsPage.xaml b/OnlyM/Windows/SettingsPage.xaml
index 63e8b9460..71d69ac30 100644
--- a/OnlyM/Windows/SettingsPage.xaml
+++ b/OnlyM/Windows/SettingsPage.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:OnlyM.Windows"
              mc:Ignorable="d" 
              DataContext="{Binding Settings, Mode=OneWay, Source={StaticResource Locator}}"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
@@ -38,7 +37,8 @@
             </Style>
 
             <Style x:Key="SettingsMarginStackPanelStyle" TargetType="{x:Type StackPanel}">
-                <Setter Property="Margin" Value="10,0,0,-20"/>
+                <Setter Property="Margin" Value="10,0,0,0"/>
+                <Setter Property="Height" Value="45"/>
                 <Setter Property="Orientation" Value="Horizontal"/>
             </Style>
 
@@ -72,11 +72,12 @@
             </Style>
 
             <Style x:Key="MarginsSliderStyle" TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesignDiscreteSlider}">
-                <Setter Property="Margin" Value="0,3,0,3"/>
+                <Setter Property="Margin" Value="10,3,0,3"/>
                 <Setter Property="Width" Value="380"/>
                 <Setter Property="Minimum" Value="0"/>
                 <Setter Property="Maximum" Value="90"/>
                 <Setter Property="HorizontalAlignment" Value="Left"/>
+                <Setter Property="VerticalAlignment" Value="Center"/>
                 <Setter Property="TickFrequency" Value="10"/>
             </Style>
 
@@ -382,14 +383,14 @@
 
         <GroupBox Header="{x:Static resx:Resources.SECTION_MARGINS}" Style="{StaticResource SettingsGroupBoxStyle}">
 
-            <StackPanel Margin="0,0,0,30">
+            <StackPanel Margin="0,0,0,10" Orientation="Vertical">
                 <TextBlock Style="{StaticResource MaterialDesignSubtitle2TextBlock}" 
                            Text="{x:Static resx:Resources.VIDEO_MARGINS}"
-                           Margin="0,0,0,-20"/>
+                           Margin="0,10,0,4"/>
 
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
                     <materialDesign:PackIcon Kind="BorderLeft" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
@@ -398,7 +399,7 @@
 
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
                     <materialDesign:PackIcon Kind="BorderTop" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
@@ -407,7 +408,7 @@
 
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
                     <materialDesign:PackIcon Kind="BorderRight" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
                             Value="{Binding VideoScreenRightMargin, Mode=TwoWay}"/>
@@ -415,7 +416,7 @@
 
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
                     <materialDesign:PackIcon Kind="BorderBottom" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
@@ -424,11 +425,11 @@
 
                 <TextBlock Style="{StaticResource MaterialDesignSubtitle2TextBlock}" 
                            Text="{x:Static resx:Resources.IMAGE_MARGINS}"
-                           Margin="0,40,0,-20"/>
+                           Margin="0,10,0,4"/>
 
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
                     <materialDesign:PackIcon Kind="BorderLeft" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
@@ -438,7 +439,7 @@
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
 
                     <materialDesign:PackIcon Kind="BorderTop" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
@@ -448,32 +449,29 @@
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
 
                     <materialDesign:PackIcon Kind="BorderRight" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
-
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
                             Value="{Binding ImageScreenRightMargin, Mode=TwoWay}"/>
                 </StackPanel>
 
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
                     <materialDesign:PackIcon Kind="BorderBottom" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
                             Value="{Binding ImageScreenBottomMargin, Mode=TwoWay}"/>
                 </StackPanel>
 
-
-
                 <TextBlock Style="{StaticResource MaterialDesignSubtitle2TextBlock}" 
                            Text="{x:Static resx:Resources.WEB_MARGINS}"
-                           Margin="0,40,0,-20"/>
+                           Margin="0,10,0,4"/>
 
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
                     <materialDesign:PackIcon Kind="BorderLeft" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
@@ -483,7 +481,7 @@
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
 
                     <materialDesign:PackIcon Kind="BorderTop" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
@@ -493,17 +491,16 @@
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
 
                     <materialDesign:PackIcon Kind="BorderRight" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
-
                     <Slider Style="{StaticResource MarginsSliderStyle}" 
                             Value="{Binding WebScreenRightMargin, Mode=TwoWay}"/>
                 </StackPanel>
 
                 <StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
                     <materialDesign:PackIcon Kind="BorderBottom" 
-                                             VerticalAlignment="Bottom"
+                                             VerticalAlignment="Center"
                                              Width="24" Height="24"/>
 
                     <Slider Style="{StaticResource MarginsSliderStyle}"