Commits March 2007

commits@gajim.org

4 participants
62 discussions

[commit-gajim] r8020 - trunk/src
by asterix＠gajim.org 20 Mar '07

20 Mar '07

Author: asterix Date: 2007-03-20 13:32:01 +0100 (Tue, 20 Mar 2007) New Revision: 8020 Modified: trunk/src/roster_window.py Log: destroy send file confirmation dialog when we press ok. fixes #3048 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-20 10:35:06 UTC (rev 8019) +++ trunk/src/roster_window.py 2007-03-20 12:32:01 UTC (rev 8020) @@ -4088,15 +4088,6 @@ contact.groups.remove(group) self.remove_contact(contact, account) - def _on_send_files(self, widget, account, jid, uri): - c = gajim.contacts.get_contact_with_highest_priority(account, jid) - uri_splitted = uri.split() # we may have more than one file dropped - for uri in uri_splitted: - path = helpers.get_file_path_from_dnd_dropped_uri(uri) - if os.path.isfile(path): # is it file? - gajim.interface.instances['file_transfers'].send_file( - account, c, path) - def drag_data_received_data(self, treeview, context, x, y, selection, info, etime): model = treeview.get_model() @@ -4145,8 +4136,18 @@ for uri in uri_splitted: path = helpers.get_file_path_from_dnd_dropped_uri(uri) sec_text += '\n' + os.path.basename(path) + def _on_send_files(widget, account, jid, uri): + dialog.destroy() + c = gajim.contacts.get_contact_with_highest_priority(account, jid) + uri_splitted = uri.split() # we may have more than one file dropped + for uri in uri_splitted: + path = helpers.get_file_path_from_dnd_dropped_uri(uri) + if os.path.isfile(path): # is it file? + gajim.interface.instances['file_transfers'].send_file( + account, c, path) + dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text, - on_response_ok = (self._on_send_files, account_dest, jid_dest, uri)) + on_response_ok = (_on_send_files, account_dest, jid_dest, uri)) dialog.popup() return

1 0

[commit-gajim] r8019 - trunk/src
by asterix＠gajim.org 20 Mar '07

20 Mar '07

Author: asterix Date: 2007-03-20 11:35:06 +0100 (Tue, 20 Mar 2007) New Revision: 8019 Modified: trunk/src/roster_window.py Log: fix number of arguments in a callback. fixes #3047 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-20 07:13:25 UTC (rev 8018) +++ trunk/src/roster_window.py 2007-03-20 10:35:06 UTC (rev 8019) @@ -4088,7 +4088,7 @@ contact.groups.remove(group) self.remove_contact(contact, account) - def _on_send_files(self, account, jid, uri): + def _on_send_files(self, widget, account, jid, uri): c = gajim.contacts.get_contact_with_highest_priority(account, jid) uri_splitted = uri.split() # we may have more than one file dropped for uri in uri_splitted:

1 0

[commit-gajim] r8018 - trunk/src/common/zeroconf
by asterix＠gajim.org 20 Mar '07

20 Mar '07

Author: asterix Date: 2007-03-20 08:13:25 +0100 (Tue, 20 Mar 2007) New Revision: 8018 Modified: trunk/src/common/zeroconf/client_zeroconf.py Log: add now argument to send funtions in zeroconf connection. fixes #3045 Modified: trunk/src/common/zeroconf/client_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/client_zeroconf.py 2007-03-19 21:02:35 UTC (rev 8017) +++ trunk/src/common/zeroconf/client_zeroconf.py 2007-03-20 07:13:25 UTC (rev 8018) @@ -310,8 +310,9 @@ if not recv_handler(None) and _tmp == self.on_receive: self.on_receive = recv_handler - def send(self, packet, is_message = False): - '''Append stanza to the queue of messages to be send. + def send(self, packet, is_message = False, now = False): + '''Append stanza to the queue of messages to be send if now is + False, else send it instantly. If supplied data is unicode string, encode it to utf-8. ''' if self.state <= 0: @@ -324,7 +325,11 @@ elif not isinstance(r, str): r = ustr(r).encode('utf-8') - self.sendqueue.append((r, is_message)) + if now: + self.sendqueue.insert(0, (r, is_message)) + self._do_send() + else: + self.sendqueue.append((r, is_message)) self._plug_idle() def read_timeout(self): @@ -617,7 +622,7 @@ return self.roster.getRoster() return {} - def send(self, stanza, is_message = False): + def send(self, stanza, is_message = False, now = False): stanza.setFrom(self.roster.zeroconf.name) to = stanza.getTo()

1 0

[commit-gajim] r8017 - trunk/src
by asterix＠gajim.org 19 Mar '07

19 Mar '07

Author: asterix Date: 2007-03-19 22:02:35 +0100 (Mon, 19 Mar 2007) New Revision: 8017 Modified: trunk/src/adhoc_commands.py Log: in adhoc commands, use the node name provided by the entity (It can change) Modified: trunk/src/adhoc_commands.py =================================================================== --- trunk/src/adhoc_commands.py 2007-03-17 10:14:31 UTC (rev 8016) +++ trunk/src/adhoc_commands.py 2007-03-19 21:02:35 UTC (rev 8017) @@ -289,6 +289,7 @@ self.form_status = command.getAttr('status') + self.commandnode = command.getAttr('node') if command.getTag('x') is not None: self.dataform = dataforms.ExtendForm(node=command.getTag('x'))

1 0

[commit-gajim] r8016 - trunk/src
by asterix＠gajim.org 17 Mar '07

17 Mar '07

Author: asterix Date: 2007-03-17 11:14:31 +0100 (Sat, 17 Mar 2007) New Revision: 8016 Modified: trunk/src/roster_window.py Log: show a confirmation dialog when we drop a file on a contact before sending files. fixes #2896 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-17 08:14:25 UTC (rev 8015) +++ trunk/src/roster_window.py 2007-03-17 10:14:31 UTC (rev 8016) @@ -38,6 +38,7 @@ from common import helpers from common import passwords from common.exceptions import GajimGeneralException +from common import i18n from message_window import MessageWindowMgr from chat_control import ChatControl @@ -4087,6 +4088,15 @@ contact.groups.remove(group) self.remove_contact(contact, account) + def _on_send_files(self, account, jid, uri): + c = gajim.contacts.get_contact_with_highest_priority(account, jid) + uri_splitted = uri.split() # we may have more than one file dropped + for uri in uri_splitted: + path = helpers.get_file_path_from_dnd_dropped_uri(uri) + if os.path.isfile(path): # is it file? + gajim.interface.instances['file_transfers'].send_file( + account, c, path) + def drag_data_received_data(self, treeview, context, x, y, selection, info, etime): model = treeview.get_model() @@ -4127,11 +4137,17 @@ jid_dest) uri = data.strip() uri_splitted = uri.split() # we may have more than one file dropped + nb_uri = len(uri_splitted) + prim_text = 'Send file?' + sec_text = i18n.ngettext('Do you want to send that file to %s:', + 'Do you want to send those files to %s:', nb_uri) %\ + c_dest.get_shown_name() for uri in uri_splitted: path = helpers.get_file_path_from_dnd_dropped_uri(uri) - if os.path.isfile(path): # is it file? - gajim.interface.instances['file_transfers'].send_file( - account_dest, c_dest, path) + sec_text += '\n' + os.path.basename(path) + dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text, + on_response_ok = (self._on_send_files, account_dest, jid_dest, uri)) + dialog.popup() return if gajim.config.get_per('accounts', account_dest, 'is_zeroconf'):

1 0

[commit-gajim] r8015 - in trunk/src: . common
by asterix＠gajim.org 17 Mar '07

17 Mar '07

Author: asterix Date: 2007-03-17 09:14:25 +0100 (Sat, 17 Mar 2007) New Revision: 8015 Modified: trunk/src/common/config.py trunk/src/roster_window.py Log: add an ACE option to disable the fact that gajim auto-expand and selects the contact who sent last message. fixes #2911 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2007-03-15 12:53:29 UTC (rev 8014) +++ trunk/src/common/config.py 2007-03-17 08:14:25 UTC (rev 8015) @@ -224,6 +224,7 @@ 'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')], 'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')], 'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], + 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], } __options_per_key = { Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-15 12:53:29 UTC (rev 8014) +++ trunk/src/roster_window.py 2007-03-17 08:14:25 UTC (rev 8015) @@ -150,7 +150,7 @@ self.add_contact_to_roster(jid, account) iters = self.get_contact_iter(jid, account) path = self.tree.get_model().get_path(iters[0]) - if self.dragging: + if self.dragging or not gajim.config.get('scroll_roster_to_last_message'): # do not change selection while DND'ing return # popup == False so we show awaiting event in roster @@ -3181,7 +3181,8 @@ if popup: if not ctrl: self.new_chat(contact, account, resource = resource_for_chat) - if path and not self.dragging: + if path and not self.dragging and gajim.config.get( + 'scroll_roster_to_last_message'): # we curently see contact in our roster OR he # is not in the roster at all. # show and select his line in roster

1 0

[commit-gajim] r8014 - in trunk/src/common: . xmpp
by asterix＠gajim.org 15 Mar '07

15 Mar '07

Author: asterix Date: 2007-03-15 13:53:29 +0100 (Thu, 15 Mar 2007) New Revision: 8014 Modified: trunk/src/common/commands.py trunk/src/common/xmpp/dispatcher_nb.py trunk/src/common/xmpp/transports_nb.py Log: add a now argument to the send function, so that stanza is sent instantly instead of added to queue. Use it to send answer to adhoc command when we disconnect. fixes #3008 and #2808 Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2007-03-14 17:14:58 UTC (rev 8013) +++ trunk/src/common/commands.py 2007-03-15 12:53:29 UTC (rev 8014) @@ -135,7 +135,7 @@ # if going offline, we need to push response so it won't go into # queue and disappear - self.connection.connection.send(response, presencetype == 'offline') + self.connection.connection.send(response, now = presencetype == 'offline') # send new status gajim.interface.roster.send_status(self.connection.name, presencetype, Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2007-03-14 17:14:58 UTC (rev 8013) +++ trunk/src/common/xmpp/dispatcher_nb.py 2007-03-15 12:53:29 UTC (rev 8014) @@ -398,11 +398,11 @@ Additional callback arguments can be specified in args. ''' self.SendAndWaitForResponse(stanza, 0, func, args) - def send(self, stanza, is_message = False): + def send(self, stanza, is_message = False, now = False): ''' Serialise stanza and put it on the wire. Assign an unique ID to it before send. Returns assigned ID.''' if type(stanza) in [type(''), type(u'')]: - return self._owner.Connection.send(stanza) + return self._owner.Connection.send(stanza, now = now) if not isinstance(stanza, Protocol): _ID=None elif not stanza.getID(): @@ -426,9 +426,9 @@ stanza.setNamespace(self._owner.Namespace) stanza.setParent(self._metastream) if is_message: - self._owner.Connection.send(stanza, True) + self._owner.Connection.send(stanza, True, now = now) else: - self._owner.Connection.send(stanza) + self._owner.Connection.send(stanza, now = now) return _ID def disconnect(self): Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2007-03-14 17:14:58 UTC (rev 8013) +++ trunk/src/common/xmpp/transports_nb.py 2007-03-15 12:53:29 UTC (rev 8014) @@ -138,7 +138,7 @@ raise NotImplementedException() - def send(self, data, flags=None): + def send(self, data, flags=None, now = False): raise NotImplementedException() class PyOpenSSLWrapper(SSLWrapper): @@ -178,7 +178,7 @@ raise SSLWrapper.Error(self.sock or self.sslobj, e) return retval - def send(self, data, flags=None): + def send(self, data, flags=None, now = False): try: if flags is None: return self.sslobj.send(data) else: return self.sslobj.send(data, flags) @@ -219,7 +219,7 @@ raise SSLWrapper.Error(self.sock or self.sslobj, e) return None - def send(self, data, flags=None): + def send(self, data, flags=None, now = False): # we simply ignore flags since ssl object doesn't support it try: return self.sslobj.write(data) @@ -574,7 +574,7 @@ self.on_connect = None return True - def send(self, raw_data): + def send(self, raw_data, now = False): '''Append raw_data to the queue of messages to be send. If supplied data is unicode string, encode it to utf-8. ''' @@ -585,7 +585,11 @@ r = r.encode('utf-8') elif not isinstance(r, str): r = ustr(r).encode('utf-8') - self.sendqueue.append(r) + if now: + self.sendqueue.insert(0, r) + self._do_send() + else: + self.sendqueue.append(r) self._plug_idle() def _on_send(self):

1 0

[commit-gajim] r8013 - www-website/locale/bg_BG/LC_MESSAGES
by asterix＠gajim.org 14 Mar '07

14 Mar '07

Author: asterix Date: 2007-03-14 18:14:58 +0100 (Wed, 14 Mar 2007) New Revision: 8013 Modified: www-website/locale/bg_BG/LC_MESSAGES/msg.po Log: [Yavor Doganov] updated translation of the website Modified: www-website/locale/bg_BG/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/bg_BG/LC_MESSAGES/msg.po 2007-03-14 13:31:50 UTC (rev 8012) +++ www-website/locale/bg_BG/LC_MESSAGES/msg.po 2007-03-14 17:14:58 UTC (rev 8013) @@ -1,16 +1,16 @@ # Bulgarian translations for gajim website package. -# Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. # This file is distributed under the same license as the gajim www-website package. -# Yavor Doganov <yavor(a)doganov.org>, 2005, 2006. +# Yavor Doganov <yavor(a)gnu.org>, 2005, 2006, 2007. # # msgid "" msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-18 23:21+0100\n" -"PO-Revision-Date: 2006-12-29 19:03+0200\n" -"Last-Translator: Yavor Doganov <yavor(a)doganov.org>\n" +"POT-Creation-Date: 2007-03-14 17:27+0200\n" +"PO-Revision-Date: 2007-03-14 17:52+0200\n" +"Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -244,11 +244,11 @@ msgid " Project is composed of:" msgstr " Проектът се състои от:" -#: dev.php:65 +#: dev.php:68 msgid " We also want to thank" msgstr " Също бихме искали да благодарим на" -#: dev.php:65 +#: dev.php:68 msgid "these people" msgstr "тези хора" @@ -584,11 +584,11 @@ #: downloads.php:133 msgid "For information on how to build Gajim," -msgstr "" +msgstr "За информация как да компилирате Gajim," #: downloads.php:133 msgid "in English" -msgstr "" +msgstr "на английски език" #: downloads.php:135 msgid "" @@ -630,15 +630,15 @@ #: downloads.php:160 msgid " Install dependencies, and build Gajim. Please see the" -msgstr "" +msgstr " Инсталирайте зависимостите и компилирайте Gajim. Вижте" #: downloads.php:160 msgid "English" -msgstr "" +msgstr "на английски език" #: downloads.php:160 msgid "for details.\n" -msgstr "" +msgstr "за подробности.\n" #: downloads.php:163 msgid " You can run Gajim by typing the following:\n" @@ -823,30 +823,29 @@ msgstr "XML конзола" #: index.php:36 -#, fuzzy msgid "" "Gajim is available in 24 languages: Basque, Belarusian, Brasilian, Breton, " "British, Bulgarian, Chinese (simplified), Croatian, Czech, Dutch, English, " "Esperanto, French, German, Greek, Italian, Norwegian (Bokmål), Polish, " "Portugese, Russian, Serbian, Spanish, Slovak and Swedish" msgstr "" -"Gajim е достъпен на 22 езика: баски, белоруски, бразилски португалски, " -"бретонски, български, китайски (опростен), хърватски, чешки, холандски, " -"английски, есперанто, френски, немски, гръцки, италиански, норвежки " -"(Bokmål), полски, португалски, руски, испански, словашки и шведски" +"Gajim е достъпен на 24 езика: баски, белоруски, бразилски португалски, " +"бретонски, британски английски, български, китайски (опростен), хърватски, " +"чешки, холандски, английски, есперанто, френски, немски, гръцки, италиански, " +"норвежки (Bokmål), полски, португалски, руски, сръбски, испански, словашки и " +"шведски" #: index.php:46 msgid "NEWS" msgstr "НОВИНИ" #: index.php:49 -#, fuzzy msgid "Gajim 0.11.1 is here!" -msgstr "Излезе Gajim 0.11!" +msgstr "Излезе Gajim 0.11.1!" #: index.php:50 msgid "Pre-release of Gajim 0.11.1" -msgstr "" +msgstr "Предварително издание на Gajim 0.11.1" #: index.php:51 msgid "Gajim 0.11 is here!" @@ -854,24 +853,23 @@ #: index.php:53 msgid "18 February 2007" -msgstr "" +msgstr "18 февруари 2007 г." #: index.php:54 msgid "07 February 2007" -msgstr "" +msgstr "7 февруари 2007 г." #: index.php:55 msgid "19 December 2006" msgstr "19 декември 2006 г." #: index.php:57 -#, fuzzy msgid "Version 0.11.1 of Gajim has been released." -msgstr "Издадена е версия 0.11 на Gajim." +msgstr "Издадена е версия 0.11.1 на Gajim." #: index.php:58 msgid "Version 0.11.1 will arrive soon." -msgstr "" +msgstr "Скоро ще излезе версия 0.11.1." #: index.php:59 msgid "Version 0.11 of Gajim has been released." @@ -884,30 +882,32 @@ #: index.php:66 index.php:78 msgid "Fix Idle and non-ascii languages under Windows" msgstr "" +"Коригиране на проблем при състоянието на автоматично отсъствие и езиците с " +"различни от ASCII знаци под „Уиндоус“" #: index.php:67 index.php:79 msgid "Fix International Domain Name usage" -msgstr "" +msgstr "Коригиране на употребата на IDN" #: index.php:68 index.php:80 msgid "Fixed avatars cache problems in group chats" -msgstr "" +msgstr "Корекция на проблеми при кеширането на аватари при разговори в стаи" #: index.php:69 index.php:81 msgid "Support of XEP-0202 (Entity Time)" -msgstr "" +msgstr "Поддръжка на XEP-0202 (Entity Time)" #: index.php:70 index.php:82 msgid "Support of XEP-0199 (XMPP Ping)" -msgstr "" +msgstr "Поддръжка на XEP-0199 (XMPP Ping)" #: index.php:71 msgid "New translation: Serbian" -msgstr "" +msgstr "Нов превод: сръбски" #: index.php:72 msgid "Fix pubsub usage" -msgstr "" +msgstr "Коригиране на употребата на „pubsub“" #: index.php:73 index.php:83 index.php:95 msgid "Full ChangeLog" @@ -949,89 +949,3 @@ #: screenshots.php:11 msgid "Here are some screenshots of Gajim:" msgstr "Ето и някои снимки на Gajim:" - -#, fuzzy -#~ msgid " There is a Gajim installer for 0.11.0.7951 pre-release " -#~ msgstr " Има инсталатор на Gajim " - -#, fuzzy -#~ msgid " The tarball version of 0.11.0.7951 pre-release is " -#~ msgstr " Архивиран изходен код на версията на Gajim има " - -#~ msgid "One Messages Window ability (default to it) with tab reorder ability" -#~ msgstr "" -#~ "Възможност за разговори в един прозорец (по подразбиране) с преподреждане " -#~ "на подпрозорците" - -#~ msgid "Gajim no longer remains unresponsive" -#~ msgstr "Gajim вече не остава неотзивчив" - -#~ msgid "Gajim now uses less memory" -#~ msgstr "Gajim вече използва по-малко памет" - -#~ msgid "File Transfer works better (now should work out of the box for all)" -#~ msgstr "Файловият трансфер работи по-добре (зависимости между контактите)" - -#~ msgid "Meta Contacts ability (relationships between contacts)" -#~ msgstr "Възможност за мета-контакти (зависимости между контактите)" - -#~ msgid "" -#~ "Support for legacy composing event (JEP-0022). Now 'Contact is composing " -#~ "a message' will always work" -#~ msgstr "" -#~ "Поддръжка за вече излязлото от употреба събитие за писане на съобщение " -#~ "(JEP-0022). Сега „Контактът пише съобщение“ винаги ще работи" - -#~ msgid "Gajim now defaults to theme that uses GTK colors" -#~ msgstr "Gajim вече по подразбиране използва тема с цветовете на GTK" - -#~ msgid "" -#~ "Roster Management Improvements (f.e. editablity of transport names, " -#~ "extended Drag and Drop Functionality)" -#~ msgstr "" -#~ "Подобрения по управлението на списъка (напр. редактиране на имената на " -#~ "транспортите, разширена функционалност за провлачване и пускане)" - -#~ msgid "History (chat logs) Manager (search globally, delete, etc)" -#~ msgstr "" -#~ "Мениджър на историята (дневници на разговорите) -- глобално търсене, " -#~ "изтриване и т.н." - -#~ msgid "Animated Emoticons ability" -#~ msgstr "Възможност за анимирани емотикони" - -#~ msgid "Support for GTalk email notifications for GMail" -#~ msgstr "Поддръжка за уведомления чрез GTalk за писма от Gmail" - -#~ msgid "Room administrators can modify room ban list" -#~ msgstr "Администраторите на стаи могат да променят списъка с отлъчените" - -#~ msgid "" -#~ "Gajim no longer optionally depends on pydns or dnspython. Requires " -#~ "dnsutils (or whatever package provides the nslookup binary)" -#~ msgstr "" -#~ "Gajim вече не зависи от pydns или dnspython като опция. Изисква dnsutils " -#~ "(или който и да е пакет, който осигурява изпълнимия файл nslookup)" - -#~ msgid "gajim-remote has extended functionality" -#~ msgstr "gajim-remote има разширена функционалност" - -#~ msgid "Improved Preset Status Messages Experience" -#~ msgstr "Подобрена работа с пренастроените съобщения за състояние" - -#~ msgid "Detection for CRUX as user's operating system" -#~ msgstr "Разпознаване на CRUX като операционна система на потребителя" - -#~ msgid "New art included, appropriate sizes of icons used where available" -#~ msgstr "" -#~ "Включени са нови изображения и звуци, използват се подходящите размери на " -#~ "иконите, когато са налични" - -#~ msgid "Translations under Windows now work okay" -#~ msgstr "Преводите под „Уиндоус“ вече се изобразяват" - -#~ msgid "Tons of fixes" -#~ msgstr "Тонове корекции" - -#~ msgid "for bugs and annoyances." -#~ msgstr "на грешки и неприятности."

1 0

[commit-gajim] r8012 - trunk/src
by asterix＠gajim.org 14 Mar '07

14 Mar '07

Author: asterix Date: 2007-03-14 14:31:50 +0100 (Wed, 14 Mar 2007) New Revision: 8012 Modified: trunk/src/dialogs.py Log: warning and information dialogs are now no more modal, but transient for parent. This means all windows are usable even if such a dialog is opened, but dialog stays above parent windows. Parent is roster window. fixes #3035 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-03-11 22:14:48 UTC (rev 8011) +++ trunk/src/dialogs.py 2007-03-14 13:31:50 UTC (rev 8012) @@ -932,6 +932,8 @@ '''HIG compliant warning dialog.''' HigDialog.__init__( self, None, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, pritext, sectext) + self.set_modal(False) + self.set_transient_for(gajim.interface.roster.window) self.popup() class InformationDialog(HigDialog): @@ -939,6 +941,8 @@ '''HIG compliant info dialog.''' HigDialog.__init__( self, None, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, pritext, sectext) + self.set_modal(False) + self.set_transient_for(gajim.interface.roster.window) self.popup() class ErrorDialog(HigDialog):

1 0

[commit-gajim] r8011 - trunk/data/glade
by asterix＠gajim.org 11 Mar '07

11 Mar '07

Author: asterix Date: 2007-03-11 23:14:48 +0100 (Sun, 11 Mar 2007) New Revision: 8011 Added: trunk/data/glade/dubbleinput_dialog.glade Log: add missing file to previous commit. fixes #3031 Added: trunk/data/glade/dubbleinput_dialog.glade =================================================================== --- trunk/data/glade/dubbleinput_dialog.glade (rev 0) +++ trunk/data/glade/dubbleinput_dialog.glade 2007-03-11 22:14:48 UTC (rev 8011) @@ -0,0 +1,205 @@ +<?xml version="1.0" standalone="no"?>  +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkDialog" id="dubbleinput_dialog"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_NONE</property> + <property name="modal">False</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <property name="has_separator">False</property> + <signal name="destroy" handler="on_dubbleinput_dialog_destroy" last_modification_time="Sun, 11 Mar 2007 11:32:38 GMT"/> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox10"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area9"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="cancelbutton"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="okbutton"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-ok</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-5</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox76"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkHBox" id="hbox2960"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image507"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon_size">6</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">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes"></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">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="input_entry1"> + <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">True</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="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes"></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">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="input_entry2"> + <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> + </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> + </child> +</widget> + +</glade-interface>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2007