From d9b539f390d40cdfa755efb091fa061030ea8bdf Mon Sep 17 00:00:00 2001
From: kaimbacher <arno.kaimbacher@hotmail.de>
Date: Thu, 1 Feb 2018 10:47:47 +0100
Subject: [PATCH 1/3] change to mvvm pattern - add MainViewModel,
 ViewModelLocator and libs for MvvmLight - ported some methods from
 MainWindow.xaml.cs to the MainViewModel.cs

---
 LegendGenerator.App/App.xaml                  |  24 +-
 .../LegendGenerator.App.csproj                |  26 +-
 LegendGenerator.App/MainWindow.xaml           | 501 +++++++++---------
 LegendGenerator.App/MainWindow.xaml.cs        | 142 +----
 .../ViewModel/MainViewModel.cs                | 201 +++++++
 .../ViewModel/ViewModelLocator.cs             |  56 ++
 LegendGenerator.App/app.config                |  10 +-
 LegendGenerator.App/packages.config           |   2 +
 8 files changed, 580 insertions(+), 382 deletions(-)
 create mode 100644 LegendGenerator.App/ViewModel/MainViewModel.cs
 create mode 100644 LegendGenerator.App/ViewModel/ViewModelLocator.cs

diff --git a/LegendGenerator.App/App.xaml b/LegendGenerator.App/App.xaml
index 7d8c49d..1eb84c4 100644
--- a/LegendGenerator.App/App.xaml
+++ b/LegendGenerator.App/App.xaml
@@ -1,12 +1,12 @@
-<Application x:Class="LegendGenerator.App.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"            
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:ignore="http://www.galasoft.ch/ignore"
-             StartupUri="MainWindow.xaml"
-              mc:Ignorable="d ignore">
-    <Application.Resources>
-        <!--Global View Model Locator-->      
-    </Application.Resources>
-</Application>
+<Application x:Class="LegendGenerator.App.App" 
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             mc:Ignorable="d" 
+             xmlns:vm="clr-namespace:LegendGenerator.App.ViewModel" 
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+    <!--Global View Model Locator-->    
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/LegendGenerator.App/LegendGenerator.App.csproj b/LegendGenerator.App/LegendGenerator.App.csproj
index bfb0317..c022182 100644
--- a/LegendGenerator.App/LegendGenerator.App.csproj
+++ b/LegendGenerator.App/LegendGenerator.App.csproj
@@ -87,7 +87,23 @@
     <Reference Include="ESRI.ArcGIS.System, Version=10.3.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="ReachFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -95,6 +111,10 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -115,6 +135,8 @@
     <Compile Include="Utils\CustomStringToColorConverter.cs" />
     <Compile Include="Utils\NotifyBase.cs" />
     <Compile Include="Utils\ValidationAttribute.cs" />
+    <Compile Include="ViewModel\MainViewModel.cs" />
+    <Compile Include="ViewModel\ViewModelLocator.cs" />
     <Compile Include="View\Help\LegendGeneratorXpsHelpEn.xaml.cs">
       <DependentUpon>LegendGeneratorXpsHelpEn.xaml</DependentUpon>
     </Compile>
@@ -294,7 +316,9 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
diff --git a/LegendGenerator.App/MainWindow.xaml b/LegendGenerator.App/MainWindow.xaml
index dd04cdf..0b0d0ef 100644
--- a/LegendGenerator.App/MainWindow.xaml
+++ b/LegendGenerator.App/MainWindow.xaml
@@ -1,11 +1,16 @@
-<Window x:Class="LegendGenerator.App.MainWindow"
+<Window x:Class="LegendGenerator.App.MainWindow" 
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:resx="clr-namespace:LegendGenerator.App.Resources"        
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"       
+        xmlns:resx="clr-namespace:LegendGenerator.App.Resources"
         Title="Legend Generator 5.14 für ArcMap 10.3" 
         WindowStartupLocation="CenterScreen"
-        Height="748" Width="740" Loaded="Window_Loaded"       
-        Icon="Skins/Images/gba.png" FontSize="12" Closing="Window_Closing" >
+        Height="748" Width="740" Loaded="Window_Loaded"  
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        mc:Ignorable="d" 
+        xmlns:vm="clr-namespace:LegendGenerator.App.ViewModel"
+        Icon="Skins/Images/gba.png" FontSize="12" Closing="Window_Closing">
+    
 
     <Window.Resources>
         <ResourceDictionary>
@@ -15,41 +20,43 @@
                 <ResourceDictionary Source="Skins/Theme.xaml"/>
                 <ResourceDictionary Source="Skins/ConverterResourcen.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
         </ResourceDictionary>
     </Window.Resources>
     <Window.Background>
         <StaticResource ResourceKey="WindowBackground"/>
     </Window.Background>
 
-    <DockPanel Name="LayoutRoot">
+
+    <DockPanel x:Name="LayoutRoot"> <!--DataContext="{Binding Source={StaticResource Locator}, Path=Main}">-->
         <Menu DockPanel.Dock="Top">
-            <MenuItem Name="mnuFile" Header="{x:Static resx:Resource.mnuFile}"  >
-                <MenuItem Name="mnuAppSave" Header="{x:Static resx:Resource.mnuAppSave}"  Icon="{DynamicResource ResourceKey=imgSave}" Click="MnuAppSave_Click" Foreground="Black" FontWeight="Medium"  />
-                <MenuItem Name="mnuAppSaveNew" Header="{x:Static resx:Resource.mnuAppSaveNew}"  Icon="{DynamicResource ResourceKey=imgSave}" Click="MnuAppSaveNew_Click" Foreground="Black" FontWeight="Medium"/>
-                <MenuItem Name="mnuAppLoad" Header="{x:Static resx:Resource.mnuAppLoad}"  Icon="{DynamicResource ResourceKey=imgLoad}" Click="MnuAppLoad_Click" Foreground="Black" FontWeight="Medium" />
+            <MenuItem x:Name="mnuFile" Header="{x:Static resx:Resource.mnuFile}"  >
+                <MenuItem x:Name="mnuAppSave" Header="{x:Static resx:Resource.mnuAppSave}"  Icon="{DynamicResource ResourceKey=imgSave}" Command="{Binding SaveProjectCommand}" Foreground="Black" FontWeight="Medium"  />
+                <MenuItem x:Name="mnuAppSaveNew" Header="{x:Static resx:Resource.mnuAppSaveNew}"  Icon="{DynamicResource ResourceKey=imgSave}" Command="{Binding SaveAsProjectCommand}" Foreground="Black" FontWeight="Medium"/>
+                <MenuItem x:Name="mnuAppLoad" Header="{x:Static resx:Resource.mnuAppLoad}"  Icon="{DynamicResource ResourceKey=imgLoad}" Command="{Binding LoadProjectCommand}" Foreground="Black" FontWeight="Medium" />
                 <Separator />
-                <MenuItem Name="mnuAppClose" Header="{x:Static resx:Resource.mnuAppClose}"  Icon="{DynamicResource ResourceKey=appClose}" Click="MnuAppClose_Click" Foreground="Black" FontWeight="Medium" />
+                <MenuItem x:Name="mnuAppClose" Header="{x:Static resx:Resource.mnuAppClose}"  Icon="{DynamicResource ResourceKey=appClose}" Click="MnuAppClose_Click" Foreground="Black" FontWeight="Medium" />
             </MenuItem>
 
-            <MenuItem Name="mnuEinstellungen" Header="{x:Static resx:Resource.mnuEinstellungen}"  >
-                <MenuItem Name="mnuSpracheinstellungen" Header="{x:Static resx:Resource.mnuSpracheinstellungen}"  Icon="{DynamicResource ResourceKey=imgEinstellungen}" Foreground="Black" FontWeight="Medium">
-                    <CheckBox Name="chkSpracheDeutsch" Content="{x:Static resx:Resource.chkSpracheDeutsch}" Checked="ChkSpracheDeutsch_Checked" Unchecked="ChkSpracheDeutsch_Unchecked" />
-                    <CheckBox Name="chkSpracheEnglisch" Content="{x:Static resx:Resource.chkSpracheEnglisch}" Checked="ChkSpracheEnglisch_Checked" Unchecked="ChkSpracheEnglisch_Unchecked" />
-                </MenuItem>              
-                <MenuItem Name="mnuLoadStylefile" Header="{x:Static Member=resx:Resource.mnuLoadStylefile}" Click="MnuLoadStylefile_Click" Icon="{DynamicResource ResourceKey=imgLoadStyleFile}" Foreground="Black" FontWeight="Medium"></MenuItem>
-                <MenuItem Name="mnuResetPage"  Header="{x:Static Member=resx:Resource.mnuResetPage}" Icon="{DynamicResource ResourceKey=imgRefresh}" Click="MnuResetPage_Click" Foreground="Black" FontWeight="Medium"></MenuItem>
+            <MenuItem x:Name="mnuEinstellungen" Header="{x:Static resx:Resource.mnuEinstellungen}"  >
+                <MenuItem x:Name="mnuSpracheinstellungen" Header="{x:Static resx:Resource.mnuSpracheinstellungen}"  Icon="{DynamicResource ResourceKey=imgEinstellungen}" Foreground="Black" FontWeight="Medium">
+                    <CheckBox x:Name="chkSpracheDeutsch" Content="{x:Static resx:Resource.chkSpracheDeutsch}" Checked="ChkSpracheDeutsch_Checked" Unchecked="ChkSpracheDeutsch_Unchecked" />
+                    <CheckBox x:Name="chkSpracheEnglisch" Content="{x:Static resx:Resource.chkSpracheEnglisch}" Checked="ChkSpracheEnglisch_Checked" Unchecked="ChkSpracheEnglisch_Unchecked" />
+                </MenuItem>
+                <MenuItem x:Name="mnuLoadStylefile" Header="{x:Static resx:Resource.mnuLoadStylefile}" Click="MnuLoadStylefile_Click" Icon="{DynamicResource ResourceKey=imgLoadStyleFile}" Foreground="Black" FontWeight="Medium"/>
+                <MenuItem x:Name="mnuResetPage"  Header="{x:Static resx:Resource.mnuResetPage}" Icon="{DynamicResource ResourceKey=imgRefresh}" Click="MnuResetPage_Click" Foreground="Black" FontWeight="Medium"/>
             </MenuItem>
-        
-            <MenuItem Name="mnuExport" Header="Export" >               
-                <MenuItem Name="mnuGraphicExport" Header="{x:Static Member=resx:Resource.mnuGraphicExport}" Icon="{DynamicResource ResourceKey=imgSymbolExport}" Foreground="Black" FontWeight="Medium" Click="MnuGraphicExport_Click"></MenuItem>
+
+            <MenuItem x:Name="mnuExport" Header="Export" >
+                <MenuItem x:Name="mnuGraphicExport" Header="{x:Static resx:Resource.mnuGraphicExport}" Icon="{DynamicResource ResourceKey=imgSymbolExport}" Foreground="Black" FontWeight="Medium" Click="MnuGraphicExport_Click"/>
             </MenuItem>
 
-            <MenuItem Name="mnuInfo" Header="{x:Static Member=resx:Resource.mnuInfo}" >
-                <MenuItem Name="mnuAppAbout"  Header="{x:Static Member=resx:Resource.mnuAppAbout}" Click="MnuAppAbout_Click" Icon="{DynamicResource imgInfo}" Foreground="Black" FontWeight="Medium" />
+            <MenuItem x:Name="mnuInfo" Header="{x:Static resx:Resource.mnuInfo}" >
+                <MenuItem x:Name="mnuAppAbout"  Header="{x:Static resx:Resource.mnuAppAbout}" Click="MnuAppAbout_Click" Icon="{DynamicResource imgInfo}" Foreground="Black" FontWeight="Medium" />
             </MenuItem>
 
-            <MenuItem Name="mnuHilfe" Header="{x:Static resx:Resource.mnuHilfe}" >
-                <MenuItem Name="mnuAppHelp" Header="{x:Static resx:Resource.mnuAppHelp}" Icon="{DynamicResource ResourceKey=imgHilfe}" Click="MnuAppHelp_Click" Foreground="Black" FontWeight="Medium"/>
+            <MenuItem x:Name="mnuHilfe" Header="{x:Static resx:Resource.mnuHilfe}" >
+                <MenuItem x:Name="mnuAppHelp" Header="{x:Static resx:Resource.mnuAppHelp}" Icon="{DynamicResource ResourceKey=imgHilfe}" Click="MnuAppHelp_Click" Foreground="Black" FontWeight="Medium"/>
             </MenuItem>
         </Menu>
 
@@ -61,163 +68,164 @@
                     <GradientStop Color="#FFC4BDBD" Offset="1" />
                 </LinearGradientBrush>
             </StatusBar.Background>
-            <StatusBarItem Name="staLblMessage" Content="" x:FieldModifier="public" FontSize="12" Margin="5,0,0,0"  Foreground="Black"></StatusBarItem>
-            <StatusBarItem Name="staLblProjectfile" Content="" x:FieldModifier="public" FontSize="12" Margin="5,0,0,0"  Foreground="Black" HorizontalContentAlignment="Right"></StatusBarItem>
+            <StatusBarItem x:Name="staLblMessage" Content="" x:FieldModifier="public" FontSize="12" Margin="5,0,0,0"  Foreground="Black"/>
+            <StatusBarItem x:Name="staLblProjectfile" Content="" x:FieldModifier="public" FontSize="12" Margin="5,0,0,0"  Foreground="Black" HorizontalContentAlignment="Right"/>
         </StatusBar>
 
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
             <Canvas Width="709" Height="661">
-                <Button Canvas.Left="529" Canvas.Top="629" Content="{x:Static resx:Resource.btnCreateLegend}" Height="23" Name="btnCreateLegend" Width="170" IsEnabled="True" Click="BtnCreateLegend_Click" />
-                <Button Canvas.Left="351" Canvas.Top="629" Content="{x:Static resx:Resource.btnLegendTemplate}" Height="23" Name="btnLegendTemplate" Width="170" IsEnabled="True" Click="BtnLegendTemplate_Click" />
-                <TabControl Canvas.Left="6" Canvas.Top="9" Height="236" Name="tabControl1" Width="333" Background="{x:Null}">
-                    <TabItem Header="{x:Static Member=resx:Resource.tabItemAccess}" IsSelected="{Binding Path=TabAccess, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="tabItemAccess" >
+                <Button Canvas.Left="529" Canvas.Top="629" Content="{x:Static resx:Resource.btnCreateLegend}" Height="23" x:Name="btnCreateLegend" Width="170" IsEnabled="True" Click="BtnCreateLegend_Click" />
+                <Button Canvas.Left="351" Canvas.Top="629" Content="{x:Static resx:Resource.btnLegendTemplate}" Height="23" x:Name="btnLegendTemplate" Width="170" IsEnabled="True" Click="BtnLegendTemplate_Click" />
+
+                <TabControl Canvas.Left="6" Canvas.Top="9" Height="236" x:Name="tabControl1" Width="333" Background="{x:Null}">
+                    <TabItem Header="{x:Static resx:Resource.tabItemAccess}" IsSelected="{Binding FormData.TabAccess, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="tabItemAccess" >
                         <Canvas Height="195" Width="315">
-                            <CheckBox Name="chkAccess" Content="{x:Static resx:Resource.chkAccess}" IsChecked="{Binding Path=ChkAccess, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Tag="True" Canvas.Left="12" Canvas.Top="14" />
-                            <Label Canvas.Left="10" Canvas.Top="44" Content="{x:Static Member=resx:Resource.lblAccessDatabase}"  Name="lblAccessDatabase"  Foreground="#FF27B23A" FontWeight="Bold" />
-                            <TextBox Canvas.Left="102" Canvas.Top="38" IsEnabled="{Binding ChkAccess}" Name="txtAccessDatabase" Width="171" Text="{Binding AccessDatabase, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" FlowDirection="RightToLeft" />
-                            <Button Canvas.Left="279" Canvas.Top="38"  IsEnabled="{Binding ChkAccess}" Content="{DynamicResource imgLoad}"  Name="btnLoadAccessDb" Width="30" Click="BtnLoadAccessDb_Click" />
-                            <Button Canvas.Left="102" Canvas.Top="81" IsEnabled="{Binding ChkAccess}" Content="{x:Static Member=resx:Resource.btnLoadAccessTables}" Name="btnLoadAccessTables" Width="171" Click="BtnLoadAccessTables_Click" />
+                            <CheckBox x:Name="chkAccess" Content="{x:Static resx:Resource.chkAccess}" IsChecked="{Binding FormData.ChkAccess, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Tag="True" Canvas.Left="12" Canvas.Top="14" />
+                            <Label Canvas.Left="10" Canvas.Top="44" Content="{x:Static resx:Resource.lblAccessDatabase}"  x:Name="lblAccessDatabase"  Foreground="#FF27B23A" FontWeight="Bold" />
+                            <TextBox Canvas.Left="102" Canvas.Top="38" IsEnabled="{Binding FormData.ChkAccess}" x:Name="txtAccessDatabase" Width="171" Text="{Binding FormData.AccessDatabase, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" FlowDirection="RightToLeft" />
+                            <Button Canvas.Left="279" Canvas.Top="38"  IsEnabled="{Binding FormData.ChkAccess}" Content="{DynamicResource imgLoad}"  x:Name="btnLoadAccessDb" Width="30" Click="BtnLoadAccessDb_Click" />
+                            <Button Canvas.Left="102" Canvas.Top="81" IsEnabled="{Binding FormData.ChkAccess}" Content="{x:Static resx:Resource.btnLoadAccessTables}" x:Name="btnLoadAccessTables" Width="171" Click="BtnLoadAccessTables_Click" />
                         </Canvas>
                     </TabItem>
-                    <TabItem Header="{x:Static Member=resx:Resource.tabItemSde}" IsSelected="{Binding Path=TabSde, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="tabItemSde" Height="22" VerticalAlignment="Bottom">
+                    <TabItem Header="{x:Static resx:Resource.tabItemSde}" IsSelected="{Binding FormData.TabSde, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="tabItemSde" Height="22" VerticalAlignment="Bottom">
                         <Canvas Height="201" Width="281">
-                            <CheckBox Name="chkSde" Content="{x:Static resx:Resource.chkSde}" IsChecked="{Binding Path=ChkSde, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Canvas.Left="6" Canvas.Top="6" />
-                            <CheckBox Canvas.Left="121" Canvas.Top="6" IsEnabled="{Binding ChkSde}" Content="{x:Static Member=resx:Resource.chkAuthentifizierung}" IsChecked="{Binding Path=ChkAuthentifizierung, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkAuthentifizierung" />
+                            <CheckBox x:Name="chkSde" Content="{x:Static resx:Resource.chkSde}" IsChecked="{Binding FormData.ChkSde, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Canvas.Left="6" Canvas.Top="6" />
+                            <CheckBox Canvas.Left="121" Canvas.Top="6" IsEnabled="{Binding FormData.ChkSde}" Content="{x:Static resx:Resource.chkAuthentifizierung}" IsChecked="{Binding FormData.ChkAuthentifizierung, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkAuthentifizierung" />
 
-                            <Label Canvas.Left="7" Canvas.Top="30"  Content="{x:Static Member=resx:Resource.lblSqlServer}" Name="lblServer" Width="72" />
-                            <TextBox Canvas.Left="100" Canvas.Top="26"  IsEnabled="{Binding ChkSde}" Name="txtSqlServer" Width="160" Tag="obelix"  Text="{Binding SqlServer, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" x:FieldModifier="public" />
+                            <Label Canvas.Left="7" Canvas.Top="30"  Content="{x:Static resx:Resource.lblSqlServer}" x:Name="lblServer" Width="72" />
+                            <TextBox Canvas.Left="100" Canvas.Top="26"  IsEnabled="{Binding FormData.ChkSde}" x:Name="txtSqlServer" Width="160" Tag="obelix"  Text="{Binding FormData.SqlServer, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:FieldModifier="public" />
 
-                            <Label Canvas.Left="6" Canvas.Top="55" Content="{x:Static Member=resx:Resource.lblInstance}" Name="lblInstance" Width="87" />
-                            <TextBox Canvas.Left="100" Canvas.Top="51"  IsEnabled="{Binding ChkSde}" Name="txtInstance" Width="160" Tag="sde:sqlserver:obelix" Text="{Binding ServerInstance, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" x:FieldModifier="public" />
+                            <Label Canvas.Left="6" Canvas.Top="55" Content="{x:Static resx:Resource.lblInstance}" x:Name="lblInstance" Width="87" />
+                            <TextBox Canvas.Left="100" Canvas.Top="51"  IsEnabled="{Binding FormData.ChkSde}" x:Name="txtInstance" Width="160" Tag="sde:sqlserver:obelix" Text="{Binding FormData.ServerInstance, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:FieldModifier="public" />
 
-                            <Label Canvas.Left="6" Canvas.Top="80" Content="{x:Static Member=resx:Resource.lblDatabase}" Height="28" Name="lblDatabase" Width="72" />
-                            <TextBox Canvas.Left="100" Canvas.Top="76"  IsEnabled="{Binding ChkSde}" Name="txtDatabase" Width="160" Tag="C01"  Text="{Binding ServerDatenbank, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" x:FieldModifier="public" />
+                            <Label Canvas.Left="6" Canvas.Top="80" Content="{x:Static resx:Resource.lblDatabase}" Height="28" x:Name="lblDatabase" Width="72" />
+                            <TextBox Canvas.Left="100" Canvas.Top="76"  IsEnabled="{Binding FormData.ChkSde}" x:Name="txtDatabase" Width="160" Tag="C01"  Text="{Binding FormData.ServerDatenbank, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:FieldModifier="public" />
 
-                            <Label Canvas.Left="7" Canvas.Top="105" Content="{x:Static Member=resx:Resource.lblUser}" Height="28" Name="lblUser" x:FieldModifier="public" Width="72" />
-                            <TextBox Canvas.Left="100" Canvas.Top="101" IsEnabled="{Binding ChkAuthentifizierung}" Name="txtUser" Width="160" x:FieldModifier="public" Text="{Binding ServerUser, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <Label Canvas.Left="7" Canvas.Top="105" Content="{x:Static resx:Resource.lblUser}" Height="28" x:Name="lblUser" x:FieldModifier="public" Width="72" />
+                            <TextBox Canvas.Left="100" Canvas.Top="101" IsEnabled="{Binding FormData.ChkAuthentifizierung}" x:Name="txtUser" Width="160" x:FieldModifier="public" Text="{Binding FormData.ServerUser, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-                            <Label Canvas.Left="7" Canvas.Top="130" Content="{x:Static Member=resx:Resource.lblPassword}"  Name="lblPassword" Width="72" />
-                            <TextBox Canvas.Left="100" Canvas.Top="126" IsEnabled="{Binding ChkAuthentifizierung}" Name="txtPassword" Width="160" x:FieldModifier="public" Text="{Binding ServerPasswort, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <Label Canvas.Left="7" Canvas.Top="130" Content="{x:Static resx:Resource.lblPassword}"  x:Name="lblPassword" Width="72" />
+                            <TextBox Canvas.Left="100" Canvas.Top="126" IsEnabled="{Binding FormData.ChkAuthentifizierung}" x:Name="txtPassword" Width="160" x:FieldModifier="public" Text="{Binding FormData.ServerPasswort, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-                            <Label Canvas.Left="7" Canvas.Top="155" Content="{x:Static Member=resx:Resource.lblVersion}"  Name="lblVersion" Width="72" />
-                            <TextBox Canvas.Left="100" Canvas.Top="151"  IsEnabled="{Binding ChkSde}" Name="txtVersion" Width="160" Tag="SDE.DEFAULT" x:FieldModifier="public" Text="{Binding ServerVersion, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <Label Canvas.Left="7" Canvas.Top="155" Content="{x:Static resx:Resource.lblVersion}"  x:Name="lblVersion" Width="72" />
+                            <TextBox Canvas.Left="100" Canvas.Top="151"  IsEnabled="{Binding FormData.ChkSde}" x:Name="txtVersion" Width="160" Tag="SDE.DEFAULT" x:FieldModifier="public" Text="{Binding FormData.ServerVersion, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-                            <Button Canvas.Left="100" Canvas.Top="176" IsEnabled="{Binding ChkSde}" Content="{x:Static Member=resx:Resource.btnLoadSqlServerTables}" Height="23" Name="btnLoadSqlServerTables" Width="160" Click="BtnLoadSqlServerTables_Click" />
+                            <Button Canvas.Left="100" Canvas.Top="176" IsEnabled="{Binding FormData.ChkSde}" Content="{x:Static resx:Resource.btnLoadSqlServerTables}" Height="23" x:Name="btnLoadSqlServerTables" Width="160" Click="BtnLoadSqlServerTables_Click" />
                         </Canvas>
                     </TabItem>
                 </TabControl>
-                <Label Canvas.Left="11" Canvas.Top="244" Content="{x:Static Member=resx:Resource.lblEinstellungen}" Height="23" Name="lblEinstellungen"  FontSize="12" FontWeight="Bold" Width="186" />
-                <TabControl Canvas.Left="5" Canvas.Top="261" Height="263" Name="tabControl2" Width="334" Background="{x:Null}">
-                    <TabItem Header="{x:Static Member=resx:Resource.tabItemGrafPos}" Name="tabItemGrafPos">
+                <Label Canvas.Left="11" Canvas.Top="244" Content="{x:Static resx:Resource.lblEinstellungen}" Height="23" x:Name="lblEinstellungen"  FontSize="12" FontWeight="Bold" Width="186" />
+                <TabControl Canvas.Left="5" Canvas.Top="261" Height="263" x:Name="tabControl2" Width="334" Background="{x:Null}">
+                    <TabItem Header="{x:Static resx:Resource.tabItemGrafPos}" x:Name="tabItemGrafPos">
                         <Canvas Height="230" Width="300">
-                            <Label Canvas.Left="6" Canvas.Top="24" Content="{x:Static resx:Resource.lblXoffset}" Name="lblXoffset" Width="66" />
-                            <TextBox Canvas.Left="100" Canvas.Top="20"  Name="x_Offset" Width="35" Text="{Binding XOffset, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
-                            <Label Canvas.Left="6" Canvas.Top="50" Content="{x:Static resx:Resource.lblYoffset}" Name="lblYoffset" Width="66" />
-                            <TextBox Canvas.Left="100" Canvas.Top="46" Name="y_offset" Width="35" Text="{Binding YOffset, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="6" Canvas.Top="24" Content="{x:Static resx:Resource.lblXoffset}" x:Name="lblXoffset" Width="66" />
+                            <TextBox Canvas.Left="100" Canvas.Top="20"  x:Name="x_Offset" Width="35" Text="{Binding FormData.XOffset, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="6" Canvas.Top="50" Content="{x:Static resx:Resource.lblYoffset}" x:Name="lblYoffset" Width="66" />
+                            <TextBox Canvas.Left="100" Canvas.Top="46" x:Name="y_offset" Width="35" Text="{Binding FormData.YOffset, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="6" Canvas.Top="78" Content="{x:Static resx:Resource.lblVertikalabstand}" Name="lblVertikalabstand" Width="89" />
-                            <TextBox Canvas.Left="100" Canvas.Top="73"  Name="kastlabstand" Width="35" Text="{Binding Vertikalabstand, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}"  />
+                            <Label Canvas.Left="6" Canvas.Top="78" Content="{x:Static resx:Resource.lblVertikalabstand}" x:Name="lblVertikalabstand" Width="89" />
+                            <TextBox Canvas.Left="100" Canvas.Top="73"  x:Name="kastlabstand" Width="35" Text="{Binding FormData.Vertikalabstand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"  />
 
-                            <Label Canvas.Left="6" Canvas.Top="103" Content="{x:Static resx:Resource.lblKlammerabstand}"  Name="lblKlammerabstand" Width="89" />
-                            <TextBox Canvas.Left="100" Canvas.Top="99"  Name="klammerabstand" Width="35" Text="{Binding Klammerabstand, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="6" Canvas.Top="103" Content="{x:Static resx:Resource.lblKlammerabstand}"  x:Name="lblKlammerabstand" Width="89" />
+                            <TextBox Canvas.Left="100" Canvas.Top="99"  x:Name="klammerabstand" Width="35" Text="{Binding FormData.Klammerabstand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="6" Canvas.Top="138" Content="{x:Static resx:Resource.lblKaestchenLegendentextAbstand}"  Name="lblKastlLegendentextAbstand" Width="203" />
-                            <TextBox Canvas.Left="262" Canvas.Top="134"  Name="txtBezAbstand" Width="35" Text="{Binding KaestchenLegendentextAbstand, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay,ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="6" Canvas.Top="138" Content="{x:Static resx:Resource.lblKaestchenLegendentextAbstand}"  x:Name="lblKastlLegendentextAbstand" Width="203" />
+                            <TextBox Canvas.Left="262" Canvas.Top="134"  x:Name="txtBezAbstand" Width="35" Text="{Binding FormData.KaestchenLegendentextAbstand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="156" Canvas.Top="24" Content="{x:Static resx:Resource.lblVorUeberschrift1}"  Name="lblVorUeberschrift1" Width="102" />
-                            <TextBox Canvas.Left="262" Canvas.Top="20" Name="vorus1" Width="35" Text="{Binding VorUeberschrift1, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay,ValidatesOnDataErrors=True}"/>
+                            <Label Canvas.Left="156" Canvas.Top="24" Content="{x:Static resx:Resource.lblVorUeberschrift1}"  x:Name="lblVorUeberschrift1" Width="102" />
+                            <TextBox Canvas.Left="262" Canvas.Top="20" x:Name="vorus1" Width="35" Text="{Binding FormData.VorUeberschrift1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"/>
 
-                            <Label Canvas.Left="156" Canvas.Top="50" Content="{x:Static resx:Resource.lblNachUeberschrift1}"  Name="lblNachUeberschrift1" Width="102" />
-                            <TextBox Canvas.Left="262" Canvas.Top="50"  Name="nachus1" Width="35" Text="{Binding NachUeberschrift1, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}"/>
+                            <Label Canvas.Left="156" Canvas.Top="50" Content="{x:Static resx:Resource.lblNachUeberschrift1}"  x:Name="lblNachUeberschrift1" Width="102" />
+                            <TextBox Canvas.Left="262" Canvas.Top="50"  x:Name="nachus1" Width="35" Text="{Binding FormData.NachUeberschrift1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"/>
 
-                            <Label Canvas.Left="156" Canvas.Top="79" Content="{x:Static resx:Resource.lblNachUeberschrift2}"  Name="lblNachUeberschrift2" Width="103" />
-                            <TextBox Canvas.Left="262" Canvas.Top="79"  Name="nachus2" Width="35" Text="{Binding NachUeberschrift2, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="156" Canvas.Top="79" Content="{x:Static resx:Resource.lblNachUeberschrift2}"  x:Name="lblNachUeberschrift2" Width="103" />
+                            <TextBox Canvas.Left="262" Canvas.Top="79"  x:Name="nachus2" Width="35" Text="{Binding FormData.NachUeberschrift2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="156" Canvas.Top="108" Content="{x:Static resx:Resource.lblNotizenOffset}"  Name="lblNotizenOffset" Width="102" />
-                            <TextBox Canvas.Left="262" Canvas.Top="108"  Name="notoff" Width="35"  Text="{Binding NotizenOffset, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}"/>
+                            <Label Canvas.Left="156" Canvas.Top="108" Content="{x:Static resx:Resource.lblNotizenOffset}"  x:Name="lblNotizenOffset" Width="102" />
+                            <TextBox Canvas.Left="262" Canvas.Top="108"  x:Name="notoff" Width="35"  Text="{Binding FormData.NotizenOffset, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"/>
                         </Canvas>
                     </TabItem>
-                    <TabItem  Header="{x:Static Member=resx:Resource.tabItemUmbruch}" Name="tabItemUmbruch">
+                    <TabItem  Header="{x:Static resx:Resource.tabItemUmbruch}" x:Name="tabItemUmbruch">
                         <Canvas Height="199" Width="300">
-                            <Label Canvas.Left="10" Canvas.Top="16" Content="{x:Static resx:Resource.lblUmbruchUeberschrift1}"  Name="lblUmbruchUeberschrift1" Width="80" />
-                            <TextBox Canvas.Left="96" Canvas.Top="12"  Name="zeile_us1" Width="35" Text="{Binding UmbruchUeberschrift1, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="10" Canvas.Top="16" Content="{x:Static resx:Resource.lblUmbruchUeberschrift1}"  x:Name="lblUmbruchUeberschrift1" Width="80" />
+                            <TextBox Canvas.Left="96" Canvas.Top="12"  x:Name="zeile_us1" Width="35" Text="{Binding FormData.UmbruchUeberschrift1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="10" Canvas.Top="43" Content="{x:Static resx:Resource.lblUmbruchUeberschrift2}"  Name="lblUmbruchUeberschrift2" Width="80" />
-                            <TextBox Canvas.Left="96" Canvas.Top="38"  Name="zeile_us2" Width="35" Text="{Binding UmbruchUeberschrift2, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="10" Canvas.Top="43" Content="{x:Static resx:Resource.lblUmbruchUeberschrift2}"  x:Name="lblUmbruchUeberschrift2" Width="80" />
+                            <TextBox Canvas.Left="96" Canvas.Top="38"  x:Name="zeile_us2" Width="35" Text="{Binding FormData.UmbruchUeberschrift2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="10" Canvas.Top="70" Content="{x:Static resx:Resource.lblUmbruchUeberschrift3}"  Name="lblUmbruchUeberschrift3" Width="80" />
-                            <TextBox Canvas.Left="96" Canvas.Top="65" Name="zeile_us3" Width="35" Text="{Binding UmbruchUeberschrift3, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="10" Canvas.Top="70" Content="{x:Static resx:Resource.lblUmbruchUeberschrift3}"  x:Name="lblUmbruchUeberschrift3" Width="80" />
+                            <TextBox Canvas.Left="96" Canvas.Top="65" x:Name="zeile_us3" Width="35" Text="{Binding FormData.UmbruchUeberschrift3, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="147" Canvas.Top="16" Content="{x:Static resx:Resource.lblUmbruchLegendentext}"  Name="lblUmbruchLegendentext" Width="107" />
-                            <TextBox Canvas.Left="260" Canvas.Top="12"  Name="zeile_bez" Width="35" Text="{Binding UmbruchLegendentext, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="147" Canvas.Top="16" Content="{x:Static resx:Resource.lblUmbruchLegendentext}"  x:Name="lblUmbruchLegendentext" Width="107" />
+                            <TextBox Canvas.Left="260" Canvas.Top="12"  x:Name="zeile_bez" Width="35" Text="{Binding FormData.UmbruchLegendentext, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="147" Canvas.Top="43" Content="{x:Static resx:Resource.lblUmbruchSpaltenLaenge}" Name="lblUmbruchSpaltenLaenge" Width="107" />
-                            <TextBox Canvas.Left="260" Canvas.Top="39"  Name="spaltenlaenge" Width="35" Text="{Binding UmbruchSpaltenLaenge, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="147" Canvas.Top="43" Content="{x:Static resx:Resource.lblUmbruchSpaltenLaenge}" x:Name="lblUmbruchSpaltenLaenge" Width="107" />
+                            <TextBox Canvas.Left="260" Canvas.Top="39"  x:Name="spaltenlaenge" Width="35" Text="{Binding FormData.UmbruchSpaltenLaenge, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
 
-                            <Label Canvas.Left="147" Canvas.Top="72" Content="{x:Static resx:Resource.lblUmbruchSpaltenOffset}" Name="lblUmbruchSpaltenOffset" Width="107" />
-                            <TextBox Canvas.Left="260" Canvas.Top="68"  Name="spaltenoffset" Width="35" Text="{Binding UmbruchSpaltenOffset, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
+                            <Label Canvas.Left="147" Canvas.Top="72" Content="{x:Static resx:Resource.lblUmbruchSpaltenOffset}" x:Name="lblUmbruchSpaltenOffset" Width="107" />
+                            <TextBox Canvas.Left="260" Canvas.Top="68"  x:Name="spaltenoffset" Width="35" Text="{Binding FormData.UmbruchSpaltenOffset, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
                         </Canvas>
                     </TabItem>
 
-                    <TabItem  Header="{x:Static Member=resx:Resource.tabItemAufdrucksfarben}" Name="tabItemAufdrucksfarben">
+                    <TabItem  Header="{x:Static resx:Resource.tabItemAufdrucksfarben}" x:Name="tabItemAufdrucksfarben">
                         <Canvas Height="230" Width="324">
 
-                            <TextBox Canvas.Left="121" Canvas.Top="5" Name="txtRoc" Text="{Binding Roc, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay,ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="5" Name="txtRom" Text="{Binding Rom, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft"/>
-                            <TextBox Canvas.Left="215" Canvas.Top="5" Name="txtRoy" Text="{Binding Roy, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="5" Name="txtRok" Text="{Binding Rok, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <TextBox Canvas.Left="121" Canvas.Top="30" Name="txtBlc" Text="{Binding Blc, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="30" Name="txtBlm" Text="{Binding Blm, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="215" Canvas.Top="30" Name="txtBly" Text="{Binding Bly, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="30" Name="txtBlk" Text="{Binding Blk, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <TextBox Canvas.Left="121" Canvas.Top="55" Name="txtGrc" Text="{Binding Grc, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="55" Name="txtGrm" Text="{Binding Grm, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="215" Canvas.Top="55" Name="txtGry" Text="{Binding Gry, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="55" Name="txtGrk" Text="{Binding Grk, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <TextBox Canvas.Left="121" Canvas.Top="80" Name="txtBrc" Text="{Binding Brc, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="80" Name="txtBrm" Text="{Binding Brm, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="215" Canvas.Top="80" Name="txtBry" Text="{Binding Bry, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="80" Name="txtBrk" Text="{Binding Brk, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <TextBox Canvas.Left="121" Canvas.Top="105" Name="txtGac" Text="{Binding Gac, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="105" Name="txtGam" Text="{Binding Gam, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="215" Canvas.Top="105" Name="txtGay" Text="{Binding Gay, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="105" Name="txtGak" Text="{Binding Gak, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <TextBox Canvas.Left="121" Canvas.Top="130" Name="txtMac" Text="{Binding Mac, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="130" Name="txtMam" Text="{Binding Mam, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="215" Canvas.Top="130" Name="txtMay" Text="{Binding May, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="130" Name="txtMak" Text="{Binding Mak, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <TextBox Canvas.Left="121" Canvas.Top="155" Name="txtCyc" Tag="100" Text="{Binding Cyc, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}"  Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="155" Name="txtCym" Tag="0" Text="{Binding Cym, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="215" Canvas.Top="155" Name="txtCyy" Tag="0" Text="{Binding Cyy, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="155" Name="txtCyk" Tag="21" Text="{Binding Cyk, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <TextBox Canvas.Left="121" Canvas.Top="180" Name="txtGec" Tag="0" Text="{Binding Gec, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="180" Name="txtGem" Tag="0" Text="{Binding Gem, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="215" Canvas.Top="180" Name="txtGey" Tag="100" Text="{Binding Gey, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="180" Name="txtGek" Tag="21" Text="{Binding Gek, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <TextBox Canvas.Left="121" Canvas.Top="205" Name="txtOrc" Tag="0" Text="{Binding Orc, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="167" Canvas.Top="205" Name="txtOrm" Tag="30" Text="{Binding Orm, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="215" Canvas.Top="205" Name="txtOry" Tag="100" Text="{Binding Ory, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-                            <TextBox Canvas.Left="261" Canvas.Top="205" Name="txtOrk" Tag="21" Text="{Binding Ork, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
-
-                            <Label Canvas.Left="7" Canvas.Top="9" Content="{x:Static resx:Resource.lblAufdruckRot}"  Name="lblAufdruckRot" Width="130" />
-                            <Label Canvas.Left="7" Canvas.Top="34" Content="{x:Static resx:Resource.lblAufdruckBlau}"  Name="lblAufdruckBlau" Width="130" />
-                            <Label Canvas.Left="7" Canvas.Top="59" Content="{x:Static resx:Resource.lblAufdruckGruen}"  Name="lblAufdruckGruen" Width="130" />
-                            <Label Canvas.Left="7" Canvas.Top="84" Content="{x:Static resx:Resource.lblAufdruckBraun}" Name="lblAufdruckBraun" Width="130" />
-                            <Label Canvas.Left="7" Canvas.Top="134" Content="{x:Static resx:Resource.lblAufdruckMagenta}" Name="lblAufdruckMagenta" Width="130" />
-                            <Label Canvas.Left="7" Canvas.Top="109" Content="{x:Static resx:Resource.lblAufdruckGrau}" Name="lblAufdruckGrau" Width="130" />
-                            <Label Canvas.Left="7" Canvas.Top="159" Content="{x:Static resx:Resource.lblAufdruckCyan}" Name="lblAufdruckCyan" Width="130" />
-                            <Label Canvas.Left="7" Canvas.Top="184" Content="{x:Static resx:Resource.lblAufdruckGelb}" Name="lblAufdruckGelb" Width="130" />
-                            <Label Canvas.Left="7" Canvas.Top="209" Content="{x:Static resx:Resource.lblAufdruckOrange}" Name="lblAufdruckOrange" Width="130" />
-
-                            <Rectangle Canvas.Left="302" Canvas.Top="6" Height="20" Name="displayRedRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <TextBox Canvas.Left="121" Canvas.Top="5" x:Name="txtRoc" Text="{Binding FormData.Roc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="5" x:Name="txtRom" Text="{Binding FormData.Rom, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft"/>
+                            <TextBox Canvas.Left="215" Canvas.Top="5" x:Name="txtRoy" Text="{Binding FormData.Roy, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="5" x:Name="txtRok" Text="{Binding FormData.Rok, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <TextBox Canvas.Left="121" Canvas.Top="30" x:Name="txtBlc" Text="{Binding FormData.Blc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="30" x:Name="txtBlm" Text="{Binding FormData.Blm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="215" Canvas.Top="30" x:Name="txtBly" Text="{Binding FormData.Bly, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="30" x:Name="txtBlk" Text="{Binding FormData.Blk, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <TextBox Canvas.Left="121" Canvas.Top="55" x:Name="txtGrc" Text="{Binding FormData.Grc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="55" x:Name="txtGrm" Text="{Binding FormData.Grm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="215" Canvas.Top="55" x:Name="txtGry" Text="{Binding FormData.Gry, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="55" x:Name="txtGrk" Text="{Binding FormData.Grk, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <TextBox Canvas.Left="121" Canvas.Top="80" x:Name="txtBrc" Text="{Binding FormData.Brc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="80" x:Name="txtBrm" Text="{Binding FormData.Brm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="215" Canvas.Top="80" x:Name="txtBry" Text="{Binding FormData.Bry, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="80" x:Name="txtBrk" Text="{Binding FormData.Brk, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <TextBox Canvas.Left="121" Canvas.Top="105" x:Name="txtGac" Text="{Binding FormData.Gac, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="105" x:Name="txtGam" Text="{Binding FormData.Gam, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="215" Canvas.Top="105" x:Name="txtGay" Text="{Binding FormData.Gay, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="105" x:Name="txtGak" Text="{Binding FormData.Gak, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <TextBox Canvas.Left="121" Canvas.Top="130" x:Name="txtMac" Text="{Binding FormData.Mac, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="130" x:Name="txtMam" Text="{Binding FormData.Mam, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="215" Canvas.Top="130" x:Name="txtMay" Text="{Binding FormData.May, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="130" x:Name="txtMak" Text="{Binding FormData.Mak, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <TextBox Canvas.Left="121" Canvas.Top="155" x:Name="txtCyc" Tag="100" Text="{Binding FormData.Cyc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"  Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="155" x:Name="txtCym" Tag="0" Text="{Binding FormData.Cym, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="215" Canvas.Top="155" x:Name="txtCyy" Tag="0" Text="{Binding FormData.Cyy, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="155" x:Name="txtCyk" Tag="21" Text="{Binding FormData.Cyk, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <TextBox Canvas.Left="121" Canvas.Top="180" x:Name="txtGec" Tag="0" Text="{Binding FormData.Gec, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="180" x:Name="txtGem" Tag="0" Text="{Binding FormData.Gem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="215" Canvas.Top="180" x:Name="txtGey" Tag="100" Text="{Binding FormData.Gey, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="180" x:Name="txtGek" Tag="21" Text="{Binding FormData.Gek, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <TextBox Canvas.Left="121" Canvas.Top="205" x:Name="txtOrc" Tag="0" Text="{Binding FormData.Orc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="167" Canvas.Top="205" x:Name="txtOrm" Tag="30" Text="{Binding FormData.Orm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="215" Canvas.Top="205" x:Name="txtOry" Tag="100" Text="{Binding FormData.Ory, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+                            <TextBox Canvas.Left="261" Canvas.Top="205" x:Name="txtOrk" Tag="21" Text="{Binding FormData.Ork, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="32" FlowDirection="RightToLeft" />
+
+                            <Label Canvas.Left="7" Canvas.Top="9" Content="{x:Static resx:Resource.lblAufdruckRot}"  x:Name="lblAufdruckRot" Width="130" />
+                            <Label Canvas.Left="7" Canvas.Top="34" Content="{x:Static resx:Resource.lblAufdruckBlau}"  x:Name="lblAufdruckBlau" Width="130" />
+                            <Label Canvas.Left="7" Canvas.Top="59" Content="{x:Static resx:Resource.lblAufdruckGruen}"  x:Name="lblAufdruckGruen" Width="130" />
+                            <Label Canvas.Left="7" Canvas.Top="84" Content="{x:Static resx:Resource.lblAufdruckBraun}" x:Name="lblAufdruckBraun" Width="130" />
+                            <Label Canvas.Left="7" Canvas.Top="134" Content="{x:Static resx:Resource.lblAufdruckMagenta}" x:Name="lblAufdruckMagenta" Width="130" />
+                            <Label Canvas.Left="7" Canvas.Top="109" Content="{x:Static resx:Resource.lblAufdruckGrau}" x:Name="lblAufdruckGrau" Width="130" />
+                            <Label Canvas.Left="7" Canvas.Top="159" Content="{x:Static resx:Resource.lblAufdruckCyan}" x:Name="lblAufdruckCyan" Width="130" />
+                            <Label Canvas.Left="7" Canvas.Top="184" Content="{x:Static resx:Resource.lblAufdruckGelb}" x:Name="lblAufdruckGelb" Width="130" />
+                            <Label Canvas.Left="7" Canvas.Top="209" Content="{x:Static resx:Resource.lblAufdruckOrange}" x:Name="lblAufdruckOrange" Width="130" />
+
+                            <Rectangle Canvas.Left="302" Canvas.Top="6" Height="20" x:Name="displayRedRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -231,7 +239,7 @@
                                     </SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
-                            <Rectangle Canvas.Left="302" Canvas.Top="30" Height="20" Name="displayBlueRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <Rectangle Canvas.Left="302" Canvas.Top="30" Height="20" x:Name="displayBlueRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -245,7 +253,7 @@
                                     </SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
-                            <Rectangle Canvas.Left="302" Canvas.Top="57" Height="20" Name="displayGreenRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <Rectangle Canvas.Left="302" Canvas.Top="57" Height="20" x:Name="displayGreenRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -259,7 +267,7 @@
                                     </SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
-                            <Rectangle Canvas.Left="302" Canvas.Top="80" Height="20" Name="displayBrownRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <Rectangle Canvas.Left="302" Canvas.Top="80" Height="20" x:Name="displayBrownRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -273,7 +281,7 @@
                                     </SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
-                            <Rectangle Canvas.Left="302" Canvas.Top="105" Height="20" Name="displayGrayRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <Rectangle Canvas.Left="302" Canvas.Top="105" Height="20" x:Name="displayGrayRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -287,7 +295,7 @@
                                     </SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
-                            <Rectangle Canvas.Left="302" Canvas.Top="130" Height="20" Name="displayMagentaRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <Rectangle Canvas.Left="302" Canvas.Top="130" Height="20" x:Name="displayMagentaRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -301,7 +309,7 @@
                                     </SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
-                            <Rectangle Canvas.Left="302" Canvas.Top="155" Height="20" Name="displayCyanRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <Rectangle Canvas.Left="302" Canvas.Top="155" Height="20" x:Name="displayCyanRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -315,7 +323,7 @@
                                     </SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
-                            <Rectangle Canvas.Left="302" Canvas.Top="180" Height="20" Name="displayYellowRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <Rectangle Canvas.Left="302" Canvas.Top="180" Height="20" x:Name="displayYellowRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -329,7 +337,7 @@
                                     </SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
-                            <Rectangle Canvas.Left="302" Canvas.Top="205" Height="20" Name="displayOrangeRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
+                            <Rectangle Canvas.Left="302" Canvas.Top="205" Height="20" x:Name="displayOrangeRectangle" Stroke="Black" StrokeThickness="1" RadiusX="5" RadiusY="5" Width="14">
                                 <Rectangle.Fill>
                                     <SolidColorBrush>
                                         <SolidColorBrush.Color>
@@ -346,72 +354,72 @@
                         </Canvas>
                     </TabItem>
                 </TabControl>
-                
-                <TabControl Canvas.Left="345" Canvas.Top="10" Height="513" Name="tabControl3" Width="360" Background="{x:Null}">
-                    <TabItem Header="{x:Static Member=resx:Resource.tabItemDatenbankspalten}" Name="tabItemDatenbankspalten">
+
+                <TabControl Canvas.Left="345" Canvas.Top="10" Height="513" x:Name="tabControl3" Width="360" Background="{x:Null}">
+                    <TabItem Header="{x:Static resx:Resource.tabItemDatenbankspalten}" x:Name="tabItemDatenbankspalten">
                         <Canvas Height="480" Width="348">
-                            <Label Canvas.Left="11" Canvas.Top="9" Content="{x:Static resx:Resource.lblLegendTable}"  Name="lblLegendTable" Foreground="#FF27B23A" FontWeight="Bold" />
-                            <ComboBox Canvas.Left="142" Canvas.Top="5" Height="21" Name="cboTable" Width="200" SelectedItem="{Binding Table, Mode=TwoWay, ValidatesOnDataErrors=True}" ItemsSource="{Binding Tables}" IsEditable="True" />
-
-                            <Label Canvas.Left="11" Canvas.Top="34" Content="{x:Static resx:Resource.lblDatabaseId}"  Name="lblDatabaseId" Foreground="#FF27B23A" FontWeight="Bold" />
-                            <TextBox Canvas.Left="142" Canvas.Top="30" Name="txtVerknuepfung" Width="160" Tag="ID"  Text="{Binding DatabaseId, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
-
-                            <Label Canvas.Left="11" Canvas.Top="59" Content="{x:Static resx:Resource.lblSortierschluessel}"  Name="lblSortierschluessel" Foreground="#FF27B23A" FontWeight="Bold" />
-                            <TextBox Canvas.Left="142" Canvas.Top="55"  Name="txtSortierung" Width="160" Tag="L_SORT" Text="{Binding Sortierschluessel, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
-
-                            <Label Canvas.Left="11" Canvas.Top="84" Content="{x:Static resx:Resource.lblLegendentext}"  Name="lblLegendentext" Foreground="#FF27B23A" FontWeight="Bold" />
-                            <TextBox Canvas.Left="142" Canvas.Top="80"  Name="txtLegendentext" Tag="L_TEXT" Width="160" Text="{Binding Legendentext, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
-
-                            <Label Canvas.Left="11" Canvas.Top="109" Content="{x:Static resx:Resource.lblZeichenelemente}"  Name="lblZeichenelemente" Foreground="#FF27B23A" FontWeight="Bold" />
-                            <TextBox Canvas.Left="142" Canvas.Top="105"  Name="txtZeichenelemente" Width="160" Tag="L_SYMB" Text="{Binding Zeichenelemente, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
-                            
-                            <Label Canvas.Left="11" Canvas.Top="134" Content="{x:Static resx:Resource.lblLegendengrafik}"  Name="lblLegendengrafik" Width="121" />
-                            <TextBox Canvas.Left="142" Canvas.Top="130"  Name="txtLegendengrafik" Width="160" IsEnabled="{Binding ChkLegendengrafik}" Tag="L_GRAPHICS" Text="{Binding Legendengrafik, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}"/>
-                            <CheckBox Canvas.Left="323" Canvas.Top="135" Name="chkLegendengrafik" Tag="True" IsChecked="{Binding Path=ChkLegendengrafik, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-
-                            <Label Canvas.Left="11" Canvas.Top="159" Content="{x:Static resx:Resource.lblUeberschrift1}" Name="lblUeberschrift1" Width="121" />
-                            <TextBox Canvas.Left="142" Canvas.Top="155"  Name="txtUeberschrift1" Width="160" IsEnabled="{Binding ChkUeberschrift1}" Tag="HEADING1" Text="{Binding Ueberschrift1, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="160" Name="chkUeberschrift1" Tag="True" IsChecked="{Binding Path=ChkUeberschrift1, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-                            <Label Canvas.Left="11" Canvas.Top="184" Content="{x:Static resx:Resource.lblUeberschrift2}" Name="lblUeberschrift2" Width="121" />
-                            <TextBox Canvas.Left="142" Canvas.Top="180"  Name="txtUeberschrift2" IsEnabled="{Binding ChkUeberschrift2}" Tag="HEADING2" Text="{Binding Ueberschrift2, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="185" Tag="True" IsChecked="{Binding Path=ChkUeberschrift2, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkUeberschrift2" />
-                            <Label Canvas.Left="11" Canvas.Top="209" Content="{x:Static resx:Resource.lblUeberschrift3}"  Name="lblUeberschrift3" Width="121" />
-                            <TextBox Canvas.Left="142" Canvas.Top="205"  Name="txtUeberschrift3" IsEnabled="{Binding ChkUeberschrift3}"  Tag="HEADING3" Text="{Binding Ueberschrift3, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="209" Tag="True" IsChecked="{Binding Path=ChkUeberschrift3, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkUeberschrift3" />
-
-                            <Label Canvas.Left="11" Canvas.Top="234" Content="{x:Static resx:Resource.lblKlammerebene1}"  Name="lblKlammerebene1" Width="121" />
-                            <TextBox Canvas.Left="142" Canvas.Top="230"  Name="txtKlammerebene1" IsEnabled="{Binding ChkKlammerebene1}" Tag="BRACKET1" Text="{Binding Klammerebene1, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="235" Tag="True" IsChecked="{Binding Path=ChkKlammerebene1, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkKlammerebene1" />
-
-                            <Label Canvas.Left="11" Canvas.Top="259" Content="{x:Static resx:Resource.lblKlammerebene2}"  Name="lblKlammerebene2" Width="121" />
-                            <TextBox Canvas.Left="142" Canvas.Top="255"  Name="txtKlammerebene2" IsEnabled="{Binding ChkKlammerebene2}" Tag="BRACKET2" Text="{Binding Klammerebene2, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="260" Tag="True" IsChecked="{Binding Path=ChkKlammerebene2, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkKlammerebene2" />
-
-                            <Label Canvas.Left="11" Canvas.Top="284" Content="{x:Static resx:Resource.lblKlammerebene3}"  Name="lblKlammerebene3" Width="121" FontSize="11" />
-                            <TextBox Canvas.Left="142" Canvas.Top="280"  Name="txtKlammerebene3" IsEnabled="{Binding ChkKlammerebene3}" Tag="BRACKET3" Text="{Binding Klammerebene3, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="285" Tag="True" IsChecked="{Binding Path=ChkKlammerebene3, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkKlammerebene3" />
-
-                            <Label Canvas.Left="11" Canvas.Top="309" Content="{x:Static resx:Resource.lblGruppierung}"  Name="lblGruppierung" Width="121" />
-                            <TextBox Canvas.Left="142" Canvas.Top="305"  Name="txtGruppierung" Width="160" IsEnabled="{Binding ChkGruppierung}" Tag="L_GROUP" Text="{Binding Gruppierung, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="310" Name="chkGruppierung" IsEnabled="True" Tag="True" IsChecked="{Binding Path=ChkGruppierung, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-
-                            <Label Canvas.Left="11" Canvas.Top="334" Content="{x:Static resx:Resource.lblFlaeche}"  Name="lblFlaeche" Width="121" />
-                            <TextBox Canvas.Left="143" Canvas.Top="330"  Name="txtFlaeche"  IsEnabled="{Binding ChkFlaechensymbolname}" Tag="FILL_SYMBOL" Text="{Binding Flaechensymbolname, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="335" Tag="True" IsChecked="{Binding Path=ChkFlaechensymbolname, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkFlaeche" />
-                            <Label Canvas.Left="11" Canvas.Top="359" Content="{x:Static resx:Resource.lblLinie}"  Name="lblLinie" Width="121" />
-                            <TextBox Canvas.Left="143" Canvas.Top="355"  Name="txtLinie" IsEnabled="{Binding ChkLiniensymbolname}" Tag="LINE_SYMBOL" Text="{Binding Liniensymbolname, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}"  Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="360" Tag="True" IsChecked="{Binding Path=ChkLiniensymbolname, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkLinie" />
-                            <Label Canvas.Left="11" Canvas.Top="384" Content="{x:Static resx:Resource.lblMarker}"  Name="lblMarker" Width="121" />
-                            <TextBox Canvas.Left="143" Canvas.Top="380"  Name="txtMarker" IsEnabled="{Binding ChkMarkersymbolname}" Tag="MARKER_SYMBOL" Text="{Binding Markersymbolname, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="385"  Tag="True" IsChecked="{Binding Path=ChkMarkersymbolname, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkMarker" />
-
-                            <Label Canvas.Left="11" Canvas.Top="409" Content="{x:Static resx:Resource.lblLegendennummer}"  Name="lblLegendennummer" Width="126" />
-                            <TextBox Canvas.Left="143" Canvas.Top="405"  Name="txtLegendennummer" IsEnabled="{Binding ChkLegendennummer}" Tag="L_NUM" Text="{Binding Legendennummer, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="323" Canvas.Top="410" Tag="True" IsChecked="{Binding Path=ChkLegendennummer, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkLegendennummer"/>
-
-                            <CheckBox Content="{x:Static resx:Resource.chkFortlaufendeNummer}" Name="chkFortlaufendeNummer"   IsChecked="{Binding Path=ChkFortlaufendeNummer, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Canvas.Left="11" Canvas.Top="431" Tag="False" />
-                            <TextBox  Name="txtFortlaufendeNummer" IsEnabled="{Binding ChkFortlaufendeNummer}" Tag="fortlaufendeNummer.txt" Text="{Binding FortlaufendeNummer, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Canvas.Left="11" Canvas.Top="453" Width="291"  />
-                            <Button Content="{DynamicResource imgLoad}" IsEnabled="{Binding ChkFortlaufendeNummer}" Name="btnFortlaufendeNummer" Width="30"  Canvas.Left="310" Canvas.Top="453" Click="BtnFortlaufendeNummer_Click" />
+                            <Label Canvas.Left="11" Canvas.Top="9" Content="{x:Static resx:Resource.lblLegendTable}"  x:Name="lblLegendTable" Foreground="#FF27B23A" FontWeight="Bold" />
+                            <ComboBox Canvas.Left="142" Canvas.Top="5" Height="21" x:Name="cboTable" Width="200" SelectedItem="{Binding FormData.Table, Mode=TwoWay, ValidatesOnDataErrors=True}" ItemsSource="{Binding FormData.Tables}" IsEditable="True" />
+
+                            <Label Canvas.Left="11" Canvas.Top="34" Content="{x:Static resx:Resource.lblDatabaseId}"  x:Name="lblDatabaseId" Foreground="#FF27B23A" FontWeight="Bold" />
+                            <TextBox Canvas.Left="142" Canvas.Top="30" x:Name="txtVerknuepfung" Width="160" Tag="ID"  Text="{Binding FormData.DatabaseId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+
+                            <Label Canvas.Left="11" Canvas.Top="59" Content="{x:Static resx:Resource.lblSortierschluessel}"  x:Name="lblSortierschluessel" Foreground="#FF27B23A" FontWeight="Bold" />
+                            <TextBox Canvas.Left="142" Canvas.Top="55"  x:Name="txtSortierung" Width="160" Tag="L_SORT" Text="{Binding FormData.Sortierschluessel, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+
+                            <Label Canvas.Left="11" Canvas.Top="84" Content="{x:Static resx:Resource.lblLegendentext}"  x:Name="lblLegendentext" Foreground="#FF27B23A" FontWeight="Bold" />
+                            <TextBox Canvas.Left="142" Canvas.Top="80"  x:Name="txtLegendentext" Tag="L_TEXT" Width="160" Text="{Binding FormData.Legendentext, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+
+                            <Label Canvas.Left="11" Canvas.Top="109" Content="{x:Static resx:Resource.lblZeichenelemente}"  x:Name="lblZeichenelemente" Foreground="#FF27B23A" FontWeight="Bold" />
+                            <TextBox Canvas.Left="142" Canvas.Top="105"  x:Name="txtZeichenelemente" Width="160" Tag="L_SYMB" Text="{Binding FormData.Zeichenelemente, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+
+                            <Label Canvas.Left="11" Canvas.Top="134" Content="{x:Static resx:Resource.lblLegendengrafik}"  x:Name="lblLegendengrafik" Width="121" />
+                            <TextBox Canvas.Left="142" Canvas.Top="130"  x:Name="txtLegendengrafik" Width="160" IsEnabled="{Binding FormData.ChkLegendengrafik}" Tag="L_GRAPHICS" Text="{Binding FormData.Legendengrafik, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"/>
+                            <CheckBox Canvas.Left="323" Canvas.Top="135" x:Name="chkLegendengrafik" Tag="True" IsChecked="{Binding FormData.ChkLegendengrafik, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                            <Label Canvas.Left="11" Canvas.Top="159" Content="{x:Static resx:Resource.lblUeberschrift1}" x:Name="lblUeberschrift1" Width="121" />
+                            <TextBox Canvas.Left="142" Canvas.Top="155"  x:Name="txtUeberschrift1" Width="160" IsEnabled="{Binding FormData.ChkUeberschrift1}" Tag="HEADING1" Text="{Binding FormData.Ueberschrift1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="160" x:Name="chkUeberschrift1" Tag="True" IsChecked="{Binding FormData.ChkUeberschrift1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <Label Canvas.Left="11" Canvas.Top="184" Content="{x:Static resx:Resource.lblUeberschrift2}" x:Name="lblUeberschrift2" Width="121" />
+                            <TextBox Canvas.Left="142" Canvas.Top="180"  x:Name="txtUeberschrift2" IsEnabled="{Binding FormData.ChkUeberschrift2}" Tag="HEADING2" Text="{Binding FormData.Ueberschrift2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="185" Tag="True" IsChecked="{Binding FormData.ChkUeberschrift2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkUeberschrift2" />
+                            <Label Canvas.Left="11" Canvas.Top="209" Content="{x:Static resx:Resource.lblUeberschrift3}"  x:Name="lblUeberschrift3" Width="121" />
+                            <TextBox Canvas.Left="142" Canvas.Top="205"  x:Name="txtUeberschrift3" IsEnabled="{Binding FormData.ChkUeberschrift3}"  Tag="HEADING3" Text="{Binding FormData.Ueberschrift3, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="209" Tag="True" IsChecked="{Binding FormData.ChkUeberschrift3, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkUeberschrift3" />
+
+                            <Label Canvas.Left="11" Canvas.Top="234" Content="{x:Static resx:Resource.lblKlammerebene1}"  x:Name="lblKlammerebene1" Width="121" />
+                            <TextBox Canvas.Left="142" Canvas.Top="230"  x:Name="txtKlammerebene1" IsEnabled="{Binding FormData.ChkKlammerebene1}" Tag="BRACKET1" Text="{Binding FormData.Klammerebene1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="235" Tag="True" IsChecked="{Binding FormData.ChkKlammerebene1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkKlammerebene1" />
+
+                            <Label Canvas.Left="11" Canvas.Top="259" Content="{x:Static resx:Resource.lblKlammerebene2}"  x:Name="lblKlammerebene2" Width="121" />
+                            <TextBox Canvas.Left="142" Canvas.Top="255"  x:Name="txtKlammerebene2" IsEnabled="{Binding FormData.ChkKlammerebene2}" Tag="BRACKET2" Text="{Binding FormData.Klammerebene2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="260" Tag="True" IsChecked="{Binding FormData.ChkKlammerebene2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkKlammerebene2" />
+
+                            <Label Canvas.Left="11" Canvas.Top="284" Content="{x:Static resx:Resource.lblKlammerebene3}"  x:Name="lblKlammerebene3" Width="121" FontSize="11" />
+                            <TextBox Canvas.Left="142" Canvas.Top="280"  x:Name="txtKlammerebene3" IsEnabled="{Binding FormData.ChkKlammerebene3}" Tag="BRACKET3" Text="{Binding FormData.Klammerebene3, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="285" Tag="True" IsChecked="{Binding FormData.ChkKlammerebene3, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkKlammerebene3" />
+
+                            <Label Canvas.Left="11" Canvas.Top="309" Content="{x:Static resx:Resource.lblGruppierung}"  x:Name="lblGruppierung" Width="121" />
+                            <TextBox Canvas.Left="142" Canvas.Top="305"  x:Name="txtGruppierung" Width="160" IsEnabled="{Binding FormData.ChkGruppierung}" Tag="L_GROUP" Text="{Binding FormData.Gruppierung, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="310" x:Name="chkGruppierung" Tag="True" IsChecked="{Binding FormData.ChkGruppierung, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                            <Label Canvas.Left="11" Canvas.Top="334" Content="{x:Static resx:Resource.lblFlaeche}"  x:Name="lblFlaeche" Width="121" />
+                            <TextBox Canvas.Left="143" Canvas.Top="330"  x:Name="txtFlaeche"  IsEnabled="{Binding FormData.ChkFlaechensymbolname}" Tag="FILL_SYMBOL" Text="{Binding FormData.Flaechensymbolname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="335" Tag="True" IsChecked="{Binding FormData.ChkFlaechensymbolname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkFlaeche" />
+                            <Label Canvas.Left="11" Canvas.Top="359" Content="{x:Static resx:Resource.lblLinie}"  x:Name="lblLinie" Width="121" />
+                            <TextBox Canvas.Left="143" Canvas.Top="355"  x:Name="txtLinie" IsEnabled="{Binding FormData.ChkLiniensymbolname}" Tag="LINE_SYMBOL" Text="{Binding FormData.Liniensymbolname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"  Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="360" Tag="True" IsChecked="{Binding FormData.ChkLiniensymbolname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkLinie" />
+                            <Label Canvas.Left="11" Canvas.Top="384" Content="{x:Static resx:Resource.lblMarker}"  x:Name="lblMarker" Width="121" />
+                            <TextBox Canvas.Left="143" Canvas.Top="380"  x:Name="txtMarker" IsEnabled="{Binding FormData.ChkMarkersymbolname}" Tag="MARKER_SYMBOL" Text="{Binding FormData.Markersymbolname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="385"  Tag="True" IsChecked="{Binding FormData.ChkMarkersymbolname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkMarker" />
+
+                            <Label Canvas.Left="11" Canvas.Top="409" Content="{x:Static resx:Resource.lblLegendennummer}"  x:Name="lblLegendennummer" Width="126" />
+                            <TextBox Canvas.Left="143" Canvas.Top="405"  x:Name="txtLegendennummer" IsEnabled="{Binding FormData.ChkLegendennummer}" Tag="L_NUM" Text="{Binding FormData.Legendennummer, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="323" Canvas.Top="410" Tag="True" IsChecked="{Binding FormData.ChkLegendennummer, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkLegendennummer"/>
+
+                            <CheckBox Content="{x:Static resx:Resource.chkFortlaufendeNummer}" x:Name="chkFortlaufendeNummer"   IsChecked="{Binding FormData.ChkFortlaufendeNummer, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Canvas.Left="11" Canvas.Top="431" Tag="False" />
+                            <TextBox  x:Name="txtFortlaufendeNummer" IsEnabled="{Binding FormData.ChkFortlaufendeNummer}" Tag="fortlaufendeNummer.txt" Text="{Binding FormData.FortlaufendeNummer, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Canvas.Left="11" Canvas.Top="453" Width="291"  />
+                            <Button Content="{DynamicResource imgLoad}" IsEnabled="{Binding  FormData.ChkFortlaufendeNummer}" x:Name="btnFortlaufendeNummer" Width="30"  Canvas.Left="310" Canvas.Top="453" Click="BtnFortlaufendeNummer_Click" />
 
 
 
@@ -421,13 +429,13 @@
                                     <RichTextBox Background="AliceBlue" BorderBrush="AliceBlue">
                                         <FlowDocument >
                                             <Paragraph TextAlignment="Center" FontSize="10pt">
-                                                Primary key Information
+                                                <Run Text="Primary key Information"/>
                                             </Paragraph>
                                             <Paragraph TextAlignment="Left"  FontSize="8pt">
-                                                Please select here the column for the primary key!
+                                                <Run Text="Please select here the column for the primary key!"/>
                                             </Paragraph>
                                             <Paragraph TextAlignment="Left"  FontSize="8pt">
-                                                The values inside this column must be unique!
+                                                <Run Text="The values inside this column must be unique!"/>
                                             </Paragraph>
                                         </FlowDocument>
                                     </RichTextBox>
@@ -440,10 +448,10 @@
                                     <RichTextBox Background="AliceBlue" BorderBrush="AliceBlue">
                                         <FlowDocument >
                                             <Paragraph TextAlignment="Center" FontSize="10pt">
-                                                Sorting table information
+                                                <Run Text="Sorting table information"/>
                                             </Paragraph>
                                             <Paragraph TextAlignment="Left"  FontSize="8pt">
-                                                For sorting the legend entries, the legend table must have an OBJECTID column!
+                                                <Run Text="For sorting the legend entries, the legend table must have an OBJECTID column!"/>
                                             </Paragraph>
                                         </FlowDocument>
                                     </RichTextBox>
@@ -452,40 +460,39 @@
 
                         </Canvas>
                     </TabItem>
-                    <TabItem Header="{x:Static Member=resx:Resource.tabItemOptionaleDatenbankspalten}" Name="tabItemOptionaleDatenbankspalten">
+                    <TabItem Header="{x:Static resx:Resource.tabItemOptionaleDatenbankspalten}" x:Name="tabItemOptionaleDatenbankspalten">
                         <Canvas Height="468" Width="348">
-                            <Label Canvas.Left="16" Canvas.Top="23" Content="{x:Static resx:Resource.lblInfozeile4}"  Name="lblInfozeile4" Width="103" />
-                            <TextBox Canvas.Left="147" Canvas.Top="19" Name="txtInfozeile4" IsEnabled="{Binding ChkInfozeile4}" Tag="HEADING4" Text="{Binding Infozeile4, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="322" Canvas.Top="19" Height="16" Tag="False" IsChecked="{Binding Path=ChkInfozeile4, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkInfozeile4" />
+                            <Label Canvas.Left="16" Canvas.Top="23" Content="{x:Static resx:Resource.lblInfozeile4}"  x:Name="lblInfozeile4" Width="103" />
+                            <TextBox Canvas.Left="147" Canvas.Top="19" x:Name="txtInfozeile4" IsEnabled="{Binding FormData.ChkInfozeile4}" Tag="HEADING4" Text="{Binding FormData.Infozeile4, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="322" Canvas.Top="19" Height="16" Tag="False" IsChecked="{Binding FormData.ChkInfozeile4, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkInfozeile4" />
 
-                            <Label Canvas.Left="16" Canvas.Top="48" Content="{x:Static resx:Resource.lblInfozeile5}" Name="lblInfozeile5" Width="103" />
-                            <TextBox Canvas.Left="147" Canvas.Top="44"  Name="txtInfozeile5" IsEnabled="{Binding ChkInfozeile5}" Tag="HEADING5" Text="{Binding Infozeile5, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="322" Canvas.Top="49" Height="16" Tag="False" IsChecked="{Binding Path=ChkInfozeile5, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkInfozeile5" />
+                            <Label Canvas.Left="16" Canvas.Top="48" Content="{x:Static resx:Resource.lblInfozeile5}" x:Name="lblInfozeile5" Width="103" />
+                            <TextBox Canvas.Left="147" Canvas.Top="44"  x:Name="txtInfozeile5" IsEnabled="{Binding FormData.ChkInfozeile5}" Tag="HEADING5" Text="{Binding FormData.Infozeile5, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="322" Canvas.Top="49" Height="16" Tag="False" IsChecked="{Binding FormData.ChkInfozeile5, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkInfozeile5" />
 
-                            <Label Canvas.Left="16" Canvas.Top="73" Content="{x:Static resx:Resource.lblInfozeile6}" Name="lblInfozeile6" Width="103" />
-                            <TextBox Canvas.Left="147" Canvas.Top="69"  Name="txtInfozeile6" IsEnabled="{Binding ChkInfozeile6}" Tag="HEADING6" Text="{Binding Infozeile6, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" Width="160" />
-                            <CheckBox Canvas.Left="322" Canvas.Top="78" Height="16" Tag="False" IsChecked="{Binding Path=ChkInfozeile6, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkInfozeile6" />
+                            <Label Canvas.Left="16" Canvas.Top="73" Content="{x:Static resx:Resource.lblInfozeile6}" x:Name="lblInfozeile6" Width="103" />
+                            <TextBox Canvas.Left="147" Canvas.Top="69"  x:Name="txtInfozeile6" IsEnabled="{Binding FormData.ChkInfozeile6}" Tag="HEADING6" Text="{Binding FormData.Infozeile6, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" Width="160" />
+                            <CheckBox Canvas.Left="322" Canvas.Top="78" Height="16" Tag="False" IsChecked="{Binding FormData.ChkInfozeile6, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkInfozeile6" />
 
-                            <Label Canvas.Left="16" Canvas.Top="98" Content="{x:Static resx:Resource.lblNotizen}"  Name="lblNotizen" Width="103" />
-                            <TextBox Canvas.Left="147" Canvas.Top="94"  Name="txtZweiteSpalte" Width="160" IsEnabled="{Binding ChkNotizen}" Tag="NOTES" Text="{Binding Notizen, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ValidatesOnDataErrors=True}" />
-                            <CheckBox Canvas.Left="322" Canvas.Top="103" Height="16" Tag="False" IsChecked="{Binding Path=ChkNotizen, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkNotizenfeld" />
+                            <Label Canvas.Left="16" Canvas.Top="98" Content="{x:Static resx:Resource.lblNotizen}"  x:Name="lblNotizen" Width="103" />
+                            <TextBox Canvas.Left="147" Canvas.Top="94"  x:Name="txtZweiteSpalte" Width="160" IsEnabled="{Binding FormData.ChkNotizen}" Tag="NOTES" Text="{Binding FormData.Notizen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                            <CheckBox Canvas.Left="322" Canvas.Top="103" Height="16" Tag="False" IsChecked="{Binding FormData.ChkNotizen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkNotizenfeld" />
                         </Canvas>
                     </TabItem>
                 </TabControl>
-             
+
                 <Popup x:Name="PersonInfoPopup" PlacementTarget="{Binding ElementName=InfoImage}" Placement="Right" VerticalOffset="-50" HorizontalOffset="10" PopupAnimation="Fade" AllowsTransparency="True" SnapsToDevicePixels="False" HorizontalAlignment="Left" Margin="6,0,0,0">
                     <Border BorderBrush="Black" BorderThickness="3" Height="212" Width="239" CornerRadius="10" Padding="2" Background="AliceBlue">
                         <RichTextBox Background="AliceBlue" BorderBrush="AliceBlue">
                             <FlowDocument>
                                 <Paragraph TextAlignment="Center" FontSize="10pt">
-                                    Stylefile Information
+                                    <Run Text="Stylefile Information"/>
                                 </Paragraph>
                                 <Paragraph TextAlignment="Left"  FontSize="8pt">
-                                    Please select a style file, which will be used for rendering the layer!
+                                    <Run Text="Please select a style file, which will be used for rendering the layer!"/>
                                 </Paragraph>
                                 <Paragraph TextAlignment="Left"  FontSize="8pt">
-                                    If the style file is not loaded in the combobox, load the file into the Style Storage of ArcMap!
-                                            Therfore use the  menu 'Settings - Load Style file'!
+                                    <Run Text="If the style file is not loaded in the combobox, load the file into the Style Storage of ArcMap! Therfore use the menu 'Settings - Load Style file'!"/>
                                 </Paragraph>
                             </FlowDocument>
                         </RichTextBox>
@@ -496,19 +503,19 @@
                     <Label Content="{x:Static resx:Resource.lblStyle}" Height="19" x:Name="lblStyle" Margin="10,0,177,70" />
                     <ComboBox x:Name="cboStyleFile" FlowDirection="LeftToRight" Text="" Margin="10,19,45,51" />
                     <Image x:Name="InfoImage" Source="Skins/Images/info.png" Stretch="None" Width="16" Height="16" ToolTip="Erweiterte Informationen" SnapsToDevicePixels="True" MouseEnter="InfoImage_MouseEnter" MouseLeave="InfoImage_MouseLeave" Margin="322,19,10,54" />
-                    <CheckBox Content="{x:Static resx:Resource.chkFarbwerte}" x:Name="chkFarbwerte" IsChecked="{Binding Path=ChkFarbwerte, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Margin="10,42,126,31" />
-                    <CheckBox Content="{x:Static resx:Resource.chkAllowNullLegendNumber}" x:Name="chkAllowNullLegendNumber" IsChecked="{Binding Path=ChkAllowNullLegendNumber, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Margin="10,63,133,10" />
+                    <CheckBox Content="{x:Static resx:Resource.chkFarbwerte}" x:Name="chkFarbwerte" IsChecked="{Binding FormData.ChkFarbwerte, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10,42,126,31" />
+                    <CheckBox Content="{x:Static resx:Resource.chkAllowNullLegendNumber}" x:Name="chkAllowNullLegendNumber" IsChecked="{Binding FormData.ChkAllowNullLegendNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10,63,133,10" />
                 </Grid>
 
                 <StackPanel Margin="0,4,0,0" Width="309" Canvas.Left="6" Canvas.Top="531">
-                    <CheckBox  Content="{x:Static resx:Resource.chkSpatialQuery}" Height="18"  IsChecked="{Binding Path=ChkSpatialQuery, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Name="chkNurSichtbarerBereich" />
+                    <CheckBox  Content="{x:Static resx:Resource.chkSpatialQuery}" Height="18"  IsChecked="{Binding FormData.ChkSpatialQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="chkNurSichtbarerBereich" />
                     <StackPanel Orientation="Horizontal">
-                        <Label  Content="{x:Static resx:Resource.lblSpatialQueryId}" Name="lblID" />
-                        <TextBox Name="txtSpatialQueryId" Width="160" IsEnabled="{Binding ChkSpatialQuery}" Tag="GBANR" Text="{Binding SpatialQueryId, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay,ValidatesOnDataErrors=True}" />
+                        <Label  Content="{x:Static resx:Resource.lblSpatialQueryId}" x:Name="lblID" />
+                        <TextBox x:Name="txtSpatialQueryId" Width="160" IsEnabled="{Binding FormData.ChkSpatialQuery}" Tag="GBANR" Text="{Binding FormData.SpatialQueryId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
                     </StackPanel>
-                    <StackPanel Height="10"></StackPanel>
-                    <Label  Content="{x:Static resx:Resource.lblAttributeQuery}" Height="18" Name="lblAttributeQuery" />
-                    <TextBox Height="50" Name="txtAttributeQuery" TextWrapping="Wrap" Text="{Binding AttributeQuery, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" />
+                    <StackPanel Height="10"/>
+                    <Label  Content="{x:Static resx:Resource.lblAttributeQuery}" Height="18" x:Name="lblAttributeQuery" />
+                    <TextBox Height="50" x:Name="txtAttributeQuery" TextWrapping="Wrap" Text="{Binding FormData.AttributeQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" />
                 </StackPanel>
 
             </Canvas>
diff --git a/LegendGenerator.App/MainWindow.xaml.cs b/LegendGenerator.App/MainWindow.xaml.cs
index f8b0808..9ffbbe6 100644
--- a/LegendGenerator.App/MainWindow.xaml.cs
+++ b/LegendGenerator.App/MainWindow.xaml.cs
@@ -17,6 +17,7 @@
 using LegendGenerator.App.Utils;
 using System.Windows.Threading;
 using LegendGenerator.App.View;
+using LegendGenerator.App.ViewModel;
 using System.Linq;
 
 namespace LegendGenerator.App
@@ -40,8 +41,6 @@ public partial class MainWindow : Window
         LayoutCreator layoutCreator;
         protected AboutDialog aboutWindow;
 
-        private FormularData _formData;
-
         #region esri event member variables:
 
         //private ESRI.ArcGIS.ArcMapUI.IDocumentEvents_NewDocumentEventHandler m_DocumentEventNewDocument = null;
@@ -79,19 +78,17 @@ public bool CheckedGifExport
         }
 
         /// <summary>
-        /// Returns the cup of coffee ordered by the customer.
-        /// If this returns null, the user cancelled the order.
+        /// Returns the formdata model.
+        /// If this returns null, the user cancelled the input.
         /// </summary>
         public FormularData FormData
         {
             get
             {
-                return this._formData;
-            }
-            set
-            {
-                this. _formData = value;               
-            }
+                //return this._formData;                
+                MainViewModel viewmodel = (this.Resources["Locator"] as ViewModelLocator).Main;
+                return viewmodel.FormData;
+            }           
         }
 
         #endregion
@@ -103,11 +100,14 @@ public MainWindow()
             this._isInitializing = true;
             InitializeComponent();
             this._isInitializing = false;
-                       
-            string path = Path.Combine(Environment.CurrentDirectory, @"Data\FormData.xml");           
-            FormularData formData = ObjectXmlSerializer<FormularData>.Load(path);           
-            this.FormData = formData;
-            this.DataContext = this.FormData;
+            //this.DataContext = (App.Current.Resources["Locator"] as ViewModelLocator).Main;
+            this.DataContext = (this.Resources["Locator"] as ViewModelLocator).Main;
+           
+            //string folder = Environment.CurrentDirectory;
+            //string path = Path.Combine(folder, @"Data\FormData.xml");
+            //FormularData formData = ObjectXmlSerializer<FormularData>.Load(path);
+            //this.FormData = formData;
+            //this.DataContext = this.FormData;
         }
         
         public MainWindow(IApplication application)
@@ -120,6 +120,7 @@ public MainWindow(IApplication application)
             this._isInitializing = true;
             InitializeComponent();           
             this._isInitializing = false;
+            this.DataContext = (this.Resources["Locator"] as ViewModelLocator).Main;
 
             m_application = application;//?? throw new Exception("Hook helper is not initialized");//for the communication with the ArcGIS-Application!         
             layoutCreator = new LayoutCreator(this, m_application);//um auf die GIS-Methoden zugreifen zu können
@@ -138,11 +139,11 @@ public MainWindow(IApplication application)
             }
             Resource.Culture = new System.Globalization.CultureInfo(language);
            
-            string folder = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);         
-            string path = Path.Combine(folder, @"Data\FormData.xml");           
-            FormularData formData = ObjectXmlSerializer<FormularData>.Load(path);          
-            this.FormData = formData;
-            this.DataContext = this.FormData;
+            //string folder = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);         
+            //string path = Path.Combine(folder, @"Data\FormData.xml");           
+            //FormularData formData = ObjectXmlSerializer<FormularData>.Load(path);          
+            //this.FormData = formData;
+            //this.DataContext = this.FormData;
         }
 
         #endregion
@@ -347,107 +348,6 @@ private void BtnLoadSqlServerTables_Click(object sender, RoutedEventArgs e)
            
             wd.Close();
         }
-
-        private void MnuAppLoad_Click(object sender, RoutedEventArgs e)
-        {
-            Microsoft.Win32.OpenFileDialog oXml = new OpenFileDialog
-            {
-                Title = "Select XML-ConfigFile",
-                Filter = "XML (*.xml)|*.xml"
-            };
-            //oDlg.RestoreDirectory = true;
-            string dir = Environment.GetFolderPath(Environment.SpecialFolder.MyComputer);
-            oXml.InitialDirectory = dir;
-
-            // Show open file dialog box
-            Nullable<bool> result = oXml.ShowDialog();
-            if (result == true)
-            {
-                this.pfadKonfigurationsdatei = oXml.FileName.ToString();
-            }
-            // Load the form object from the existing XML file (if any)...
-            if (File.Exists(this.pfadKonfigurationsdatei) == true)
-            {
-                // Load the form object from the XML file using our custom class...
-                FormularData formdata = ObjectXmlSerializer<FormularData>.Load(this.pfadKonfigurationsdatei);
-
-                if (formdata == null)
-                {
-                    MessageBox.Show("Unable to load a formular data object from file '" + this.pfadKonfigurationsdatei + "'!", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-                else  // Load form properties into form data...
-                {
-                    //this.LoadCustomerIntoForm(formdata);
-                    this.FormData.DeepCopy(formdata);               
-                    this.Title = this.pfadKonfigurationsdatei;
-                }
-            }
-            else
-            {
-                MessageBox.Show(this.CreateFileDoesNotExistMsg(), "Information", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-        }
-
-        private void MnuAppSave_Click(object sender, RoutedEventArgs e)
-        {
-            if (File.Exists(this.pfadKonfigurationsdatei) == true)
-            {
-                // Create form object based on Form values.
-                FormularData formdata = this.FormData;// this.CreateFormularData();
-
-                //Save form object to XML file using our ObjectXMLSerializer class...
-                try
-                {
-                    ObjectXmlSerializer<FormularData>.Save(formdata, this.pfadKonfigurationsdatei);                    
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("Unable to save formular data object!" + Environment.NewLine + Environment.NewLine + ex.Message,
-                        "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-            else
-            {
-                this.MnuAppSaveNew_Click(sender, e);
-            }       
-            
-        }
-
-        //save as the projectfile:
-        private void MnuAppSaveNew_Click(object sender, RoutedEventArgs e)
-        {
-            Microsoft.Win32.SaveFileDialog sXml = new Microsoft.Win32.SaveFileDialog();
-            string dir = Environment.GetFolderPath(Environment.SpecialFolder.MyComputer);
-            sXml.InitialDirectory = dir;
-            sXml.Title = "Select a folder for creating a new projectfile!";
-            sXml.Filter = "XML (*.xml)|*.xml";
-
-            // pressed OK:
-            if (sXml.ShowDialog() == true)
-            {
-                this.pfadKonfigurationsdatei = sXml.FileName.ToString();                
-            }
-
-            //if (File.Exists(this.txtKonfigurationsdatei.Text))
-            if (this.pfadKonfigurationsdatei != String.Empty)
-            {
-                // Create customer object based on Form values.
-                FormularData formdata = this.FormData;//this.CreateFormularData();
-
-                //Save form object to XML file using our ObjectXMLSerializer class...
-                try
-                {
-                    ObjectXmlSerializer<FormularData>.Save(formdata, this.pfadKonfigurationsdatei);                                   
-                    this.Title = "Legend Generator 5.0 für ArcMap 10.0 - " + this.pfadKonfigurationsdatei;
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("Unable to save formular data object!" + Environment.NewLine + Environment.NewLine + ex.Message,
-                        "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-
-        }
               
         private void MnuAppClose_Click(object sender, RoutedEventArgs e)
         {
diff --git a/LegendGenerator.App/ViewModel/MainViewModel.cs b/LegendGenerator.App/ViewModel/MainViewModel.cs
new file mode 100644
index 0000000..af35c1c
--- /dev/null
+++ b/LegendGenerator.App/ViewModel/MainViewModel.cs
@@ -0,0 +1,201 @@
+using System;
+using System.IO;
+using GalaSoft.MvvmLight;
+using LegendGenerator.App.Model;
+using LegendGenerator.App.Utils;
+using System.Windows;
+using Microsoft.Win32;
+using GalaSoft.MvvmLight.CommandWpf;
+
+namespace LegendGenerator.App.ViewModel
+{
+    /// <summary>
+    /// This class contains properties that the main View can data bind to.
+    /// <para>
+    /// Use the <strong>mvvminpc</strong> snippet to add bindable properties to this ViewModel.
+    /// </para> 
+    /// </summary>
+    public class MainViewModel : ViewModelBase
+    {
+        #region fields
+
+        private string _title;
+        private string _pfadKonfigurationsdatei = String.Empty;//XML-Projektfile;
+        private FormularData _formData;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the MainViewModel class.
+        /// </summary>
+        public MainViewModel()
+        {
+            if (IsInDesignMode)
+            {
+                // Code runs in Blend --> create design time data.
+                FormularData formData = new FormularData();
+                formData.AccessDatabase = "DesignDatabase";
+                formData.TabAccess = true;
+                formData.ChkAccess = true;
+                this.FormData = formData;
+            }
+            else
+            {
+                // Code runs "for real"
+                //string folder = Environment.CurrentDirectory;
+                string folder = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+                string path = Path.Combine(folder, @"Data\FormData.xml");
+                FormularData formData = ObjectXmlSerializer<FormularData>.Load(path);
+                this.FormData = formData;
+
+                LoadProjectCommand = new RelayCommand(MnuAppLoad_Click);
+                SaveProjectCommand = new RelayCommand(MnuAppSave_Click);
+                SaveAsProjectCommand = new RelayCommand(MnuAppSaveNew_Click);
+            }
+        }
+
+        #region commands
+
+        public RelayCommand LoadProjectCommand { get; private set; }
+        public RelayCommand SaveProjectCommand { get; private set; }
+        public RelayCommand SaveAsProjectCommand { get; private set; }
+
+        #endregion
+
+        public FormularData FormData
+        {
+            get
+            {
+                return this._formData;               
+            }
+            set
+            {
+                this._formData = value;
+                base.RaisePropertyChanged("FormData");
+            }
+        }
+
+        public string Title
+        {
+            get { return this._title; }
+            set
+            {
+                this._title = value;
+                base.RaisePropertyChanged("Title");
+            }
+        }
+        
+        private void MnuAppLoad_Click()
+        {
+            Microsoft.Win32.OpenFileDialog oXml = new OpenFileDialog
+            {
+                Title = "Select XML-ConfigFile",
+                Filter = "XML (*.xml)|*.xml"
+            };
+            //oDlg.RestoreDirectory = true;
+            string dir = Environment.GetFolderPath(Environment.SpecialFolder.MyComputer);
+            oXml.InitialDirectory = dir;
+
+            // Show open file dialog box
+            Nullable<bool> result = oXml.ShowDialog();
+            if (result == true)
+            {
+                this._pfadKonfigurationsdatei = oXml.FileName.ToString();
+            }
+            // Load the form object from the existing XML file (if any)...
+            if (File.Exists(this._pfadKonfigurationsdatei) == true)
+            {
+                // Load the form object from the XML file using our custom class...
+                FormularData formdata = ObjectXmlSerializer<FormularData>.Load(this._pfadKonfigurationsdatei);
+
+                if (formdata == null)
+                {
+                    MessageBox.Show("Unable to load a formular data object from file '" + this._pfadKonfigurationsdatei + "'!", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                else  // Load form properties into form data...
+                {
+                    //this.LoadCustomerIntoForm(formdata);
+                    this.FormData.DeepCopy(formdata);                   
+                    //this.FormData = formdata;
+                    this.Title = this._pfadKonfigurationsdatei;
+                }
+            }
+            else
+            {
+                MessageBox.Show(this.CreateFileDoesNotExistMsg(), "Information", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
+        private void MnuAppSave_Click()
+        {
+            if (File.Exists(this._pfadKonfigurationsdatei) == true)
+            {
+                // Create form object based on Form values.
+                FormularData formdata = this.FormData;// this.CreateFormularData();
+
+                //Save form object to XML file using our ObjectXMLSerializer class...
+                try
+                {
+                    ObjectXmlSerializer<FormularData>.Save(formdata, this._pfadKonfigurationsdatei);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Unable to save formular data object!" + Environment.NewLine + Environment.NewLine + ex.Message,
+                        "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+            else
+            {
+                this.MnuAppSaveNew_Click();
+            }
+
+        }
+
+        //save as the projectfile:
+        private void MnuAppSaveNew_Click()
+        {
+            Microsoft.Win32.SaveFileDialog sXml = new Microsoft.Win32.SaveFileDialog();
+            string dir = Environment.GetFolderPath(Environment.SpecialFolder.MyComputer);
+            sXml.InitialDirectory = dir;
+            sXml.Title = "Select a folder for creating a new projectfile!";
+            sXml.Filter = "XML (*.xml)|*.xml";
+
+            // pressed OK:
+            if (sXml.ShowDialog() == true)
+            {
+                this._pfadKonfigurationsdatei = sXml.FileName.ToString();
+            }
+
+            //if (File.Exists(this.txtKonfigurationsdatei.Text))
+            if (this._pfadKonfigurationsdatei != String.Empty)
+            {
+                // Create customer object based on Form values.
+                FormularData formdata = this.FormData;//this.CreateFormularData();
+
+                //Save form object to XML file using our ObjectXMLSerializer class...
+                try
+                {
+                    ObjectXmlSerializer<FormularData>.Save(formdata, this._pfadKonfigurationsdatei);
+                    this.Title = "Legend Generator 5.0 für ArcMap 10.0 - " + this._pfadKonfigurationsdatei;
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Unable to save formular data object!" + Environment.NewLine + Environment.NewLine + ex.Message,
+                        "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+
+        }
+
+        #region private helper methods
+
+        private string CreateFileDoesNotExistMsg()
+        {
+            return "The example XML file '" + _pfadKonfigurationsdatei + "' does not exist." + "\n\n" +
+            "To create the example XML file, enter formular data details, then click the 'Save' button.";
+        }          
+
+        #endregion                
+
+    }
+}
\ No newline at end of file
diff --git a/LegendGenerator.App/ViewModel/ViewModelLocator.cs b/LegendGenerator.App/ViewModel/ViewModelLocator.cs
new file mode 100644
index 0000000..65af3cc
--- /dev/null
+++ b/LegendGenerator.App/ViewModel/ViewModelLocator.cs
@@ -0,0 +1,56 @@
+/*
+  In App.xaml:
+  <Application.Resources>
+      <vm:ViewModelLocator xmlns:vm="clr-namespace:LegendGenerator.App"
+                           x:Key="Locator" />
+  </Application.Resources>
+  
+  In the View:
+  DataContext="{Binding Source={StaticResource Locator}, Path=ViewModelName}"
+*/
+
+using GalaSoft.MvvmLight.Ioc;
+using Microsoft.Practices.ServiceLocation;
+namespace LegendGenerator.App.ViewModel
+{
+    /// <summary>
+    /// This class contains static references to all the view models in the
+    /// application and provides an entry point for the bindings.
+    /// </summary>
+    public class ViewModelLocator
+    {
+        /// <summary>
+        /// Initializes a new instance of the ViewModelLocator class.
+        /// </summary>
+        public ViewModelLocator()
+        {
+            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
+
+            ////if (ViewModelBase.IsInDesignModeStatic)
+            ////{
+            ////    // Create design time view services and models
+            ////    SimpleIoc.Default.Register<IDataService, DesignDataService>();
+            ////}
+            ////else
+            ////{
+            ////    // Create run time view services and models
+            ////    SimpleIoc.Default.Register<IDataService, DataService>();
+            ////}
+
+            SimpleIoc.Default.Register<MainViewModel>(true);
+        }
+
+        public MainViewModel Main
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MainViewModel>();
+            }
+        }
+        
+        public static void Cleanup()
+        {
+            // TODO Clear the ViewModels
+        }
+    }
+}
\ No newline at end of file
diff --git a/LegendGenerator.App/app.config b/LegendGenerator.App/app.config
index 8747823..7187772 100644
--- a/LegendGenerator.App/app.config
+++ b/LegendGenerator.App/app.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/LegendGenerator.App/packages.config b/LegendGenerator.App/packages.config
index 6d46893..76ca171 100644
--- a/LegendGenerator.App/packages.config
+++ b/LegendGenerator.App/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
+  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net45" />
   <package id="WPFFolderBrowser" version="1.0.2" targetFramework="net35" />
 </packages>
\ No newline at end of file

From 3e21c51a84e4748de2fdbcf579a08e4aa7b63289 Mon Sep 17 00:00:00 2001
From: kaimbacher <arno.kaimbacher@hotmail.de>
Date: Fri, 2 Feb 2018 09:54:53 +0100
Subject: [PATCH 2/3] - porting help views to mvvm

---
 .../LegendGenerator.App.csproj                | 40 ++++++----
 LegendGenerator.App/MainWindow.xaml.cs        |  4 +-
 .../Skins/ViewDataTemplates.xaml              | 23 ++++++
 ...ratorCopyright.xaml => CopyrightView.xaml} |  2 +-
 ...opyright.xaml.cs => CopyrightView.xaml.cs} |  4 +-
 LegendGenerator.App/View/Help/HelpWindow.xaml | 68 +++++++++++++++++
 .../View/Help/HelpWindow.xaml.cs              | 57 ++++++++++++++
 .../View/Help/LegendGeneratorHelp.xaml        | 32 --------
 .../View/Help/LegendGeneratorHelp.xaml.cs     | 59 --------------
 ...neratorOverView.xaml => OverviewView.xaml} |  2 +-
 ...rOverView.xaml.cs => OverviewView.xaml.cs} |  4 +-
 ...gendGeneratorXpsHelp.xaml => XpsHelp.xaml} |  2 +-
 ...neratorXpsHelp.xaml.cs => XpsHelp.xaml.cs} |  4 +-
 ...GeneratorXpsHelpEn.xaml => XpsHelpEn.xaml} |  2 +-
 ...torXpsHelpEn.xaml.cs => XpsHelpEn.xaml.cs} |  4 +-
 .../ViewModel/Help/CopyrightViewModel.cs      | 29 +++++++
 .../ViewModel/Help/HelpViewModel.cs           | 76 +++++++++++++++++++
 .../ViewModel/Help/OverviewViewModel.cs       | 29 +++++++
 .../ViewModel/Help/XpsHelpEnViewModel.cs      | 29 +++++++
 .../ViewModel/Help/XpsHelpViewModel.cs        | 29 +++++++
 .../ViewModel/ViewModelLocator.cs             | 19 ++++-
 LegendGenerator.App/ViewModel/ViewVM.cs       | 41 ++++++++++
 22 files changed, 437 insertions(+), 122 deletions(-)
 create mode 100644 LegendGenerator.App/Skins/ViewDataTemplates.xaml
 rename LegendGenerator.App/View/Help/{LegendGeneratorCopyright.xaml => CopyrightView.xaml} (97%)
 rename LegendGenerator.App/View/Help/{LegendGeneratorCopyright.xaml.cs => CopyrightView.xaml.cs} (70%)
 create mode 100644 LegendGenerator.App/View/Help/HelpWindow.xaml
 create mode 100644 LegendGenerator.App/View/Help/HelpWindow.xaml.cs
 delete mode 100644 LegendGenerator.App/View/Help/LegendGeneratorHelp.xaml
 delete mode 100644 LegendGenerator.App/View/Help/LegendGeneratorHelp.xaml.cs
 rename LegendGenerator.App/View/Help/{LegendGeneratorOverView.xaml => OverviewView.xaml} (98%)
 rename LegendGenerator.App/View/Help/{LegendGeneratorOverView.xaml.cs => OverviewView.xaml.cs} (71%)
 rename LegendGenerator.App/View/Help/{LegendGeneratorXpsHelp.xaml => XpsHelp.xaml} (96%)
 rename LegendGenerator.App/View/Help/{LegendGeneratorXpsHelp.xaml.cs => XpsHelp.xaml.cs} (97%)
 rename LegendGenerator.App/View/Help/{LegendGeneratorXpsHelpEn.xaml => XpsHelpEn.xaml} (96%)
 rename LegendGenerator.App/View/Help/{LegendGeneratorXpsHelpEn.xaml.cs => XpsHelpEn.xaml.cs} (97%)
 create mode 100644 LegendGenerator.App/ViewModel/Help/CopyrightViewModel.cs
 create mode 100644 LegendGenerator.App/ViewModel/Help/HelpViewModel.cs
 create mode 100644 LegendGenerator.App/ViewModel/Help/OverviewViewModel.cs
 create mode 100644 LegendGenerator.App/ViewModel/Help/XpsHelpEnViewModel.cs
 create mode 100644 LegendGenerator.App/ViewModel/Help/XpsHelpViewModel.cs
 create mode 100644 LegendGenerator.App/ViewModel/ViewVM.cs

diff --git a/LegendGenerator.App/LegendGenerator.App.csproj b/LegendGenerator.App/LegendGenerator.App.csproj
index c022182..f7810b7 100644
--- a/LegendGenerator.App/LegendGenerator.App.csproj
+++ b/LegendGenerator.App/LegendGenerator.App.csproj
@@ -135,10 +135,16 @@
     <Compile Include="Utils\CustomStringToColorConverter.cs" />
     <Compile Include="Utils\NotifyBase.cs" />
     <Compile Include="Utils\ValidationAttribute.cs" />
+    <Compile Include="ViewModel\Help\XpsHelpEnViewModel.cs" />
+    <Compile Include="ViewModel\Help\XpsHelpViewModel.cs" />
+    <Compile Include="ViewModel\Help\HelpViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
+    <Compile Include="ViewModel\Help\CopyrightViewModel.cs" />
+    <Compile Include="ViewModel\Help\OverviewViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
-    <Compile Include="View\Help\LegendGeneratorXpsHelpEn.xaml.cs">
-      <DependentUpon>LegendGeneratorXpsHelpEn.xaml</DependentUpon>
+    <Compile Include="ViewModel\ViewVM.cs" />
+    <Compile Include="View\Help\XpsHelpEn.xaml.cs">
+      <DependentUpon>XpsHelpEn.xaml</DependentUpon>
     </Compile>
     <Compile Include="Model\FormularData.cs" />
     <Compile Include="Model\IDataService.cs" />
@@ -161,23 +167,23 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Help\LegendGeneratorCopyright.xaml">
+    <Page Include="View\Help\CopyrightView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Help\LegendGeneratorHelp.xaml">
+    <Page Include="View\Help\HelpWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Help\LegendGeneratorOverView.xaml">
+    <Page Include="View\Help\OverviewView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Help\LegendGeneratorXpsHelp.xaml">
+    <Page Include="View\Help\XpsHelp.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Help\LegendGeneratorXpsHelpEn.xaml">
+    <Page Include="View\Help\XpsHelpEn.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -185,6 +191,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Skins\ViewDataTemplates.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\ProgressDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -207,17 +217,17 @@
     <Compile Include="View\FortlaufendeNrDialog.xaml.cs">
       <DependentUpon>FortlaufendeNrDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Help\LegendGeneratorCopyright.xaml.cs">
-      <DependentUpon>LegendGeneratorCopyright.xaml</DependentUpon>
+    <Compile Include="View\Help\CopyrightView.xaml.cs">
+      <DependentUpon>CopyrightView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Help\LegendGeneratorHelp.xaml.cs">
-      <DependentUpon>LegendGeneratorHelp.xaml</DependentUpon>
+    <Compile Include="View\Help\HelpWindow.xaml.cs">
+      <DependentUpon>HelpWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Help\LegendGeneratorOverView.xaml.cs">
-      <DependentUpon>LegendGeneratorOverView.xaml</DependentUpon>
+    <Compile Include="View\Help\OverviewView.xaml.cs">
+      <DependentUpon>OverviewView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Help\LegendGeneratorXpsHelp.xaml.cs">
-      <DependentUpon>LegendGeneratorXpsHelp.xaml</DependentUpon>
+    <Compile Include="View\Help\XpsHelp.xaml.cs">
+      <DependentUpon>XpsHelp.xaml</DependentUpon>
     </Compile>
     <Compile Include="LayoutCreator.cs" />
     <Compile Include="MainWindow.xaml.cs">
diff --git a/LegendGenerator.App/MainWindow.xaml.cs b/LegendGenerator.App/MainWindow.xaml.cs
index 9ffbbe6..5b9d4bd 100644
--- a/LegendGenerator.App/MainWindow.xaml.cs
+++ b/LegendGenerator.App/MainWindow.xaml.cs
@@ -531,10 +531,10 @@ private void ChkSpracheEnglisch_Unchecked(object sender, RoutedEventArgs e)
             
         private void MnuAppHelp_Click(object sender, RoutedEventArgs e)
         {
-            LegendGeneratorHelp lgh = null;
+            HelpWindow lgh = null;
             try
             {
-                lgh = new LegendGeneratorHelp
+                lgh = new HelpWindow
                 {
                     //lgh.ShowDialog();//modal, aber bei der Hilfe nicht erwünscht!             
                     Owner = this
diff --git a/LegendGenerator.App/Skins/ViewDataTemplates.xaml b/LegendGenerator.App/Skins/ViewDataTemplates.xaml
new file mode 100644
index 0000000..7c1db88
--- /dev/null
+++ b/LegendGenerator.App/Skins/ViewDataTemplates.xaml
@@ -0,0 +1,23 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"                 
+                     xmlns:vm="clr-namespace:LegendGenerator.App.ViewModel"
+                     xmlns:viewn="clr-namespace:LegendGenerator.App.View.Help">
+
+   
+    <DataTemplate DataType="{x:Type vm:OverviewViewModel}">     
+            <viewn:OverviewView />    
+    </DataTemplate>
+    
+    <DataTemplate DataType="{x:Type vm:CopyrightViewModel}">       
+            <viewn:CopyrightView />       
+    </DataTemplate>
+
+    <DataTemplate DataType="{x:Type vm:XpsHelpViewModel}">
+        <viewn:XpsHelp />
+    </DataTemplate>
+
+    <DataTemplate DataType="{x:Type vm:XpsHelpEnViewModel}">
+        <viewn:XpsHelpEn />
+    </DataTemplate>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorCopyright.xaml b/LegendGenerator.App/View/Help/CopyrightView.xaml
similarity index 97%
rename from LegendGenerator.App/View/Help/LegendGeneratorCopyright.xaml
rename to LegendGenerator.App/View/Help/CopyrightView.xaml
index d344d47..4a5c881 100644
--- a/LegendGenerator.App/View/Help/LegendGeneratorCopyright.xaml
+++ b/LegendGenerator.App/View/Help/CopyrightView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class=" LegendGenerator.App.View.Help.LegendGeneratorCopyright"
+<UserControl x:Class=" LegendGenerator.App.View.Help.CopyrightView"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"	   
 	    Width="520" Height="581"
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorCopyright.xaml.cs b/LegendGenerator.App/View/Help/CopyrightView.xaml.cs
similarity index 70%
rename from LegendGenerator.App/View/Help/LegendGeneratorCopyright.xaml.cs
rename to LegendGenerator.App/View/Help/CopyrightView.xaml.cs
index e074192..fd6aa5a 100644
--- a/LegendGenerator.App/View/Help/LegendGeneratorCopyright.xaml.cs
+++ b/LegendGenerator.App/View/Help/CopyrightView.xaml.cs
@@ -6,9 +6,9 @@ namespace LegendGenerator.App.View.Help
     /// <summary>
     /// Interaktionslogik für LegendGeneratorCopyright.xaml
     /// </summary>
-    public partial class LegendGeneratorCopyright : UserControl
+    public partial class CopyrightView : UserControl
     {
-        public LegendGeneratorCopyright()
+        public CopyrightView()
         {
             InitializeComponent();
         }
diff --git a/LegendGenerator.App/View/Help/HelpWindow.xaml b/LegendGenerator.App/View/Help/HelpWindow.xaml
new file mode 100644
index 0000000..2af0e82
--- /dev/null
+++ b/LegendGenerator.App/View/Help/HelpWindow.xaml
@@ -0,0 +1,68 @@
+<Window x:Class=" LegendGenerator.App.View.Help.HelpWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	    Title="LegendGenerator Help"                
+	    Height="765" Width="1000"
+	    ShowInTaskbar="False" 
+	    WindowStartupLocation="CenterScreen"
+        xmlns:resx="clr-namespace:LegendGenerator.App.Resources"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        mc:Ignorable="d" 
+        xmlns:vm="clr-namespace:LegendGenerator.App.ViewModel"
+	    Foreground="Blue" Icon="/LegendGenerator.App;component/Skins/Images/gba.png" >
+    
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>              
+                <ResourceDictionary Source="/LegendGenerator.App;component/Skins/ViewDataTemplates.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+                        
+            <!-- WIZARD STEP TEMPLATE -->
+            <DataTemplate x:Key="wizardStepTemplate">
+                <Border x:Name="bdOuter" BorderBrush="Black" BorderThickness="0,0,1,1" CornerRadius="12" Margin="1,1,1,12" Opacity="0.25" SnapsToDevicePixels="True">
+                    <!--<Border x:Name="bdInner" Background="#FFFEFEFE" BorderBrush="Brown" BorderThickness="2,2,1,1" CornerRadius="12" Padding="2">-->
+                        <TextBlock x:Name="txt" Margin="2,2,2,2" Text="{Binding Path=DisplayName}"></TextBlock>
+                    <!--</Border>-->
+                </Border>
+              
+                <DataTemplate.Triggers>
+                    <DataTrigger Binding="{Binding Path=IsCurrentPage}" Value="True">
+                        <Setter TargetName="txt" Property="FontWeight" Value="Bold" />
+                        <!--<Setter TargetName="bdInner" Property="Background" Value="BurlyWood" />-->
+                        <Setter TargetName="bdOuter" Property="Opacity" Value="1" />
+                    </DataTrigger>
+                </DataTemplate.Triggers>
+            </DataTemplate>
+            
+            <!--Global View Model Locator-->
+            <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Window.Content>
+        <Grid>            
+            <Grid.ColumnDefinitions>                
+                <ColumnDefinition Width="20*" />                
+                <ColumnDefinition Width="Auto" />                
+                <ColumnDefinition Width="80*" />                
+            </Grid.ColumnDefinitions>
+
+            <!--<TreeView x:Name="tree" FontSize="10pt" SelectedItemChanged="HelponselectedItemChanged">
+                <TreeViewItem Header="Copyright Information" Tag="LegendGeneratorCopyright"/>
+                <TreeViewItem Header="Program Overview" Tag="LegendGeneratorOverView" />              
+                <TreeViewItem Header="User Manual" Tag="LegendGeneratorXpsHelp"/>
+                <TreeViewItem Header="English User Manual" Tag="LegendGeneratorXpsHelpEn" IsSelected="True"/>
+            </TreeView>-->
+            <!-- WIZARD STEP LISTING -->
+            <HeaderedContentControl x:Name="tree">
+                <ListBox ItemsSource="{Binding Path=Views}" ItemTemplate="{StaticResource wizardStepTemplate}" SelectedItem="{Binding SelectedView, Mode=TwoWay}" >
+                </ListBox>
+            </HeaderedContentControl>
+
+            <GridSplitter Grid.Column="1" Width="6" HorizontalAlignment="Center" VerticalAlignment="Stretch" />
+
+            <ContentControl Name="frame" Grid.Column="2" Content="{Binding Path=SelectedView, Mode=TwoWay}" />            
+        </Grid>        
+    </Window.Content>    
+</Window>
diff --git a/LegendGenerator.App/View/Help/HelpWindow.xaml.cs b/LegendGenerator.App/View/Help/HelpWindow.xaml.cs
new file mode 100644
index 0000000..5a93a85
--- /dev/null
+++ b/LegendGenerator.App/View/Help/HelpWindow.xaml.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+using System.Reflection;
+using LegendGenerator.App.ViewModel;
+
+namespace LegendGenerator.App.View.Help
+{
+    /// <summary>
+    /// Interaktionslogik für LegendGeneratorHelp.xaml
+    /// </summary>
+    public partial class HelpWindow : Window
+    {       
+        private Dictionary<string, UserControl> _userControls = new Dictionary<string, UserControl>();
+
+        public HelpWindow()
+        {            
+            InitializeComponent();            
+            this.DataContext = (this.Resources["Locator"] as ViewModelLocator).Help;
+
+            //List<string> userControlKeys = new List<string>();
+            //userControlKeys.Add("LegendGeneratorCopyright");
+            //userControlKeys.Add("LegendGeneratorOverView");           
+            // userControlKeys.Add("LegendGeneratorXpsHelp");
+            //userControlKeys.Add("LegendGeneratorXpsHelpEn");
+
+            //Type type = this.GetType();
+            //Assembly assembly = type.Assembly;
+            //foreach (string userControlKey in userControlKeys)
+            //{
+            //    string userControlFullName = String.Format("{0}.{1}", type.Namespace, userControlKey);
+            //    UserControl userControl = (UserControl)assembly.CreateInstance(userControlFullName);
+            //    _userControls.Add(userControlKey, userControl);
+            //}
+
+
+            //TreeViewItem item = (TreeViewItem)tree.SelectedItem;           
+            //this.frame.Content = _userControls[item.Tag.ToString()];
+        }
+
+        //private void HelponselectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        //{
+        //    if (_isInitializing == false)
+        //    {
+        //    TreeViewItem item = (TreeViewItem)tree.SelectedItem;
+        //    //this.frame.Source = new Uri(item.Tag.ToString(), UriKind.RelativeOrAbsolute);
+        //    this.frame.Content = _userControls[item.Tag.ToString()];
+        //    }
+        //}
+
+      
+
+        
+    }
+}
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorHelp.xaml b/LegendGenerator.App/View/Help/LegendGeneratorHelp.xaml
deleted file mode 100644
index cc3b0b9..0000000
--- a/LegendGenerator.App/View/Help/LegendGeneratorHelp.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Window x:Class=" LegendGenerator.App.View.Help.LegendGeneratorHelp"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	    Title="LegendGenerator Help"                
-	    Height="765" Width="1000"
-	    ShowInTaskbar="False" 
-	    WindowStartupLocation="CenterScreen"
-	    Foreground="Blue" Icon="/LegendGenerator.App;component/Skins/Images/gba.png" >    	     
-
-   
-    <Window.Content >        
-        <Grid >            
-            <Grid.ColumnDefinitions>                
-                <ColumnDefinition Width="20*" />                
-                <ColumnDefinition Width="Auto" />                
-                <ColumnDefinition Width="80*" />                
-            </Grid.ColumnDefinitions>
-
-            <TreeView x:Name="tree" FontSize="10pt" SelectedItemChanged="HelponselectedItemChanged">
-                <TreeViewItem Header="Copyright Information" Tag="LegendGeneratorCopyright"/>
-                <TreeViewItem Header="Program Overview" Tag="LegendGeneratorOverView" />
-                <!--<TreeViewItem Header="Online Manual" Tag="LegendGeneratorOnlineHelp" />-->
-                <TreeViewItem Header="User Manual" Tag="LegendGeneratorXpsHelp"/>
-                <TreeViewItem Header="English User Manual" Tag="LegendGeneratorXpsHelpEn" IsSelected="True"/>
-            </TreeView>        	 
-            
-            <GridSplitter Grid.Column="1" Width="6" HorizontalAlignment="Center" VerticalAlignment="Stretch" />
-
-            <ContentControl Name="frame" Grid.Column="2" />            
-        </Grid>        
-    </Window.Content>    
-</Window>
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorHelp.xaml.cs b/LegendGenerator.App/View/Help/LegendGeneratorHelp.xaml.cs
deleted file mode 100644
index 7d4ccf6..0000000
--- a/LegendGenerator.App/View/Help/LegendGeneratorHelp.xaml.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Navigation;
-using System.Reflection;
-
-namespace LegendGenerator.App.View.Help
-{
-    /// <summary>
-    /// Interaktionslogik für LegendGeneratorHelp.xaml
-    /// </summary>
-    public partial class LegendGeneratorHelp : Window
-    {
-        private bool _isInitializing = false;
-        private Dictionary<string, UserControl> _userControls = new Dictionary<string, UserControl>();
-
-        public LegendGeneratorHelp()
-        {
-            this._isInitializing = true;
-            InitializeComponent();
-            this._isInitializing = false;
-
-            List<string> userControlKeys = new List<string>();
-            userControlKeys.Add("LegendGeneratorCopyright");
-            userControlKeys.Add("LegendGeneratorOverView");           
-             userControlKeys.Add("LegendGeneratorXpsHelp");
-            userControlKeys.Add("LegendGeneratorXpsHelpEn");
-           
-            Type type = this.GetType();
-            Assembly assembly = type.Assembly;
-            foreach (string userControlKey in userControlKeys)
-            {
-                string userControlFullName = String.Format("{0}.{1}", type.Namespace, userControlKey);
-                UserControl userControl = (UserControl)assembly.CreateInstance(userControlFullName);
-                _userControls.Add(userControlKey, userControl);
-            }
-
-
-            TreeViewItem item = (TreeViewItem)tree.SelectedItem;
-            //this.frame.Source = new Uri(item.Tag.ToString(), UriKind.RelativeOrAbsolute);
-            this.frame.Content = _userControls[item.Tag.ToString()];
-        }
-
-        private void HelponselectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
-            if (_isInitializing == false)
-            {
-            TreeViewItem item = (TreeViewItem)tree.SelectedItem;
-            //this.frame.Source = new Uri(item.Tag.ToString(), UriKind.RelativeOrAbsolute);
-            this.frame.Content = _userControls[item.Tag.ToString()];
-            }
-        }
-
-      
-
-        
-    }
-}
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorOverView.xaml b/LegendGenerator.App/View/Help/OverviewView.xaml
similarity index 98%
rename from LegendGenerator.App/View/Help/LegendGeneratorOverView.xaml
rename to LegendGenerator.App/View/Help/OverviewView.xaml
index 4515c31..1e2a652 100644
--- a/LegendGenerator.App/View/Help/LegendGeneratorOverView.xaml
+++ b/LegendGenerator.App/View/Help/OverviewView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class=" LegendGenerator.App.View.Help.LegendGeneratorOverView"
+<UserControl x:Class=" LegendGenerator.App.View.Help.OverviewView"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorOverView.xaml.cs b/LegendGenerator.App/View/Help/OverviewView.xaml.cs
similarity index 71%
rename from LegendGenerator.App/View/Help/LegendGeneratorOverView.xaml.cs
rename to LegendGenerator.App/View/Help/OverviewView.xaml.cs
index 2a809cd..876f6a5 100644
--- a/LegendGenerator.App/View/Help/LegendGeneratorOverView.xaml.cs
+++ b/LegendGenerator.App/View/Help/OverviewView.xaml.cs
@@ -6,9 +6,9 @@ namespace LegendGenerator.App.View.Help
     /// <summary>
     /// Interaktionslogik für LegendGeneratorOverView.xaml
     /// </summary>
-    public partial class LegendGeneratorOverView : UserControl
+    public partial class OverviewView : UserControl
     {
-        public LegendGeneratorOverView()
+        public OverviewView()
         {
             InitializeComponent();
         }
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorXpsHelp.xaml b/LegendGenerator.App/View/Help/XpsHelp.xaml
similarity index 96%
rename from LegendGenerator.App/View/Help/LegendGeneratorXpsHelp.xaml
rename to LegendGenerator.App/View/Help/XpsHelp.xaml
index f5d940f..3de023c 100644
--- a/LegendGenerator.App/View/Help/LegendGeneratorXpsHelp.xaml
+++ b/LegendGenerator.App/View/Help/XpsHelp.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class=" LegendGenerator.App.View.Help.LegendGeneratorXpsHelp"
+<UserControl x:Class=" LegendGenerator.App.View.Help.XpsHelp"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorXpsHelp.xaml.cs b/LegendGenerator.App/View/Help/XpsHelp.xaml.cs
similarity index 97%
rename from LegendGenerator.App/View/Help/LegendGeneratorXpsHelp.xaml.cs
rename to LegendGenerator.App/View/Help/XpsHelp.xaml.cs
index d8f1c7b..c6fee9b 100644
--- a/LegendGenerator.App/View/Help/LegendGeneratorXpsHelp.xaml.cs
+++ b/LegendGenerator.App/View/Help/XpsHelp.xaml.cs
@@ -13,11 +13,11 @@ namespace LegendGenerator.App.View.Help
     /// <summary>
     /// Interaktionslogik für LegendGeneratorXpsHelp.xaml
     /// </summary>
-    public partial class LegendGeneratorXpsHelp : UserControl
+    public partial class XpsHelp : UserControl
     {
         XpsDocument doc;
 
-        public LegendGeneratorXpsHelp()
+        public XpsHelp()
         {
             InitializeComponent();
         }
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorXpsHelpEn.xaml b/LegendGenerator.App/View/Help/XpsHelpEn.xaml
similarity index 96%
rename from LegendGenerator.App/View/Help/LegendGeneratorXpsHelpEn.xaml
rename to LegendGenerator.App/View/Help/XpsHelpEn.xaml
index 1d65e4c..b0fab91 100644
--- a/LegendGenerator.App/View/Help/LegendGeneratorXpsHelpEn.xaml
+++ b/LegendGenerator.App/View/Help/XpsHelpEn.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class=" LegendGenerator.App.View.Help.LegendGeneratorXpsHelpEn"
+<UserControl x:Class=" LegendGenerator.App.View.Help.XpsHelpEn"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/LegendGenerator.App/View/Help/LegendGeneratorXpsHelpEn.xaml.cs b/LegendGenerator.App/View/Help/XpsHelpEn.xaml.cs
similarity index 97%
rename from LegendGenerator.App/View/Help/LegendGeneratorXpsHelpEn.xaml.cs
rename to LegendGenerator.App/View/Help/XpsHelpEn.xaml.cs
index a843086..84e57a0 100644
--- a/LegendGenerator.App/View/Help/LegendGeneratorXpsHelpEn.xaml.cs
+++ b/LegendGenerator.App/View/Help/XpsHelpEn.xaml.cs
@@ -13,11 +13,11 @@ namespace LegendGenerator.App.View.Help
     /// <summary>
     /// Interaktionslogik für LegendGeneratorXpsHelpEn.xaml
     /// </summary>
-    public partial class LegendGeneratorXpsHelpEn : UserControl
+    public partial class XpsHelpEn : UserControl
     {
        XpsDocument doc;
 
-        public LegendGeneratorXpsHelpEn()
+        public XpsHelpEn()
         {
             InitializeComponent();
         }
diff --git a/LegendGenerator.App/ViewModel/Help/CopyrightViewModel.cs b/LegendGenerator.App/ViewModel/Help/CopyrightViewModel.cs
new file mode 100644
index 0000000..2025e69
--- /dev/null
+++ b/LegendGenerator.App/ViewModel/Help/CopyrightViewModel.cs
@@ -0,0 +1,29 @@
+
+namespace LegendGenerator.App.ViewModel
+{
+    /// <summary>
+    /// This class contains properties that a View can data bind to.
+    /// <para>
+    /// See http://www.galasoft.ch/mvvm
+    /// </para>
+    /// </summary>
+    public class CopyrightViewModel : ViewVM
+    {      
+        /// <summary>
+        /// Initializes a new instance of the OverviewViewModel class.
+        /// </summary>
+        public CopyrightViewModel()
+        {
+        }
+
+        public override string DisplayName
+        {
+            get
+            {
+                return "Copyright";
+            }
+        }
+
+       
+    }
+}
\ No newline at end of file
diff --git a/LegendGenerator.App/ViewModel/Help/HelpViewModel.cs b/LegendGenerator.App/ViewModel/Help/HelpViewModel.cs
new file mode 100644
index 0000000..fbde0ea
--- /dev/null
+++ b/LegendGenerator.App/ViewModel/Help/HelpViewModel.cs
@@ -0,0 +1,76 @@
+using GalaSoft.MvvmLight;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Microsoft.Practices.ServiceLocation;
+
+namespace LegendGenerator.App.ViewModel
+{
+    /// <summary>
+    /// This class contains properties that a View can data bind to.  
+    /// </summary>
+    public class HelpViewModel : ViewModelBase
+    {
+        private ViewVM _currentView;
+        private ReadOnlyCollection<ViewVM> _views;
+
+        /// <summary>
+        /// Initializes a new instance of the HelpViewModel class.
+        /// </summary>
+        public HelpViewModel()
+        {
+            this.CreateSubViews();
+            SelectedView = this.Views[0];
+        }
+
+        public ViewVM SelectedView
+        {
+            get { return _currentView; }
+            set
+            {
+                if (_currentView != null)
+                {
+                    _currentView.IsCurrentPage = false;
+                }
+                Set(ref _currentView, value);
+                _currentView.IsCurrentPage = true;
+            }
+        }
+
+        /// <summary>
+        /// Returns a read-only collection of all page ViewModels.
+        /// </summary>
+        public ReadOnlyCollection<ViewVM> Views
+        {
+            get
+            {
+                if (_views == null)
+                {
+                    this.CreateSubViews();
+                }
+                return _views;
+            }
+        }
+
+        #region Private Helpers
+
+        private void CreateSubViews()
+        {
+
+            var views = new List<ViewVM>();
+            var copyrightViewModel = ServiceLocator.Current.GetInstance<CopyrightViewModel>();
+            views.Add(copyrightViewModel);
+            var welcomeViewModel = ServiceLocator.Current.GetInstance<OverviewViewModel>();
+            views.Add(welcomeViewModel);
+            var xpsHelpViewModel = ServiceLocator.Current.GetInstance<XpsHelpViewModel>();
+            views.Add(xpsHelpViewModel);
+            var xpsHelpEnViewModel = ServiceLocator.Current.GetInstance<XpsHelpEnViewModel>();
+            views.Add(xpsHelpEnViewModel);
+
+            _views = new ReadOnlyCollection<ViewVM>(views);
+        }
+
+        #endregion
+
+
+    }
+}
\ No newline at end of file
diff --git a/LegendGenerator.App/ViewModel/Help/OverviewViewModel.cs b/LegendGenerator.App/ViewModel/Help/OverviewViewModel.cs
new file mode 100644
index 0000000..5990ac2
--- /dev/null
+++ b/LegendGenerator.App/ViewModel/Help/OverviewViewModel.cs
@@ -0,0 +1,29 @@
+using LegendGenerator.App.Resources;
+
+namespace LegendGenerator.App.ViewModel
+{
+    /// <summary>
+    /// This class contains properties that a View can data bind to.
+    /// <para>
+    /// See http://www.galasoft.ch/mvvm
+    /// </para>
+    /// </summary>
+    public class OverviewViewModel : ViewVM
+    {
+        /// <summary>
+        /// Initializes a new instance of the OverviewViewModel class.
+        /// </summary>
+        public OverviewViewModel()
+        {
+        }
+
+        public override string DisplayName
+        {
+            get
+            {
+                return "Übersicht";
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/LegendGenerator.App/ViewModel/Help/XpsHelpEnViewModel.cs b/LegendGenerator.App/ViewModel/Help/XpsHelpEnViewModel.cs
new file mode 100644
index 0000000..bf66595
--- /dev/null
+++ b/LegendGenerator.App/ViewModel/Help/XpsHelpEnViewModel.cs
@@ -0,0 +1,29 @@
+namespace LegendGenerator.App.ViewModel
+{
+    /// <summary>
+    /// This class contains properties that a View can data bind to.
+    /// <para>
+    /// See http://www.galasoft.ch/mvvm
+    /// </para>
+    /// </summary>
+    public class XpsHelpEnViewModel : ViewVM
+    {
+        
+        /// <summary>
+        /// Initializes a new instance of the OverviewViewModel class.
+        /// </summary>
+        public XpsHelpEnViewModel()
+        {
+        }
+
+        public override string DisplayName
+        {
+            get
+            {
+                return "Help";
+            }
+        }
+
+       
+    }
+}
\ No newline at end of file
diff --git a/LegendGenerator.App/ViewModel/Help/XpsHelpViewModel.cs b/LegendGenerator.App/ViewModel/Help/XpsHelpViewModel.cs
new file mode 100644
index 0000000..4a3996c
--- /dev/null
+++ b/LegendGenerator.App/ViewModel/Help/XpsHelpViewModel.cs
@@ -0,0 +1,29 @@
+namespace LegendGenerator.App.ViewModel
+{
+    /// <summary>
+    /// This class contains properties that a View can data bind to.
+    /// <para>
+    /// See http://www.galasoft.ch/mvvm
+    /// </para>
+    /// </summary>
+    public class XpsHelpViewModel : ViewVM
+    {
+        
+        /// <summary>
+        /// Initializes a new instance of the OverviewViewModel class.
+        /// </summary>
+        public XpsHelpViewModel()
+        {
+        }
+
+        public override string DisplayName
+        {
+            get
+            {
+                return "Hilfe";
+            }
+        }
+
+       
+    }
+}
\ No newline at end of file
diff --git a/LegendGenerator.App/ViewModel/ViewModelLocator.cs b/LegendGenerator.App/ViewModel/ViewModelLocator.cs
index 65af3cc..30f8bea 100644
--- a/LegendGenerator.App/ViewModel/ViewModelLocator.cs
+++ b/LegendGenerator.App/ViewModel/ViewModelLocator.cs
@@ -22,7 +22,7 @@ public class ViewModelLocator
         /// <summary>
         /// Initializes a new instance of the ViewModelLocator class.
         /// </summary>
-        public ViewModelLocator()
+        static ViewModelLocator()
         {
             ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
 
@@ -38,6 +38,13 @@ public ViewModelLocator()
             ////}
 
             SimpleIoc.Default.Register<MainViewModel>(true);
+
+            SimpleIoc.Default.Register<CopyrightViewModel>(true);
+            SimpleIoc.Default.Register<OverviewViewModel>(true);
+            SimpleIoc.Default.Register<XpsHelpViewModel>(true);
+            SimpleIoc.Default.Register<XpsHelpEnViewModel>(true);
+            SimpleIoc.Default.Register<HelpViewModel>(true);
+          
         }
 
         public MainViewModel Main
@@ -47,7 +54,15 @@ public MainViewModel Main
                 return ServiceLocator.Current.GetInstance<MainViewModel>();
             }
         }
-        
+
+        public HelpViewModel Help
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<HelpViewModel>();
+            }
+        }
+       
         public static void Cleanup()
         {
             // TODO Clear the ViewModels
diff --git a/LegendGenerator.App/ViewModel/ViewVM.cs b/LegendGenerator.App/ViewModel/ViewVM.cs
new file mode 100644
index 0000000..1ea5965
--- /dev/null
+++ b/LegendGenerator.App/ViewModel/ViewVM.cs
@@ -0,0 +1,41 @@
+namespace LegendGenerator.App.ViewModel
+{
+    public abstract class ViewVM : GalaSoft.MvvmLight.ViewModelBase
+    {
+        #region Fields   
+       
+        private bool _isCurrentPage;
+
+        #endregion // Fields
+
+        #region Constructor
+
+        protected ViewVM()
+        {
+        }
+
+        #endregion // Constructor
+
+        #region Properties           
+
+        public abstract string DisplayName { get; }
+
+        public bool IsCurrentPage
+        {
+            get { return _isCurrentPage; }
+            set
+            {
+                if (value == _isCurrentPage)
+                {
+                    return;
+                }
+                _isCurrentPage = value;
+                this.RaisePropertyChanged("IsCurrentPage");
+            }
+        }
+
+        #endregion     
+               
+
+    }
+}

From 3b4028100000e8546a745b8ed76d6e6dd57b9910 Mon Sep 17 00:00:00 2001
From: kaimbacher <arno.kaimbacher@hotmail.de>
Date: Fri, 2 Feb 2018 10:01:05 +0100
Subject: [PATCH 3/3] new version number

---
 LegendGenerator.App/View/AboutDialog.xaml |   4 ++--
 LegendGenerator/Config.Designer.cs        | Bin 11548 -> 11548 bytes
 LegendGenerator/Config.esriaddinx         |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LegendGenerator.App/View/AboutDialog.xaml b/LegendGenerator.App/View/AboutDialog.xaml
index cc8d213..d2d1ff9 100644
--- a/LegendGenerator.App/View/AboutDialog.xaml
+++ b/LegendGenerator.App/View/AboutDialog.xaml
@@ -41,9 +41,9 @@
             <Label Canvas.Left="14" Canvas.Top="8" Content="LegendGenerator" Height="34" Name="lblUeberschrift" FontWeight="SemiBold" FontStyle="Normal" FontSize="18" FontFamily="Verdana" Width="188" />
             <Image Source="../Skins/Images/gba.png" Canvas.Left="278" Canvas.Top="118" Height="28" Name="image1" Stretch="Uniform" Width="47" />
             <Label Canvas.Left="14" Canvas.Top="38" Content="Product: LegendGenerator" Height="28" Name="lblProduct" Width="249" />
-            <Label Canvas.Left="14" Canvas.Top="58" Content="Version: 5.14" Height="28" Name="lblVersion" Width="249" />
+            <Label Canvas.Left="14" Canvas.Top="58" Content="Version: 5.15" Height="28" Name="lblVersion" Width="249" />
             <Label Canvas.Left="14" Canvas.Top="98" Content="Company: Federal Geological Office Vienna (GBA)" Height="28" Name="lblCompanyName" />
-            <Label Canvas.Left="14" Canvas.Top="78" Content="ReleaseDate: 15.01.2018" Height="28" Name="lblProgrammer" Width="267" />
+            <Label Canvas.Left="14" Canvas.Top="78" Content="ReleaseDate: 02.02.2018" Height="28" Name="lblProgrammer" Width="267" />
             <Label Canvas.Left="14" Canvas.Top="118" Content="Copyright 2011-2018. All rights reserved." Height="28" Name="lblCopyright" Width="249" />
         </Canvas>
 
diff --git a/LegendGenerator/Config.Designer.cs b/LegendGenerator/Config.Designer.cs
index a363e6023c509076b68368afbc9abe7c94ec09ec..6471a1f3e98412679c527fc031f477de4be50134 100644
GIT binary patch
delta 47
wcmbOeH79Dr3@%2~$%!2On>DzvFbNwl7%}KEKu9AXZOC8&lx*BQfv-mn072XgG5`Po

delta 47
xcmbOeH79Dr3@%2K$%!2On>DzvFbNwnm@?=w7%&(DNh2_A0hDaqJb|xA4gf+63^V`$

diff --git a/LegendGenerator/Config.esriaddinx b/LegendGenerator/Config.esriaddinx
index e57863c..ab2f159 100644
--- a/LegendGenerator/Config.esriaddinx
+++ b/LegendGenerator/Config.esriaddinx
@@ -2,11 +2,11 @@
   <Name>LegendGenerator</Name>
   <AddInID>{cf149dbd-0936-4bad-8094-370870cf24ed}</AddInID>
   <Description>Creates a map legend out of a legend table.</Description>
-  <Version>5.14</Version>
+  <Version>5.15</Version>
   <Image>Images\LegendGenerator.png</Image>
   <Author>Arno Kaimbacher</Author>
   <Company>Geologische Bundesanstalt Wien</Company>
-  <Date>15.01.2018</Date>
+  <Date>02.02.2018</Date>
   <Targets>   
     <Target name="Desktop" version="10.3" />
   </Targets>