From 1d44d69b942d78c99001b30c8e6bcd85ee31abd0 Mon Sep 17 00:00:00 2001
From: Tiberiu Chibici <chibicitiberiu@gmail.com>
Date: Fri, 25 Jul 2014 11:09:10 +0300
Subject: [PATCH] UI changes, added commands

---
 .../Documents/Text/TextEditorFactory.cs       |   2 +-
 RainmeterEditor/RainmeterStudio.csproj        |  23 ++++-
 .../Resources/Icons/arrow_backward_16.png     | Bin 0 -> 343 bytes
 .../Resources/Icons/arrow_forward_16.png      | Bin 0 -> 375 bytes
 .../Resources/Icons/arrow_left_16.png         | Bin 0 -> 345 bytes
 .../Resources/Icons/arrow_right_16.png        | Bin 0 -> 349 bytes
 .../Resources/Icons/page_white_star_16.png    | Bin 0 -> 565 bytes
 .../Resources/Icons/page_white_text.png       | Bin 342 -> 0 bytes
 .../Resources/Icons/project_16.png            | Bin 0 -> 724 bytes
 .../Resources/Icons/project_star_16.png       | Bin 0 -> 742 bytes
 ...text-x-generic-32.png => text_file_32.png} | Bin
 RainmeterEditor/Resources/Strings.Designer.cs |  18 ++++
 RainmeterEditor/Resources/Strings.resx        |   6 ++
 RainmeterEditor/UI/Command.cs                 |  88 ++++++++++++++++++
 .../UI/Controller/DocumentController.cs       |  25 ++++-
 RainmeterEditor/UI/MainWindow.xaml            |  36 ++++++-
 RainmeterEditor/UI/MainWindow.xaml.cs         |  27 ++++--
 17 files changed, 207 insertions(+), 18 deletions(-)
 create mode 100644 RainmeterEditor/Resources/Icons/arrow_backward_16.png
 create mode 100644 RainmeterEditor/Resources/Icons/arrow_forward_16.png
 create mode 100644 RainmeterEditor/Resources/Icons/arrow_left_16.png
 create mode 100644 RainmeterEditor/Resources/Icons/arrow_right_16.png
 create mode 100644 RainmeterEditor/Resources/Icons/page_white_star_16.png
 delete mode 100644 RainmeterEditor/Resources/Icons/page_white_text.png
 create mode 100644 RainmeterEditor/Resources/Icons/project_16.png
 create mode 100644 RainmeterEditor/Resources/Icons/project_star_16.png
 rename RainmeterEditor/Resources/Icons/{text-x-generic-32.png => text_file_32.png} (100%)
 create mode 100644 RainmeterEditor/UI/Command.cs

diff --git a/RainmeterEditor/Documents/Text/TextEditorFactory.cs b/RainmeterEditor/Documents/Text/TextEditorFactory.cs
index 8136c656..80b4115a 100644
--- a/RainmeterEditor/Documents/Text/TextEditorFactory.cs
+++ b/RainmeterEditor/Documents/Text/TextEditorFactory.cs
@@ -29,7 +29,7 @@ namespace RainmeterEditor.Documents.Text
                     Category = Resources.Strings.Category_Utility,
                     DefaultExtension = ".txt",
                     Description = Resources.Strings.DocumentFormat_TextFile_Description,
-                    Icon = new System.Windows.Media.Imaging.BitmapImage(new Uri("/Resources/Icons/text-x-generic-32.png", UriKind.RelativeOrAbsolute)),
+                    Icon = new System.Windows.Media.Imaging.BitmapImage(new Uri("/Resources/Icons/text_file_32.png", UriKind.RelativeOrAbsolute)),
                     Factory = this
                 };
             }
diff --git a/RainmeterEditor/RainmeterStudio.csproj b/RainmeterEditor/RainmeterStudio.csproj
index 2342db13..87368a4d 100644
--- a/RainmeterEditor/RainmeterStudio.csproj
+++ b/RainmeterEditor/RainmeterStudio.csproj
@@ -98,6 +98,7 @@
     </Compile>
     <Compile Include="Model\IDocumentStorage.cs" />
     <Compile Include="Storage\SkinDirectory.cs" />
+    <Compile Include="UI\Command.cs" />
     <Compile Include="UI\Dialogs\CreateDocumentDialog.xaml.cs">
       <DependentUpon>CreateDocumentDialog.xaml</DependentUpon>
     </Compile>
@@ -175,14 +176,28 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\Icons\page_white_text.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Icons\text-x-generic-32.png" />
+    <Resource Include="Resources\Icons\text_file_32.png" />
   </ItemGroup>
   <ItemGroup>
     <SplashScreen Include="Resources\splash.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons\arrow_left_16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons\arrow_right_16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons\arrow_backward_16.png" />
+    <Resource Include="Resources\Icons\arrow_forward_16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons\page_white_star_16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons\project_16.png" />
+    <Resource Include="Resources\Icons\project_star_16.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/RainmeterEditor/Resources/Icons/arrow_backward_16.png b/RainmeterEditor/Resources/Icons/arrow_backward_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d5ba30c6647a0557d0a790deb5f2b34566fad40
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqyM(BzRNG~}6F?!^%#er@=ltB<)VvZPmw~~#C^fMp
zHASI3vm`^o-P1Q9MK6^dD8Ad%#WBRf|L7z`zC#8)uJS9~xyn}@Q4EmWrSR2Y;x2;=
z!7is{PfVPU;4#N)=}H#w`zbf?Z<Lk(_H085!;CTuM)L=AV)!JQx1Wy`)s!=Mdx4>R
z!R5N6EME@Zo^Bx}+VVDKMsj$e%u$bA@skH{Zx!6Vg!KyZk(tI*Qxvnma(qg3-L%cu
zde7vUTX!|@zaVSzfNA5Tkg!lwKc2e>SG<W@G-2y$>xvC~-5NA2e(ycz;%_reN;q(G
fWb9S_<$LVqFDIBp-l-1T4f3C-tDnm{r-UW|2$X&)

literal 0
HcmV?d00001

diff --git a/RainmeterEditor/Resources/Icons/arrow_forward_16.png b/RainmeterEditor/Resources/Icons/arrow_forward_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cc5bee55f80cb4d0a59732d95046c4afd5e448f
GIT binary patch
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqyM(Bziu)$xWT232W=KSdbAE1aYF-JD%fR4Vl$uzQ
znxasiS(2gP?&%wlqL<1J6u<51;uvD#e{|AD-a`fguJHj@W(iDe9y1g>6a_>wm0DwU
zmM&BXcKO8fU><J*vzAJ*N|~OT%c4`O&)vWO?dQ9MyhQ;F9-E9<xe~5>@&-t*&D*;=
zwZL)GRKo%`z98`{4tZOutQEy(8`Mht+Phe|hAsA1_;#^14ekqa@05!<>A1WxjIwP^
zRj6M7r%7AFZM9==Pnf=f*QQHllfIwg*|*_ZUzw+paYln}L$&7Jc?)VQdGAzf_j0GO
zP3>@gk|=PmfKSh7yWj$|sGnwSrYADnpNgBVJ#HMeq~5Kv&Mv*f{Iw7NY<H0VJzf1=
J);T3K0RRWzfOP->

literal 0
HcmV?d00001

diff --git a/RainmeterEditor/Resources/Icons/arrow_left_16.png b/RainmeterEditor/Resources/Icons/arrow_left_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dc696781e6135d37b5bf2e98e46fd94f020c48d
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy>q$gGR5;6H
z{Qv(y10{fofkH6I3@AO3$p*x`Nil#0jeqs;pT9Ds7{CaN1)$9r#n~kE{`~pF@bLXZ
zhF?E_GyM7i!oL`P0x_8Wj$ni2F7#hzWPxfvDaI<Ur@*bm@aNwj1{rQSF#Y@QUm*U?
z@cSPS|NR3M1JS=3R<B%(@B+};zyC1)Vfgj;7g*6BprYSk#lI0W)Bup&pZ`FyUw=@&
zkhwGNyfB-H0S7ZD!^4*k8D77CgVos}uYolG`Td9C{=!F$jL0c5c2&qtph7vI2FDF)
rJ5G=sjX=%1K+Ok<)r{hW5u6tQ<Dt8}dRo)T00000NkvXXu0mjf%~_cN

literal 0
HcmV?d00001

diff --git a/RainmeterEditor/Resources/Icons/arrow_right_16.png b/RainmeterEditor/Resources/Icons/arrow_right_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1a1819238c6de8f9e50988f4151261fa6ba64ea
GIT binary patch
literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy?@2^KR5;6H
z{Qv(y10{fofkH6E3<#LzvD<5s6C2qE{QB|B=I8fcSCPdSL9tMJA`=`HfB*bt`1AV@
z!|z{z7=Hcy4b%X_zZiZ3F^HBFl4SVx>o>#A+qW*AYQLZl(!&BX$x7Ik;qO170ssEM
z@$bKXf%rGW?|(r27bf<H;men=dRkd(C$CMrWzGV#8Ke-d8K~$tSn+QJ{TCtk>-TSv
zD}TdX0CM*JhkLO)8|Y^+n~Q^sK~hqR;q|N647YFGy>NTZJsWr!5CaSfwJm@a><8NX
v2&h?|<XE`SfAs`V^Fg3%bunULgy#hS2<N~z-E6GT00000NkvXXu0mjfI|-VZ

literal 0
HcmV?d00001

diff --git a/RainmeterEditor/Resources/Icons/page_white_star_16.png b/RainmeterEditor/Resources/Icons/page_white_star_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a1441c9a12062a4bb3d706000d3ca14399aebca
GIT binary patch
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz$4Nv%R5;6x
zlg&#TQ541fSouFxaA~2GVkAp((Jo5cMa4}~3JR^@(iRsk8@ft2g=CRUaVc)ZeK#T^
zXmNrKrU@9tMbdmVlg!6^Z)WWA-Pg|ehD3DWFpGKTH|L(2I|N{eB(Dcj38~~Anvfca
zd>SCZIX8XZzY2l?gCw6LlgWJ5Avz#QX4|&mI8LN)w~J1vgL=KLAhlWz*=#m~gyvxa
z&;iC6gb?aZvMdXxX`<0+D1hs_pqJ!wxqlEH;CJ)je~uL(gpi@v>!I0f_Kl=E(E+Tq
z26na*9gribxx-Oft(HnstyXUUy!39&E-cI%J5Rsy;(PGZH{g{ty!HVC&yGPT3H8x#
zw{^gBPW)O0FMoh{k%l<`1a|To_Wl&u&-GXm8izU|&<&utILc4wc6s@u1bmTz6x{qg
zTw@7=FQRcg&r`h+gcR$*Jbv+*<zGTnQV^vL*n5xQnT1$klp-vb(!>DPk7v)B@e0o2
z6IlBXW&8xh@9)YKiV~2>+z&XKd24J<ZU(#sUy2n!gI{j<nRN~PjDvn(J%z5@0Do`W
zg8{mV0RJJ=vLJ^Z+{Y}>T55YWz&JtfvCg4r^~bLP79-yS@n$OW00000NkvXXu0mjf
DStt2z

literal 0
HcmV?d00001

diff --git a/RainmeterEditor/Resources/Icons/page_white_text.png b/RainmeterEditor/Resources/Icons/page_white_text.png
deleted file mode 100644
index 813f712f726c935f9adf8d2f2dd0d7683791ef11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%6;pyTSA|c6o&@eC9QG)Hj&ExYL
zO&oVL^)+cM^qd@ApywS>pwx0H@RDN}hq;7mU-SKczYQ-hnrr=;iDAQMZQ+*g=YOM=
z!QlMQEn7FbaD->uKAYgo_j9)W&$$zS*W9}m(ey0q$&7l-XEWO0Y(9M=SnhLbwy<xp
z<-V!w{rtjKUv+o*|6m()ceab>;d>@~SY$Ku*0xPvIOQeV1x7u_z-2-X>_74(yfh7C
znXL|3GZ+d2`3re2hs?MK<V&+KGL$sTUzRzG=^m3+$2Td42G30@X|lcy44dbP=-$#!
h7h_<U68r8SGxL_I=i_|Jgn@o$@O1TaS?83{1OPX3f*b$<

diff --git a/RainmeterEditor/Resources/Icons/project_16.png b/RainmeterEditor/Resources/Icons/project_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..242ca212e0284a6d493e1a9dcccf9b060d2213ab
GIT binary patch
literal 724
zcmV;_0xSKAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RZ2N?$+D28#P8vp<Tc1c7*R5(w4kxOV3Q5c2)d1PiXnLK6^
zlUN&(D6MU^iba$z6j2xH$_I)?)Qy5`ao1IGRji=cg$o5;i=fb#T?Hvr7p|2WLo4*5
zQ`(H3$vp1M)s%EvJgdupzjOX`xd8vsz?gCB(u?f*=)6@zbP%fY4CHcW`BlDTT$Q@*
zw~I4DGs*w}@X<jiE!}>vbXY%GIFKs06>@i@_n~%eaPe^>-*dYBQdUKkQO49ntV`^5
zKP*goR+QbfL9VFZ(b6#;`4l0aA~mh(rM&Sl$^q=spz=I(wBuN5M2PVcC5$l2D5H#N
znfSrv5qIv#q`TD0?`V)K8u#Udn8X3|31*03hA?8jC<)S@f^j>_Z)<SjslNYE_ue6n
z<Aj#&lu<@0p+r$*ZK*zYt~TMXhMsK=^o)90kU-h=EXP5XM<~XGGE51@1XCo+V%#t?
zgZ(3r+!1hgRLkkb!~o~U?LPjdaDu-fa81>6{DzAup@dRG5JK5P>Wq=f^@Tn$JZP%e
z1yYde;w$2<-l0w(BerN>x2BfH>NRK9Vw6FgrHL4~GfG_U0D$VY0Kx>GhZy_q)h%;l
zJs{v?UCk?l<wrfsR^1XoWL5L^ukUmQF-BPE+j;`wyl>Ry)@t~Z_jzG_-ghu{Hk*Ol
zbo{Jb(i-lXJ?~c?>hm@VP%ZRr{X%^LIql~-YGl*>^WJQuX}jw@5lO={ov-G2efsa{
z3Lm42x!ic?*?->GrhxzeaA82GYj5^F$QF|o%ppMp1$f{f02c(1V12dm(fqmcq&f^Z
z<aY!B01S+!k82t2iX;nJjsqTf#I)_^)cDHA7Z?WG%Kig}^DlKV&Su{L0000<MNUMn
GLSTa4ELrFP

literal 0
HcmV?d00001

diff --git a/RainmeterEditor/Resources/Icons/project_star_16.png b/RainmeterEditor/Resources/Icons/project_star_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bb095096a0cf4167deb79d4167b0306f3ce556e
GIT binary patch
literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RZ2N?$+6E}KFKL7v%h)G02R5(w4k4sDwQ51&How=R9rk%D^
zXd@J%B9AJHF+>e23tzy(7>$W;WFszgXI#1=u8f*sB!-0~YFrrHNMbM&7v1=Zk&O#c
z5G{%|wmb@@^SE>Gb%B$Vf%qpUxjFYc|M?HVf7Cq?*>hr0J>=|{OLR7Db=?McvN1VS
znTVW{QpG2kF|*`k000DM!<MX6_a>UcZL!*5a#JjN-uZ89!vsfe_$#;VP2O|+u#Yp&
zeSTLn-l2_rAJq#^cEbeGc(_MaTw!7`LJUTHiYJ_?j9hVY02?Iex)W+?*qOL4x&(<)
zPC4U@GtT9ZcS~Tq_GWTan=R+pB{<$tf33;uQ7w}j)Z&C%oLGb#SQ4d*Smd0OUt@5%
zKU{OHB6_sL5d4%dQeH&2^opuLN9SE-SNV(x0HA;F^<KS{YEOman_HE-#sKnQvGk2G
z#@RB6g!0uxM3*R;8WjU=g||Omf(ZbCSAA$dLct5Iu^0$a9Jr*xeoI&Ptz=-ln42F7
zL~;laM~pHx7CgAL5Zw)sPXpK|F!SPkG4l!lfn8h>K@&EUad&4%U$Op_mdzYn@?|kb
zZjaa9u)6qP0#EZJI{36@sHYaSbF2VZ8nD6y@R~t(Mrus`DohtJV4lw1pP67|gmcQ*
z7ytkqP=gw91f|)B6j6?_s0c=3hFbn=OLZsY%;LxF7bCsGK;XnAQ|k=syx8?=ZgON8
zx#HAf`dJ9oV>&M6&EWEM@k9Q-@puVKAm@KB4ikOuwLORIhpp2OsxGVXK$nGxh`|E_
zATU7#5hR%Zz4#*cHG3=F2bRsRGXMbS9#C54kbF{diz-4O5S`|V#nSU<*@bt|2dtd^
Y3*mVh0rbtjN&o-=07*qoM6N<$f_ThG3IG5A

literal 0
HcmV?d00001

diff --git a/RainmeterEditor/Resources/Icons/text-x-generic-32.png b/RainmeterEditor/Resources/Icons/text_file_32.png
similarity index 100%
rename from RainmeterEditor/Resources/Icons/text-x-generic-32.png
rename to RainmeterEditor/Resources/Icons/text_file_32.png
diff --git a/RainmeterEditor/Resources/Strings.Designer.cs b/RainmeterEditor/Resources/Strings.Designer.cs
index ec71e91f..986ee145 100644
--- a/RainmeterEditor/Resources/Strings.Designer.cs
+++ b/RainmeterEditor/Resources/Strings.Designer.cs
@@ -69,6 +69,24 @@ namespace RainmeterEditor.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to New file....
+        /// </summary>
+        internal static string DocumentCreateCommand_DisplayText {
+            get {
+                return ResourceManager.GetString("DocumentCreateCommand_DisplayText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Creates a new file.
+        /// </summary>
+        internal static string DocumentCreateCommand_ToolTip {
+            get {
+                return ResourceManager.GetString("DocumentCreateCommand_ToolTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Text Editor.
         /// </summary>
diff --git a/RainmeterEditor/Resources/Strings.resx b/RainmeterEditor/Resources/Strings.resx
index d012ca0e..ca250b3d 100644
--- a/RainmeterEditor/Resources/Strings.resx
+++ b/RainmeterEditor/Resources/Strings.resx
@@ -120,6 +120,12 @@
   <data name="Category_Utility" xml:space="preserve">
     <value>Utility</value>
   </data>
+  <data name="DocumentCreateCommand_DisplayText" xml:space="preserve">
+    <value>New file...</value>
+  </data>
+  <data name="DocumentCreateCommand_ToolTip" xml:space="preserve">
+    <value>Creates a new file</value>
+  </data>
   <data name="DocumentEditor_Text_Name" xml:space="preserve">
     <value>Text Editor</value>
   </data>
diff --git a/RainmeterEditor/UI/Command.cs b/RainmeterEditor/UI/Command.cs
new file mode 100644
index 00000000..36645b51
--- /dev/null
+++ b/RainmeterEditor/UI/Command.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace RainmeterEditor.UI
+{
+    public class Command : ICommand
+    {
+        #region Private members
+
+        private Action<object> _execute;
+        private Func<object, bool> _canExecute;
+        private Action _executeNoParam;
+        private Func<bool> _canExecuteNoParam;
+        
+        #endregion
+
+        #region Public properties
+
+        public string Name { get; set; }
+        public string DisplayText { get; set; }
+        public string Tooltip { get; set; }
+        public ImageSource Icon { get; set; }
+        public KeyGesture Shortcut { get; set; }
+
+        public string ShortcutText
+        {
+            get
+            {
+                string text = String.Empty;
+
+                if ((Shortcut.Modifiers & ModifierKeys.Windows) != 0)
+                    text += "Win+";
+
+                if ((Shortcut.Modifiers & ModifierKeys.Control) != 0)
+                    text += "Ctrl+";
+
+                if ((Shortcut.Modifiers & ModifierKeys.Alt) != 0)
+                    text += "Alt+";
+
+                if ((Shortcut.Modifiers & ModifierKeys.Shift) != 0)
+                    text += "Shift+";
+
+                text += Enum.GetName(typeof(Key), Shortcut.Key);
+                return text;
+            }
+        }
+
+        #endregion
+
+        public event EventHandler CanExecuteChanged;
+
+        public Command(string name = null, Action<object> execute = null, Func<object, bool> canExecute = null)
+        {
+            Name = name;
+            _execute = execute;
+            _canExecute = canExecute;
+        }
+
+        public Command(string name = null, Action execute = null, Func<bool> canExecute = null)
+        {
+            Name = name;
+            _executeNoParam = execute;
+            _canExecuteNoParam = canExecute;
+        }
+
+        public virtual bool CanExecute(object parameter)
+        {
+            if (_canExecute != null)
+                return _canExecute(parameter);
+            else if (_canExecuteNoParam != null)
+                return _canExecuteNoParam();
+
+            return true;
+        }
+
+        public virtual void Execute(object parameter)
+        {
+            if (_execute != null)
+                _execute(parameter);
+            else if (_executeNoParam != null)
+                _executeNoParam();
+        }
+    }
+}
diff --git a/RainmeterEditor/UI/Controller/DocumentController.cs b/RainmeterEditor/UI/Controller/DocumentController.cs
index 31c812c7..9489bb29 100644
--- a/RainmeterEditor/UI/Controller/DocumentController.cs
+++ b/RainmeterEditor/UI/Controller/DocumentController.cs
@@ -7,11 +7,19 @@ using RainmeterEditor.UI.Dialogs;
 using RainmeterEditor.Model.Events;
 using RainmeterEditor.Model;
 using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media.Imaging;
 
 namespace RainmeterEditor.UI.Controller
 {
     public class DocumentController
     {
+        #region Commands
+
+        public Command DocumentCreateCommand { get; private set; }
+
+        #endregion
+
         public event EventHandler<DocumentOpenedEventArgs> DocumentOpened
         {
             add
@@ -23,19 +31,27 @@ namespace RainmeterEditor.UI.Controller
                 DocumentManager.Instance.DocumentOpened -= value;
             }
         }
-
         public event EventHandler DocumentClosed;
-        
+
+        public Window OwnerWindow { get; set; }
+
         public DocumentController()
         {
+            DocumentCreateCommand = new Command("DocumentCreateCommand", () => CreateWindow())
+            {
+                DisplayText = Resources.Strings.DocumentCreateCommand_DisplayText,
+                Tooltip = Resources.Strings.DocumentCreateCommand_ToolTip,
+                Icon = new BitmapImage(new Uri("/Resources/Icons/page_white_star_16.png", UriKind.RelativeOrAbsolute)),
+                Shortcut = new KeyGesture(Key.N, ModifierKeys.Control)
+            };
         }
 
-        public void Create(Window parent = null, DocumentFormat defaultFormat = null, string defaultPath = "")
+        public void CreateWindow(DocumentFormat defaultFormat = null, string defaultPath = "")
         {
             // Show dialog
             var dialog = new CreateDocumentDialog()
             {
-                Owner = parent,
+                Owner = OwnerWindow,
                 SelectedFormat = defaultFormat,
                 SelectedPath = defaultPath
             };
@@ -56,5 +72,6 @@ namespace RainmeterEditor.UI.Controller
             // Call manager
             DocumentManager.Instance.Create(format, path);
         }
+
     }
 }
diff --git a/RainmeterEditor/UI/MainWindow.xaml b/RainmeterEditor/UI/MainWindow.xaml
index 79c70311..8f1b80c6 100644
--- a/RainmeterEditor/UI/MainWindow.xaml
+++ b/RainmeterEditor/UI/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="RainmeterEditor.MainWindow"
+<Window x:Class="RainmeterEditor.UI.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ui="clr-namespace:RainmeterEditor.UI"
@@ -6,6 +6,11 @@
         xmlns:adlayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
         Title="Rainmeter Studio" Height="350" Width="525"
         ResizeMode="CanResizeWithGrip" >
+    
+    <Window.Resources>
+        
+    </Window.Resources>
+    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -21,7 +26,23 @@
         <!-- Menu bar -->
         <Menu Grid.Row="0" Grid.ColumnSpan="10">
             <MenuItem Header="_File">
-                <MenuItem Header="_New Item..." Click="File_New_Click"/>
+                <MenuItem Header="_New">
+                    <MenuItem Header="_File..." 
+                              DataContext="{DynamicResource DocumentCreateCommand}"
+                              Command="{Binding}"
+                              ToolTip="{Binding Tooltip}"
+                              InputGestureText="{Binding ShortcutText}">
+                        <MenuItem.Icon>
+                            <Image DataContext="{DynamicResource DocumentCreateCommand}"
+                                   Source="{Binding Icon}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="_Project..." Command="{DynamicResource CreateFileCommand}">
+                        <MenuItem.Icon>
+                            <Image Source="/Resources/Icons/project_star_16.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuItem>
                 <MenuItem Header="_Open..." />
                 <Separator />
                 <MenuItem Header="_Close" />
@@ -32,6 +53,17 @@
         </Menu>
 
         <!-- Toolbar -->
+        <ToolBarTray Grid.Row="1">
+            <ToolBar>
+                <Button Name="buttonBackward" ToolTip="Navigate backward">
+                    <Image Width="16" Height="16" Source="/Resources/Icons/arrow_backward_16.png" />
+                </Button>
+                <Button Name="buttonForward" ToolTip="Navigate forward">
+                    <Image Width="16" Height="16" Source="/Resources/Icons/arrow_forward_16.png" />
+                </Button>
+                <Separator />
+            </ToolBar>
+        </ToolBarTray>
 
         <!-- Grid splitter -->
         <GridSplitter Grid.Row="2" Grid.Column="1"
diff --git a/RainmeterEditor/UI/MainWindow.xaml.cs b/RainmeterEditor/UI/MainWindow.xaml.cs
index da8d2004..bb318c4f 100644
--- a/RainmeterEditor/UI/MainWindow.xaml.cs
+++ b/RainmeterEditor/UI/MainWindow.xaml.cs
@@ -15,20 +15,38 @@ using RainmeterEditor.Model.Events;
 using RainmeterEditor.UI.Controller;
 using Xceed.Wpf.AvalonDock.Layout;
 
-namespace RainmeterEditor
+namespace RainmeterEditor.UI
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
     public partial class MainWindow : Window
     {
-        DocumentController documentController = new DocumentController();
+        private DocumentController documentController;
+
+        private IEnumerable<Command> Commands
+        {
+            get
+            {
+                yield return documentController.DocumentCreateCommand;
+            }
+        }
 
         public MainWindow()
         {
             InitializeComponent();
 
+            documentController = new DocumentController();
+            documentController.OwnerWindow = this;
             documentController.DocumentOpened += documentController_DocumentOpened;
+
+            foreach (var c in Commands)
+            {
+                Resources.Add(c.Name, c);
+
+                if (c.Shortcut != null)
+                    InputBindings.Add(new KeyBinding(c, c.Shortcut));
+            }
         }
 
         void documentController_DocumentOpened(object sender, DocumentOpenedEventArgs e)
@@ -58,10 +76,5 @@ namespace RainmeterEditor
                     return;
             }
         }
-
-        private void File_New_Click(object sender, RoutedEventArgs e)
-        {
-            documentController.Create(this);
-        }
     }
 }
\ No newline at end of file