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!lycy7VKz`(%B$jHRR#LUdh!otGJ%F4#Z#?H>p!NI}F$;rjV#m&vl
z!^6YN%ge{d$Is6%ARr(pC@3T(BrGf}A|fIxDk>%>CN3^6At50tDJdl-B`qy2BO@a#
zD=Q}_CoeCrprD|rsHmi*q^zv0qN1Xzs;Z`@rmn88p`oFvsi~!<rLC>4qobp%tE;D{
zr?0PXU|?WqXlP_)WNd6~Vq#)yYHDU?W^Qh7VPRouX=!C;Wo>P3V`F1$Yinm`XK!!s
z;Nals=;-9+<m~M1;^N}!>gwj^=I-w9;o;%w>FMR=<?Ze5<KyG&>+9#|=kM<y5D*X;
z7#I{36dW8J5)u*`8X6WB79JiR5fKp?85tE76&)QN6B82~8ygoF7at#=kdTm=n3$B5
zl$@NLl9G~|nwplDmY$xTk&%&^nVFT9m7SfPlarI1o12%Hm!F?sP*6}<SXfk4R9swK
zQc_Y{T3S|CR$g9SQBhG@Sy@$8Rb5?OQ&Ur0TU%FGS6^S>(9qD>*x1z6)ZE<M($dn}
z+S=CE*52OU(b3V_+1b_A)!p6Q)6>)2+uPUI*WceiVZwxo6DLlZG->kW$y26GnL2gq
zv}x0(PoF+x#*CRWXU>{6YxeBfbLPyMJ9qB9dGqGapTA(if`tngE?Tr`@#4ixmMmGi
zbm_8X%a$)+zGB6Sl`B`STD5BR>eXx3tXaEu?YedA)~{c`VZ(-v8#iv+v}yC^&0Dr?
z*}8S>wr$(CZ{NOS$BvylckbG?YxnNmd-m+vyLa!tef#$B-+$o1frAGR9y)aB@ZrNp
zjvP69^ysl;$BrLAe&WQ5lP6D}I(6#w>C<P<oH={;?74I2&YwSj;lhQB7cXAAbm{Wt
z%U7;kxq9{LwQJX|U%!6i#*LddZ{E6f>-O#2ckbM|d-v|Wd-v|&zyILDgNF|vK6>=%
z@#Du&o;-Q_^y#x_&z?Vj{^G@pmoHzwdiCn{>(_7Iym|Zf?YnpH-oJnU;lqcIA3uKj
z^y%~G&tJZL`TF(iw{PFRfB*jD$B&;sfByRQ>-X>9fByXW`}gm^fB*jf|F8I;+s`#5
z*x50_)kx2PnUR5kLGdRGD;L9m1|3l50A&*fjuM9doH8C8794E;za_)*M8HC)Hs;Gq
z1YZ<9+#k4@&ufauMJ2Z$Hgi9nABM>%CbBs?#dr$v$xNGP!&~xFDCx`$rp$dQ6~Sre
z=9<-RN|~w7f5@eiPfRyUKr^V>yZ4`Si^qb?O9GY#EzJ_uKC(8no$rZOSdIh2A&d-+
z3_=V-3=ACkActre_)0Z#2uqpFn4lnI!79#mWfAMc!|j6VL2E2ND7myqTbBKqF(K*j
zWZutD94!m3tf<!t-Bj|@=$Y3PllW69KhLZB&+8DF`{fB|;)MmAokFS=Ausm3bh2pa
zp1PtLvLa~ZyggE1mpiQCWoE+d1_3@9s2dXI*|3Up`AlZR?gl|cC(D5DX;|FQDKuBc
zlndbod;fW)xxv6+4(bL4B^Oq4t`=r?>~0WNb+R<@orT2>^K9l`S;UHP!~Vd<q`5&r
zPzmaWghe1XoSBTn4Yrj|mI8cpu()Bd+gzW?YzQ~l>qe3027^GD8y2Yhvx;-Mv~XY#
z2lrklO9TITSlke`Wljq-JHie7O)^Py!-dJ}&~SLLA`p}wrr>bH)(l5W0l`IB+>m)`
z&Y8(bZm_o~z~u%;a0W%s7X?=|pl(<orpqeM_2mgC_Heko#L?0q5Stqc9?WrR;Xn!p
Kn@X&1um%88R|;$Z

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: