Commits October 2018

commits@gajim.org

1 participants
107 discussions

[Git][gajim/gajim][master] Rework Preferences Window
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5d2e8339 by Daniel Brötzmann at 2018-10-25T22:18:06Z Rework Preferences Window - - - - - 3 changed files: - gajim/data/gui/preferences_window.ui - gajim/data/style/gajim.css - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== The diff for this file was not included because it is too large. ===================================== gajim/data/style/gajim.css ===================================== @@ -119,6 +119,10 @@ list.settings > row > box { margin: 6px 18px; } +/* Preferences Window */ +.PreferencesWindow { background-color: @theme_base_color; } +.PreferencesStack { background-color: @theme_bg_color; } + /* Accounts Window */ #AccountsWindow > box > stack { padding:30px 30px 30px 30px;} #AccountsWindow scrolledwindow {border: none;} ===================================== gajim/gtk/preferences.py ===================================== @@ -58,296 +58,326 @@ class Preferences(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('Preferences')) - self.set_default_size(-1, 400) - - self.xml = get_builder('preferences_window.ui') - self.notebook = self.xml.get_object('preferences_notebook') - self.add(self.notebook) - - self.one_window_type_combobox = 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_object( - 'notify_on_signout_checkbutton') - self.auto_popup_away_checkbutton = self.xml.get_object( - 'auto_popup_away_checkbutton') - self.auto_popup_chat_opened_checkbutton = self.xml.get_object( - 'auto_popup_chat_opened_checkbutton') - 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_object( - 'auto_away_message_entry') - 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_object('auto_xa_message_entry') + + self._ui = get_builder('preferences_window.ui') + self.add(self._ui.preferences_window) ### General tab ### + ## Behavior of Windows and Tabs + # Set default for single window type + choices = c_config.opt_one_window_types + type_ = app.config.get('one_message_window') + if type_ in choices: + self._ui.one_window_type_combobox.set_active(choices.index(type_)) + else: + self._ui.one_window_type_combobox.set_active(0) + + # Show roster on startup + choices = c_config.opt_show_roster_on_startup + type_ = app.config.get('show_roster_on_startup') + if type_ in choices: + self._ui.show_roster_on_startup.set_active(choices.index(type_)) + else: + self._ui.show_roster_on_startup.set_active(0) + + # Quit on roster x + st = app.config.get('quit_on_roster_x_button') + self._ui.quit_on_roster_x_checkbutton.set_active(st) + + # Tab placement + st = app.config.get('tabs_position') + if st == 'top': + self._ui.tabs_placement.set_active(0) + elif st == 'bottom': + self._ui.tabs_placement.set_active(1) + elif st == 'left': + self._ui.tabs_placement.set_active(2) + else: # right + self._ui.tabs_placement.set_active(3) + + # Show avatar in tabs + st = app.config.get('show_avatar_in_tabs') + self._ui.show_avatar_in_tabs_checkbutton.set_active(st) + + ## Roster Appearance # Display avatars in roster st = app.config.get('show_avatars_in_roster') - self.xml.get_object('show_avatars_in_roster_checkbutton'). \ - set_active(st) + self._ui.show_avatars_in_roster_checkbutton.set_active(st) # Display status msg under contact name in roster st = app.config.get('show_status_msgs_in_roster') - self.xml.get_object('show_status_msgs_in_roster_checkbutton'). \ - set_active(st) + self._ui.show_status_msgs_in_roster_checkbutton.set_active(st) # Display PEP in roster st1 = app.config.get('show_mood_in_roster') st2 = app.config.get('show_activity_in_roster') st3 = app.config.get('show_tunes_in_roster') st4 = app.config.get('show_location_in_roster') - w = self.xml.get_object('show_pep_in_roster_checkbutton') if st1 == st2 == st3 == st4: - w.set_active(st1) + self._ui.show_pep_in_roster_checkbutton.set_active(st1) else: - w.set_inconsistent(True) + self._ui.show_pep_in_roster_checkbutton.set_inconsistent(True) # Sort contacts by show st = app.config.get('sort_by_show_in_roster') - self.xml.get_object('sort_by_show_in_roster_checkbutton').set_active(st) + self._ui.sort_by_show_in_roster_checkbutton.set_active(st) st = app.config.get('sort_by_show_in_muc') - self.xml.get_object('sort_by_show_in_muc_checkbutton').set_active(st) - - # Set default for single window type - choices = c_config.opt_one_window_types - type_ = app.config.get('one_message_window') - if type_ in choices: - self.one_window_type_combobox.set_active(choices.index(type_)) - else: - self.one_window_type_combobox.set_active(0) - - # Show roster on startup - show_roster_combobox = self.xml.get_object('show_roster_on_startup') - choices = c_config.opt_show_roster_on_startup - type_ = app.config.get('show_roster_on_startup') - if type_ in choices: - show_roster_combobox.set_active(choices.index(type_)) - else: - show_roster_combobox.set_active(0) - - # Ignore XHTML - st = app.config.get('ignore_incoming_xhtml') - self.xml.get_object('xhtml_checkbutton').set_active(st) + self._ui.sort_by_show_in_muc_checkbutton.set_active(st) - # use speller + ### Chat tab ### + ## Chat Settings + # Use speller if app.is_installed('GSPELL'): st = app.config.get('use_speller') - self.xml.get_object('speller_checkbutton').set_active(st) + self._ui.speller_checkbutton.set_active(st) else: - self.xml.get_object('speller_checkbutton').set_sensitive(False) + self._ui.speller_checkbutton.set_sensitive(False) # XEP-0184 positive ack st = app.config.get('positive_184_ack') - self.xml.get_object('positive_184_ack_checkbutton').set_active(st) - - st = app.config.get('show_subject_on_join') - self.xml.get_object('subject_on_join').set_active(st) - - # Show avatar in tabs - st = app.config.get('show_avatar_in_tabs') - self.xml.get_object('show_avatar_in_tabs_checkbutton').set_active(st) - - ### Style tab ### - # Themes - theme_combobox = self.xml.get_object('theme_combobox') - self.changed_id = theme_combobox.connect( - 'changed', self.on_theme_combobox_changed) - self.update_theme_list() - - # iconset - iconsets_list = os.listdir( - os.path.join(configpaths.get('DATA'), 'iconsets')) - if os.path.isdir(configpaths.get('MY_ICONSETS')): - iconsets_list += os.listdir(configpaths.get('MY_ICONSETS')) - # new model, image in 0, string in 1 - model = Gtk.ListStore(Gtk.Image, str) - renderer_image = cell_renderer_image.CellRendererImage(0, 0) - renderer_text = Gtk.CellRendererText() - renderer_text.set_property('xpad', 5) - self.iconset_combobox.pack_start(renderer_image, False) - self.iconset_combobox.pack_start(renderer_text, True) - self.iconset_combobox.add_attribute(renderer_text, 'text', 1) - self.iconset_combobox.add_attribute(renderer_image, 'image', 0) - self.iconset_combobox.set_model(model) - dirlist = [] - for dir_ in iconsets_list: - if not os.path.isdir(os.path.join(configpaths.get('DATA'), 'iconsets', dir_)) \ - and not os.path.isdir(os.path.join(configpaths.get('MY_ICONSETS'), dir_)): - continue - if dir_ not in ('.svn', 'transports'): - dirlist.append(dir_) - if not dirlist: - dirlist.append(' ') - for index, dir_ in enumerate(dirlist): - preview = Gtk.Image() - files = [] - files.append(os.path.join(helpers.get_iconset_path(dir_), '16x16', - 'online.png')) - files.append(os.path.join(helpers.get_iconset_path(dir_), '16x16', - 'online.gif')) - for file_ in files: - if os.path.exists(file_): - preview.set_from_file(file_) - model.append([preview, dir_]) - if app.config.get('iconset') == dir_: - self.iconset_combobox.set_active(index) - - # Use transports iconsets - st = app.config.get('use_transports_iconsets') - self.xml.get_object('transports_iconsets_checkbutton').set_active(st) - - # Dark theme - dark_theme_combo = self.xml.get_object('dark_theme_combobox') - dark_theme_combo.set_active_id(str(app.config.get('dark_theme'))) - - # Emoticons - emoticons_combobox = self.xml.get_object('emoticons_combobox') - emoticon_themes = helpers.get_available_emoticon_themes() + self._ui.positive_184_ack_checkbutton.set_active(st) - for theme in emoticon_themes: - emoticons_combobox.append_text(theme) - - config_theme = app.config.get('emoticons_theme') - if config_theme not in emoticon_themes: - config_theme = 'font' - emoticons_combobox.set_id_column(0) - emoticons_combobox.set_active_id(config_theme) - - self.xml.ascii_emoticons.set_active(app.config.get('ascii_emoticons')) + # Ignore XHTML + st = app.config.get('ignore_incoming_xhtml') + self._ui.xhtml_checkbutton.set_active(st) - ### Personal Events tab ### - # outgoing send chat state notifications - st = app.config.get('outgoing_chat_state_notifications') - combo = self.xml.get_object('outgoing_chat_states_combobox') - if st == 'all': - combo.set_active(0) - elif st == 'composing_only': - combo.set_active(1) - else: # disabled - combo.set_active(2) + # Print status messages in single chats + st = app.config.get('print_status_in_chats') + self._ui.print_status_in_chats_checkbutton.set_active(st) - # displayed send chat state notifications + # Show subject on join + st = app.config.get('show_subject_on_join') + self._ui.subject_on_join_checkbutton.set_active(st) + + # Print status in MUC + st = app.config.get('print_status_in_muc') + if st == 'none': + self._ui.print_status_in_muc_combobox.set_active(0) + elif st == 'all': + self._ui.print_status_in_muc_combobox.set_active(1) + else: # in_and_out + self._ui.print_status_in_muc_combobox.set_active(2) + + # Displayed chat state notifications st = app.config.get('displayed_chat_state_notifications') - combo = self.xml.get_object('displayed_chat_states_combobox') if st == 'all': - combo.set_active(0) + self._ui.displayed_chat_states_combobox.set_active(0) elif st == 'composing_only': - combo.set_active(1) + self._ui.displayed_chat_states_combobox.set_active(1) else: # disabled - combo.set_active(2) - + self._ui.displayed_chat_states_combobox.set_active(2) ### Notifications tab ### - # On new event - on_event_combobox = self.xml.get_object('on_event_combobox') + ## Visual Notifications + # Systray icon + if app.config.get('trayicon') == 'never': + self._ui.systray_combobox.set_active(0) + elif app.config.get('trayicon') == 'on_event': + self._ui.systray_combobox.set_active(1) + else: # always + self._ui.systray_combobox.set_active(2) + + # Notify on new event if app.config.get('autopopup'): - on_event_combobox.set_active(0) + self._ui.on_event_received_combobox.set_active(0) elif app.config.get('notify_on_new_message'): - on_event_combobox.set_active(1) - else: - on_event_combobox.set_active(2) + self._ui.on_event_received_combobox.set_active(1) + else: # only show in roster + self._ui.on_event_received_combobox.set_active(2) - # notify on online statuses + # Notify on online statuses st = app.config.get('notify_on_signin') - self.notify_on_signin_checkbutton.set_active(st) + self._ui.notify_on_signin_checkbutton.set_active(st) - # notify on offline statuses + # Notify on offline statuses st = app.config.get('notify_on_signout') - self.notify_on_signout_checkbutton.set_active(st) + self._ui.notify_on_signout_checkbutton.set_active(st) - # autopopupaway + # Auto popup when away st = app.config.get('autopopupaway') - self.auto_popup_away_checkbutton.set_active(st) + self._ui.auto_popup_away_checkbutton.set_active(st) - # autopopup_chat_opened + # Auto popup when chat already open st = app.config.get('autopopup_chat_opened') - self.auto_popup_chat_opened_checkbutton.set_active(st) - - # sounddnd - st = app.config.get('sounddnd') - self.sound_dnd_checkbutton.set_active(st) + self._ui.auto_popup_chat_opened_checkbutton.set_active(st) - # Systray - systray_combobox = self.xml.get_object('systray_combobox') - if app.config.get('trayicon') == 'never': - systray_combobox.set_active(0) - elif app.config.get('trayicon') == 'on_event': - systray_combobox.set_active(1) - else: - systray_combobox.set_active(2) - - # sounds + ## Sounds + # Sounds if app.config.get('sounds_on'): - self.xml.get_object('play_sounds_checkbutton').set_active(True) + self._ui.play_sounds_checkbutton.set_active(True) else: - self.xml.get_object('manage_sounds_button').set_sensitive(False) + self._ui.manage_sounds_button.set_sensitive(False) + + # Allow sounds when dnd + st = app.config.get('sounddnd') + self._ui.sound_dnd_checkbutton.set_active(st) #### Status tab ### - # Autoaway + # Auto away st = app.config.get('autoaway') - self.auto_away_checkbutton.set_active(st) + self._ui.auto_away_checkbutton.set_active(st) - # Autoawaytime + # Auto away time st = app.config.get('autoawaytime') - self.auto_away_time_spinbutton.set_value(st) - self.auto_away_time_spinbutton.set_sensitive(app.config.get('autoaway')) + self._ui.auto_away_time_spinbutton.set_value(st) + self._ui.auto_away_time_spinbutton.set_sensitive(app.config.get('autoaway')) - # autoaway message + # Auto away message st = app.config.get('autoaway_message') - self.auto_away_message_entry.set_text(st) - self.auto_away_message_entry.set_sensitive(app.config.get('autoaway')) + self._ui.auto_away_message_entry.set_text(st) + self._ui.auto_away_message_entry.set_sensitive(app.config.get('autoaway')) - # Autoxa + # Auto xa st = app.config.get('autoxa') - self.auto_xa_checkbutton.set_active(st) + self._ui.auto_xa_checkbutton.set_active(st) - # Autoxatime + # Auto xa time st = app.config.get('autoxatime') - self.auto_xa_time_spinbutton.set_value(st) - self.auto_xa_time_spinbutton.set_sensitive(app.config.get('autoxa')) + self._ui.auto_xa_time_spinbutton.set_value(st) + self._ui.auto_xa_time_spinbutton.set_sensitive(app.config.get('autoxa')) - # autoxa message + # Auto xa message st = app.config.get('autoxa_message') - self.auto_xa_message_entry.set_text(st) - self.auto_xa_message_entry.set_sensitive(app.config.get('autoxa')) + self._ui.auto_xa_message_entry.set_text(st) + self._ui.auto_xa_message_entry.set_sensitive(app.config.get('autoxa')) if not idle.Monitor.is_available(): - self.xml.get_object('autoaway_table').set_sensitive(False) + self._ui.autoaway_table.set_sensitive(False) - # ask_status when online / offline + # Restore last status + st = self.get_per_account_option('restore_last_status') + if st == 'mixed': + self._ui.restore_last_status_checkbutton.set_inconsistent(True) + else: + self._ui.restore_last_status_checkbutton.set_active(st) + + # Ask for status when online/offline st = app.config.get('ask_online_status') - self.xml.get_object('prompt_online_status_message_checkbutton').\ - set_active(st) + self._ui.prompt_online_status_message_checkbutton.set_active(st) st = app.config.get('ask_offline_status') - self.xml.get_object('prompt_offline_status_message_checkbutton').\ - set_active(st) + self._ui.prompt_offline_status_message_checkbutton.set_active(st) - # Default Status messages - self.default_msg_tree = self.xml.get_object('default_msg_treeview') + # Default status messages self.fill_default_msg_treeview() # Status messages - self.msg_tree = self.xml.get_object('msg_treeview') renderer = Gtk.CellRendererText() renderer.connect('edited', self.on_msg_cell_edited) renderer.set_property('editable', True) col = Gtk.TreeViewColumn('name', renderer, text=0) - self.msg_tree.append_column(col) + self._ui.msg_treeview.append_column(col) self.fill_msg_treeview() - buf = self.xml.get_object('msg_textview').get_buffer() + buf = self._ui.msg_textview.get_buffer() buf.connect('end-user-action', self.on_msg_textview_changed) - ### Audio / Video tab ### + ### Privacy tab ### + # Send idle time + st = self.get_per_account_option('send_idle_time') + if st == 'mixed': + self._ui.send_idle_time_checkbutton.set_inconsistent(True) + else: + self._ui.send_idle_time_checkbutton.set_active(st) + + # Send absolute time info + st = self.get_per_account_option('send_time_info') + if st == 'mixed': + self._ui.send_time_info_checkbutton.set_inconsistent(True) + else: + self._ui.send_time_info_checkbutton.set_active(st) + + # Send OS info + st = self.get_per_account_option('send_os_info') + if st == 'mixed': + self._ui.send_os_info_checkbutton.set_inconsistent(True) + else: + self._ui.send_os_info_checkbutton.set_active(st) + + # Ignore messages from unknown contacts + st = self.get_per_account_option('ignore_unknown_contacts') + if st == 'mixed': + self._ui.ignore_events_from_unknown_contacts_checkbutton.set_inconsistent(True) + else: + self._ui.ignore_events_from_unknown_contacts_checkbutton.set_active(st) + + # Outgoing chat state notifications + st = app.config.get('outgoing_chat_state_notifications') + if st == 'all': + self._ui.outgoing_chat_states_combobox.set_active(0) + elif st == 'composing_only': + self._ui.outgoing_chat_states_combobox.set_active(1) + else: # disabled + self._ui.outgoing_chat_states_combobox.set_active(2) + + ### Style tab ### + # Themes + self.changed_id = self._ui.theme_combobox.connect( + 'changed', self.on_theme_combobox_changed) + self.update_theme_list() + + # Dark theme + self._ui.dark_theme_combobox.set_active_id(str(app.config.get('dark_theme'))) + + # Emoticons + emoticon_themes = helpers.get_available_emoticon_themes() + + for theme in emoticon_themes: + self._ui.emoticons_combobox.append_text(theme) + + config_theme = app.config.get('emoticons_theme') + if config_theme not in emoticon_themes: + config_theme = 'font' + self._ui.emoticons_combobox.set_id_column(0) + self._ui.emoticons_combobox.set_active_id(config_theme) + + self._ui.ascii_emoticons.set_active(app.config.get('ascii_emoticons')) + + # Iconset + iconsets_list = os.listdir( + os.path.join(configpaths.get('DATA'), 'iconsets')) + if os.path.isdir(configpaths.get('MY_ICONSETS')): + iconsets_list += os.listdir(configpaths.get('MY_ICONSETS')) + # New model, image in 0, string in 1 + model = Gtk.ListStore(Gtk.Image, str) + renderer_image = cell_renderer_image.CellRendererImage(0, 0) + renderer_text = Gtk.CellRendererText() + renderer_text.set_property('xpad', 5) + self._ui.iconset_combobox.pack_start(renderer_image, False) + self._ui.iconset_combobox.pack_start(renderer_text, True) + self._ui.iconset_combobox.add_attribute(renderer_text, 'text', 1) + self._ui.iconset_combobox.add_attribute(renderer_image, 'image', 0) + self._ui.iconset_combobox.set_model(model) + dirlist = [] + for dir_ in iconsets_list: + if not os.path.isdir(os.path.join(configpaths.get('DATA'), 'iconsets', dir_)) \ + and not os.path.isdir(os.path.join(configpaths.get('MY_ICONSETS'), dir_)): + continue + if dir_ not in ('.svn', 'transports'): + dirlist.append(dir_) + if not dirlist: + dirlist.append(' ') + for index, dir_ in enumerate(dirlist): + preview = Gtk.Image() + files = [] + files.append(os.path.join(helpers.get_iconset_path(dir_), '16x16', + 'online.png')) + files.append(os.path.join(helpers.get_iconset_path(dir_), '16x16', + 'online.gif')) + for file_ in files: + if os.path.exists(file_): + preview.set_from_file(file_) + model.append([preview, dir_]) + if app.config.get('iconset') == dir_: + self._ui.iconset_combobox.set_active(index) + + # Use transports iconsets + st = app.config.get('use_transports_iconsets') + self._ui.transports_iconsets_checkbutton.set_active(st) + + ### Audio/Video tab ### def create_av_combobox(opt_name, device_dict, config_name=None, key=None): - combobox = self.xml.get_object(opt_name + '_combobox') + combobox = self._ui.get_object(opt_name + '_combobox') cell = Gtk.CellRendererText() cell.set_property('ellipsize', Pango.EllipsizeMode.END) cell.set_property('ellipsize-set', True) @@ -383,107 +413,70 @@ class Preferences(Gtk.ApplicationWindow): '320x240': '320x240'}, 'video_size', key=lambda x: -1 if \ not x[1] else int(x[0][:3])) st = app.config.get('video_see_self') - self.xml.get_object('video_see_self_checkbutton').set_active(st) + self._ui.video_see_self_checkbutton.set_active(st) else: for opt_name in ('audio_input', 'audio_output', 'video_input', 'video_output', 'video_framerate', 'video_size'): - combobox = self.xml.get_object(opt_name + '_combobox') + combobox = self._ui.get_object(opt_name + '_combobox') combobox.set_sensitive(False) # STUN - cb = self.xml.get_object('stun_checkbutton') st = app.config.get('use_stun_server') - cb.set_active(st) + self._ui.stun_checkbutton.set_active(st) - entry = self.xml.get_object('stun_server_entry') - entry.set_text(app.config.get('stun_server')) + self._ui.stun_server_entry.set_text(app.config.get('stun_server')) if not st: - entry.set_sensitive(False) + self._ui.stun_server_entry.set_sensitive(False) ### Advanced tab ### - # open links with + ## Applications (open links with) if os.name == 'nt': - applications_frame = self.xml.get_object('applications_frame') - applications_frame.set_no_show_all(True) - applications_frame.hide() + self._ui.custom_apps_frame.set_no_show_all(True) + self._ui.custom_apps_frame.hide() else: - self.applications_combobox = self.xml.get_object( - 'applications_combobox') - self.xml.get_object('custom_apps_frame').hide() - self.xml.get_object('custom_apps_frame').set_no_show_all(True) + self._ui.custom_apps_frame.hide() + self._ui.custom_apps_frame.set_no_show_all(True) if app.config.get('autodetect_browser_mailer'): - self.applications_combobox.set_active(0) + self._ui.applications_combobox.set_active(0) else: - self.applications_combobox.set_active(1) - self.xml.get_object('custom_apps_frame').show() - - self.xml.get_object('custom_browser_entry').set_text( - app.config.get('custombrowser')) - self.xml.get_object('custom_mail_client_entry').set_text( - app.config.get('custommailapp')) - self.xml.get_object('custom_file_manager_entry').set_text( - app.config.get('custom_file_manager')) - - # log status changes of contacts - st = app.config.get('log_contact_status_changes') - self.xml.get_object('log_show_changes_checkbutton').set_active(st) - - # send os info - 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) - else: - w.set_active(st) - - # send absolute time info - w = self.xml.get_object('send_time_info_checkbutton') - st = self.get_per_account_option('send_time_info') - if st == 'mixed': - w.set_inconsistent(True) - else: - w.set_active(st) - - # send idle time - 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) - else: - w.set_active(st) - + self._ui.applications_combobox.set_active(1) + self._ui.custom_apps_frame.show() + + self._ui.custom_browser_entry.set_text( + app.config.get('custombrowser')) + self._ui.custom_mail_client_entry.set_text( + app.config.get('custommailapp')) + self._ui.custom_file_manager_entry.set_text( + app.config.get('custom_file_manager')) + + ## Miscellaneous + # Proxy self.update_proxy_list() - # Ignore messages from unknown contacts - 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) + # Log status changes of contacts + st = app.config.get('log_contact_status_changes') + self._ui.log_show_changes_checkbutton.set_active(st) + # Enable debug logging if sys.platform == 'win32': - w = self.xml.get_object('enable_logging') - w.set_active(app.get_win_debug_mode()) - w.show() + self._ui.enable_logging.set_active(app.get_win_debug_mode()) + self._ui.enable_logging.show() - self.xml.connect_signals(self) + self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) - self.msg_tree.get_model().connect('row-changed', + self._ui.msg_treeview.get_model().connect('row-changed', self.on_msg_treemodel_row_changed) - self.msg_tree.get_model().connect('row-deleted', + self._ui.msg_treeview.get_model().connect('row-deleted', self.on_msg_treemodel_row_deleted) - self.default_msg_tree.get_model().connect('row-changed', + self._ui.default_msg_treeview.get_model().connect('row-changed', self.on_default_msg_treemodel_row_changed) self.sounds_preferences = None self.theme_preferences = None - self.notebook.set_current_page(0) - self.show_all() def _on_key_press(self, widget, event): @@ -496,7 +489,7 @@ class Preferences(Gtk.ApplicationWindow): returns "mixed" """ if not app.connections: - # a non existent key return default value + # A non existent key return default value return app.config.get_per('accounts', '__default__', opt) val = None for account in app.connections: @@ -507,9 +500,6 @@ class Preferences(Gtk.ApplicationWindow): return 'mixed' return val - def on_subject_on_join_toggled(self, widget): - app.config.set('show_subject_on_join', widget.get_active()) - def on_checkbutton_toggled(self, widget, config_name, change_sensitivity_widgets=None): app.config.set(config_name, widget.get_active()) @@ -541,15 +531,34 @@ class Preferences(Gtk.ApplicationWindow): for ctrl in app.interface.minimized_controls[account].values(): yield ctrl - def on_sort_by_show_in_roster_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster') - app.interface.roster.setup_and_draw_roster() + ### General tab ### + def on_one_window_type_combo_changed(self, widget): + active = widget.get_active() + config_type = c_config.opt_one_window_types[active] + app.config.set('one_message_window', config_type) + app.interface.msg_win_mgr.reconfig() - def on_sort_by_show_in_muc_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'sort_by_show_in_muc') - # Redraw groupchats - for ctrl in self._get_all_muc_controls(): - ctrl.draw_roster() + def on_show_roster_on_startup_changed(self, widget): + active = widget.get_active() + config_type = c_config.opt_show_roster_on_startup[active] + app.config.set('show_roster_on_startup', config_type) + + def on_quit_on_roster_x_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'quit_on_roster_x_button') + + def on_tab_placement_changed(self, widget): + active = widget.get_active() + if active == 0: # top + app.config.set('tabs_position', 'top') + elif active == 1: # bottom + app.config.set('tabs_position', 'bottom') + elif active == 2: # left + app.config.set('tabs_position', 'left') + else: # right + app.config.set('tabs_position', 'right') + + def on_show_avatar_in_tabs_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_avatar_in_tabs') def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') @@ -571,42 +580,17 @@ class Preferences(Gtk.ApplicationWindow): self.on_checkbutton_toggled(widget, 'show_location_in_roster') app.interface.roster.setup_and_draw_roster() - def on_emoticons_combobox_changed(self, widget): - active = widget.get_active() - model = widget.get_model() - emot_theme = model[active][0] - app.config.set('emoticons_theme', emot_theme) - from gajim.gtk.emoji_chooser import emoji_chooser - emoji_chooser.load() - self.toggle_emoticons() - - def toggle_emoticons(self): - """ - Update emoticons state in Opened Chat Windows - """ - for ctrl in self._get_all_controls(): - ctrl.toggle_emoticons() - - def on_one_window_type_combo_changed(self, widget): - active = widget.get_active() - config_type = c_config.opt_one_window_types[active] - app.config.set('one_message_window', config_type) - app.interface.msg_win_mgr.reconfig() - - def on_show_roster_on_startup_changed(self, widget): - active = widget.get_active() - config_type = c_config.opt_show_roster_on_startup[active] - app.config.set('show_roster_on_startup', config_type) - - def on_xhtml_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml') - helpers.update_optional_features() + def on_sort_by_show_in_roster_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster') + app.interface.roster.setup_and_draw_roster() - def apply_speller(self): - for ctrl in self._get_all_controls(): - if isinstance(ctrl, ChatControlBase): - ctrl.set_speller() + def on_sort_by_show_in_muc_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'sort_by_show_in_muc') + # Redraw groupchats + for ctrl in self._get_all_muc_controls(): + ctrl.draw_roster() + ### Chat tab ### def on_speller_checkbutton_toggled(self, widget): active = widget.get_active() app.config.set('use_speller', active) @@ -624,70 +608,32 @@ class Preferences(Gtk.ApplicationWindow): app.config.set('speller_language', gspell_lang.get_code()) self.apply_speller() + def apply_speller(self): + for ctrl in self._get_all_controls(): + if isinstance(ctrl, ChatControlBase): + ctrl.set_speller() + def on_positive_184_ack_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'positive_184_ack') - def on_show_avatar_in_tabs_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'show_avatar_in_tabs') - - @staticmethod - def on_theme_combobox_changed(combobox): - theme = combobox.get_active_id() - app.config.set('roster_theme', theme) - app.css_config.change_theme(theme) - - # begin repainting themed widgets throughout - app.interface.roster.repaint_themed_widgets() - app.interface.roster.change_roster_style(None) - - def update_theme_list(self): - theme_combobox = self.xml.get_object('theme_combobox') - with theme_combobox.handler_block(self.changed_id): - theme_combobox.remove_all() - theme_combobox.append('default', 'default') - for config_theme in app.css_config.themes: - theme_combobox.append(config_theme, config_theme) - - theme_combobox.set_active_id(app.config.get('roster_theme')) - - def on_manage_theme_button_clicked(self, widget): - window = app.get_app_window(Themes) - if window is None: - Themes(self) - else: - window.present() - - def on_iconset_combobox_changed(self, widget): - model = widget.get_model() - active = widget.get_active() - icon_string = model[active][1] - app.config.set('iconset', icon_string) - gtkgui_helpers.reload_jabber_state_images() - - def on_convert_ascii_toggle(self, widget): - app.config.set('ascii_emoticons', widget.get_active()) - app.interface.make_regexps() - - def on_transports_iconsets_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'use_transports_iconsets') - gtkgui_helpers.reload_jabber_state_images() + def on_xhtml_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml') + helpers.update_optional_features() - def on_dark_theme_changed(self, widget): - app.css_config.set_dark_theme(int(widget.get_active_id())) + def on_print_status_in_chats_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'print_status_in_chats') - def on_outgoing_chat_states_combobox_changed(self, widget): + def on_subject_on_join_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_subject_on_join') + + def print_status_in_muc_combobox_changed(self, widget): active = widget.get_active() - old_value = app.config.get('outgoing_chat_state_notifications') - if active == 0: # all - app.config.set('outgoing_chat_state_notifications', 'all') - elif active == 1: # only composing - app.config.set('outgoing_chat_state_notifications', 'composing_only') - else: # disabled - app.config.set('outgoing_chat_state_notifications', 'disabled') - new_value = app.config.get('outgoing_chat_state_notifications') - if 'disabled' in (old_value, new_value): - # we changed from disabled to sth else or vice versa - helpers.update_optional_features() + if active == 0: # none + app.config.set('print_status_in_muc', 'none') + elif active == 1: # all + app.config.set('print_status_in_muc', 'all') + else: # in_and_out + app.config.set('print_status_in_muc', 'in_and_out') def on_displayed_chat_states_combobox_changed(self, widget): active = widget.get_active() @@ -699,11 +645,23 @@ class Preferences(Gtk.ApplicationWindow): else: # disabled app.config.set('displayed_chat_state_notifications', 'disabled') - def on_ignore_events_from_unknown_contacts_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'ignore_unknown_contacts') + ### Notifications tab ### + def on_systray_combobox_changed(self, widget): + active = widget.get_active() + if active == 0: + app.config.set('trayicon', 'never') + app.interface.systray_enabled = False + app.interface.systray.hide_icon() + elif active == 1: + app.config.set('trayicon', 'on_event') + app.interface.systray_enabled = True + app.interface.systray.show_icon() + else: + app.config.set('trayicon', 'always') + app.interface.systray_enabled = True + app.interface.systray.show_icon() - def on_on_event_combobox_changed(self, widget): + def on_event_received_combobox_changed(self, widget): active = widget.get_active() if active == 0: app.config.set('autopopup', True) @@ -727,27 +685,9 @@ class Preferences(Gtk.ApplicationWindow): def on_auto_popup_chat_opened_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'autopopup_chat_opened') - def on_sound_dnd_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'sounddnd') - - def on_systray_combobox_changed(self, widget): - active = widget.get_active() - if active == 0: - app.config.set('trayicon', 'never') - app.interface.systray_enabled = False - app.interface.systray.hide_icon() - elif active == 1: - app.config.set('trayicon', 'on_event') - app.interface.systray_enabled = True - app.interface.systray.show_icon() - else: - app.config.set('trayicon', 'always') - app.interface.systray_enabled = True - app.interface.systray.show_icon() - def on_play_sounds_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sounds_on', - [self.xml.get_object('manage_sounds_button')]) + [self._ui.manage_sounds_button]) def on_manage_sounds_button_clicked(self, widget): if self.sounds_preferences is None: @@ -755,9 +695,14 @@ class Preferences(Gtk.ApplicationWindow): else: self.sounds_preferences.window.present() + def on_sound_dnd_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'sounddnd') + + ### Status tab ### def on_auto_away_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'autoaway', - [self.auto_away_time_spinbutton, self.auto_away_message_entry]) + [self._ui.auto_away_time_spinbutton, + self._ui.auto_away_message_entry]) def on_auto_away_time_spinbutton_value_changed(self, widget): aat = widget.get_value_as_int() @@ -770,7 +715,8 @@ class Preferences(Gtk.ApplicationWindow): def on_auto_xa_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'autoxa', - [self.auto_xa_time_spinbutton, self.auto_xa_message_entry]) + [self._ui.auto_xa_time_spinbutton, + self._ui.auto_xa_message_entry]) def on_auto_xa_time_spinbutton_value_changed(self, widget): axt = widget.get_value_as_int() @@ -781,6 +727,10 @@ class Preferences(Gtk.ApplicationWindow): def on_auto_xa_message_entry_changed(self, widget): app.config.set('autoxa_message', widget.get_text()) + def on_restore_last_status_checkbutton_toggled(self, widget): + widget.set_inconsistent(False) + self.on_per_account_checkbutton_toggled(widget, 'restore_last_status') + def on_prompt_online_status_message_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'ask_online_status') @@ -788,7 +738,7 @@ class Preferences(Gtk.ApplicationWindow): self.on_checkbutton_toggled(widget, 'ask_offline_status') def fill_default_msg_treeview(self): - model = self.default_msg_tree.get_model() + model = self._ui.default_msg_treeview.get_model() model.clear() status = [] for status_ in app.config.get_per('defaultstatusmsg'): @@ -803,12 +753,12 @@ class Preferences(Gtk.ApplicationWindow): model.set(iter_, 0, status_, 1, uf_show, 2, msg, 3, enabled) def on_default_msg_cell_edited(self, cell, row, new_text): - model = self.default_msg_tree.get_model() + model = self._ui.default_msg_treeview.get_model() iter_ = model.get_iter_from_string(row) model.set_value(iter_, 2, new_text) def default_msg_toggled_cb(self, cell, path): - model = self.default_msg_tree.get_model() + model = self._ui.default_msg_treeview.get_model() model[path][3] = not model[path][3] def on_default_msg_treemodel_row_changed(self, model, path, iter_): @@ -825,14 +775,14 @@ class Preferences(Gtk.ApplicationWindow): iter_ = model.get_iter_first() while iter_: val = model[iter_][0] - if model[iter_][1]: # we have a preset message - if not val: # no title, use message text for title + if model[iter_][1]: # We have a preset message + if not val: # No title, use message text for title val = model[iter_][1] app.config.add_per('statusmsg', val) msg = helpers.to_one_line(model[iter_][1]) app.config.set_per('statusmsg', val, 'message', msg) i = 2 - # store mood / activity + # Store mood / activity for subname in ('activity', 'subactivity', 'activity_text', 'mood', 'mood_text'): val2 = model[iter_][i] @@ -848,75 +798,9 @@ class Preferences(Gtk.ApplicationWindow): def on_msg_treemodel_row_deleted(self, model, path): self.save_status_messages(model) - def on_av_combobox_changed(self, combobox, config_name): - model = combobox.get_model() - active = combobox.get_active() - device = model[active][1] - app.config.set(config_name, device) - - def on_audio_input_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'audio_input_device') - - def on_audio_output_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'audio_output_device') - - def on_video_input_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_input_device') - - def on_video_output_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_output_device') - - def on_video_framerate_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_framerate') - - def on_video_size_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_size') - - def on_video_see_self_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'video_see_self') - - def on_stun_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'use_stun_server', [ - self.xml.get_object('stun_server_entry')]) - - def stun_server_entry_changed(self, widget): - app.config.set('stun_server', widget.get_text()) - - def on_applications_combobox_changed(self, widget): - if widget.get_active() == 0: - app.config.set('autodetect_browser_mailer', True) - self.xml.get_object('custom_apps_frame').hide() - elif widget.get_active() == 1: - app.config.set('autodetect_browser_mailer', False) - self.xml.get_object('custom_apps_frame').show() - - def on_custom_browser_entry_changed(self, widget): - app.config.set('custombrowser', widget.get_text()) - - def on_custom_mail_client_entry_changed(self, widget): - app.config.set('custommailapp', widget.get_text()) - - def on_custom_file_manager_entry_changed(self, widget): - app.config.set('custom_file_manager', widget.get_text()) - - def on_log_show_changes_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'log_contact_status_changes') - - def on_send_os_info_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'send_os_info') - - def on_send_time_info_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'send_time_info') - - def on_send_idle_time_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'send_idle_time') - def fill_msg_treeview(self): - self.xml.get_object('delete_msg_button').set_sensitive(False) - model = self.msg_tree.get_model() + self._ui.delete_msg_button.set_sensitive(False) + model = self._ui.msg_treeview.get_model() model.clear() preset_status = [] for msg_name in app.config.get_per('statusmsg'): @@ -939,50 +823,50 @@ class Preferences(Gtk.ApplicationWindow): subactivity, 4, activity_text, 5, mood, 6, mood_text) def on_msg_cell_edited(self, cell, row, new_text): - model = self.msg_tree.get_model() + model = self._ui.msg_treeview.get_model() iter_ = model.get_iter_from_string(row) model.set_value(iter_, 0, new_text) def on_msg_treeview_cursor_changed(self, widget, data=None): - sel = self.msg_tree.get_selection() + sel = self._ui.msg_treeview.get_selection() if not sel: return (model, iter_) = sel.get_selected() if not iter_: return - self.xml.get_object('delete_msg_button').set_sensitive(True) - buf = self.xml.get_object('msg_textview').get_buffer() + self._ui.delete_msg_button.set_sensitive(True) + buf = self._ui.msg_textview.get_buffer() msg = model[iter_][1] buf.set_text(msg) def on_new_msg_button_clicked(self, widget, data=None): - model = self.msg_tree.get_model() + model = self._ui.msg_treeview.get_model() iter_ = model.append() model.set( iter_, 0, _('status message title'), 1, _('status message text')) - self.msg_tree.set_cursor(model.get_path(iter_)) + self._ui.msg_treeview.set_cursor(model.get_path(iter_)) def on_delete_msg_button_clicked(self, widget, data=None): - sel = self.msg_tree.get_selection() + sel = self._ui.msg_treeview.get_selection() if not sel: return (model, iter_) = sel.get_selected() if not iter_: return - buf = self.xml.get_object('msg_textview').get_buffer() + buf = self._ui.msg_textview.get_buffer() model.remove(iter_) buf.set_text('') - self.xml.get_object('delete_msg_button').set_sensitive(False) + self._ui.delete_msg_button.set_sensitive(False) def on_msg_textview_changed(self, widget, data=None): - sel = self.msg_tree.get_selection() + sel = self._ui.msg_treeview.get_selection() if not sel: return (model, iter_) = sel.get_selected() if not iter_: return - buf = self.xml.get_object('msg_textview').get_buffer() + buf = self._ui.msg_textview.get_buffer() first_iter, end_iter = buf.get_bounds() model.set_value(iter_, 1, buf.get_text(first_iter, end_iter, True)) @@ -990,12 +874,158 @@ class Preferences(Gtk.ApplicationWindow): if event.keyval == Gdk.KEY_Delete: self.on_delete_msg_button_clicked(widget) + ### Privacy tab ### + def on_send_idle_time_checkbutton_toggled(self, widget): + widget.set_inconsistent(False) + self.on_per_account_checkbutton_toggled(widget, 'send_idle_time') + + def on_send_time_info_checkbutton_toggled(self, widget): + widget.set_inconsistent(False) + self.on_per_account_checkbutton_toggled(widget, 'send_time_info') + + def on_send_os_info_checkbutton_toggled(self, widget): + widget.set_inconsistent(False) + self.on_per_account_checkbutton_toggled(widget, 'send_os_info') + + def on_ignore_events_from_unknown_contacts_checkbutton_toggled(self, widget): + widget.set_inconsistent(False) + self.on_per_account_checkbutton_toggled(widget, 'ignore_unknown_contacts') + + def on_outgoing_chat_states_combobox_changed(self, widget): + active = widget.get_active() + old_value = app.config.get('outgoing_chat_state_notifications') + if active == 0: # all + app.config.set('outgoing_chat_state_notifications', 'all') + elif active == 1: # only composing + app.config.set('outgoing_chat_state_notifications', 'composing_only') + else: # disabled + app.config.set('outgoing_chat_state_notifications', 'disabled') + new_value = app.config.get('outgoing_chat_state_notifications') + if 'disabled' in (old_value, new_value): + # We changed from disabled to sth else or vice versa + helpers.update_optional_features() + + ### Style ### + @staticmethod + def on_theme_combobox_changed(combobox): + theme = combobox.get_active_id() + app.config.set('roster_theme', theme) + app.css_config.change_theme(theme) + + # Begin repainting themed widgets throughout + app.interface.roster.repaint_themed_widgets() + app.interface.roster.change_roster_style(None) + + def update_theme_list(self): + with self._ui.theme_combobox.handler_block(self.changed_id): + self._ui.theme_combobox.remove_all() + self._ui.theme_combobox.append('default', 'default') + for config_theme in app.css_config.themes: + self._ui.theme_combobox.append(config_theme, config_theme) + + self._ui.theme_combobox.set_active_id(app.config.get('roster_theme')) + + def on_manage_theme_button_clicked(self, widget): + window = app.get_app_window(Themes) + if window is None: + Themes(self) + else: + window.present() + + def on_dark_theme_changed(self, widget): + app.css_config.set_dark_theme(int(widget.get_active_id())) + + def on_emoticons_combobox_changed(self, widget): + active = widget.get_active() + model = widget.get_model() + emot_theme = model[active][0] + app.config.set('emoticons_theme', emot_theme) + from gajim.gtk.emoji_chooser import emoji_chooser + emoji_chooser.load() + self.toggle_emoticons() + + def on_convert_ascii_toggle(self, widget): + app.config.set('ascii_emoticons', widget.get_active()) + app.interface.make_regexps() + + def toggle_emoticons(self): + """ + Update emoticons state in Opened Chat Windows + """ + for ctrl in self._get_all_controls(): + ctrl.toggle_emoticons() + + def on_iconset_combobox_changed(self, widget): + model = widget.get_model() + active = widget.get_active() + icon_string = model[active][1] + app.config.set('iconset', icon_string) + gtkgui_helpers.reload_jabber_state_images() + + def on_transports_iconsets_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'use_transports_iconsets') + gtkgui_helpers.reload_jabber_state_images() + + ### Audio/Video tab ### + def on_av_combobox_changed(self, combobox, config_name): + model = combobox.get_model() + active = combobox.get_active() + device = model[active][1] + app.config.set(config_name, device) + + def on_audio_input_combobox_changed(self, widget): + self.on_av_combobox_changed(widget, 'audio_input_device') + + def on_audio_output_combobox_changed(self, widget): + self.on_av_combobox_changed(widget, 'audio_output_device') + + def on_video_input_combobox_changed(self, widget): + self.on_av_combobox_changed(widget, 'video_input_device') + + def on_video_output_combobox_changed(self, widget): + self.on_av_combobox_changed(widget, 'video_output_device') + + def on_video_framerate_combobox_changed(self, widget): + self.on_av_combobox_changed(widget, 'video_framerate') + + def on_video_size_combobox_changed(self, widget): + self.on_av_combobox_changed(widget, 'video_size') + + def on_video_see_self_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'video_see_self') + + def on_stun_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'use_stun_server', [ + self._ui.stun_server_entry]) + + def stun_server_entry_changed(self, widget): + app.config.set('stun_server', widget.get_text()) + + ### Advanced tab ### + # Applications + def on_applications_combobox_changed(self, widget): + if widget.get_active() == 0: + app.config.set('autodetect_browser_mailer', True) + self._ui.custom_apps_frame.hide() + elif widget.get_active() == 1: + app.config.set('autodetect_browser_mailer', False) + self._ui.custom_apps_frame.show() + + def on_custom_browser_entry_changed(self, widget): + app.config.set('custombrowser', widget.get_text()) + + def on_custom_mail_client_entry_changed(self, widget): + app.config.set('custommailapp', widget.get_text()) + + def on_custom_file_manager_entry_changed(self, widget): + app.config.set('custom_file_manager', widget.get_text()) + + # Proxies def on_proxies_combobox_changed(self, widget): active = widget.get_active() proxy = widget.get_model()[active][0] if proxy == _('None'): proxy = '' - app.config.set('global_proxy', proxy) def on_manage_proxies_button_clicked(self, widget): @@ -1008,21 +1038,26 @@ class Preferences(Gtk.ApplicationWindow): our_proxy = app.config.get('global_proxy') if not our_proxy: our_proxy = _('None') - proxy_combobox = self.xml.get_object('proxies_combobox') - model = proxy_combobox.get_model() + model = self._ui.proxies_combobox.get_model() model.clear() proxies = app.config.get_per('proxies') proxies.insert(0, _('None')) for index, proxy in enumerate(proxies): model.append([proxy]) if our_proxy == proxy: - proxy_combobox.set_active(index) + self._ui.proxies_combobox.set_active(index) + + # Log status changes of contacts + def on_log_show_changes_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'log_contact_status_changes') + + # Enable debug logging + def on_enable_logging_toggled(self, widget): + app.set_win_debug_mode(widget.get_active()) + # Advanced Config Editor (ACE) def on_open_advanced_editor_button_clicked(self, widget, data=None): if 'advanced_config' in app.interface.instances: app.interface.instances['advanced_config'].window.present() else: app.interface.instances['advanced_config'] = AdvancedConfig(self) - - def on_enable_logging_toggled(self, widget): - app.set_win_debug_mode(widget.get_active()) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d2e83394bd6e5331503fc9f539a7697c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d2e83394bd6e5331503fc9f539a7697c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework ACE
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5416f0e by Daniel Brötzmann at 2018-10-25T22:06:27Z Rework ACE - - - - - 2 changed files: - gajim/data/gui/advanced_configuration_window.ui - gajim/gtk/advanced_config.py Changes: ===================================== gajim/data/gui/advanced_configuration_window.ui ===================================== @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-warning</property> - </object> + <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="advanced_configuration_window"> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="title" translatable="yes">Advanced Configuration Editor</property> + <property name="title" translatable="yes">Advanced Configuration Editor (ACE)</property> <property name="role">ace</property> <property name="window_position">center-on-parent</property> <property name="default_width">650</property> @@ -18,21 +12,81 @@ <property name="type_hint">dialog</property> <signal name="destroy" handler="on_advanced_configuration_window_destroy" swapped="no"/> <child> - <object class="GtkBox" id="box2"> + <placeholder/> + </child> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkInfoBar" id="restart_warning"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="message_type">warning</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="content_area"> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="spacing">16</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">You should restart Gajim for some changes to take effect</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Filter:</property> + <property name="label" translatable="yes">_Filter</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">advanced_entry</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> @@ -56,11 +110,12 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow36"> + <object class="GtkScrolledWindow"> + <property name="height_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> @@ -72,7 +127,7 @@ <property name="rules_hint">True</property> <signal name="row-activated" handler="on_advanced_treeview_row_activated" swapped="no"/> <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection"/> + <object class="GtkTreeSelection"/> </child> </object> </child> @@ -81,47 +136,26 @@ <property name="expand">True</property> <property name="fill">True</property> <property name="padding">1</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkFrame" id="frame36"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">3</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="advanced_desc_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="xalign">0</property> - <property name="wrap">True</property> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label357"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Description</b></property> + <property name="halign">start</property> + <property name="label" translatable="yes">Description</property> <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="restart_box"> - <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="image3"> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-warning</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> @@ -130,15 +164,16 @@ </packing> </child> <child> - <object class="GtkLabel" id="restart_label"> + <object class="GtkLabel" id="description"> + <property name="height_request">30</property> + <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="wrap">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>NOTE:</b> You should restart Gajim for some settings to take effect</property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -147,13 +182,14 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> - <object class="GtkButtonBox" id="buttonbox1"> + <object class="GtkButtonBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">12</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> @@ -162,10 +198,12 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image1</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_reset_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -193,15 +231,10 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </object> </child> </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-undo</property> - </object> </interface> ===================================== gajim/gtk/advanced_config.py ===================================== @@ -69,13 +69,8 @@ def tree_model_pre_order(model, treeiter): class AdvancedConfig: def __init__(self, transient): - self.xml = get_builder('advanced_configuration_window.ui') - self.window = self.xml.get_object('advanced_configuration_window') - self.window.set_transient_for(transient) - self.entry = self.xml.get_object('advanced_entry') - self.desc_label = self.xml.get_object('advanced_desc_label') - self.restart_box = self.xml.get_object('restart_box') - self.reset_button = self.xml.get_object('reset_button') + self._ui = get_builder('advanced_configuration_window.ui') + self._ui.advanced_configuration_window.set_transient_for(transient) # Format: # key = option name (root/subopt/opt separated by \n then) @@ -90,7 +85,7 @@ class AdvancedConfig: 'string': _('Text'), 'color': _('Color')} - treeview = self.xml.get_object('advanced_treeview') + treeview = self._ui.advanced_treeview self.treeview = treeview self.model = Gtk.TreeStore(str, str, str) self.fill_model() @@ -121,13 +116,12 @@ class AdvancedConfig: treeview.set_model(self.modelfilter) - # connect signal for selection change + # Connect signal for selection change treeview.get_selection().connect('changed', self.on_advanced_treeview_selection_changed) - self.xml.connect_signals(self) - self.restart_box.set_no_show_all(True) - self.window.show_all() + self._ui.connect_signals(self) + self._ui.advanced_configuration_window.show_all() app.interface.instances['advanced_config'] = self def cb_value_column_data(self, col, cell, model, iter_, data): @@ -168,17 +162,17 @@ class AdvancedConfig: elif len(opt_path) == 1: desc = app.config.get_desc(opt_path[0]) if desc: - self.desc_label.set_text(desc) + self._ui.description.set_text(desc) else: - #we talk about option description in advanced configuration editor - self.desc_label.set_text(_('(None)')) + # We talk about option description in advanced configuration editor + self._ui.description.set_text(_('(None)')) if len(opt_path) == 3 or (len(opt_path) == 1 and not \ model.iter_has_child(iter_)): - self.reset_button.set_sensitive(True) + self._ui.reset_button.set_sensitive(True) else: - self.reset_button.set_sensitive(False) + self._ui.reset_button.set_sensitive(False) else: - self.reset_button.set_sensitive(False) + self._ui.reset_button.set_sensitive(False) def remember_option(self, option, oldval, newval): if option in self.changed_opts: @@ -211,7 +205,7 @@ class AdvancedConfig: self.check_for_restart() def check_for_restart(self): - self.restart_box.hide() + self._ui.restart_warning.hide() for opt in self.changed_opts: opt_path = opt.split('\n') if len(opt_path) == 3: @@ -221,12 +215,12 @@ class AdvancedConfig: restart = app.config.get_restart(opt_path[0]) if restart: if self.changed_opts[opt][0] != self.changed_opts[opt][1]: - self.restart_box.set_no_show_all(False) - self.restart_box.show_all() + self._ui.restart_warning.set_no_show_all(False) + self._ui.restart_warning.show() break def on_config_edited(self, cell, path, text): - # convert modelfilter path to model path + # Convert modelfilter path to model path path = Gtk.TreePath.new_from_string(path) modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] @@ -287,7 +281,7 @@ class AdvancedConfig: self.on_config_edited(None, path.to_string(), str(default)) def on_advanced_close_button_clicked(self, widget): - self.window.destroy() + self._ui.advanced_configuration_window.destroy() def fill_model(self, node=None, parent=None): for item, option in app.config.get_children(node): @@ -314,7 +308,7 @@ class AdvancedConfig: self.model.append(parent, [name, value, type_]) def visible_func(self, model, treeiter, data): - search_string = self.entry.get_text().lower() + search_string = self._ui.advanced_entry.get_text().lower() for it in tree_model_pre_order(model, treeiter): if model[it][Column.TYPE] != '': opt_path = self.get_option_path(model, it) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5416f0e9717ab969a87564319f89113f5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5416f0e9717ab969a87564319f89113f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix error when plugin cant be loaded
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 08fe2326 by Philipp Hörist at 2018-10-25T19:20:38Z Fix error when plugin cant be loaded Fixes #9403 - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -163,6 +163,8 @@ class PluginManager(metaclass=Singleton): if activate: pc = self.scan_dir_for_plugins(dst_dir, scan_dirs=True, package=True) + if not pc: + continue self.add_plugin(pc[0]) plugin = self.plugins[-1] self.activate_plugin(plugin) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08fe232695f3118014659ffa80f8906577… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08fe232695f3118014659ffa80f8906577… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update feature list in appdata.xml
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3dcd6323 by Daniel Brötzmann at 2018-10-25T09:59:41Z Update feature list in appdata.xml - - - - - 2 changed files: - .gitlab-ci.yml - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== .gitlab-ci.yml ===================================== @@ -24,6 +24,11 @@ run-pylint: - pylint --version - scripts/dev/pylint-ci.sh --jobs=2 gajim +run-appdata: + stage: test + script: + - appstream-util validate data/org.gajim.Gajim.appdata.xml.in + run-build: stage: build script: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -7,32 +7,37 @@ <metadata_license>CC-BY-SA-3.0</metadata_license> <project_license>GPL-3.0</project_license> <name>Gajim</name> - <summary>A GTK+ Jabber client</summary> + <summary>A GTK+ XMPP client</summary> <description> - <p>Gajim is a chat client to be used with Jabber.org, Live Journal Talk, - Nimbuzz, Ovi, Talkonaut, and thousands of other services - run by companies and ISPs, and volunteers around the world. + <p>Gajim aims to be an easy to use and fully-featured XMPP client. + With Gajim you can chat through various XMPP services of your choice + (e.g. Jabber.org) as well as transports (e.g. Facebook, IRC). </p> - <p>If you have a few accounts on different servers, if you want to be in - contact with your friends and family all the time, then Gajim is for you. + <p>Just chat with your friends or family, easily share pictures and + thoughts or discuss the news with your groups. + </p> + <p>Gajim integrates well with your other devices: just chat and see what's + been said on your mobile device. </p> <p>Features:</p> <ul> - <li>Tabbed chat window and single window modes</li> - <li>Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation</li> - <li>Emojis, avatars, PEP (user activity, mood and tune)</li> - <li>Audio / video conferences</li> - <li>File transfer, room bookmarks</li> - <li>Metacontacts support</li> - <li>Trayicon, speller, extended chat history functionalities</li> - <li>TLS, GPG and End-To-End encryption support</li> - <li>Transport registration support</li> - <li>Service discovery including nodes, user search</li> - <li>Wikipedia, dictionary and search engine lookup</li> - <li>Multiple accounts support</li> - <li>XML console interface</li> - <li>Link local (bonjour / zeroconf), BOSH</li> - <li>Other features via plugins </li> + <li>Never miss a message, keep all your chat clients synchronized</li> + <li>Invite friends to group chats or join one</li> + <li>Easily send pictures, videos or other files to friends and groups</li> + <li>Chat securely with End-to-End encryption via OMEMO or PGP</li> + <li>Use your favorite emoticons, set your own profile picture</li> + <li>Keep and manage all your chat history</li> + <li>Organize your chats with tabs</li> + <li>Automatic spell-checking for your messages</li> + <li>Connect to other Messengers via Transports (Facebook, IRC, ...)</li> + <li>Lookup things on Wikipedia, dictionaries or other search engines directly from the chat window</li> + <li>Set your activity, tune, and mood to show your friends how you are feeling</li> + <li>Support for multiple accounts</li> + <li>Group multiple contacts from one friend to a single Meta-Contact</li> + <li>XML console to see what's happening on the protocol layer</li> + <li>Serverless messaging (Bonjour/Zeroconf), BOSH</li> + <li>Support for service discovery including nodes and search for users</li> + <li>Even more features via plugins</li> </ul> </description> <categories> @@ -43,7 +48,7 @@ </categories> <screenshots> <screenshot type="default"> - <image>https://gajim.org/imgs/gajim_roster.png</image> + <image>https://gajim.org/imgs/gajim_single_window_mode.png</image> <caption>Roster, list of contacts</caption> </screenshot> <screenshot> @@ -69,7 +74,7 @@ <url type="homepage">https://gajim.org/</url> <url type="bugtracker">https://dev.gajim.org/gajim/gajim</url> <url type="faq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</url> - <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/home</url> + <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/Help</url> <url type="donation">https://gajim.org/dev.php#donate</url> <url type="translate">https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate</url> <translation type="gettext">gajim</translation> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3dcd6323d297ca5a779c0f0c0a443a385d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3dcd6323d297ca5a779c0f0c0a443a385d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint error
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c1cc8c57 by Philipp Hörist at 2018-10-24T22:06:45Z Fix pylint error - - - - - d7ea69f3 by Philipp Hörist at 2018-10-24T22:12:28Z Refactor StatusIcon - Move to gtk folder - Rename some handlers - Use get_builder - - - - - 3 changed files: - gajim/gtk/profile.py - gajim/statusicon.py → gajim/gtk/statusicon.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -161,7 +161,7 @@ class ProfileWindow(Gtk.ApplicationWindow): if self.avatar_sha is None: return show_save_as_menu(self.avatar_sha, nick) - + elif event.button == 1: # left click self.on_set_avatar_button_clicked(widget) ===================================== gajim/statusicon.py → gajim/gtk/statusicon.py ===================================== @@ -22,7 +22,6 @@ import os from gi.repository import Gtk -from gi.repository import Gdk from gajim import dialogs from gajim import tooltips @@ -30,6 +29,7 @@ from gajim import gtkgui_helpers from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ +from gajim.gtk.util import get_builder from gajim.gtk.single_message import SingleMessageWindow @@ -45,9 +45,9 @@ class StatusIcon: # click somewhere else does not popdown menu. workaround this. self.added_hide_menuitem = False self.status = 'offline' - self.xml = gtkgui_helpers.get_gtk_builder('systray_context_menu.ui') - self.systray_context_menu = self.xml.get_object('systray_context_menu') - self.xml.connect_signals(self) + self._ui = get_builder('systray_context_menu.ui') + self.systray_context_menu = self._ui.systray_context_menu + self._ui.connect_signals(self) self.popup_menus = [] self.status_icon = None self.tooltip = tooltips.NotificationAreaTooltip() @@ -83,21 +83,15 @@ class StatusIcon: if not self.status_icon: self.status_icon = Gtk.StatusIcon() self.status_icon.set_property('has-tooltip', True) - self.status_icon.connect('activate', - self.on_status_icon_left_clicked) - self.status_icon.connect('popup-menu', - self.on_status_icon_right_clicked) - self.status_icon.connect('query-tooltip', - self.on_status_icon_query_tooltip) + self.status_icon.connect('activate', self._on_activate) + self.status_icon.connect('popup-menu', self._on_popup_menu) + self.status_icon.connect('query-tooltip', self._on_query_tooltip) self.status_icon.connect('size-changed', self.set_img) self.set_img() self.subscribe_events() - def on_status_icon_right_clicked(self, widget, event_button, event_time): - self.make_menu(event_button, event_time) - - def on_status_icon_query_tooltip(self, widget, x, y, keyboard_mode, tooltip): + def _on_query_tooltip(self, _status_icon, _x, _y, _keyboard_mode, tooltip): tooltip.set_custom(self.tooltip.get_tooltip()) return True @@ -105,7 +99,15 @@ class StatusIcon: self.status_icon.set_visible(False) self.unsubscribe_events() - def on_status_icon_left_clicked(self, widget): + def _on_popup_menu(self, _status_icon, button, activate_time): + if button == 1: # Left click + self.on_left_click() + elif button == 2: # middle click + self.on_middle_click() + elif button == 3: # right click + self.make_menu(button, activate_time) + + def _on_activate(self, _status_icon): self.on_left_click() def on_status_icon_size_changed(self, statusicon, size): @@ -173,13 +175,12 @@ class StatusIcon: for m in self.popup_menus: m.destroy() - chat_with_menuitem = self.xml.get_object('chat_with_menuitem') - single_message_menuitem = self.xml.get_object( - 'single_message_menuitem') - status_menuitem = self.xml.get_object('status_menu') - join_gc_menuitem = self.xml.get_object('join_gc_menuitem') - sounds_mute_menuitem = self.xml.get_object('sounds_mute_menuitem') - show_roster_menuitem = self.xml.get_object('show_roster_menuitem') + chat_with_menuitem = self._ui.chat_with_menuitem + single_message_menuitem = self._ui.single_message_menuitem + status_menuitem = self._ui.status_menu + join_gc_menuitem = self._ui.join_gc_menuitem + sounds_mute_menuitem = self._ui.sounds_mute_menuitem + show_roster_menuitem = self._ui.show_roster_menuitem if self.single_message_handler_id: single_message_menuitem.handler_disconnect( @@ -412,17 +413,6 @@ class StatusIcon: else: win.present() - def on_clicked(self, widget, event): - self.on_tray_leave_notify_event(widget, None) - if event.type_ != Gdk.EventType.BUTTON_PRESS: - return - if event.button == 1: # Left click - self.on_left_click() - elif event.button == 2: # middle click - self.on_middle_click() - elif event.button == 3: # right click - self.make_menu(event.button, event.time) - def on_show_menuitem_activate(self, widget, show): # we all add some fake (we cannot select those nor have them as show) # but this helps to align with roster's status_combobox index positions ===================================== gajim/gui_interface.py ===================================== @@ -2737,7 +2737,7 @@ class Interface: self.systray_enabled = False - from gajim import statusicon + from gajim.gtk import statusicon self.systray = statusicon.StatusIcon() pixs = [] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c08f752d8981ae06155fcb3dac3938fae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c08f752d8981ae06155fcb3dac3938fae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor "Save as" menu
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c08f752d by Philipp Hörist at 2018-10-24T21:42:07Z Refactor "Save as" menu - - - - - 4 changed files: - gajim/chat_control.py - gajim/gtk/profile.py - gajim/gui_menu_builder.py - gajim/vcard.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -568,8 +568,6 @@ class ChatControl(ChatControlBase): If right-clicked, show popup """ if event.button == 3: # right click - menu = Gtk.Menu() - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) if self.TYPE_ID == message_control.TYPE_CHAT: sha = app.contacts.get_avatar_sha( self.account, self.contact.jid) @@ -577,16 +575,7 @@ class ChatControl(ChatControlBase): else: sha = self.gc_contact.avatar_sha name = self.gc_contact.get_shown_name() - id_ = menuitem.connect('activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, sha, name) - self.handlers[id_] = menuitem - menu.append(menuitem) - menu.show_all() - menu.connect('selection-done', lambda w: w.destroy()) - # show the menu - menu.show_all() - menu.attach_to_widget(widget, None) - menu.popup(None, None, None, None, event.button, event.time) + gui_menu_builder.show_save_as_menu(sha, name) return True def on_location_eventbox_button_release_event(self, widget, event): ===================================== gajim/gtk/profile.py ===================================== @@ -31,6 +31,7 @@ from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim import gtkgui_helpers +from gajim.gui_menu_builder import show_save_as_menu from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InformationDialog @@ -154,25 +155,13 @@ class ProfileWindow(Gtk.ApplicationWindow): """ If right-clicked, show popup """ - if event.button == 3: # right click - menu = Gtk.Menu() - nick = app.config.get_per('accounts', self.account, 'name') if self.avatar_sha is None: return - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) - menuitem.connect( - 'activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.avatar_sha, nick) - menu.append(menuitem) - menu.connect('selection-done', lambda w: w.destroy()) - # show the menu - menu.show_all() - menu.attach_to_widget(widget, None) - menu.popup(None, None, None, None, event.button, event.time) + show_save_as_menu(self.avatar_sha, nick) + elif event.button == 1: # left click self.on_set_avatar_button_clicked(widget) ===================================== gajim/gui_menu_builder.py ===================================== @@ -596,6 +596,18 @@ def get_transport_menu(contact, account): return menu +def show_save_as_menu(sha, name): + menu = Gtk.Menu() + menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) + menuitem.connect( + 'activate', + gtkgui_helpers.on_avatar_save_as_menuitem_activate, sha, name) + menu.append(menuitem) + menu.connect('selection-done', lambda w: w.destroy()) + menu.show_all() + menu.popup_at_pointer() + + def get_singlechat_menu(control_id): singlechat_menu = [ (_('Send File…'), [ ===================================== gajim/vcard.py ===================================== @@ -34,6 +34,7 @@ from gi.repository import GLib from gi.repository import Gdk from gajim import gtkgui_helpers +from gajim.gui_menu_builder import show_save_as_menu from gajim.common import helpers from gajim.common import app from gajim.common import ged @@ -160,8 +161,6 @@ class VcardWindow: If right-clicked, show popup """ if event.button == 3: # right click - menu = Gtk.Menu() - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) if self.gc_contact: sha = self.gc_contact.avatar_sha name = self.gc_contact.get_shown_name() @@ -171,14 +170,7 @@ class VcardWindow: name = self.contact.get_shown_name() if sha is None: sha = self.avatar - menuitem.connect('activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, sha, name) - menu.append(menuitem) - menu.connect('selection-done', lambda w: w.destroy()) - # show the menu - menu.show_all() - menu.attach_to_widget(widget, None) - menu.popup(None, None, None, None, event.button, event.time) + show_save_as_menu(sha, name) def set_value(self, entry_name, value): try: @@ -512,17 +504,8 @@ class ZeroconfVcardWindow: If right-clicked, show popup """ if event.button == 3: # right click - menu = Gtk.Menu() - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) - menuitem.connect('activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.contact.avatar_sha, self.contact.get_shown_name()) - menu.append(menuitem) - menu.connect('selection-done', lambda w: w.destroy()) - # show the menu - menu.show_all() - menu.attach_to_widget(widget, None) - menu.popup(None, None, None, None, event.button, event.time) + show_save_as_menu(self.contact.avatar_sha, + self.contact.get_shown_name()) def set_value(self, entry_name, value): try: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c08f752d8981ae06155fcb3dac3938fae9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c08f752d8981ae06155fcb3dac3938fae9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use keyword init for Labels
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c6b2e0b by Philipp Hörist at 2018-10-24T21:04:14Z Use keyword init for Labels keyword-less init is deprecated - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -396,7 +396,7 @@ class Account(Gtk.Box): self.options = AccountPage(account, parent) self.parent = parent - self.label = Gtk.Label(app.get_account_label(account)) + self.label = Gtk.Label(label=app.get_account_label(account)) self.label.set_halign(Gtk.Align.START) self.label.set_hexpand(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c6b2e0bb4b47de4cd95de436ed2958954… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c6b2e0bb4b47de4cd95de436ed2958954… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint error
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 974b3513 by Philipp Hörist at 2018-10-24T19:16:13Z Fix pylint error - - - - - 1 changed file: - gajim/gtk/exception.py Changes: ===================================== gajim/gtk/exception.py ===================================== @@ -101,7 +101,7 @@ class ExceptionDialog(): Gtk.get_minor_version(), Gtk.get_micro_version()) gobject_ver = '.'.join(map(str, GObject.pygobject_version)) - glib_ver = '.'.join(map(str, GLib.glib_version)) + glib_ver = '.'.join(map(str, GLib.glib_version)) return ISSUE_TEXT.format(get_os_info(), gtk_ver, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/974b351338970ca685846c1257aa2f646b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/974b351338970ca685846c1257aa2f646b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve ExceptionDialog
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0e2a9c72 by Philipp Hörist at 2018-10-24T19:14:54Z Improve ExceptionDialog - Move to gtk module - Use get_builder() so translation works - Add GLib version - Remove standalone testing code - - - - - 3 changed files: - gajim/data/gui/exception_dialog.ui - gajim/gajim.py - gajim/gtkexcepthook.py → gajim/gtk/exception.py Changes: ===================================== gajim/data/gui/exception_dialog.ui ===================================== @@ -2,7 +2,7 @@  <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkApplicationWindow" id="ExceptionDialog"> + <object class="GtkApplicationWindow" id="exception_dialog"> <property name="can_focus">False</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> ===================================== gajim/gajim.py ===================================== @@ -67,8 +67,8 @@ def _init_gtk(): 'Quitting...' % _MIN_GTK_VER) sys.exit(1) - from gajim import gtkexcepthook - gtkexcepthook.init() + from gajim.gtk import exception + exception.init() i18n.initialize_direction_mark() ===================================== gajim/gtkexcepthook.py → gajim/gtk/exception.py ===================================== @@ -23,25 +23,19 @@ import traceback import threading import webbrowser import platform +from pathlib import Path from io import StringIO from urllib.parse import urlencode -import nbxmpp -from gi.repository import Gtk, GObject +from gi.repository import Gtk +from gi.repository import GObject +from gi.repository import GLib -try: - import gajim - gajim_version = gajim.__version__ -except ImportError: - # For standalone testing - gajim_version = 'Package not installed' +import nbxmpp -if __name__ == '__main__': - glade_file = os.path.join('data', 'gui', 'exception_dialog.ui') -else: - from gajim.common import configpaths - gui_path = configpaths.get('GUI') - glade_file = os.path.join(gui_path, 'exception_dialog.ui') +import gajim +from gajim.common import configpaths +from gajim.gtk.util import get_builder _exception_in_progress = threading.Lock() @@ -50,6 +44,7 @@ ISSUE_TEXT = '''## Versions - OS: {} - GTK+ Version: {} - PyGObject Version: {} +- GLib Version : {} - python-nbxmpp Version: {} - Gajim Version: {} @@ -74,22 +69,21 @@ def _hook(type_, value, tb): class ExceptionDialog(): def __init__(self, type_, value, tb): - builder = Gtk.Builder() - builder.add_from_file(glade_file) - self.dialog = builder.get_object("ExceptionDialog") - builder.connect_signals(self) - builder.get_object("report_btn").grab_focus() - self.exception_view = builder.get_object("exception_view") - buffer_ = self.exception_view.get_buffer() + path = Path(configpaths.get('GUI')) / 'exception_dialog.ui' + self._ui = get_builder(path.resolve()) + self._ui.connect_signals(self) + + self._ui.report_btn.grab_focus() + + buffer_ = self._ui.exception_view.get_buffer() trace = StringIO() traceback.print_exception(type_, value, tb, None, trace) self.text = self.get_issue_text(trace.getvalue()) buffer_.set_text(self.text) print(self.text) - self.exception_view.set_editable(False) - self.dialog.show() - if __name__ == '__main__': - self.dialog.connect('delete-event', self._on_delete_event) + + self._ui.exception_view.set_editable(False) + self._ui.exception_dialog.show() def on_report_clicked(self, *args): issue_url = 'https://dev.gajim.org/gajim/gajim/issues/new' @@ -98,25 +92,23 @@ class ExceptionDialog(): webbrowser.open(url, new=2) def on_close_clicked(self, *args): - self.dialog.destroy() - if __name__ == '__main__': - Gtk.main_quit() - - def _on_delete_event(self, *args): - Gtk.main_quit() + self._ui.exception_dialog.destroy() - def get_issue_text(self, traceback_text): + @staticmethod + def get_issue_text(traceback_text): gtk_ver = '%i.%i.%i' % ( Gtk.get_major_version(), Gtk.get_minor_version(), Gtk.get_micro_version()) gobject_ver = '.'.join(map(str, GObject.pygobject_version)) + glib_ver = '.'.join(map(str, GLib.glib_version)) return ISSUE_TEXT.format(get_os_info(), gtk_ver, gobject_ver, + glib_ver, nbxmpp.__version__, - gajim_version, + gajim.__version__, traceback_text) @@ -135,11 +127,3 @@ def get_os_info(): except ImportError: return platform.system() return '' - - -# this is just to assist testing (python3 gtkexcepthook.py) -if __name__ == '__main__': - init() - print(sys.version) - ExceptionDialog(None, None, None) - Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0e2a9c724f4afa7080fcb3678429cfe802… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0e2a9c724f4afa7080fcb3678429cfe802… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ExceptionDialog GUI
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 79a37f69 by Daniel Brötzmann at 2018-10-24T18:41:16Z Update ExceptionDialog GUI - - - - - 1 changed file: - gajim/data/gui/exception_dialog.ui Changes: ===================================== gajim/data/gui/exception_dialog.ui ===================================== @@ -1,29 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkApplicationWindow" id="ExceptionDialog"> <property name="can_focus">False</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> - <property name="margin_top">12</property> - <property name="margin_bottom">12</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkGrid" id="grid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">20</property> - <property name="column_spacing">20</property> + <property name="spacing">12</property> <child> - <object class="GtkImage" id="image"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -31,59 +30,61 @@ <property name="icon_size">6</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="msglabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes">A programming error has been detected. It probably is not fatal, but should be reported to the developers nonetheless.</property> - <property name="wrap">True</property> - <property name="max_width_chars">60</property> - <property name="lines">3</property> - <attributes> - <attribute name="font-desc" value="<Geben Sie den Wert ein> 12"/> - </attributes> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkTextView" id="exception_view"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="editable">False</property> - <property name="left_margin">4</property> - <property name="right_margin">4</property> - <property name="accepts_tab">False</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Sorry, that should not have happened</property> + <style> + <class name="large-header"/> + <class name="dim-label"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Gajim encountered an error. A report is shown below. +By reporting this bug you might help people to fix this.</property> + <property name="wrap">True</property> + <property name="max_width_chars">60</property> + <property name="lines">3</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -112,11 +113,15 @@ </child> <child> <object class="GtkButton" id="report_btn"> - <property name="label" translatable="yes">Report Bug</property> + <property name="label" translatable="yes">_Report Bug</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_report_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">True</property> @@ -132,10 +137,33 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkScrolledWindow"> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="exception_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="editable">False</property> + <property name="left_margin">4</property> + <property name="right_margin">4</property> + <property name="accepts_tab">False</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> </child> - <child> - <placeholder/> - </child> </object> </interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/79a37f6992acc2adb21b04549860eaaf11… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/79a37f6992acc2adb21b04549860eaaf11… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2018