Skip to content

Commit

Permalink
Fix web tool header
Browse files Browse the repository at this point in the history
  • Loading branch information
@AntonyCorbett
AntonyCorbett committed Jun 6, 2021
1 parent d0db278 commit f01ace8
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 74 deletions.
2 changes: 2 additions & 0 deletions OnlyM.sln.DotSettings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion OnlyM/Dialogs/StartOffsetDialog.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions OnlyM/MainWindow.xaml
View file

This file was deleted.

28 changes: 0 additions & 28 deletions OnlyM/MainWindow.xaml.cs
View file

This file was deleted.

8 changes: 6 additions & 2 deletions OnlyM/Services/WebNavHeaderManager/WebNavHeaderAdmin.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace OnlyM.Services.WebNavHeaderManager
using System.Diagnostics;

namespace OnlyM.Services.WebNavHeaderManager
{
using System;
using System.Threading.Tasks;
Expand All @@ -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;

Expand All @@ -20,6 +22,8 @@ public WebNavHeaderAdmin(Grid webNavHeader)

public void MouseMove(Point pos)
{
Debug.WriteLine(pos.Y);

switch (_webHeaderStatus)
{
case WebNavHeaderStatus.NotVisible:
Expand Down
2 changes: 1 addition & 1 deletion OnlyM/Windows/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
11 changes: 4 additions & 7 deletions OnlyM/Windows/OperatorPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -241,19 +239,17 @@
<!-- 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}"/>

<StackPanel Orientation="Horizontal"
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}"/>

Expand Down Expand Up @@ -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}}"
Expand Down
43 changes: 20 additions & 23 deletions OnlyM/Windows/SettingsPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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}"
Expand All @@ -398,7 +399,7 @@

<StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
<materialDesign:PackIcon Kind="BorderTop"
VerticalAlignment="Bottom"
VerticalAlignment="Center"
Width="24" Height="24"/>

<Slider Style="{StaticResource MarginsSliderStyle}"
Expand All @@ -407,15 +408,15 @@

<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}"/>
</StackPanel>

<StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">
<materialDesign:PackIcon Kind="BorderBottom"
VerticalAlignment="Bottom"
VerticalAlignment="Center"
Width="24" Height="24"/>

<Slider Style="{StaticResource MarginsSliderStyle}"
Expand All @@ -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}"
Expand All @@ -438,7 +439,7 @@
<StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">

<materialDesign:PackIcon Kind="BorderTop"
VerticalAlignment="Bottom"
VerticalAlignment="Center"
Width="24" Height="24"/>

<Slider Style="{StaticResource MarginsSliderStyle}"
Expand All @@ -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}"
Expand All @@ -483,7 +481,7 @@
<StackPanel Style="{StaticResource SettingsMarginStackPanelStyle}">

<materialDesign:PackIcon Kind="BorderTop"
VerticalAlignment="Bottom"
VerticalAlignment="Center"
Width="24" Height="24"/>

<Slider Style="{StaticResource MarginsSliderStyle}"
Expand All @@ -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}"
Expand Down

0 comments on commit f01ace8

Please sign in to comment.