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
zcmbO)+ao_gq+Wo5!Ox0;fnhZRL*xVo2F9ZdEazDm7<eTaSe{Q~U|=}Qz-fDrfq~bI
zL0Qk2fq{ve!Q>wc0|SdLgZs223=E9V8A6)77#P?Y8NxHG7#J8W7{aIhWME)SU^wbk
z%)r1?%*eR;7Xt(5S;l=_$_xzb2}}oeg)%U3>M&ieKg_^T&*sAPxz?G1folUZgV-Ym
z2KE`ur+B6?FmQfh$=v^yfq~;9OWEGJ3=FIvSmw1{WnkdG%(7y~QU(T&jV!01-DY55
zX<~V;&&9yN5yz@%w3C5>X*a9sw0{f?oI$Kk36=~DOwU=@9qwXa;OJyMX8)OifkTV+
z-r*Dm2DTY&8D-84^$e^&Y@Nr17#P^~*yRNU7#LV*v-?;uGcfSnVULSSW?*3W#NI4Y
z!oa|-%|7AyPX-2-E9_G*lrk`|{NiX_`<Q`&JC$RmwJ-w%R~aXB+*Aezw$q&UR;~;T
zOcOahW}ISRVD{kj^3`HsU?_*s?7unB?&)M;;91V4#CW8hfq{Vm#9&}xGUtkyWMyFB
z_{+6oj}-$0`x&ki(~mMRutag^|2@aRz$L>y#o#9c1NUDZ3*q?;44g$g3-Tv3FmQd~
zSy{1*fq}t+XE$Rp0|RRb&jYE?3=AwQc=fv0GcfSz@`n7n!oa}T!8<qY76SwKG(MRb
zDGUs(3jC32QY;J%Oo{xRNn02gm__+l-k8F`z-61sz`z^5S&7M$8RWhe23LkWh7yKU
zh9U+9hCGH;hH?f4hD3%OhD?S;hGGT<hBStJuv{8L5kn?JDnlMa3WEYeHA5|f0#qi4
zA(bJKp^PDwL4hHaA(x?mp@gB5L4l!!A)i5kp_HK*EQ73H9c*%F9z!BSE<-AV6$dD!
z*cccXoLuutQi~MwQp*(*b21Z)71HvH6w-<^Q}a?3s%sVUixhHF6U$N+QgaJRDiuod
c6-tX!q4Mg*3VDgSsaBI2+2l4?u&Q$c0GRH)m;e9(

delta 544
zcmeB?pD#N>q@II;!Ox0;fnhZRL*xVo2F9ZdEazDm7<fz=Se{Q~U|=}Qz-fDrfq^HG
zL0Qk2fq{ve!Q>wc0|T=MgZs223=E9V8A6)77#P@O7{W8F7#J8W7{aIhWME)SU^wbk
z%)r3i$H=((7Xt&w3&wq1$_xx_)l3I=g)%U3xHDa^Kg_^T&l=D4xz?G1f%7yogV-Ym
z2DZ)2r+B6?FmUp-WbXgUz`*{7rEKq91_oAcmU%5#85p?Uv8>p!l!1Z$49n?fw;33i
z=d!%k=VD-BuVhs;+R4Dcw42p*+CK&cj$Br!1WN`6rsu5d4tFsyurFafX8)Oif!&q$
z-r*Dm2G-4N8D-84^$aZOY@Nr17#P?*+2sWV7#LW#vHMssGca&}XOD|YW?*3W#NI4Y
z!oa}g#y;WrPX-3&_v}+Ilrk`|h;lTpeayhX)xa^+T9|=>b0Q~m+*Aez)@PjdR;~;T
zOcOc1e6<)D7|J0uyBO!$J)H~;+=sZ77>_V8Fff4V$uk+b>m|5W?6G2CV0+GWV){`A
z2If-k{J-ZI7&y(jrx^TXVBnVEu@Iimz`)VVvmk#m0|OT~&&rBj3=9koJi8f-85mgl
zc^*i8W?*1G%&XV6o`HeegE!>Y6$S>z4&J$Gw-^|>HuA~LNMT@LvF49VV_{%mO62cM
n+QPuVEXu#~#uNqycFu@Q1_qw8&00*J%#$5hc{iuBsdEAV*GY%V

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
zcmeyS+i5UCq+Wo5!Ox0;fng^DL*xVo2FAM#EazDm7(|m9Se{Q~U|_h-z-fDrfkCv3
zL0Qk2fq}`A!Q>wc0|V=E2KQ-47#JA;GlVpEF)(nQWeCr#Vqjo&V+f!2lYxOTkKw3S
zF$05$C?n(MUknWV`HcIxlo=SfeV7jH3T0s6<6^pAf0%)xp7RRR=UQh527w363}TNM
z7`T@)pW>Oqz`(zbC3F8*1_s__ma@Hb85lTzu*_?@%D^D>m1V__r3?(brYxtQ-DY55
z%V2q}&&9yNbB<NfXeR>$b2qE$w0{f?d_k;E36=~D%-31h9qwXa;ALh#X8)Oifv1S|
z-r*Dm1}+u0j5242dIt7Bw$5Wh3=G^%?DB#F3=AB?>^>IE3=AUo*yEy-85kHD*qcR4
z7#IW(vQIevlYxQl2K&?tr3?)0A{>otA2TornRCpv7G_`&sN-ago65kzRmo{@<;uXo
z?9S;i;}in}%N|ZIUo8d(hE@p8W6F7UPbUL|NHLcZ<B@s>1_lNYgMopmnk!zCm4ShG
zC)bKSRtyZ>Ke$dzKgz(srpKNC_Z$NQ|2ys}20s}Xg!OqWgy%Cb@Ky0F$e+x>AQ;25
zvSJql1A`aOZpLB;2KHM#52QXbFtAPI)$3Z%z#v@C8}jQ40|Vm>-nnVF7#M`Q_+)0J
zFfg!t@JFUeu`n<&9p&##+QPuVV$Q$v#uNqy0ohCj2GO&V=d##uPGo9isb9q+#A3u^
z%3{J|!Q#YX%Amkv%VNi3#Ny3j$)Lbu&*I2p%3{P~!eYl_%VNP|!=S)o!eY(h52hVh
zoLP)n3>Xv`su^k-6j&@+tXV7=6j<z799f)L3|Nd<e4u99vp9pryirWBU~#Nxv1hSk
zv1ajMF$Y^~0Ja8XyeW$@iyhcd8x~WLD1#LTC_vd57#N&f^GZ^S6!KEb6%unY6N?qn
z@{1JGiZWC4QWUCd74nM|a#9n^QWa8j3rZ>#O7ay-i&LTU>ct9qiMgp(?4Y>uO`QCK
LgLm^IHW2{;nqj?b

delta 547
zcmeA)_@+BSq@II;!Ox0;fng^DL*xVo2FAM#EazDm7(^l%Se{Q~U|_h-z-fDrfkC96
zL0Qk2fq}`A!Q>wc0|Uz*2KQ-47#JA;GlVpEF)(l*VhGQyVqjo&V+f!2lYxOTkKw3S
zF$04z7bD~5UknU<DUAELlo=Sf9GMR63T0s6`OkE{{xAbWJ;zC=&$Z4B4E$G_8N?nj
zFmTOgKE*SIfq`!^OXmKs3=BLGEM<G=GBB{eWtrD<m4QL<70ZepOBon=v{+6*yUoDB
z8q4xppNoNk`!K7b(M|>i=5AKgY5y1)c->i@5-b@Qn6I<0JKV*<!2N^unEhu42JUp$
zdxujP7&s-_GRmA8>KWLY**cF2F)(m`XO|ZgU|?Y9VE3_LW?&G$%pMn&%)r3Nz}_rU
z!oVP~jeWxLp9~DFXW6G-C}m(^<K$>u`<Q`2P={ltwJ-w%e=#R>+*Aez&OA<gD^~^v
zW_M06Uo8d(hE@p8t;KnEPbUL|a0ZtW;}Hf11_lsa&%nS`%@r@n%D}+0j%&ppD+UIx
zw_GQtA7x-*Rp!qBdyavD?=kljgP#lxLMl8K!t)szc=LG{<WFW`5D4U1S+R?Ofx(Ms
zH)Ama1KW9?2U4FI7+AY`^}5zGFbL)FhWxt1z`!_zcW&A(1_r@;KA9OQ3=C|x{E=xa
q3=B+1`8$(@wlFZTnDei^F@=GFUnrA-LFCY8Ev5r3o4>M)2mk;~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>