Skip to content

Commit 804d3c7

Browse files
author
Toroczkai Attila
committed
Theme Overhaul
1 parent 442e789 commit 804d3c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+503
-1817
lines changed

‎Capture2.JPG

35.7 KB
Loading

‎Example/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
1010
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
1111
<!-- Theme setting -->
12-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Green.xaml" />
12+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
1313
</ResourceDictionary.MergedDictionaries>
1414
</ResourceDictionary>
1515
</Application.Resources>

‎Example/Example.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Example</RootNamespace>
1212
<AssemblyName>Example</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1616
<WarningLevel>4</WarningLevel>
@@ -126,9 +126,6 @@
126126
</Compile>
127127
<AppDesigner Include="Properties\" />
128128
</ItemGroup>
129-
<ItemGroup>
130-
<Resource Include="OriginalLogo.png" />
131-
</ItemGroup>
132129
<ItemGroup>
133130
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
134131
<Visible>False</Visible>
@@ -151,10 +148,10 @@
151148
</ItemGroup>
152149
<ItemGroup>
153150
<PackageReference Include="MahApps.Metro">
154-
<Version>2.4.5</Version>
151+
<Version>2.4.9</Version>
155152
</PackageReference>
156153
<PackageReference Include="MahApps.Metro.IconPacks">
157-
<Version>4.8.0</Version>
154+
<Version>4.10.0</Version>
158155
</PackageReference>
159156
</ItemGroup>
160157
<ItemGroup>

‎Example/Main.xaml

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,14 @@
66
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
77
Title="WPF.MDI Example" Height="362" Width="684" WindowState="Maximized" Loaded="MetroWindow_Loaded">
88
<Grid>
9-
<DockPanel Margin="0,0,0,20" Background="Transparent">
10-
<mdi:MdiContainer Name="Container" EnableScrollbar="True">
11-
<mdi:MdiContainer.Menu>
12-
<Menu DockPanel.Dock="Top">
13-
9+
<DockPanel Margin="0,0,0,20">
10+
<mdi:MdiContainer Name="Container" Background="{x:Null}" Theme="Metro">
11+
<mdi:MdiContainer.Menu>
12+
<Menu DockPanel.Dock="Top">
1413
<MenuItem Header="Add">
15-
<MenuItem Header="Normal Window" Click="AddWindow_Click" />
16-
<MenuItem Header="Fixed Window" Click="AddFixedWindow_Click" />
17-
<MenuItem Header="Scroll Window" Click="AddScrollWindow_Click" />
18-
</MenuItem>
19-
<MenuItem Header="Theme">
20-
<MenuItem Header="Generic" Name="Generic" ToolTip="Generic Visual Studio designer theme" Click="Generic_Click" />
21-
<MenuItem Header="Luna" Name="Luna" ToolTip="Blue Windows XP theme" Click="Luna_Click" />
22-
<MenuItem Header="Aero" Name="Aero" ToolTip="Windows Vista/7 theme" Click="Aero_Click" />
23-
<MenuItem Header="Metro" Name="Metro" ToolTip="Windows Vista/7 theme" Click="Metro_Click" />
14+
<MenuItem Header="Normal Window" Click="AddWindow_Click" />
15+
<MenuItem Header="Fixed Window" Click="AddFixedWindow_Click" />
16+
<MenuItem Header="Scroll Window" Click="AddScrollWindow_Click" />
2417
</MenuItem>
2518
<MenuItem Header="Windows" Icon="{iconPacks:FontAwesome Kind=WindowsBrands}" Visibility="Visible" IsEnabled="True" FontSize="15">
2619
<StackPanel Width="auto" Margin="-30,-5,-30,-5">
@@ -36,22 +29,22 @@
3629
<MenuItem x:Name="Theme" Header="Theme" />
3730
<MenuItem x:Name="Accent" Header="Accent" />
3831
</Menu>
39-
</mdi:MdiContainer.Menu>
40-
<mdi:MdiChild Title="Empty Window Using XAML" Activated="Window_Activated" Deactivated="Window_Deactivated"/>
41-
<mdi:MdiChild Name="Window1" Title="Window Using XAML" Position="20,15" Icon="OriginalLogo.png" Activated="Window_Activated" Deactivated="Window_Deactivated">
42-
<StackPanel>
43-
<Button Name="DisableMinimize" Height="20" Click="DisableMinimize_Click">Disable Minimize</Button>
44-
<Button Name="EnableMinimize" Height="20" Click="EnableMinimize_Click">Enable Minimize</Button>
45-
<Button Name="DisableMaximize" Height="20" Click="DisableMaximize_Click">Disable Maximize</Button>
46-
<Button Name="EnableMaximize" Height="20" Click="EnableMaximize_Click">Enable Maximize</Button>
47-
<Button Name="DisableClose" Height="20" Click="DisableClose_Click">Disable Close</Button>
48-
<Button Name="EnableClose" Height="20" Click="EnableClose_Click">Enable Close</Button>
49-
<Button Name="ShowIcon" Height="20" Click="ShowIcon_Click">Show Icon</Button>
50-
<Button Name="HideIcon" Height="20" Click="HideIcon_Click">Hide Icon</Button>
51-
</StackPanel>
52-
</mdi:MdiChild>
53-
</mdi:MdiContainer>
54-
</DockPanel>
32+
</mdi:MdiContainer.Menu>
33+
<mdi:MdiChild Title="Empty Window Using XAML" />
34+
<mdi:MdiChild Name="Window1" Title="Window Using XAML" Position="20,15">
35+
<StackPanel>
36+
<Button Name="DisableMinimize" Height="20" Click="DisableMinimize_Click">Disable Minimize</Button>
37+
<Button Name="EnableMinimize" Height="20" Click="EnableMinimize_Click">Enable Minimize</Button>
38+
<Button Name="DisableMaximize" Height="20" Click="DisableMaximize_Click">Disable Maximize</Button>
39+
<Button Name="EnableMaximize" Height="20" Click="EnableMaximize_Click">Enable Maximize</Button>
40+
<Button Name="DisableClose" Height="20" Click="DisableClose_Click">Disable Close</Button>
41+
<Button Name="EnableClose" Height="20" Click="EnableClose_Click">Enable Close</Button>
42+
<Button Name="ShowIcon" Height="20" Click="ShowIcon_Click">Show Icon</Button>
43+
<Button Name="HideIcon" Height="20" Click="HideIcon_Click">Hide Icon</Button>
44+
</StackPanel>
45+
</mdi:MdiChild>
46+
</mdi:MdiContainer>
47+
</DockPanel>
5548
<StatusBar Height="23" VerticalAlignment="Bottom" Margin="0,0,0,0">
5649
<StatusBar.ItemsPanel>
5750
<ItemsPanelTemplate>
@@ -69,18 +62,17 @@
6962
</ItemsPanelTemplate>
7063
</StatusBar.ItemsPanel>
7164
<StatusBarItem>
72-
<TextBlock x:Name="activetxt" Foreground="Black"/>
65+
<TextBlock x:Name="activetxt"/>
7366
</StatusBarItem>
7467
<StatusBarItem Grid.Column="1">
75-
<Controls:MetroProgressBar x:Name="somethingloader" Value="30" Width="80" Height="17" Foreground="WhiteSmoke" IsIndeterminate="True"/>
68+
<Controls:MetroProgressBar x:Name="somethingloader" Value="30" Width="80" Height="17" IsIndeterminate="True"/>
7669
</StatusBarItem>
7770
<StatusBarItem Grid.Column="2">
78-
<TextBlock x:Name="somethingtxt" Text="Loading some things..." Foreground="Black" />
71+
<TextBlock x:Name="somethingtxt" Text="Loading some things..." />
7972
</StatusBarItem>
8073
<StatusBarItem HorizontalContentAlignment="Right" Grid.Column="3">
81-
<TextBlock x:Name="verstxt" Foreground="Black" Text="1.2.0.0"/>
74+
<TextBlock x:Name="verstxt" Text="1.3.0.0"/>
8275
</StatusBarItem>
8376
</StatusBar>
84-
8577
</Grid>
8678
</Controls:MetroWindow>

0 commit comments

Comments
 (0)