From e0b749382e58502548fd27e23c98cc9b38962d30 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Wed, 12 Aug 2015 17:54:23 +0200
Subject: [PATCH] Use buttons in SettingsView.

---
 gimp/plus-child.xcf                           | Bin 0 -> 2968 bytes
 zaaReloaded2/Icons/plus-child.png             | Bin 0 -> 557 bytes
 .../ViewModels/ControlElementViewModel.cs     |   4 ++-
 zaaReloaded2/ViewModels/ElementViewModel.cs   |   2 ++
 .../ViewModels/FormatElementViewModel.cs      |   2 ++
 zaaReloaded2/Views/SettingsView.xaml          |  28 ++++++++++++------
 zaaReloaded2/zaaReloaded2.csproj              |   3 ++
 7 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 gimp/plus-child.xcf
 create mode 100644 zaaReloaded2/Icons/plus-child.png

diff --git a/gimp/plus-child.xcf b/gimp/plus-child.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..7eeefc5adf2ac1810937a24a3df5dbe7f37206b4
GIT binary patch
literal 2968
zcmeHJO>bL86rE?spN;Jo$B;l+JP8R>z*QqvtWky3(ux%ld)Iw7R{c@gj+C&;h7D3T
zZ4j&e23AO@1zN*`k1~5$vET=^0Yq%l=XpJ6K8Qn{1?rNHbUkOz+&gbP=iYg*+3H*m
zw(5<b(Q1bRZPgm_63p}Pvkc3g9|=K2tH2guS=jRy)9*R>UqWAKV%ciF*Xe}aA;yA}
zg|}<nR@e?M_iLL2lD_t8b!yG9+U&Qkl7pj{T^|g$+hNe^4#WN+tPfkg?%;HOz0s`q
z+P!|TuDfc#d8HPdJ#$vKIbg$1okr-DIiYSoI2kZ>YjC|*Z*`l&hI<ys?Rli-s+--`
z5Sy=m5OUXBy+&gY4*%I8qmNUDIU36Iu+6)J!!DUYZr_qT`Ilil+=bshy-PYx42xk@
zhnOt~bNHnhoS(s`EarNPGq^D0!#!}_L>$Kv`pnFn%L?}#x*@019|E|&VlJ_bF`MNQ
zA9JuHJ`z(EiL!XCV)VXHD)wShMZ%<pi-ai+^Mn}<vxGSf(*}A<{Vr0*19%_%)PWj%
z0^Oe?Nh%p@Dk;2J{beZ6P$@?pU_W{V>!Je|gnGD_*aP)9x~bU5$z!=JTyZ`Q70en-
zCv-~vf&cyav;Y2o*8ToP=KLi7{vvaJ!kqu%9p?OmIS+`OpD^ctyd;qG6XrZ1l5E19
ze{h+ZM;J{$Sz^x919*)&&p?fl^HNoq;9OQyI_Fmn<rzxnJgI|8Y*s*ma~$nqJ>-1R
zPxzo-^*ui-i5K|jUzqfJ+>b>%=~wac(6Pt5uT)tl{ow^5a=5&LPHk|F7s0$6j5pFr
zH&_vKym9E`!;&yGcNy`rvMv1(z+FUe&m`=G<uYZC^+j~=0!10e-(8?6V~PTOAj+7c
z078^8MS(sLWlT{3aR_6I0)22Ygwc4{rzrFQevzUuP-BSllUk+%Tvk(Blodlk6h>%K
zNF9u0vjPs5<LD7)Axfc?D1myV<dvc#Uf_82&lKem_hXS3WyOdxr~6VZIZ@mP0MGN(
z`C9#2v)|k7Uggoa^ZKt6&3nmkJ@=9!p7)X=&o=KR<Mx8->;vs}`0avp$o_hi%Tjx>
zlXz<gYr`rVa(Zr8R^;QfII}CuQl*hX)9Nkh6DBn*5~jrTjazb&Fr#6fFej$3-;`Mc
zqxAdtWyW{_e<5?kDWS0^z1P&&GDQlaaXKkIq3#;WGgQh^2Wdf<j2lM<j25K&c9a+)
z>a&qIQr}2a^BtL%Dxk&%i7i=FGI7f%bZ@GAa!ukWoXn;7!nXOu3f{F9$ZBG9GVcJp
zZ;7X<M26ay-vV$u0H42MCoGr0&GCkqq7Eyz4$G_(Q-``FO&#izG<B#;($t|YNmGZm
zBvDDesXbeVx#M-H%k*d+YU*emrv6ojQ2BTrsv?pJH|Jp~VoSCZOS~9Y@J&6xV=1nQ
EC+$q^k^lez

literal 0
HcmV?d00001

diff --git a/zaaReloaded2/Icons/plus-child.png b/zaaReloaded2/Icons/plus-child.png
new file mode 100644
index 0000000000000000000000000000000000000000..bccea0b5157ee1ba99cf1ad10ac3c4280fd6d99c
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000;O000;W1^@s7mv9Yk00004XF*Lt006O%
z3;baP00006VoOIv00000008+zyMF)x010qNS#tmY4#WTe4#WYKD-Ig~000McNliru
z-v|s3BsyuLj|u<)02FjZSad^gZEa<4bO1zQZfRv~AWL##b#u8!DU1LB0g6dPK~zY`
zwUs?f!$26ve+i`yQiOVb3*CxC{Spq+QBhDF&Q6CPLT>X0N56uT=;CBuGPT9o-NQw3
zQyjd6Gv=C$!T*xL^YVY*FHurtIHUmD*Z}}aiY%8VzFGk#MTRd)loXjZc2HJNz5k)l
z(kc9uP|fIE4T1eC0ovG^^Sze~I$pfjz#8xZ^b;k;4Y2A*q@?Iokrx&ja12}!ft-6<
zl=Yip9k>jo_Y2zCxl8*w#DJ2b3tYJjedB?W;uh%p1`{HY)+s0{HvLF~y{lt*Xk?&`
zJ#l57G|E96JFYVf^&vOBkFJuEVgzi}8Yn47u5zb8HnF19qg-hbLVeiL#y(Xob8X|w
zyPeVyv9rXVXQ@p@Ls#;HCbJlO0{kLQffFy~4d5`pjjahP2xq{!bbpRw2^)7=8#~v=
zjvc`n@Y*Va(v918_us#ByY71qtV9zma9Gah(dmEGWw4~AsB`!Zd<JB1K-XUZV7ciY
vRPK170zKfa^`dzXXz|vxnxdxo_fzo&05O?L9)}Z400000NkvXXu0mjfGfCtL

literal 0
HcmV?d00001

diff --git a/zaaReloaded2/ViewModels/ControlElementViewModel.cs b/zaaReloaded2/ViewModels/ControlElementViewModel.cs
index c0c09eb..fa55d8f 100755
--- a/zaaReloaded2/ViewModels/ControlElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/ControlElementViewModel.cs
@@ -45,7 +45,9 @@ namespace zaaReloaded2.ViewModels
             {
                 return ((ControlElementBase)Element).CanHaveChildren;
             }
-        } 
+        }
+
+        public override string ToolTip { get { return Element.Label; } }
 
         #endregion
 
diff --git a/zaaReloaded2/ViewModels/ElementViewModel.cs b/zaaReloaded2/ViewModels/ElementViewModel.cs
index c56b175..2fe3d61 100755
--- a/zaaReloaded2/ViewModels/ElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/ElementViewModel.cs
@@ -39,6 +39,8 @@ namespace zaaReloaded2.ViewModels
             get { return Element.Label;  }
         }
 
+        public abstract string ToolTip { get;  }
+
         #endregion
 
         #region Constructors
diff --git a/zaaReloaded2/ViewModels/FormatElementViewModel.cs b/zaaReloaded2/ViewModels/FormatElementViewModel.cs
index 00810fa..61ae81b 100755
--- a/zaaReloaded2/ViewModels/FormatElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/FormatElementViewModel.cs
@@ -46,6 +46,8 @@ namespace zaaReloaded2.ViewModels
         /// </summary>
         public ControlElementViewModel Parent { get; set; }
 
+        public override string ToolTip { get { return Element.Label; } }
+
         #endregion
 
         #region Commands
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index cf53d63..e5137bc 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -60,29 +60,39 @@
                       x:Name="ReferenceStyleChooser" HorizontalAlignment="Stretch" />
         </DockPanel>
         <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Command="{Binding CloseViewCommand}" Content="Schließen" IsDefault="True" IsCancel="True" Margin="0 10 0 0"
-                    Width="{Binding ElementName=NewElementButton,Path=ActualWidth}"/>
+            <Button Command="{Binding CloseViewCommand}" Content="Schließen" IsDefault="True" IsCancel="True"
+                    Margin="0 10 0 0" />
         </StackPanel>
         <GroupBox Header="Elemente" Margin="0 10 0 0">
             <DockPanel LastChildFill="True">
                 <StackPanel DockPanel.Dock="Right" Margin="10 0 0 0">
-                    <Button Command="{Binding AddElementCommand}" Content="Neues Element" Margin="0 0 0 10"
-                            x:Name="NewElementButton"/>
-                    <Button Command="{Binding AddChildElementCommand}" Content="Neues Kindelement" Margin="0 0 0 10" />
-                    <Button Command="{Binding EditElementCommand}" IsDefault="True" Content="Bearbeiten" Margin="0 0 0 10" />
-                    <Button Command="{Binding CopyElementCommand}" Content="Kopieren" Margin="0 0 0 10" />
-                    <Button Command="{Binding DeleteElementCommand}" Content="Entfernen" Margin="0 0 0 10" />
+                    <Button Command="{Binding AddElementCommand}" ToolTip="Neues Element" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/plus.png" Width="24" />
+                    </Button>
+                    <Button Command="{Binding AddChildElementCommand}" ToolTip="Neues Kindelement" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/plus-child.png" Width="24" />
+                    </Button>
+                    <Button Command="{Binding DeleteElementCommand}" ToolTip="Entfernen" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/minus.png" Width="24" />
+                    </Button>
+                    <Button Command="{Binding EditElementCommand}" IsDefault="True" ToolTip="Bearbeiten" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/pen.png" Width="24" />
+                    </Button>
+                    <Button Command="{Binding CopyElementCommand}" ToolTip="Kopieren" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/duplicate.png" Width="24" />
+                    </Button>
                 </StackPanel>
                 <TreeView ItemsSource="{Binding Elements}">
                     <TreeView.ItemContainerStyle>
                         <Style TargetType="{x:Type TreeViewItem}">
                             <!--<Setter Property="IsExpanded" Value="True" />-->
                             <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                            <Setter Property="ToolTip" Value="{Binding ToolTip}" />
                         </Style>
                     </TreeView.ItemContainerStyle>
                     <TreeView.ItemTemplate>
                         <HierarchicalDataTemplate ItemsSource="{Binding Elements}">
-                            <TextBlock Text="{Binding DisplayString}" />
+                            <TextBlock Text="{Binding DisplayString}" ToolTip="{Binding ToolTip}" />
                         </HierarchicalDataTemplate>
                     </TreeView.ItemTemplate>
                 </TreeView>
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 676868d..853000a 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -398,6 +398,9 @@
   <ItemGroup>
     <Resource Include="Icons\exit.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\plus-child.png" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>