From 37abba17b8baba60e3935cc159abbdc89ff41879 Mon Sep 17 00:00:00 2001
From: Flynn <dontContactMeThroughEm@i.l>
Date: Fri, 27 Jun 2014 16:46:13 -0700
Subject: [PATCH] Modified groupchat notifications

---
 group.cpp                                 |   1 +
 group.h                                   |   2 +-
 img/status/dot_groupchat_newmessages.png  | Bin 0 -> 605 bytes
 img/status/dot_groupchat_notification.png | Bin 761 -> 764 bytes
 widget/widget.cpp                         |   8 ++++++++
 5 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 img/status/dot_groupchat_newmessages.png

diff --git a/group.cpp b/group.cpp
index 93fdd7254..0f42d873f 100644
--- a/group.cpp
+++ b/group.cpp
@@ -19,6 +19,7 @@ Group::Group(int GroupId, QString Name)
 
     //in groupchats, we only notify on messages containing your name
     hasNewMessages = 0;
+    userWasMentioned = 0;
 }
 
 Group::~Group()
diff --git a/group.h b/group.h
index f88cdf2bd..67f5a0e06 100644
--- a/group.h
+++ b/group.h
@@ -32,7 +32,7 @@ public:
     GroupChatForm* chatForm;
     bool hasPeerInfo;
     QTimer peerInfoTimer;
-    int hasNewMessages;
+    int hasNewMessages, userWasMentioned;
 };
 
 #endif // GROUP_H
diff --git a/img/status/dot_groupchat_newmessages.png b/img/status/dot_groupchat_newmessages.png
new file mode 100644
index 0000000000000000000000000000000000000000..98e6cf5b118de29026927d8b09d09ae51cbec998
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-Ub^NCKAQAwO9ZE0qRLa
zK~y-)jg-%76Hye#f9J$WZ5o$i3q>1;ASj`vg4Jpk;sdBJkez~S_oAEn3hKs9m)4~|
zK&mu_MoI!!hBROVl`e|tv@w&+b&>g(q_#aUaOd26zw__=t}tS=AAKfH3kvundkRdr
zE{#%l$S=vC+`2*235OS7_N|29f@VR+LGo1-9n@do+?LTKv8x8G7}!~m7{sobIQW}3
zUzg95Uo#iUaM$-Zi$yyvy!~91pM`gQI@5{|=sq~N1POZpP@adCm#BZ8*FbqBksdBj
znk9Lj+cap9Xn7taUo!(#3!H*r*UT&60sk@ec;qa~i|`&ENLWg9LCDq3oO-l4+J0-X
zf3CysLHg4)es|Cx)Qh6r<9IvMtEQIPGJ^t|4nPv)n>zsrD$Ek_NP{op1F(G(5HdJn
z1wNqa5zW5)m(?N2!|hw<a${ruLqFzKxUegR_6^wuo*n^UaCuly6?%Ur2Sum_s_Vh_
z6kPgZ*eU8V@ECAM0KNnFn<aT~S7LHH1qm2iF)%f7W)FO}Zl=g>n#`#lOFhE{_1K=o
z-Ds4uo?SOl!M=gkRY_<kBu~(=&b1%3WhRPvrDf>uC6t{I;gHJmYX(1a{BX>kVdst>
r{uBT_>l;?K#@`YwU>}-`<Ldqg1hlT69yJn<00000NkvXXu0mjf|4j#`

literal 0
HcmV?d00001

diff --git a/img/status/dot_groupchat_notification.png b/img/status/dot_groupchat_notification.png
index 3e773d0e06c6bd225ff2c5dfbc644b555ec45fbf..690d5f051115fe4a05527575bf8b086ead87d1de 100644
GIT binary patch
delta 691
zcmV;k0!;n+1^fk&RevQXxF{mH0007sNkl<ZILnQcUuex?7{@>FyYt(2{)m~Fk~)5V
z$efljjyR-kNs>!NO=41Wqm<%8A}*90Q7EN$xfn^V?BZ-P=4b27pEk$XQ5M=!&at!o
z&UqgfJ2dn6d-wJ{&*%B}^gfSbnif1Tm1X7XfQD@b!hj$60)ITyaH}kvz1|-S<)+rC
zsgLkO*{@4E2h0R|@OT7dG*lXkO@ITu!D3%BqV7*OfYUAKZCAv0<-XG))%-?ww=~$U
zys%yI99Q=I<ivKR8Mp#m@Y+&`htDi5IGqwDz!u}-$6~Zp(f(qk8i?F2gmP87&A?{;
zl}&>i)I(LA!G9~jZK|QM^)i-;at+uu%}AasCzCOCI{ZXtX+<wE+El}8<+yUxz*%jv
zVlbkf+pb&#_VNd5kCwr;>XPHiZUe1&G%DMbI8dIfRdwNn)al7#{!L%>%EE#iAHCA2
zRiDfRS2f^hkH^I>Tlu$U<hx5Yrqui~4GCS!QVmoXi+|6>ggO5KL959;18EHv8u*CE
z++sZSKM(>87oArb_@K2%9~K({CdRn|c>h4W3oP&Ntm!IL7>gA^uQnF#fMds{KDACI
zfm4402w4s$N+J^(zuph{v_-peE=ie*@)F4Tf~*->qBD!0nj^poAUFl^9%xC{s+)FP
z789fgh<_(*)%M9B8<%>5+ygp7V`gXH`jT|`iOllliRFcP+GEI1wyQrD%Gn8V@VE`k
zF+$zYD)r{a0y?fV8Mq33&>qKfYew2qYW~>wc=eFXo=DSd;5aaj#g1e|J@{pdolc3G
z02hH;APXdb3{VL~03UEi(sJl^y?*=KQvh(XAS}AIj|KzVfMvjJU<8X^zH%$MR`pD;
Z`38#_{2MA4!YKd%002ovPDHLkV1i3VPtX7W

delta 688
zcmV;h0#E(?1^ES#Reu5+I)&WK0007pNkl<ZILnQcO-Phc6o#L3=NmIkbh4sV5GV!J
zq9_O<$5GqlqFqa|nJE};oZPg?&Fq8xncQSEYTGd=652#FR!EeHA?;e25QJv=Gp1vH
z_p~s?)XH~vFP!JT=WyODY*EYe#&WOYxvnA&C`W<4po<_M5Px|xZ{30ZK>y0-8rgif
znYkKPkvl*sFsjO1ft-qz3+e|dfk_b!b^7~WY=gwIp}U}MK*m^4w4=87!&aAVnP9yY
z5<rEDguDI8felD38@vYG7f5`bUTjNWNxRWZ_>dU8B9@$r7CRot+`Z5{-<)aQ=QS&X
zC;_X+p9nm7BY!Q=8_ONX`3Q{p{6{X%KAZKJqMU-PZFPc*rz?<jZ)Tdx5Hqgu&F4RI
z);L~o7$~(yqj8B_Q?#@*06^4@WkaSj&_9RJ4xFCPPSr{*8+-*6cGaZL#j;HY!OZX<
z*}}Znv8#?<E%_>{y=Hyl^6vLjd3GVQT;Oz6rI!&VRDa}{0ep&`Tc5Jzb^{S)eNU9{
z2tEVMh{~b$JBrzr72We2cUV=Y4aj?hY5?oHvKvO(f!u23Rm2B+(jemo^f6G``XW@9
zs2f;N@cgqCD<*y-Z42Cd7;rH9*w`P%4}nQBdhgcjU`e+>W%&z8!F1LpZCfT(0ki`{
zoz;C~CVz1$kyk5Wpd!Dfk0P%lWnDEXSJW05WUr`-S}B}Y>*=mZ+1BBvN-O#l_$g|m
ze`aSm*oe{#Oe=ERQ?M}DQI%fa$jwM-zx~NIRNH~PieB#a_l;~zaWoS?Z^ZThXMiQp
z2}N=O<-jSx0fyFGxzSUX{Iug&01(%>nSD7`Zz+@pf#VAMfiH-T8!Jyb0;$ohHNOBE
W0S()+Bs-n}0000<MNUMnLSTY?5=w&r

diff --git a/widget/widget.cpp b/widget/widget.cpp
index 3c63e2490..0849e764f 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -430,8 +430,15 @@ void Widget::onGroupMessageReceived(int groupnumber, int friendgroupnumber, cons
         {
             playMessageNotification();
             g->hasNewMessages = 1;
+            g->userWasMentioned = 1;
             g->widget->statusPic.setPixmap(QPixmap("img/status/dot_groupchat_notification.png"));
         }
+        else
+            if (g->hasNewMessages == 0)
+            {
+                g->hasNewMessages = 1;
+                g->widget->statusPic.setPixmap(QPixmap("img/status/dot_groupchat_newmessages.png"));
+            }
     }
 }
 
@@ -473,6 +480,7 @@ void Widget::onGroupWidgetClicked(GroupWidget* widget)
     if (g->hasNewMessages != 0)
     {
         g->hasNewMessages = 0;
+        g->userWasMentioned = 0;
         g->widget->statusPic.setPixmap(QPixmap("img/status/dot_groupchat.png"));
     }
 }