From ea64707439c1f2004c43e76cbeb3e3f4803b36fb Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Fri, 15 Sep 2017 11:23:03 +0200
Subject: [PATCH] mini fixes

---
 ChatController/ChatMainControl.xaml    |  13 +++++++++----
 ChatController/ChatMainControl.xaml.cs |   6 +++++-
 ChatController/HauptKlassen/Chat.cs    |   6 ++++++
 PrototypChat/.vs/PrototypChat/v15/.suo | Bin 90624 -> 141824 bytes
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChatController/ChatMainControl.xaml b/ChatController/ChatMainControl.xaml
index a89bb75..03123f2 100644
--- a/ChatController/ChatMainControl.xaml
+++ b/ChatController/ChatMainControl.xaml
@@ -278,10 +278,15 @@
                           <StackPanel Orientation="Vertical">
                               <Image ToolTip="Dokument öffnen" Height="100" Width="150" Source="pack://application:,,,/ChatController;component/Ressourcen/ClipboardDisabled.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
                               <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}"/>
-                              <Button HorizontalAlignment="Center" VerticalAlignment="Center" Content="Dokument Anzeigen"  Height="25"  Tag="{Binding Dokpfad}" Click="OpenDokument_OnClick " />
-                          </StackPanel>
-                          
-                         
+                              <Button HorizontalAlignment="Center" VerticalAlignment="Center" Content="Dokument Anzeigen"  Height="25"  Tag="{Binding Dokpfad}" Click="OpenDokument_OnClick " >
+                                <Button.Resources>
+                                  <Style TargetType="{x:Type Border}">
+                                    <Setter Property="CornerRadius" Value="3"/>
+                                    <Setter Property="Padding" Value="1,1,1,1" />
+                                  </Style>
+                                </Button.Resources>
+                              </Button>
+                          </StackPanel>                         
                         </DockPanel>
 
                         
diff --git a/ChatController/ChatMainControl.xaml.cs b/ChatController/ChatMainControl.xaml.cs
index 1698f00..979244a 100644
--- a/ChatController/ChatMainControl.xaml.cs
+++ b/ChatController/ChatMainControl.xaml.cs
@@ -676,7 +676,8 @@ namespace ChatController
                             {
                                 if (liste.GroupId == neu.GroupId)
                                 {
-                                    if (!liste.ReceiveMs.Equals(neu.ReceiveMs)) { 
+                                    if (!liste.ReceiveMs.Equals(neu.ReceiveMs)) {
+                                        
                                         liste.ReceiveMs = neu.ReceiveMs;
                                         
                                         if (neu.GroupId == aktuellerKontakt.GroupId)
@@ -752,6 +753,7 @@ namespace ChatController
         #region Lade Dokument Herunter und Zeige es an 
         private void OpenDokument_OnClick(object sender, RoutedEventArgs e)
         {
+            Cursor = Cursors.Wait;
             var btn = sender as System.Windows.Controls.Button;
 
             if (btn.Tag != null)
@@ -762,6 +764,8 @@ namespace ChatController
 
                 LoadDokument(link.ToString(),filename);
             }
+
+            Cursor = Cursors.Arrow;
         }
 
         private void LoadDokument(string link, String filename)
diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs
index 4261a6a..31f1b1a 100644
--- a/ChatController/HauptKlassen/Chat.cs
+++ b/ChatController/HauptKlassen/Chat.cs
@@ -733,6 +733,12 @@ namespace ChatController.HauptKlassen
                             timestamp = DateTime.Parse(lastMS.Timestamp.Date);
                         }
                     }
+
+                    if (message.Equals("") && value.LastMessage != null && !value.LastMessage.File.Equals(""))
+                    {
+                       message = Path.GetFileName(value.LastMessage.File);
+                    }
+
                     //null steht für employee 
                     Kontakt.Add(new KontaktlistBuilder(value.Name, AvatarToImageSourceConverter(value.Avatar),
                         message, timestamp, value.Oid, null));
diff --git a/PrototypChat/.vs/PrototypChat/v15/.suo b/PrototypChat/.vs/PrototypChat/v15/.suo
index 55dd87bddb19fa346faa1f6d8e24bac38c7df6fa..c6ee189eb522c53e33b1e1e305a9970059cca244 100644
GIT binary patch
delta 4321
zcmeHKe@v9;9e=;~gL@B8IF94^4KE;-q8^+mGCan?9m)^|4ywgD239*`n9@kI;uH?l
zxTLtkeWP!iT7tvXWnFE{+i*!^^-M|AOw-oRc3EcDtXr44{s32Mhpn*h_kJ`87Tabn
z`(sbuPoD4d`*}X!AJ6-EMzx;HVqbo?5KcxxSV*#pFf~0r&DB82AXt?1)>7ziYxSyH
zquRP2`h(i~JGh5?<l<h{UO0uHst$mN9qKN)jFalDu2gEHNxn=bDw_!rv+8-J7^+)9
zFwt^cz8M;oGNW$-$ytQtP@P11EFs)CJyg#_KM@3cQgamZQ;l(TRPQD<gxc?;`~aS}
zKEo&RkL|p}Np#7}W}YOHMvH{R&}>nZYY4n^-pN#dOZs<s+k6a8x7)U!+HbpUd_p7N
zVbhV#;z=6*3j*$ll;Va$YyFb)r$h483oQ@8uwfKLiE5Y_EX&BjiG{7-cC0pF4>%dS
zPQ%tApG$<L;87kn*MnwhXnyU_NH~I%@fS3F=s+KwNT?N=1~#(5CfXBwy(X7vr7~+h
zSZBJ7uVpU9_Sl2)>}?j=0Qic^X5je`5jdg0(1YXIMl?$KieGZTaEcwwyvwk@S!SJM
zZR+EOpOUbTz?I5GszJ40MGB+Bw3>1aK}(1r=m;V~PlzNeAQ%V>2|PNQawFH#Y&<@e
z%OU4z_vU-h_Fk6J*!VPzB^|yur@Q&;#KS-8LtBPfZu%kQ;8=bP`m-IhZ3|j*8#9C!
zp<UP_IE5Vn$tjdwICk{9G>X}d%IQZgeDEuL)0XeGyrKtY%tBzsv;!oJ;H3FpuwjNO
z6&)*AXrG|E!&n!;4qfqfuc=ZqgWnoGET-lqq479jsuh<}A*{PF^>@-;jaJB`VFBG5
zDo8p^;N(r)k0lvmf18N?+Y1zbngi|<8UInu#f3G8j>4Vz))EV=UC<J2@}-SL?z7qT
zq^kmStnzy^N5vd!Vb>4(Q)WZZY_n?7l|+<FC|QQ|z$||QO?@4kG0rgyqiuY6g%k9!
zoL0*WZ>fD{?{Ja}L=H<ForCUG(d#X8i5zt}G6f8XgL^S{6jkX10hNPu@JvM>Z9Nrw
zu;Z!2-h|P4U3porw~{QA-9Q(bU}(Y)5o~H_pTQd?RRQ162(>BgYia<UNhRJz1~gdP
zU=a6PSLshv^K*pvDJcKG^=~Booxqb`rTia+4+tL;J|cWf7$b}mt`Yu8V85K8{8Pep
z!e@kk5he*Y2%i(aAlxKO5u#Yh1aFa3FYwVhUIl1*n*^q1ofr=EK~|18XrjY?+$1nP
zUAm1VQNro63Q;71FADCjwEwz>G?PX}o+dCeyG?^Kx%P92xSvF(C#LEv!r<awyg$BD
zsjR*T`iMqBs4A~_7Gl56iOn0%sOgrL&!<B=7S|-i@v?2gHesu<Ti7ME3LSjE;*V=q
zQkce*HTLA`X^#K9sl!f+Gj3r!b=pp`W{<EPyN@nb(rSwU$Lp#W-r96FJqugi<@iqh
zONrHAIl-l#Lr{s=>ekH~ePT%><~Eq|Vxw`WuK~a@w~x}bQ4RA>U4Y~7x|N<yR)C7R
z<ME;U;&8J&6R$L`NnKlB{k{2iS%3p|Zm8i|qHj5;um!v8VsWs3IbJ-lS2@19RnnC^
z>z(93a-9UpN^#ALxkJ}Zsg#d9mV@e`+k554H&MX8Vp0H`#qAXU?<S*h{}pe!OJvWK
z2qF9Fh5wttrJny46Ud2vkep@@UDcc@a^U{X_4wNc`@9Bx2v#C=u8o^zaY7k+Y#W~N
z#LhdK&mM*Tladnkh)I2yOm7@}IxGJR2XQM>_whTq`#{|W%-p;epMUf;_6?*d<M01f
z1*H`CW``G!TeVkTGGN3f?<jqrRcle|a@~a$u4r)U!RM9J0}X($?n+bIj-1hj)?5)i
zD^BdY9*vquJxb@`4&CggSJTn+*q|~vut87%XXPW2a7riNi~)lx!Yq%)K%)G59=Ou=
z@nl>gfS#`-k>5k5;(~LR6H2L$KA+75S>S81!EYi)lHfJK6Pse?Kdy%CV=0g$e>Vkk
z`6VLA7Lt7a6ll_@>Cy_^6|h=9FF~oAo1JA)B6~8x6Iq-Td_w63-^=A-0=X{-?DCch
z_=)cgCsb)<s(sRTu@YX0im~$4fi!;ZLCQtn&o@D(+QJu5FlGArC*MqP9h1+N!*2P*
zAAnij{eAcg#j;jxj^8!|R-dB@{A$_X3??)cTJgQdtV&bwTk7FO4v_neL`v-%(BMaf
z^`ZZK{$b8l^84OgFq_RPom`bi6x_@MgWQ=1T}*CVdXTmNt079mWCpnP+4A8H-K|Xe
z9Ck?4eo32pb&#)@XHdnYw8*V4D4tE4Or+W6z9JZ54o}wc6N8_5-}Z?SL*wZp68MQ>
zCQK>UPCW-BYamfIV-uvF^vD>dKA1B7P7?BbU%26IwX7)uiPdVB)kTmIlwMyC&bj)O
zNuLUOq%^!oiq=>k*pnYF_+G4qRjOMw%~u-#bbc*OA8P^!7<^?-@RSO+;h+Chg7!iY
zw{%)?SGP!ij;xNYf%=lPMY5v>{9&_r9OI>>{PR8cy+>w(4#|UOvR7l5WWpoa1+Wz%
O&90`$l;X+tz`p@+w)CX{

delta 2473
zcmbVOdr*{B6#ve*55C1scbBIKvMzxu0s%UaM6s}|vjdZ^fM|_5Y>xSegh9+FvPn(O
zM3d|VuZ`L;D#(N)xW<=hLgS8EI$=iBA5MQ&_D78{6FqQ7w{yO4!N*uucjouqd(M5G
z-#O==UEi?e3+nb}+eIPVOo9-FLz3@=LLt&>5Q&I#L}0143;bgBRMW`jcYn?N8d6a?
zXlL8S?Qod=CN@DW+ooxR4QyPK(l`SrBM}mUPBUO{Md%S`#8iY45skoUrNxEEw^5=!
z)X*qpetNi{iT#xDI4Rt#E7k8Z)Xf$Ic0k)^UmTuag1rZ^6j6qtv*`|MO(?f`yA)o<
z4UgazF+<^{?!5b*u+@rZk@i7;<OeMx84({|L+dO!CVtZp#E)zuelZ9-^CA57A%!4&
zPs{%ky~rw7<<e^DRJJbC3U~UvTi}#22of1YhOwd<b~g4{^}ky;FN0ar>{`kdWn+Ep
zur^~-h<gJ%*toe=nu{umDy@MXfz6h3&}N0@DSL464gwnsr34Lv9Y<*-;cDIcIOyj^
ziDD@WrWSBdqUfT5KRT$5z$rd(1TxrIv`4a`M5(CS5z~As-vulvX0!UIml%LzLB6F~
z!#o^NLJF)UDJoz}%z$Xh3-Su(1!cM7Ay3kNBMo+<!iNZqB^gELOK`B-ltSJ(TPz9;
zCOE*K8)UAyY&Mo#p{19jS}@Ne(H-<`6vdb`UN&BZ`M?Kfi$3N_aQM^Qf9JX9npta-
z>7PxDzt^-~cugaMbUY_sjAfN6&$AkvS@zjQA3Vxkh0T7~PUv9`t~?VRaT1T}MNmri
zc?-aA^O=e+?`!+r8f2*scWCS7pSyU=9B~1+ehz7D#Ac=h#*Io#$5>xyro2(V#q~h!
z*=EaP1JJ4`aD(a?%kV>!ArQ*L2s)p7k+m<VVzx>P-)R%~$JVS}ztLH<vA(XRI%})<
z)oMIO&=>d<e9VzE=r3?lD0J<pEMwail}c2A=z*zM75H=&DC}a}p4p+JI<T9KJDXJE
zN~no=0;120ado&Pvh;D3)tHtHF=tVqo|5zCa(1hzM54DjYjVDL$N*H)Vkb4u=Kt$D
zw@aERmg?nhk75m3r;_QpDp8rBvO)?Sd9;F!FZhBv<8s(oKBj#RswSQiK7?j}vFkpQ
z1NFsAzyNd%IZC}KKQUk``2qCHQFEn|-E!`JNM@YH$ri8OObJg;I*<JT0xOCJ_-98T
zpJj_v1MbCFz%Yg-p`^In`6O$}bFwPWxj<IKwe)@?<bvU1x;mH3zbc19zS02k%-?;G
zWi@okts9^q8AB=&MJiAV&Am8KV@uh2H@1r^wB#^l4LxBB@>{a#h8qUSwXoc|&{^&Y
zKvxJ_YNPyar$Kp|*6@x%eNQuVwt`5d#;uxt4a?TOW~b{fWd67&IG649G$VsQwSkv+
z8@0T71-RMq6=m$)3yT7-l{c&`p*#Ljywd0J6Gy=&-)sj9bnXMOzZH%}@Y@H#DC(p6
z$Oug5Uygt)*+6wu0x%GN?4>CK!|{d602PID&Ot~4-g*e4<h6&uE9HH&djB6=DJ|9J
z73zeSgf+r?p&q|=LZ;vqUPII)>VzzzR@f-46_yD+G!9K%JO<CozD`)B<*T~Eswu(>
z3zsl1zHabEmSOHuybS^$9e{w`*#nuthfY8N$y>OwAENnBC&Av<A$s}f8OZ0;df_xm
z2jmOAPzma`)2Cp*hA(Y{P4cE+ASCkJBVgpaMxc@S$0SdZQ@E?dCs_l?IioNXp~+gk
ziT8d2vt+#WJCNZhSmCjc(K-mjp?H|1hiB?Yx9+aYBM*a(4Zf-8*E=AUAMXH(w|9Vj
z+J@4uZ`)rlyYtZpxIqwPbV{<0uL{B82g!ffAzDC2?j_nuR((^=R%IW3Mh7n9*TUaE
v18d~#pThT|nf^viH2QHj%R@nU1?2N*AqMW7rK}b>&hFVaQ*`uSf<et+dT}LT