Skip to content

Commit e556623

Browse files
KeveninKevenin
committed
#1, #3
- Fixed Count down timing issues - Added Virtual Panel for Fonts
1 parent 0e10dcd commit e556623

18 files changed

Lines changed: 882 additions & 429 deletions

‎Kevenin.LiveClock/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<userSettings>
1212
<Kevenin.LiveClock.Properties.Settings>
1313
<setting name="Foregound" serializeAs="String">
14-
<value>#00000000</value>
14+
<value>#FFFFFFFF</value>
1515
</setting>
1616
<setting name="Background" serializeAs="String">
1717
<value>#FF000000</value>

‎Kevenin.LiveClock/App.xaml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:local="clr-namespace:Kevenin.LiveClock"
55
StartupUri="MainWindow.xaml">
6-
<Application.Resources>
7-
<ResourceDictionary>
8-
<ResourceDictionary.MergedDictionaries>
9-
<!-- MahApps -->
10-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
11-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
12-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
13-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
6+
<Application.Resources>
7+
<ResourceDictionary>
8+
<ResourceDictionary.MergedDictionaries>
9+
<!-- MahApps -->
10+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
11+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
12+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
13+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
1414

15-
<!-- Material Design -->
16-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
17-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
18-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
19-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
15+
<!-- Material Design -->
16+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
17+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
18+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />
19+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
2020

21-
<!-- Material Design: MahApps Compatibility -->
22-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
23-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />
24-
</ResourceDictionary.MergedDictionaries>
21+
<!-- Material Design: MahApps Compatibility -->
22+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
23+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />
24+
</ResourceDictionary.MergedDictionaries>
2525

26-
<SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}" />
27-
<SolidColorBrush x:Key="AccentBaseColorBrush" Color="{DynamicResource Primary600}" />
28-
<SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource Primary500}" />
29-
<SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource Primary400}" />
30-
<SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource Primary300}" />
31-
<SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}" />
32-
<SolidColorBrush x:Key="WindowTitleColorBrush" Color="{DynamicResource Primary700}" />
33-
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}" />
34-
<LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
35-
<GradientStop Color="{DynamicResource Primary700}" Offset="0" />
36-
<GradientStop Color="{DynamicResource Primary300}" Offset="1" />
37-
</LinearGradientBrush>
38-
<SolidColorBrush x:Key="CheckmarkFill" Color="{DynamicResource Primary500}" />
39-
<SolidColorBrush x:Key="RightArrowFill" Color="{DynamicResource Primary500}" />
40-
<SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{DynamicResource Primary500Foreground}" />
41-
<SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4" />
42-
<SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{DynamicResource Primary500}" />
43-
<SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{DynamicResource Primary400}" />
44-
<SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{DynamicResource Primary500Foreground}" />
45-
</ResourceDictionary>
46-
</Application.Resources>
26+
<SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}" />
27+
<SolidColorBrush x:Key="AccentBaseColorBrush" Color="{DynamicResource Primary600}" />
28+
<SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource Primary500}" />
29+
<SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource Primary400}" />
30+
<SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource Primary300}" />
31+
<SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}" />
32+
<SolidColorBrush x:Key="WindowTitleColorBrush" Color="{DynamicResource Primary700}" />
33+
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}" />
34+
<LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
35+
<GradientStop Color="{DynamicResource Primary700}" Offset="0" />
36+
<GradientStop Color="{DynamicResource Primary300}" Offset="1" />
37+
</LinearGradientBrush>
38+
<SolidColorBrush x:Key="CheckmarkFill" Color="{DynamicResource Primary500}" />
39+
<SolidColorBrush x:Key="RightArrowFill" Color="{DynamicResource Primary500}" />
40+
<SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{DynamicResource Primary500Foreground}" />
41+
<SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4" />
42+
<SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{DynamicResource Primary500}" />
43+
<SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{DynamicResource Primary400}" />
44+
<SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{DynamicResource Primary500Foreground}" />
45+
</ResourceDictionary>
46+
</Application.Resources>
4747
</Application>

‎Kevenin.LiveClock/Kevenin.LiveClock.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@
9595
<Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
9696
<HintPath>..\packages\MahApps.Metro.1.6.5\lib\net45\MahApps.Metro.dll</HintPath>
9797
</Reference>
98-
<Reference Include="MaterialDesignColors, Version=1.0.0.14576, Culture=neutral, processorArchitecture=MSIL">
99-
<HintPath>..\packages\MaterialDesignColors.1.1.1\lib\net45\MaterialDesignColors.dll</HintPath>
98+
<Reference Include="MaterialDesignColors, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
99+
<HintPath>..\packages\MaterialDesignColors.1.2.1\lib\net45\MaterialDesignColors.dll</HintPath>
100100
</Reference>
101-
<Reference Include="MaterialDesignThemes.MahApps, Version=0.0.10.0, Culture=neutral, processorArchitecture=MSIL">
102-
<HintPath>..\packages\MaterialDesignThemes.MahApps.0.0.12\lib\net45\MaterialDesignThemes.MahApps.dll</HintPath>
101+
<Reference Include="MaterialDesignThemes.MahApps, Version=0.1.0.325, Culture=neutral, processorArchitecture=MSIL">
102+
<HintPath>..\packages\MaterialDesignThemes.MahApps.0.1.0\lib\net45\MaterialDesignThemes.MahApps.dll</HintPath>
103103
</Reference>
104-
<Reference Include="MaterialDesignThemes.Wpf, Version=2.5.0.1205, Culture=neutral, processorArchitecture=MSIL">
105-
<HintPath>..\packages\MaterialDesignThemes.2.5.0.1205\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
104+
<Reference Include="MaterialDesignThemes.Wpf, Version=2.6.0.325, Culture=neutral, processorArchitecture=MSIL">
105+
<HintPath>..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
106106
</Reference>
107107
<Reference Include="System" />
108108
<Reference Include="System.Data" />

0 commit comments

Comments
 (0)