From b4f3d813365f3b8b61e2cf0be4069f8ba8d23daa Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Mon, 27 Jul 2015 20:39:05 +0200
Subject: [PATCH 1/4] Implement DanielsStyle.

---
 gimp/dk.xcf                            | Bin 0 -> 3864 bytes
 zaaReloaded2/Formatter/DanielsStyle.cs |  71 +++++++++++++++++++++++++
 zaaReloaded2/Icons/dk.png              | Bin 0 -> 1274 bytes
 zaaReloaded2/Ribbon.cs                 |  17 ++++++
 zaaReloaded2/Ribbon.xml                |   2 +
 zaaReloaded2/zaaReloaded2.csproj       |   4 ++
 6 files changed, 94 insertions(+)
 create mode 100644 gimp/dk.xcf
 create mode 100755 zaaReloaded2/Formatter/DanielsStyle.cs
 create mode 100644 zaaReloaded2/Icons/dk.png

diff --git a/gimp/dk.xcf b/gimp/dk.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..439dd504bdcbb87f5543137c2e3e9b6533f6eb19
GIT binary patch
literal 3864
zcmeHK-D@0G6u+|{Np@orzv7EU#}qLER}w1XlMhi;T3<vT?2C4?JG+@?b~f(L!mbF(
zlVJP@gn$%_F99D^@Pi80j}{+76=UhrDnyVPB8u3u+1=Th>+d%+yPeb&eX$Rc3un*Q
zz2}~}_jk@s3Py2Jt!49S-Y|86p@u~HHjtv==MK=&>}erL7<Ymapd{$7Q0BaG%s&i1
zQb5>Dwp1+YmJMCdIr4;N8M>(+DQndVjko%<jG|W1GljB|qYV?4p~;F}H+9vpY`t93
zv$j#PDpTpnd?8yhOJ#M^XPI(gPE)5Jn)b&Y!c6Fz!qT}tmiGMWjRh{PRTj0ZVHMPw
z-d-@)_cDgIOw}@MB%htvnRTs{&sTK2pCDKN-4s}MFXefJL-|CA!FeG@XL=U!+d&6G
zJlxm<engBv7y}^Qj|2^cGH0bi8B83A$mxhY9FcE{$RiPX3^L==&oKz%ejHJ35D$;R
z7TmP0*X)d`)%7yx@unvxX;UW_CU7eGk_GYcQnhU8Wp%b>=6cpl#dt+m4@J(ObA4-Y
zVv9yiH+k5aWgD7lXce{YAO1WrlnKz3ubL)in3`3n0&(g@PG|f%t)gdgMmd0)YT9KO
zugBRxK;(F}VjKCong!Z*t~U)!&-5U2sE0#rR;p!+rJSzj>XueCvfLjgA29uIV9vyw
z{{=j$aKzsWh2Fj6#N%gn+v4Y`zbw3EkrqjBSa_a{Nza28^Arjr;(FHg0F<Om!VwW2
zSUpLT>*8(|x#NkhC#AOqbSY9nG}m*1f&_RQ$Rh86$KdNquLYMPTi%+BHGcpheuQO4
zSo0$wp14F+#6`Q~avCs!d==T|p27_>SHysXJ)$j%ll!0ef4M~k&}_fH_SweP_mI2`
zyz~Zb?|gSw%0__KU98)<hSzJN196pj-Kg3DUK`@MKc!qv`)F(b@P?FEjs|!=e}912
z-yihx+WE9Ae>oW7bu(6!^1@hv*M?A5rTick;1wGTd@1E?#Ot(eGdbXLg?L@D@yg8y
zsfT!tXv8Z9AJKlh_8+^O)uwyT!d`8fZTsK0>3&1rZ`0|?8@1`w3%qQM-hJbQQ)Xc5
z*;21kuZvF8>AJ3`ctE}<6YS5azBDA7%dXpXTI`IY=%4V0EGgV|*Nb}{N6?uNZrei(
zcfxk+K$CFCxg;jqr>VApR=36W>Ki*<*e(Ohoh^S=OmKA<f6_UAD-QG>>V5)&ewF%F
z?ircSNYFc6cZm@<!-#Fazwbmhjti$lFOzf7=KZW-Ng^wWe7gwbZt~k)cResHiM9Qs
z+CQrQ1XVkCKXT+)b>+mHth;lpzy_u5Ktcs7$B#bs@C19kUwVC(6ju^2ez@KI_U%Ve
zf(@47)CNoNeQI&heBd`JTW8+-xE;I-sKWR;DNm^^26dfP*kH{(i`OQ_no0k}g{Z2N
zQa;ZrI~M9+OL-6Vdqe#jDaWaghx)rx9;W_Gpm$!9a(#di2eBU`wg)ca5j)^-{86wm
z@|!^wH@`UXRSWq!zuNYF^w0drLOjd5dm1a7gZim$=kn);L||bhVyGeUKZ@a5ExS-C
vm#WrHebKP9KlXajdaoTOjQ$+XQ^85-#iK274mF@L{v#un-~l}u^7X#}B#iKI

literal 0
HcmV?d00001

diff --git a/zaaReloaded2/Formatter/DanielsStyle.cs b/zaaReloaded2/Formatter/DanielsStyle.cs
new file mode 100755
index 0000000..a2ab215
--- /dev/null
+++ b/zaaReloaded2/Formatter/DanielsStyle.cs
@@ -0,0 +1,71 @@
+/* DanielsStyle.cs
+ * part of zaaReloaded2
+ * 
+ * Copyright 2015 Daniel Kraus
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Office.Interop.Word;
+
+namespace zaaReloaded2.Formatter
+{
+    /// <summary>
+    /// Makes design changes and edits especially for Daniel Kraus.
+    /// </summary>
+    static class DanielsStyle
+    {
+        public static void Apply(Document document, Selection selection)
+        {
+            FixWords(document);
+            FormatDiagnoses(selection);
+        }
+
+        static void FormatDiagnoses(Selection selection)
+        {
+            Range r = selection.Range;
+            r.ListFormat.RemoveNumbers();
+            r.Bold = 0;
+            r.Italic = 0;
+            r.Underline = WdUnderline.wdUnderlineNone;
+            r.Font.Size = 10;
+            Paragraphs p = r.Paragraphs;
+            p.Alignment = WdParagraphAlignment.wdAlignParagraphLeft;
+            p.FirstLineIndent = -45;
+            p.LeftIndent = 45;
+            p.LineSpacingRule = WdLineSpacing.wdLineSpaceSingle;
+            p.SpaceAfter = 0;
+            p.SpaceBefore = 0;
+
+            if (p[p.Count].Range.Text.StartsWith("Aktuell"))
+            {
+                p[p.Count].Range.Bold = 1;
+            }
+        }
+
+        static void FixWords(Document document)
+        {
+            Find find = document.Range().Find;
+            find.Execute2007(FindText: "Dr.D.Kraus", ReplaceWith: "Dr. D. Kraus", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "Z. n.", ReplaceWith: "Z.n.", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "Zust. n.", ReplaceWith: "Z.n.", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "Zust.n.", ReplaceWith: "Z.n.", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "Assistent der Klinik", ReplaceWith: "Internist/Nephrologe", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "Professor Dr.", ReplaceWith: "Prof. Dr.", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "mmHg", ReplaceWith: "mm Hg", Replace: WdReplace.wdReplaceAll);
+        }
+    }
+}
diff --git a/zaaReloaded2/Icons/dk.png b/zaaReloaded2/Icons/dk.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4f9c39498713463e7d34f6e34b6f15010bfc8b4
GIT binary patch
literal 1274
zcmV<W1O@wvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s71bs?k00004XF*Lt006O%
z3;baP00006VoOIv0000+0050tN(}%2010qNS#tmY4#WTe4#WYKD-Ig~000McNliru
z-v=8KAv-v-gAD)x02FjZSad^gZEa<4bO1zQZfRv~AWL##b#u8!DU1LB1XoE!K~z}7
z?N(h#n`ab0@0ZW~7o*nNO|3CaH2wtJrclH|3l4>Cwkh!<7b0PlQq(!{s<fcY?V_&R
z7&zB--H+|)NV}Q~R~W&?1~$C%4{W?hqKR2;YKTA6uO?BGcNgYMznD)=7B)B7xq1K2
zIq&nHpZ6RDbubDHBIpS=V|CodE2@K0%pk<7gO=Y`hB2nawz;DVZMW9Ws$(a`U|4Tj
z<)%)Pl-5s=B)vfOXe>I<xu&~zBwL$32>`I~70F}Rm%;y|zY3eNdbWSIB7uQJaFCEE
zBp5)|an`nfYcCg`7f#IoFt6fpIEV^R5t^9*0J!?i)n@<z9k)9?9D;+y0x=Qi9?ya&
zNV_KziNst5bugN~9rh!VZL{b|QN|hN8DXWgl3#wTT+sMYqx&x-z-Fv=d0j!7US`|V
z5h|&QkIh&e{3&?q;q`~o(BsglxX5JKzq`3RF988IW3^l_pPKQ`Y|w}D*X3NtcMcW3
zKHYYDddx8vU`615;SM?bohoUblnVf$$XCRKU0zoZ)uS;(yW!YQRB3yGfHdjg5u~kv
zH4@LN&WcpUDt<*#h2W6z5Yg1r<Vnc}*o@T}V?YRPGevVVX#~v7Pw5FQ4J|p{&D{mQ
z72js-7p-$UQL$YTQ?NX+TqO}p$Z_X5MFptH@W;bSrhw6E^y|*)4%?sE14gTHF%Cgf
zZIeVImXM+b(Zu@3dISJK#1j$JAaxP|z|d|e(4EsAzWn)R*PWm5EF~Cm^2<qO)$uCP
zPGd1)uTU%DEN#{#YaDo&y_<UmOFc0r5lc8T{WBG;3NCbAm<0f^^jPGKYNCiC0Svsi
zdE>IzWc=Qi-u#532X!!7{eJZ{v-mN8S7w!Cu9Nz8|NY67_7e{L1^;;fWU`F5uWV)I
zMdiY1^A&d%4u`R8!4)idw`BTn190z`d;X=hrSRhF;#Rw+J+CmgkXwATn2!(wk|YsH
zkmw%|LgrtySNo8%1y0CL@E=@%AS)>-5$q;tnXvqk46xmb1uFmo5oqf6l#=%Kh;3w5
z|EYe?G4F`AD~fyt*VJh`UVE}OlkI}$H=DDl02LMs#2mT~T>9+N?=M3yBm26*)M+Zd
zSaUHO06_nVe)jIr-R0e0(ssTrr?<6N%68_QcLp^dXq>h=TPUS8R2C}v^xQmZUfWCX
z(XWpZTrgrASqq25Se`HEKe_p&w5+g<mlA-!!9E{7AG$H5;F4U{$mV76kfq0>VD7oR
zu3$|^jh%dp95-5x{@l#mjOnkZD=j@1IRcb?7F3s23x{qDm5TTx0stTo3Phf|pRRj+
zo{;pYlvi0)DdJ|l0!Ftki>r%UeS>{3?hoHzvCrE>x8A!|aOIsVu|C-F*s$PR@ofSC
zbba5oux}djGI*%9p*2VQhBm9TuvC~S%;YRlOIz**cj&qQ`G%%OlN}fN(LSp2!$!xz
kZv(5zX2So)=)eK|2_p9>>7otM{r~^~07*qoM6N<$g0e4B9smFU

literal 0
HcmV?d00001

diff --git a/zaaReloaded2/Ribbon.cs b/zaaReloaded2/Ribbon.cs
index 4192060..a9a1791 100755
--- a/zaaReloaded2/Ribbon.cs
+++ b/zaaReloaded2/Ribbon.cs
@@ -90,6 +90,11 @@ namespace zaaReloaded2
                         ViewModels.AboutViewModel vm = new ViewModels.AboutViewModel();
                         vm.InjectInto<Views.AboutView>().ShowDialog();
                         break;
+                    case "zrlDaniel":
+                        Formatter.DanielsStyle.Apply(
+                            Globals.ThisAddIn.Application.ActiveDocument,
+                            Globals.ThisAddIn.Application.Selection);
+                        break;
                     default:
                         throw new InvalidOperationException("No operation defined for " + control.Id);
                 }
@@ -118,6 +123,18 @@ namespace zaaReloaded2
             return Image.FromStream(sri.Stream);
         }
 
+        public bool Daniel_GetVisible(Office.IRibbonControl control)
+        {
+            switch (Environment.UserName.ToUpper())
+            {
+                case "DANIEL":
+                case "KRAUS_D1":
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
         #endregion
 
         #region Helpers
diff --git a/zaaReloaded2/Ribbon.xml b/zaaReloaded2/Ribbon.xml
index cd12b15..14f7544 100755
--- a/zaaReloaded2/Ribbon.xml
+++ b/zaaReloaded2/Ribbon.xml
@@ -25,6 +25,8 @@
       <tab id="zaaReloaded2" label="zaaReloaded2">
 		  <group id="zrlFormatGroup" label="Formatieren">
 			  <button id="zrlFormat" label="Formatieren" image="f.png" onAction="Ribbon_Click" size="large" />
+			  <button id="zrlDaniel" label="Daniels Spezial" image="dk.png" onAction="Ribbon_Click" size="large"
+					  getVisible="Daniel_GetVisible"/>
 		  </group>
 		  <group id="zrlInfoGroup" label="Info">
 			<button id="zrlAbout" label="Über..." image="i.png" onAction="Ribbon_Click" size="large" />
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 7c8dc1f..503e0f7 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -184,6 +184,7 @@
     <Compile Include="ExceptionHandler\SubmissionProcessAction.cs" />
     <Compile Include="ExceptionHandler\SubmissionProcessView.xaml.cs" />
     <Compile Include="ExceptionHandler\SubmissionSuccessView.xaml.cs" />
+    <Compile Include="Formatter\DanielsStyle.cs" />
     <Compile Include="Formatter\DocumentWriter.cs" />
     <Compile Include="Ribbon.cs" />
     <Compile Include="Thesaurus\ThesaurusBase.cs" />
@@ -301,6 +302,9 @@
   <ItemGroup>
     <Resource Include="Icons\f.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\dk.png" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

From 81619edcb1afd0d71ba9654ddf9321dcf2a707e0 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Mon, 27 Jul 2015 22:14:18 +0200
Subject: [PATCH 2/4] Implement exception handling and reporting.

- NEU: Fehlerbehandlung und Fehlerberichte.
---
 .gitmodules                                   |  3 ++
 www/PHPMailer                                 |  1 +
 www/postreport.php                            | 53 +++++++++++++++++++
 .../ExceptionHandler/ExceptionView.xaml       |  2 +-
 zaaReloaded2/ThisAddIn.cs                     | 12 +++++
 5 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 .gitmodules
 create mode 160000 www/PHPMailer
 create mode 100644 www/postreport.php

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..78265bd
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "www/PHPMailer"]
+	path = www/PHPMailer
+	url = git@github.com:PHPMailer/PHPMailer.git
diff --git a/www/PHPMailer b/www/PHPMailer
new file mode 160000
index 0000000..1193eb9
--- /dev/null
+++ b/www/PHPMailer
@@ -0,0 +1 @@
+Subproject commit 1193eb9d280f046fb3726c0124ea171f216328fd
diff --git a/www/postreport.php b/www/postreport.php
new file mode 100644
index 0000000..4ec082c
--- /dev/null
+++ b/www/postreport.php
@@ -0,0 +1,53 @@
+<?php
+require(__DIR__ . '/PHPMailer/PHPMailerAutoload.php');
+$reportId = $_POST['report_id'];
+$mail = new PHPMailer;
+$mail->isSMTP();
+$mail->SMTPAuth = true;
+$mail->Host = 'nephrowiki.de';
+$mail->Username = 'zaareloaded@nephrowiki.de';
+$mail->Password = 'ooZ1eiJa';
+// $mail->SMTPSecure = 'tls';
+$mail->Port = 25;
+
+$mail->From = 'zaareloaded@nephrowiki.de';
+$mail->FromName = 'zaaReloaded';
+$mail->addAddress('dk@doktorkraus.de');
+$mail->Subject = "[zaaReloaded] Exception $reportId";
+
+if ( $_POST['ccUser'] ) {
+	$validMail = filter_var( $_POST['usersMail'], FILTER_VALIDATE_EMAIL );
+	$validUser = filter_var( $_POST['usersName'], FILTER_SANITIZE_STRING );
+	if ( $validUser ) {
+		$validUser = "\"$validUser\" "; // space character deliberately placed
+	};
+	if ( $validMail ) {
+                $mail->addCC($validMail, $validUser);
+	};
+};
+
+$info = print_r( $_POST, true );
+
+$mail->Body = <<<EOF
+zaaReloaded exception
+
+User's comment on submission:
+{$_POST['comment']}
+
+***
+
+Technical details: $info
+
+-- 
+http://zaa.nephrowiki.de
+EOF;
+
+if ($mail->send())
+{
+        // Must return the report ID to indicate success
+        echo($reportId);
+}
+else
+{
+        echo($mail->ErrorInfo);
+}
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
index b61e024..64e6e0e 100755
--- a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
@@ -34,7 +34,7 @@
     <i:Interaction.Triggers>
         <i:EventTrigger SourceObject="{Binding ViewDetailsMessage}" EventName="Sent">
             <i:EventTrigger.Actions>
-                <actions:ShowViewAction Assembly="zaaReloaded2" View="XLToolbox.ExceptionHandler.ExceptionDetailView" />
+                <actions:ShowViewAction Assembly="zaaReloaded2" View="zaaReloaded2.ExceptionHandler.ExceptionDetailView" />
             </i:EventTrigger.Actions>
         </i:EventTrigger>
         <i:EventTrigger SourceObject="{Binding SubmitReportMessage}" EventName="Sent">
diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs
index 2eef6aa..286e84d 100755
--- a/zaaReloaded2/ThisAddIn.cs
+++ b/zaaReloaded2/ThisAddIn.cs
@@ -26,6 +26,7 @@ using Office = Microsoft.Office.Core;
 using Microsoft.Office.Tools.Word;
 using Bovender.Versioning;
 using Bovender.Mvvm.Messaging;
+using zaaReloaded2.ExceptionHandler;
 
 namespace zaaReloaded2
 {
@@ -46,6 +47,7 @@ namespace zaaReloaded2
 
         private void ThisAddIn_Startup(object sender, System.EventArgs e)
         {
+            Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
         }
 
         private void ThisAddIn_Shutdown(object sender, System.EventArgs e)
@@ -108,6 +110,16 @@ namespace zaaReloaded2
 
         #endregion
 
+        #region Exception handler
+
+        void CentralHandler_ManageExceptionCallback(object sender, Bovender.ExceptionHandler.ManageExceptionEventArgs e)
+        {
+            e.IsHandled = true;
+            ExceptionViewModel vm = new ExceptionViewModel(e.Exception);
+            vm.InjectInto<ExceptionView>().ShowDialog();
+        }
+        #endregion
+
         #region Private fields
 
         Ribbon _ribbon;

From edd81457cf528e92b274fff7741717f03a74c707 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Tue, 28 Jul 2015 11:54:21 +0200
Subject: [PATCH 3/4] Add format ribbon buttons.

---
 gimp/fff.xcf                     | Bin 0 -> 4341 bytes
 zaaReloaded2/Icons/fff.png       | Bin 0 -> 1132 bytes
 zaaReloaded2/Ribbon.xml          |  13 +++++++++++--
 zaaReloaded2/zaaReloaded2.csproj |   7 ++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 gimp/fff.xcf
 create mode 100644 zaaReloaded2/Icons/fff.png

diff --git a/gimp/fff.xcf b/gimp/fff.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..404657aa7fec9b291f84a52cc01ee9afa6f31b3a
GIT binary patch
literal 4341
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

literal 0
HcmV?d00001

diff --git a/zaaReloaded2/Icons/fff.png b/zaaReloaded2/Icons/fff.png
new file mode 100644
index 0000000000000000000000000000000000000000..2491380f8e86c1e0290cf80adc759e3b1695049d
GIT binary patch
literal 1132
zcmV-y1e5!TP)<h;3K|Lk000e1NJLTq001BW001Be1^@s71bs?k00004XF*Lt006O%
z3;baP00006VoOIv0C)gy0045R_FDh|010qNS#tmY4#WTe4#WYKD-Ig~000McNliru
z-v=B72?ZhY*LMH_02FjZSad^gZEa<4bO1zQZfRv~AWL##b#u8!DU1LB1IbB5K~z}7
zy_R2WQ*{)_KexT@TBKcF25hjAu_Yv9=!_(g7)gq(D)MF^=!4Puu<*2MbfMF1X2CGR
z_5ksvnF-a%gD+~Lk(W&~B;kb-FiRkrxCtRB3e}Cdm9Bq$;CGv|yI<|?QaCTabMO7$
z^Y8cjp7S$e-Ao|FrPh(bQ~4bLh7B=lAy9~jp|dd}ZJ2-u=<JOe!$5{uHxqd!v2G?T
z8(#r=U><l&+BDTV2XyxIO}7CUE?4%%KvP@-mVl9=qs;(az$g%rfG(Dc2N>67x<U%I
z0lv`zO!X1qul~Wm+x=@o=F(Cs*Z;o%vSpzQ;P5*ahW%?oX7cV#DiPoJxr$-FP~7;*
z=cWLLjy9j1xjvp$nXPpR7uFh)tL36AHgM|`Yn!&VzOvr3tV?rT=wUnHJK&DetAO1=
z)Bn}U6#8dCT2pnL6dH9JmdW6${Eq6-W{=Yd3KAQ*^;C6ellP&1<7w-CBEJ8NscUDq
zNvu_aG2jM}1)4<!M|z{iC0pU7gsliVN~9WAN7SQqZ4Fk4@=n<`C?XNv%aVL3CxW}c
z_rL@7J_sBr$H3R>d7Uy+Rc-_Toq$np3a5dLdj8b<P`9!D)##BcFG=vnAJ+Z+@BE#N
z-N4&|uLT|)dgDy1ldaTlV^807TQJm6W$6GOuYciKUwuNra=;5(12wf<d>Y*cJOhME
zM$j8IF7@<Hx7E~c@%2WH<D!`^3D|a^-UQC8Z9|dj;R!R0R!bF*B(*bE1iy$~m@XJ_
zxwAH+joXQ2--Tt8%Vs=I&ViN-)_8Nm&T`09G=)+!CUCMdwE&Gy40M!TgU2bl3~sBw
zk}vV^>p<X91TZF?9|WF!92GdDrYeFI6uXrGFNSKGn)gILSl`sLI~WModA;6%E1kZd
zOD)c278jD4<h_~H`5%Y>y!qRO1t$TdZI00dQ;^r*{BnEyvxiy$=4O9S&s;w@`yh2c
zYkGXHC)Tbr1A#hkYVn_JDd#c($>xM;I@)_i<K~^43Z(7dIH`dofk~B^TaDkW+S<H&
z-s+S_E3O+(x<(?t|BtC_XKxFqhB#Ypps}pEe*B|`NjWgAKCfv{qoV8XEj1&}3LWOL
zA}#-15qyii0;h`{xDoB0(rpf_38(9JvI61N9Kw>~bkwZ25ozW5J@3_4`GRf$pTD~B
z-`;%#8ze3mtlyQ-=UhMiFmyF}@7D?j5Pr8_$AXTR`x|Vp8UU_NetXkN0F@d>7e((_
y5Q%w<;M;)eO0r;9*pfEWMeuW#4xnSTKmG>|vNCpHAFs6l0000<MNUMnLSTXjDGc%e

literal 0
HcmV?d00001

diff --git a/zaaReloaded2/Ribbon.xml b/zaaReloaded2/Ribbon.xml
index 14f7544..3793cc4 100755
--- a/zaaReloaded2/Ribbon.xml
+++ b/zaaReloaded2/Ribbon.xml
@@ -24,12 +24,21 @@
     <tabs>
       <tab id="zaaReloaded2" label="zaaReloaded2">
 		  <group id="zrlFormatGroup" label="Formatieren">
-			  <button id="zrlFormat" label="Formatieren" image="f.png" onAction="Ribbon_Click" size="large" />
+			  <splitButton id="zrlFormatSplitButton" size="large">
+				  <button id="zrlFormat" label="Formatieren" image="f.png" onAction="Ribbon_Click"
+						  supertip="Formatiert den ausgewählten Bereich mit dem zuletzt verwendeten Stil." />
+				  <menu id="zrlFormatMenu" screentip="Formatierungsmenü" supertip="Öffnet ein Menü mit einem weiteren Befehl.">
+					  <button id="zrlChooseFormat" label="Stil auswählen/bearbeiten" image="fff.png" onAction="Ribbon_Click"
+						   supertip="Zeigt eine Liste vorhandener Stile an. Stile können bearbeitet, hinzugefügt, gelöscht werden." />
+				  </menu>
+			  </splitButton>
 			  <button id="zrlDaniel" label="Daniels Spezial" image="dk.png" onAction="Ribbon_Click" size="large"
 					  getVisible="Daniel_GetVisible"/>
 		  </group>
 		  <group id="zrlInfoGroup" label="Info">
-			<button id="zrlAbout" label="Über..." image="i.png" onAction="Ribbon_Click" size="large" />
+			<button id="zrlAbout" label="Über..." image="i.png" onAction="Ribbon_Click" size="large"
+					screentip="Über zaaReloaded"
+					supertip="Zeigt Informationen über das Add-in an." />
         </group>
       </tab>
     </tabs>
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 503e0f7..1aa5e8a 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -294,7 +294,9 @@
     <EmbeddedResource Include="VERSION" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Ribbon.xml" />
+    <EmbeddedResource Include="Ribbon.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Icons\i.png" />
@@ -305,6 +307,9 @@
   <ItemGroup>
     <Resource Include="Icons\dk.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\fff.png" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

From 28b31533c77148ce8deb15c05d332fb15394c54c Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Tue, 28 Jul 2015 11:57:12 +0200
Subject: [PATCH 4/4] Prepare release 2.0.0-alpha.2

---
 HISTORY.md           | 10 +++++++++-
 zaaReloaded2/VERSION |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 9a49239..41bda37 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,14 @@
-Unpublished changes (2015-06-19)
+Version 2.0.0-alpha.2 (2015-07-28)
 ========================================================================
 
+- NEU: Fehlerbehandlung und Fehlerberichte.
 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.0.0-alpha.1 (2015-07-27)
+========================================================================
+
+- NEW: First release of version 2 series.
 
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION
index 39babaf..0a0ab65 100755
--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@@ -1,2 +1,2 @@
-2.0.0-alpha.1
-2.0.0.1
+2.0.0-alpha.2
+2.0.0.2