diff --git a/WPFCatalog/App.xaml b/WPFCatalog/App.xaml
index b17e4a8..33082dc 100644
--- a/WPFCatalog/App.xaml
+++ b/WPFCatalog/App.xaml
@@ -1,5 +1,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WPFCatalog/Controls/GeneralSettingsControl.xaml b/WPFCatalog/Controls/GeneralSettingsControl.xaml
new file mode 100644
index 0000000..337df08
--- /dev/null
+++ b/WPFCatalog/Controls/GeneralSettingsControl.xaml
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WPFCatalog/Controls/GeneralSettingsControl.xaml.cs b/WPFCatalog/Controls/GeneralSettingsControl.xaml.cs
new file mode 100644
index 0000000..af3e0aa
--- /dev/null
+++ b/WPFCatalog/Controls/GeneralSettingsControl.xaml.cs
@@ -0,0 +1,28 @@
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace WPFCatalog.Controls
+{
+ ///
+ /// Interaction logic for GeneralSettingsControl.xaml
+ ///
+ public partial class GeneralSettingsControl : UserControl
+ {
+ public GeneralSettingsControl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/WPFCatalog/Controls/TextSettingsControl.xaml b/WPFCatalog/Controls/TextSettingsControl.xaml
new file mode 100644
index 0000000..530d830
--- /dev/null
+++ b/WPFCatalog/Controls/TextSettingsControl.xaml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WPFCatalog/Controls/TextSettingsControl.xaml.cs b/WPFCatalog/Controls/TextSettingsControl.xaml.cs
new file mode 100644
index 0000000..2c29c51
--- /dev/null
+++ b/WPFCatalog/Controls/TextSettingsControl.xaml.cs
@@ -0,0 +1,28 @@
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace WPFCatalog.Controls
+{
+ ///
+ /// Interaction logic for TextSettingsControl.xaml
+ ///
+ public partial class TextSettingsControl : UserControl
+ {
+ public TextSettingsControl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/WPFCatalog/Converters/MaddoColorConverter.cs b/WPFCatalog/Converters/MaddoColorConverter.cs
index d26a440..2248484 100644
--- a/WPFCatalog/Converters/MaddoColorConverter.cs
+++ b/WPFCatalog/Converters/MaddoColorConverter.cs
@@ -14,7 +14,7 @@ namespace WPFCatalog
{
public class MaddoColorConverter : IValueConverter
{
- private DependencyObject _dummy = new DependencyObject();
+ private static readonly DependencyObject _dummy = new DependencyObject();
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
diff --git a/WPFCatalog/MainWindow.xaml b/WPFCatalog/MainWindow.xaml
index d13b68f..bb589ae 100644
--- a/WPFCatalog/MainWindow.xaml
+++ b/WPFCatalog/MainWindow.xaml
@@ -1,10 +1,13 @@
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
diff --git a/WPFCatalog/MainWindow.xaml.cs b/WPFCatalog/MainWindow.xaml.cs
index e0ebc7b..f4aab5a 100644
--- a/WPFCatalog/MainWindow.xaml.cs
+++ b/WPFCatalog/MainWindow.xaml.cs
@@ -16,6 +16,7 @@ using System.Windows.Shapes;
using CatalogLib;
using GalaSoft.MvvmLight.Messaging;
using MaddoLibrary.Helpers;
+using MahApps.Metro.Controls;
using WPFCatalog.Messages;
namespace WPFCatalog
@@ -23,14 +24,14 @@ namespace WPFCatalog
///
/// Interaction logic for MainWindow.xaml
///
- public partial class MainWindow : Window
+ public partial class MainWindow
{
public PicSettings GlobalSettings = new PicSettings();
public MainWindow()
{
InitializeComponent();
-
- DataContext = new MainWindowViewModel();
+
+ this.DataContext = new MainWindowViewModel();
SetDefaults();
diff --git a/WPFCatalog/TestWindow.xaml b/WPFCatalog/TestWindow.xaml
new file mode 100644
index 0000000..7c7cffa
--- /dev/null
+++ b/WPFCatalog/TestWindow.xaml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WPFCatalog/TestWindow.xaml.cs b/WPFCatalog/TestWindow.xaml.cs
new file mode 100644
index 0000000..38ae495
--- /dev/null
+++ b/WPFCatalog/TestWindow.xaml.cs
@@ -0,0 +1,27 @@
+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;
+
+namespace WPFCatalog
+{
+ ///
+ /// Interaction logic for TestWindow.xaml
+ ///
+ public partial class TestWindow
+ {
+ public TestWindow()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/WPFCatalog/WPFCatalog.csproj b/WPFCatalog/WPFCatalog.csproj
index 4d2c26d..b23b8ba 100644
--- a/WPFCatalog/WPFCatalog.csproj
+++ b/WPFCatalog/WPFCatalog.csproj
@@ -46,6 +46,9 @@
..\packages\MvvmLightLibs.4.1.27.1\lib\net45\GalaSoft.MvvmLight.WPF45.dll
+
+ ..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll
+
..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll
@@ -60,7 +63,7 @@
- ..\packages\MvvmLightLibs.4.1.27.1\lib\net45\System.Windows.Interactivity.dll
+ ..\packages\MahApps.Metro.1.4.3\lib\net45\System.Windows.Interactivity.dll
@@ -99,13 +102,30 @@
MSBuild:Compile
Designer
+
+ GeneralSettingsControl.xaml
+
+
+ TextSettingsControl.xaml
+
+
+ TestWindow.xaml
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
@@ -118,6 +138,10 @@
MainWindow.xaml
Code
+
+ Designer
+ MSBuild:Compile
+
diff --git a/WPFCatalog/packages.config b/WPFCatalog/packages.config
index a288590..106e697 100644
--- a/WPFCatalog/packages.config
+++ b/WPFCatalog/packages.config
@@ -2,6 +2,7 @@
+
\ No newline at end of file