From 7d7efa6acd30f1a636ec5615af383c598324132b Mon Sep 17 00:00:00 2001
From: ingvar1995 <IgorN1995@yandex.ru>
Date: Thu, 14 Apr 2016 20:45:29 +0300
Subject: [PATCH] fixed repaint bug, translations update

---
 src/profile.py            |  23 +++++----
 src/translations/en_GB.qm | Bin 3743 -> 3980 bytes
 src/translations/en_GB.ts |   9 +++-
 src/translations/fr_FR.ts |  96 ++++++++++++++++++++++----------------
 src/translations/ru_RU.qm | Bin 5878 -> 6153 bytes
 src/translations/ru_RU.ts |   9 +++-
 6 files changed, 85 insertions(+), 52 deletions(-)

diff --git a/src/profile.py b/src/profile.py
index 3631b6c..fadd653 100644
--- a/src/profile.py
+++ b/src/profile.py
@@ -201,7 +201,7 @@ class Friend(Contact):
         """
         if hasattr(self, '_message_getter'):
             del self._message_getter
-        self._corr = filter(lambda x: x.get_type() == 2, self._corr)
+        self._corr = filter(lambda x: x.get_type() == 2 and x.get_status() in (2, 4), self._corr)
         self._unsaved_messages = 0
 
     def update_transfer_data(self, file_number, status, inline=None):
@@ -388,7 +388,7 @@ class Profile(Contact, Singleton):
             if value is not None:
                 self._active_friend = value
                 friend = self._friends[value]
-                self._friends[self._active_friend].set_messages(False)
+                self._friends[value].set_messages(False)
                 self._screen.messageEdit.clear()
                 self._messages.clear()
                 friend.load_corr()
@@ -587,7 +587,6 @@ class Profile(Contact, Singleton):
         else:
             self._messages.insertItem(0, elem)
         self._messages.setItemWidget(elem, item)
-        self._messages.repaint()
 
     def create_file_transfer_item(self, tm, append=True):
         data = list(tm.get_data())
@@ -600,7 +599,6 @@ class Profile(Contact, Singleton):
         else:
             self._messages.insertItem(0, elem)
         self._messages.setItemWidget(elem, item)
-        self._messages.repaint()
         return item
 
     def create_inline_item(self, data, append=True):
@@ -612,7 +610,6 @@ class Profile(Contact, Singleton):
         else:
             self._messages.insertItem(0, elem)
         self._messages.setItemWidget(elem, item)
-        self._messages.repaint()
 
     # -----------------------------------------------------------------------------------------------------------------
     # Work with friends (remove, set alias, get public key)
@@ -621,8 +618,17 @@ class Profile(Contact, Singleton):
     def set_alias(self, num):
         friend = self._friends[num]
         name = friend.name.encode('utf-8')
-        dialog = "Enter new alias for friend " + name.decode('utf-8') + "  or leave empty to use friend's name:"
-        text, ok = QtGui.QInputDialog.getText(None, 'Set alias', dialog)
+        dialog = QtGui.QApplication.translate('MainWindow',
+                                              "Enter new alias for friend {} or leave empty to use friend's name:",
+                                              None, QtGui.QApplication.UnicodeUTF8)
+        dialog = dialog.format(name.decode('utf-8'))
+        title = QtGui.QApplication.translate('MainWindow',
+                                             'Set alias',
+                                             None, QtGui.QApplication.UnicodeUTF8)
+
+        text, ok = QtGui.QInputDialog.getText(None,
+                                              title,
+                                              dialog)
         if ok:
             settings = Settings.get_instance()
             aliases = settings['friends_aliases']
@@ -889,8 +895,7 @@ class Profile(Contact, Singleton):
                     inline = InlineImage(transfer.get_data())
                     self.get_friend_by_number(friend_number).update_transfer_data(file_number,
                                                                                   FILE_TRANSFER_MESSAGE_STATUS['FINISHED'],
-                                                                                  inline
-                                                                                  )
+                                                                                  inline)
                     self.set_active(self._active_friend)
                 else:
                     self.get_friend_by_number(friend_number).update_transfer_data(file_number, FILE_TRANSFER_MESSAGE_STATUS['FINISHED'])
diff --git a/src/translations/en_GB.qm b/src/translations/en_GB.qm
index 2c9c41041c58c7ea8c29b79dec2486113b815c8a..990f160b1a0bbf4f75e48aa4442e5e4c03a86ebf 100644
GIT binary patch
delta 773
zcmYjOOGs2<7(I99-nnz{%w(kniselgf~7_Dun93V$wXU(A{v-e-l2hc$jmruB17q-
zkrswJO@!GdQlb~OD76RpC^UPJQB+72<f4saEi#nOXp0vA_d4I>eBa-<>3mveQg|(J
z#17yFP}K<t;}BnpfGru~T$J%?D0#E=_aGyu3@})*Yniy1jYH8f=Fg$Ltpkt+RJu;n
z&qZbQH+3z>O9Fs3AP9qtfHEySQZtxWYj`qLL4TX!U3e4-n+_TlS_=X7ju9KbFd=4~
zw01M$r|5e83oySHLl1iaX<oe2{uZ#j5&Q37WBjf-_3a~xoE5)sSLxSCTXsGm!C`54
zbeZ)>rGnah^yj2oqa<jKNE7)B)LGK(XdPgRnNEcY5r$N1icGBM;2b$^9j_r>mP>Pu
zWd2F6sXoaI{E*v{f*ib6?tIG4#2LBgRRi^+`OM9)jO*r0`xCi9NHNy*u<?|VZ!hBD
z3rcZp5-=7kC1qLc)3~bTKg#q-g#E9p>B3l;0OAG<_NvE|B{E!6`$zaC@^kgs#c>X*
zw)mD_Fe}y4y@LcSOV-@PK5po@UiEb`K5rdp8e*FR)?tAsmx9*MDcn@-x8-!)=Adj_
z`Qi+}<eaV7`GNJ(HK{RPK++PboGBs)I}#!%?vd$+gn{=wy_)CZhaVeEHyk#``L&}6
zUId}T4~>?NMrsG#a8U+mJK<ZwoRlu&Ueqz#f>z2^#LcJ!Axe$UgL?LBrX3`%p@CiE
z$p7`3E1fI6Eb|bwo8y-<@f8$#gSuby>W!Mi?Q#S(r_ZlB{Vv^Gr?s?dblkclq-(mT
eKG>`UeOg06|A%J=G_S*>+q(qQ=D{W@Q~3*+?!1@)

delta 544
zcmX9*TS!z<6kYe;bMBe@n5Oc9gdyce;D<#RO-d+<`5=S9F#9ljS@RKol+%m2g?%*A
zV`Oy7kI6m?l&FXsQECqy$0D=(D2f7!0w*X6l8A()1$}MSK5MVF_C9Be2A0Niy#TPe
z9Kdy;B@SpAh?fFz%OJ8z_NQR2pC;ad;?hPycThIZccTuq$#L?tXzJ<)%tACrjuD5^
zoczPuhD^gjz&WpJ{u~haqCK>W$vdt;9^Oh^tH1TqfG2n8vnQ$nYtlgeClY+)ncGVo
z5|Ky00QF5oAEW^3h|8zn0QPq=c<&nf&&A}-2L?%ruPbfhqjK5m`wTcD*Cgj@a6oQo
zTSuIgH`5HLuF8qZS=Jgko!&z|-`pRqh6l0Fj7==2alI;9v=9(?)uyn)<iAzx_T9X|
zPt}!sh{hXL{0TQReyF}zo#f>OPTly-{>eapMGgb^SVn6fg=ehF@){cVSPhLOoIm`(
zs(fo|G)CPqd%4ETagsIBuQ^_UJvhogFthg4iy1m}IvsysP;sr(yNZrZfg8>l;7aG*
zD;){WIquMrVG2~aBN}fkF1R0;a5W<xEbYEUeqFF>?lu45Ofc2{p8VSj3NLYGQ4wls
l7fiM@6x(%&{JhZ6JDyru+amnos9&Pj8;L3z^!J)8tbf-@hsyu}

diff --git a/src/translations/en_GB.ts b/src/translations/en_GB.ts
index 402b76c..144c404 100644
--- a/src/translations/en_GB.ts
+++ b/src/translations/en_GB.ts
@@ -105,13 +105,13 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="profile.py" line="700"/>
+        <location filename="profile.py" line="713"/>
         <source>User {} wants to add you to contact list. Message:
 {}</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="profile.py" line="702"/>
+        <location filename="profile.py" line="715"/>
         <source>Friend request</source>
         <translation></translation>
     </message>
@@ -155,6 +155,11 @@
         <source>Remove friend</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="profile.py" line="624"/>
+        <source>Enter new alias for friend {} or leave empty to use friend&apos;s name:</source>
+        <translation>Enter new alias for friend {} or leave empty to use friend&apos;s name:</translation>
+    </message>
 </context>
 <context>
     <name>NetworkSettings</name>
diff --git a/src/translations/fr_FR.ts b/src/translations/fr_FR.ts
index 42e5115..c80ebac 100644
--- a/src/translations/fr_FR.ts
+++ b/src/translations/fr_FR.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fr">
+<!DOCTYPE TS><TS version="1.1" language="fr">
 <context>
     <name>AddContact</name>
     <message>
@@ -52,7 +51,7 @@
         <translation>Port :</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="140"/>
+        <location filename="mainscreen.py" line="87"/>
         <source>Online contacts</source>
         <translation>Contacts connectés</translation>
     </message>
@@ -60,102 +59,106 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainscreen.py" line="86"/>
+        <location filename="mainscreen.py" line="92"/>
         <source>Profile</source>
         <translation>Profile</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="92"/>
+        <location filename="mainscreen.py" line="98"/>
         <source>Settings</source>
         <translation>Paramêtres</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="275"/>
+        <location filename="mainscreen.py" line="280"/>
         <source>About</source>
         <translation>À Propos</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="85"/>
+        <location filename="mainscreen.py" line="91"/>
         <source>Add contact</source>
         <translation>Rajouter un contact</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="87"/>
+        <location filename="mainscreen.py" line="93"/>
         <source>Privacy</source>
         <translation>Confidentialité</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="88"/>
+        <location filename="mainscreen.py" line="94"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="89"/>
+        <location filename="mainscreen.py" line="95"/>
         <source>Notifications</source>
         <translation>Notifications</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="90"/>
+        <location filename="mainscreen.py" line="96"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="91"/>
+        <location filename="mainscreen.py" line="97"/>
         <source>About program</source>
         <translation>À propos du programme</translation>
     </message>
     <message>
-        <location filename="profile.py" line="686"/>
+        <location filename="profile.py" line="713"/>
         <source>User {} wants to add you to contact list. Message:
 {}</source>
         <translation>L&apos;Utilisateur {} veut vout rajouter à sa liste de contacts. Message : {}</translation>
     </message>
     <message>
-        <location filename="profile.py" line="688"/>
+        <location filename="profile.py" line="715"/>
         <source>Friend request</source>
-        <translatorcomment>D&apos;un ami ? De l&apos;ami ?</translatorcomment>
         <translation>Demande d&apos;amis</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="276"/>
+        <location filename="mainscreen.py" line="281"/>
         <source>Toxygen is Tox client written on Python 2.7. Version: </source>
         <translation>Toxygen est un client Tox écris en Python 2.7. Version : </translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="314"/>
+        <location filename="mainscreen.py" line="319"/>
         <source>Choose file</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="333"/>
+        <location filename="mainscreen.py" line="338"/>
         <source>Disallow auto accept</source>
         <translation>Désactiver l&apos;auto-réception</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="334"/>
+        <location filename="mainscreen.py" line="339"/>
         <source>Allow auto accept</source>
         <translation>Activer l&apos;auto-réception</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="336"/>
+        <location filename="mainscreen.py" line="341"/>
         <source>Set alias</source>
         <translation>Définir un alias</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="337"/>
+        <location filename="mainscreen.py" line="342"/>
         <source>Clear history</source>
         <translation>Vider l&apos;historique</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="338"/>
+        <location filename="mainscreen.py" line="343"/>
         <source>Copy public key</source>
         <translation>Copier la clé publique</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="340"/>
+        <location filename="mainscreen.py" line="345"/>
         <source>Remove friend</source>
         <translation>Retirer un ami</translation>
     </message>
+    <message>
+        <location filename="profile.py" line="624"/>
+        <source>Enter new alias for friend {} or leave empty to use friend&apos;s name:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkSettings</name>
@@ -211,17 +214,17 @@
 <context>
     <name>interfaceForm</name>
     <message>
-        <location filename="menu.py" line="402"/>
+        <location filename="menu.py" line="420"/>
         <source>Interface settings</source>
         <translation>Paramêtres de l&apos;interface</translation>
     </message>
     <message>
-        <location filename="menu.py" line="403"/>
+        <location filename="menu.py" line="421"/>
         <source>Theme:</source>
         <translation>Thème :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="404"/>
+        <location filename="menu.py" line="422"/>
         <source>Language:</source>
         <translation>Langue :</translation>
     </message>
@@ -269,7 +272,7 @@
         <translation>toxygen</translation>
     </message>
     <message>
-        <location filename="main.py" line="70"/>
+        <location filename="main.py" line="80"/>
         <source>Looks like other instance of Toxygen uses this profile! Continue?</source>
         <translation>Il semble qu&apos;une autre instance de Toxygen utilise ce profil ! Continuer ?</translation>
     </message>
@@ -277,22 +280,22 @@
 <context>
     <name>notificationsForm</name>
     <message>
-        <location filename="menu.py" line="342"/>
+        <location filename="menu.py" line="361"/>
         <source>Notification settings</source>
         <translation>Paramêtres de notification</translation>
     </message>
     <message>
-        <location filename="menu.py" line="343"/>
+        <location filename="menu.py" line="362"/>
         <source>Enable notifications</source>
         <translation>Activer les notifications</translation>
     </message>
     <message>
-        <location filename="menu.py" line="344"/>
+        <location filename="menu.py" line="363"/>
         <source>Enable call&apos;s sound</source>
         <translation>Activer les sons d&apos;appel</translation>
     </message>
     <message>
-        <location filename="menu.py" line="345"/>
+        <location filename="menu.py" line="364"/>
         <source>Enable sound notifications</source>
         <translation>Activer les sons de notifications</translation>
     </message>
@@ -300,45 +303,60 @@
 <context>
     <name>privacySettings</name>
     <message>
-        <location filename="menu.py" line="289"/>
+        <location filename="menu.py" line="294"/>
         <source>Privacy settings</source>
         <translation>Paramêtres de confidentialité</translation>
     </message>
     <message>
-        <location filename="menu.py" line="290"/>
+        <location filename="menu.py" line="295"/>
         <source>Save chat history</source>
         <translation>Sauvegarder l&apos;historique du chat</translation>
     </message>
     <message>
-        <location filename="menu.py" line="291"/>
+        <location filename="menu.py" line="296"/>
         <source>Allow file auto accept</source>
         <translation>Autoriser les fichier automatiquement</translation>
     </message>
     <message>
-        <location filename="menu.py" line="292"/>
+        <location filename="menu.py" line="297"/>
         <source>Send typing notifications</source>
         <translation>Notifier la frappe</translation>
     </message>
     <message>
-        <location filename="menu.py" line="293"/>
+        <location filename="menu.py" line="298"/>
         <source>Auto accept default path:</source>
         <translation>Chemin d&apos;accès des fichiers acceptés automatiquement :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="294"/>
+        <location filename="menu.py" line="299"/>
         <source>Change</source>
         <translation>Modifier</translation>
     </message>
+    <message>
+        <location filename="menu.py" line="300"/>
+        <source>Allow inlines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="menu.py" line="310"/>
+        <source>Chat history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="menu.py" line="313"/>
+        <source>History will be cleaned! Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>tray</name>
     <message>
-        <location filename="main.py" line="85"/>
+        <location filename="main.py" line="106"/>
         <source>Open Toxygen</source>
         <translation>Ouvrir Toxygen</translation>
     </message>
     <message>
-        <location filename="main.py" line="86"/>
+        <location filename="main.py" line="107"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
diff --git a/src/translations/ru_RU.qm b/src/translations/ru_RU.qm
index 7e9ed2eb18b835d5c54924fc1511b1242bb66b1f..e98cd9822a2a8a99a13227ee430d6f6e085ee22a 100644
GIT binary patch
delta 819
zcmY*WT}V@57=E|CXJ<P*b5m!K6rC~%f^?X}`M0HFiq3*C#0YEY5eK@3^CuM>VqMH2
z1a;Yk)lH#6c3~H3_J@CAXk8eJl88YCK{sMpko9QZba8mU_wRY0_c=d~h3#Fokd^3E
zIuVT!m30wmJ`%rUqPPm;FA>z2$(Xf*yps|Vi;1*pl(L1sFirW93C#bYl8#OyX_iWT
zEyzz&Y2+uOpC$`~M7B7MX80G8C7^jBB@mfB+E=4ziJ~O!LTH>QWSrNox8)L9S9P>!
z4FeB!Gjb0WhS>LVgUDRLjnDgu44ZuC+6SVT4IX%UA9V-6{k%-1ujX$_5|KP798AU$
zx*LKcvIT-OLe9lB<O{;kI0Tw?!jyX*b9KVXcqIfM)>k*?Qi#Nx`tVc?h_&K@Xt-gB
z6+KQJl&^^8=PGasi5<3jqUhIR*EBBEFN(eI8;C@kq5aV(2ud~F&WObUSB<*zUH~^6
z-RXHC&NmkH%@FaJv9S0koV@-o$`0e~SQz+0>5yh3ga&OtU~Q{(VXpwCBhtVaeu-&Q
zdUI<Mgo&oW?>RW~-PB`;fY>D28G9EOw#fGa-4J$O9=tLNm_qrP29}FU@@hOT)kn;U
zosTi!WG?wNk3;&*{Z&g4+!?j64-SY0ma?jN2JxgNeCY|4rdkFUVZC*~4?ldiyPw^|
zUTr&v9&!vPvx8IE$vNyGg|pa&N)e~w?dELslF@ac?&M6=QaFQ8@5B?F%g5PH3bj%j
zDo%8qh%Rj9upN7zT}(G7w`)cJAvifZ1PT|{Je;~iYu};ShIatkwF8=oH^?d7ux+Rw
zUrwICUaeF7YLnuv@p*$vRiI9(s`IJ-N~N_;K~kf78&yTEy<Fd{)CZJ?pt{>X5>))&
US~Xn+j8yFH{%SA}ujy^pznWpaYXATM

delta 547
zcmXAmUr3W-6vm%#-}`?5=Qp<z7(vv!8f6kiYKWB7U}O*&YLG>VIS6-QNfhxBtBdK)
zAYDdSK?Hh{T`Zz(l{jbrFoO~!Ng|=3@Jj5DkoG`VhjZTZp7Z>kldkx=B@^}x;6OEi
zM?iB1P(DFS2_W1A@h!{xEX<lY<{l#D^?<Jm+gJE5@`z=}*}sa0R5xIbp)qle`93se
z|1fr-81Do^mZIdAfs$6`sTBdN-M-P0Lx8jDoAC;OXT0<+UZ?}yX%%a}u;IG;%IW2Y
z+amF7iH%L7>&XD1FNhnLrh(G$V({S|)}!L}*I7Uw5kIzCfL)Lqwh=<@kvp<0fIlYp
z9IIkJBZmtVX#bWIwTp}=<y@hag3Gk_t~z+oQd)W<$igpueQAJ;41Is4O6BkLmcu7V
z0zDNz4Fn$Ondc;vlX~CVGk|6q7w^tf&}QS>t`Gq_O|_+ub2`l0>b+bXGvoD9I(Yei
zw4>%^KFzu9)<%WS5tY%SrRS}qWs*e0)?l8euokQrSBqQ}v6Fw_(204ww}Oj<o1Dtf
zO_C*@TgfXFbkG?(JHk0}=dnVowJGQGS`x}0e|h&k_Mh@MEWal}zki_ZBZYb;>-tHq
m)ws=Vf_sZ@`grg@Z@JSQ`asLwV1kDp%SC;oBDbW61OEU_Uy4)!

diff --git a/src/translations/ru_RU.ts b/src/translations/ru_RU.ts
index 0f5071b..7220df8 100644
--- a/src/translations/ru_RU.ts
+++ b/src/translations/ru_RU.ts
@@ -105,14 +105,14 @@
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="profile.py" line="700"/>
+        <location filename="profile.py" line="713"/>
         <source>User {} wants to add you to contact list. Message:
 {}</source>
         <translation>Пользователь {} хочет добавить Вас в список контактов. Сообщение:
 {}</translation>
     </message>
     <message>
-        <location filename="profile.py" line="702"/>
+        <location filename="profile.py" line="715"/>
         <source>Friend request</source>
         <translation>Запрос на добавление в друзья</translation>
     </message>
@@ -156,6 +156,11 @@
         <source>Remove friend</source>
         <translation>Удалить друга</translation>
     </message>
+    <message>
+        <location filename="profile.py" line="624"/>
+        <source>Enter new alias for friend {} or leave empty to use friend&apos;s name:</source>
+        <translation>Введите новый псевдоним для друга {} или оставьте пустым для использования его имени:</translation>
+    </message>
 </context>
 <context>
     <name>NetworkSettings</name>