Commits July 2006

commits@gajim.org

5 participants
109 discussions

[commit-gajim] r6559 - trunk/src
by asterix＠gajim.org 17 Jul '06

17 Jul '06

Author: asterix Date: 2006-07-17 14:48:07 +0200 (Mon, 17 Jul 2006) New Revision: 6559 Modified: trunk/src/chat_control.py Log: Fix TB. Fixes #2029 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-07-17 12:01:04 UTC (rev 6558) +++ trunk/src/chat_control.py 2006-07-17 12:48:07 UTC (rev 6559) @@ -1575,6 +1575,9 @@ def show_bigger_avatar(self, small_avatar): '''resizes the avatar, if needed, so it has at max half the screen size and shows it''' + if not small_avatar.window: + # Tab has been closed since we hovered the avatar + return is_fake = False if self.type_id == message_control.TYPE_PM: is_fake = True

1 0

[commit-gajim] r6558 - trunk/po
by asterix＠gajim.org 17 Jul '06

17 Jul '06

Author: asterix Date: 2006-07-17 14:01:04 +0200 (Mon, 17 Jul 2006) New Revision: 6558 Modified: trunk/po/fr.po Log: [Jonathan] updated french translation Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2006-07-17 11:31:42 UTC (rev 6557) +++ trunk/po/fr.po 2006-07-17 12:01:04 UTC (rev 6558) @@ -1,11 +1,8 @@ -# translation of gajim.po to # French translations for gajim package -# Traduction anglaise du package gajim. -# Copyright (C) 2004 THE gajim'S COPYRIGHT HOLDER +# Copyright (C) 2004-2006 THE gajim'S COPYRIGHT HOLDER # This file is distributed under the same license as the gajim package. -# Automatically generated, 2004. -# , 2005. # +# See: http://live.gnome.org/GnomeFr/Traduire for translation guidelines # #: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225 msgid "" @@ -33,15 +30,15 @@ #: ../gajim.desktop.in.h:3 msgid "Jabber IM Client" -msgstr "Client de la MI Jabber" +msgstr "Client de MI Jabber" #: ../data/glade/account_context_menu.glade.h:1 msgid "Send Single _Message..." -msgstr "Envoyer un _Message Simple..." +msgstr "Envoyer un _message simple..." #: ../data/glade/account_context_menu.glade.h:2 msgid "_Add Contact..." -msgstr "Ajouter un _Contact..." +msgstr "Ajouter un _contact..." #: ../data/glade/account_context_menu.glade.h:3 msgid "_Discover Services..." @@ -55,7 +52,7 @@ #: ../data/glade/account_context_menu.glade.h:5 msgid "_Modify Account..." -msgstr "_Modifier le Compte..." +msgstr "_Modifier le compte..." #: ../data/glade/account_context_menu.glade.h:6 msgid "_Status" @@ -135,7 +132,7 @@ #: ../data/glade/account_creation_wizard_window.glade.h:18 msgid "Your JID:" -msgstr "Votre Identifiant Jabber :" +msgstr "Votre identifiant Jabber :" #: ../data/glade/account_creation_wizard_window.glade.h:19 #: ../data/glade/roster_window.glade.h:10 @@ -219,13 +216,13 @@ "be disabled" msgstr "" "Si vous cochez cette case, Gajim se connectera sur le port 5223, sur lequel " -"les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le cryptage " +"les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le chiffrement " "TLS par défaut si le serveur annonce qu'il le supporte, et avec cette option " "vous désactivez le TLS" #: ../data/glade/account_modification_window.glade.h:10 msgid "Choose _Key..." -msgstr "Choisissez une _clé" +msgstr "Choisissez une _clé..." #: ../data/glade/account_modification_window.glade.h:11 msgid "Click to change account's password" @@ -258,7 +255,6 @@ msgstr "Serveur :" #: ../data/glade/account_modification_window.glade.h:17 -#, fuzzy msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." @@ -279,7 +275,7 @@ "If checked, Gajim will store the password in ~/.gajim/config with 'read' " "permission only for you" msgstr "" -"Si cette case est cochée, Gajim va sauvegarder le mot de passe dans ~/.gajim/" +"Si cette case est cochée, Gajim va stocker le mot de passe dans ~/.gajim/" "config avec accès en lecture pour vous uniquement" #: ../data/glade/account_modification_window.glade.h:21 @@ -288,7 +284,7 @@ "this account" msgstr "" "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement " -"à jabber en utilisant ce compte." +"à jabber en utilisant ce compte" #: ../data/glade/account_modification_window.glade.h:22 msgid "" @@ -306,7 +302,7 @@ #: ../data/glade/account_modification_window.glade.h:24 msgid "Manage..." -msgstr "Modifier..." +msgstr "Gérer..." #: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448 msgid "No key selected" @@ -426,9 +422,8 @@ msgstr "_Supprimer" #: ../data/glade/add_new_contact_window.glade.h:1 -#, fuzzy msgid "A_llow this contact to view my status" -msgstr "L'autoriser à voir mon état" +msgstr "_Autoriser ce contact à voir mon état" #: ../data/glade/add_new_contact_window.glade.h:2 msgid "Add New Contact" @@ -439,33 +434,28 @@ msgstr "Je souhaiterais vous ajouter à ma liste de contacts." #: ../data/glade/add_new_contact_window.glade.h:4 -#, fuzzy msgid "_Account:" -msgstr "Compte" +msgstr "_Compte :" #: ../data/glade/add_new_contact_window.glade.h:5 -#, fuzzy msgid "_Group:" -msgstr "Groupe :" +msgstr "_Groupe :" #: ../data/glade/add_new_contact_window.glade.h:7 -#, fuzzy msgid "_Nickname:" -msgstr "Surnom :" +msgstr "_Surnom :" #: ../data/glade/add_new_contact_window.glade.h:8 -#, fuzzy msgid "_Protocol:" -msgstr "Protocole :" +msgstr "_Protocole :" #: ../data/glade/add_new_contact_window.glade.h:9 msgid "_Subscribe" msgstr "_Ajouter" #: ../data/glade/add_new_contact_window.glade.h:10 -#, fuzzy msgid "_User ID:" -msgstr "Identifiant :" +msgstr "_Identifiant :" #: ../data/glade/advanced_configuration_window.glade.h:1 msgid "Description" @@ -475,7 +465,7 @@ msgid "NOTE: You should restart gajim for some setting to take effect" msgstr "" "NOTE : Vous devez redémarrer Gajim pour prendre en compte certaines " -"de vos modifications." +"de vos modifications" #: ../data/glade/advanced_configuration_window.glade.h:3 msgid "Advanced Configuration Editor" @@ -538,14 +528,12 @@ msgstr "" #: ../data/glade/advanced_notifications_window.glade.h:2 -#, fuzzy msgid "Actions" -msgstr "Applications" +msgstr "Actions" #: ../data/glade/advanced_notifications_window.glade.h:3 -#, fuzzy msgid "Conditions" -msgstr "Sons" +msgstr "Conditions" #: ../data/glade/advanced_notifications_window.glade.h:4 #: ../data/glade/preferences_window.glade.h:10 @@ -553,42 +541,36 @@ msgstr "Sons" #: ../data/glade/advanced_notifications_window.glade.h:5 -#, fuzzy msgid "Add" -msgstr "Adresse" +msgstr "Ajouter" #: ../data/glade/advanced_notifications_window.glade.h:6 -#, fuzzy msgid "Advanced Actions" -msgstr "Actions a_vancées" +msgstr "Actions avancées" #: ../data/glade/advanced_notifications_window.glade.h:7 -#, fuzzy msgid "Advanced Notifications Control" msgstr "Éditeur de configuration avancée" #: ../data/glade/advanced_notifications_window.glade.h:8 -#, fuzzy msgid "All Status " -msgstr "État : " +msgstr "Tous les états " #: ../data/glade/advanced_notifications_window.glade.h:9 msgid "And I " -msgstr "" +msgstr "Et je " #: ../data/glade/advanced_notifications_window.glade.h:10 -#, fuzzy msgid "Away " -msgstr "Absent" +msgstr "Absent " #: ../data/glade/advanced_notifications_window.glade.h:11 -#, fuzzy msgid "Busy " -msgstr "Occupé" +msgstr "Occupé " #: ../data/glade/advanced_notifications_window.glade.h:12 msgid "Don't have " -msgstr "" +msgstr "N'ai pas" #: ../data/glade/advanced_notifications_window.glade.h:13 #, fuzzy @@ -597,7 +579,7 @@ #: ../data/glade/advanced_notifications_window.glade.h:14 msgid "Have " -msgstr "" +msgstr "Ai" #: ../data/glade/advanced_notifications_window.glade.h:15 #: ../src/common/helpers.py:239 @@ -615,19 +597,16 @@ msgstr "Ajout de notifications spéciales pour %s" #: ../data/glade/advanced_notifications_window.glade.h:18 -#, fuzzy msgid "Not Available " -msgstr "Non disponible" +msgstr "Non disponible " #: ../data/glade/advanced_notifications_window.glade.h:19 -#, fuzzy msgid "Online / Free For Chat" -msgstr "Disponible pour discuter" +msgstr "En ligne / Disponible pour discuter" #: ../data/glade/advanced_notifications_window.glade.h:20 -#, fuzzy msgid "Play a sound" -msgstr "_Jouer les sons" +msgstr "Jouer un son" #: ../data/glade/advanced_notifications_window.glade.h:21 msgid "" @@ -648,11 +627,11 @@ #: ../data/glade/advanced_notifications_window.glade.h:31 msgid "Up" -msgstr "" +msgstr "Haut" #: ../data/glade/advanced_notifications_window.glade.h:32 msgid "When " -msgstr "" +msgstr "Quand" #: ../data/glade/advanced_notifications_window.glade.h:33 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash" @@ -736,7 +715,7 @@ #: ../data/glade/change_status_message_dialog.glade.h:3 msgid "Save as Preset..." -msgstr "Enregistrer comme Messages d'État Prédéfini" +msgstr "Enregistrer comme messages d'état prédéfini..." #: ../data/glade/chat_context_menu.glade.h:1 msgid "Join _Group Chat" @@ -782,7 +761,7 @@ #: ../data/glade/chat_control_popup_menu.glade.h:3 msgid "Toggle Open_PGP Encryption" -msgstr "Bascule l'Encryption _GPG" +msgstr "Bascule le chiffrement _GPG" #: ../data/glade/chat_control_popup_menu.glade.h:5 #: ../data/glade/gc_control_popup_menu.glade.h:6 @@ -1181,7 +1160,7 @@ #: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966 msgid "OpenPGP Encryption" -msgstr "Encryption OpenPGP" +msgstr "Chiffrement OpenPGP" #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) #: ../data/glade/message_window.glade.h:4 @@ -1349,7 +1328,7 @@ msgstr "" "Gajim peut envoyer et recevoir des meta-informations concernant les " "conversations que vous pouvez avoir avec un contact. Vous pouvez ici " -"spécifier quel état de conversation vous voulez envoyer à vos contacts" +"spécifier quel état de conversation vous voulez envoyer à vos contacts." #: ../data/glade/preferences_window.glade.h:39 msgid "" @@ -1432,7 +1411,7 @@ #: ../data/glade/preferences_window.glade.h:50 msgid "Ma_nage..." -msgstr "Gérer..." +msgstr "_Gérer..." #: ../data/glade/preferences_window.glade.h:51 msgid "" @@ -1813,7 +1792,7 @@ #: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252 #: ../src/roster_window.py:1462 msgid "_Edit" -msgstr "_Éditer" +msgstr "É_dition" #: ../data/glade/roster_window.glade.h:14 msgid "_FAQ" @@ -1821,7 +1800,7 @@ #: ../data/glade/roster_window.glade.h:16 msgid "_Help" -msgstr "_Aide" +msgstr "Aid_e" #: ../data/glade/roster_window.glade.h:17 msgid "_Preferences" @@ -2183,11 +2162,11 @@ #: ../src/chat_control.py:1106 msgid "Encryption enabled" -msgstr "Encryption activée" +msgstr "Chiffrement activée" #: ../src/chat_control.py:1111 msgid "Encryption disabled" -msgstr "Encryption désactivée" +msgstr "Chiffrement désactivée" #. add_to_roster_menuitem #: ../src/chat_control.py:1239 ../src/conversation_textview.py:407 @@ -2781,8 +2760,8 @@ #: ../src/dialogs.py:612 msgid "translator-credits" msgstr "" -"Traduction française proposée par\n" -"Yann Le Boulanger <asterix(a)lagaule.org>" +"Yann Le Boulanger <asterix(a)lagaule.org>\n" +"Jonathan Ernst <jonathan(a)ernstfamily.ch>" #: ../src/dialogs.py:738 #, fuzzy, python-format @@ -3008,7 +2987,7 @@ #: ../src/dialogs.py:1994 #, python-format msgid "Comment: %s" -msgstr "Commentaire : %s" +msgstr "Commentaire : %s" #: ../src/dialogs.py:2054 msgid "Choose Sound" @@ -3033,7 +3012,7 @@ #: ../src/dialogs.py:2157 #, python-format msgid "When %s becomes:" -msgstr "Quand %s devient :" +msgstr "Quand %s devient :" #: ../src/dialogs.py:2159 #, python-format @@ -3134,12 +3113,12 @@ #: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223 #, python-format msgid "Filename: %s" -msgstr "Nom du Fichier : %s" +msgstr "Nom du Fichier : %s" #: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291 #, python-format msgid "Size: %s" -msgstr "Taille : %s" +msgstr "Taille : %s" #. You is a reply of who sent a file #. You is a reply of who received a file @@ -3151,17 +3130,17 @@ #: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224 #, python-format msgid "Sender: %s" -msgstr "Expéditeur : %s" +msgstr "Expéditeur : %s" #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556 #: ../src/tooltips.py:639 msgid "Recipient: " -msgstr "Destinataire : " +msgstr "Destinataire : " #: ../src/filetransfers_window.py:186 #, python-format msgid "Saved in: %s" -msgstr "sauvé dans : %s" +msgstr "Enregistré dans : %s" #: ../src/filetransfers_window.py:188 msgid "File transfer completed" @@ -3194,22 +3173,22 @@ #: ../src/filetransfers_window.py:289 #, python-format msgid "File: %s" -msgstr "Fichier : %s" +msgstr "Fichier : %s" #: ../src/filetransfers_window.py:294 #, python-format msgid "Type: %s" -msgstr "Type : %s" +msgstr "Type : %s" #: ../src/filetransfers_window.py:296 #, python-format msgid "Description: %s" -msgstr "Description : %s" +msgstr "Description : %s" #: ../src/filetransfers_window.py:297 #, python-format msgid "%s wants to send you a file:" -msgstr "%s souhaite vous envoyer un fichier :" +msgstr "%s souhaite vous envoyer un fichier :" #: ../src/filetransfers_window.py:311 #, python-format @@ -3265,7 +3244,7 @@ #: ../src/filetransfers_window.py:528 msgid "File: " -msgstr "Fichier : " +msgstr "Fichier : " #: ../src/filetransfers_window.py:532 msgid "It is not possible to send empty files" @@ -3274,11 +3253,11 @@ #: ../src/filetransfers_window.py:552 ../src/tooltips.py:511 #: ../src/tooltips.py:629 msgid "Name: " -msgstr "Nom : " +msgstr "Nom : " #: ../src/filetransfers_window.py:554 ../src/tooltips.py:633 msgid "Sender: " -msgstr "Expéditeur : " +msgstr "Expéditeur : " #: ../src/filetransfers_window.py:742 msgid "Pause" @@ -3341,7 +3320,7 @@ #: ../src/gajim-remote.py:112 msgid "one of: offline, online, chat, away, xa, dnd, invisible " -msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible " +msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible " #: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134 #: ../src/gajim-remote.py:148 @@ -3400,7 +3379,7 @@ #: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149 msgid "if specified, the message will be encrypted using this public key" -msgstr "Si spécifié, le message sera crypté en utilisant cette clé public" +msgstr "Si spécifié, le message sera chiffré en utilisant cette clé public" #: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151 msgid "if specified, the message will be sent using this account" @@ -3553,7 +3532,7 @@ #: ../src/gajim-remote.py:321 #, python-format msgid "Unknown D-Bus version: %s" -msgstr "Version de dbus inconnue : %s" +msgstr "Version de dbus inconnue : %s" #: ../src/gajim-remote.py:348 #, python-format @@ -3566,7 +3545,7 @@ #: ../src/gajim-remote.py:351 msgid "Arguments:" -msgstr "Arguments :" +msgstr "Arguments :" #: ../src/gajim-remote.py:355 #, python-format @@ -3579,8 +3558,8 @@ "Usage: %s command [arguments]\n" "Command is one of:\n" msgstr "" -"Usage : %s commande [arguments]\n" -"commande est l'une de :\n" +"Utilisation : %s commande [arguments]\n" +"commande est l'une de :\n" #: ../src/gajim-remote.py:433 #, python-format @@ -3649,7 +3628,7 @@ #: ../src/gajim.py:267 #, python-format msgid "HTTP (%s) Authorization for %s (id: %s)" -msgstr "Autorisation HTTP (%s) pour %s (id : %s)" +msgstr "Autorisation HTTP (%s) pour %s (id : %s)" #: ../src/gajim.py:268 msgid "Do you accept this request?" @@ -3773,7 +3752,7 @@ #. in case he or she cannot see the output of the console #: ../src/gajim.py:1683 msgid "Could not save your settings and preferences" -msgstr "Impossible de sauver vos informations de configuration" +msgstr "Impossible d'enregistrer vos informations de configuration" #: ../src/gajim.py:1903 msgid "Session Management support not available (missing gnome.ui module)" @@ -3845,23 +3824,23 @@ #: ../src/groupchat_control.py:801 #, python-format msgid "%(nick)s has been kicked: %(reason)s" -msgstr "%(nick)s a été éjecté : %(reason)s" +msgstr "%(nick)s a été éjecté : %(reason)s" #: ../src/groupchat_control.py:805 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" -msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s" +msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s" #. do not print 'banned by None' #: ../src/groupchat_control.py:812 #, python-format msgid "%(nick)s has been banned: %(reason)s" -msgstr "%(nick)s a été banni : %(reason)s" +msgstr "%(nick)s a été banni : %(reason)s" #: ../src/groupchat_control.py:816 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" -msgstr "%(nick)s a été banni par %(who)s : %(reason)s" +msgstr "%(nick)s a été banni par %(who)s : %(reason)s" #: ../src/groupchat_control.py:824 #, python-format @@ -3893,7 +3872,7 @@ #: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148 #, python-format msgid "Nickname not found: %s" -msgstr "Surnom introuvable : %s" +msgstr "Surnom introuvable : %s" #: ../src/groupchat_control.py:1066 #, python-format @@ -3915,7 +3894,7 @@ #: ../src/groupchat_control.py:1207 #, python-format msgid "Commands: %s" -msgstr "Commandes : %s" +msgstr "Commandes : %s" #: ../src/groupchat_control.py:1209 #, python-format @@ -3925,7 +3904,7 @@ "is currently in the room, he/she/it will also be kicked. Does NOT support " "spaces in nickname." msgstr "" -"Usage : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom de " +"Utilisation : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom de " "l'occupant peut être utilisé s'il ne contient pas de \"@\". Si le JID est " "actuellement dans le salon il sera également éjecté. Ne supporte pas les " "espaces dans le surnom." @@ -3935,7 +3914,7 @@ msgid "" "Usage: /%s <nickname>, opens a private chat window to the specified occupant." msgstr "" -"Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant " +"Utilisation : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant " "spécifié." #: ../src/groupchat_control.py:1219 @@ -3949,7 +3928,7 @@ "Usage: /%s [reason], closes the current window or tab, displaying reason if " "specified." msgstr "" -"Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la " +"Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la " "raison si spécifiée." #: ../src/groupchat_control.py:1224 @@ -3963,7 +3942,7 @@ "Usage: /%s <JID> [reason], invites JID to the current room, optionally " "providing a reason." msgstr "" -"Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison " +"Utilisation : /%s <JID> [raison], invite le JID dans le salon actuel, la raison " "est optionnelle." #: ../src/groupchat_control.py:1230 @@ -3972,7 +3951,7 @@ "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally " "using specified nickname." msgstr "" -"Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur " +"Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur " "en option on peut spécifier le surnom utilisé." #: ../src/groupchat_control.py:1234 @@ -3982,7 +3961,7 @@ "from the room and optionally displays a reason. Does NOT support spaces in " "nickname." msgstr "" -"Usage : /%s <surnom> [raison], supprime l'occupant portant le surnom " +"Utilisation : /%s <surnom> [raison], supprime l'occupant portant le surnom " "spécifié du salon et affiche en option la raison. Le surnom ne doit pas " "contenir d'espaces !" @@ -3992,7 +3971,7 @@ "Usage: /%s <action>, sends action to the current room. Use third person. (e." "g. /%s explodes.)" msgstr "" -"Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième " +"Utilisation : /%s <action>, envoie l'action au salon actuel. Utilise la troisième " "personne. (ex : /%s explose.)" #: ../src/groupchat_control.py:1243 @@ -4001,30 +3980,30 @@ "Usage: /%s <nickname> [message], opens a private message windowand sends " "message to the occupant specified by nickname." msgstr "" -"Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et " +"Utilisation : /%s <surnom> [message], ouvre une fenêtre de discussion privée et " "envoie le message à l'occupant(e) spécifié(e) par le surnom." #: ../src/groupchat_control.py:1248 #, python-format msgid "Usage: /%s <nickname>, changes your nickname in current room." -msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon." +msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon." #: ../src/groupchat_control.py:1252 #, fuzzy, python-format msgid "Usage: /%s , display the names of room occupants." -msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon." +msgstr "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon." #: ../src/groupchat_control.py:1256 #, python-format msgid "Usage: /%s [topic], displays or updates the current room topic." -msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon." +msgstr "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon." #: ../src/groupchat_control.py:1259 #, python-format msgid "" "Usage: /%s <message>, sends a message without looking for other commands." msgstr "" -"Usage : /%s <message>, envoie un message sans chercher d'autres commandes." +"Utilisation : /%s <message>, envoie un message sans chercher d'autres commandes." #: ../src/groupchat_control.py:1262 #, python-format @@ -4050,7 +4029,7 @@ #: ../src/groupchat_control.py:1344 msgid "Please specify the new subject:" -msgstr "Saisissez le nouveau sujet :" +msgstr "Saisissez le nouveau sujet :" #: ../src/groupchat_control.py:1352 msgid "Changing Nickname" @@ -4058,7 +4037,7 @@ #: ../src/groupchat_control.py:1353 msgid "Please specify the new nickname you want to use:" -msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :" +msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :" #: ../src/groupchat_control.py:1379 msgid "Bookmark already set" @@ -4087,7 +4066,7 @@ #: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779 msgid "You may specify a reason below:" -msgstr "Vous pouvez saisir une raison ci-dessous :" +msgstr "Vous pouvez saisir une raison ci-dessous :" #. ask for reason #: ../src/groupchat_control.py:1778 @@ -4119,7 +4098,7 @@ #: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169 #, python-format msgid "Error: cannot open %s for reading" -msgstr "Erreur : impossible d'ouvrir %s en lecture" +msgstr "Erreur : impossible d'ouvrir %s en lecture" #: ../src/gtkgui_helpers.py:298 msgid "Error reading file:" @@ -4127,7 +4106,7 @@ #: ../src/gtkgui_helpers.py:301 msgid "Error parsing file:" -msgstr "Erreur lors de l'analyse du fichier :" +msgstr "Erreur lors de l'analyse du fichier :" #. do not traceback (could be a permission problem) #. we talk about a file here @@ -4240,7 +4219,7 @@ #: ../src/history_window.py:258 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" -msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s" +msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s" #: ../src/history_window.py:262 ../src/notify.py:113 #, python-format @@ -4250,12 +4229,12 @@ #: ../src/history_window.py:268 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" -msgstr "L'état est maintenant : %(status)s : %(status_msg)s" +msgstr "L'état est maintenant : %(status)s : %(status_msg)s" #: ../src/history_window.py:271 #, python-format msgid "Status is now: %(status)s" -msgstr "L'état est maintenant : %(status)s" +msgstr "L'état est maintenant : %(status)s" #: ../src/message_window.py:244 msgid "Messages" @@ -4294,7 +4273,7 @@ #: ../src/notify.py:151 #, python-format msgid "%(nickname)s: %(message)s" -msgstr "%(nickname)s : %(message)s" +msgstr "%(nickname)s : %(message)s" #: ../src/notify.py:157 #, python-format @@ -4577,28 +4556,28 @@ #: ../src/tooltips.py:395 msgid "Role: " -msgstr "Fonction : " +msgstr "Fonction : " #: ../src/tooltips.py:396 msgid "Affiliation: " -msgstr "Affiliation : " +msgstr "Affiliation : " #: ../src/tooltips.py:398 ../src/tooltips.py:537 msgid "Resource: " -msgstr "Ressource : " +msgstr "Ressource : " #: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565 #: ../src/tooltips.py:676 msgid "Status: " -msgstr "État : " +msgstr "État : " #: ../src/tooltips.py:514 msgid "Subscription: " -msgstr "Inscription : " +msgstr "Inscription : " #: ../src/tooltips.py:523 msgid "OpenPGP: " -msgstr "OpenPGP : " +msgstr "OpenPGP : " #: ../src/tooltips.py:570 #, python-format @@ -4620,11 +4599,11 @@ #: ../src/tooltips.py:645 msgid "Type: " -msgstr "Type : " +msgstr "Type : " #: ../src/tooltips.py:651 msgid "Transferred: " -msgstr "Transféré : " +msgstr "Transféré : " #: ../src/tooltips.py:654 ../src/tooltips.py:675 msgid "Not started" @@ -4758,7 +4737,7 @@ #: ../src/common/exceptions.py:40 msgid "Service not available: Gajim is not running, or remote_control is False" msgstr "" -"Service indisponible : Gajim n'est pas lancé ou remote_control est False" +"Service indisponible : Gajim n'est pas lancé ou remote_control est False" #: ../src/common/exceptions.py:48 msgid "D-Bus is not present on this machine or python module is missing" @@ -5257,7 +5236,7 @@ "Subject: %s\n" "%s" msgstr "" -"Sujet : %s\n" +"Sujet : %s\n" "%s" #: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511 @@ -5320,7 +5299,7 @@ msgstr "" "Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré " "par un autre occupant.\n" -"Veuillez entrer un autre surnom ci-dessous :" +"Veuillez entrer un autre surnom ci-dessous :" #. BE CAREFUL: no con.updateRosterItem() in a callback #: ../src/common/connection_handlers.py:1519 @@ -5392,7 +5371,7 @@ #: ../src/common/helpers.py:170 #, python-format msgid "%s KiB" -msgstr "%s Ko" +msgstr "%s Kio" #. KB means kilo bytes #: ../src/common/helpers.py:173 @@ -5555,199 +5534,4 @@ #: ../src/common/optparser.py:180 ../src/common/optparser.py:181 msgid "cyan" -msgstr "Cyan" - -#~ msgid "Automatically authorize contact" -#~ msgstr "Autoriser automatiquement le contact à voir mon état" - -#~ msgid "Send File" -#~ msgstr "Envoyer un Fichier" - -#~ msgid "Underline" -#~ msgstr "Souligner" - -#~ msgid "Would you like to overwrite it?" -#~ msgstr "Voulez-vous l'écraser ?" - -#~ msgid "_Join New Room..." -#~ msgstr "Re_joindre un nouveau salon..." - -#~ msgid "Usage: /%s, sets the groupchat window to compact mode." -#~ msgstr "" -#~ "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte." - -#, fuzzy -#~ msgid "Please modify your special notification below" -#~ msgstr "Choisissez une des options suivantes :" - -#~ msgid "Delete Message of the Day" -#~ msgstr "Supprimer le message du jour" - -#, fuzzy -#~ msgid "I want a notification popup:" -#~ msgstr "Noti_fications d'état de discussion" - -#, fuzzy -#~ msgid "I want to listen to:" -#~ msgstr "%s souhaite vous envoyer un fichier :" - -#~ msgid "Send _New Message..." -#~ msgstr "Envoyer un _nouveau message..." - -#~ msgid "Set Message of the Day" -#~ msgstr "Définir un message du jour" - -#~ msgid "Update Message of the Day" -#~ msgstr "Mettre à jour le message du jour" - -#~ msgid "_XML Console..." -#~ msgstr "Console _XML..." - -#~ msgid "Choose Avatar" -#~ msgstr "Choisissez un Avatar" - -#~ msgid "Use compact view when you open a chat window" -#~ msgstr "" -#~ "Utiliser la vue compacte quand vous ouvrez une fenêtre de discussion" - -#~ msgid "Use compact view when you open a group chat window" -#~ msgstr "Utiliser la vue compacte quand vous ouvrez une fenêtre de salon" - -#~ msgid "plain" -#~ msgstr "Standard" - -#~ msgid "Send" -#~ msgstr "Envoyer" - -#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message." -#~ msgstr "" -#~ "%(nickname)s du salon %(room_name)s vous a envoyé un nouveau message." - -#~ msgid "%s has sent you a new message." -#~ msgstr "%s vous a envoyé un nouveau message." - -#, fuzzy -#~ msgid "GUI Migration failed" -#~ msgstr "échec lors de la publication de votre vCard" - -#~ msgid "Logs have been successfully migrated to the database." -#~ msgstr "L'historique a été corectement récupéré." - -#~ msgid "If checked, Gajim will also have a trayicon" -#~ msgstr "" -#~ "Si cette case est cochée, Gajim placera une icône dans la zone de " -#~ "notification" - -#~ msgid "_Online Users" -#~ msgstr "Utilisateurs En _Ligne" - -#, fuzzy -#~ msgid "Start Chat with Contact" -#~ msgstr "Commencer une discussion avec le compte %s" - -#~ msgid "All contacts in this group are offline or have errors" -#~ msgstr "Tous les contacts de ce groupe sont déconnectés ou ont des erreurs" - -#~ msgid "Size: " -#~ msgstr "Taille : " - -#~ msgid "Session bus is not available" -#~ msgstr "Le bus de session n'est pas disponible" - -#~ msgid "Sound" -#~ msgstr "Son" - -#~ msgid "Text" -#~ msgstr "Texte" - -#~ msgid "Image" -#~ msgstr "Image" - -#~ msgid "From %s" -#~ msgstr "De %s" - -#~ msgid "To %s" -#~ msgstr "À %s" - -#~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s" -#~ msgstr "Vous avez été invité dans le salon %(room_jid)s par %(contact_jid)s" - -#~ msgid "Manage Emoticons" -#~ msgstr "Gérer les frimousses" - -#~ msgid "Or choose a preset message:" -#~ msgstr "Ou choisissez votre message :" - -#~ msgid "Use _emoticons" -#~ msgstr "Utiliser les _frimousses" - -#~ msgid "_Set Image..." -#~ msgstr "_Choisir une image..." - -#~ msgid "Switch to %s" -#~ msgstr "Basculer vers %s" - -#~ msgid "using account " -#~ msgstr "en utilisant le compte " - -#~ msgid "The filesize of image \"%s\" is too large" -#~ msgstr "Le taille du fichier de l'image \"%s\" est trop importante" - -#~ msgid "The file must not be more than 32 kilobytes." -#~ msgstr "Le fichier ne doit pas excéder les 32 kilobytes." - -#~ msgid "Timeout" -#~ msgstr "Dépassement de temps" - -#~ msgid "A protocol error has occured:" -#~ msgstr "Une erreur de protocole s'est produite :" - -#~ msgid "account: " -#~ msgstr "compte : " - -#~ msgid "Are you sure you want to leave rooms \"%s\"?" -#~ msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?" - -#~ msgid "If you close this window, you will be disconnected from these rooms." -#~ msgstr "Si vous fermer cette fenêtre, vous serez déconnecté de ces salons." - -#~ msgid "Activate/Disable notification for when a file transfer is complete" -#~ msgstr "Active/Désactive la notification de fin de transfert" - -#~ msgid "Removing selected file transfer" -#~ msgstr "Supprime le transfert du fichier sélectionné" - -#~ msgid "Stoping selected file transfer" -#~ msgstr "Arrête le transfert de fichier sélectionné" - -#~ msgid "" -#~ "If you close this tab and you have history disabled, the message will be " -#~ "lost." -#~ msgstr "" -#~ "Si vous fermez cet onglet et que l'historique n'est pas activé, le " -#~ "message sera perdu." - -#~ msgid "Cannot remove last group" -#~ msgstr "Impossible d'enlever le dernier groupe" - -#~ msgid "At least one contact group must be present." -#~ msgstr "Au moins un groupe de contacts doit exister." - -#~ msgid "" -#~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install " -#~ "pysqlite3, if you want to migrate your logs to the new database, please " -#~ "read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..." -#~ msgstr "" -#~ "pysqlite2 (ou python-pysqlite2) n'est pas installé. Aprés avoir installé " -#~ "pysqlite2, si vous voulez migrer votre historique dans la nouvelle base " -#~ "de donnée, lisez http://trac.gajim.org/wiki/MigrateLogToDot9DB. Quitte..." - -#~ msgid "Image is too big" -#~ msgstr "L'image est trop grande" - -#~ msgid "" -#~ "Image for emoticon has to be less than or equal to 24 pixels in width and " -#~ "24 in height." -#~ msgstr "" -#~ "L'image pour l'émoticône doit être inférieure ou égale à 24 points en " -#~ "largeur et 24 points en hauteur." +msgstr "cyan"

1 0

[commit-gajim] r6557 - trunk/src
by asterix＠gajim.org 17 Jul '06

17 Jul '06

Author: asterix Date: 2006-07-17 13:31:42 +0200 (Mon, 17 Jul 2006) New Revision: 6557 Modified: trunk/src/gajim.py trunk/src/vcard.py Log: Fixed TB qith ICQ transport. Fixes #2159 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-07-17 10:36:28 UTC (rev 6556) +++ trunk/src/gajim.py 2006-07-17 11:31:42 UTC (rev 6557) @@ -802,7 +802,7 @@ c = gajim.contacts.get_contact(account, array[0], array[1]) # c is a list when no resource is given. it probably means that contact # is offline, so only on Contact instance - if isinstance(c, list): + if isinstance(c, list) and len(c): c = c[0] if c: # c can be none if it's a gc contact c.last_status_time = time.localtime(time.time() - array[2]) Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2006-07-17 10:36:28 UTC (rev 6556) +++ trunk/src/vcard.py 2006-07-17 11:31:42 UTC (rev 6557) @@ -270,6 +270,8 @@ self.fill_status_label() def set_os_info(self, resource, client_info, os_info): + if self.xml.get_widget('information_notebook').get_n_pages() < 5: + return i = 0 client = '' os = '' @@ -293,6 +295,8 @@ self.xml.get_widget('os_label').set_text(os) def fill_status_label(self): + if self.xml.get_widget('information_notebook').get_n_pages() < 5: + return contact_list = gajim.contacts.get_contact(self.account, self.contact.jid) # stats holds show and status message stats = ''

1 0

[commit-gajim] r6556 - trunk/src
by asterix＠gajim.org 17 Jul '06

17 Jul '06

Author: asterix Date: 2006-07-17 12:36:28 +0200 (Mon, 17 Jul 2006) New Revision: 6556 Modified: trunk/src/config.py Log: Fix TB when closing account modification window. Fixes #2161 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-07-17 10:07:26 UTC (rev 6555) +++ trunk/src/config.py 2006-07-17 10:36:28 UTC (rev 6556) @@ -1317,6 +1317,7 @@ relogin_needed = False else: # we're connected to the account we want to apply changes # check if relogin is needed + relogin_needed = False if self.options_changed_need_relogin(config, ('resource', 'proxy', 'usessl', 'keyname', 'use_custom_host', 'custom_host')):

1 0

[commit-gajim] r6555 - in trunk: data/glade src src/common
by asterix＠gajim.org 17 Jul '06

17 Jul '06

Author: asterix Date: 2006-07-17 12:07:26 +0200 (Mon, 17 Jul 2006) New Revision: 6555 Modified: trunk/data/glade/advanced_notifications_window.glade trunk/src/common/config.py trunk/src/dialogs.py Log: code for advanced_notifications_window: config is now saved in config file Modified: trunk/data/glade/advanced_notifications_window.glade =================================================================== --- trunk/data/glade/advanced_notifications_window.glade 2006-07-17 10:06:04 UTC (rev 6554) +++ trunk/data/glade/advanced_notifications_window.glade 2006-07-17 10:07:26 UTC (rev 6555) @@ -17,6 +17,7 @@ <property name="skip_pager_hint">False</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> <child> <widget class="GtkVBox" id="vbox95"> @@ -44,6 +45,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -64,254 +69,154 @@ </child> <child> - <widget class="GtkLabel" id="label391"> + <widget class="GtkVBox" id="vbox100"> <property name="visible">True</property> - <property name="label" translatable="yes">Conditions</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">5</property> - <child> - <widget class="GtkExpander" id="list_expander"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="expanded">True</property> - <property name="spacing">0</property> - <child> - <widget class="GtkVBox" id="vbox100"> + <widget class="GtkScrolledWindow" id="scrolledwindow23"> + <property name="height_request">90</property> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow23"> + <widget class="GtkTreeView" id="conditions_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="conditions_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">True</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - </widget> - </child> + <property name="headers_visible">True</property> + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + <signal name="cursor_changed" handler="on_conditions_treeview_cursor_changed" last_modification_time="Sun, 09 Jul 2006 20:23:26 GMT"/> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment99"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">212</property> + <property name="right_padding">0</property> + <child> - <widget class="GtkAlignment" id="alignment99"> + <widget class="GtkHBox" id="hbox3045"> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">328</property> - <property name="right_padding">0</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> <child> - <widget class="GtkHBox" id="hbox3045"> + <widget class="GtkHButtonBox" id="hbuttonbox2"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property> + <property name="spacing">10</property> <child> - <widget class="GtkHButtonBox" id="hbuttonbox2"> + <widget class="GtkButton" id="new_button"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property> - <property name="spacing">0</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-new</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_new_button_clicked" last_modification_time="Sat, 08 Jul 2006 20:15:42 GMT"/> + </widget> + </child> - <child> - <widget class="GtkButton" id="button12"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> + <child> + <widget class="GtkButton" id="up_button"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-go-up</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_up_button_clicked" last_modification_time="Sun, 09 Jul 2006 22:33:12 GMT"/> + </widget> + </child> - <child> - <widget class="GtkAlignment" id="alignment100"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> + <child> + <widget class="GtkButton" id="down_button"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-go-down</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_down_button_clicked" last_modification_time="Wed, 12 Jul 2006 01:18:01 GMT"/> + </widget> + </child> - <child> - <widget class="GtkHBox" id="hbox3046"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1376"> - <property name="visible">True</property> - <property name="stock">gtk-go-up</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label405"> - <property name="visible">True</property> - <property name="label" translatable="yes">Up</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="button13"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - - <child> - <widget class="GtkAlignment" id="alignment101"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox3047"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1377"> - <property name="visible">True</property> - <property name="stock">gtk-go-down</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label406"> - <property name="visible">True</property> - <property name="label" translatable="yes">Down</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> + <child> + <widget class="GtkButton" id="delete_button"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-delete</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_delete_button_clicked" last_modification_time="Wed, 12 Jul 2006 01:58:19 GMT"/> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - </packing> </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">False</property> + </packing> </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="config_vbox"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">5</property> + <child> - <widget class="GtkLabel" id="label404"> + <widget class="GtkLabel" id="label391"> <property name="visible">True</property> - <property name="label" translatable="yes">List of special notifications settings</property> + <property name="label" translatable="yes">Conditions</property> <property name="use_underline">False</property> - <property name="use_markup">False</property> + <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> @@ -319,56 +224,59 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox101"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - <child> - <widget class="GtkHBox" id="hbox3042"> + <widget class="GtkVBox" id="vbox101"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">5</property> <child> - <widget class="GtkLabel" id="label401"> + <widget class="GtkHBox" id="hbox3042"> <property name="visible">True</property> - <property name="label" translatable="yes">When </property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">5</property> - <child> - <widget class="GtkComboBox" id="combobox5"> - <property name="visible">True</property> - <property name="items" translatable="yes">Receive a Message + <child> + <widget class="GtkLabel" id="label401"> + <property name="visible">True</property> + <property name="label" translatable="yes">When </property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="event_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">Receive a Message Contact Connected Contact Disconnected Contact Change Status @@ -377,55 +285,91 @@ File Transfert Resquest File Transfert Started File Transfert Finished</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_event_combobox_changed" last_modification_time="Sun, 09 Jul 2006 01:54:11 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox3048"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - <child> - <widget class="GtkLabel" id="label400"> + <widget class="GtkHBox" id="hbox3048"> <property name="visible">True</property> - <property name="label" translatable="yes">for </property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">5</property> - <child> - <widget class="GtkComboBox" id="recipient_type_combobox"> - <property name="visible">True</property> - <property name="items" translatable="yes">contact(s) + <child> + <widget class="GtkLabel" id="label400"> + <property name="visible">True</property> + <property name="label" translatable="yes">for </property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="recipient_type_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">contact(s) group(s) everybody</property> - <signal name="changed" handler="on_recipient_type_combobox_changed" last_modification_time="Mon, 08 May 2006 20:54:22 GMT"/> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_recipient_type_combobox_changed" last_modification_time="Mon, 08 May 2006 20:54:22 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="recipient_list_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + <signal name="changed" handler="on_recipient_list_entry_changed" last_modification_time="Sun, 09 Jul 2006 02:21:36 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -435,16 +379,188 @@ </child> <child> - <widget class="GtkEntry" id="recipient_list"> + <widget class="GtkHBox" id="hbox3049"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label402"> + <property name="visible">True</property> + <property name="label" translatable="yes">when I'm </property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="status_hbox"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">3</property> + + <child> + <widget class="GtkRadioButton" id="all_status_rb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">All Status </property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_status_radiobutton_toggled" last_modification_time="Mon, 08 May 2006 18:37:46 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="special_status_rb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Some special(s) status...</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">all_status_rb</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="online_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Online / Free For Chat</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_status_cb_toggled" last_modification_time="Sun, 09 Jul 2006 02:40:38 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="away_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Away</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_status_cb_toggled" last_modification_time="Sun, 09 Jul 2006 02:43:25 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="xa_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Not Available</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_status_cb_toggled" last_modification_time="Sun, 09 Jul 2006 02:43:14 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="dnd_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Busy </property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_status_cb_toggled" last_modification_time="Sun, 09 Jul 2006 02:43:45 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="invisible_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Invisible</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_status_cb_toggled" last_modification_time="Sun, 09 Jul 2006 02:44:48 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -452,59 +568,30 @@ <property name="fill">True</property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox3049"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - <child> - <widget class="GtkLabel" id="label402"> + <widget class="GtkHBox" id="hbox3053"> <property name="visible">True</property> - <property name="label" translatable="yes">when I'm </property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="status_hbox"> - <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child> - <widget class="GtkRadioButton" id="all_status_rb"> + <widget class="GtkLabel" id="label408"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">All Status </property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_status_radiobutton_toggled" last_modification_time="Mon, 08 May 2006 18:37:46 GMT"/> + <property name="label" translatable="yes">and I </property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -514,17 +601,17 @@ </child> <child> - <widget class="GtkRadioButton" id="special_status_rb"> + <widget class="GtkCheckButton" id="tab_opened_cb"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Some special(s) status...</property> + <property name="label" translatable="yes">Have </property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">all_status_rb</property> + <signal name="toggled" handler="on_tab_opened_cb_toggled" last_modification_time="Tue, 09 May 2006 17:13:20 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -534,16 +621,17 @@ </child> <child> - <widget class="GtkCheckButton" id="online_cb"> + <widget class="GtkCheckButton" id="not_tab_opened_cb"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Online / Free For Chat</property> + <property name="label" translatable="yes">Don't have </property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_not_tab_opened_cb_toggled" last_modification_time="Tue, 09 May 2006 17:13:02 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -553,16 +641,22 @@ </child> <child> - <widget class="GtkCheckButton" id="away_cb"> + <widget class="GtkLabel" id="label409"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Away </property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"> a window/tab opened with that contact </property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -570,18 +664,71 @@ <property name="fill">False</property> </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label392"> + <property name="visible">True</property> + <property name="label" translatable="yes">Actions</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame35"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkHBox" id="hbox3027"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + <child> - <widget class="GtkCheckButton" id="not_available_cb"> + <widget class="GtkCheckButton" id="use_popup_cb"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Not Available </property> + <property name="label" translatable="yes">_Inform me with a popup window</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_use_popup_cb_toggled" last_modification_time="Mon, 08 May 2006 23:11:50 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -591,16 +738,17 @@ </child> <child> - <widget class="GtkCheckButton" id="busy_cb"> + <widget class="GtkCheckButton" id="disable_popup_cb"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Busy </property> + <property name="label" translatable="yes">_Disable existing popup window</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_disable_popup_cb_toggled" last_modification_time="Mon, 08 May 2006 23:12:03 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -608,30 +756,195 @@ <property name="fill">False</property> </packing> </child> + </widget> + </child> + <child> + <widget class="GtkFrame" id="frame38"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <child> - <widget class="GtkCheckButton" id="invisible_cb"> + <widget class="GtkAlignment" id="alignment93"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Invisible</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox98"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkHBox" id="hbox3028"> + <property name="visible">True</property> + <property name="homogeneous">True</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkCheckButton" id="use_sound_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Play a sound</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_use_sound_cb_toggled" last_modification_time="Mon, 08 May 2006 22:44:14 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="sound_file_hbox"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkEntry" id="sound_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + <signal name="changed" handler="on_sound_entry_changed" last_modification_time="Sun, 09 Jul 2006 17:40:01 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">...</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_browse_for_sounds_button_clicked" last_modification_time="Thu, 16 Feb 2006 14:51:54 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="play_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_play_button_clicked" last_modification_time="Thu, 02 Feb 2006 07:19:21 GMT"/> + + <child> + <widget class="GtkImage" id="image1372"> + <property name="visible">True</property> + <property name="stock">gtk-media-play</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="disable_sound_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Disable existing sound for this event</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_disable_sound_cb_toggled" last_modification_time="Mon, 08 May 2006 22:44:38 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> </widget> + </child> + + <child> + <widget class="GtkLabel" id="label394"> + <property name="visible">True</property> + <property name="label" translatable="yes">Sounds</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="type">label_item</property> </packing> </child> </widget> <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="type">label_item</property> </packing> </child> </widget> @@ -643,44 +956,23 @@ </child> <child> - <widget class="GtkHBox" id="hbox3053"> + <widget class="GtkHBox" id="hbox3032"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label408"> + <widget class="GtkCheckButton" id="use_auto_open_cb"> <property name="visible">True</property> - <property name="label" translatable="yes">And I </property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="tab_opened_cb"> - <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Have </property> + <property name="label" translatable="yes">_Open chat window with user</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_tab_opened_cb_toggled" last_modification_time="Tue, 09 May 2006 17:13:20 GMT"/> + <signal name="toggled" handler="on_use_auto_open_cb_toggled" last_modification_time="Mon, 08 May 2006 23:12:12 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -690,17 +982,17 @@ </child> <child> - <widget class="GtkCheckButton" id="not_tab_opened_cb"> + <widget class="GtkCheckButton" id="disable_auto_open_cb"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Don't have </property> + <property name="label" translatable="yes">_Disable auto opening chat window</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_not_tab_opened_cb_toggled" last_modification_time="Tue, 09 May 2006 17:13:02 GMT"/> + <signal name="toggled" handler="on_disable_auto_open_cb_toggled" last_modification_time="Mon, 08 May 2006 23:12:22 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -708,27 +1000,6 @@ <property name="fill">False</property> </packing> </child> - - <child> - <widget class="GtkLabel" id="label409"> - <property name="visible">True</property> - <property name="label" translatable="yes"> a window/tab opened with that contact </property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> </widget> <packing> <property name="padding">0</property> @@ -736,218 +1007,92 @@ <property name="fill">True</property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label392"> - <property name="visible">True</property> - <property name="label" translatable="yes">Actions</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame35"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <child> - <widget class="GtkHBox" id="hbox3027"> + <widget class="GtkExpander" id="expander1"> <property name="visible">True</property> - <property name="homogeneous">False</property> + <property name="can_focus">True</property> + <property name="expanded">True</property> <property name="spacing">0</property> <child> - <widget class="GtkCheckButton" id="use_popup_cb"> + <widget class="GtkVBox" id="vbox99"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Inform me with a popup window</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_use_popup_cb_toggled" last_modification_time="Mon, 08 May 2006 23:11:50 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">5</property> - <child> - <widget class="GtkCheckButton" id="disable_popup_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable existing popup window</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_disable_popup_cb_toggled" last_modification_time="Mon, 08 May 2006 23:12:03 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - - <child> - <widget class="GtkFrame" id="frame38"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment93"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - <child> - <widget class="GtkVBox" id="vbox98"> + <widget class="GtkHBox" id="hbox3033"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox3028"> + <widget class="GtkCheckButton" id="run_command_cb"> <property name="visible">True</property> - <property name="homogeneous">True</property> - <property name="spacing">6</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Launch a command</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_run_command_cb_toggled" last_modification_time="Tue, 11 Jul 2006 22:58:49 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> - <child> - <widget class="GtkCheckButton" id="use_sound_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Play a sound</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_use_sound_cb_toggled" last_modification_time="Mon, 08 May 2006 22:44:14 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> + <child> + <widget class="GtkEntry" id="command_entry"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + <signal name="changed" handler="on_command_entry_changed" last_modification_time="Sun, 09 Jul 2006 20:17:58 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> - <child> - <widget class="GtkHBox" id="hbox3030"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> + <child> + <widget class="GtkHBox" id="hbox3035"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> - <child> - <widget class="GtkEntry" id="entry4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_sounds_entry_changed" last_modification_time="Mon, 06 Jun 2005 19:59:41 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">...</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_browse_for_sounds_button_clicked" last_modification_time="Thu, 16 Feb 2006 14:51:54 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_play_button_clicked" last_modification_time="Thu, 02 Feb 2006 07:19:21 GMT"/> - - <child> - <widget class="GtkImage" id="image1372"> - <property name="visible">True</property> - <property name="stock">gtk-media-play</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> + <child> + <widget class="GtkCheckButton" id="use_systray_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Show event in systray</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_use_systray_cb_toggled" last_modification_time="Mon, 08 May 2006 23:37:23 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -957,17 +1102,17 @@ </child> <child> - <widget class="GtkCheckButton" id="disable_sound_cb"> + <widget class="GtkCheckButton" id="disable_systray_cb"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable existing sound for this event</property> + <property name="label" translatable="yes">_Disable showing event in systray</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_disable_sound_cb_toggled" last_modification_time="Mon, 08 May 2006 22:44:38 GMT"/> + <signal name="toggled" handler="on_disable_systray_cb_toggled" last_modification_time="Mon, 08 May 2006 23:37:16 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -976,126 +1121,6 @@ </packing> </child> </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label394"> - <property name="visible">True</property> - <property name="label" translatable="yes">Sounds</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox3032"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkCheckButton" id="use_auto_open_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Open chat window with user</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_use_auto_open_cb_toggled" last_modification_time="Mon, 08 May 2006 23:12:12 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="disable_auto_open_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable auto opening chat window</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_disable_auto_open_cb_toggled" last_modification_time="Mon, 08 May 2006 23:12:22 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkExpander" id="expander1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="expanded">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkVBox" id="vbox99"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkHBox" id="hbox3033"> - <property name="visible">True</property> - <property name="homogeneous">True</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkCheckButton" id="checkbutton15"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Launch a command</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_play_sounds_checkbutton_toggled" last_modification_time="Wed, 06 Apr 2005 19:05:21 GMT"/> - </widget> <packing> <property name="padding">0</property> <property name="expand">True</property> @@ -1104,30 +1129,50 @@ </child> <child> - <widget class="GtkHBox" id="hbox3034"> + <widget class="GtkHBox" id="hbox3052"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <widget class="GtkEntry" id="entry5"> + <widget class="GtkCheckButton" id="use_roster_cb"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_sounds_entry_changed" last_modification_time="Mon, 06 Jun 2005 19:59:41 GMT"/> + <property name="label" translatable="yes">_Show event in roster</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_use_roster_cb_toggled" last_modification_time="Tue, 09 May 2006 17:08:45 GMT"/> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkCheckButton" id="disable_roster_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Disable showing event in roster</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_disable_roster_cb_toggled" last_modification_time="Tue, 09 May 2006 17:08:29 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -1135,32 +1180,19 @@ <property name="fill">True</property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox3035"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - <child> - <widget class="GtkCheckButton" id="use_systray_cb"> + <widget class="GtkCheckButton" id="urgency_hint_cb"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Show event in systray</property> + <property name="label" translatable="yes">_Activate Windows manager UrgencyHint to make chat taskbar to flash</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_use_systray_cb_toggled" last_modification_time="Mon, 08 May 2006 23:37:23 GMT"/> + <signal name="toggled" handler="on_urgency_hint_checkbutton_toggled" last_modification_time="Sun, 09 Jul 2006 20:19:58 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -1168,209 +1200,47 @@ <property name="fill">False</property> </packing> </child> - - <child> - <widget class="GtkCheckButton" id="disable_systray_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable showing event in systray</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_disable_systray_cb_toggled" last_modification_time="Mon, 08 May 2006 23:37:16 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> </child> <child> - <widget class="GtkHBox" id="hbox3052"> + <widget class="GtkLabel" id="label395"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkCheckButton" id="use_roster_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Show event in roster</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_use_roster_cb_toggled" last_modification_time="Tue, 09 May 2006 17:08:45 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="disable_roster_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable showing event in roster</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_disable_roster_cb_toggled" last_modification_time="Tue, 09 May 2006 17:08:29 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="label" translatable="yes">Advanced Actions</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="type">label_item</property> </packing> </child> - - <child> - <widget class="GtkCheckButton" id="checkbutton14"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Activate Windows manager UrgencyHint to make chat taskbar to flash</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> </widget> - </child> - - <child> - <widget class="GtkLabel" id="label395"> - <property name="visible">True</property> - <property name="label" translatable="yes">Advanced Actions</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> <child> - <widget class="GtkButton" id="button14"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - - <child> - <widget class="GtkAlignment" id="alignment102"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox3051"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1378"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label407"> - <property name="visible">True</property> - <property name="label" translatable="yes">Add</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> <widget class="GtkAlignment" id="alignment97"> <property name="visible">True</property> <property name="xalign">0.5</property> @@ -1383,29 +1253,15 @@ <property name="right_padding">0</property> <child> - <widget class="GtkHBox" id="hbox3036"> + <widget class="GtkButton" id="close_button"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_window" last_modification_time="Mon, 08 May 2006 20:57:06 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_close_window" last_modification_time="Mon, 08 May 2006 20:57:06 GMT"/> </widget> </child> </widget> Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-07-17 10:06:04 UTC (rev 6554) +++ trunk/src/common/config.py 2006-07-17 10:07:26 UTC (rev 6555) @@ -291,6 +291,22 @@ 'contacts': ({ 'gpg_enabled': [ opt_bool, True ], }, {}), + 'notifications': ({ + 'event': [opt_str, ''], + 'recipient_type': [opt_str, 'all'], + 'recipients': [opt_str, ''], + 'status': [opt_str, 'all', _('all or space separated status')], + 'tab_opened': [opt_str, 'both', _("'yes', 'no', or 'both'")], + 'sound': [opt_str, '', _("'yes', 'no' or ''")], + 'sound_file': [opt_str, ''], + 'popup': [opt_str, '', _("'yes', 'no' or ''")], + 'auto_open': [opt_str, '', _("'yes', 'no' or ''")], + 'run_command': [opt_bool, False], + 'command': [opt_str, ''], + 'systray': [opt_str, '', _("'yes', 'no' or ''")], + 'roster': [opt_str, '', _("'yes', 'no' or ''")], + 'urgency_hint': [opt_bool, False], + }, {}), } statusmsg_default = { Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-17 10:06:04 UTC (rev 6554) +++ trunk/src/dialogs.py 2006-07-17 10:07:26 UTC (rev 6555) @@ -2190,16 +2190,26 @@ print listen_sound_model[active_iter][0] class AdvancedNotificationsWindow: + events_list = ['message_received', 'contact_connected', + 'contact_disconnected', 'contact_change_status', 'gc_msg_highlight', + 'gc_msg', 'ft_request', 'ft_started', 'ft_finished'] + recipient_types_list = ['contact', 'group', 'all'] + config_options = ['event', 'recipient_type', 'recipients', 'status', + 'tab_opened', 'sound', 'sound_file', 'popup', 'auto_open', + 'run_command', 'command', 'systray', 'roster', 'urgency_hint'] def __init__(self): self.xml = gtkgui_helpers.get_glade('advanced_notifications_window.glade') self.window = self.xml.get_widget('advanced_notifications_window') - self.xml.signal_autoconnect(self) - self.conditions_treeview = self.xml.get_widget('conditions_treeview') - self.recipient_type_combobox = self.xml.get_widget('recipient_type_combobox') - self.recipient_list = self.xml.get_widget('recipient_list') - self.list_expander = self.xml.get_widget('list_expander') - - self.status_hbox = self.xml.get_widget('status_hbox') + for w in ('conditions_treeview', 'config_vbox', 'event_combobox', + 'recipient_type_combobox', 'recipient_list_entry', 'delete_button', + 'status_hbox', 'use_sound_cb', 'disable_sound_cb', 'use_popup_cb', + 'disable_popup_cb', 'use_auto_open_cb', 'disable_auto_open_cb', + 'use_systray_cb', 'disable_systray_cb', 'use_roster_cb', + 'disable_roster_cb', 'tab_opened_cb', 'not_tab_opened_cb', + 'sound_entry', 'sound_file_hbox', 'up_button', 'down_button', + 'run_command_cb', 'command_entry', 'urgency_hint_cb'): + self.__dict__[w] = self.xml.get_widget(w) + # Contains status checkboxes childs = self.status_hbox.get_children() @@ -2207,130 +2217,438 @@ self.special_status_rb = childs[1] self.online_cb = childs[2] self.away_cb = childs[3] - self.not_available_cb = childs[4] - self.busy_cb = childs[5] + self.xa_cb = childs[4] + self.dnd_cb = childs[5] self.invisible_cb = childs[6] - - self.use_sound_cb = self.xml.get_widget('use_sound_cb') - self.disable_sound_cb = self.xml.get_widget('disable_sound_cb') - self.use_popup_cb = self.xml.get_widget('use_popup_cb') - self.disable_popup_cb = self.xml.get_widget('disable_popup_cb') - self.use_auto_open_cb = self.xml.get_widget('use_auto_open_cb') - self.disable_auto_open_cb = self.xml.get_widget('disable_auto_open_cb') - self.use_systray_cb = self.xml.get_widget('use_systray_cb') - self.disable_systray_cb = self.xml.get_widget('disable_systray_cb') - self.use_roster_cb = self.xml.get_widget('use_roster_cb') - self.disable_roster_cb = self.xml.get_widget('disable_roster_cb') - - self.tab_opened_cb = self.xml.get_widget('tab_opened_cb') - self.not_tab_opened_cb = self.xml.get_widget('not_tab_opened_cb') - - model = gtk.ListStore(str) + + model = gtk.ListStore(int, str) + model.set_sort_column_id(0, gtk.SORT_ASCENDING) model.clear() self.conditions_treeview.set_model(model) + ## means number + col = gtk.TreeViewColumn(_('#')) + self.conditions_treeview.append_column(col) + renderer = gtk.CellRendererText() + col.pack_start(renderer, expand = False) + col.set_attributes(renderer, text = 0) + col = gtk.TreeViewColumn(_('Condition')) self.conditions_treeview.append_column(col) renderer = gtk.CellRendererText() col.pack_start(renderer, expand = True) - col.set_attributes(renderer, text = 0) - - if (0==0): # No rule set yet - self.list_expander.set_expanded(False) - - if (0==1): # We have existing rule(s) - #temporary example - model.append(("When Contact Connected for contact Asterix when I am Available",)) + col.set_attributes(renderer, text = 1) - # TODO : add a "New rule" line - + self.xml.signal_autoconnect(self) + + # Fill conditions_treeview + num = 0 + while gajim.config.get_per('notifications', str(num)): + iter = model.append((num, '')) + path = model.get_path(iter) + self.conditions_treeview.set_cursor(path) + self.active_num = num + self.initiate_rule_state() + self.set_treeview_string() + num += 1 + + # No rule selected at init time + self.conditions_treeview.get_selection().unselect_all() + #TODO +# self.conditions_treeview.set_cursor(None) + self.active_num = -1 + self.config_vbox.set_sensitive(False) + self.delete_button.set_sensitive(False) + self.down_button.set_sensitive(False) + self.up_button.set_sensitive(False) + self.recipient_list_entry.set_no_show_all(True) + for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + self.__dict__[st + '_cb'].set_no_show_all(True) + self.window.show_all() - - # No rule selected at init time - self.initiate_new_rule_state() - - def initiate_new_rule_state(self): - '''Set default value to all widgets''' - # Deal with status line - self.all_status_rb.set_active(True) + + def initiate_rule_state(self): + '''Set values for all widgets''' + if self.active_num < 0: + return + # event + value = gajim.config.get_per('notifications', str(self.active_num), + 'event') + if value: + self.event_combobox.set_active(self.events_list.index(value)) + else: + #TODO: unselect all + pass + # recipient_type + value = gajim.config.get_per('notifications', str(self.active_num), + 'recipient_type') + if value: + self.recipient_type_combobox.set_active( + self.recipient_types_list.index(value)) + else: + #TODO: unselect all + pass + # recipient + value = gajim.config.get_per('notifications', str(self.active_num), + 'recipients') + if not value: + value = '' + self.recipient_list_entry.set_text(value) + # status + value = gajim.config.get_per('notifications', str(self.active_num), + 'status') + if value == 'all': + self.all_status_rb.set_active(True) + else: + self.special_status_rb.set_active(True) + values = value.split() + for v in ['online', 'away', 'xa', 'dnd', 'invisible']: + if v in values: + self.__dict__[v + '_cb'].set_active(True) + else: + self.__dict__[v + '_cb'].set_active(False) self.on_status_radiobutton_toggled(self.all_status_rb) - - self.recipient_type_combobox.set_active(0) # 'Contact(s)' + # tab_opened + value = gajim.config.get_per('notifications', str(self.active_num), + 'tab_opened') + self.tab_opened_cb.set_active(True) self.not_tab_opened_cb.set_active(True) - self.tab_opened_cb.set_active(True) + if value == 'no': + self.tab_opened_cb.set_active(False) + elif value == 'yes': + self.not_tab_opened_cb.set_active(False) + # sound_file + value = gajim.config.get_per('notifications', str(self.active_num), + 'sound_file') + self.sound_entry.set_text(value) + # sound, popup, auto_open, systray, roster + for option in ['sound', 'popup', 'auto_open', 'systray', 'roster']: + value = gajim.config.get_per('notifications', str(self.active_num), + option) + if value == 'yes': + self.__dict__['use_' + option + '_cb'].set_active(True) + else: + self.__dict__['use_' + option + '_cb'].set_active(False) + if value == 'no': + self.__dict__['disable_' + option + '_cb'].set_active(True) + else: + self.__dict__['disable_' + option + '_cb'].set_active(False) + # run_command + value = gajim.config.get_per('notifications', str(self.active_num), + 'run_command') + self.run_command_cb.set_active(value) + # command + value = gajim.config.get_per('notifications', str(self.active_num), + 'command') + self.command_entry.set_text(value) + # urgency_hint + value = gajim.config.get_per('notifications', str(self.active_num), + 'urgency_hint') + self.urgency_hint_cb.set_active(value) + def set_treeview_string(self): + (model, iter) = self.conditions_treeview.get_selection().get_selected() + if not iter: + return + event = self.event_combobox.get_active_text() + recipient_type = self.recipient_type_combobox.get_active_text() + recipient = '' + if recipient_type != 'everybody': + recipient = self.recipient_list_entry.get_text() + if self.all_status_rb.get_active(): + status = '' + else: + status = _('when I am ') + for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + if self.__dict__[st + '_cb'].get_active(): + status += helpers.get_uf_show(st) + ' ' + model[iter][1] = "When %s for %s %s %s" % (event, recipient_type, + recipient, status) + + def on_conditions_treeview_cursor_changed(self, widget): + (model, iter) = widget.get_selection().get_selected() + if not iter: + self.active_num = -1 + return + self.active_num = model[iter][0] + if self.active_num == 0: + self.up_button.set_sensitive(False) + else: + self.up_button.set_sensitive(True) + max = self.conditions_treeview.get_model().iter_n_children(None) + if self.active_num == max - 1: + self.down_button.set_sensitive(False) + else: + self.down_button.set_sensitive(True) + self.initiate_rule_state() + self.config_vbox.set_sensitive(True) + self.delete_button.set_sensitive(True) + + def on_new_button_clicked(self, widget): + model = self.conditions_treeview.get_model() + num = self.conditions_treeview.get_model().iter_n_children(None) + gajim.config.add_per('notifications', str(num)) + iter = model.append((num, '')) + path = model.get_path(iter) + self.conditions_treeview.set_cursor(path) + self.active_num = num + self.set_treeview_string() + self.config_vbox.set_sensitive(True) + + def on_delete_button_clicked(self, widget): + (model, iter) = self.conditions_treeview.get_selection().get_selected() + if not iter: + return + # up all others + iter2 = model.iter_next(iter) + num = self.active_num + while iter2: + num = model[iter2][0] + model[iter2][0] = num - 1 + for opt in self.config_options: + val = gajim.config.get_per('notifications', str(num), opt) + gajim.config.set_per('notifications', str(num - 1), opt, val) + iter2 = model.iter_next(iter2) + model.remove(iter) + gajim.config.del_per('notifications', str(num)) # delete latest + self.active_num = -1 + self.config_vbox.set_sensitive(False) + self.delete_button.set_sensitive(False) + self.up_button.set_sensitive(False) + self.down_button.set_sensitive(False) + + def on_up_button_clicked(self, widget): + (model, iter) = self.conditions_treeview.get_selection().\ + get_selected() + if not iter: + return + for opt in self.config_options: + val = gajim.config.get_per('notifications', str(self.active_num), opt) + val2 = gajim.config.get_per('notifications', str(self.active_num - 1), + opt) + gajim.config.set_per('notifications', str(self.active_num), opt, val2) + gajim.config.set_per('notifications', str(self.active_num - 1), opt, + val) + + model[iter][0] = self.active_num - 1 + # get previous iter + path = model.get_path(iter) + iter = model.get_iter((path[0] - 1,)) + model[iter][0] = self.active_num + self.on_conditions_treeview_cursor_changed(self.conditions_treeview) + + def on_down_button_clicked(self, widget): + (model, iter) = self.conditions_treeview.get_selection().get_selected() + if not iter: + return + for opt in self.config_options: + val = gajim.config.get_per('notifications', str(self.active_num), opt) + val2 = gajim.config.get_per('notifications', str(self.active_num + 1), + opt) + gajim.config.set_per('notifications', str(self.active_num), opt, val2) + gajim.config.set_per('notifications', str(self.active_num + 1), opt, + val) + + model[iter][0] = self.active_num + 1 + iter = model.iter_next(iter) + model[iter][0] = self.active_num + self.on_conditions_treeview_cursor_changed(self.conditions_treeview) + + def on_event_combobox_changed(self, widget): + if self.active_num < 0: + return + event = self.events_list[self.event_combobox.get_active()] + gajim.config.set_per('notifications', str(self.active_num), 'event', + event) + self.set_treeview_string() + + def on_recipient_type_combobox_changed(self, widget): + if self.active_num < 0: + return + recipient_type = self.recipient_types_list[self.recipient_type_combobox.\ + get_active()] + gajim.config.set_per('notifications', str(self.active_num), + 'recipient_type', recipient_type) + if recipient_type == 'all': + self.recipient_list_entry.hide() + else: + self.recipient_list_entry.show() + self.set_treeview_string() + + def on_recipient_list_entry_changed(self, widget): + if self.active_num < 0: + return + recipients = widget.get_text().decode('utf-8') + #TODO: do some check + gajim.config.set_per('notifications', str(self.active_num), + 'recipients', recipients) + self.set_treeview_string() + + def set_status_config(self): + if self.active_num < 0: + return + status = '' + for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + if self.__dict__[st + '_cb'].get_active(): + status += st + ' ' + if status: + status = status[:-1] + gajim.config.set_per('notifications', str(self.active_num), 'status', + status) + self.set_treeview_string() + def on_status_radiobutton_toggled(self, widget): + if self.active_num < 0: + return if self.all_status_rb.get_active(): + gajim.config.set_per('notifications', str(self.active_num), 'status', + 'all') # 'All status' clicked - self.online_cb.hide() - self.away_cb.hide() - self.not_available_cb.hide() - self.busy_cb.hide() - self.invisible_cb.hide() - - self.online_cb.set_active(False) - self.away_cb.set_active(False) - self.not_available_cb.set_active(False) - self.busy_cb.set_active(False) - self.invisible_cb.set_active(False) - + for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + self.__dict__[st + '_cb'].hide() + self.special_status_rb.show() else: + self.set_status_config() # 'special status' clicked - self.online_cb.show() - self.away_cb.show() - self.not_available_cb.show() - self.busy_cb.show() - self.invisible_cb.show() - + for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + self.__dict__[st + '_cb'].show() + self.special_status_rb.hide() - def on_recipient_type_combobox_changed(self, widget): - if (self.recipient_type_combobox.get_active()==2 ): - self.recipient_list.hide() - else: - self.recipient_list.show() + self.set_treeview_string() + def on_status_cb_toggled(self, widget): + if self.active_num < 0: + return + self.set_status_config() + # tab_opened OR (not xor) not_tab_opened must be active def on_tab_opened_cb_toggled(self, widget): - if not self.tab_opened_cb.get_active() and not self.not_tab_opened_cb.get_active(): + if self.active_num < 0: + return + if self.tab_opened_cb.get_active(): + if self.not_tab_opened_cb.get_active(): + gajim.config.set_per('notifications', str(self.active_num), + 'tab_opened', 'both') + else: + gajim.config.set_per('notifications', str(self.active_num), + 'tab_opened', 'yes') + elif not self.not_tab_opened_cb.get_active(): self.not_tab_opened_cb.set_active(True) + gajim.config.set_per('notifications', str(self.active_num), + 'tab_opened', 'no') + def on_not_tab_opened_cb_toggled(self, widget): - if not self.tab_opened_cb.get_active() and not self.not_tab_opened_cb.get_active(): + if self.active_num < 0: + return + if self.not_tab_opened_cb.get_active(): + if self.tab_opened_cb.get_active(): + gajim.config.set_per('notifications', str(self.active_num), + 'tab_opened', 'both') + else: + gajim.config.set_per('notifications', str(self.active_num), + 'tab_opened', 'no') + elif not self.tab_opened_cb.get_active(): self.tab_opened_cb.set_active(True) - - # 10 next functions : Forbid two incompatible actions to be checked together + gajim.config.set_per('notifications', str(self.active_num), + 'tab_opened', 'yes') + + def on_use_it_toggled(self, widget, oposite_widget, option): + if widget.get_active(): + if oposite_widget.get_active(): + oposite_widget.set_active(False) + gajim.config.set_per('notifications', str(self.active_num), option, + 'yes') + elif oposite_widget.get_active(): + gajim.config.set_per('notifications', str(self.active_num), option, + 'no') + else: + gajim.config.set_per('notifications', str(self.active_num), option, '') + + def on_disable_it_toggled(self, widget, oposite_widget, option): + if widget.get_active(): + if oposite_widget.get_active(): + oposite_widget.set_active(False) + gajim.config.set_per('notifications', str(self.active_num), option, + 'no') + elif oposite_widget.get_active(): + gajim.config.set_per('notifications', str(self.active_num), option, + 'yes') + else: + gajim.config.set_per('notifications', str(self.active_num), option, '') + def on_use_sound_cb_toggled(self, widget): - if self.use_sound_cb.get_active() and self.disable_sound_cb.get_active(): - self.disable_sound_cb.set_active(False) + self.on_use_it_toggled(widget, self.disable_sound_cb, 'sound') + if widget.get_active(): + self.sound_file_hbox.set_sensitive(True) + else: + self.sound_file_hbox.set_sensitive(False) + + def on_browse_for_sounds_button_clicked(self, widget, data = None): + if self.active_num < 0: + return + + def on_ok(widget, path_to_snd_file): + dialog.destroy() + if not path_to_snd_file: + path_to_snd_file = '' + gajim.config.set_per('notifications', str(self.active_num), + 'sound_file', path_to_snd_file) + self.sound_entry.set_text(path_to_snd_file) + + path_to_snd_file = self.sound_entry.get_text().decode('utf-8') + path_to_snd_file = os.path.join(os.getcwd(), path_to_snd_file) + dialog = SoundChooserDialog(path_to_snd_file, on_ok) + + def on_play_button_clicked(self, widget): + helpers.play_sound_file(self.sound_entry.get_text().decode('utf-8')) + def on_disable_sound_cb_toggled(self, widget): - if self.use_sound_cb.get_active() and self.disable_sound_cb.get_active(): - self.use_sound_cb.set_active(False) + self.on_disable_it_toggled(widget, self.use_sound_cb, 'sound') + + def on_sound_entry_changed(self, widget): + gajim.config.set_per('notifications', str(self.active_num), + 'sound_file', widget.get_text().decode('utf-8')) + def on_use_popup_cb_toggled(self, widget): - if self.use_popup_cb.get_active() and self.disable_popup_cb.get_active(): - self.disable_popup_cb.set_active(False) + self.on_use_it_toggled(widget, self.disable_popup_cb, 'popup') + def on_disable_popup_cb_toggled(self, widget): - if self.use_popup_cb.get_active() and self.disable_popup_cb.get_active(): - self.use_popup_cb.set_active(False) + self.on_disable_it_toggled(widget, self.use_popup_cb, 'popup') + def on_use_auto_open_cb_toggled(self, widget): - if self.use_auto_open_cb.get_active() and\ - self.disable_auto_open_cb.get_active(): - self.disable_auto_open_cb.set_active(False) + self.on_use_it_toggled(widget, self.disable_auto_open_cb, 'auto_open') + def on_disable_auto_open_cb_toggled(self, widget): - if self.use_auto_open_cb.get_active() and\ - self.disable_auto_open_cb.get_active(): - self.use_auto_open_cb.set_active(False) + self.on_disable_it_toggled(widget, self.use_auto_open_cb, 'auto_open') + + def on_run_command_cb_toggled(self, widget): + gajim.config.set_per('notifications', str(self.active_num), 'run_command', + widget.get_active()) + if widget.get_active(): + self.command_entry.set_sensitive(True) + else: + self.command_entry.set_sensitive(False) + + def on_command_entry_changed(self, widget): + gajim.config.set_per('notifications', str(self.active_num), 'command', + widget.get_text().decode('utf-8')) + def on_use_systray_cb_toggled(self, widget): - if self.use_systray_cb.get_active() and self.disable_systray_cb.get_active(): - self.disable_systray_cb.set_active(False) + self.on_use_it_toggled(widget, self.disable_systray_cb, 'systray') + def on_disable_systray_cb_toggled(self, widget): - if self.use_systray_cb.get_active() and self.disable_systray_cb.get_active(): - self.use_systray_cb.set_active(False) + self.on_disable_it_toggled(widget, self.use_systray_cb, 'systray') + def on_use_roster_cb_toggled(self, widget): - if self.use_roster_cb.get_active() and self.disable_roster_cb.get_active(): - self.disable_roster_cb.set_active(False) + self.on_use_it_toggled(widget, self.disable_roster_cb, 'roster') + def on_disable_roster_cb_toggled(self, widget): - if self.use_roster_cb.get_active() and self.disable_roster_cb.get_active(): - self.use_roster_cb.set_active(False) - + self.on_disable_it_toggled(widget, self.use_roster_cb, 'roster') + + def on_urgency_hint_cb_toggled(self, widget): + gajim.config.set_per('notifications', str(self.active_num), + 'uregency_hint', widget.get_active()) + def on_close_window(self, widget): self.window.destroy()

1 0

[commit-gajim] r6554 - trunk/src
by asterix＠gajim.org 17 Jul '06

17 Jul '06

Author: asterix Date: 2006-07-17 12:06:04 +0200 (Mon, 17 Jul 2006) New Revision: 6554 Modified: trunk/src/gajim.py trunk/src/notify.py Log: indentation Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-07-17 10:04:43 UTC (rev 6553) +++ trunk/src/gajim.py 2006-07-17 10:06:04 UTC (rev 6554) @@ -453,20 +453,21 @@ gajim.connections[account].remove_transfers_for_contact(contact1) self.roster.chg_contact_status(contact1, array[1], status_message, account) - # play sound + # Notifications if old_show < 2 and new_show > 1: notify.notify('contact_connected', jid, account, status_message) if self.remote_ctrl: self.remote_ctrl.raise_signal('ContactPresence', (account, array)) - + elif old_show > 1 and new_show < 2: notify.notify('contact_disconnected', jid, account, status_message) if self.remote_ctrl: self.remote_ctrl.raise_signal('ContactAbsence', (account, array)) # FIXME: stop non active file transfers elif new_show > 1: # Status change (not connected/disconnected or error (<1)) - notify.notify('status_change', jid, account, [new_show, status_message]) + notify.notify('status_change', jid, account, [new_show, + status_message]) else: # FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) doesn't follow the JEP # remove in 2007 @@ -567,7 +568,8 @@ msg_type, array[5], resource, msg_id, array[9]) nickname = gajim.get_name_from_jid(account, jid) # Check and do wanted notifications - notify.notify('new_message', jid, account, [msg_type, first, nickname, message]) + notify.notify('new_message', jid, account, [msg_type, first, nickname, + message]) if self.remote_ctrl: self.remote_ctrl.raise_signal('NewMessage', (account, array)) Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2006-07-17 10:04:43 UTC (rev 6553) +++ trunk/src/notify.py 2006-07-17 10:06:04 UTC (rev 6554) @@ -143,8 +143,7 @@ text = message elif message_type == 'pm': # private message event_type = _('New Private Message') - room_name, t = gajim.get_room_name_and_server_from_room_jid( - jid) + room_name, t = gajim.get_room_name_and_server_from_room_jid(jid) img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', 'priv_msg_recv.png') title = _('New Private Message from room %s') % room_name @@ -156,7 +155,7 @@ 'chat_msg_recv.png') title = _('New Message from %(nickname)s') % \ {'nickname': nickname} - text = message + text = message path = gtkgui_helpers.get_path_to_generic_or_avatar(img) popup(event_type, jid, account, message_type, path_to_image = path, title = title, text = text) @@ -167,8 +166,8 @@ helpers.play_sound('first_message_received') else: helpers.play_sound('next_message_received') - elif (event == 'contact_connected' or event == 'contact_disconnected'): - helpers.play_sound(event) + elif event in ('contact_connected', 'contact_disconnected'): + helpers.play_sound(event) def popup(event_type, jid, account, msg_type = '', path_to_image = None,

1 0

[commit-gajim] r6553 - trunk/src/common
by asterix＠gajim.org 17 Jul '06

17 Jul '06

Author: asterix Date: 2006-07-17 12:04:43 +0200 (Mon, 17 Jul 2006) New Revision: 6553 Modified: trunk/src/common/helpers.py Log: introduce play_sound_file function in helpers Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2006-07-15 13:27:57 UTC (rev 6552) +++ trunk/src/common/helpers.py 2006-07-17 10:04:43 UTC (rev 6553) @@ -418,6 +418,9 @@ if not gajim.config.get('sounds_on'): return path_to_soundfile = gajim.config.get_per('soundevents', event, 'path') + play_sound_file(path_to_soundfile) + +def play_sound_file(path_to_soundfile): if path_to_soundfile == 'beep': print '\a' # make a speaker beep return

1 0

[commit-gajim] r6552 - branches/ad_hoc/src/common
by liori＠gajim.org 15 Jul '06

15 Jul '06

Author: liori Date: 2006-07-15 15:27:57 +0200 (Sat, 15 Jul 2006) New Revision: 6552 Modified: branches/ad_hoc/src/common/connection_handlers.py Log: Generic support for exposing commands (untested). Modified: branches/ad_hoc/src/common/connection_handlers.py =================================================================== --- branches/ad_hoc/src/common/connection_handlers.py 2006-07-14 07:13:59 UTC (rev 6551) +++ branches/ad_hoc/src/common/connection_handlers.py 2006-07-15 13:27:57 UTC (rev 6552) @@ -655,6 +655,10 @@ feature = common.xmpp.Node('feature') feature.setAttr('var', common.xmpp.NS_FILE) query.addChild(node=feature) + # exposing adhoc commands + feature = common.xmpp.Node('feature') + feature.setAttr('var', common.xmpp.NS_COMMANDS) + query.addChild(node=feature) self.connection.send(iq) raise common.xmpp.NodeProcessed @@ -692,20 +696,34 @@ else: self.dispatch('AGENT_INFO_ITEMS', (jid, node, items)) + def _DiscoverItemsGetCB(self, con, iq_obj): + gajim.log.debug('DiscoverItemsGetCB') + node = iq_obj.getTagAttr('query', 'node') + if node==common.xmpp.NS_COMMANDS: + self.commandListQuery(con, iq_obj) + raise common.xmpp.NodeProcessed + def _DiscoverInfoGetCB(self, con, iq_obj): gajim.log.debug('DiscoverInfoGetCB') - iq = iq_obj.buildReply('result') - q = iq.getTag('query') - q.addChild('identity', attrs = {'type': 'pc', - 'category': 'client', - 'name': 'Gajim'}) - q.addChild('feature', attrs = {'var': common.xmpp.NS_BYTESTREAM}) - q.addChild('feature', attrs = {'var': common.xmpp.NS_SI}) - q.addChild('feature', attrs = {'var': common.xmpp.NS_FILE}) - q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC}) - self.connection.send(iq) - raise common.xmpp.NodeProcessed + q = iq_obj.getTag('query') + node = q.getAttr('node') + if self.commandQuery(con, iq_obj): + raise NodeProcessed + + elif node is None: + iq = iq_obj.buildReply('result') + q = iq.getTag('query') + q.addChild('identity', attrs = {'type': 'pc', + 'category': 'client', + 'name': 'Gajim'}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_BYTESTREAM}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_SI}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_FILE}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC}) + self.connection.send(iq) + raise common.xmpp.NodeProcessed + def _DiscoverInfoErrorCB(self, con, iq_obj): gajim.log.debug('DiscoverInfoErrorCB') jid = helpers.get_full_jid_from_iq(iq_obj) @@ -1036,11 +1054,124 @@ else: self.dispatch('VCARD', vcard) +class AdHocCommand: + commandnode = 'command' + commandname = 'The Command' + commandfeatures = (common.xmpp.NS_DATA,) -class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco): + @staticmethod + def isVisibleFor(jid): return True + +class ChangeStatusCommand(AdHocCommand): + commandnode = 'change-status' + commandname = 'Change status information' + def __init__(self, sessiondata): + pass + +class ConnectionCommands: def __init__(self): + # a list of all commands exposed + self.__commands = {} + for cmdobj in (ChangeStatusCommand,): + self.__commands[cmdobj.commandnode] = cmdobj + + # a list of sessions; keys are tuples (jid, sessionid, node) + self.__sessions = {} + + def commandListQuery(self, con, iq_obj): + iq = iq_obj.buildReply('result') + jid = helpers.get_full_jid_from_iq(iq_obj) + q = iq.getTag('query') + + for node, cmd in self.__commands.iter_items(): + if cmd.isVisibleFor(jid): + q.addChild('item', { + 'jid': 'our-jid', + 'node': node, + 'name': cmd.commandname}) + + self.connection.send(iq) + + def commandQuery(self, con, iq_obj): + ''' Send disco result for query for command (JEP-0050, example 6.). + Return True if the result was sent, False if not. ''' + jid = helpers.get_full_jid_from_iq(iq_obj) + node = iq_obj.getTagAttr('query', 'node') + + if node not in self.__commands: return False + + cmd = self.__commands[node] + if cmd.isVisibleFor(jid): + iq = iq_obj.buildReply('result') + q = iq.getTag('query') + q.addChild('identity', attrs = {'type': 'command-node', + 'category': 'automation', + 'name': cmd.commandname}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_COMMANDS}) + for feature in cmd.commandfeatures: + q.addChild('feature', attrs = {'var': feature}) + + self.connection.send(iq) + return True + + return False + + def _CommandExecuteCB(self, con, iq_obj): + jid = helpers.get_full_jid_from_iq(iq_obj) + + cmd = iq_obj.getTag('command') + if cmd is None: return + + node = cmd.getAttr('node') + if node is None: return + + sessionid = cmd.getAttr('sessionid') + if sessionid is None: + # we start a new command session... only if we are visible for the jid + newcmd = self.__commands[node] + if not newcmd.isVisibleFor(jid): + return + + # generate new sessionid + sessionid = self.connection.getAnID() + + # create new instance and run it + obj = newcmd(jid=jid, sessionid=sessionid) + rc = obj.execute() + if rc: + self.__sessions[(jid, sessionid, node)] = obj + raise NodeProcessed + else: + # the command is already running, check for it + magictuple = (jid, sessionid, node) + if magictuple not in self.__sessions: + # we don't have this session... ha! + return + + action = cmd.getAttr('action') + obj = self.__sessions[magictuple] + + if action == 'cancel': rc = obj.cancel(iq_obj) + elif action == 'prev': rc = obj.prev(iq_obj) + elif action == 'next': rc = obj.next(iq_obj) + elif action == 'execute': rc = obj.execute(iq_obj) + elif action == 'complete': rc = obj.complete(iq_obj) + else: + # action is wrong. stop the session, send error + del self.__sessions[magictuple] + return + + # delete the session if rc is False + if not rc: + del self.__sessions[magictuple] + + raise NodeProcessed + +class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands): + def __init__(self): ConnectionVcard.__init__(self) ConnectionBytestream.__init__(self) + ConnectionCommands.__init__(self) # List of IDs we are waiting answers for {id: (type_of_request, data), } self.awaiting_answers = {} # List of IDs that will produce a timeout is answer doesn't arrive @@ -1785,12 +1916,16 @@ common.xmpp.NS_PRIVATE) con.RegisterHandler('iq', self._HttpAuthCB, 'get', common.xmpp.NS_HTTP_AUTH) + con.RegisterHandler('iq', self._CommandExecuteCB, 'set', + common.xmpp.NS_COMMANDS) con.RegisterHandler('iq', self._gMailNewMailCB, 'set', common.xmpp.NS_GMAILNOTIFY) con.RegisterHandler('iq', self._gMailQueryCB, 'result', common.xmpp.NS_GMAILNOTIFY) con.RegisterHandler('iq', self._DiscoverInfoGetCB, 'get', common.xmpp.NS_DISCO_INFO) + con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get', + common.xmpp.NS_DISCO_ITEMS) con.RegisterHandler('iq', self._ErrorCB, 'error') con.RegisterHandler('iq', self._IqCB) con.RegisterHandler('iq', self._StanzaArrivedCB)

1 0

[commit-gajim] r6551 - trunk/src/common
by dkirov＠gajim.org 14 Jul '06

14 Jul '06

Author: dkirov Date: 2006-07-14 09:13:59 +0200 (Fri, 14 Jul 2006) New Revision: 6551 Modified: trunk/src/common/contacts.py Log: take on account priorities, which are <= 0 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2006-07-14 06:41:51 UTC (rev 6550) +++ trunk/src/common/contacts.py 2006-07-14 07:13:59 UTC (rev 6551) @@ -324,8 +324,11 @@ max_order = data_['order'] contact = self.get_contact_with_highest_priority(account, jid) score = (max_order - order)*10000 - if not common.gajim.jid_is_transport(jid): - score += contact.priority*10 + + if common.gajim.get_transport_name_from_jid(jid) is None: + score += 10 + if contact.priority > 0: + score += contact.priority * 10 score += ['not in roster', 'error', 'offline', 'invisible', 'dnd', 'xa', 'away', 'chat', 'online', 'requested', 'message'].index(contact.show) return score

1 0

[commit-gajim] r6550 - trunk/data/glade
by dkirov＠gajim.org 14 Jul '06

14 Jul '06

Author: dkirov Date: 2006-07-14 08:41:51 +0200 (Fri, 14 Jul 2006) New Revision: 6550 Modified: trunk/data/glade/preferences_window.glade Log: [bluegray] make gmail options visible Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2006-07-13 13:07:31 UTC (rev 6549) +++ trunk/data/glade/preferences_window.glade 2006-07-14 06:41:51 UTC (rev 6550) @@ -3108,6 +3108,7 @@ <child> <widget class="GtkCheckButton" id="notify_gmail_checkbutton"> + <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Notify on new _GMail email</property> <property name="use_underline">True</property> @@ -3127,6 +3128,7 @@ <child> <widget class="GtkCheckButton" id="notify_gmail_extra_checkbutton"> + <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Display _extra email details</property> <property name="use_underline">True</property>

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2006