diff --git a/MahApps.Metro/MahApps.Metro.NET45.csproj b/MahApps.Metro/MahApps.Metro.NET45.csproj index d4c9741980..0f63772e82 100644 --- a/MahApps.Metro/MahApps.Metro.NET45.csproj +++ b/MahApps.Metro/MahApps.Metro.NET45.csproj @@ -153,6 +153,94 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -374,26 +462,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - Designer MSBuild:Compile diff --git a/MahApps.Metro/MahApps.Metro.csproj b/MahApps.Metro/MahApps.Metro.csproj index b993d5d3dc..b2485a3762 100644 --- a/MahApps.Metro/MahApps.Metro.csproj +++ b/MahApps.Metro/MahApps.Metro.csproj @@ -170,6 +170,74 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + Designer MSBuild:Compile diff --git a/MahApps.Metro/Styles/Accents/Amber.xaml b/MahApps.Metro/Styles/Accents/Amber.xaml new file mode 100644 index 0000000000..7ec1a2b81f --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Amber.xaml @@ -0,0 +1,26 @@ + + #FFF0A30A + #FFF0A30A + + #CCF0A30A + + #99F0A30A + + #66F0A30A + + #33F0A30A + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Brown.xaml b/MahApps.Metro/Styles/Accents/Brown.xaml new file mode 100644 index 0000000000..2c80186abe --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Brown.xaml @@ -0,0 +1,26 @@ + + #FF825A2C + #FF825A2C + + #CC825A2C + + #99825A2C + + #66825A2C + + #33825A2C + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Cobalt.xaml b/MahApps.Metro/Styles/Accents/Cobalt.xaml new file mode 100644 index 0000000000..d8cb810a61 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Cobalt.xaml @@ -0,0 +1,26 @@ + + #FF0050EF + #FF0050EF + + #CC0050EF + + #990050EF + + #660050EF + + #330050EF + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Crimson.xaml b/MahApps.Metro/Styles/Accents/Crimson.xaml new file mode 100644 index 0000000000..e17e88dfab --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Crimson.xaml @@ -0,0 +1,26 @@ + + #FFA20025 + #FFA20025 + + #CCA20025 + + #99A20025 + + #66A20025 + + #33A20025 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Cyan.xaml b/MahApps.Metro/Styles/Accents/Cyan.xaml new file mode 100644 index 0000000000..4388e79451 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Cyan.xaml @@ -0,0 +1,26 @@ + + #FF1BA1E2 + #FF1BA1E2 + + #CC1BA1E2 + + #991BA1E2 + + #661BA1E2 + + #331BA1E2 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Emerald.xaml b/MahApps.Metro/Styles/Accents/Emerald.xaml new file mode 100644 index 0000000000..c3a24f9b4c --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Emerald.xaml @@ -0,0 +1,26 @@ + + #FF008A00 + #FF008A00 + + #CC008A00 + + #99008A00 + + #66008A00 + + #33008A00 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Green.xaml b/MahApps.Metro/Styles/Accents/Green.xaml index fc773eb845..272218ff02 100644 --- a/MahApps.Metro/Styles/Accents/Green.xaml +++ b/MahApps.Metro/Styles/Accents/Green.xaml @@ -1,19 +1,19 @@ - - #FF48cb00 - #FF48cb00 + #FF60A917 + #FF60A917 - #CC48cb00 + #CC60A917 - #9948cb00 + #9960A917 - #6648cb00 + #6660A917 - #3348cb00 + #3360A917 - + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Indigo.xaml b/MahApps.Metro/Styles/Accents/Indigo.xaml new file mode 100644 index 0000000000..39827cb5f6 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Indigo.xaml @@ -0,0 +1,26 @@ + + #FF6A00FF + #FF6A00FF + + #CC6A00FF + + #996A00FF + + #666A00FF + + #336A00FF + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Lime.xaml b/MahApps.Metro/Styles/Accents/Lime.xaml new file mode 100644 index 0000000000..1368ef1802 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Lime.xaml @@ -0,0 +1,26 @@ + + #FFA4C400 + #FFA4C400 + + #CCA4C400 + + #99A4C400 + + #66A4C400 + + #33A4C400 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Magenta.xaml b/MahApps.Metro/Styles/Accents/Magenta.xaml new file mode 100644 index 0000000000..4dc8719c1b --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Magenta.xaml @@ -0,0 +1,26 @@ + + #FFD80073 + #FFD80073 + + #CCD80073 + + #99D80073 + + #66D80073 + + #33D80073 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Mauve.xaml b/MahApps.Metro/Styles/Accents/Mauve.xaml new file mode 100644 index 0000000000..dece8dfce7 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Mauve.xaml @@ -0,0 +1,26 @@ + + #FF76608A + #FF76608A + + #CC76608A + + #9976608A + + #6676608A + + #3376608A + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Olive.xaml b/MahApps.Metro/Styles/Accents/Olive.xaml new file mode 100644 index 0000000000..05a52987c5 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Olive.xaml @@ -0,0 +1,26 @@ + + #FF6D8764 + #FF6D8764 + + #CC6D8764 + + #996D8764 + + #666D8764 + + #336D8764 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Orange.xaml b/MahApps.Metro/Styles/Accents/Orange.xaml index e4299ac0c4..9bb4297357 100644 --- a/MahApps.Metro/Styles/Accents/Orange.xaml +++ b/MahApps.Metro/Styles/Accents/Orange.xaml @@ -1,27 +1,19 @@  - - #FF9e5608 - #FF9e5608 + #FFFA6800 + #FFFA6800 - #FFde872a - - - #CCff9829 + #CCFA6800 - #99ff9829 + #99FA6800 - #66ff9829 + #66FA6800 - #33ff9829 + #33FA6800 - - - + + + + #FFF472D0 + #FFF472D0 + + #CCF472D0 + + #99F472D0 + + #66F472D0 + + #33F472D0 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Red.xaml b/MahApps.Metro/Styles/Accents/Red.xaml index a344d10e71..cb4a7395d1 100644 --- a/MahApps.Metro/Styles/Accents/Red.xaml +++ b/MahApps.Metro/Styles/Accents/Red.xaml @@ -1,15 +1,15 @@  - #FFcb0000 - #FFcb0000 + #FFE51400 + #FFE51400 - #CCcb0000 + #CCE51400 - #99cb0000 + #99E51400 - #66cb0000 + #66E51400 - #33cb0000 + #33E51400 diff --git a/MahApps.Metro/Styles/Accents/Sienna.xaml b/MahApps.Metro/Styles/Accents/Sienna.xaml new file mode 100644 index 0000000000..da0390038b --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Sienna.xaml @@ -0,0 +1,26 @@ + + #FFA0522D + #FFA0522D + + #CCA0522D + + #99A0522D + + #66A0522D + + #33A0522D + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Steel.xaml b/MahApps.Metro/Styles/Accents/Steel.xaml new file mode 100644 index 0000000000..4ad0fbfdc1 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Steel.xaml @@ -0,0 +1,26 @@ + + #FF647687 + #FF647687 + + #CC647687 + + #99647687 + + #66647687 + + #33647687 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Teal.xaml b/MahApps.Metro/Styles/Accents/Teal.xaml new file mode 100644 index 0000000000..620a3b1dd5 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Teal.xaml @@ -0,0 +1,26 @@ + + #FF00ABA9 + #FF00ABA9 + + #CC00ABA9 + + #9900ABA9 + + #6600ABA9 + + #3300ABA9 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Violet.xaml b/MahApps.Metro/Styles/Accents/Violet.xaml new file mode 100644 index 0000000000..34ac42b517 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Violet.xaml @@ -0,0 +1,26 @@ + + #FFAA00FF + #FFAA00FF + + #CCAA00FF + + #99AA00FF + + #66AA00FF + + #33AA00FF + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Accents/Yellow.xaml b/MahApps.Metro/Styles/Accents/Yellow.xaml new file mode 100644 index 0000000000..841ae28986 --- /dev/null +++ b/MahApps.Metro/Styles/Accents/Yellow.xaml @@ -0,0 +1,26 @@ + + #FFE3C800 + #FFE3C800 + + #CCE3C800 + + #99E3C800 + + #66E3C800 + + #33E3C800 + + + + + + + + + + + + \ No newline at end of file diff --git a/MahApps.Metro/ThemeManager.cs b/MahApps.Metro/ThemeManager.cs index bf6dab2dae..169e249c07 100644 --- a/MahApps.Metro/ThemeManager.cs +++ b/MahApps.Metro/ThemeManager.cs @@ -22,6 +22,24 @@ public static IEnumerable DefaultAccents new Accent("Blue", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml")), new Accent("Purple", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Purple.xaml")), new Accent("Orange", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Orange.xaml")), + + new Accent("Lime", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Lime.xaml")), + new Accent("Emerald", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Emerald.xaml")), + new Accent("Teal", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Teal.xaml")), + new Accent("Cyan", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Cyan.xaml")), + new Accent("Cobalt", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Cobalt.xaml")), + new Accent("Indigo", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Indigo.xaml")), + new Accent("Violet", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Violet.xaml")), + new Accent("Pink", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Pink.xaml")), + new Accent("Magenta", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Magenta.xaml")), + new Accent("Crimson", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Crimson.xaml")), + new Accent("Amber", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Amber.xaml")), + new Accent("Yellow", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Yellow.xaml")), + new Accent("Brown", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Brown.xaml")), + new Accent("Olive", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Olive.xaml")), + new Accent("Steel", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Steel.xaml")), + new Accent("Mauve", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Mauve.xaml")), + new Accent("Sienna", new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Sienna.xaml")), }); } } diff --git a/samples/MetroDemo/MainWindow.xaml b/samples/MetroDemo/MainWindow.xaml index 1d3f8b155e..53384be3c0 100644 --- a/samples/MetroDemo/MainWindow.xaml +++ b/samples/MetroDemo/MainWindow.xaml @@ -63,11 +63,28 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/MetroDemo/MainWindow.xaml.cs b/samples/MetroDemo/MainWindow.xaml.cs index 6bda21c5af..6f30e90eff 100644 --- a/samples/MetroDemo/MainWindow.xaml.cs +++ b/samples/MetroDemo/MainWindow.xaml.cs @@ -35,31 +35,6 @@ private void ChangeAccent(string accentName) ThemeManager.ChangeTheme(this, this.currentAccent, this.currentTheme); } - private void AccentRed(object sender, RoutedEventArgs e) - { - this.ChangeAccent("Red"); - } - - private void AccentGreen(object sender, RoutedEventArgs e) - { - this.ChangeAccent("Green"); - } - - private void AccentBlue(object sender, RoutedEventArgs e) - { - this.ChangeAccent("Blue"); - } - - private void AccentPurple(object sender, RoutedEventArgs e) - { - this.ChangeAccent("Purple"); - } - - private void AccentOrange(object sender, RoutedEventArgs e) - { - this.ChangeAccent("Orange"); - } - private void ThemeLight(object sender, RoutedEventArgs e) { this.currentTheme = Theme.Light; @@ -134,5 +109,10 @@ private void InteropDemo(object sender, RoutedEventArgs e) new InteropDemo().Show(); } + + private void ChangeAccent(object sender, RoutedEventArgs e) + { + ChangeAccent((string)((MenuItem)sender).Header); + } } }