Commits

commits@gajim.org

17632 discussions

gajim: don't try to connect twice when we get see-other-host. se...
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset 59edb542b13f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59edb542b13f description: don't try to connect twice when we get see-other-host. see #7179 diffstat: src/common/xmpp/client_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r d600ffb766f4 -r 59edb542b13f src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Fri Jul 06 01:38:18 2012 +0400 +++ b/src/common/xmpp/client_nb.py Thu Jun 21 14:10:01 2012 +0200 @@ -354,6 +354,7 @@ self.Dispatcher.ProcessNonBlocking(data) if self.got_see_other_host: log.info('got see-other-host') + self.onreceive(None) self.on_stream_error_cb(self, self.got_see_other_host) elif not self.got_features: self._xmpp_connect_machine(

1 0

gajim: fix set parent window for ProfileWindow and ChoseGPGKeyDi...
by Fomin Denis 14 Aug '12

14 Aug '12

changeset d600ffb766f4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d600ffb766f4 description: fix set parent window for ProfileWindow and ChoseGPGKeyDialog. diffstat: data/gui/profile_window.ui | 1 - src/config.py | 2 +- src/dialogs.py | 3 +-- src/gui_interface.py | 2 +- src/profile_window.py | 3 +-- src/roster_window.py | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diffs (73 lines): diff -r 64f5c1467c42 -r d600ffb766f4 data/gui/profile_window.ui --- a/data/gui/profile_window.ui Thu Jul 05 23:53:51 2012 +0400 +++ b/data/gui/profile_window.ui Fri Jul 06 01:38:18 2012 +0400 @@ -4,7 +4,6 @@  <object class="GtkWindow" id="profile_window"> <property name="title" translatable="yes">Personal Information</property> - <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_profile_window_destroy"/> <signal name="key_press_event" handler="on_profile_window_key_press_event"/> diff -r 64f5c1467c42 -r d600ffb766f4 src/config.py --- a/src/config.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/config.py Fri Jul 06 01:38:18 2012 +0400 @@ -2459,7 +2459,7 @@ jid = gajim.get_jid_from_account(self.current_account) if 'profile' not in gajim.interface.instances[self.current_account]: gajim.interface.instances[self.current_account]['profile'] = \ - profile_window.ProfileWindow(self.current_account, self.window) + profile_window.ProfileWindow(self.current_account, transient_for=self.window) gajim.connections[self.current_account].request_vcard(jid) def on_checkbutton_toggled(self, widget, config_name, diff -r 64f5c1467c42 -r d600ffb766f4 src/dialogs.py --- a/src/dialogs.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/dialogs.py Fri Jul 06 01:38:18 2012 +0400 @@ -283,8 +283,7 @@ xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui') self.window = xml.get_object('choose_gpg_key_dialog') self.window.set_title(title_text) - if not transient_for: - self.window.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(transient_for) self.keys_treeview = xml.get_object('keys_treeview') prompt_label = xml.get_object('prompt_label') prompt_label.set_text(prompt_text) diff -r 64f5c1467c42 -r d600ffb766f4 src/gui_interface.py --- a/src/gui_interface.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/gui_interface.py Fri Jul 06 01:38:18 2012 +0400 @@ -237,7 +237,7 @@ jid = gajim.get_jid_from_account(account) if 'profile' not in self.instances[account]: self.instances[account]['profile'] = \ - profile_window.ProfileWindow(account) + profile_window.ProfileWindow(account, gajim.interface.roster.window) gajim.connections[account].request_vcard(jid) def handle_gc_error(self, gc_control, pritext, sectext): diff -r 64f5c1467c42 -r d600ffb766f4 src/profile_window.py --- a/src/profile_window.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/profile_window.py Fri Jul 06 01:38:18 2012 +0400 @@ -45,8 +45,7 @@ def __init__(self, account, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui') self.window = self.xml.get_object('profile_window') - if not transient_for: - self.window.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(transient_for) self.progressbar = self.xml.get_object('progressbar') self.statusbar = self.xml.get_object('statusbar') self.context_id = self.statusbar.get_context_id('profile') diff -r 64f5c1467c42 -r d600ffb766f4 src/roster_window.py --- a/src/roster_window.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/roster_window.py Fri Jul 06 01:38:18 2012 +0400 @@ -3215,7 +3215,7 @@ dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'), _('Select a key to apply to the contact'), public_keys, - on_key_selected, selected=keyID) + on_key_selected, selected=keyID, transient_for=self.window) def on_set_custom_avatar_activate(self, widget, contact, account): def on_ok(widget, path_to_file):

1 0

gajim: Set parent window for ProfileWindow. See #7184.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 64f5c1467c42 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=64f5c1467c42 description: Set parent window for ProfileWindow. See #7184. diffstat: data/gui/profile_window.ui | 1 + src/config.py | 7 ++++++- src/profile_window.py | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diffs (52 lines): diff -r fb38c55406b3 -r 64f5c1467c42 data/gui/profile_window.ui --- a/data/gui/profile_window.ui Thu Jul 05 23:23:56 2012 +0400 +++ b/data/gui/profile_window.ui Thu Jul 05 23:53:51 2012 +0400 @@ -4,6 +4,7 @@  <object class="GtkWindow" id="profile_window"> <property name="title" translatable="yes">Personal Information</property> + <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_profile_window_destroy"/> <signal name="key_press_event" handler="on_profile_window_key_press_event"/> diff -r fb38c55406b3 -r 64f5c1467c42 src/config.py --- a/src/config.py Thu Jul 05 23:23:56 2012 +0400 +++ b/src/config.py Thu Jul 05 23:53:51 2012 +0400 @@ -45,6 +45,7 @@ import message_control import chat_control import dataforms_widget +import profile_window try: import gtkspell @@ -2455,7 +2456,11 @@ _("Your server can't save your personal information.")) return - gajim.interface.edit_own_details(self.current_account) + jid = gajim.get_jid_from_account(self.current_account) + if 'profile' not in gajim.interface.instances[self.current_account]: + gajim.interface.instances[self.current_account]['profile'] = \ + profile_window.ProfileWindow(self.current_account, self.window) + gajim.connections[self.current_account].request_vcard(jid) def on_checkbutton_toggled(self, widget, config_name, change_sensitivity_widgets = None, account = None): diff -r fb38c55406b3 -r 64f5c1467c42 src/profile_window.py --- a/src/profile_window.py Thu Jul 05 23:23:56 2012 +0400 +++ b/src/profile_window.py Thu Jul 05 23:53:51 2012 +0400 @@ -42,10 +42,11 @@ Class for our information window """ - def __init__(self, account): + def __init__(self, account, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui') self.window = self.xml.get_object('profile_window') - self.window.set_transient_for(gajim.interface.roster.window) + if not transient_for: + self.window.set_transient_for(gajim.interface.roster.window) self.progressbar = self.xml.get_object('progressbar') self.statusbar = self.xml.get_object('statusbar') self.context_id = self.statusbar.get_context_id('profile')

1 0

gajim: Select root iter in the PluginsWindow treeview. set focus...
by Fomin Denis 14 Aug '12

14 Aug '12

changeset fd57686e12e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fd57686e12e2 description: Select root iter in the PluginsWindow treeview. set focus on close button when switch page. diffstat: data/gui/plugins_window.ui | 1 + src/plugins/gui.py | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diffs (34 lines): diff -r 346f4ded0411 -r fd57686e12e2 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Thu Jun 28 13:15:52 2012 +0400 +++ b/data/gui/plugins_window.ui Thu Jun 28 13:37:55 2012 +0400 @@ -20,6 +20,7 @@ <object class="GtkNotebook" id="plugins_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> + <signal name="switch_page" handler="on_plugins_notebook_switch_page"/> <child> <object class="GtkHPaned" id="hpaned1"> <property name="visible">True</property> diff -r 346f4ded0411 -r fd57686e12e2 src/plugins/gui.py --- a/src/plugins/gui.py Thu Jun 28 13:15:52 2012 +0400 +++ b/src/plugins/gui.py Thu Jun 28 13:37:55 2012 +0400 @@ -82,14 +82,19 @@ self._clear_installed_plugin_info() self.fill_installed_plugins_model() + selection.select_iter(self.installed_plugins_model.get_iter_root()) self.xml.connect_signals(self) self.plugins_notebook.set_current_page(0) + self.xml.get_object('close_button').grab_focus() self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) + def on_plugins_notebook_switch_page(self, widget, page, page_num): + gobject.idle_add(self.xml.get_object('close_button').grab_focus) + @log_calls('PluginsWindow') def installed_plugins_treeview_selection_changed(self, treeview_selection): model, iter = treeview_selection.get_selected()

1 0

gajim: Set parent window for ChooseGPGKeyDialog.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset fb38c55406b3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fb38c55406b3 description: Set parent window for ChooseGPGKeyDialog. diffstat: src/config.py | 3 ++- src/dialogs.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diffs (32 lines): diff -r fd57686e12e2 -r fb38c55406b3 src/config.py --- a/src/config.py Thu Jun 28 13:37:55 2012 +0400 +++ b/src/config.py Thu Jul 05 23:23:56 2012 +0400 @@ -2430,7 +2430,8 @@ keyID[0]) dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'), - _('Choose your OpenPGP key'), secret_keys, on_key_selected) + _('Choose your OpenPGP key'), secret_keys, on_key_selected, + transient_for=self.window) def on_use_gpg_agent_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'use_gpg_agent') diff -r fd57686e12e2 -r fb38c55406b3 src/dialogs.py --- a/src/dialogs.py Thu Jun 28 13:37:55 2012 +0400 +++ b/src/dialogs.py Thu Jul 05 23:23:56 2012 +0400 @@ -277,12 +277,14 @@ """ def __init__(self, title_text, prompt_text, secret_keys, on_response, - selected=None): + selected=None, transient_for=None): '''secret_keys : {keyID: userName, ...}''' self.on_response = on_response xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui') self.window = xml.get_object('choose_gpg_key_dialog') self.window.set_title(title_text) + if not transient_for: + self.window.set_transient_for(gajim.interface.roster.window) self.keys_treeview = xml.get_object('keys_treeview') prompt_label = xml.get_object('prompt_label') prompt_label.set_text(prompt_text)

1 0

gajim: Don't ellipsize Family Name label in the profile window.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 346f4ded0411 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=346f4ded0411 description: Don't ellipsize Family Name label in the profile window. diffstat: data/gui/profile_window.ui | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r a960791e8c1f -r 346f4ded0411 data/gui/profile_window.ui --- a/data/gui/profile_window.ui Thu Jun 28 13:03:56 2012 +0400 +++ b/data/gui/profile_window.ui Thu Jun 28 13:15:52 2012 +0400 @@ -128,7 +128,6 @@ <property name="yalign">0</property> <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property> <property name="use_markup">True</property> - <property name="ellipsize">middle</property> </object> <packing> <property name="x_options">GTK_FILL</property>

1 0

gajim: Set focus on ok button when switch profile window page.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset f2b9adc8be9d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f2b9adc8be9d description: Set focus on ok button when switch profile window page. diffstat: data/gui/profile_window.ui | 127 ++++++++++++++++++++++---------------------- src/profile_window.py | 4 + 2 files changed, 68 insertions(+), 63 deletions(-) diffs (truncated from 585 to 300 lines): diff -r b949134e01ac -r f2b9adc8be9d data/gui/profile_window.ui --- a/data/gui/profile_window.ui Thu Jun 28 12:38:43 2012 +0400 +++ b/data/gui/profile_window.ui Thu Jun 28 12:49:54 2012 +0400 @@ -15,6 +15,7 @@ <object class="GtkNotebook" id="information_notebook"> <property name="visible">True</property> <property name="border_width">6</property> + <signal name="switch_page" handler="on_information_notebook_switch_page"/> <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> @@ -31,7 +32,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -44,7 +45,7 @@ <property name="right_attach">4</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -67,7 +68,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -78,7 +79,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -91,7 +92,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -104,7 +105,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -117,7 +118,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -131,7 +132,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -146,7 +147,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -161,7 +162,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -176,7 +177,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -193,7 +194,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -218,7 +219,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -229,7 +230,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -252,7 +253,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -263,7 +264,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -276,7 +277,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -289,7 +290,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -302,7 +303,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -315,7 +316,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -328,7 +329,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -343,7 +344,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -358,7 +359,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -373,7 +374,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -390,7 +391,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -407,7 +408,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -426,7 +427,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -440,7 +441,7 @@ <property name="right_attach">4</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -454,8 +455,8 @@ <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -468,7 +469,7 @@ <property name="right_attach">4</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -481,7 +482,7 @@ <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -494,7 +495,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child>

1 0

gajim: Set focus on close button when switch preferences window ...
by Fomin Denis 14 Aug '12

14 Aug '12

changeset a960791e8c1f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a960791e8c1f description: Set focus on close button when switch preferences window page. diffstat: data/gui/preferences_window.ui | 53 +++++++++++++++++++++-------------------- src/config.py | 4 +++ 2 files changed, 31 insertions(+), 26 deletions(-) diffs (249 lines): diff -r f2b9adc8be9d -r a960791e8c1f data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Thu Jun 28 12:49:54 2012 +0400 +++ b/data/gui/preferences_window.ui Thu Jun 28 13:03:56 2012 +0400 @@ -166,6 +166,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="show_border">False</property> + <signal name="switch_page" handler="on_preferences_notebook_switch_page"/> <child> <object class="GtkVBox" id="vbox41"> <property name="visible">True</property> @@ -1059,7 +1060,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1077,7 +1078,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1090,7 +1091,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1105,7 +1106,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1168,7 +1169,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1185,7 +1186,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -1698,7 +1699,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1713,7 +1714,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1728,7 +1729,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1744,7 +1745,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1827,7 +1828,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1842,7 +1843,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1881,8 +1882,8 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -1921,8 +1922,8 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -1951,7 +1952,7 @@ <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1982,7 +1983,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2011,7 +2012,7 @@ <property name="left_attach">3</property> <property name="right_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2042,7 +2043,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -2447,7 +2448,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2462,7 +2463,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2474,7 +2475,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2488,7 +2489,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2503,7 +2504,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2516,7 +2517,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> diff -r f2b9adc8be9d -r a960791e8c1f src/config.py --- a/src/config.py Thu Jun 28 12:49:54 2012 +0400 +++ b/src/config.py Thu Jun 28 13:03:56 2012 +0400 @@ -582,10 +582,14 @@ self.sounds_preferences = None self.notebook.set_current_page(0) + self.xml.get_object('close_button').grab_focus() self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) + def on_preferences_notebook_switch_page(self, widget, page, page_num): + gobject.idle_add(self.xml.get_object('close_button').grab_focus) + def on_preferences_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: self.window.hide()

1 0

gajim: Set focus on close button when switch vcard page.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset b949134e01ac in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b949134e01ac description: Set focus on close button when switch vcard page. diffstat: data/gui/vcard_information_window.ui | 157 +++++++++++++++++----------------- src/vcard.py | 3 + 2 files changed, 80 insertions(+), 80 deletions(-) diffs (truncated from 727 to 300 lines): diff -r 090d769eb568 -r b949134e01ac data/gui/vcard_information_window.ui --- a/data/gui/vcard_information_window.ui Tue Jun 26 00:25:19 2012 +0400 +++ b/data/gui/vcard_information_window.ui Thu Jun 28 12:38:43 2012 +0400 @@ -29,6 +29,7 @@ <child> <object class="GtkNotebook" id="information_notebook"> <property name="visible">True</property> + <signal name="switch_page" handler="on_information_notebook_switch_page"/> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> @@ -56,7 +57,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -71,7 +72,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -86,7 +87,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -101,7 +102,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -116,13 +117,12 @@ <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="jid_label"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="xpad">5</property> @@ -132,7 +132,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -156,7 +156,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -175,7 +175,7 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -195,7 +195,7 @@ <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -235,7 +235,7 @@ <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -254,7 +254,7 @@ <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -366,7 +366,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -386,7 +386,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -399,7 +399,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -414,7 +414,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -480,7 +480,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -496,7 +496,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -514,7 +514,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -532,7 +532,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -550,7 +550,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -563,7 +563,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -578,7 +578,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -593,7 +593,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -608,7 +608,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -625,7 +625,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -650,7 +650,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -678,7 +678,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -694,7 +694,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -712,7 +712,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -730,7 +730,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -748,7 +748,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -766,7 +766,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property>

1 0

gajim: Select root iter in the AccountsWindow treeview.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 090d769eb568 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=090d769eb568 description: Select root iter in the AccountsWindow treeview. diffstat: src/config.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (30 lines): diff -r 0e2cb8d5ec7d -r 090d769eb568 src/config.py --- a/src/config.py Mon Jun 25 23:49:20 2012 +0400 +++ b/src/config.py Tue Jun 26 00:25:19 2012 +0400 @@ -1559,7 +1559,6 @@ self.update_proxy_list() self.xml.connect_signals(self) self.init_accounts() - self.xml.get_object('close_button').grab_focus() self.window.show_all() # Merge accounts @@ -1576,6 +1575,8 @@ except ImportError: self.avahi_available = False + self.xml.get_object('close_button').grab_focus() + def on_accounts_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: self.check_resend_relog() @@ -1604,6 +1605,9 @@ iter_ = model.append() model.set(iter_, 0, account) + self.selection = self.accounts_treeview.get_selection() + self.selection.select_iter(model.get_iter_root()) + def resend(self, account): if not account in gajim.connections: return

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits