From 2f642498f941a5e0d7095273c8d90f61f0700857 Mon Sep 17 00:00:00 2001 From: Martin Konstantin Herrmann Date: Tue, 23 Jun 2015 12:30:38 +0100 Subject: [PATCH 001/213] starting some work --- LegendaryClient/App.xaml | 214 +++++-------------------- LegendaryClient/LegendaryClient.csproj | 9 ++ LegendaryClient/MainWindow.xaml | 28 +++- LegendaryClient/Windows/MainPage.xaml | 209 +++++++++++++++--------- LegendaryClient/packages.config | 3 + 5 files changed, 205 insertions(+), 258 deletions(-) diff --git a/LegendaryClient/App.xaml b/LegendaryClient/App.xaml index 61673388..7f305179 100644 --- a/LegendaryClient/App.xaml +++ b/LegendaryClient/App.xaml @@ -1,190 +1,54 @@  + Startup="Application_Startup" + xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"> - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + - - + d:DesignWidth="1024" + TextElement.Foreground="{DynamicResource MaterialDesignBody}" + Background="{DynamicResource MaterialDesignPaper}"> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + diff --git a/LegendaryClient/Windows/LoginPage.xaml.cs b/LegendaryClient/Windows/LoginPage.xaml.cs index 64d238d6..f4359d76 100644 --- a/LegendaryClient/Windows/LoginPage.xaml.cs +++ b/LegendaryClient/Windows/LoginPage.xaml.cs @@ -43,6 +43,20 @@ using System.Security.Principal; using System.Security.Cryptography; +namespace MaterialDesignThemes.Wpf +{ + /// + /// A card is a content control, styled according to Material Design guidelines. + /// + public class Card : ContentControl + { + static Card() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(Card), new FrameworkPropertyMetadata(typeof(Card))); + } + } +} + namespace LegendaryClient.Windows { /// diff --git a/LegendaryClient/packages.config b/LegendaryClient/packages.config index bd4be4bf..3c1a1b15 100644 --- a/LegendaryClient/packages.config +++ b/LegendaryClient/packages.config @@ -8,7 +8,7 @@ - + diff --git a/LegendaryClient/ui/img/icons/ic_account_circle_black_36dp.png b/LegendaryClient/ui/img/icons/ic_account_circle_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ba5a509bf53c96da7d9dc5e0f054ff79b35c0c7b GIT binary patch literal 495 zcmVx>;-Rn4@%iu#$@eK`iPShEpu>P9O`i?{ht!zMZJLZRN=7u; zq?Ake%rKTDc&t)ji;tKR>Ed8YwolHlsFvJyOe#tX^DFdyL)lSp2t#>?=U>3;qKMd+)7D#0O*fZYoj7MDKLYg%m z^PKnmv3zW0{bOEn70nv2nf!bGhw^~0+`(p>Z?exmnHnQ;@C2QHHDf9W4RQ2$b;$PeDI z#|e1yAs`=P`e$G zy-b0gM71F(SJ*VKqc23S3mhn)UM&C?y`@5V`J@Mci~m690O+Mc`<16HrJuGw_J=y! zwhYogHqS!s3INcpB7of~&~_}ubq#Y#Je0Ygz}(7GAX<)$#*j~kTBJd+;#A??w-1j_ gEJHlh)HE~w0zQggqyomN&j0`b07*qoM6N<$f(~_fV*mgE literal 0 HcmV?d00001 From 2878bb122cdaf94f3a6b99731d16131b823e997f Mon Sep 17 00:00:00 2001 From: Martin Konstantin Herrmann Date: Wed, 24 Jun 2015 03:01:50 +0100 Subject: [PATCH 004/213] Warning Modal Changed, moved Namespace so slick yo --- LegendaryClient/App.xaml | 2 +- LegendaryClient/MainWindow.xaml.cs | 14 +++++++++ LegendaryClient/Windows/LoginPage.xaml | 7 +++++ LegendaryClient/Windows/LoginPage.xaml.cs | 14 --------- LegendaryClient/Windows/Warning.xaml | 37 +++++++++++++---------- 5 files changed, 43 insertions(+), 31 deletions(-) diff --git a/LegendaryClient/App.xaml b/LegendaryClient/App.xaml index 02004d84..01228821 100644 --- a/LegendaryClient/App.xaml +++ b/LegendaryClient/App.xaml @@ -35,7 +35,7 @@ - + diff --git a/LegendaryClient/MainWindow.xaml.cs b/LegendaryClient/MainWindow.xaml.cs index 584e724a..143908d5 100644 --- a/LegendaryClient/MainWindow.xaml.cs +++ b/LegendaryClient/MainWindow.xaml.cs @@ -23,6 +23,20 @@ using agsXMPP.protocol.client; using System.Security.Principal; +namespace MaterialDesignThemes.Wpf +{ + /// + /// A card is a content control, styled according to Material Design guidelines. + /// + public class Card : ContentControl + { + static Card() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(Card), new FrameworkPropertyMetadata(typeof(Card))); + } + } +} + namespace LegendaryClient { diff --git a/LegendaryClient/Windows/LoginPage.xaml b/LegendaryClient/Windows/LoginPage.xaml index ce2cf8fd..7cc4d54a 100644 --- a/LegendaryClient/Windows/LoginPage.xaml +++ b/LegendaryClient/Windows/LoginPage.xaml @@ -18,6 +18,13 @@ + + + diff --git a/LegendaryClient/Windows/LoginPage.xaml.cs b/LegendaryClient/Windows/LoginPage.xaml.cs index f4359d76..64d238d6 100644 --- a/LegendaryClient/Windows/LoginPage.xaml.cs +++ b/LegendaryClient/Windows/LoginPage.xaml.cs @@ -43,20 +43,6 @@ using System.Security.Principal; using System.Security.Cryptography; -namespace MaterialDesignThemes.Wpf -{ - /// - /// A card is a content control, styled according to Material Design guidelines. - /// - public class Card : ContentControl - { - static Card() - { - DefaultStyleKeyProperty.OverrideMetadata(typeof(Card), new FrameworkPropertyMetadata(typeof(Card))); - } - } -} - namespace LegendaryClient.Windows { /// diff --git a/LegendaryClient/Windows/Warning.xaml b/LegendaryClient/Windows/Warning.xaml index 089ca941..eb39902b 100644 --- a/LegendaryClient/Windows/Warning.xaml +++ b/LegendaryClient/Windows/Warning.xaml @@ -3,26 +3,31 @@ 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:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf" Title="Warning" mc:Ignorable="d" d:DesignHeight="768" + TextElement.Foreground="{DynamicResource MaterialDesignBody}" d:DesignWidth="1280"> - - -