Merge pull request #27 from VeronicaGeek/development

Merged development to master for release 0.2.2
veronicageek · Nov 14, 2018 · 7d17c27 · 7d17c27
2 parents ca11bfd + fbe25e3
commit 7d17c27
Show file tree

Hide file tree

Showing 20 changed files with 7,060 additions and 2,193 deletions.
diff --git a/Credits.md b/Credits.md
@@ -15,13 +15,21 @@ This is the customized message box displaying when entering the wrong credential
 * Blog: [A Customizable WPF MessageBox for PowerShell](https://smsagent.wordpress.com/2017/08/24/a-customisable-wpf-messagebox-for-powershell/)
 
 
-## DataGrid instead of ListViews _(Damien Van Robaeys - MVP)_
-Damien helped me understand a few aspects of WPF and also provided script samples in no time.
+## XAML and WPF _(Damien Van Robaeys - MVP)_
+Damien helped me understand a few aspects of XAML and WPF as well as providing script samples in no time.
 
 * Twitter: [@syst_and_deploy](https://twitter.com/syst_and_deploy)
 * Website: [Syst & Deploy](http://www.systanddeploy.com/)
 
 
+## MahApps Design _(Jan Karger)_
+MahApps offers a modern UI for your applications, with a lot of modern design possibilities!
+
+* Github Repo: [MahApps.Metro](https://github.com/MahApps/MahApps.Metro)
+* Twitter: [@punker76](https://twitter.com/punker76)
+* Website: [MahApps](https://mahapps.com/)
+
+
 ## GitHub Gotchas _(Bryce McDonalds)_
 Being new to GitHub is not easy, and Bryce nicely spent some time answering my questions so... Merci !
 

diff --git a/Images/wip.jpg b/Images/wip.jpg
diff --git a/MainWindow.xaml b/MainWindow.xaml
diff --git a/O365DataRetriever.ps1 b/O365DataRetriever.ps1
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ _This file contains the PowerShell script with bindings to the xaml file_
 
 4. Once the tool is visible, on the top right corner, enter your O365 Global Admin account + password, then click on "Connect" _(or press "Enter" on your keyboard)_
 
-![creds_section](screenshots/creds_panel.png)
+![creds_section](screenshots/NewUpdate.png)
 
 5. Wait for a few seconds for the data to be _retrieved_ and _displayed_.
 

diff --git a/assembly/ControlzEx.dll b/assembly/ControlzEx.dll
diff --git a/assembly/MahApps.Metro.IconPacks.dll b/assembly/MahApps.Metro.IconPacks.dll
diff --git a/assembly/MahApps.Metro.dll b/assembly/MahApps.Metro.dll
diff --git a/Assemblies/PresentationCore.dll → assembly/PresentationCore.dll b/Assemblies/PresentationCore.dll → assembly/PresentationCore.dll
diff --git a/Assemblies/PresentationFramework.dll → assembly/PresentationFramework.dll b/Assemblies/PresentationFramework.dll → assembly/PresentationFramework.dll
diff --git a/Assemblies/System.Drawing.dll → assembly/System.Drawing.dll b/Assemblies/System.Drawing.dll → assembly/System.Drawing.dll
diff --git a/Assemblies/System.Windows.Interactivity.dll → assembly/System.Windows.Interactivity.dll b/Assemblies/System.Windows.Interactivity.dll → assembly/System.Windows.Interactivity.dll
diff --git a/Assemblies/WindowsBase.dll → assembly/WindowsBase.dll b/Assemblies/WindowsBase.dll → assembly/WindowsBase.dll
diff --git a/images/NewUpdate.png b/images/NewUpdate.png
diff --git a/images/pwd.png b/images/pwd.png
diff --git a/images/user.jpg b/images/user.jpg
diff --git a/resources/Icons.xaml b/resources/Icons.xaml
diff --git a/resources/custom.xaml b/resources/custom.xaml
@@ -0,0 +1,44 @@
+<ResourceDictionary
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+<LinearGradientBrush x:Key="PannelBrush" EndPoint="0.5,1" StartPoint="0.5,0" Opacity="0">
+		<GradientStop Color="#FF06183C" Offset="0.75"/>
+		<GradientStop Color="#FF0D60A3"/>
+</LinearGradientBrush> 
+
+<LinearGradientBrush x:Key="PartitionBrush" EndPoint="0.811,0.2" StartPoint="0.246,1.023">
+		<GradientStop Color="#FF7C9FC8" Offset="0"/>
+		<GradientStop Color="#FF7C9FC8" Offset="1"/>
+</LinearGradientBrush>
+ <!-- This storyboard will make the image grow in 0.2 seconds -->
+<Storyboard x:Key="expandStoryboard">
+    <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" To="1.1" Duration="0:0:0.2" />
+    <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" To="1.1" Duration="0:0:0.2" />
+</Storyboard>
+<!-- This storyboard will make the image revert to its original size -->
+<Storyboard x:Key="shrinkStoryboard">
+    <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" To="1" Duration="0:0:0.2" />
+    <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" To="1" Duration="0:0:0.2" />
+</Storyboard>
+
+<!--<Style x:Key="FocusImage" TargetType ="{x:Type Image}">-->
+<Style x:Key="FocusImage" TargetType ="{x:Type StackPanel}">
+    <Setter Property="RenderTransform">
+        <Setter.Value>
+            <ScaleTransform ScaleX="1" ScaleY="1"/>
+        </Setter.Value>
+    </Setter> 
+    <Style.Triggers>
+        <Trigger Property="IsMouseOver" Value="True">
+            <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource expandStoryboard}" />
+            </Trigger.EnterActions>
+            <Trigger.ExitActions>
+                <BeginStoryboard Storyboard="{StaticResource shrinkStoryboard}" />
+            </Trigger.ExitActions>
+        </Trigger>
+    </Style.Triggers>
+</Style>
+
+</ResourceDictionary>
diff --git a/screenshots/NewUpdate.png b/screenshots/NewUpdate.png
diff --git a/screenshots/creds_panel.png b/screenshots/creds_panel.png