new Design

duhowise · Sep 22, 2016 · 4b146af · 4b146af
1 parent bc2cf43
commit 4b146af
Show file tree

Hide file tree

Showing 220 changed files with 31,123 additions and 727 deletions.
diff --git a/ClinicApp/App.config b/ClinicApp/App.config
@@ -1,11 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
         <startup>
 
         </startup>
         <connectionStrings>
-        <add name="ClinicReport.Properties.Settings.Clinic" connectionString="Data Source=.;Initial Catalog=Clinic;Integrated Security=True"
-            providerName="System.Data.SqlClient" />
-        <add connectionString="Data Source=.;Initial Catalog=Clinic;Integrated Security=True;MultipleActiveResultSets=True" name="ClinicConnection" providerName="System.Data.Sqlclient"/>
+        <add name="ClinicReport.Properties.Settings.Clinic" connectionString="Data Source=.;Initial Catalog=Clinic;Integrated Security=True" providerName="System.Data.SqlClient" />
+        <add connectionString="Data Source=.;Initial Catalog=Clinic;Integrated Security=True;MultipleActiveResultSets=True" name="ClinicConnection" providerName="System.Data.Sqlclient" />
         </connectionStrings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Telerik.Reporting" publicKeyToken="a9d7983dfcc261be" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.1.16.615" newVersion="10.1.16.615" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/ClinicApp/App.xaml b/ClinicApp/App.xaml
@@ -2,13 +2,50 @@
 
     <Application.Resources>
         <ResourceDictionary>
+            <Color x:Key="PrimaryColor">#FF00186B</Color>
+
+            <!-- MahApps Brushes -->
+            <SolidColorBrush x:Key="PrimaryColorBrush" Color="{StaticResource PrimaryColor}" />
+            <SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}"/>
+            <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource PrimaryColor}"/>
+            <SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource Primary400}"/>
+            <SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource Primary300}"/>
+            <SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}"/>
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource PrimaryColor}"/>
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}"/>
+            <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
+                <GradientStop Color="{DynamicResource Primary700}" Offset="0"/>
+                <GradientStop Color="{DynamicResource Primary300}" Offset="1"/>
+            </LinearGradientBrush>
+            <SolidColorBrush x:Key="CheckmarkFill" Color="{DynamicResource Primary500}"/>
+            <SolidColorBrush x:Key="RightArrowFill" Color="{DynamicResource Primary500}"/>
+            <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{DynamicResource Primary500Foreground}"/>
+            <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4"/>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/theme/System.Windows.xaml" />
                 <ResourceDictionary Source="/theme/Telerik.Windows.Controls.xaml" />
                 <ResourceDictionary Source="/theme/Telerik.Windows.Controls.Input.xaml" />
                 <ResourceDictionary Source="/theme/Telerik.Windows.Controls.Navigation.xaml" />
                 <ResourceDictionary Source="/theme/Telerik.ReportViewer.Wpf.xaml" />
+
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
+
+                <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
+        <!-- Accent and AppTheme setting -->
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
+
+                <!-- Material Design: MahApps Compatibility -->
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />
             </ResourceDictionary.MergedDictionaries>
+
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/ClinicApp/App.xaml.cs b/ClinicApp/App.xaml.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading;
+using System.Threading;
 using System.Windows;
-using System.Windows.Documents;
 
 namespace ClinicApp
 {

diff --git a/ClinicApp/CMB.xaml.cs b/ClinicApp/CMB.xaml.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace ClinicApp
 {