diff options
Diffstat (limited to 'src/config.py')
| -rw-r--r-- | src/config.py | 598 |
1 files changed, 299 insertions, 299 deletions
diff --git a/src/config.py b/src/config.py index c908a9551..b5f39019f 100644 --- a/src/config.py +++ b/src/config.py @@ -88,69 +88,69 @@ class PreferencesWindow: """ Initialize Preferences window """ - self.xml = gtkgui_helpers.get_glade('preferences_window.glade') - self.window = self.xml.get_widget('preferences_window') + self.xml = gtkgui_helpers.get_gtk_builder('preferences_window.ui') + self.window = self.xml.get_object('preferences_window') self.window.set_transient_for(gajim.interface.roster.window) - self.notebook = self.xml.get_widget('preferences_notebook') + self.notebook = self.xml.get_object('preferences_notebook') self.one_window_type_combobox =\ - self.xml.get_widget('one_window_type_combobox') - self.iconset_combobox = self.xml.get_widget('iconset_combobox') - self.notify_on_signin_checkbutton = self.xml.get_widget( + self.xml.get_object('one_window_type_combobox') + self.iconset_combobox = self.xml.get_object('iconset_combobox') + self.notify_on_signin_checkbutton = self.xml.get_object( 'notify_on_signin_checkbutton') - self.notify_on_signout_checkbutton = self.xml.get_widget( + self.notify_on_signout_checkbutton = self.xml.get_object( 'notify_on_signout_checkbutton') - self.auto_popup_away_checkbutton = self.xml.get_widget( + self.auto_popup_away_checkbutton = self.xml.get_object( 'auto_popup_away_checkbutton') - self.sound_dnd_checkbutton = self.xml.get_widget('sound_dnd_checkbutton') - self.auto_away_checkbutton = self.xml.get_widget('auto_away_checkbutton') - self.auto_away_time_spinbutton = self.xml.get_widget( + self.sound_dnd_checkbutton = self.xml.get_object('sound_dnd_checkbutton') + self.auto_away_checkbutton = self.xml.get_object('auto_away_checkbutton') + self.auto_away_time_spinbutton = self.xml.get_object( 'auto_away_time_spinbutton') - self.auto_away_message_entry = self.xml.get_widget( + self.auto_away_message_entry = self.xml.get_object( 'auto_away_message_entry') - self.auto_xa_checkbutton = self.xml.get_widget('auto_xa_checkbutton') - self.auto_xa_time_spinbutton = self.xml.get_widget( + self.auto_xa_checkbutton = self.xml.get_object('auto_xa_checkbutton') + self.auto_xa_time_spinbutton = self.xml.get_object( 'auto_xa_time_spinbutton') - self.auto_xa_message_entry = self.xml.get_widget('auto_xa_message_entry') + self.auto_xa_message_entry = self.xml.get_object('auto_xa_message_entry') ### General tab ### # Display avatars in roster st = gajim.config.get('show_avatars_in_roster') - self.xml.get_widget('show_avatars_in_roster_checkbutton'). \ + self.xml.get_object('show_avatars_in_roster_checkbutton'). \ set_active(st) # Display status msg under contact name in roster st = gajim.config.get('show_status_msgs_in_roster') - self.xml.get_widget('show_status_msgs_in_roster_checkbutton'). \ + self.xml.get_object('show_status_msgs_in_roster_checkbutton'). \ set_active( st) # Display mood in roster st = gajim.config.get('show_mood_in_roster') - self.xml.get_widget('show_mood_in_roster_checkbutton'). \ + self.xml.get_object('show_mood_in_roster_checkbutton'). \ set_active(st) # Display activity in roster st = gajim.config.get('show_activity_in_roster') - self.xml.get_widget('show_activity_in_roster_checkbutton'). \ + self.xml.get_object('show_activity_in_roster_checkbutton'). \ set_active(st) # Display tunes in roster st = gajim.config.get('show_tunes_in_roster') - self.xml.get_widget('show_tunes_in_roster_checkbutton'). \ + self.xml.get_object('show_tunes_in_roster_checkbutton'). \ set_active(st) # Display location in roster st = gajim.config.get('show_location_in_roster') - self.xml.get_widget('show_location_in_roster_checkbutton'). \ + self.xml.get_object('show_location_in_roster_checkbutton'). \ set_active(st) # Sort contacts by show st = gajim.config.get('sort_by_show_in_roster') - self.xml.get_widget('sort_by_show_in_roster_checkbutton').set_active(st) + self.xml.get_object('sort_by_show_in_roster_checkbutton').set_active(st) st = gajim.config.get('sort_by_show_in_muc') - self.xml.get_widget('sort_by_show_in_muc_checkbutton').set_active(st) + self.xml.get_object('sort_by_show_in_muc_checkbutton').set_active(st) # emoticons - emoticons_combobox = self.xml.get_widget('emoticons_combobox') + emoticons_combobox = self.xml.get_object('emoticons_combobox') emoticons_list = os.listdir(os.path.join(gajim.DATA_DIR, 'emoticons')) # user themes if os.path.isdir(gajim.MY_EMOTS_PATH): @@ -185,22 +185,22 @@ class PreferencesWindow: # Compact View st = gajim.config.get('compact_view') - self.xml.get_widget('compact_view_checkbutton').set_active(st) + self.xml.get_object('compact_view_checkbutton').set_active(st) # Ignore XHTML st = gajim.config.get('ignore_incoming_xhtml') - self.xml.get_widget('xhtml_checkbutton').set_active(st) + self.xml.get_object('xhtml_checkbutton').set_active(st) # use speller if HAS_GTK_SPELL: st = gajim.config.get('use_speller') - self.xml.get_widget('speller_checkbutton').set_active(st) + self.xml.get_object('speller_checkbutton').set_active(st) else: - self.xml.get_widget('speller_checkbutton').set_sensitive(False) + self.xml.get_object('speller_checkbutton').set_sensitive(False) ### Style tab ### # Themes - theme_combobox = self.xml.get_widget('theme_combobox') + theme_combobox = self.xml.get_object('theme_combobox') cell = gtk.CellRendererText() theme_combobox.pack_start(cell, True) theme_combobox.add_attribute(cell, 'text', 0) @@ -245,7 +245,7 @@ class PreferencesWindow: # Use transports iconsets st = gajim.config.get('use_transports_iconsets') - self.xml.get_widget('transports_iconsets_checkbutton').set_active(st) + self.xml.get_object('transports_iconsets_checkbutton').set_active(st) # Color widgets self.draw_color_widgets() @@ -253,17 +253,17 @@ class PreferencesWindow: # Font for messages font = gajim.config.get('conversation_font') # try to set default font for the current desktop env - fontbutton = self.xml.get_widget('conversation_fontbutton') + fontbutton = self.xml.get_object('conversation_fontbutton') if font == '': fontbutton.set_sensitive(False) - self.xml.get_widget('default_chat_font').set_active(True) + self.xml.get_object('default_chat_font').set_active(True) else: fontbutton.set_font_name(font) ### Personal Events tab ### # outgoing send chat state notifications st = gajim.config.get('outgoing_chat_state_notifications') - combo = self.xml.get_widget('outgoing_chat_states_combobox') + combo = self.xml.get_object('outgoing_chat_states_combobox') if st == 'all': combo.set_active(0) elif st == 'composing_only': @@ -273,7 +273,7 @@ class PreferencesWindow: # displayed send chat state notifications st = gajim.config.get('displayed_chat_state_notifications') - combo = self.xml.get_widget('displayed_chat_states_combobox') + combo = self.xml.get_object('displayed_chat_states_combobox') if st == 'all': combo.set_active(0) elif st == 'composing_only': @@ -284,7 +284,7 @@ class PreferencesWindow: ### Notifications tab ### # On new event - on_event_combobox = self.xml.get_widget('on_event_combobox') + on_event_combobox = self.xml.get_object('on_event_combobox') if gajim.config.get('autopopup'): on_event_combobox.set_active(0) elif gajim.config.get('notify_on_new_message'): @@ -309,7 +309,7 @@ class PreferencesWindow: self.sound_dnd_checkbutton.set_active(st) # Systray - systray_combobox = self.xml.get_widget('systray_combobox') + systray_combobox = self.xml.get_object('systray_combobox') if gajim.config.get('trayicon') == 'never': systray_combobox.set_active(0) elif gajim.config.get('trayicon') == 'on_event': @@ -319,15 +319,15 @@ class PreferencesWindow: # sounds if gajim.config.get('sounds_on'): - self.xml.get_widget('play_sounds_checkbutton').set_active(True) + self.xml.get_object('play_sounds_checkbutton').set_active(True) else: - self.xml.get_widget('manage_sounds_button').set_sensitive(False) + self.xml.get_object('manage_sounds_button').set_sensitive(False) # Notify user of new gmail e-mail messages, # make checkbox sensitive if user has a gtalk account - frame_gmail = self.xml.get_widget('frame_gmail') - notify_gmail_checkbutton = self.xml.get_widget('notify_gmail_checkbutton') - notify_gmail_extra_checkbutton = self.xml.get_widget( + frame_gmail = self.xml.get_object('frame_gmail') + notify_gmail_checkbutton = self.xml.get_object('notify_gmail_checkbutton') + notify_gmail_extra_checkbutton = self.xml.get_object( 'notify_gmail_extra_checkbutton') for account in gajim.config.get_per('accounts'): @@ -371,18 +371,18 @@ class PreferencesWindow: from common import sleepy if not sleepy.SUPPORTED: - self.xml.get_widget('autoaway_table').set_sensitive(False) + self.xml.get_object('autoaway_table').set_sensitive(False) # ask_status when online / offline st = gajim.config.get('ask_online_status') - self.xml.get_widget('prompt_online_status_message_checkbutton').\ + self.xml.get_object('prompt_online_status_message_checkbutton').\ set_active(st) st = gajim.config.get('ask_offline_status') - self.xml.get_widget('prompt_offline_status_message_checkbutton').\ + self.xml.get_object('prompt_offline_status_message_checkbutton').\ set_active(st) # Default Status messages - self.default_msg_tree = self.xml.get_widget('default_msg_treeview') + self.default_msg_tree = self.xml.get_object('default_msg_treeview') col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].\ to_string() # (status, translated_status, message, enabled) @@ -414,7 +414,7 @@ class PreferencesWindow: self.fill_default_msg_treeview() # Status messages - self.msg_tree = self.xml.get_widget('msg_treeview') + self.msg_tree = self.xml.get_object('msg_treeview') model = gtk.ListStore(str, str) self.msg_tree.set_model(model) col = gtk.TreeViewColumn('name') @@ -425,12 +425,12 @@ class PreferencesWindow: renderer.connect('edited', self.on_msg_cell_edited) renderer.set_property('editable', True) self.fill_msg_treeview() - buf = self.xml.get_widget('msg_textview').get_buffer() + buf = self.xml.get_object('msg_textview').get_buffer() buf.connect('changed', self.on_msg_textview_changed) ### Audio / Video tab ### def create_av_combobox(opt_name, device_dict): - combobox = self.xml.get_widget(opt_name + '_combobox') + combobox = self.xml.get_object(opt_name + '_combobox') cell = gtk.CellRendererText() combobox.pack_start(cell, True) combobox.add_attribute(cell, 'text', 0) @@ -450,15 +450,15 @@ class PreferencesWindow: else: for opt_name in ('audio_input', 'audio_output', 'video_input', 'video_output'): - combobox = self.xml.get_widget(opt_name + '_combobox') + combobox = self.xml.get_object(opt_name + '_combobox') combobox.set_sensitive(False) # STUN - cb = self.xml.get_widget('stun_checkbutton') + cb = self.xml.get_object('stun_checkbutton') st = gajim.config.get('use_stun_server') cb.set_active(st) - entry = self.xml.get_widget('stun_server_entry') + entry = self.xml.get_object('stun_server_entry') entry.set_text(gajim.config.get('stun_server')) if not st: entry.set_sensitive(False) @@ -466,14 +466,14 @@ class PreferencesWindow: ### Advanced tab ### # open links with if os.name == 'nt': - applications_frame = self.xml.get_widget('applications_frame') + applications_frame = self.xml.get_object('applications_frame') applications_frame.set_no_show_all(True) applications_frame.hide() else: - self.applications_combobox = self.xml.get_widget( + self.applications_combobox = self.xml.get_object( 'applications_combobox') - self.xml.get_widget('custom_apps_frame').hide() - self.xml.get_widget('custom_apps_frame').set_no_show_all(True) + self.xml.get_object('custom_apps_frame').hide() + self.xml.get_object('custom_apps_frame').set_no_show_all(True) if gajim.config.get('autodetect_browser_mailer'): self.applications_combobox.set_active(0) @@ -487,21 +487,21 @@ class PreferencesWindow: self.applications_combobox.set_active(3) elif gajim.config.get('openwith') == 'custom': self.applications_combobox.set_active(4) - self.xml.get_widget('custom_apps_frame').show() + self.xml.get_object('custom_apps_frame').show() - self.xml.get_widget('custom_browser_entry').set_text( + self.xml.get_object('custom_browser_entry').set_text( gajim.config.get('custombrowser')) - self.xml.get_widget('custom_mail_client_entry').set_text( + self.xml.get_object('custom_mail_client_entry').set_text( gajim.config.get('custommailapp')) - self.xml.get_widget('custom_file_manager_entry').set_text( + self.xml.get_object('custom_file_manager_entry').set_text( gajim.config.get('custom_file_manager')) # log status changes of contacts st = gajim.config.get('log_contact_status_changes') - self.xml.get_widget('log_show_changes_checkbutton').set_active(st) + self.xml.get_object('log_show_changes_checkbutton').set_active(st) # log encrypted chat sessions - w = self.xml.get_widget('log_encrypted_chats_checkbutton') + w = self.xml.get_object('log_encrypted_chats_checkbutton') st = self.get_per_account_option('log_encrypted_sessions') if st == 'mixed': w.set_inconsistent(True) @@ -509,7 +509,7 @@ class PreferencesWindow: w.set_active(st) # send os info - w = self.xml.get_widget('send_os_info_checkbutton') + w = self.xml.get_object('send_os_info_checkbutton') st = self.get_per_account_option('send_os_info') if st == 'mixed': w.set_inconsistent(True) @@ -517,7 +517,7 @@ class PreferencesWindow: w.set_active(st) # send idle time - w = self.xml.get_widget('send_idle_time_checkbutton') + w = self.xml.get_object('send_idle_time_checkbutton') st = self.get_per_account_option('send_idle_time') if st == 'mixed': w.set_inconsistent(True) @@ -526,17 +526,17 @@ class PreferencesWindow: # check if gajm is default st = gajim.config.get('check_if_gajim_is_default') - self.xml.get_widget('check_default_client_checkbutton').set_active(st) + self.xml.get_object('check_default_client_checkbutton').set_active(st) # Ignore messages from unknown contacts - w = self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton') + w = self.xml.get_object('ignore_events_from_unknown_contacts_checkbutton') st = self.get_per_account_option('ignore_unknown_contacts') if st == 'mixed': w.set_inconsistent(True) else: w.set_active(st) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.msg_tree.get_model().connect('row-changed', self.on_msg_treemodel_row_changed) @@ -743,7 +743,7 @@ class PreferencesWindow: gajim.interface.save_config() def update_theme_list(self): - theme_combobox = self.xml.get_widget('theme_combobox') + theme_combobox = self.xml.get_object('theme_combobox') model = gtk.ListStore(str) theme_combobox.set_model(model) i = 0 @@ -847,7 +847,7 @@ class PreferencesWindow: def on_play_sounds_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sounds_on', - [self.xml.get_widget('manage_sounds_button')]) + [self.xml.get_object('manage_sounds_button')]) def on_manage_sounds_button_clicked(self, widget): if self.sounds_preferences is None: @@ -907,7 +907,7 @@ class PreferencesWindow: self.on_preference_widget_font_set(widget, 'conversation_font') def on_default_chat_font_toggled(self, widget): - font_widget = self.xml.get_widget('conversation_fontbutton') + font_widget = self.xml.get_object('conversation_fontbutton') if widget.get_active(): font_widget.set_sensitive(False) font_widget = None @@ -928,21 +928,21 @@ class PreferencesWindow: col = gajim.config.get(c) if col: if isinstance(col_to_widget[c], list): - self.xml.get_widget(col_to_widget[c][0]).set_color( + self.xml.get_object(col_to_widget[c][0]).set_color( gtk.gdk.color_parse(col)) - self.xml.get_widget(col_to_widget[c][0]).set_sensitive(True) - self.xml.get_widget(col_to_widget[c][1]).set_active(True) + self.xml.get_object(col_to_widget[c][0]).set_sensitive(True) + self.xml.get_object(col_to_widget[c][1]).set_active(True) else: - self.xml.get_widget(col_to_widget[c]).set_color( + self.xml.get_object(col_to_widget[c]).set_color( gtk.gdk.color_parse(col)) else: if isinstance(col_to_widget[c], list): - self.xml.get_widget(col_to_widget[c][0]).set_color( + self.xml.get_object(col_to_widget[c][0]).set_color( gtk.gdk.color_parse('#000000')) - self.xml.get_widget(col_to_widget[c][0]).set_sensitive(False) - self.xml.get_widget(col_to_widget[c][1]).set_active(False) + self.xml.get_object(col_to_widget[c][0]).set_sensitive(False) + self.xml.get_object(col_to_widget[c][1]).set_active(False) else: - self.xml.get_widget(col_to_widget[c]).set_color( + self.xml.get_object(col_to_widget[c]).set_color( gtk.gdk.color_parse('#000000')) def on_reset_colors_button_clicked(self, widget): @@ -964,7 +964,7 @@ class PreferencesWindow: Set color value in prefs and update the UI """ if state: - color = self.xml.get_widget(widget_name).get_color() + color = self.xml.get_object(widget_name).get_color() color_string = gtkgui_helpers.make_color_string(color) else: color_string = '' @@ -973,12 +973,12 @@ class PreferencesWindow: def on_incoming_msg_checkbutton_toggled(self, widget): state = widget.get_active() - self.xml.get_widget('incoming_msg_colorbutton').set_sensitive(state) + self.xml.get_object('incoming_msg_colorbutton').set_sensitive(state) self._set_color(state, 'incoming_msg_colorbutton', 'inmsgtxtcolor') def on_outgoing_msg_checkbutton_toggled(self, widget): state = widget.get_active() - self.xml.get_widget('outgoing_msg_colorbutton').set_sensitive(state) + self.xml.get_object('outgoing_msg_colorbutton').set_sensitive(state) self._set_color(state, 'outgoing_msg_colorbutton', 'outmsgtxtcolor') def on_auto_away_checkbutton_toggled(self, widget): @@ -1048,8 +1048,8 @@ class PreferencesWindow: gajim.config.set_per('defaultstatusmsg', status, 'message', message) def on_default_status_expander_activate(self, expander): - eventbox = self.xml.get_widget('default_status_eventbox') - vbox = self.xml.get_widget('status_vbox') + eventbox = self.xml.get_object('default_status_eventbox') + vbox = self.xml.get_object('status_vbox') vbox.set_child_packing(eventbox, not expander.get_expanded(), True, 0, gtk.PACK_START) @@ -1094,7 +1094,7 @@ class PreferencesWindow: def on_stun_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'use_stun_server', - [self.xml.get_widget('stun_server_entry')]) + [self.xml.get_object('stun_server_entry')]) def stun_server_entry_changed(self, widget): gajim.config.set('stun_server', widget.get_text().decode('utf-8')) @@ -1102,7 +1102,7 @@ class PreferencesWindow: def on_applications_combobox_changed(self, widget): gajim.config.set('autodetect_browser_mailer', False) if widget.get_active() == 4: - self.xml.get_widget('custom_apps_frame').show() + self.xml.get_object('custom_apps_frame').show() gajim.config.set('openwith', 'custom') else: if widget.get_active() == 0: @@ -1113,7 +1113,7 @@ class PreferencesWindow: gajim.config.set('openwith', 'kfmclient exec') elif widget.get_active() == 3: gajim.config.set('openwith', 'exo-open') - self.xml.get_widget('custom_apps_frame').hide() + self.xml.get_object('custom_apps_frame').hide() gajim.interface.save_config() def on_custom_browser_entry_changed(self, widget): @@ -1153,7 +1153,7 @@ class PreferencesWindow: self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email_extra') def fill_msg_treeview(self): - self.xml.get_widget('delete_msg_button').set_sensitive(False) + self.xml.get_object('delete_msg_button').set_sensitive(False) model = self.msg_tree.get_model() model.clear() preset_status = [] @@ -1177,8 +1177,8 @@ class PreferencesWindow: (model, iter_) = self.msg_tree.get_selection().get_selected() if not iter_: return - self.xml.get_widget('delete_msg_button').set_sensitive(True) - buf = self.xml.get_widget('msg_textview').get_buffer() + self.xml.get_object('delete_msg_button').set_sensitive(True) + buf = self.xml.get_object('msg_textview').get_buffer() msg = model[iter_][1] buf.set_text(msg) @@ -1192,16 +1192,16 @@ class PreferencesWindow: (model, iter_) = self.msg_tree.get_selection().get_selected() if not iter_: return - buf = self.xml.get_widget('msg_textview').get_buffer() + buf = self.xml.get_object('msg_textview').get_buffer() model.remove(iter_) buf.set_text('') - self.xml.get_widget('delete_msg_button').set_sensitive(False) + self.xml.get_object('delete_msg_button').set_sensitive(False) def on_msg_textview_changed(self, widget, data = None): (model, iter_) = self.msg_tree.get_selection().get_selected() if not iter_: return - buf = self.xml.get_widget('msg_textview').get_buffer() + buf = self.xml.get_object('msg_textview').get_buffer() first_iter, end_iter = buf.get_bounds() model.set_value(iter_, 1, buf.get_text(first_iter, end_iter)) @@ -1219,32 +1219,32 @@ class PreferencesWindow: #---------- ManageProxiesWindow class -------------# class ManageProxiesWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade('manage_proxies_window.glade') - self.window = self.xml.get_widget('manage_proxies_window') + self.xml = gtkgui_helpers.get_gtk_builder('manage_proxies_window.ui') + self.window = self.xml.get_object('manage_proxies_window') self.window.set_transient_for(gajim.interface.roster.window) - self.proxies_treeview = self.xml.get_widget('proxies_treeview') - self.proxyname_entry = self.xml.get_widget('proxyname_entry') - self.proxytype_combobox = self.xml.get_widget('proxytype_combobox') + self.proxies_treeview = self.xml.get_object('proxies_treeview') + self.proxyname_entry = self.xml.get_object('proxyname_entry') + self.proxytype_combobox = self.xml.get_object('proxytype_combobox') self.init_list() self.block_signal = False - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() # hide the BOSH fields by default self.show_bosh_fields() def show_bosh_fields(self, show=True): if show: - self.xml.get_widget('boshuri_entry').show() - self.xml.get_widget('boshuri_label').show() - self.xml.get_widget('boshuseproxy_checkbutton').show() + self.xml.get_object('boshuri_entry').show() + self.xml.get_object('boshuri_label').show() + self.xml.get_object('boshuseproxy_checkbutton').show() else: - cb = self.xml.get_widget('boshuseproxy_checkbutton') + cb = self.xml.get_object('boshuseproxy_checkbutton') cb.hide() cb.set_active(True) self.on_boshuseproxy_checkbutton_toggled(cb) - self.xml.get_widget('boshuri_entry').hide() - self.xml.get_widget('boshuri_label').hide() + self.xml.get_object('boshuri_entry').hide() + self.xml.get_object('boshuri_label').hide() def fill_proxies_treeview(self): @@ -1257,9 +1257,9 @@ class ManageProxiesWindow: model.set(iter_, 0, p) def init_list(self): - self.xml.get_widget('remove_proxy_button').set_sensitive(False) + self.xml.get_object('remove_proxy_button').set_sensitive(False) self.proxytype_combobox.set_sensitive(False) - self.xml.get_widget('proxy_table').set_sensitive(False) + self.xml.get_object('proxy_table').set_sensitive(False) model = gtk.ListStore(str) self.proxies_treeview.set_model(model) col = gtk.TreeViewColumn('Proxies') @@ -1268,7 +1268,7 @@ class ManageProxiesWindow: col.pack_start(renderer, True) col.set_attributes(renderer, text = 0) self.fill_proxies_treeview() - self.xml.get_widget('proxytype_combobox').set_active(0) + self.xml.get_object('proxytype_combobox').set_active(0) def on_manage_proxies_window_destroy(self, widget): if 'accounts' in gajim.interface.instances: @@ -1294,7 +1294,7 @@ class ManageProxiesWindow: proxy = model[iter_][0].decode('utf-8') model.remove(iter_) gajim.config.del_per('proxies', proxy) - self.xml.get_widget('remove_proxy_button').set_sensitive(False) + self.xml.get_object('remove_proxy_button').set_sensitive(False) self.block_signal = True self.on_proxies_treeview_cursor_changed(self.proxies_treeview) self.block_signal = False @@ -1308,8 +1308,8 @@ class ManageProxiesWindow: act = widget.get_active() proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'useauth', act) - self.xml.get_widget('proxyuser_entry').set_sensitive(act) - self.xml.get_widget('proxypass_entry').set_sensitive(act) + self.xml.get_object('proxyuser_entry').set_sensitive(act) + self.xml.get_object('proxypass_entry').set_sensitive(act) def on_boshuseproxy_checkbutton_toggled(self, widget): if self.block_signal: @@ -1317,19 +1317,19 @@ class ManageProxiesWindow: act = widget.get_active() proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'bosh_useproxy', act) - self.xml.get_widget('proxyhost_entry').set_sensitive(act) - self.xml.get_widget('proxyport_entry').set_sensitive(act) + self.xml.get_object('proxyhost_entry').set_sensitive(act) + self.xml.get_object('proxyport_entry').set_sensitive(act) def on_proxies_treeview_cursor_changed(self, widget): #FIXME: check if off proxy settings are correct (see # http://trac.gajim.org/changeset/1921#file2 line 1221 - proxyhost_entry = self.xml.get_widget('proxyhost_entry') - proxyport_entry = self.xml.get_widget('proxyport_entry') - proxyuser_entry = self.xml.get_widget('proxyuser_entry') - proxypass_entry = self.xml.get_widget('proxypass_entry') - boshuri_entry = self.xml.get_widget('boshuri_entry') - useauth_checkbutton = self.xml.get_widget('useauth_checkbutton') - boshuseproxy_checkbutton = self.xml.get_widget('boshuseproxy_checkbutton') + proxyhost_entry = self.xml.get_object('proxyhost_entry') + proxyport_entry = self.xml.get_object('proxyport_entry') + proxyuser_entry = self.xml.get_object('proxyuser_entry') + proxypass_entry = self.xml.get_object('proxypass_entry') + boshuri_entry = self.xml.get_object('boshuri_entry') + useauth_checkbutton = self.xml.get_object('useauth_checkbutton') + boshuseproxy_checkbutton = self.xml.get_object('boshuseproxy_checkbutton') self.block_signal = True proxyhost_entry.set_text('') proxyport_entry.set_text('') @@ -1345,30 +1345,30 @@ class ManageProxiesWindow: (model, iter_) = widget.get_selection().get_selected() if not iter_: - self.xml.get_widget('proxyname_entry').set_text('') - self.xml.get_widget('proxytype_combobox').set_sensitive(False) - self.xml.get_widget('proxy_table').set_sensitive(False) + self.xml.get_object('proxyname_entry').set_text('') + self.xml.get_object('proxytype_combobox').set_sensitive(False) + self.xml.get_object('proxy_table').set_sensitive(False) self.block_signal = False return proxy = model[iter_][0] - self.xml.get_widget('proxyname_entry').set_text(proxy) + self.xml.get_object('proxyname_entry').set_text(proxy) if proxy == _('None'): # special proxy None self.show_bosh_fields(False) self.proxyname_entry.set_editable(False) - self.xml.get_widget('remove_proxy_button').set_sensitive(False) - self.xml.get_widget('proxytype_combobox').set_sensitive(False) - self.xml.get_widget('proxy_table').set_sensitive(False) + self.xml.get_object('remove_proxy_button').set_sensitive(False) + self.xml.get_object('proxytype_combobox').set_sensitive(False) + self.xml.get_object('proxy_table').set_sensitive(False) else: proxytype = gajim.config.get_per('proxies', proxy, 'type') self.show_bosh_fields(proxytype=='bosh') self.proxyname_entry.set_editable(True) - self.xml.get_widget('remove_proxy_button').set_sensitive(True) - self.xml.get_widget('proxytype_combobox').set_sensitive(True) - self.xml.get_widget('proxy_table').set_sensitive(True) + self.xml.get_object('remove_proxy_button').set_sensitive(True) + self.xml.get_object('proxytype_combobox').set_sensitive(True) + self.xml.get_object('proxy_table').set_sensitive(True) proxyhost_entry.set_text(gajim.config.get_per('proxies', proxy, 'host')) proxyport_entry.set_text(unicode(gajim.config.get_per('proxies', @@ -1470,16 +1470,16 @@ class AccountsWindow: self.window.destroy() def __init__(self): - self.xml = gtkgui_helpers.get_glade('accounts_window.glade') - self.window = self.xml.get_widget('accounts_window') + self.xml = gtkgui_helpers.get_gtk_builder('accounts_window.ui') + self.window = self.xml.get_object('accounts_window') self.window.set_transient_for(gajim.interface.roster.window) - self.accounts_treeview = self.xml.get_widget('accounts_treeview') - self.remove_button = self.xml.get_widget('remove_button') - self.rename_button = self.xml.get_widget('rename_button') + self.accounts_treeview = self.xml.get_object('accounts_treeview') + self.remove_button = self.xml.get_object('remove_button') + self.rename_button = self.xml.get_object('rename_button') path_to_kbd_input_img = gtkgui_helpers.get_icon_path('gajim-kbd_input') - img = self.xml.get_widget('rename_image') + img = self.xml.get_object('rename_image') img.set_from_file(path_to_kbd_input_img) - self.notebook = self.xml.get_widget('notebook') + self.notebook = self.xml.get_object('notebook') # Name model = gtk.ListStore(str) self.accounts_treeview.set_model(model) @@ -1495,13 +1495,13 @@ class AccountsWindow: self.resend_presence = False self.update_proxy_list() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.init_accounts() self.window.show_all() # Merge accounts st = gajim.config.get('mergeaccounts') - checkbutton = self.xml.get_widget('merge_checkbutton') + checkbutton = self.xml.get_object('merge_checkbutton') checkbutton.set_active(st) # prevent roster redraws by connecting the signal after button state is set checkbutton.connect('toggled', self.on_merge_checkbutton_toggled) @@ -1643,7 +1643,7 @@ class AccountsWindow: if not our_proxy: our_proxy = _('None') - proxy_combobox = self.xml.get_widget('proxies_combobox1') + proxy_combobox = self.xml.get_object('proxies_combobox1') model = gtk.ListStore(str) proxy_combobox.set_model(model) l = gajim.config.get_per('proxies') @@ -1671,31 +1671,31 @@ class AccountsWindow: def init_zeroconf_account(self): active = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') - self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(active) + self.xml.get_object('enable_zeroconf_checkbutton2').set_active(active) if not gajim.HAVE_ZEROCONF: - self.xml.get_widget('enable_zeroconf_checkbutton2').set_sensitive( + self.xml.get_object('enable_zeroconf_checkbutton2').set_sensitive( False) - self.xml.get_widget('zeroconf_notebook').set_sensitive(active) + self.xml.get_object('zeroconf_notebook').set_sensitive(active) # General tab st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'autoconnect') - self.xml.get_widget('autoconnect_checkbutton2').set_active(st) + self.xml.get_object('autoconnect_checkbutton2').set_active(st) list_no_log_for = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() if gajim.ZEROCONF_ACC_NAME in list_no_log_for: - self.xml.get_widget('log_history_checkbutton2').set_active(0) + self.xml.get_object('log_history_checkbutton2').set_active(0) else: - self.xml.get_widget('log_history_checkbutton2').set_active(1) + self.xml.get_object('log_history_checkbutton2').set_active(1) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'sync_with_global_status') - self.xml.get_widget('sync_with_global_status_checkbutton2').set_active(st) + self.xml.get_object('sync_with_global_status_checkbutton2').set_active(st) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'use_custom_host') - self.xml.get_widget('custom_port_checkbutton2').set_active(st) - self.xml.get_widget('custom_port_entry2').set_sensitive(st) + self.xml.get_object('custom_port_checkbutton2').set_active(st) + self.xml.get_object('custom_port_entry2').set_sensitive(st) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port') @@ -1703,22 +1703,22 @@ class AccountsWindow: gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port', '5298') st = '5298' - self.xml.get_widget('custom_port_entry2').set_text(str(st)) + self.xml.get_object('custom_port_entry2').set_text(str(st)) # Personal tab - gpg_key_label = self.xml.get_widget('gpg_key_label2') + gpg_key_label = self.xml.get_object('gpg_key_label2') if gajim.ZEROCONF_ACC_NAME in gajim.connections and \ gajim.connections[gajim.ZEROCONF_ACC_NAME].gpg: - self.xml.get_widget('gpg_choose_button2').set_sensitive(True) + self.xml.get_object('gpg_choose_button2').set_sensitive(True) self.init_account_gpg() else: gpg_key_label.set_text(_('OpenPGP is not usable on this computer')) - self.xml.get_widget('gpg_choose_button2').set_sensitive(False) + self.xml.get_object('gpg_choose_button2').set_sensitive(False) for opt in ('first_name', 'last_name', 'jabber_id', 'email'): st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_' + opt) - self.xml.get_widget(opt + '_entry2').set_text(st) + self.xml.get_object(opt + '_entry2').set_text(st) def init_account_gpg(self): account = self.current_account @@ -1731,9 +1731,9 @@ class AccountsWindow: else: widget_name_add = '1' - gpg_key_label = self.xml.get_widget('gpg_key_label' + widget_name_add) - gpg_name_label = self.xml.get_widget('gpg_name_label' + widget_name_add) - use_gpg_agent_checkbutton = self.xml.get_widget( + gpg_key_label = self.xml.get_object('gpg_key_label' + widget_name_add) + gpg_name_label = self.xml.get_object('gpg_name_label' + widget_name_add) + use_gpg_agent_checkbutton = self.xml.get_object( 'use_gpg_agent_checkbutton' + widget_name_add) if not keyid: @@ -1751,26 +1751,26 @@ class AccountsWindow: account = self.current_account self.ignore_events = True active = gajim.config.get_per('accounts', account, 'active') - self.xml.get_widget('enable_checkbutton1').set_active(active) - self.xml.get_widget('normal_notebook1').set_sensitive(active) + self.xml.get_object('enable_checkbutton1').set_active(active) + self.xml.get_object('normal_notebook1').set_sensitive(active) if gajim.config.get_per('accounts', account, 'anonymous_auth'): - self.xml.get_widget('anonymous_checkbutton1').set_active(True) - self.xml.get_widget('jid_label1').set_text(_('Server:')) - save_password = self.xml.get_widget('save_password_checkbutton1') + self.xml.get_object('anonymous_checkbutton1').set_active(True) + self.xml.get_object('jid_label1').set_text(_('Server:')) + save_password = self.xml.get_object('save_password_checkbutton1') save_password.set_active(False) save_password.set_sensitive(False) - password_entry = self.xml.get_widget('password_entry1') + password_entry = self.xml.get_object('password_entry1') password_entry.set_text('') password_entry.set_sensitive(False) jid = gajim.config.get_per('accounts', account, 'hostname') else: - self.xml.get_widget('anonymous_checkbutton1').set_active(False) - self.xml.get_widget('jid_label1').set_text(_('Jabber ID:')) + self.xml.get_object('anonymous_checkbutton1').set_active(False) + self.xml.get_object('jid_label1').set_text(_('Jabber ID:')) savepass = gajim.config.get_per('accounts', account, 'savepass') - save_password = self.xml.get_widget('save_password_checkbutton1') + save_password = self.xml.get_object('save_password_checkbutton1') save_password.set_sensitive(True) save_password.set_active(savepass) - password_entry = self.xml.get_widget('password_entry1') + password_entry = self.xml.get_object('password_entry1') if savepass: passstr = passwords.get_password(account) or '' password_entry.set_sensitive(True) @@ -1781,19 +1781,19 @@ class AccountsWindow: jid = gajim.config.get_per('accounts', account, 'name') \ + '@' + gajim.config.get_per('accounts', account, 'hostname') - self.xml.get_widget('jid_entry1').set_text(jid) + self.xml.get_object('jid_entry1').set_text(jid) self.ignore_events = False def init_normal_account(self): account = self.current_account # Account tab self.draw_normal_jid() - self.xml.get_widget('resource_entry1').set_text(gajim.config.get_per( + self.xml.get_object('resource_entry1').set_text(gajim.config.get_per( 'accounts', account, 'resource')) - self.xml.get_widget('adjust_priority_with_status_checkbutton1').\ + self.xml.get_object('adjust_priority_with_status_checkbutton1').\ set_active(gajim.config.get_per('accounts', account, 'adjust_priority_with_status')) - spinbutton = self.xml.get_widget('priority_spinbutton1') + spinbutton = self.xml.get_object('priority_spinbutton1') if gajim.config.get('enable_negative_priority'): spinbutton.set_range(-128, 127) else: @@ -1804,58 +1804,58 @@ class AccountsWindow: # Connection tab use_env_http_proxy = gajim.config.get_per('accounts', account, 'use_env_http_proxy') - self.xml.get_widget('use_env_http_proxy_checkbutton1').set_active( + self.xml.get_object('use_env_http_proxy_checkbutton1').set_active( use_env_http_proxy) - self.xml.get_widget('proxy_hbox1').set_sensitive(not use_env_http_proxy) + self.xml.get_object('proxy_hbox1').set_sensitive(not use_env_http_proxy) warn_when_insecure_ssl = gajim.config.get_per('accounts', account, 'warn_when_insecure_ssl_connection') - self.xml.get_widget('warn_when_insecure_connection_checkbutton1').\ + self.xml.get_object('warn_when_insecure_connection_checkbutton1').\ set_active(warn_when_insecure_ssl) - self.xml.get_widget('send_keepalive_checkbutton1').set_active( + self.xml.get_object('send_keepalive_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'keep_alives_enabled')) use_custom_host = gajim.config.get_per('accounts', account, 'use_custom_host') - self.xml.get_widget('custom_host_port_checkbutton1').set_active( + self.xml.get_object('custom_host_port_checkbutton1').set_active( use_custom_host) custom_host = gajim.config.get_per('accounts', account, 'custom_host') if not custom_host: custom_host = gajim.config.get_per('accounts', account, 'hostname') gajim.config.set_per('accounts', account, 'custom_host', custom_host) - self.xml.get_widget('custom_host_entry1').set_text(custom_host) + self.xml.get_object('custom_host_entry1').set_text(custom_host) custom_port = gajim.config.get_per('accounts', account, 'custom_port') if not custom_port: custom_port = 5222 gajim.config.set_per('accounts', account, 'custom_port', custom_port) - self.xml.get_widget('custom_port_entry1').set_text(unicode(custom_port)) + self.xml.get_object('custom_port_entry1').set_text(unicode(custom_port)) # Personal tab - gpg_key_label = self.xml.get_widget('gpg_key_label1') + gpg_key_label = self.xml.get_object('gpg_key_label1') if gajim.HAVE_GPG: - self.xml.get_widget('gpg_choose_button1').set_sensitive(True) + self.xml.get_object('gpg_choose_button1').set_sensitive(True) self.init_account_gpg() else: gpg_key_label.set_text(_('OpenPGP is not usable on this computer')) - self.xml.get_widget('gpg_choose_button1').set_sensitive(False) + self.xml.get_object('gpg_choose_button1').set_sensitive(False) # General tab - self.xml.get_widget('autoconnect_checkbutton1').set_active(gajim.config.\ + self.xml.get_object('autoconnect_checkbutton1').set_active(gajim.config.\ get_per('accounts', account, 'autoconnect')) - self.xml.get_widget('autoreconnect_checkbutton1').set_active(gajim. + self.xml.get_object('autoreconnect_checkbutton1').set_active(gajim. config.get_per('accounts', account, 'autoreconnect')) list_no_log_for = gajim.config.get_per('accounts', account, 'no_log_for').split() if account in list_no_log_for: - self.xml.get_widget('log_history_checkbutton1').set_active(False) + self.xml.get_object('log_history_checkbutton1').set_active(False) else: - self.xml.get_widget('log_history_checkbutton1').set_active(True) + self.xml.get_object('log_history_checkbutton1').set_active(True) - self.xml.get_widget('sync_with_global_status_checkbutton1').set_active( + self.xml.get_object('sync_with_global_status_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'sync_with_global_status')) - self.xml.get_widget('use_ft_proxies_checkbutton1').set_active( + self.xml.get_object('use_ft_proxies_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'use_ft_proxies')) def on_add_button_clicked(self, widget): @@ -2082,7 +2082,7 @@ class AccountsWindow: if self.ignore_events: return active = widget.get_active() - password_entry = self.xml.get_widget('password_entry1') + password_entry = self.xml.get_object('password_entry1') password_entry.set_sensitive(active) gajim.config.set_per('accounts', self.current_account, 'savepass', active) if active: @@ -2094,7 +2094,7 @@ class AccountsWindow: def on_resource_entry1_focus_out_event(self, widget, event): if self.ignore_events: return - resource = self.xml.get_widget('resource_entry1').get_text().decode( + resource = self.xml.get_object('resource_entry1').get_text().decode( 'utf-8') try: resource = helpers.parse_resource(resource) @@ -2112,7 +2112,7 @@ class AccountsWindow: resource) def on_adjust_priority_with_status_checkbutton1_toggled(self, widget): - self.xml.get_widget('priority_spinbutton1').set_sensitive( + self.xml.get_object('priority_spinbutton1').set_sensitive( not widget.get_active()) self.on_checkbutton_toggled(widget, 'adjust_priority_with_status', account = self.current_account) @@ -2137,8 +2137,8 @@ class AccountsWindow: if new_password is not None: gajim.connections[self.current_account].change_password( new_password) - if self.xml.get_widget('save_password_checkbutton1').get_active(): - self.xml.get_widget('password_entry1').set_text(new_password) + if self.xml.get_object('save_password_checkbutton1').get_active(): + self.xml.get_object('password_entry1').set_text(new_password) try: dialogs.ChangePasswordDialog(self.current_account, on_changed) @@ -2189,7 +2189,7 @@ class AccountsWindow: return self.on_checkbutton_toggled(widget, 'use_env_http_proxy', account=self.current_account) - hbox = self.xml.get_widget('proxy_hbox1') + hbox = self.xml.get_object('proxy_hbox1') hbox.set_sensitive(not widget.get_active()) def on_proxies_combobox1_changed(self, widget): @@ -2231,7 +2231,7 @@ class AccountsWindow: self.on_checkbutton_toggled(widget, 'use_custom_host', account=self.current_account) active = widget.get_active() - self.xml.get_widget('custom_host_port_hbox1').set_sensitive(active) + self.xml.get_object('custom_host_port_hbox1').set_sensitive(active) def on_custom_host_entry1_changed(self, widget): if self.ignore_events: @@ -2283,9 +2283,9 @@ class AccountsWindow: wiget_name_ext = '2' else: wiget_name_ext = '1' - gpg_key_label = self.xml.get_widget('gpg_key_label' + wiget_name_ext) - gpg_name_label = self.xml.get_widget('gpg_name_label' + wiget_name_ext) - use_gpg_agent_checkbutton = self.xml.get_widget( + gpg_key_label = self.xml.get_object('gpg_key_label' + wiget_name_ext) + gpg_name_label = self.xml.get_object('gpg_name_label' + wiget_name_ext) + use_gpg_agent_checkbutton = self.xml.get_object( 'use_gpg_agent_checkbutton' + wiget_name_ext) if keyID[0] == _('None'): gpg_key_label.set_text(_('No key selected')) @@ -2390,11 +2390,11 @@ class AccountsWindow: gajim.connections[account] = connection_zeroconf.ConnectionZeroconf( account) if gajim.connections[account].gpg: - self.xml.get_widget('gpg_choose_button2').set_sensitive(True) + self.xml.get_object('gpg_choose_button2').set_sensitive(True) else: gajim.connections[account] = common.connection.Connection(account) if gajim.connections[account].gpg: - self.xml.get_widget('gpg_choose_button1').set_sensitive(True) + self.xml.get_object('gpg_choose_button1').set_sensitive(True) self.init_account_gpg() # update variables gajim.interface.instances[account] = {'infos': {}, @@ -2437,7 +2437,7 @@ class AccountsWindow: return if gajim.connections[self.current_account].connected > 0: self.ignore_events = True - self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(True) + self.xml.get_object('enable_zeroconf_checkbutton2').set_active(True) self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), @@ -2453,13 +2453,13 @@ class AccountsWindow: if gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') \ and not widget.get_active(): - self.xml.get_widget('zeroconf_notebook').set_sensitive(False) + self.xml.get_object('zeroconf_notebook').set_sensitive(False) # disable self._disable_account(gajim.ZEROCONF_ACC_NAME) elif not gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') and widget.get_active(): - self.xml.get_widget('zeroconf_notebook').set_sensitive(True) + self.xml.get_object('zeroconf_notebook').set_sensitive(True) # enable (will create new account if not present) self._enable_account(gajim.ZEROCONF_ACC_NAME) @@ -2473,7 +2473,7 @@ class AccountsWindow: gajim.connections[self.current_account].connected > 0: # connecting or connected self.ignore_events = True - self.xml.get_widget('enable_checkbutton1').set_active(True) + self.xml.get_object('enable_checkbutton1').set_active(True) self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), @@ -2488,15 +2488,15 @@ class AccountsWindow: self._disable_account(self.current_account) self.on_checkbutton_toggled(widget, 'active', account=self.current_account, change_sensitivity_widgets=[ - self.xml.get_widget('normal_notebook1')]) + self.xml.get_object('normal_notebook1')]) def on_custom_port_checkbutton2_toggled(self, widget): - self.xml.get_widget('custom_port_entry2').set_sensitive( + self.xml.get_object('custom_port_entry2').set_sensitive( widget.get_active()) self.on_checkbutton_toggled(widget, 'use_custom_host', account = self.current_account) if not widget.get_active(): - self.xml.get_widget('custom_port_entry2').set_text('5298') + self.xml.get_object('custom_port_entry2').set_text('5298') def on_first_name_entry2_changed(self, widget): if self.ignore_events: @@ -2592,15 +2592,15 @@ class ServiceRegistrationWindow: self.service = service self.account = account self.is_form = is_form - self.xml = gtkgui_helpers.get_glade('service_registration_window.glade') - self.window = self.xml.get_widget('service_registration_window') + self.xml = gtkgui_helpers.get_gtk_builder('service_registration_window.ui') + self.window = self.xml.get_object('service_registration_window') self.window.set_transient_for(gajim.interface.roster.window) if self.is_form: dataform = dataforms.ExtendForm(node = infos) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) if self.data_form_widget.title: self.window.set_title('%s - Gajim' % self.data_form_widget.title) - table = self.xml.get_widget('table') + table = self.xml.get_object('table') table.attach(self.data_form_widget, 0, 2, 0, 1) else: if 'registered' in infos: @@ -2608,10 +2608,10 @@ class ServiceRegistrationWindow: else: self.window.set_title(_('Register to %s') % service) self.data_form_widget = FakeDataForm(infos) - table = self.xml.get_widget('table') + table = self.xml.get_object('table') table.attach(self.data_form_widget, 0, 2, 0, 1) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_cancel_button_clicked(self, widget): @@ -2647,24 +2647,24 @@ class GroupchatConfigWindow: 'owner': _('Owner List'), 'admin':_('Administrator List')} - self.xml = gtkgui_helpers.get_glade('data_form_window.glade', 'data_form_window') - self.window = self.xml.get_widget('data_form_window') + self.xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', 'data_form_window') + self.window = self.xml.get_object('data_form_window') self.window.set_transient_for(gajim.interface.roster.window) if self.form: - config_vbox = self.xml.get_widget('config_vbox') + config_vbox = self.xml.get_object('config_vbox') dataform = dataforms.ExtendForm(node = self.form) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) # hide scrollbar of this data_form_widget, we already have in this # widget - sw = self.data_form_widget.xml.get_widget('single_form_scrolledwindow') + sw = self.data_form_widget.xml.get_object('single_form_scrolledwindow') sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER) self.data_form_widget.show() config_vbox.pack_start(self.data_form_widget) # Draw the edit affiliation list things - add_on_vbox = self.xml.get_widget('add_on_vbox') + add_on_vbox = self.xml.get_object('add_on_vbox') for affiliation in self.affiliation_labels.keys(): self.start_users_dict[affiliation] = {} @@ -2730,7 +2730,7 @@ class GroupchatConfigWindow: gajim.connections[self.account].get_affiliation_list(self.room_jid, affiliation) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_cancel_button_clicked(self, widget): @@ -2852,13 +2852,13 @@ class RemoveAccountWindow: def __init__(self, account): self.account = account - xml = gtkgui_helpers.get_glade('remove_account_window.glade') - self.window = xml.get_widget('remove_account_window') + xml = gtkgui_helpers.get_gtk_builder('remove_account_window.ui') + self.window = xml.get_object('remove_account_window') self.window.set_transient_for(gajim.interface.roster.window) - self.remove_and_unregister_radiobutton = xml.get_widget( + self.remove_and_unregister_radiobutton = xml.get_object( 'remove_and_unregister_radiobutton') self.window.set_title(_('Removing %s account') % self.account) - xml.signal_autoconnect(self) + xml.connect_signals(self) self.window.show_all() def on_remove_button_clicked(self, widget): @@ -2939,8 +2939,8 @@ class RemoveAccountWindow: #---------- ManageBookmarksWindow class -------------# class ManageBookmarksWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade('manage_bookmarks_window.glade') - self.window = self.xml.get_widget('manage_bookmarks_window') + self.xml = gtkgui_helpers.get_gtk_builder('manage_bookmarks_window.ui') + self.window = self.xml.get_object('manage_bookmarks_window') self.window.set_transient_for(gajim.interface.roster.window) # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Passowrd, Nick, @@ -2986,7 +2986,7 @@ class ManageBookmarksWindow: bookmark['nick'], print_status ]) - self.print_status_combobox = self.xml.get_widget('print_status_combobox') + self.print_status_combobox = self.xml.get_object('print_status_combobox') model = gtk.ListStore(str, str) self.option_list = {'': _('Default'), 'all': Q_('?print_status:All'), @@ -2999,7 +2999,7 @@ class ManageBookmarksWindow: self.print_status_combobox.set_model(model) self.print_status_combobox.set_active(1) - self.view = self.xml.get_widget('bookmarks_treeview') + self.view = self.xml.get_object('bookmarks_treeview') self.view.set_model(self.treestore) self.view.expand_all() @@ -3011,20 +3011,20 @@ class ManageBookmarksWindow: self.selection.connect('changed', self.bookmark_selected) #Prepare input fields - self.title_entry = self.xml.get_widget('title_entry') + self.title_entry = self.xml.get_object('title_entry') self.title_entry.connect('changed', self.on_title_entry_changed) - self.nick_entry = self.xml.get_widget('nick_entry') + self.nick_entry = self.xml.get_object('nick_entry') self.nick_entry.connect('changed', self.on_nick_entry_changed) - self.server_entry = self.xml.get_widget('server_entry') + self.server_entry = self.xml.get_object('server_entry') self.server_entry.connect('changed', self.on_server_entry_changed) - self.room_entry = self.xml.get_widget('room_entry') + self.room_entry = self.xml.get_object('room_entry') self.room_entry.connect('changed', self.on_room_entry_changed) - self.pass_entry = self.xml.get_widget('pass_entry') + self.pass_entry = self.xml.get_object('pass_entry') self.pass_entry.connect('changed', self.on_pass_entry_changed) - self.autojoin_checkbutton = self.xml.get_widget('autojoin_checkbutton') - self.minimize_checkbutton = self.xml.get_widget('minimize_checkbutton') + self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton') + self.minimize_checkbutton = self.xml.get_object('minimize_checkbutton') - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_bookmarks_treeview_button_press_event(self, widget, event): @@ -3282,20 +3282,20 @@ class ManageBookmarksWindow: class AccountCreationWizardWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade( - 'account_creation_wizard_window.glade') - self.window = self.xml.get_widget('account_creation_wizard_window') + self.xml = gtkgui_helpers.get_gtk_builder( + 'account_creation_wizard_window.ui') + self.window = self.xml.get_object('account_creation_wizard_window') self.window.set_transient_for(gajim.interface.roster.window) completion = gtk.EntryCompletion() # Connect events from comboboxentry.child - server_comboboxentry = self.xml.get_widget('server_comboboxentry') + server_comboboxentry = self.xml.get_object('server_comboboxentry') entry = server_comboboxentry.child entry.connect('key_press_event', self.on_server_comboboxentry_key_press_event, server_comboboxentry) entry.set_completion(completion) # Do the same for the other server comboboxentry - server_comboboxentry1 = self.xml.get_widget('server_comboboxentry1') + server_comboboxentry1 = self.xml.get_object('server_comboboxentry1') entry = server_comboboxentry1.child entry.connect('key_press_event', self.on_server_comboboxentry_key_press_event, server_comboboxentry1) @@ -3321,24 +3321,24 @@ class AccountCreationWizardWindow: server_comboboxentry1.set_text_column(0) # Generic widgets - self.notebook = self.xml.get_widget('notebook') - self.cancel_button = self.xml.get_widget('cancel_button') - self.back_button = self.xml.get_widget('back_button') - self.forward_button = self.xml.get_widget('forward_button') - self.finish_button = self.xml.get_widget('finish_button') - self.advanced_button = self.xml.get_widget('advanced_button') - self.finish_label = self.xml.get_widget('finish_label') - self.go_online_checkbutton = self.xml.get_widget( + self.notebook = self.xml.get_object('notebook') + self.cancel_button = self.xml.get_object('cancel_button') + self.back_button = self.xml.get_object('back_button') + self.forward_button = self.xml.get_object('forward_button') + self.finish_button = self.xml.get_object('finish_button') + self.advanced_button = self.xml.get_object('advanced_button') + self.finish_label = self.xml.get_object('finish_label') + self.go_online_checkbutton = self.xml.get_object( 'go_online_checkbutton') - self.show_vcard_checkbutton = self.xml.get_widget( + self.show_vcard_checkbutton = self.xml.get_object( 'show_vcard_checkbutton') - self.progressbar = self.xml.get_widget('progressbar') + self.progressbar = self.xml.get_object('progressbar') # some vars self.update_progressbar_timeout_id = None self.notebook.set_current_page(0) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() gajim.ged.register_event_handler('NEW_ACC_CONNECTED', ged.CORE, self.new_acc_connected) @@ -3370,7 +3370,7 @@ class AccountCreationWizardWindow: 'http://www.jabber.org/network/oldnetwork.shtml') def on_save_password_checkbutton_toggled(self, widget): - self.xml.get_widget('password_entry').grab_focus() + self.xml.get_object('password_entry').grab_focus() def on_cancel_button_clicked(self, widget): self.window.destroy() @@ -3381,13 +3381,13 @@ class AccountCreationWizardWindow: self.notebook.set_current_page(0) self.back_button.set_sensitive(False) elif cur_page == 3: - self.xml.get_widget('form_vbox').remove(self.data_form_widget) + self.xml.get_object('form_vbox').remove(self.data_form_widget) self.notebook.set_current_page(2) # show server page elif cur_page == 4: if self.account in gajim.connections: del gajim.connections[self.account] self.notebook.set_current_page(2) - self.xml.get_widget('form_vbox').remove(self.data_form_widget) + self.xml.get_object('form_vbox').remove(self.data_form_widget) elif cur_page == 6: # finish page self.forward_button.show() if self.modify: @@ -3397,9 +3397,9 @@ class AccountCreationWizardWindow: def on_anonymous_checkbutton1_toggled(self, widget): active = widget.get_active() - self.xml.get_widget('username_entry').set_sensitive(not active) - self.xml.get_widget('password_entry').set_sensitive(not active) - self.xml.get_widget('save_password_checkbutton').set_sensitive(not active) + self.xml.get_object('username_entry').set_sensitive(not active) + self.xml.get_object('password_entry').set_sensitive(not active) + self.xml.get_object('save_password_checkbutton').set_sensitive(not active) def show_finish_page(self): self.cancel_button.hide() @@ -3422,7 +3422,7 @@ class AccountCreationWizardWindow: self.finish_button.set_property('has-default', True) self.advanced_button.show() self.go_online_checkbutton.show() - img = self.xml.get_widget('finish_image') + img = self.xml.get_object('finish_image') if self.modify: img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG) else: @@ -3435,7 +3435,7 @@ class AccountCreationWizardWindow: cur_page = self.notebook.get_current_page() if cur_page == 0: - widget = self.xml.get_widget('use_existing_account_radiobutton') + widget = self.xml.get_object('use_existing_account_radiobutton') if widget.get_active(): self.modify = True self.notebook.set_current_page(1) @@ -3447,8 +3447,8 @@ class AccountCreationWizardWindow: elif cur_page == 1: # We are adding an existing account - anonymous = self.xml.get_widget('anonymous_checkbutton1').get_active() - username = self.xml.get_widget('username_entry').get_text().decode( + anonymous = self.xml.get_object('anonymous_checkbutton1').get_active() + username = self.xml.get_object('username_entry').get_text().decode( 'utf-8').strip() if not username and not anonymous: pritext = _('Invalid username') @@ -3456,11 +3456,11 @@ class AccountCreationWizardWindow: 'You must provide a username to configure this account.') dialogs.ErrorDialog(pritext, sectext) return - server = self.xml.get_widget('server_comboboxentry').child.get_text().\ + server = self.xml.get_object('server_comboboxentry').child.get_text().\ decode('utf-8').strip() - savepass = self.xml.get_widget('save_password_checkbutton').\ + savepass = self.xml.get_object('save_password_checkbutton').\ get_active() - password = self.xml.get_widget('password_entry').get_text().decode( + password = self.xml.get_object('password_entry').get_text().decode( 'utf-8') jid = username + '@' + server @@ -3479,14 +3479,14 @@ class AccountCreationWizardWindow: i += 1 username, server = gajim.get_name_and_server_from_jid(jid) - if self.xml.get_widget('anonymous_checkbutton1').get_active(): + if self.xml.get_object('anonymous_checkbutton1').get_active(): self.save_account('', server, False, '', anonymous=True) else: self.save_account(username, server, savepass, password) self.show_finish_page() elif cur_page == 2: # We are creating a new account - server = self.xml.get_widget('server_comboboxentry1').child.get_text()\ + server = self.xml.get_object('server_comboboxentry1').child.get_text()\ .decode('utf-8') if not server: @@ -3501,16 +3501,16 @@ class AccountCreationWizardWindow: config = self.get_config('', server, '', '') # Get advanced options - proxies_combobox = self.xml.get_widget('proxies_combobox') + proxies_combobox = self.xml.get_object('proxies_combobox') active = proxies_combobox.get_active() proxy = proxies_combobox.get_model()[active][0].decode('utf-8') if proxy == _('None'): proxy = '' config['proxy'] = proxy - config['use_custom_host'] = self.xml.get_widget( + config['use_custom_host'] = self.xml.get_object( 'custom_host_port_checkbutton').get_active() - custom_port = self.xml.get_widget('custom_port_entry').get_text() + custom_port = self.xml.get_object('custom_port_entry').get_text() try: custom_port = int(custom_port) except Exception: @@ -3518,10 +3518,10 @@ class AccountCreationWizardWindow: _('Custom port must be a port number.')) return config['custom_port'] = custom_port - config['custom_host'] = self.xml.get_widget( + config['custom_host'] = self.xml.get_object( 'custom_host_entry').get_text().decode('utf-8') - if self.xml.get_widget('anonymous_checkbutton2').get_active(): + if self.xml.get_object('anonymous_checkbutton2').get_active(): self.modify = True self.save_account('', server, False, '', anonymous=True) self.show_finish_page() @@ -3536,7 +3536,7 @@ class AccountCreationWizardWindow: gajim.connections[self.account] = con con.new_account(self.account, config) elif cur_page == 3: - checked = self.xml.get_widget('ssl_checkbutton').get_active() + checked = self.xml.get_object('ssl_checkbutton').get_active() if checked: hostname = gajim.connections[self.account].new_account_info[ 'hostname'] @@ -3564,8 +3564,8 @@ class AccountCreationWizardWindow: form = self.data_form_widget.get_infos() gajim.connections[self.account].send_new_account_infos(form, self.is_form) - self.xml.get_widget('form_vbox').remove(self.data_form_widget) - self.xml.get_widget('progressbar_label').set_markup('<b>Account is being created</b>\n\nPlease wait...') + self.xml.get_object('form_vbox').remove(self.data_form_widget) + self.xml.get_object('progressbar_label').set_markup('<b>Account is being created</b>\n\nPlease wait...') self.notebook.set_current_page(5) # show creating page self.back_button.hide() self.forward_button.hide() @@ -3573,7 +3573,7 @@ class AccountCreationWizardWindow: self.update_progressbar) def update_proxy_list(self): - proxies_combobox = self.xml.get_widget('proxies_combobox') + proxies_combobox = self.xml.get_object('proxies_combobox') model = gtk.ListStore(str) proxies_combobox.set_model(model) l = gajim.config.get_per('proxies') @@ -3590,7 +3590,7 @@ class AccountCreationWizardWindow: ManageProxiesWindow() def on_custom_host_port_checkbutton_toggled(self, widget): - self.xml.get_widget('custom_host_hbox').set_sensitive(widget.get_active()) + self.xml.get_object('custom_host_hbox').set_sensitive(widget.get_active()) def update_progressbar(self): self.progressbar.pulse() @@ -3615,23 +3615,23 @@ class AccountCreationWizardWindow: else: self.data_form_widget = FakeDataForm(form) self.data_form_widget.show_all() - self.xml.get_widget('form_vbox').pack_start(self.data_form_widget) + self.xml.get_object('form_vbox').pack_start(self.data_form_widget) self.ssl_fingerprint = ssl_fingerprint self.ssl_cert = ssl_cert if ssl_msg: # An SSL warning occured, show it hostname = gajim.connections[self.account].new_account_info['hostname'] - self.xml.get_widget('ssl_label').set_markup(_('<b>Security Warning</b>' + self.xml.get_object('ssl_label').set_markup(_('<b>Security Warning</b>' '\n\nThe authenticity of the %(hostname)s SSL certificate could be ' 'invalid.\nSSL Error: %(error)s\n' 'Do you still want to connect to this server?') % { 'hostname': hostname, 'error': ssl_msg}) if ssl_err in (18, 27): text = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % ssl_fingerprint - self.xml.get_widget('ssl_checkbutton').set_label(text) + self.xml.get_object('ssl_checkbutton').set_label(text) else: - self.xml.get_widget('ssl_checkbutton').set_no_show_all(True) - self.xml.get_widget('ssl_checkbutton').hide() + self.xml.get_object('ssl_checkbutton').set_no_show_all(True) + self.xml.get_object('ssl_checkbutton').hide() self.notebook.set_current_page(3) # show SSL page else: self.notebook.set_current_page(4) # show form page @@ -3654,7 +3654,7 @@ class AccountCreationWizardWindow: self.cancel_button.show() self.go_online_checkbutton.hide() self.show_vcard_checkbutton.hide() - img = self.xml.get_widget('finish_image') + img = self.xml.get_object('finish_image') img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) finish_text = '<big><b>%s</b></big>\n\n%s' % ( _('An error occurred during account creation') , reason) @@ -3688,7 +3688,7 @@ class AccountCreationWizardWindow: del gajim.connections[self.account] if self.account in gajim.config.get_per('accounts'): gajim.config.del_per('accounts', self.account) - img = self.xml.get_widget('finish_image') + img = self.xml.get_object('finish_image') img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occurred during ' 'account creation') , reason) @@ -3708,8 +3708,8 @@ class AccountCreationWizardWindow: self.window.destroy() def on_finish_button_clicked(self, widget): - go_online = self.xml.get_widget('go_online_checkbutton').get_active() - show_vcard = self.xml.get_widget('show_vcard_checkbutton').get_active() + go_online = self.xml.get_object('go_online_checkbutton').get_active() + show_vcard = self.xml.get_object('show_vcard_checkbutton').get_active() self.window.destroy() if show_vcard: gajim.interface.show_vcard_when_connect.append(self.account) @@ -3719,7 +3719,7 @@ class AccountCreationWizardWindow: def on_username_entry_key_press_event(self, widget, event): # Check for pressed @ and jump to combobox if found if event.keyval == gtk.keysyms.at: - combobox = self.xml.get_widget('server_comboboxentry') + combobox = self.xml.get_object('server_comboboxentry') combobox.grab_focus() combobox.child.set_position(-1) return True @@ -3729,7 +3729,7 @@ class AccountCreationWizardWindow: backspace = event.keyval == gtk.keysyms.BackSpace empty = len(combobox.get_active_text()) == 0 if backspace and empty and self.modify: - username_entry = self.xml.get_widget('username_entry') + username_entry = self.xml.get_object('username_entry') username_entry.grab_focus() username_entry.set_position(-1) return True @@ -3816,16 +3816,16 @@ class AccountCreationWizardWindow: class ManagePEPServicesWindow: def __init__(self, account): - self.xml = gtkgui_helpers.get_glade('manage_pep_services_window.glade') - self.window = self.xml.get_widget('manage_pep_services_window') + self.xml = gtkgui_helpers.get_gtk_builder('manage_pep_services_window.ui') + self.window = self.xml.get_object('manage_pep_services_window') self.window.set_transient_for(gajim.interface.roster.window) - self.xml.get_widget('configure_button').set_sensitive(False) - self.xml.get_widget('delete_button').set_sensitive(False) - self.xml.signal_autoconnect(self) + self.xml.get_object('configure_button').set_sensitive(False) + self.xml.get_object('delete_button').set_sensitive(False) + self.xml.connect_signals(self) self.account = account self.init_services() - self.xml.get_widget('services_treeview').get_selection().connect( + self.xml.get_object('services_treeview').get_selection().connect( 'changed', self.on_services_selection_changed) self.window.show_all() @@ -3837,11 +3837,11 @@ class ManagePEPServicesWindow: self.window.destroy() def on_services_selection_changed(self, sel): - self.xml.get_widget('configure_button').set_sensitive(True) - self.xml.get_widget('delete_button').set_sensitive(True) + self.xml.get_object('configure_button').set_sensitive(True) + self.xml.get_object('delete_button').set_sensitive(True) def init_services(self): - self.treeview = self.xml.get_widget('services_treeview') + self.treeview = self.xml.get_object('services_treeview') # service, access_model, group self.treestore = gtk.ListStore(str) self.treeview.set_model(self.treestore) @@ -3901,11 +3901,11 @@ class ManagePEPServicesWindow: class ManageSoundsWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade('manage_sounds_window.glade') - self.window = self.xml.get_widget('manage_sounds_window') + self.xml = gtkgui_helpers.get_gtk_builder('manage_sounds_window.ui') + self.window = self.xml.get_object('manage_sounds_window') # sounds treeview - self.sound_tree = self.xml.get_widget('sounds_treeview') + self.sound_tree = self.xml.get_object('sounds_treeview') # active, event ui name, path to sound file, event_config_name model = gtk.ListStore(bool, str, str, str) @@ -3927,7 +3927,7 @@ class ManageSoundsWindow: self.fill_sound_treeview() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.sound_tree.get_model().connect('row-changed', self.on_sounds_treemodel_row_changed) @@ -3975,7 +3975,7 @@ class ManageSoundsWindow: def on_treeview_sounds_cursor_changed(self, widget, data = None): (model, iter_) = self.sound_tree.get_selection().get_selected() - sounds_entry = self.xml.get_widget('sounds_entry') + sounds_entry = self.xml.get_object('sounds_entry') if not iter_: sounds_entry.set_text('') return @@ -3991,13 +3991,13 @@ class ManageSoundsWindow: model, iter_ = self.sound_tree.get_selection().get_selected() if not path_to_snd_file: model[iter_][2] = '' - self.xml.get_widget('sounds_entry').set_text('') + self.xml.get_object('sounds_entry').set_text('') model[iter_][0] = False return directory = os.path.dirname(path_to_snd_file) gajim.config.set('last_sounds_dir', directory) path_to_snd_file = helpers.strip_soundfile_path(path_to_snd_file) - self.xml.get_widget('sounds_entry').set_text(path_to_snd_file) + self.xml.get_object('sounds_entry').set_text(path_to_snd_file) model[iter_][2] = path_to_snd_file # set new path to sounds_model model[iter_][0] = True # set the sound to enabled |