From 85061454a65ba21e37dac7be90c34104b38e20b2 Mon Sep 17 00:00:00 2001
From: ingvar1995 <IgorN1995@yandex.ru>
Date: Wed, 15 Jun 2016 23:27:57 +0300
Subject: [PATCH] read receipts - spinner

---
 src/callbacks.py       |   5 ++++-
 src/images/spinner.gif | Bin 0 -> 1862 bytes
 src/list_items.py      |  11 ++++++++---
 src/profile.py         |  16 ++++++++--------
 4 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 src/images/spinner.gif

diff --git a/src/callbacks.py b/src/callbacks.py
index d0413de..a33fd35 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -148,7 +148,10 @@ def friend_typing(tox, friend_number, typing, user_data):
 
 
 def friend_read_receipt(tox, friend_number, message_id, user_data):
-    Profile.get_instance().get_friend_by_number(friend_number).dec_receipt()
+    profile = Profile.get_instance()
+    profile.get_friend_by_number(friend_number).dec_receipt()
+    if friend_number == profile.get_active_number():
+        invoke_in_main_thread(profile.update)  # TODO: improve
 
 # -----------------------------------------------------------------------------------------------------------------
 # Callbacks - file transfers
diff --git a/src/images/spinner.gif b/src/images/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..33e021339fecb299afd0069b1c72ea4332d10fa7
GIT binary patch
literal 1862
zcmZ?wbhEHb6k!lycy7S}1dNP~OiWD7%*-q-EUc`oY;0`o?CcyI9Gsk-TwGk-+}u1o
zJiNTTe0+TT{QLp}0)m2qLPA2q!ongVBBG+AVq#+A;^Gn#5|WaVQc_aV($X?AGP1I=
za&mI=^70A_3W|z~N=iz~%E~G#DypigYHDig>gpOA8k(A#T3TA#+S)ogI=Z^LdU|^L
z`uYY228M=)Mn*=)#>OTlCZ?vQW@cvQ=H?a_7M7NlR#sNl*48#QHnz65c6N65_Vx}A
z4vvnFPEJnF&dx3_F0QVwZf<Vw?(QBQ9-f|_US3|_-rhbwKEA%betv%b{{8_00fB*m
zK|w*m!NDORA)%q6VPRq6;o%Vx5s{IRQBhIR(a|w6F|o0+adC0+@$m@>35kh`Nl8h`
z$;l}xDXFQcX=!Qc>FF668JU@xSy@@x+1WWcIk~yHd3kyH`S}F}1%-u$MMXu$#l<Bh
zC8edMWo2dM<>eI>6_u5hRaI5h)zvjMHMO<1b#-<1_4N%64ULVBO-)VB&CM+>Ev>Ds
zZEbDs?d=^M9i5$>U0q$>-Q7JsJ-xlXeSLlX{rwXrOqe)v;-pEFCQqI`Wy+MPQ>RXw
zHf{R!=`&``m^pLitXZ>W&z?PJ&YZb(=gylqZ~pxG3l=O`xNza3MT-_MUc6+<lBG+R
zE?c&2`SRr}R;*aLa^<R3t5&aGy=KjtwQJX|Teoig`t=(&Y}mMQ<EBlUHgDd%Wy_YW
zTeoi8wr%_N?K^ht*tv7(u3fu!@7}#<&z`+|_wL)bZ~y-N2M!!Kc<|t%Lx&C@K78cJ
zk)ubC9y@mI`0?W>PMkP-^5m&gr%s<fedf%WvuDqqJ9qB<`STYpT)24g;-yQME?>TU
z<;s<-SFc{XcJ2E0>o;!PxOwyDty{Nl-@bk4&Yin=@7}w2@BaP!4<0;t`0(MQM~@yq
ze*EOglc!IgK701;`Sa&5Uc7ku^5v^nuU@}?{pQV^w{PFRd-v}B`}ZF{eE9hB<EKxb
zK7aoF<;$0^U%!6)_U-%k?>~P0`1$kauV24@|Ni~w&!4}4|Ni^;@Bjb*ivPL&TtkAL
z9RpmA^bD98f%!r4CkrbV!+!=HQ04$-69$eFhX0&09vc=MZ2rF`!|_DGLZ>$7%S!}b
z6g=D?xR}ptipNDIw;ncgKb;?j$tNbVIXcC73h>EHn`gsY@=_@2%nYW?eJK^eY3Jse
z)ox0esm_1MrISxgH%mY>sM)*spL2`Hg3C(+mIf`&64gGkHng4ZiB?#S1HvJU42%py
zK*+$64|0fxfv;2(hp?2%j0p-d7Odi2R~E58Jlrm*9<;{dgOW>&v}M_!855EYPv-sn
z#L=?g%8Gie&`l*Tjh=Z;F^NBw^7Fi^|GW-?xnG`eCSF*;*(s!25%OZcODBt#?x`!9
zAuEDb&f6pPb-BYDUS=lTZUFiZ>V|}QHb6J{OlHIG20=w9%Yg1_SlrMlG*`xy3*iQP
z|9Paj!N6Y*77j`-KsU57vtxIIu&R@#f$uCVZkT5?7Z`d7Hvr?4G&cwcD#5~G5y%Z^
zCgX5}ZKac?0N)%eZdmL#7Z`d7H`wb&k>&=2K$sgAsQUxm;L^f@JsjM7f#Kjk4~rY3
zw#)&B9>NX#O)^Py!-dJ}&~SLLA`p}wrr>bH)(l5W0l`IB+>m)`4lwi(Zm_o~z~u%;
wa0W%s7X?=|pl(<orVDffFok0ehs#SGEe!&(xuM{}9AM}n+_2xK5~~}m0Z~^9YybcN

literal 0
HcmV?d00001

diff --git a/src/list_items.py b/src/list_items.py
index 34bbdb1..7501aaf 100644
--- a/src/list_items.py
+++ b/src/list_items.py
@@ -98,7 +98,7 @@ class MessageItem(QtGui.QWidget):
     """
     Message in messages list
     """
-    def __init__(self, text, time, user='', message_type=TOX_MESSAGE_TYPE['NORMAL'], parent=None):
+    def __init__(self, text, time, user='', sent=True, message_type=TOX_MESSAGE_TYPE['NORMAL'], parent=None):
         QtGui.QWidget.__init__(self, parent)
         self.name = DataLabel(self)
         self.name.setGeometry(QtCore.QRect(0, 2, 95, 20))
@@ -118,8 +118,13 @@ class MessageItem(QtGui.QWidget):
         font.setPointSize(10)
         font.setBold(False)
         self.time.setFont(font)
-        self.time.setObjectName("time")
-        self.time.setText(time)
+
+        if not sent:
+            movie = QtGui.QMovie(curr_directory() + '/images/spinner.gif')
+            self.time.setMovie(movie)
+            movie.start()
+        else:
+            self.time.setText(time)
 
         self.message = MessageEdit(text, parent.width() - 150, self)
         self.message.setGeometry(QtCore.QRect(100, 0, parent.width() - 150, self.message.height()))
diff --git a/src/profile.py b/src/profile.py
index 4c069b6..eb0819c 100644
--- a/src/profile.py
+++ b/src/profile.py
@@ -166,7 +166,7 @@ class Profile(contact.Contact, Singleton):
                         data = message.get_data()
                         self.create_message_item(data[0],
                                                  convert_time(data[2]),
-                                                 friend.name if data[1] == MESSAGE_OWNER['FRIEND'] else self._name,
+                                                 data[1],
                                                  data[3])
                     elif message.get_type() == MESSAGE_TYPE['FILE_TRANSFER']:
                         if message.get_status() is None:
@@ -350,8 +350,7 @@ class Profile(contact.Contact, Singleton):
         :param message: text of message
         """
         if friend_num == self.get_active_number():  # add message to list
-            user_name = Profile.get_instance().get_active_name()
-            self.create_message_item(message.decode('utf-8'), curr_time(), user_name, message_type)
+            self.create_message_item(message.decode('utf-8'), curr_time(), MESSAGE_OWNER['FRIEND'], message_type)
             self._messages.scrollToBottom()
             self._friends[self._active_friend].append_message(
                 TextMessage(message.decode('utf-8'), MESSAGE_OWNER['FRIEND'], time.time(), message_type))
@@ -378,13 +377,13 @@ class Profile(contact.Contact, Singleton):
             else:
                 message_type = TOX_MESSAGE_TYPE['NORMAL']
             friend = self._friends[self._active_friend]
+            friend.inc_receipts()
             if friend.status is not None:
                 self.split_and_send(friend.number, message_type, text.encode('utf-8'))
-            self.create_message_item(text, curr_time(), self._name, message_type)
+            self.create_message_item(text, curr_time(), MESSAGE_OWNER['NOT_SENT'], message_type)
             self._screen.messageEdit.clear()
             self._messages.scrollToBottom()
             friend.append_message(TextMessage(text, MESSAGE_OWNER['NOT_SENT'], time.time(), message_type))
-            friend.inc_receipts()
 
     # -----------------------------------------------------------------------------------------------------------------
     # History support
@@ -440,7 +439,7 @@ class Profile(contact.Contact, Singleton):
                 data = message.get_data()
                 self.create_message_item(data[0],
                                          convert_time(data[2]),
-                                         friend.name if data[1] == MESSAGE_OWNER['FRIEND'] else self._name,
+                                         data[1],
                                          data[3],
                                          False)
             elif message.get_type() == MESSAGE_TYPE['FILE_TRANSFER']:
@@ -479,8 +478,9 @@ class Profile(contact.Contact, Singleton):
         self._screen.friends_list.setItemWidget(elem, item)
         return item
 
-    def create_message_item(self, text, time, name, message_type, append=True):
-        item = MessageItem(text, time, name, message_type, self._messages)
+    def create_message_item(self, text, time, owner, message_type, append=True):
+        name = self.get_active_name() if owner == MESSAGE_OWNER['FRIEND'] else self.name
+        item = MessageItem(text, time, name, owner != MESSAGE_OWNER['NOT_SENT'], message_type, self._messages)
         elem = QtGui.QListWidgetItem()
         elem.setSizeHint(QtCore.QSize(self._messages.width(), item.height()))
         if append: