From 96705ed1cc8c841bd2ffbe159cde3a47a33b1c5f Mon Sep 17 00:00:00 2001
From: ingvar1995 <IgorN1995@yandex.ru>
Date: Thu, 16 Jun 2016 11:59:30 +0300
Subject: [PATCH] ui: statuses

---
 src/contact.py                      |   4 +--
 src/friend.py                       |   8 ++---
 src/images/busy.png                 | Bin 0 -> 329 bytes
 src/images/busy_notification.png    | Bin 0 -> 609 bytes
 src/images/idle.png                 | Bin 0 -> 231 bytes
 src/images/idle_notification.png    | Bin 0 -> 405 bytes
 src/images/offline.png              | Bin 0 -> 159 bytes
 src/images/offline_notification.png | Bin 0 -> 445 bytes
 src/images/online.png               | Bin 0 -> 201 bytes
 src/images/online_notification.png  | Bin 0 -> 351 bytes
 src/list_items.py                   |  53 ++++++++++++----------------
 src/mainscreen.py                   |   5 +--
 12 files changed, 30 insertions(+), 40 deletions(-)
 create mode 100644 src/images/busy.png
 create mode 100644 src/images/busy_notification.png
 create mode 100644 src/images/idle.png
 create mode 100644 src/images/idle_notification.png
 create mode 100644 src/images/offline.png
 create mode 100644 src/images/offline_notification.png
 create mode 100644 src/images/online.png
 create mode 100644 src/images/online_notification.png

diff --git a/src/contact.py b/src/contact.py
index c957113..0691219 100644
--- a/src/contact.py
+++ b/src/contact.py
@@ -64,8 +64,8 @@ class Contact(object):
         return self._status
 
     def set_status(self, value):
-        self._widget.connection_status.data = self._status = value
-        self._widget.connection_status.repaint()
+        self._status = value
+        self._widget.connection_status.update(value)
 
     status = property(get_status, set_status)
 
diff --git a/src/friend.py b/src/friend.py
index 585a2bd..52e9ac7 100644
--- a/src/friend.py
+++ b/src/friend.py
@@ -188,12 +188,12 @@ class Friend(contact.Contact):
         return self._new_messages
 
     def inc_messages(self):
-        self._widget.connection_status.messages = self._new_messages + 1
-        self._widget.connection_status.repaint()
+        self._new_messages += 1
+        self._widget.connection_status.update(self.status, True)
 
     def reset_messages(self):
-        self._widget.connection_status.messages = self._new_messages = 0
-        self._widget.connection_status.repaint()
+        self._new_messages = 0
+        self._widget.connection_status.update(self.status, False)
 
     messages = property(get_messages)
 
diff --git a/src/images/busy.png b/src/images/busy.png
new file mode 100644
index 0000000000000000000000000000000000000000..857b3967e78e2ede8726580bce500f0ab163251e
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5m^jW
ze;tGwoit`w00kvWTq8<?^V3So6N^$A%FE03GV`*FlM@S4_413-XTP(N0xCM@>Eak7
zF}3%Ctshe$gX_cM`He?pcd#y>opp$9L$kYcdhTnz1#_m&%9|BFVZxc)4L+{Ry)Vd4
z$oLSY(W>(2&aczDeL2h*eAS%yRZfdxx^YWr#p)?W4h%1n=A7Ij)S8$Y;VEL2EB=_r
zVYWoOk?w{&->dzbm)&IC<FkCb`TTh92NxeX&JK+67WrNG{$B&%@5A|K>m7?S=kyC6
zSddwEEV5{2o=qM5UD?I|Kf7<(YTIAO&BF9m)nfr)sMpPkx=+04S5Mirj`tsP<&wlQ
U(b!AOKp!!9y85}Sb4q9e0P<;mxBvhE

literal 0
HcmV?d00001

diff --git a/src/images/busy_notification.png b/src/images/busy_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..a01eb3ff6fc36c848de4332e792e40cb5342655f
GIT binary patch
literal 609
zcmV-n0-pVeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10p3YOK~y-6t&=fp6mb;9f3s%-)+sG)(gsPq+;LwZDb(!U7AFXn
zA*Z0G^eik*%BT>v76M*zdy7i&K7cWsQ<1c3QV3~M2bA5hxQ#3U38Jr@|I9qz{NIyp
z%C!@Q(}60tgsVWcfJa87+}TzmNe;?<{Wg%a7q;#huK^WcU*-#d#T+mLWJ2BfBz{gI
z92-bV!|*NW8m31@cWeFrak*0(MN?$nM6|*0Ye{kg+p^7GGrDj56zfhc>A&1<wHC-(
zl{^bz>ni~p^*A1;Vbno>A@pE=(0`_nOH0!g1>Z35YDs)^x7l11dI%gE4*`T0fXl|~
z^}(Q<hOIY<>zVT_`V_Vv3qK;zCEHhJJ^-(?$%&OluXh5l({5j^{P_6_xNWg0=`*>%
z8$Ah%wD)WM{xLbLz+qVo(CGC}vdM`R;E<fvBA<QXY5-JE)0RAIJS>aLCdR|lTnbI~
z!darwa@uSypT&zez(-{)07k_>kJCP<PC12U6c~+wnKX)~2-rB!fPjrOil%@WqfwAM
z+X6B&Z`R{@XuST%?s&Z($3rr20$J{CD`+IiflwFGPQ$2E9}Kz{i#FTid3|KFZLv7s
vfvAIM3w0Ywa`1mvc^vV-98;<O_MCqKcAg{V=wW`c00000NkvXXu0mjf5kCh4

literal 0
HcmV?d00001

diff --git a/src/images/idle.png b/src/images/idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..255092658062232a7c2064f9ec91b35e21658dc7
GIT binary patch
literal 231
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4NtU=qlmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5Otk?j>hyGR45_%4l+w_&`S)C@h7daeZiiMohL0`^^Ag_dc+adH
za<Nh&m0{{0hR_U#t1OSKH#ztkHE=eRIGZ+$ylp=vYQV&L&)GMiMboK>&*NjQz--Pm
zn_Wr*4PCMfD;a10nBT~8faNQL;)g~~DVCN4E?*uTWIM3%AWP{M#R*w1#mCrJNLZX;
cVB%q5n`Zo^>5tPapraT(UHx3vIVCg!0H8Nc^#A|>

literal 0
HcmV?d00001

diff --git a/src/images/idle_notification.png b/src/images/idle_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..29f3b492949410baedb350888010d5cd90fc797b
GIT binary patch
literal 405
zcmV;G0c!q<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzH%UZ6RCwB~li^XrFbsvATn5MpjF21)
zG;ELwNG1r~piEFYLDLDk0qp|4W&;?(8^BZUbIxaa<p=0aXIs*Hl4Ut_iCj)kot9_m
zDsi2qhsWl9jEz|Ye9&@~R+uKKXJ01vRz#l*0pKfvmZ=W`NrF9<8F6hf1^y%8QN~`u
z8|i?}0oYk)=~mi-sWa|u%x8fcov)PZDc5l>IX8f<lD?o}CTq(~@Ej;YPx%Hu;d?Ql
z^g}x2Fii?J&_Lz|Y{I_5H_#u8ukz@Qq1#goPDrf5B^Aw0F5FL9Dd5Z9mohXsj|_1o
z_r!CBg}}<Hl(piiev=(DF*n-?4mh@A-b7D#OU(Div(IEXvpsS5z0S4vugP^hwuV6p
zFE@rJwv2K|d26b1H~vZ(<@WzR(_g;xw*UhGMfZ)W&Ebyv00000NkvXXu0mjfbx^KH

literal 0
HcmV?d00001

diff --git a/src/images/offline.png b/src/images/offline.png
new file mode 100644
index 0000000000000000000000000000000000000000..70a863b740b4c62dacb9b2c7fbed0444d718a3e4
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQn>1T^vI!
wdXxYB|8LK%+R&+VcQIR!ltI=31tSKA<XOzJ+iXmB0o5^hy85}Sb4q9e0D2TF4*&oF

literal 0
HcmV?d00001

diff --git a/src/images/offline_notification.png b/src/images/offline_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..77006ed6212918ceb9bfa87678db40a77a6e95e2
GIT binary patch
literal 445
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$m7#J9>JY5_^
zEPB^Y_Vr?R6mYwLy|yJr@wUPVi4&54B<H%e%u!&wQtJ00iuEfCW2}nVD^U@(W`&#2
zxa1ZF>s`t!5ETBRJNtd;#jCMK#$uHxKku6Sp5t_bj%;|_s+mU}wOd{$#l^F#^nPwm
zK75XW-zQ}c(~KJ|QVt@o@>?&edd?A_5c2FNbB6R|zV&g%7B%s2Ld0BqGr~K}ZUh^*
z#Gdg<J65sZ!tjmE<v?Se{0OI+;;|{$ot8&`Kg@0W{_WMhcchOc8~5-{KY8DkFHg|=
zVw&{1ljRKk;rXJH3aNW1zu#f<_T+hMedSd3Lq_Z=^DoD>KS{}p{ix2j;*#}x*CMU-
z6--j8fmgz&25(DTQDofBtRVC@>*=@8IddXqc7$;RFSJ_}`^@$G^>>vQUAMIUS}U;Z
l|L3WV_Ij6@Ua$MizIF4iL&rY+IR*@B22WQ%mvv4FO#ns3vf}^%

literal 0
HcmV?d00001

diff --git a/src/images/online.png b/src/images/online.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e5f40af916a22aa6ab0cc917757f4e0d4124d96
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4NtU=qlmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5Otk?j%Jy_|45_%4l+w_&huM?YK})`ab%B$7Lxqxn|BNRF@0pcD
zE><d}9%zt_VMuaMTj43lv!jtk;D1U}lsm^0W5u1E@&XA-3PJ{sweB1>2~BK_iUt#3
vJYd`{D6yc;VU^%nN%;jyeG3@aISd#!%gB6Ka5wiT&{_shS3j3^P6<r_US~cc

literal 0
HcmV?d00001

diff --git a/src/images/online_notification.png b/src/images/online_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e85b155db7d98c4476db96881e5cc2563dede40
GIT binary patch
literal 351
zcmV-l0igbgP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz0ZBwbRCwB~Q-KYFKn#3{12BRkzy`2^
zP9Qjd#0kU+00&T*fDvQ^*g!{M1h3|vd_ED3(&Pg4d)Izj9A(*|-N$(BfY3T>f%+0&
zE7R#1#5Eob;M3Iu1K&N%zlG3q6d<`{pkzvPfR*6J%0xJjm=(_(k}Eh91ZO}>pCX}@
z%s>vr<OB}yEXpm&5xzU4T-&7lh-9fG5rI2D0$>B2)U=(YQs5ziF3CNzi+ZZ&EoFZs
z-gk{VD&x*m=CPsgCcEl48+0<)$~=5S#uY|^MVeUiAcu0s=BSA=796`+sW(y2eq1C@
x#9pMrSR|QT@M)Eg9P8{VFY`0~^E<x;7yt+yd9_3+<fZ@s002ovPDHLkV1oESj&=Y5

literal 0
HcmV?d00001

diff --git a/src/list_items.py b/src/list_items.py
index 041d2d4..efdd6b3 100644
--- a/src/list_items.py
+++ b/src/list_items.py
@@ -140,6 +140,8 @@ class MessageItem(QtGui.QWidget):
     def mark_as_sent(self):
         if hasattr(self, 't'):
             self.time.setText(self.t)
+            self.time.repaint()
+            del self.t
             return True
         return False
 
@@ -170,7 +172,7 @@ class ContactItem(QtGui.QWidget):
         self.status_message.setFont(font)
         self.status_message.setObjectName("status_message")
         self.connection_status = StatusCircle(self)
-        self.connection_status.setGeometry(QtCore.QRect(220, 5, 32, 32))
+        self.connection_status.setGeometry(QtCore.QRect(243, 5, 32, 32))
         self.connection_status.setObjectName("connection_status")
 
 
@@ -178,40 +180,30 @@ class StatusCircle(QtGui.QWidget):
     """
     Connection status
     """
-    # TODO: rewrite
     def __init__(self, parent):
         QtGui.QWidget.__init__(self, parent)
         self.setGeometry(0, 0, 32, 32)
-        self.data = None
-        self.messages = False
+        self.label = QtGui.QLabel(self)
+        self.label.setGeometry(QtCore.QRect(0, 0, 32, 32))
+        self.unread = False
 
-    def paintEvent(self, event):
-        paint = QtGui.QPainter()
-        paint.begin(self)
-        paint.setRenderHint(QtGui.QPainter.Antialiasing)
-        k = 16
-        rad_x = rad_y = 5
-        if self.data is None:
-            color = QtCore.Qt.transparent
+    def update(self, status, unread_messages=None):
+        if unread_messages is None:
+            unread_messages = self.unread
         else:
-            if self.data == TOX_USER_STATUS['NONE']:
-                color = QtGui.QColor(50, 205, 50)
-            elif self.data == TOX_USER_STATUS['AWAY']:
-                color = QtGui.QColor(255, 200, 50)
-            else:  # self.data == TOX_USER_STATUS['BUSY']:
-                color = QtGui.QColor(255, 50, 0)
-
-        paint.setPen(color)
-        center = QtCore.QPoint(k, k)
-        paint.setBrush(color)
-        paint.drawEllipse(center, rad_x, rad_y)
-        if self.messages:
-            if color == QtCore.Qt.transparent:
-                color = QtCore.Qt.darkRed
-            paint.setBrush(QtCore.Qt.transparent)
-            paint.setPen(color)
-            paint.drawEllipse(center, rad_x + 3, rad_y + 3)
-        paint.end()
+            self.unread = unread_messages
+        if status == TOX_USER_STATUS['NONE']:
+            name = 'online'
+        elif status == TOX_USER_STATUS['AWAY']:
+            name = 'idle'
+        elif status == TOX_USER_STATUS['BUSY']:
+            name = 'busy'
+        else:
+            name = 'offline'
+        if unread_messages:
+            name += '_notification'
+        pixmap = QtGui.QPixmap(curr_directory() + '/images/{}.png'.format(name))
+        self.label.setPixmap(pixmap)
 
 
 class FileTransferItem(QtGui.QListWidget):
@@ -376,6 +368,7 @@ class UnsentFileItem(FileTransferItem):
         super(UnsentFileItem, self).__init__(file_name, size, time, user, -1, -1,
                                              FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_FRIEND'], width, parent)
         self._time = time
+        self.pb.setVisible(False)
 
     def cancel_transfer(self, *args):
         pr = profile.Profile.get_instance()
diff --git a/src/mainscreen.py b/src/mainscreen.py
index cde69e2..8e87bec 100644
--- a/src/mainscreen.py
+++ b/src/mainscreen.py
@@ -183,10 +183,7 @@ class MainWindow(QtGui.QMainWindow):
         Form.status_message.setFont(font)
         Form.status_message.setObjectName("status_message")
         self.connection_status = Form.connection_status = StatusCircle(Form)
-        Form.connection_status.setGeometry(QtCore.QRect(230, 29, 64, 64))
-        Form.connection_status.setMinimumSize(QtCore.QSize(32, 32))
-        Form.connection_status.setMaximumSize(QtCore.QSize(32, 32))
-        Form.connection_status.setBaseSize(QtCore.QSize(32, 32))
+        Form.connection_status.setGeometry(QtCore.QRect(245, 35, 32, 32))
         self.avatar_label.mouseReleaseEvent = self.profile_settings
         self.status_message.mouseReleaseEvent = self.profile_settings
         self.name.mouseReleaseEvent = self.profile_settings