Commits August 2018

commits@gajim.org

1 participants
79 discussions

[Git][gajim/gajim][master] 2 commits: Rework Preferences Dialog
by Philipp Hörist 06 Aug '18

06 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 42adff1b by Sophie Herold at 2018-08-06T17:48:49Z Rework Preferences Dialog - - - - - c778ed69 by Philipp Hörist at 2018-08-06T17:48:49Z Move Preferences into own module - Port Preferences to Gtk.ApplicationWindow - - - - - 8 changed files: - gajim/advanced_configuration_window.py - gajim/app_actions.py - gajim/config.py - gajim/data/gui/preferences_window.ui - gajim/gajim_themes_window.py - + gajim/gtk/preferences.py - gajim/gui_interface.py - gajim/statusicon.py Changes: ===================================== gajim/advanced_configuration_window.py ===================================== --- a/gajim/advanced_configuration_window.py +++ b/gajim/advanced_configuration_window.py @@ -69,11 +69,10 @@ def tree_model_pre_order(model, treeiter): class AdvancedConfigurationWindow(object): - def __init__(self): + def __init__(self, transient): self.xml = gtkgui_helpers.get_gtk_builder('advanced_configuration_window.ui') self.window = self.xml.get_object('advanced_configuration_window') - self.window.set_transient_for( - app.interface.instances['preferences'].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') ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -28,6 +28,7 @@ from gajim import disco from gajim.gtk.history_sync import HistorySyncAssistant from gajim.gtk.server_info import ServerInfoDialog from gajim.gtk.mam_preferences import MamPreferences +from gajim.gtk.preferences import Preferences from gajim.gtk import JoinGroupchatWindow from gajim.gtk import StartChatDialog from gajim.gtk import AddNewContactWindow @@ -50,11 +51,11 @@ def on_add_contact_jid(action, param): def on_preferences(action, param): - if 'preferences' in interface.instances: - interface.instances['preferences'].window.present() + window = app.get_app_window(Preferences) + if window is None: + Preferences() else: - interface.instances['preferences'] = \ - config.PreferencesWindow() + window.present() def on_plugins(action, param): ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -35,1156 +35,19 @@ import os from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import Pango from gi.repository import GObject -from gi.repository import GLib - -from gajim.common import config as c_config -from gajim.common import idle -from gajim.common.i18n import Q_ from gajim import gtkgui_helpers from gajim import dialogs -from gajim import cell_renderer_image -from gajim import message_control -from gajim.chat_control_base import ChatControlBase -from gajim.gajim_themes_window import GajimThemesWindow -from gajim.advanced_configuration_window import AdvancedConfigurationWindow from gajim import dataforms_widget from gajim import gui_menu_builder -from gajim.gtk import AspellDictError from gajim.gtk import ConfirmationDialog from gajim.gtk import ConfirmationDialogDoubleRadio from gajim.gtk import ErrorDialog from gajim.gtk import InputDialog -from gajim.gtk import WarningDialog - from gajim.common import helpers from gajim.common import app -from gajim.common import connection -from gajim.common.modules import dataforms -from gajim.common import ged -from gajim.common import configpaths -from gajim.accounts_window import AccountsWindow - -try: - from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager - from gajim.common.multimedia_helpers import VideoInputManager, VideoOutputManager - HAS_GST = True -except (ImportError, ValueError): - HAS_GST = False - -if app.is_installed('GSPELL'): - from gi.repository import Gspell - -#---------- PreferencesWindow class -------------# -class PreferencesWindow: - """ - Class for Preferences window - """ - - def on_preferences_window_destroy(self, widget): - """ - Close window - """ - del app.interface.instances['preferences'] - - def on_close_button_clicked(self, widget): - self.window.destroy() - - def __init__(self): - """ - Initialize Preferences window - """ - self.xml = gtkgui_helpers.get_gtk_builder('preferences_window.ui') - self.window = self.xml.get_object('preferences_window') - self.window.set_transient_for(app.interface.roster.window) - self.notebook = self.xml.get_object('preferences_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') - - ### General tab ### - # Display avatars in roster - st = app.config.get('show_avatars_in_roster') - self.xml.get_object('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) - - # 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) - else: - w.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) - st = app.config.get('sort_by_show_in_muc') - self.xml.get_object('sort_by_show_in_muc_checkbutton').set_active(st) - - # emoticons - emoticons_combobox = self.xml.get_object('emoticons_combobox') - emoticon_themes = helpers.get_available_emoticon_themes() - - emoticons_combobox.append_text(_('Disabled')) - 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 = _('Disabled') - emoticons_combobox.set_id_column(0) - emoticons_combobox.set_active_id(config_theme) - - # 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) - - # use speller - if app.is_installed('GSPELL'): - st = app.config.get('use_speller') - self.xml.get_object('speller_checkbutton').set_active(st) - else: - self.xml.get_object('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) - - # 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') - cell = Gtk.CellRendererText() - theme_combobox.pack_start(cell, True) - theme_combobox.add_attribute(cell, 'text', 0) - 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) - l = [] - 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 != '.svn' and dir != 'transports': - l.append(dir) - if l.count == 0: - l.append(' ') - for i in range(len(l)): - preview = Gtk.Image() - files = [] - files.append(os.path.join(helpers.get_iconset_path(l[i]), '16x16', - 'online.png')) - files.append(os.path.join(helpers.get_iconset_path(l[i]), '16x16', - 'online.gif')) - for file_ in files: - if os.path.exists(file_): - preview.set_from_file(file_) - model.append([preview, l[i]]) - if app.config.get('iconset') == l[i]: - self.iconset_combobox.set_active(i) - - # Use transports iconsets - st = app.config.get('use_transports_iconsets') - self.xml.get_object('transports_iconsets_checkbutton').set_active(st) - - # Color widgets - self.draw_color_widgets() - - # Font for messages - font = app.config.get('conversation_font') - # try to set default font for the current desktop env - fontbutton = self.xml.get_object('conversation_fontbutton') - if font == '': - fontbutton.set_sensitive(False) - self.xml.get_object('default_chat_font').set_active(True) - else: - fontbutton.set_font_name(font) - - ### Personal Events tab ### - # outgoing send chat state notifications - st = 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) - - # displayed send 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) - elif st == 'composing_only': - combo.set_active(1) - else: # disabled - combo.set_active(2) - - - ### Notifications tab ### - # On new event - on_event_combobox = self.xml.get_object('on_event_combobox') - if app.config.get('autopopup'): - on_event_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) - - # notify on online statuses - st = app.config.get('notify_on_signin') - self.notify_on_signin_checkbutton.set_active(st) - - # notify on offline statuses - st = app.config.get('notify_on_signout') - self.notify_on_signout_checkbutton.set_active(st) - - # autopopupaway - st = app.config.get('autopopupaway') - self.auto_popup_away_checkbutton.set_active(st) - - # autopopup_chat_opened - 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) - - # 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 - if app.config.get('sounds_on'): - self.xml.get_object('play_sounds_checkbutton').set_active(True) - else: - self.xml.get_object('manage_sounds_button').set_sensitive(False) - - #### Status tab ### - # Autoaway - st = app.config.get('autoaway') - self.auto_away_checkbutton.set_active(st) - - # Autoawaytime - st = app.config.get('autoawaytime') - self.auto_away_time_spinbutton.set_value(st) - self.auto_away_time_spinbutton.set_sensitive(app.config.get('autoaway')) - - # autoaway 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')) - - # Autoxa - st = app.config.get('autoxa') - self.auto_xa_checkbutton.set_active(st) - - # Autoxatime - st = app.config.get('autoxatime') - self.auto_xa_time_spinbutton.set_value(st) - self.auto_xa_time_spinbutton.set_sensitive(app.config.get('autoxa')) - - # autoxa 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')) - - if not idle.Monitor.is_available(): - self.xml.get_object('autoaway_table').set_sensitive(False) - - # ask_status when online / offline - st = app.config.get('ask_online_status') - self.xml.get_object('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) - - # Default Status messages - self.default_msg_tree = self.xml.get_object('default_msg_treeview') - 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.fill_msg_treeview() - - buf = self.xml.get_object('msg_textview').get_buffer() - buf.connect('end-user-action', self.on_msg_textview_changed) - - ### Audio / Video tab ### - def create_av_combobox(opt_name, device_dict, config_name=None, - key=None): - combobox = self.xml.get_object(opt_name + '_combobox') - cell = Gtk.CellRendererText() - cell.set_property('ellipsize', Pango.EllipsizeMode.END) - cell.set_property('ellipsize-set', True) - combobox.pack_start(cell, True) - combobox.add_attribute(cell, 'text', 0) - model = Gtk.ListStore(str, str) - combobox.set_model(model) - if config_name: - config = app.config.get(config_name) - else: - config = app.config.get(opt_name + '_device') - - for index, (name, value) in enumerate(sorted(device_dict.items(), - key=key)): - model.append((name, value)) - if config == value: - combobox.set_active(index) - - if HAS_GST and app.is_installed('FARSTREAM'): - create_av_combobox('audio_input', AudioInputManager().get_devices()) - create_av_combobox('audio_output', AudioOutputManager().get_devices( - )) - create_av_combobox('video_input', VideoInputManager().get_devices()) - create_av_combobox('video_output', VideoOutputManager().get_devices( - )) - - create_av_combobox('video_framerate', {_('Default'): '', - '15fps': '15/1', '10fps': '10/1', '5fps': '5/1', - '2.5fps': '5/2'}, 'video_framerate', key=lambda x: -1 if \ - not x[1] else float(x[0][:-3])) - create_av_combobox('video_size', {_('Default'): '', - '800x600': '800x600', '640x480': '640x480', - '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) - - 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.set_sensitive(False) - - # STUN - cb = self.xml.get_object('stun_checkbutton') - st = app.config.get('use_stun_server') - cb.set_active(st) - - entry = self.xml.get_object('stun_server_entry') - entry.set_text(app.config.get('stun_server')) - if not st: - entry.set_sensitive(False) - - ### Advanced tab ### - # 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() - 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) - - if app.config.get('autodetect_browser_mailer'): - self.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.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) - - self.xml.connect_signals(self) - - self.msg_tree.get_model().connect('row-changed', - self.on_msg_treemodel_row_changed) - self.msg_tree.get_model().connect('row-deleted', - self.on_msg_treemodel_row_deleted) - self.default_msg_tree.get_model().connect('row-changed', - self.on_default_msg_treemodel_row_changed) - - self.theme_preferences = None - self.sounds_preferences = None - - self.notebook.set_current_page(0) - self.xml.get_object('close_button').grab_focus() - - self.window.show_all() - gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) - - def on_preferences_notebook_switch_page(self, widget, page, page_num): - GLib.idle_add(self.xml.get_object('close_button').grab_focus) - - def on_preferences_window_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self.window.hide() - - def get_per_account_option(self, opt): - """ - Return the value of the option opt if it's the same in all accounts else - returns "mixed" - """ - if len(app.connections) == 0: - # a non existent key return default value - return app.config.get_per('accounts', '__default__', opt) - val = None - for account in app.connections: - v = app.config.get_per('accounts', account, opt) - if val is None: - val = v - elif val != v: - return 'mixed' - return val - - def on_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets=None): - app.config.set(config_name, widget.get_active()) - if change_sensitivity_widgets: - for w in change_sensitivity_widgets: - w.set_sensitive(widget.get_active()) - - def on_per_account_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets=None): - for account in app.connections: - app.config.set_per('accounts', account, config_name, - widget.get_active()) - if change_sensitivity_widgets: - for w in change_sensitivity_widgets: - w.set_sensitive(widget.get_active()) - - def _get_all_controls(self): - for ctrl in app.interface.msg_win_mgr.get_controls(): - yield ctrl - for account in app.connections: - for ctrl in app.interface.minimized_controls[account].values(): - yield ctrl - - def _get_all_muc_controls(self): - for ctrl in app.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC): - yield ctrl - for account in app.connections: - 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() - - 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_avatars_in_roster_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') - app.interface.roster.setup_and_draw_roster() - # Redraw groupchats (in an ugly way) - for ctrl in self._get_all_muc_controls(): - ctrl.draw_roster() - - def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster') - app.interface.roster.setup_and_draw_roster() - for ctrl in self._get_all_muc_controls(): - ctrl.update_ui() - - def on_show_pep_in_roster_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'show_mood_in_roster') - self.on_checkbutton_toggled(widget, 'show_activity_in_roster') - self.on_checkbutton_toggled(widget, 'show_tunes_in_roster') - 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] - if emot_theme == _('Disabled'): - app.config.set('emoticons_theme', '') - else: - app.config.set('emoticons_theme', emot_theme) - - app.interface.init_emoticons() - app.interface.make_regexps() - 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 apply_speller(self): - for ctrl in self._get_all_controls(): - if isinstance(ctrl, ChatControlBase): - ctrl.set_speller() - - def on_speller_checkbutton_toggled(self, widget): - active = widget.get_active() - app.config.set('use_speller', active) - if not active: - return - lang = app.config.get('speller_language') - gspell_lang = Gspell.language_lookup(lang) - if gspell_lang is None: - gspell_lang = Gspell.language_get_default() - if gspell_lang is None: - AspellDictError(lang) - app.config.set('use_speller', False) - widget.set_active(False) - else: - app.config.set('speller_language', gspell_lang.get_code()) - self.apply_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') - - def on_theme_combobox_changed(self, widget): - model = widget.get_model() - active = widget.get_active() - config_theme = model[active][0].replace(' ', '_') - - app.config.set('roster_theme', config_theme) - - # begin repainting themed widgets throughout - app.interface.roster.repaint_themed_widgets() - app.interface.roster.change_roster_style(None) - gtkgui_helpers.load_css() - def update_theme_list(self): - theme_combobox = self.xml.get_object('theme_combobox') - model = Gtk.ListStore(str) - theme_combobox.set_model(model) - i = 0 - for config_theme in app.config.get_per('themes'): - theme = config_theme.replace('_', ' ') - model.append([theme]) - if app.config.get('roster_theme') == config_theme: - theme_combobox.set_active(i) - i += 1 - - def on_manage_theme_button_clicked(self, widget): - if self.theme_preferences is None: - self.theme_preferences = GajimThemesWindow() - else: - self.theme_preferences.window.present() - self.theme_preferences.select_active_theme() - - 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() - - 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() - - def on_displayed_chat_states_combobox_changed(self, widget): - active = widget.get_active() - if active == 0: # all - app.config.set('displayed_chat_state_notifications', 'all') - elif active == 1: # only composing - app.config.set('displayed_chat_state_notifications', - 'composing_only') - 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') - - def on_on_event_combobox_changed(self, widget): - active = widget.get_active() - if active == 0: - app.config.set('autopopup', True) - app.config.set('notify_on_new_message', False) - elif active == 1: - app.config.set('autopopup', False) - app.config.set('notify_on_new_message', True) - else: - app.config.set('autopopup', False) - app.config.set('notify_on_new_message', False) - - def on_notify_on_signin_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'notify_on_signin') - - def on_notify_on_signout_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'notify_on_signout') - - def on_auto_popup_away_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'autopopupaway') - - 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')]) - - def on_manage_sounds_button_clicked(self, widget): - if self.sounds_preferences is None: - self.sounds_preferences = ManageSoundsWindow() - else: - self.sounds_preferences.window.present() - - def update_text_tags(self): - """ - Update color tags in opened chat windows - """ - for ctrl in self._get_all_controls(): - ctrl.update_tags() - - def on_preference_widget_color_set(self, widget, text): - color = widget.get_color() - color_string = color.to_string() - app.config.set(text, color_string) - self.update_text_tags() - - def on_preference_widget_font_set(self, widget, text): - if widget: - font = widget.get_font_name() - else: - font = '' - app.config.set(text, font) - gtkgui_helpers.load_css() - - def on_incoming_nick_colorbutton_color_set(self, widget): - self.on_preference_widget_color_set(widget, 'inmsgcolor') - - def on_outgoing_nick_colorbutton_color_set(self, widget): - self.on_preference_widget_color_set(widget, 'outmsgcolor') - - def on_incoming_msg_colorbutton_color_set(self, widget): - self.on_preference_widget_color_set(widget, 'inmsgtxtcolor') - - def on_outgoing_msg_colorbutton_color_set(self, widget): - self.on_preference_widget_color_set(widget, 'outmsgtxtcolor') - - def on_url_msg_colorbutton_color_set(self, widget): - self.on_preference_widget_color_set(widget, 'urlmsgcolor') - - def on_status_msg_colorbutton_color_set(self, widget): - self.on_preference_widget_color_set(widget, 'statusmsgcolor') - - def on_muc_highlight_colorbutton_color_set(self, widget): - self.on_preference_widget_color_set(widget, 'markedmsgcolor') - - def on_conversation_fontbutton_font_set(self, widget): - self.on_preference_widget_font_set(widget, 'conversation_font') - - def on_default_chat_font_toggled(self, widget): - font_widget = self.xml.get_object('conversation_fontbutton') - if widget.get_active(): - font_widget.set_sensitive(False) - font_widget = None - else: - font_widget.set_sensitive(True) - self.on_preference_widget_font_set(font_widget, 'conversation_font') - - def draw_color_widgets(self): - col_to_widget = {'inmsgcolor': 'incoming_nick_colorbutton', - 'outmsgcolor': 'outgoing_nick_colorbutton', - 'inmsgtxtcolor': ['incoming_msg_colorbutton', - 'incoming_msg_checkbutton'], - 'outmsgtxtcolor': ['outgoing_msg_colorbutton', - 'outgoing_msg_checkbutton'], - 'statusmsgcolor': 'status_msg_colorbutton', - 'urlmsgcolor': 'url_msg_colorbutton', - 'markedmsgcolor': 'muc_highlight_colorbutton'} - for c in col_to_widget: - col = app.config.get(c) - if col: - if isinstance(col_to_widget[c], list): - rgba = Gdk.RGBA() - rgba.parse(col) - self.xml.get_object(col_to_widget[c][0]).set_rgba(rgba) - self.xml.get_object(col_to_widget[c][0]).set_sensitive(True) - self.xml.get_object(col_to_widget[c][1]).set_active(True) - else: - rgba = Gdk.RGBA() - rgba.parse(col) - self.xml.get_object(col_to_widget[c]).set_rgba(rgba) - else: - rgba = Gdk.RGBA() - rgba.parse('#000000') - if isinstance(col_to_widget[c], list): - self.xml.get_object(col_to_widget[c][0]).set_rgba(rgba) - self.xml.get_object(col_to_widget[c][0]).set_sensitive(False) - self.xml.get_object(col_to_widget[c][1]).set_active(False) - else: - self.xml.get_object(col_to_widget[c]).set_rgba(rgba) - - def on_reset_colors_button_clicked(self, widget): - col_to_widget = {'inmsgcolor': 'incoming_nick_colorbutton', - 'outmsgcolor': 'outgoing_nick_colorbutton', - 'inmsgtxtcolor': 'incoming_msg_colorbutton', - 'outmsgtxtcolor': 'outgoing_msg_colorbutton', - 'statusmsgcolor': 'status_msg_colorbutton', - 'urlmsgcolor': 'url_msg_colorbutton', - 'markedmsgcolor': 'muc_highlight_colorbutton'} - for c in col_to_widget: - app.config.set(c, app.interface.default_colors[c]) - self.draw_color_widgets() - - self.update_text_tags() - - def _set_color(self, state, widget_name, option): - """ - Set color value in prefs and update the UI - """ - if state: - color = self.xml.get_object(widget_name).get_rgba() - color_string = color.to_string() - else: - color_string = '' - app.config.set(option, color_string) - - def on_incoming_msg_checkbutton_toggled(self, widget): - state = widget.get_active() - self.xml.get_object('incoming_msg_colorbutton').set_sensitive(state) - self._set_color(state, 'incoming_msg_colorbutton', 'inmsgtxtcolor') - - def on_outgoing_msg_checkbutton_toggled(self, widget): - state = widget.get_active() - self.xml.get_object('outgoing_msg_colorbutton').set_sensitive(state) - self._set_color(state, 'outgoing_msg_colorbutton', 'outmsgtxtcolor') - - def on_auto_away_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'autoaway', - [self.auto_away_time_spinbutton, self.auto_away_message_entry]) - - def on_auto_away_time_spinbutton_value_changed(self, widget): - aat = widget.get_value_as_int() - app.config.set('autoawaytime', aat) - idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, - app.config.get('autoxatime') * 60) - - def on_auto_away_message_entry_changed(self, widget): - app.config.set('autoaway_message', widget.get_text()) - - def on_auto_xa_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'autoxa', - [self.auto_xa_time_spinbutton, self.auto_xa_message_entry]) - - def on_auto_xa_time_spinbutton_value_changed(self, widget): - axt = widget.get_value_as_int() - app.config.set('autoxatime', axt) - idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, - app.config.get('autoxatime') * 60) - - def on_auto_xa_message_entry_changed(self, widget): - app.config.set('autoxa_message', widget.get_text()) - - def on_prompt_online_status_message_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'ask_online_status') - - def on_prompt_offline_status_message_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'ask_offline_status') - - def fill_default_msg_treeview(self): - model = self.default_msg_tree.get_model() - model.clear() - status = [] - for status_ in app.config.get_per('defaultstatusmsg'): - status.append(status_) - status.sort() - for status_ in status: - msg = app.config.get_per('defaultstatusmsg', status_, 'message') - msg = helpers.from_one_line(msg) - enabled = app.config.get_per('defaultstatusmsg', status_, 'enabled') - iter_ = model.append() - uf_show = helpers.get_uf_show(status_) - 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() - 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[path][3] = not model[path][3] - - def on_default_msg_treemodel_row_changed(self, model, path, iter_): - status = model[iter_][0] - message = model[iter_][2] - message = helpers.to_one_line(message) - app.config.set_per('defaultstatusmsg', status, 'enabled', - model[iter_][3]) - app.config.set_per('defaultstatusmsg', status, 'message', message) - - def save_status_messages(self, model): - for msg in app.config.get_per('statusmsg'): - app.config.del_per('statusmsg', msg) - 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 - 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 - for subname in ('activity', 'subactivity', 'activity_text', - 'mood', 'mood_text'): - val2 = model[iter_][i] - if not val2: - val2 = '' - app.config.set_per('statusmsg', val, subname, val2) - i += 1 - iter_ = model.iter_next(iter_) - - def on_msg_treemodel_row_changed(self, model, path, iter_): - self.save_status_messages(model) - - 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() - model.clear() - preset_status = [] - for msg_name in app.config.get_per('statusmsg'): - if msg_name.startswith('_last_'): - continue - preset_status.append(msg_name) - preset_status.sort() - for msg_name in preset_status: - msg_text = app.config.get_per('statusmsg', msg_name, 'message') - msg_text = helpers.from_one_line(msg_text) - activity = app.config.get_per('statusmsg', msg_name, 'activity') - subactivity = app.config.get_per('statusmsg', msg_name, - 'subactivity') - activity_text = app.config.get_per('statusmsg', msg_name, - 'activity_text') - mood = app.config.get_per('statusmsg', msg_name, 'mood') - mood_text = app.config.get_per('statusmsg', msg_name, 'mood_text') - iter_ = model.append() - model.set(iter_, 0, msg_name, 1, msg_text, 2, activity, 3, - 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() - 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() - 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() - msg = model[iter_][1] - buf.set_text(msg) - - def on_new_msg_button_clicked(self, widget, data = None): - model = self.msg_tree.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_)) - - def on_delete_msg_button_clicked(self, widget, data = None): - sel = self.msg_tree.get_selection() - if not sel: - return - (model, iter_) = sel.get_selected() - if not iter_: - return - buf = self.xml.get_object('msg_textview').get_buffer() - model.remove(iter_) - buf.set_text('') - self.xml.get_object('delete_msg_button').set_sensitive(False) - - def on_msg_textview_changed(self, widget, data = None): - sel = self.msg_tree.get_selection() - if not sel: - return - (model, iter_) = sel.get_selected() - if not iter_: - return - buf = self.xml.get_object('msg_textview').get_buffer() - first_iter, end_iter = buf.get_bounds() - model.set_value(iter_, 1, buf.get_text(first_iter, end_iter, True)) - - def on_msg_treeview_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Delete: - self.on_delete_msg_button_clicked(widget) - - 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): - if 'manage_proxies' in app.interface.instances: - app.interface.instances['manage_proxies'].window.present() - else: - app.interface.instances['manage_proxies'] = ManageProxiesWindow( - self.window) - - def update_proxy_list(self): - 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.clear() - l = app.config.get_per('proxies') - l.insert(0, _('None')) - for i in range(len(l)): - model.append([l[i]]) - if our_proxy == l[i]: - proxy_combobox.set_active(i) - - 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'] = \ - AdvancedConfigurationWindow() #---------- ManageProxiesWindow class -------------# class ManageProxiesWindow: @@ -1834,12 +697,11 @@ class RemoveAccountWindow: class ManageSoundsWindow: - def __init__(self): + def __init__(self, transient): self._builder = gtkgui_helpers.get_gtk_builder( 'manage_sounds_window.ui') self.window = self._builder.get_object('manage_sounds_window') - self.window.set_transient_for( - app.interface.instances['preferences'].window) + self.window.set_transient_for(transient) self.sound_button = self._builder.get_object('filechooser') @@ -1932,4 +794,6 @@ class ManageSoundsWindow: def _on_destroy(self, *args): self.window.destroy() - app.interface.instances['preferences'].sounds_preferences = None + window = app.get_app_window('Preferences') + if window is not None: + window.sounds_preferences = None ===================================== gajim/data/gui/preferences_window.ui ===================================== The diff for this file was not included because it is too large. ===================================== gajim/gajim_themes_window.py ===================================== --- a/gajim/gajim_themes_window.py +++ b/gajim/gajim_themes_window.py @@ -34,11 +34,10 @@ from gajim.gtk.util import get_builder class GajimThemesWindow: - def __init__(self): + def __init__(self, transient): self.xml = get_builder('gajim_themes_window.ui') self.window = self.xml.get_object('gajim_themes_window') - self.window.set_transient_for(app.interface.instances[ - 'preferences'].window) + self.window.set_transient_for(transient) self.options = ['account', 'group', 'contact', 'banner'] self.options_combobox = self.xml.get_object('options_combobox') @@ -85,8 +84,9 @@ class GajimThemesWindow: return True # do NOT destroy the window def on_close_button_clicked(self, widget): - if 'preferences' in app.interface.instances: - app.interface.instances['preferences'].update_theme_list() + window = app.get_app_window('Preferences') + if window is not None: + window.update_theme_list() self.window.hide() def on_theme_cell_edited(self, cell, row, new_name): ===================================== gajim/gtk/preferences.py ===================================== --- /dev/null +++ b/gajim/gtk/preferences.py @@ -0,0 +1,1140 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import os + +from gi.repository import Gtk +from gi.repository import Gdk +from gi.repository import Pango + +from gajim.common import app +from gajim.common import helpers +from gajim.common import configpaths +from gajim.common import config as c_config +from gajim.common import idle +from gajim.gtk.util import get_builder +from gajim.gtk import AspellDictError +from gajim.gajim_themes_window import GajimThemesWindow +from gajim.advanced_configuration_window import AdvancedConfigurationWindow +from gajim.chat_control_base import ChatControlBase +from gajim.config import ManageProxiesWindow, ManageSoundsWindow +from gajim import message_control +from gajim import cell_renderer_image +from gajim import gtkgui_helpers + +try: + from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager + from gajim.common.multimedia_helpers import VideoInputManager, VideoOutputManager + HAS_GST = True +except (ImportError, ValueError): + HAS_GST = False + +if app.is_installed('GSPELL'): + from gi.repository import Gspell + + +class Preferences(Gtk.ApplicationWindow): + def __init__(self): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + 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') + + ### General tab ### + # Display avatars in roster + st = app.config.get('show_avatars_in_roster') + self.xml.get_object('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) + + # 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) + else: + w.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) + st = app.config.get('sort_by_show_in_muc') + self.xml.get_object('sort_by_show_in_muc_checkbutton').set_active(st) + + # emoticons + emoticons_combobox = self.xml.get_object('emoticons_combobox') + emoticon_themes = helpers.get_available_emoticon_themes() + + emoticons_combobox.append_text(_('Disabled')) + 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 = _('Disabled') + emoticons_combobox.set_id_column(0) + emoticons_combobox.set_active_id(config_theme) + + # 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) + + # use speller + if app.is_installed('GSPELL'): + st = app.config.get('use_speller') + self.xml.get_object('speller_checkbutton').set_active(st) + else: + self.xml.get_object('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) + + # 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') + cell = Gtk.CellRendererText() + theme_combobox.pack_start(cell, True) + theme_combobox.add_attribute(cell, 'text', 0) + 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) + l = [] + 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 != '.svn' and dir != 'transports': + l.append(dir) + if l.count == 0: + l.append(' ') + for i in range(len(l)): + preview = Gtk.Image() + files = [] + files.append(os.path.join(helpers.get_iconset_path(l[i]), '16x16', + 'online.png')) + files.append(os.path.join(helpers.get_iconset_path(l[i]), '16x16', + 'online.gif')) + for file_ in files: + if os.path.exists(file_): + preview.set_from_file(file_) + model.append([preview, l[i]]) + if app.config.get('iconset') == l[i]: + self.iconset_combobox.set_active(i) + + # Use transports iconsets + st = app.config.get('use_transports_iconsets') + self.xml.get_object('transports_iconsets_checkbutton').set_active(st) + + # Color widgets + self.draw_color_widgets() + + # Font for messages + font = app.config.get('conversation_font') + # try to set default font for the current desktop env + fontbutton = self.xml.get_object('conversation_fontbutton') + if font == '': + fontbutton.set_sensitive(False) + self.xml.get_object('default_chat_font').set_active(True) + else: + fontbutton.set_font_name(font) + + ### Personal Events tab ### + # outgoing send chat state notifications + st = 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) + + # displayed send 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) + elif st == 'composing_only': + combo.set_active(1) + else: # disabled + combo.set_active(2) + + + ### Notifications tab ### + # On new event + on_event_combobox = self.xml.get_object('on_event_combobox') + if app.config.get('autopopup'): + on_event_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) + + # notify on online statuses + st = app.config.get('notify_on_signin') + self.notify_on_signin_checkbutton.set_active(st) + + # notify on offline statuses + st = app.config.get('notify_on_signout') + self.notify_on_signout_checkbutton.set_active(st) + + # autopopupaway + st = app.config.get('autopopupaway') + self.auto_popup_away_checkbutton.set_active(st) + + # autopopup_chat_opened + 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) + + # 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 + if app.config.get('sounds_on'): + self.xml.get_object('play_sounds_checkbutton').set_active(True) + else: + self.xml.get_object('manage_sounds_button').set_sensitive(False) + + #### Status tab ### + # Autoaway + st = app.config.get('autoaway') + self.auto_away_checkbutton.set_active(st) + + # Autoawaytime + st = app.config.get('autoawaytime') + self.auto_away_time_spinbutton.set_value(st) + self.auto_away_time_spinbutton.set_sensitive(app.config.get('autoaway')) + + # autoaway 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')) + + # Autoxa + st = app.config.get('autoxa') + self.auto_xa_checkbutton.set_active(st) + + # Autoxatime + st = app.config.get('autoxatime') + self.auto_xa_time_spinbutton.set_value(st) + self.auto_xa_time_spinbutton.set_sensitive(app.config.get('autoxa')) + + # autoxa 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')) + + if not idle.Monitor.is_available(): + self.xml.get_object('autoaway_table').set_sensitive(False) + + # ask_status when online / offline + st = app.config.get('ask_online_status') + self.xml.get_object('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) + + # Default Status messages + self.default_msg_tree = self.xml.get_object('default_msg_treeview') + 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.fill_msg_treeview() + + buf = self.xml.get_object('msg_textview').get_buffer() + buf.connect('end-user-action', self.on_msg_textview_changed) + + ### Audio / Video tab ### + def create_av_combobox(opt_name, device_dict, config_name=None, + key=None): + combobox = self.xml.get_object(opt_name + '_combobox') + cell = Gtk.CellRendererText() + cell.set_property('ellipsize', Pango.EllipsizeMode.END) + cell.set_property('ellipsize-set', True) + combobox.pack_start(cell, True) + combobox.add_attribute(cell, 'text', 0) + model = Gtk.ListStore(str, str) + combobox.set_model(model) + if config_name: + config = app.config.get(config_name) + else: + config = app.config.get(opt_name + '_device') + + for index, (name, value) in enumerate(sorted(device_dict.items(), + key=key)): + model.append((name, value)) + if config == value: + combobox.set_active(index) + + if HAS_GST and app.is_installed('FARSTREAM'): + create_av_combobox('audio_input', AudioInputManager().get_devices()) + create_av_combobox('audio_output', AudioOutputManager().get_devices( + )) + create_av_combobox('video_input', VideoInputManager().get_devices()) + create_av_combobox('video_output', VideoOutputManager().get_devices( + )) + + create_av_combobox('video_framerate', {_('Default'): '', + '15fps': '15/1', '10fps': '10/1', '5fps': '5/1', + '2.5fps': '5/2'}, 'video_framerate', key=lambda x: -1 if \ + not x[1] else float(x[0][:-3])) + create_av_combobox('video_size', {_('Default'): '', + '800x600': '800x600', '640x480': '640x480', + '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) + + 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.set_sensitive(False) + + # STUN + cb = self.xml.get_object('stun_checkbutton') + st = app.config.get('use_stun_server') + cb.set_active(st) + + entry = self.xml.get_object('stun_server_entry') + entry.set_text(app.config.get('stun_server')) + if not st: + entry.set_sensitive(False) + + ### Advanced tab ### + # 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() + 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) + + if app.config.get('autodetect_browser_mailer'): + self.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.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) + + self.xml.connect_signals(self) + self.connect('key-press-event', self._on_key_press) + + self.msg_tree.get_model().connect('row-changed', + self.on_msg_treemodel_row_changed) + self.msg_tree.get_model().connect('row-deleted', + self.on_msg_treemodel_row_deleted) + self.default_msg_tree.get_model().connect('row-changed', + self.on_default_msg_treemodel_row_changed) + + self.theme_preferences = None + self.sounds_preferences = None + + self.notebook.set_current_page(0) + + self.show_all() + + def _on_key_press(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def get_per_account_option(self, opt): + """ + Return the value of the option opt if it's the same in all accounts else + returns "mixed" + """ + if len(app.connections) == 0: + # a non existent key return default value + return app.config.get_per('accounts', '__default__', opt) + val = None + for account in app.connections: + v = app.config.get_per('accounts', account, opt) + if val is None: + val = v + elif val != v: + return 'mixed' + return val + + def on_checkbutton_toggled(self, widget, config_name, + change_sensitivity_widgets=None): + app.config.set(config_name, widget.get_active()) + if change_sensitivity_widgets: + for w in change_sensitivity_widgets: + w.set_sensitive(widget.get_active()) + + def on_per_account_checkbutton_toggled(self, widget, config_name, + change_sensitivity_widgets=None): + for account in app.connections: + app.config.set_per('accounts', account, config_name, + widget.get_active()) + if change_sensitivity_widgets: + for w in change_sensitivity_widgets: + w.set_sensitive(widget.get_active()) + + def _get_all_controls(self): + for ctrl in app.interface.msg_win_mgr.get_controls(): + yield ctrl + for account in app.connections: + for ctrl in app.interface.minimized_controls[account].values(): + yield ctrl + + def _get_all_muc_controls(self): + for ctrl in app.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC): + yield ctrl + for account in app.connections: + 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() + + 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_avatars_in_roster_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') + app.interface.roster.setup_and_draw_roster() + # Redraw groupchats (in an ugly way) + for ctrl in self._get_all_muc_controls(): + ctrl.draw_roster() + + def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster') + app.interface.roster.setup_and_draw_roster() + for ctrl in self._get_all_muc_controls(): + ctrl.update_ui() + + def on_show_pep_in_roster_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_mood_in_roster') + self.on_checkbutton_toggled(widget, 'show_activity_in_roster') + self.on_checkbutton_toggled(widget, 'show_tunes_in_roster') + 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] + if emot_theme == _('Disabled'): + app.config.set('emoticons_theme', '') + else: + app.config.set('emoticons_theme', emot_theme) + + app.interface.init_emoticons() + app.interface.make_regexps() + 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 apply_speller(self): + for ctrl in self._get_all_controls(): + if isinstance(ctrl, ChatControlBase): + ctrl.set_speller() + + def on_speller_checkbutton_toggled(self, widget): + active = widget.get_active() + app.config.set('use_speller', active) + if not active: + return + lang = app.config.get('speller_language') + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: + gspell_lang = Gspell.language_get_default() + if gspell_lang is None: + AspellDictError(lang) + app.config.set('use_speller', False) + widget.set_active(False) + else: + app.config.set('speller_language', gspell_lang.get_code()) + self.apply_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') + + def on_theme_combobox_changed(self, widget): + model = widget.get_model() + active = widget.get_active() + config_theme = model[active][0].replace(' ', '_') + + app.config.set('roster_theme', config_theme) + + # begin repainting themed widgets throughout + app.interface.roster.repaint_themed_widgets() + app.interface.roster.change_roster_style(None) + gtkgui_helpers.load_css() + + def update_theme_list(self): + theme_combobox = self.xml.get_object('theme_combobox') + model = Gtk.ListStore(str) + theme_combobox.set_model(model) + i = 0 + for config_theme in app.config.get_per('themes'): + theme = config_theme.replace('_', ' ') + model.append([theme]) + if app.config.get('roster_theme') == config_theme: + theme_combobox.set_active(i) + i += 1 + + def on_manage_theme_button_clicked(self, widget): + if self.theme_preferences is None: + self.theme_preferences = GajimThemesWindow(self) + else: + self.theme_preferences.window.present() + self.theme_preferences.select_active_theme() + + 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() + + 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() + + def on_displayed_chat_states_combobox_changed(self, widget): + active = widget.get_active() + if active == 0: # all + app.config.set('displayed_chat_state_notifications', 'all') + elif active == 1: # only composing + app.config.set('displayed_chat_state_notifications', + 'composing_only') + 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') + + def on_on_event_combobox_changed(self, widget): + active = widget.get_active() + if active == 0: + app.config.set('autopopup', True) + app.config.set('notify_on_new_message', False) + elif active == 1: + app.config.set('autopopup', False) + app.config.set('notify_on_new_message', True) + else: + app.config.set('autopopup', False) + app.config.set('notify_on_new_message', False) + + def on_notify_on_signin_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'notify_on_signin') + + def on_notify_on_signout_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'notify_on_signout') + + def on_auto_popup_away_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'autopopupaway') + + 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')]) + + def on_manage_sounds_button_clicked(self, widget): + if self.sounds_preferences is None: + self.sounds_preferences = ManageSoundsWindow(self) + else: + self.sounds_preferences.window.present() + + def update_text_tags(self): + """ + Update color tags in opened chat windows + """ + for ctrl in self._get_all_controls(): + ctrl.update_tags() + + def on_preference_widget_color_set(self, widget, text): + color = widget.get_color() + color_string = color.to_string() + app.config.set(text, color_string) + self.update_text_tags() + + def on_preference_widget_font_set(self, widget, text): + if widget: + font = widget.get_font_name() + else: + font = '' + app.config.set(text, font) + gtkgui_helpers.load_css() + + def on_incoming_nick_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'inmsgcolor') + + def on_outgoing_nick_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'outmsgcolor') + + def on_incoming_msg_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'inmsgtxtcolor') + + def on_outgoing_msg_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'outmsgtxtcolor') + + def on_url_msg_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'urlmsgcolor') + + def on_status_msg_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'statusmsgcolor') + + def on_muc_highlight_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'markedmsgcolor') + + def on_conversation_fontbutton_font_set(self, widget): + self.on_preference_widget_font_set(widget, 'conversation_font') + + def on_default_chat_font_toggled(self, widget): + font_widget = self.xml.get_object('conversation_fontbutton') + if widget.get_active(): + font_widget.set_sensitive(False) + font_widget = None + else: + font_widget.set_sensitive(True) + self.on_preference_widget_font_set(font_widget, 'conversation_font') + + def draw_color_widgets(self): + col_to_widget = {'inmsgcolor': 'incoming_nick_colorbutton', + 'outmsgcolor': 'outgoing_nick_colorbutton', + 'inmsgtxtcolor': ['incoming_msg_colorbutton', + 'incoming_msg_checkbutton'], + 'outmsgtxtcolor': ['outgoing_msg_colorbutton', + 'outgoing_msg_checkbutton'], + 'statusmsgcolor': 'status_msg_colorbutton', + 'urlmsgcolor': 'url_msg_colorbutton', + 'markedmsgcolor': 'muc_highlight_colorbutton'} + for c in col_to_widget: + col = app.config.get(c) + if col: + if isinstance(col_to_widget[c], list): + rgba = Gdk.RGBA() + rgba.parse(col) + self.xml.get_object(col_to_widget[c][0]).set_rgba(rgba) + self.xml.get_object(col_to_widget[c][0]).set_sensitive(True) + self.xml.get_object(col_to_widget[c][1]).set_active(True) + else: + rgba = Gdk.RGBA() + rgba.parse(col) + self.xml.get_object(col_to_widget[c]).set_rgba(rgba) + else: + rgba = Gdk.RGBA() + rgba.parse('#000000') + if isinstance(col_to_widget[c], list): + self.xml.get_object(col_to_widget[c][0]).set_rgba(rgba) + self.xml.get_object(col_to_widget[c][0]).set_sensitive(False) + self.xml.get_object(col_to_widget[c][1]).set_active(False) + else: + self.xml.get_object(col_to_widget[c]).set_rgba(rgba) + + def on_reset_colors_button_clicked(self, widget): + col_to_widget = {'inmsgcolor': 'incoming_nick_colorbutton', + 'outmsgcolor': 'outgoing_nick_colorbutton', + 'inmsgtxtcolor': 'incoming_msg_colorbutton', + 'outmsgtxtcolor': 'outgoing_msg_colorbutton', + 'statusmsgcolor': 'status_msg_colorbutton', + 'urlmsgcolor': 'url_msg_colorbutton', + 'markedmsgcolor': 'muc_highlight_colorbutton'} + for c in col_to_widget: + app.config.set(c, app.interface.default_colors[c]) + self.draw_color_widgets() + + self.update_text_tags() + + def _set_color(self, state, widget_name, option): + """ + Set color value in prefs and update the UI + """ + if state: + color = self.xml.get_object(widget_name).get_rgba() + color_string = color.to_string() + else: + color_string = '' + app.config.set(option, color_string) + + def on_incoming_msg_checkbutton_toggled(self, widget): + state = widget.get_active() + self.xml.get_object('incoming_msg_colorbutton').set_sensitive(state) + self._set_color(state, 'incoming_msg_colorbutton', 'inmsgtxtcolor') + + def on_outgoing_msg_checkbutton_toggled(self, widget): + state = widget.get_active() + self.xml.get_object('outgoing_msg_colorbutton').set_sensitive(state) + self._set_color(state, 'outgoing_msg_colorbutton', 'outmsgtxtcolor') + + def on_auto_away_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'autoaway', + [self.auto_away_time_spinbutton, self.auto_away_message_entry]) + + def on_auto_away_time_spinbutton_value_changed(self, widget): + aat = widget.get_value_as_int() + app.config.set('autoawaytime', aat) + idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, + app.config.get('autoxatime') * 60) + + def on_auto_away_message_entry_changed(self, widget): + app.config.set('autoaway_message', widget.get_text()) + + def on_auto_xa_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'autoxa', + [self.auto_xa_time_spinbutton, self.auto_xa_message_entry]) + + def on_auto_xa_time_spinbutton_value_changed(self, widget): + axt = widget.get_value_as_int() + app.config.set('autoxatime', axt) + idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, + app.config.get('autoxatime') * 60) + + def on_auto_xa_message_entry_changed(self, widget): + app.config.set('autoxa_message', widget.get_text()) + + def on_prompt_online_status_message_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'ask_online_status') + + def on_prompt_offline_status_message_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'ask_offline_status') + + def fill_default_msg_treeview(self): + model = self.default_msg_tree.get_model() + model.clear() + status = [] + for status_ in app.config.get_per('defaultstatusmsg'): + status.append(status_) + status.sort() + for status_ in status: + msg = app.config.get_per('defaultstatusmsg', status_, 'message') + msg = helpers.from_one_line(msg) + enabled = app.config.get_per('defaultstatusmsg', status_, 'enabled') + iter_ = model.append() + uf_show = helpers.get_uf_show(status_) + 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() + 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[path][3] = not model[path][3] + + def on_default_msg_treemodel_row_changed(self, model, path, iter_): + status = model[iter_][0] + message = model[iter_][2] + message = helpers.to_one_line(message) + app.config.set_per('defaultstatusmsg', status, 'enabled', + model[iter_][3]) + app.config.set_per('defaultstatusmsg', status, 'message', message) + + def save_status_messages(self, model): + for msg in app.config.get_per('statusmsg'): + app.config.del_per('statusmsg', msg) + 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 + 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 + for subname in ('activity', 'subactivity', 'activity_text', + 'mood', 'mood_text'): + val2 = model[iter_][i] + if not val2: + val2 = '' + app.config.set_per('statusmsg', val, subname, val2) + i += 1 + iter_ = model.iter_next(iter_) + + def on_msg_treemodel_row_changed(self, model, path, iter_): + self.save_status_messages(model) + + 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() + model.clear() + preset_status = [] + for msg_name in app.config.get_per('statusmsg'): + if msg_name.startswith('_last_'): + continue + preset_status.append(msg_name) + preset_status.sort() + for msg_name in preset_status: + msg_text = app.config.get_per('statusmsg', msg_name, 'message') + msg_text = helpers.from_one_line(msg_text) + activity = app.config.get_per('statusmsg', msg_name, 'activity') + subactivity = app.config.get_per('statusmsg', msg_name, + 'subactivity') + activity_text = app.config.get_per('statusmsg', msg_name, + 'activity_text') + mood = app.config.get_per('statusmsg', msg_name, 'mood') + mood_text = app.config.get_per('statusmsg', msg_name, 'mood_text') + iter_ = model.append() + model.set(iter_, 0, msg_name, 1, msg_text, 2, activity, 3, + 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() + 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() + 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() + msg = model[iter_][1] + buf.set_text(msg) + + def on_new_msg_button_clicked(self, widget, data=None): + model = self.msg_tree.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_)) + + def on_delete_msg_button_clicked(self, widget, data=None): + sel = self.msg_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() + if not iter_: + return + buf = self.xml.get_object('msg_textview').get_buffer() + model.remove(iter_) + buf.set_text('') + self.xml.get_object('delete_msg_button').set_sensitive(False) + + def on_msg_textview_changed(self, widget, data=None): + sel = self.msg_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() + if not iter_: + return + buf = self.xml.get_object('msg_textview').get_buffer() + first_iter, end_iter = buf.get_bounds() + model.set_value(iter_, 1, buf.get_text(first_iter, end_iter, True)) + + def on_msg_treeview_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Delete: + self.on_delete_msg_button_clicked(widget) + + 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): + if 'manage_proxies' in app.interface.instances: + app.interface.instances['manage_proxies'].window.present() + else: + app.interface.instances['manage_proxies'] = ManageProxiesWindow(self) + + def update_proxy_list(self): + 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.clear() + l = app.config.get_per('proxies') + l.insert(0, _('None')) + for i in range(len(l)): + model.append([l[i]]) + if our_proxy == l[i]: + proxy_combobox.set_active(i) + + 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'] = \ + AdvancedConfigurationWindow(self) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1916,10 +1916,6 @@ class Interface: if not emot_theme: return - transient_for = None - if 'preferences' in app.interface.instances: - transient_for = app.interface.instances['preferences'].window - themes = helpers.get_available_emoticon_themes() if emot_theme not in themes: if 'font-emoticons' in themes: @@ -1935,7 +1931,7 @@ class Interface: _('Emoticons disabled'), _('Your configured emoticons theme could not be loaded.' ' See the log for more details.'), - transient_for=transient_for) + transient_for=app.get_app_window('Preferences')) app.config.set('emoticons_theme', '') return ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -365,10 +365,12 @@ class StatusIcon: win.hide() def on_preferences_menuitem_activate(self, widget): - if 'preferences' in app.interface.instances: - app.interface.instances['preferences'].window.present() + from gajim.gtk.preferences import Preferences + window = app.get_app_window(Preferences) + if window is None: + Preferences() else: - app.interface.instances['preferences'] = config.PreferencesWindow() + window.present() def on_quit_menuitem_activate(self, widget): app.interface.roster.on_quit_request() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/835bffd8932aecd4a170c16ec164c708a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/835bffd8932aecd4a170c16ec164c708a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix broken history search
by Philipp Hörist 06 Aug '18

06 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 835bffd8 by Sophie Herold at 2018-08-06T17:07:42Z Fix broken history search - - - - - 1 changed file: - gajim/gtk/history.py Changes: ===================================== gajim/gtk/history.py ===================================== --- a/gajim/gtk/history.py +++ b/gajim/gtk/history.py @@ -709,8 +709,8 @@ class HistoryWindow: # make it a tuple (Y, M, D, 0, 0, 0...) tim = time.strptime(model[path][Column.UNIXTIME], '%Y-%m-%d') year = tim[0] - gtk_month = tim[1] - month = gtk_month(gtk_month) + gtk_m = tim[1] + month = gtk_month(gtk_m) day = tim[2] # switch to belonging logfile if necessary @@ -719,10 +719,10 @@ class HistoryWindow: self._load_history(log_jid, None) # avoid reruning mark days algo if same month and year! - if year != cur_year or gtk_month != cur_month: + if year != cur_year or gtk_m != cur_month: self.calendar.select_month(month, year) - if year != cur_year or gtk_month != cur_month or day != cur_day: + if year != cur_year or gtk_m != cur_month or day != cur_day: self.calendar.select_day(day) self._scroll_to_message_and_highlight(model[path][Column.LOG_LINE_ID]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/835bffd8932aecd4a170c16ec164c708a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/835bffd8932aecd4a170c16ec164c708a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix passing too many args
by Philipp Hörist 06 Aug '18

06 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 94b2d1e5 by Philipp Hörist at 2018-08-06T16:25:52Z Fix passing too many args - - - - - 2 changed files: - gajim/gtk/util.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtk/util.py ===================================== --- a/gajim/gtk/util.py +++ b/gajim/gtk/util.py @@ -68,7 +68,7 @@ def get_builder(file_name, widget=None): if widget is not None: builder.add_objects_from_string(xml_text, [widget]) else: - builder.add_from_string(xml_text, -1) + builder.add_from_string(xml_text) else: if widget is not None: builder.add_objects_from_file(file_path, [widget]) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -144,7 +144,7 @@ def get_gtk_builder(file_name, widget=None): if widget is not None: builder.add_objects_from_string(xml_text, [widget]) else: - builder.add_from_string(xml_text, -1) + builder.add_from_string(xml_text) else: if widget is not None: builder.add_objects_from_file(file_path, [widget]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/94b2d1e577721303495ac5ba180ffebb88… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/94b2d1e577721303495ac5ba180ffebb88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix GtkBuilder translation
by Philipp Hörist 06 Aug '18

06 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2e53f47d by Philipp Hörist at 2018-08-06T15:14:07Z Fix GtkBuilder translation Fixes #9277 - - - - - 2 changed files: - gajim/gtk/util.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtk/util.py ===================================== --- a/gajim/gtk/util.py +++ b/gajim/gtk/util.py @@ -51,34 +51,30 @@ def load_icon(icon_name, widget, size=16, pixbuf=False, def get_builder(file_name, widget=None): file_path = os.path.join(configpaths.get('GUI'), file_name) - builder = _translate(file_path, widget) - builder.set_translation_domain(i18n.DOMAIN) - return builder + builder = Gtk.Builder() + builder.set_translation_domain(i18n.DOMAIN) -def _translate(gui_file, widget): - """ - This is a workaround for non working translation on Windows - """ if sys.platform == "win32": - tree = ET.parse(gui_file) + # This is a workaround for non working translation on Windows + tree = ET.parse(file_path) for node in tree.iter(): if 'translatable' in node.attrib: node.text = _(node.text) xml_text = ET.tostring(tree.getroot(), encoding='unicode', method='xml') + if widget is not None: - builder = Gtk.Builder() builder.add_objects_from_string(xml_text, [widget]) - return builder - return Gtk.Builder.new_from_string(xml_text, -1) + else: + builder.add_from_string(xml_text, -1) else: if widget is not None: - builder = Gtk.Builder() - builder.add_objects_from_file(gui_file, [widget]) - return builder - return Gtk.Builder.new_from_file(gui_file) + builder.add_objects_from_file(file_path, [widget]) + else: + builder.add_from_file(file_path) + return builder def get_iconset_name_for(name): ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -127,33 +127,30 @@ def get_image_button(icon_name, tooltip, toggle=False): def get_gtk_builder(file_name, widget=None): file_path = os.path.join(configpaths.get('GUI'), file_name) - builder = _translate(file_path, widget) + + builder = Gtk.Builder() builder.set_translation_domain(i18n.DOMAIN) - return builder -def _translate(gui_file, widget): - """ - This is a workaround for non working translation on Windows - """ if sys.platform == "win32": - tree = ET.parse(gui_file) + # This is a workaround for non working translation on Windows + tree = ET.parse(file_path) for node in tree.iter(): if 'translatable' in node.attrib: node.text = _(node.text) xml_text = ET.tostring(tree.getroot(), encoding='unicode', method='xml') + if widget is not None: - builder = Gtk.Builder() builder.add_objects_from_string(xml_text, [widget]) - return builder - return Gtk.Builder.new_from_string(xml_text, -1) + else: + builder.add_from_string(xml_text, -1) else: if widget is not None: - builder = Gtk.Builder() - builder.add_objects_from_file(gui_file, [widget]) - return builder - return Gtk.Builder.new_from_file(gui_file) + builder.add_objects_from_file(file_path, [widget]) + else: + builder.add_from_file(file_path) + return builder def get_completion_liststore(entry): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e53f47da80e03dc5489609f3b294ec2bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e53f47da80e03dc5489609f3b294ec2bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove unused FeatureNegotiationWindow
by Philipp Hörist 05 Aug '18

05 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 621d667f by Philipp Hörist at 2018-08-05T20:51:03Z Remove unused FeatureNegotiationWindow - - - - - f90b9a6b by Philipp Hörist at 2018-08-05T20:51:03Z Add new DataFormWidget - - - - - 2fd7187d by Philipp Hörist at 2018-08-05T20:51:09Z Use new DataFormWidget with ServiceRegistration - - - - - 4 changed files: - gajim/data/style/gajim.css - + gajim/gtk/dataform.py - gajim/gtk/service_registration.py - − gajim/negotiation.py Changes: ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -161,3 +161,9 @@ button.flat.link { padding: 0; border: 0; } .success-color { color: @success_color; } .error-color { color: @error_color; } .warning-color { color: @warning_color; } + +/*Dataforms*/ +.field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} +.data-form-title { font-size: 16px; font-weight: bold; } +.data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } +.data-form-widget treeview { padding: 5px; } ===================================== gajim/gtk/dataform.py ===================================== --- /dev/null +++ b/gajim/gtk/dataform.py @@ -0,0 +1,377 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk +from gi.repository import Pango + + +class DataFormWidget(Gtk.ScrolledWindow): + def __init__(self, form_node): + Gtk.ScrolledWindow.__init__(self) + self.set_hexpand(True) + self.set_vexpand(True) + self.get_style_context().add_class('data-form-widget') + + self._form_node = form_node + + self._form_grid = FormGrid(form_node) + + self.add(self._form_grid) + + @property + def title(self): + return self._form_grid.title + + @property + def instructions(self): + return self._form_grid.instructions + + def get_submit_form(self): + self._form_node.type_ = 'submit' + return self._form_node + + +class FormGrid(Gtk.Grid): + def __init__(self, form_node): + Gtk.Grid.__init__(self) + self.set_column_spacing(12) + self.set_row_spacing(12) + self.set_halign(Gtk.Align.CENTER) + self.row_count = 0 + self.rows = [] + + self._data_form = form_node + + self.title = None + self.instructions = None + + self._fields = { + 'boolean': BooleanField, + 'fixed': FixedField, + 'list-single': ListSingleField, + 'list-multi': ListMultiField, + 'jid-single': JidSingleField, + 'jid-multi': JidMultiField, + 'text-single': TextSingleField, + 'text-private': TextPrivateField, + 'text-multi': TextMultiField + } + + if form_node.title is not None: + self.title = form_node.title + self.add_row(Title(form_node.title)) + if form_node.instructions is not None: + self.instructions = form_node.instructions + self.add_row(Instructions(form_node.instructions)) + + self.parse_form(form_node) + + def add_row(self, field): + field.add(self, self.row_count) + self.row_count += 1 + self.rows.append(field) + + def parse_form(self, form_node): + for field in form_node.iter_fields(): + if field.type_ == 'hidden': + continue + + widget = self._fields[field.type_] + self.add_row(widget(field)) + + def is_valid(self): + return self._data_form.is_valid() + + +class Title: + def __init__(self, title): + self._label = Gtk.Label(label=title) + self._label.get_style_context().add_class('data-form-title') + + def add(self, form_grid, row_number): + form_grid.attach(self._label, 0, row_number, 2, 1) + + +class Instructions: + def __init__(self, instructions): + self._label = Gtk.Label(label=instructions) + self._label.set_line_wrap(True) + self._label.set_line_wrap_mode(Pango.WrapMode.WORD) + + def add(self, form_grid, row_number): + form_grid.attach(self._label, 0, row_number, 2, 1) + + +class Field: + def __init__(self, field): + self._field = field + + self._label = Gtk.Label(label=field.label) + self._label.set_single_line_mode(False) + self._label.set_line_wrap(True) + self._label.set_line_wrap_mode(Pango.WrapMode.WORD) + self._label.set_width_chars(15) + self._label.set_size_request(100, -1) + self._label.set_xalign(1) + self._label.set_tooltip_text(field.description) + + def add(self, form_grid, row_number): + form_grid.attach(self._label, 0, row_number, 1, 1) + form_grid.attach_next_to( + self._widget, self._label, Gtk.PositionType.RIGHT, 1, 1) + + +class BooleanField(Field): + def __init__(self, field): + Field.__init__(self, field) + + self._widget = Gtk.CheckButton() + self._widget.set_active(field.value) + self._widget.connect('toggled', self._toggled) + + def _toggled(self, widget): + self._field.value = self._widget.get_active() + + +class FixedField(Field): + def __init__(self, field): + Field.__init__(self, field) + + self._label.set_text(field.value) + + # If the value is more than 30 chars it proabably isnt + # meant as a section header + if len(field.value) < 30: + self._label.get_style_context().add_class('field-fixed') + else: + self._label.set_xalign(0.5) + + def add(self, form_grid, row_number): + if len(self._field.value) < 30: + form_grid.attach(self._label, 0, row_number, 1, 1) + else: + form_grid.attach(self._label, 0, row_number, 2, 1) + + +class ListSingleField(Field): + def __init__(self, field): + Field.__init__(self, field) + + self._widget = Gtk.ComboBoxText() + for value, label in field.iter_options(): + if not label: + label = value + self._widget.append(value, label) + + self._widget.set_active_id(field.value) + self._widget.connect('changed', self._changed) + + def _changed(self, widget): + self._field.value = widget.get_active_id() + + +class ListMultiField(Field): + def __init__(self, field): + Field.__init__(self, field) + self._label.set_valign(Gtk.Align.START) + + self._treeview = ListMutliTreeView(field) + + self._widget = Gtk.ScrolledWindow() + self._widget.set_propagate_natural_height(True) + self._widget.set_min_content_height(100) + self._widget.set_max_content_height(300) + self._widget.add(self._treeview) + + +class ListMutliTreeView(Gtk.TreeView): + def __init__(self, field): + Gtk.TreeView.__init__(self) + + self._field = field + + self._store = Gtk.ListStore(str, str, bool) + + col = Gtk.TreeViewColumn() + cell = Gtk.CellRendererText() + col.pack_start(cell, True) + col.set_attributes(cell, text=0) + self.append_column(col) + + col = Gtk.TreeViewColumn() + cell = Gtk.CellRendererToggle() + cell.set_activatable(True) + cell.connect('toggled', self._toggled) + col.pack_start(cell, True) + col.set_attributes(cell, active=2) + self.append_column(col) + + self.set_headers_visible(False) + + for option in field.options: + # option = (label, value) + self._store.append( + [*option, option[1] in field.values]) + + self.set_model(self._store) + + def _toggled(self, renderer, path): + iter_ = self._store.get_iter(path) + current_value = self._store[iter_][2] + self._store.set_value(iter_, 2, not current_value) + self._set_values() + + def _set_values(self): + values = [] + for row in self.get_model(): + if not row[2]: + continue + values.append(row[1]) + self._field.values = values + + +class JidMultiField(Field): + def __init__(self, field): + Field.__init__(self, field) + self._label.set_valign(Gtk.Align.START) + + self._treeview = JidMutliTreeView(field) + + self._add_button = Gtk.Button.new_from_icon_name( + 'list-add-symbolic', Gtk.IconSize.MENU) + self._add_button.connect('clicked', self._add_clicked) + self._add_button.set_halign(Gtk.Align.START) + + self._remove_button = Gtk.Button.new_from_icon_name( + 'list-remove-symbolic', Gtk.IconSize.MENU) + self._remove_button.connect('clicked', self._remove_clicked) + self._remove_button.set_halign(Gtk.Align.START) + + self._button_box = Gtk.ButtonBox( + orientation=Gtk.Orientation.HORIZONTAL) + self._button_box.set_layout(Gtk.ButtonBoxStyle.START) + self._button_box.add(self._add_button) + self._button_box.add(self._remove_button) + self._button_box.set_child_non_homogeneous(self._add_button, True) + self._button_box.set_child_non_homogeneous(self._remove_button, True) + + self._widget = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + self._widget.set_spacing(6) + + self._scrolled_window = Gtk.ScrolledWindow() + self._scrolled_window.set_propagate_natural_height(True) + self._scrolled_window.set_min_content_height(100) + self._scrolled_window.set_max_content_height(300) + self._scrolled_window.add(self._treeview) + + self._widget.pack_start(self._scrolled_window, True, True, 0) + self._widget.pack_end(self._button_box, False, False, 0) + + def _add_clicked(self, widget): + self._treeview.get_model().append(['']) + + def _remove_clicked(self, widget): + mod, paths = self._treeview.get_selection().get_selected_rows() + for path in paths: + iter_ = mod.get_iter(path) + self._treeview.get_model().remove(iter_) + + jids = [] + for row in self._treeview.get_model(): + if not row[0]: + continue + jids.append(row[0]) + self._field.values = jids + + +class JidMutliTreeView(Gtk.TreeView): + def __init__(self, field): + Gtk.TreeView.__init__(self) + + self._field = field + + self._store = Gtk.ListStore(str) + + col = Gtk.TreeViewColumn() + cell = Gtk.CellRendererText() + cell.set_property('editable', True) + cell.set_property('placeholder-text', 'user(a)example.org') + cell.connect('edited', self._jid_edited) + col.pack_start(cell, True) + col.set_attributes(cell, text=0) + self.append_column(col) + + self.set_headers_visible(False) + + for value in field.values: + self._store.append([value]) + + self.set_model(self._store) + + def _jid_edited(self, renderer, path, new_text): + iter_ = self._store.get_iter(path) + self._store.set_value(iter_, 0, new_text) + self._set_values() + + def _set_values(self): + jids = [] + for row in self._store: + if not row[0]: + continue + jids.append(row[0]) + self._field.values = jids + + +class TextSingleField(Field): + def __init__(self, field): + Field.__init__(self, field) + + self._widget = Gtk.Entry() + self._widget.set_text(field.value) + self._widget.connect('changed', self._changed) + + def _changed(self, widget): + self._field.value = self._widget.get_text() + + +class TextPrivateField(TextSingleField): + def __init__(self, field): + TextSingleField.__init__(self, field) + self._widget.set_input_purpose(Gtk.InputPurpose.PASSWORD) + self._widget.set_visibility(False) + + +class JidSingleField(TextSingleField): + def __init__(self, field): + TextSingleField.__init__(self, field) + + +class TextMultiField(Field): + def __init__(self, field): + Field.__init__(self, field) + self._label.set_valign(Gtk.Align.START) + + self._widget = Gtk.ScrolledWindow() + self._widget.set_propagate_natural_height(True) + self._widget.set_min_content_height(100) + self._widget.set_max_content_height(300) + self._textview = Gtk.TextView() + + self._textview.get_buffer().set_text(field.value) + self._textview.get_buffer().connect('changed', self._changed) + + self._widget.add(self._textview) + + def _changed(self, widget): + self._field.value = widget.get_text(*widget.get_bounds(), False) ===================================== gajim/gtk/service_registration.py ===================================== --- a/gajim/gtk/service_registration.py +++ b/gajim/gtk/service_registration.py @@ -19,6 +19,7 @@ from gi.repository import Gtk from gajim.common import app from gajim.common.modules import dataforms +from gajim.gtk.dataform import DataFormWidget log = logging.getLogger('gajim.gtk.registration') @@ -45,38 +46,33 @@ class ServiceRegistration(Gtk.Assistant): self.set_resizable(True) self.set_position(Gtk.WindowPosition.CENTER) - self.set_default_size(500, 300) + self.set_default_size(600, 400) self.get_style_context().add_class('dialog-margin') - request = RequestPage() - self.append_page(request) - self.set_page_type(request, Gtk.AssistantPageType.INTRO) - - form = FormPage() - self.append_page(form) - self.set_page_type(form, Gtk.AssistantPageType.INTRO) - self.set_page_complete(form, True) - - sending = SendingPage() - self.append_page(sending) - self.set_page_type(sending, Gtk.AssistantPageType.PROGRESS) - - success = SuccessfulPage() - self.append_page(success) - self.set_page_type(success, Gtk.AssistantPageType.SUMMARY) - self.set_page_complete(success, True) - - error = ErrorPage() - self.append_page(error) - self.set_page_type(error, Gtk.AssistantPageType.SUMMARY) - self.set_page_complete(error, True) + self._add_page(RequestPage()) + self._add_page(FormPage()) + self._add_page(SendingPage()) + self._add_page(SuccessfulPage()) + self._add_page(ErrorPage()) self.connect('prepare', self._on_page_change) self.connect('cancel', self._on_cancel) self.connect('close', self._on_cancel) + self._remove_sidebar() self.show_all() + def _add_page(self, page): + self.append_page(page) + self.set_page_type(page, page.type_) + self.set_page_title(page, page.title) + self.set_page_complete(page, page.complete) + + def _remove_sidebar(self): + main_box = self.get_children()[0] + sidebar = main_box.get_children()[0] + main_box.remove(sidebar) + def _on_page_change(self, assistant, page): if self.get_current_page() == Page.REQUEST: self._con.get_module('Register').get_register_form( @@ -90,22 +86,15 @@ class ServiceRegistration(Gtk.Assistant): log.info('Show Form page') self._is_form = is_form if is_form: - from gajim import dataforms_widget dataform = dataforms.ExtendForm(node=form) - self._data_form_widget = dataforms_widget.DataFormWidget(dataform) - if self._data_form_widget.title: - self.set_title('%s - Gajim' % self._data_form_widget.title) + self._data_form_widget = DataFormWidget(dataform) else: - if 'registered' in form: - self.set_title(_('Edit %s') % self._agent) - else: - self.set_title(_('Register to %s') % self._agent) from gajim import config self._data_form_widget = config.FakeDataForm(form) page = self.get_nth_page(Page.FORM) page.pack_start(self._data_form_widget, True, True, 0) - self._data_form_widget.show() + self._data_form_widget.show_all() self.set_current_page(Page.FORM) def _on_error(self, error_text): @@ -120,7 +109,7 @@ class ServiceRegistration(Gtk.Assistant): def _register(self): log.info('Show Sending page') if self._is_form: - form = self._data_form_widget.data_form + form = self._data_form_widget.get_submit_form() else: form = self._data_form_widget.get_infos() if 'instructions' in form: @@ -141,6 +130,11 @@ class ServiceRegistration(Gtk.Assistant): class RequestPage(Gtk.Box): + + type_ = Gtk.AssistantPageType.INTRO + title = _('Register') + complete = False + def __init__(self): super().__init__(orientation=Gtk.Orientation.VERTICAL) self.set_spacing(18) @@ -150,16 +144,31 @@ class RequestPage(Gtk.Box): class SendingPage(RequestPage): + + type_ = Gtk.AssistantPageType.PROGRESS + title = _('Register') + complete = False + def __init__(self): super().__init__() class FormPage(Gtk.Box): + + type_ = Gtk.AssistantPageType.INTRO + title = _('Register') + complete = True + def __init__(self): super().__init__(orientation=Gtk.Orientation.VERTICAL) class SuccessfulPage(Gtk.Box): + + type_ = Gtk.AssistantPageType.SUMMARY + title = _('Successful registered') + complete = True + def __init__(self): super().__init__(orientation=Gtk.Orientation.VERTICAL) self.set_spacing(12) @@ -178,6 +187,11 @@ class SuccessfulPage(Gtk.Box): class ErrorPage(Gtk.Box): + + type_ = Gtk.AssistantPageType.SUMMARY + title = _('Registration failed') + complete = True + def __init__(self): super().__init__(orientation=Gtk.Orientation.VERTICAL) self.set_spacing(12) ===================================== gajim/negotiation.py deleted ===================================== --- a/gajim/negotiation.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- coding:utf-8 -*- -## src/negotiation.py -## -## Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -from gajim import gtkgui_helpers -from gajim import dataforms_widget - -from gajim.common.modules import dataforms -from gajim.common import app -import nbxmpp - -def describe_features(features): - """ - A human-readable description of the features that have been negotiated - """ - if features['logging'] == 'may': - return _('- messages will be logged') - elif features['logging'] == 'mustnot': - return _('- messages will not be logged') - -class FeatureNegotiationWindow: - def __init__(self, account, jid, session, form): - self.account = account - self.jid = jid - self.form = form - self.session = session - - self.xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', 'data_form_window') - self.window = self.xml.get_object('data_form_window') - - config_vbox = self.xml.get_object('config_vbox') - dataform = dataforms.ExtendForm(node = self.form) - self.data_form_widget = dataforms_widget.DataFormWidget(dataform) - self.data_form_widget.show() - config_vbox.pack_start(self.data_form_widget, True, True, 0) - - self.xml.connect_signals(self) - self.window.show_all() - - def on_ok_button_clicked(self, widget): - acceptance = nbxmpp.Message(self.jid) - acceptance.setThread(self.session.thread_id) - feature = acceptance.NT.feature - feature.setNamespace(nbxmpp.NS_FEATURE) - - form = self.data_form_widget.data_form - form.setAttr('type', 'submit') - - feature.addChild(node=form) - - app.connections[self.account].send_stanza(acceptance) - - self.window.destroy() - - def on_cancel_button_clicked(self, widget): - rejection = nbxmpp.Message(self.jid) - rejection.setThread(self.session.thread_id) - feature = rejection.NT.feature - feature.setNamespace(nbxmpp.NS_FEATURE) - - x = nbxmpp.DataForm(typ='submit') - x.addChild(node=nbxmpp.DataField('FORM_TYPE', value='urn:xmpp:ssn')) - x.addChild(node=nbxmpp.DataField('accept', value='false', typ='boolean')) - - feature.addChild(node=x) - - app.connections[self.account].send_stanza(rejection) - - self.window.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2ce78334ca7077aa154f6e63b7a2783ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2ce78334ca7077aa154f6e63b7a2783ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix direct MUC invite
by Philipp Hörist 04 Aug '18

04 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2ce78334 by Philipp Hörist at 2018-08-04T19:41:44Z Fix direct MUC invite - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== --- a/gajim/common/modules/muc.py +++ b/gajim/common/modules/muc.py @@ -312,8 +312,8 @@ class MUC: password = app.gc_passwords.get(room, None) if password: attrs['password'] = password - message = message.addChild(name='x', attrs=attrs, - namespace=nbxmpp.NS_CONFERENCE) + message.addChild(name='x', attrs=attrs, + namespace=nbxmpp.NS_CONFERENCE) return message def _build_mediated_invite(self, room, to, reason, continue_): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2ce78334ca7077aa154f6e63b7a2783ef6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2ce78334ca7077aa154f6e63b7a2783ef6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move history window into gtk folder
by Philipp Hörist 04 Aug '18

04 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 92af78f1 by Philipp Hörist at 2018-08-04T18:14:28Z Move history window into gtk folder - fix some pep8 warnings - - - - - 7 changed files: - gajim/app_actions.py - gajim/chat_control_base.py - gajim/gtk/__init__.py - gajim/history_window.py → gajim/gtk/history.py - gajim/gtk/util.py - gajim/history_manager.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -24,7 +24,6 @@ from gajim import dialogs from gajim.gtk import shortcuts_window from gajim import accounts_window import gajim.plugins.gui -from gajim import history_window from gajim import disco from gajim.gtk.history_sync import HistorySyncAssistant from gajim.gtk.server_info import ServerInfoDialog @@ -39,6 +38,7 @@ from gajim.gtk import PrivacyListsWindow from gajim.gtk import ManageBookmarksWindow from gajim.gtk import FeaturesDialog from gajim.gtk import AccountCreationWizard +from gajim.gtk import HistoryWindow # General Actions @@ -305,8 +305,7 @@ def on_history(action, param): if 'logs' in interface.instances: interface.instances['logs'].window.present() else: - interface.instances['logs'] = history_window.\ - HistoryWindow() + interface.instances['logs'] = HistoryWindow() def on_open_event(action, param): ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -38,7 +38,6 @@ from gi.repository import Gio from gajim import gtkgui_helpers from gajim import message_control from gajim.gtk import NonModalConfirmationDialog -from gajim import history_window from gajim import notify import re @@ -432,8 +431,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): app.interface.instances['logs'].window.present() app.interface.instances['logs'].open_history(jid, self.account) else: - app.interface.instances['logs'] = \ - history_window.HistoryWindow(jid, self.account) + from gajim.gtk import HistoryWindow + app.interface.instances['logs'] = HistoryWindow(jid, self.account) def change_encryption(self, action, param): encryption = param.get_string() @@ -1119,8 +1118,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): app.interface.instances['logs'].window.present() app.interface.instances['logs'].open_history(jid, self.account) else: - app.interface.instances['logs'] = \ - history_window.HistoryWindow(jid, self.account) + from gajim.gtk import HistoryWindow + app.interface.instances['logs'] = HistoryWindow(jid, self.account) def _on_send_file(self, action, param): # get file transfer preference ===================================== gajim/gtk/__init__.py ===================================== --- a/gajim/gtk/__init__.py +++ b/gajim/gtk/__init__.py @@ -67,3 +67,4 @@ from gajim.gtk.profile import ProfileWindow from gajim.gtk.features import FeaturesDialog from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.service_registration import ServiceRegistration +from gajim.gtk.history import HistoryWindow ===================================== gajim/history_window.py → gajim/gtk/history.py ===================================== --- a/gajim/history_window.py +++ b/gajim/gtk/history.py @@ -1,48 +1,44 @@ -# -*- coding:utf-8 -*- -## src/history_window.py -## -## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Travis Shirk <travis AT pobox.com> -## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## +# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> +# Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +# Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +# Travis Shirk <travis AT pobox.com> +# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +# Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> +# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +# +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib import time import datetime - from enum import IntEnum, unique -from gajim import gtkgui_helpers +from gi.repository import Gtk +from gi.repository import Gdk +from gi.repository import GLib + from gajim import conversation_textview from gajim.gtk import ErrorDialog - +from gajim.gtk import util +from gajim.gtk.util import python_month, gtk_month from gajim.common import app from gajim.common import helpers from gajim.common import exceptions - from gajim.common.const import ShowConstant, KindConstant + @unique class InfoColumn(IntEnum): '''Completion dict''' @@ -51,6 +47,7 @@ class InfoColumn(IntEnum): NAME = 2 COMPLETION = 3 + @unique class Column(IntEnum): LOG_JID = 0 @@ -60,13 +57,14 @@ class Column(IntEnum): TIME = 4 LOG_LINE_ID = 5 + class HistoryWindow: """ Class for browsing logs of conversations with contacts """ def __init__(self, jid=None, account=None): - xml = gtkgui_helpers.get_gtk_builder('history_window.ui') + xml = util.get_builder('history_window.ui') self.window = xml.get_object('history_window') self.window.set_application(app.app) self.calendar = xml.get_object('calendar') @@ -76,7 +74,7 @@ class HistoryWindow: self.button_last_day = xml.get_object('button_last_day') scrolledwindow = xml.get_object('scrolledwindow') self.history_textview = conversation_textview.ConversationTextview( - account, used_in_history_window = True) + account, used_in_history_window=True) scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() self.history_buffer.create_tag('highlight', background='yellow') @@ -102,7 +100,8 @@ class HistoryWindow: renderer = Gtk.CellRendererText() col.pack_start(renderer, True) col.add_attribute(renderer, 'text', Column.CONTACT_NAME) - col.set_sort_column_id(Column.CONTACT_NAME) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(Column.CONTACT_NAME) col.set_resizable(True) col = Gtk.TreeViewColumn(_('Date')) @@ -110,7 +109,8 @@ class HistoryWindow: renderer = Gtk.CellRendererText() col.pack_start(renderer, True) col.add_attribute(renderer, 'text', Column.UNIXTIME) - col.set_sort_column_id(Column.UNIXTIME) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(Column.UNIXTIME) col.set_resizable(True) col = Gtk.TreeViewColumn(_('Message')) @@ -120,10 +120,10 @@ class HistoryWindow: col.add_attribute(renderer, 'text', Column.MESSAGE) col.set_resizable(True) - self.jid = None # The history we are currently viewing + self.jid = None # The history we are currently viewing self.account = account self.completion_dict = {} - self.accounts_seen_online = [] # Update dict when new accounts connect + self.accounts_seen_online = [] # Update dict when new accounts connect self.jids_to_search = [] # This will load history too @@ -135,12 +135,12 @@ class HistoryWindow: else: self._load_history(None) - gtkgui_helpers.resize_window(self.window, - app.config.get('history_window_width'), - app.config.get('history_window_height')) - gtkgui_helpers.move_window(self.window, - app.config.get('history_window_x-position'), - app.config.get('history_window_y-position')) + util.resize_window(self.window, + app.config.get('history_window_width'), + app.config.get('history_window_height')) + util.move_window(self.window, + app.config.get('history_window_x-position'), + app.config.get('history_window_y-position')) xml.connect_signals(self) self.window.show_all() @@ -161,7 +161,8 @@ class HistoryWindow: {key : (jid, account, nick_name, full_completion_name} This is a generator and does pseudo-threading via idle_add(). """ - liststore = gtkgui_helpers.get_completion_liststore(self.jid_entry.get_child()) + liststore = util.get_completion_liststore( + self.jid_entry.get_child()) liststore.set_sort_column_id(1, Gtk.SortType.ASCENDING) self.jid_entry.get_child().get_completion().connect( 'match-selected', self.on_jid_entry_match_selected) @@ -174,12 +175,14 @@ class HistoryWindow: self.accounts_seen_online = list(app.contacts.get_accounts()) - # Enhance contacts of online accounts with contact. Needed for mapping below + # Enhance contacts of online accounts with contact. + # Needed for mapping below for account in self.accounts_seen_online: - completion_dict.update(helpers.get_contact_dict_for_account(account)) + completion_dict.update( + helpers.get_contact_dict_for_account(account)) - muc_active_icon = gtkgui_helpers.get_iconset_name_for('muc-active') - online_icon = gtkgui_helpers.get_iconset_name_for('online') + muc_active_icon = util.get_iconset_name_for('muc-active') + online_icon = util.get_iconset_name_for('online') keys = list(completion_dict.keys()) # Move the actual jid at first so we load history faster @@ -209,8 +212,8 @@ class HistoryWindow: info_acc = self._get_account_for_jid(info_jid) - if app.logger.jid_is_room_jid(completed) or\ - app.logger.jid_is_from_pm(completed): + if (app.logger.jid_is_room_jid(completed) or + app.logger.jid_is_from_pm(completed)): icon = muc_active_icon if app.logger.jid_is_from_pm(completed): # It's PM. Make it easier to find @@ -226,16 +229,16 @@ class HistoryWindow: if len(completed) > 70: completed = completed[:70] + '[\u2026]' liststore.append((icon, completed)) - self.completion_dict[key] = (info_jid, info_acc, info_name, - info_completion) - self.completion_dict[completed] = (info_jid, info_acc, - info_name, info_completion) + self.completion_dict[key] = ( + info_jid, info_acc, info_name, info_completion) + self.completion_dict[completed] = ( + info_jid, info_acc, info_name, info_completion) if completed2: if len(completed2) > 70: completed2 = completed2[:70] + '[\u2026]' liststore.append((icon, completed2)) - self.completion_dict[completed2] = (info_jid, info_acc, - info_name, info_completion2) + self.completion_dict[completed2] = ( + info_jid, info_acc, info_name, info_completion2) if key == actual_jid: self._load_history(info_jid, self.account or info_acc) yield True @@ -295,7 +298,7 @@ class HistoryWindow: Load history for the given jid/name and show it """ if jid_or_name and jid_or_name in self.completion_dict: - # a full qualified jid or a contact name was entered + # a full qualified jid or a contact name was entered info_jid, info_account, info_name, info_completion = self.completion_dict[jid_or_name] self.jids_to_search = [info_jid] self.jid = info_jid @@ -311,22 +314,22 @@ class HistoryWindow: self.checkbutton.set_sensitive(False) else: # Are log disabled for account ? - if self.account in app.config.get_per('accounts', self.account, - 'no_log_for').split(' '): + if self.account in app.config.get_per( + 'accounts', self.account, 'no_log_for').split(' '): self.checkbutton.set_active(False) self.checkbutton.set_sensitive(False) else: # Are log disabled for jid ? log = True - if self.jid in app.config.get_per('accounts', self.account, - 'no_log_for').split(' '): + if self.jid in app.config.get_per( + 'accounts', self.account, 'no_log_for').split(' '): log = False self.checkbutton.set_active(log) self.checkbutton.set_sensitive(True) self.jids_to_search = [info_jid] - # Get first/last date we have logs with contact (for log navigation) + # Get first/last date we have logs with contact self.first_log = app.logger.get_first_date_that_has_logs( self.account, self.jid) self.first_day = self._get_date_from_timestamp(self.first_log) @@ -336,9 +339,8 @@ class HistoryWindow: # Select logs for last date we have logs with contact self.search_menu_button.set_sensitive(True) - gtk_month = gtkgui_helpers.make_python_month_gtk_month( - self.last_day.month) - self.calendar.select_month(gtk_month, self.last_day.year) + month = gtk_month(self.last_day.month) + self.calendar.select_month(month, self.last_day.year) self.calendar.select_day(self.last_day.day) self.button_previous_day.set_sensitive(True) @@ -351,12 +353,13 @@ class HistoryWindow: self.jid_entry.get_child().set_text(info_completion) - else: # neither a valid jid, nor an existing contact name was entered + else: + # neither a valid jid, nor an existing contact name was entered # we have got nothing to show or to search in self.jid = None self.account = None - self.history_buffer.set_text('') # clear the buffer + self.history_buffer.set_text('') # clear the buffer self.search_entry.set_sensitive(False) self.checkbutton.set_sensitive(False) @@ -372,26 +375,27 @@ class HistoryWindow: def on_calendar_day_selected(self, widget): if not self.jid: return - year, month, day = self.calendar.get_date() # integers - month = gtkgui_helpers.make_gtk_month_python_month(month) + year, month, day = self.calendar.get_date() # integers + month = python_month(month) date_str = datetime.date(year, month, day).strftime('%x') self.date_label.set_text(date_str) self._load_conversation(year, month, day) def on_calendar_month_changed(self, widget): """ - Ask for days in this month, if they have logs it bolds them (marks them) + Ask for days in this month, if they have logs it bolds them + (marks them) """ if not self.jid: return - year, month, day = widget.get_date() # integers + year, month, day = widget.get_date() # integers if year < 1900: widget.select_month(0, 1900) widget.select_day(1) return widget.clear_marks() - month = gtkgui_helpers.make_gtk_month_python_month(month) + month = python_month(month) try: log_days = app.logger.get_days_with_logs( @@ -413,17 +417,16 @@ class HistoryWindow: def _change_date(self, widget): # Get day selected in calendar y, m, d = self.calendar.get_date() - py_m = gtkgui_helpers.make_gtk_month_python_month(m) + py_m = python_month(m) _date = datetime.datetime(y, py_m, d) if widget is self.button_first_day: - gtk_m = gtkgui_helpers.make_python_month_gtk_month( - self.first_day.month) + gtk_m = gtk_month(self.first_day.month) self.calendar.select_month(gtk_m, self.first_day.year) self.calendar.select_day(self.first_day.day) return elif widget is self.button_last_day: - gtk_m = gtkgui_helpers.make_python_month_gtk_month( + gtk_m = gtk_month( self.last_day.month) self.calendar.select_month(gtk_m, self.last_day.year) self.calendar.select_day(self.last_day.day) @@ -453,8 +456,8 @@ class HistoryWindow: ErrorDialog(_('Disk Error'), str(e)) return - gtk_month = gtkgui_helpers.make_python_month_gtk_month(_date.month) - self.calendar.select_month(gtk_month, _date.year) + gtk_m = gtk_month(_date.month) + self.calendar.select_month(gtk_m, _date.year) self.calendar.select_day(_date.day) def _get_string_show_from_constant_int(self, show): @@ -521,13 +524,13 @@ class HistoryWindow: buf.insert(end_iter, tim) elif app.config.get('print_time') == 'sometimes': every_foo_seconds = 60 * app.config.get( - 'print_ichat_every_foo_minutes') + 'print_ichat_every_foo_minutes') seconds_passed = tim - self.last_time_printout if seconds_passed > every_foo_seconds: self.last_time_printout = tim tim = time.strftime('%X ', time.localtime(float(tim))) - buf.insert_with_tags_by_name(end_iter, tim + '\n', - 'time_sometimes') + buf.insert_with_tags_by_name( + end_iter, tim + '\n', 'time_sometimes') tag_name = '' tag_msg = '' @@ -536,11 +539,13 @@ class HistoryWindow: if kind == KindConstant.GC_MSG: tag_name = 'incoming' - elif kind in (KindConstant.SINGLE_MSG_RECV, KindConstant.CHAT_MSG_RECV): + elif kind in (KindConstant.SINGLE_MSG_RECV, + KindConstant.CHAT_MSG_RECV): contact_name = self.completion_dict[self.jid][InfoColumn.NAME] tag_name = 'incoming' tag_msg = 'incomingtxt' - elif kind in (KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): + elif kind in (KindConstant.SINGLE_MSG_SENT, + KindConstant.CHAT_MSG_SENT): if self.account: contact_name = app.nicks[self.account] else: @@ -553,26 +558,29 @@ class HistoryWindow: elif kind == KindConstant.GCSTATUS: # message here (if not None) is status message if message: - message = _('%(nick)s is now %(status)s: %(status_msg)s') %\ - {'nick': contact_name, 'status': helpers.get_uf_show(show), - 'status_msg': message } + message = _('%(nick)s is now %(status)s: %(status_msg)s') % { + 'nick': contact_name, + 'status': helpers.get_uf_show(show), + 'status_msg': message} else: - message = _('%(nick)s is now %(status)s') % {'nick': contact_name, - 'status': helpers.get_uf_show(show) } + message = _('%(nick)s is now %(status)s') % { + 'nick': contact_name, + 'status': helpers.get_uf_show(show) } tag_msg = 'status' - else: # 'status' + else: # 'status' # message here (if not None) is status message - if show is None: # it means error + if show is None: # it means error if message: message = _('Error: %s') % message else: message = _('Error') elif message: - message = _('Status is now: %(status)s: %(status_msg)s') % \ - {'status': helpers.get_uf_show(show), 'status_msg': message} + message = _('Status is now: %(status)s: %(status_msg)s') % { + 'status': helpers.get_uf_show(show), + 'status_msg': message} else: - message = _('Status is now: %(status)s') % { 'status': - helpers.get_uf_show(show) } + message = _('Status is now: %(status)s') % { + 'status': helpers.get_uf_show(show)} tag_msg = 'status' if message.startswith('/me ') or message.startswith('/me\n'): @@ -586,11 +594,11 @@ class HistoryWindow: before_str = helpers.from_one_line(before_str) after_str = app.config.get('after_nickname') after_str = helpers.from_one_line(after_str) - format = before_str + contact_name + after_str + ' ' + format_ = before_str + contact_name + after_str + ' ' if tag_name: - buf.insert_with_tags_by_name(end_iter, format, tag_name) + buf.insert_with_tags_by_name(end_iter, format_, tag_name) else: - buf.insert(end_iter, format) + buf.insert(end_iter, format_) if subject: message = _('Subject: %s\n') % subject + message xhtml = None @@ -598,11 +606,17 @@ class HistoryWindow: xhtml = message if tag_msg: - self.history_textview.print_real_text(message, [tag_msg], - name=contact_name, xhtml=xhtml, additional_data=additional_data) + self.history_textview.print_real_text( + message, [tag_msg], + name=contact_name, + xhtml=xhtml, + additional_data=additional_data) else: - self.history_textview.print_real_text(message, name=contact_name, - xhtml=xhtml, additional_data=additional_data) + self.history_textview.print_real_text( + message, + name=contact_name, + xhtml=xhtml, + additional_data=additional_data) self.history_textview.print_real_text('\n', text_tags=['eol']) def on_search_complete_history_toggled(self, widget): @@ -634,23 +648,23 @@ class HistoryWindow: for jid in self.jids_to_search: account = self.completion_dict[jid][InfoColumn.ACCOUNT] if account is None: - # We do not know an account. This can only happen if the contact is offine, - # or if we browse a groupchat history. The account is not needed, a dummy can - # be set. - # This may leed to wrong self nick in the displayed history (Uggh!) + # We do not know an account. This can only happen if + # the contact is offine, or if we browse a groupchat history. + # The account is not needed, a dummy can be set. + # This may leed to wrong self nick in the displayed history account = list(app.contacts.get_accounts())[0] date = None if self.search_in_date.get_active(): - year, month, day = self.calendar.get_date() # integers - month = gtkgui_helpers.make_gtk_month_python_month(month) + year, month, day = self.calendar.get_date() # integers + month = python_month(month) date = datetime.datetime(year, month, day) show_status = self.show_status_checkbutton.get_active() results = app.logger.search_log(account, jid, text, date) result_found = False - #FIXME: + # FIXME: # add "subject: | message: " in message column if kind is single # also do we need show at all? (we do not search on subject) for row in results: @@ -660,7 +674,7 @@ class HistoryWindow: contact_name = row.contact_name if not contact_name: - if row.kind == KindConstant.CHAT_MSG_SENT: # it's us! :) + if row.kind == KindConstant.CHAT_MSG_SENT: contact_name = app.nicks[account] else: contact_name = self.completion_dict[jid][InfoColumn.NAME] @@ -685,7 +699,7 @@ class HistoryWindow: # get currently selected date cur_year, cur_month, cur_day = self.calendar.get_date() - cur_month = gtkgui_helpers.make_gtk_month_python_month(cur_month) + cur_month = python_month(cur_month) model, paths = self.results_treeview.get_selection().get_selected_rows() if not paths: @@ -696,7 +710,7 @@ class HistoryWindow: tim = time.strptime(model[path][Column.UNIXTIME], '%Y-%m-%d') year = tim[0] gtk_month = tim[1] - month = gtkgui_helpers.make_python_month_gtk_month(gtk_month) + month = gtk_month(gtk_month) day = tim[2] # switch to belonging logfile if necessary @@ -740,25 +754,27 @@ class HistoryWindow: match_end = match_start.copy() match_end.forward_to_tag_toggle(self.history_buffer.eol_tag) - self.history_buffer.apply_tag_by_name('highlight', match_start, match_end) + self.history_buffer.apply_tag_by_name( + 'highlight', match_start, match_end) mark = self.history_buffer.create_mark('match', match_start, True) - GLib.idle_add(self.history_textview.tv.scroll_to_mark, mark, 0, True, 0.0, 0.5) + GLib.idle_add( + self.history_textview.tv.scroll_to_mark, mark, 0, True, 0.0, 0.5) def on_log_history_checkbutton_toggled(self, widget, *args): # log conversation history? oldlog = True - no_log_for = app.config.get_per('accounts', self.account, - 'no_log_for').split() + no_log_for = app.config.get_per( + 'accounts', self.account, 'no_log_for').split() if self.jid in no_log_for: oldlog = False log = widget.get_active() - if not log and not self.jid in no_log_for: + if not log and self.jid not in no_log_for: no_log_for.append(self.jid) if log and self.jid in no_log_for: no_log_for.remove(self.jid) if oldlog != log: - app.config.set_per('accounts', self.account, 'no_log_for', - ' '.join(no_log_for)) + app.config.set_per( + 'accounts', self.account, 'no_log_for', ' '.join(no_log_for)) def on_show_status_checkbutton_toggled(self, widget): # reload logs @@ -773,8 +789,8 @@ class HistoryWindow: # Update dict to not only show bare jid GLib.idle_add(next, self._fill_completion_dict()) else: - # Only in that case because it's called by self._fill_completion_dict() - # otherwise + # Only in that case because it's called by + # self._fill_completion_dict() otherwise self._load_history(jid, account) self.results_window.set_property('visible', False) ===================================== gajim/gtk/util.py ===================================== --- a/gajim/gtk/util.py +++ b/gajim/gtk/util.py @@ -203,3 +203,11 @@ def get_image_button(icon_name, tooltip, toggle=False): icon_name, Gtk.IconSize.MENU) button.set_tooltip_text(tooltip) return button + + +def python_month(month): + return month + 1 + + +def gtk_month(month): + return month - 1 ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -27,7 +27,7 @@ ## NOTE: some method names may match those of logger.py but that's it ## someday (TM) should have common class ## that abstracts db connections and helpers on it -## the same can be said for history_window.py +## the same can be said for history.py import os import sys ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -47,7 +47,6 @@ import logging from enum import IntEnum, unique -from gajim import history_window from gajim import dialogs from gajim import vcard from gajim import config @@ -72,6 +71,7 @@ from gajim.gtk import ManagePEPServicesWindow from gajim.gtk import ManageBookmarksWindow from gajim.gtk import AccountCreationWizard from gajim.gtk import ServiceRegistration +from gajim.gtk import HistoryWindow from gajim.common.const import AvatarSize @@ -3047,8 +3047,7 @@ class RosterWindow: app.interface.instances['logs'].window.present() app.interface.instances['logs'].open_history(contact.jid, account) else: - app.interface.instances['logs'] = history_window.\ - HistoryWindow(contact.jid, account) + app.interface.instances['logs'] = HistoryWindow(contact.jid, account) def on_disconnect(self, widget, jid, account): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/92af78f103d2ea33ca8c7e1ae295c29c76… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/92af78f103d2ea33ca8c7e1ae295c29c76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make Service Registration a Gtk.Assistant
by Philipp Hörist 04 Aug '18

04 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 043e7648 by Philipp Hörist at 2018-08-04T17:47:57Z Make Service Registration a Gtk.Assistant - Move all xmpp Register methods into the register module - - - - - 13 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/modules/register.py - gajim/config.py - − gajim/data/gui/service_registration_window.ui - gajim/disco.py - gajim/gtk/__init__.py - gajim/gtk/add_contact.py - gajim/gtk/dialogs.py - + gajim/gtk/service_registration.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -792,11 +792,6 @@ class Connection(CommonConnection, ConnectionHandlers): None, dialog_name='invalid-answer', kwargs={'name': data[0], 'error': data[3]})) return - is_form = data[2] - conf = data[1] - app.nec.push_incoming_event(RegisterAgentInfoReceivedEvent( - None, conn=self, agent=data[0], config=conf, - is_form=is_form)) def _select_next_host(self, hosts): """ ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -54,61 +54,6 @@ log = logging.getLogger('gajim.c.connection_handlers') # kind of events we can wait for an answer AGENT_REMOVED = 'agent_removed' - -class ConnectionDisco: - - def request_register_agent_info(self, agent): - if not self.connection or self.connected < 2: - return None - iq = nbxmpp.Iq('get', nbxmpp.NS_REGISTER, to=agent) - id_ = self.connection.getAnID() - iq.setID(id_) - # Wait the answer during 30 secondes - self.awaiting_timeouts[app.idlequeue.current_time() + 30] = (id_, - _('Registration information for transport %s has not arrived in ' - 'time') % agent) - self.connection.SendAndCallForResponse(iq, self._ReceivedRegInfo, - {'agent': agent}) - - def _agent_registered_cb(self, con, resp, agent): - if resp.getType() == 'result': - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='agent-register-success', args=agent)) - self.get_module('Presence').subscribe(agent, auto_auth=True) - self.agent_registrations[agent]['roster_push'] = True - if self.agent_registrations[agent]['sub_received']: - p = nbxmpp.Presence(agent, 'subscribed') - p = self.add_sha(p) - self.connection.send(p) - if resp.getType() == 'error': - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='agent-register-error', - kwargs={'agent': agent, - 'error': resp.getError(), - 'error_msg': resp.getErrorMsg()})) - - def register_agent(self, agent, info, is_form=False): - if not self.connection or self.connected < 2: - return - if is_form: - iq = nbxmpp.Iq('set', nbxmpp.NS_REGISTER, to=agent) - query = iq.setQuery() - info.setAttr('type', 'submit') - query.addChild(node=info) - self.connection.SendAndCallForResponse(iq, - self._agent_registered_cb, {'agent': agent}) - else: - # fixed: blocking - nbxmpp.features_nb.register(self.connection, agent, info, - self._agent_registered_cb, {'agent': agent}) - self.agent_registrations[agent] = {'roster_push': False, - 'sub_received': False} - - def _ReceivedRegInfo(self, con, resp, agent): - nbxmpp.features_nb._ReceivedRegInfo(con, resp, agent) - self._IqCB(con, resp) - - # basic connection handlers used here and in zeroconf class ConnectionHandlersBase: def __init__(self): @@ -443,7 +388,7 @@ class ConnectionHandlersBase: return sess -class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, +class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def __init__(self): ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -868,10 +868,6 @@ class SignedInEvent(nec.NetworkIncomingEvent): name = 'signed-in' base_network_events = [] -class RegisterAgentInfoReceivedEvent(nec.NetworkIncomingEvent): - name = 'register-agent-info-received' - base_network_events = [] - class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'file-request-received' base_network_events = [] ===================================== gajim/common/modules/register.py ===================================== --- a/gajim/common/modules/register.py +++ b/gajim/common/modules/register.py @@ -31,6 +31,8 @@ class Register: self.handlers = [] + self.agent_registrations = {} + def change_password(self, password, success_cb, error_cb): if not app.account_is_connected(self._account): return @@ -52,11 +54,87 @@ class Register: if not nbxmpp.isResultNode(stanza): error = stanza.getErrorMsg() log.info('Error: %s', error) - error_cb()(error) + if error_cb() is not None: + error_cb()(error) else: log.info('Password changed') + if success_cb() is not None: + success_cb()() + + def register_agent(self, agent, form, is_form, success_cb, error_cb): + if not app.account_is_connected(self._account): + return + + weak_success_cb = weakref.WeakMethod(success_cb) + weak_error_cb = weakref.WeakMethod(error_cb) + + iq = nbxmpp.Iq('set', nbxmpp.NS_REGISTER, to=agent) + if is_form: + query = iq.setQuery() + form.setAttr('type', 'submit') + query.addChild(node=form) + else: + for field in form.keys(): + iq.setTag('query').setTagData(field, form[field]) + + self._con.connection.SendAndCallForResponse( + iq, self._register_agent_response, {'agent': agent, + 'success_cb': weak_success_cb, + 'error_cb': weak_error_cb}) + + self.agent_registrations[agent] = {'roster_push': False, + 'sub_received': False} + + def _register_agent_response(self, con, stanza, agent, + success_cb, error_cb): + if not nbxmpp.isResultNode(stanza): + error = stanza.getErrorMsg() + log.info('Error: %s', error) + if error_cb() is not None: + error_cb()(error) + return + + self._con.get_module('Presence').subscribe(agent, auto_auth=True) + + self.agent_registrations[agent]['roster_push'] = True + if self.agent_registrations[agent]['sub_received']: + self._con.get_module('Presence').subscribed(agent) + + if success_cb() is not None: success_cb()() + def get_register_form(self, jid, success_cb, error_cb): + if not app.account_is_connected(self._account): + return + + weak_success_cb = weakref.WeakMethod(success_cb) + weak_error_cb = weakref.WeakMethod(error_cb) + + iq = nbxmpp.Iq('get', nbxmpp.NS_REGISTER, to=jid) + self._con.connection.SendAndCallForResponse( + iq, self._register_info_response, {'success_cb': weak_success_cb, + 'error_cb': weak_error_cb}) + + def _register_info_response(self, con, stanza, success_cb, error_cb): + if not nbxmpp.isResultNode(stanza): + error = stanza.getErrorMsg() + log.info('Error: %s', error) + if error_cb() is not None: + error_cb()(error) + else: + log.info('Register form received') + form = stanza.getQuery().getTag('x', namespace=nbxmpp.NS_DATA) + is_form = form is not None + if not is_form: + form = {} + for field in stanza.getQueryPayload(): + if not isinstance(field, nbxmpp.Node): + continue + form[field.getName()] = field.getData() + + if success_cb() is not None: + success_cb()(form, is_form) + def get_instance(*args, **kwargs): return Register(*args, **kwargs), 'Register' ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1486,57 +1486,6 @@ class FakeDataForm(Gtk.Table, object): self.infos[name] = self.entries[name].get_text() return self.infos -class ServiceRegistrationWindow: - """ - Class for Service registration window. Window that appears when we want to - subscribe to a service if is_form we use dataforms_widget else we use - service_registarion_window - """ - def __init__(self, service, infos, account, is_form): - self.service = service - self.account = account - self.is_form = is_form - self.xml = gtkgui_helpers.get_gtk_builder('service_registration_window.ui') - self.window = self.xml.get_object('service_registration_window') - self.window.set_transient_for(app.interface.roster.window) - if self.is_form: - dataform = dataforms.ExtendForm(node = infos) - self.data_form_widget = dataforms_widget.DataFormWidget(dataform) - if self.data_form_widget.title: - self.window.set_title('%s - Gajim' % self.data_form_widget.title) - grid = self.xml.get_object('grid') - grid.attach(self.data_form_widget, 0, 0, 2, 1) - else: - if 'registered' in infos: - self.window.set_title(_('Edit %s') % service) - else: - self.window.set_title(_('Register to %s') % service) - self.data_form_widget = FakeDataForm(infos) - grid = self.xml.get_object('grid') - grid.attach(self.data_form_widget, 0, 0, 2, 1) - - self.xml.connect_signals(self) - self.window.show_all() - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def on_ok_button_clicked(self, widget): - # send registration info to the core - if self.is_form: - form = self.data_form_widget.data_form - app.connections[self.account].register_agent(self.service, - form, True) # True is for is_form - else: - infos = self.data_form_widget.get_infos() - if 'instructions' in infos: - del infos['instructions'] - if 'registered' in infos: - del infos['registered'] - app.connections[self.account].register_agent(self.service, infos) - - self.window.destroy() - class GroupchatConfigWindow: def __init__(self, account, room_jid, form=None): ===================================== gajim/data/gui/service_registration_window.ui deleted ===================================== --- a/gajim/data/gui/service_registration_window.ui +++ /dev/null @@ -1,96 +0,0 @@ -<?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-apply</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-cancel</property> - </object> - <object class="GtkWindow" id="service_registration_window"> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="title" translatable="yes">Register to</property> - <property name="type_hint">dialog</property> - <child> - <object class="GtkBox" id="vbox12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkGrid" id="grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="image">image2</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label" translatable="yes">_OK</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="image">image1</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -59,6 +59,7 @@ from gajim import groups from gajim import adhoc_commands from gajim import search_window from gajim import gui_menu_builder +from gajim.gtk import ServiceRegistration from gajim.common import app import nbxmpp @@ -1355,8 +1356,8 @@ class ToplevelAgentBrowser(AgentBrowser): return jid = model[iter_][0] if jid: - app.connections[self.account].request_register_agent_info(jid) - self.window.destroy(chain = True) + ServiceRegistration(self.account, jid) + self.window.destroy(chain=True) def on_join_button_clicked(self, widget): """ ===================================== gajim/gtk/__init__.py ===================================== --- a/gajim/gtk/__init__.py +++ b/gajim/gtk/__init__.py @@ -66,3 +66,4 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow from gajim.gtk.profile import ProfileWindow from gajim.gtk.features import FeaturesDialog from gajim.gtk.account_wizard import AccountCreationWizard +from gajim.gtk.service_registration import ServiceRegistration ===================================== gajim/gtk/add_contact.py ===================================== --- a/gajim/gtk/add_contact.py +++ b/gajim/gtk/add_contact.py @@ -209,7 +209,8 @@ class AddNewContactWindow(Gtk.ApplicationWindow): model = self.protocol_jid_combobox.get_model() row = self.protocol_jid_combobox.get_active() jid = model[row][0] - app.connections[self.account].request_register_agent_info(jid) + from gajim.gtk import ServiceRegistration + ServiceRegistration(self.account, jid) def _on_key_press(self, widget, event): if event.keyval == Gdk.KEY_Escape: ===================================== gajim/gtk/dialogs.py ===================================== --- a/gajim/gtk/dialogs.py +++ b/gajim/gtk/dialogs.py @@ -13,10 +13,10 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gtk -from gi.repository import Gdk from gajim.common import app from gajim.common import helpers +from gajim.common.modules import dataforms from gajim.gtk.util import get_builder from gajim.gtk.util import load_icon ===================================== gajim/gtk/service_registration.py ===================================== --- /dev/null +++ b/gajim/gtk/service_registration.py @@ -0,0 +1,198 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import logging +from enum import IntEnum + +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.modules import dataforms + +log = logging.getLogger('gajim.gtk.registration') + + +class Page(IntEnum): + REQUEST = 0 + FORM = 1 + SENDING = 2 + SUCCESS = 3 + ERROR = 4 + + +class ServiceRegistration(Gtk.Assistant): + def __init__(self, account, agent): + Gtk.Assistant.__init__(self) + + self._con = app.connections[account] + self._agent = agent + self._account = account + self._data_form_widget = None + self._is_form = None + + self.set_application(app.app) + self.set_resizable(True) + self.set_position(Gtk.WindowPosition.CENTER) + + self.set_default_size(500, 300) + self.get_style_context().add_class('dialog-margin') + + request = RequestPage() + self.append_page(request) + self.set_page_type(request, Gtk.AssistantPageType.INTRO) + + form = FormPage() + self.append_page(form) + self.set_page_type(form, Gtk.AssistantPageType.INTRO) + self.set_page_complete(form, True) + + sending = SendingPage() + self.append_page(sending) + self.set_page_type(sending, Gtk.AssistantPageType.PROGRESS) + + success = SuccessfulPage() + self.append_page(success) + self.set_page_type(success, Gtk.AssistantPageType.SUMMARY) + self.set_page_complete(success, True) + + error = ErrorPage() + self.append_page(error) + self.set_page_type(error, Gtk.AssistantPageType.SUMMARY) + self.set_page_complete(error, True) + + self.connect('prepare', self._on_page_change) + self.connect('cancel', self._on_cancel) + self.connect('close', self._on_cancel) + + self.show_all() + + def _on_page_change(self, assistant, page): + if self.get_current_page() == Page.REQUEST: + self._con.get_module('Register').get_register_form( + self._agent, self._on_get_success, self._on_error) + elif self.get_current_page() == Page.SENDING: + self._register() + self.commit() + pass + + def _on_get_success(self, form, is_form): + log.info('Show Form page') + self._is_form = is_form + if is_form: + from gajim import dataforms_widget + dataform = dataforms.ExtendForm(node=form) + self._data_form_widget = dataforms_widget.DataFormWidget(dataform) + if self._data_form_widget.title: + self.set_title('%s - Gajim' % self._data_form_widget.title) + else: + if 'registered' in form: + self.set_title(_('Edit %s') % self._agent) + else: + self.set_title(_('Register to %s') % self._agent) + from gajim import config + self._data_form_widget = config.FakeDataForm(form) + + page = self.get_nth_page(Page.FORM) + page.pack_start(self._data_form_widget, True, True, 0) + self._data_form_widget.show() + self.set_current_page(Page.FORM) + + def _on_error(self, error_text): + log.info('Show Error page') + page = self.get_nth_page(Page.ERROR) + page.set_text(error_text) + self.set_current_page(Page.ERROR) + + def _on_cancel(self, widget): + self.destroy() + + def _register(self): + log.info('Show Sending page') + if self._is_form: + form = self._data_form_widget.data_form + else: + form = self._data_form_widget.get_infos() + if 'instructions' in form: + del form['instructions'] + if 'registered' in form: + del form['registered'] + + self._con.get_module('Register').register_agent( + self._agent, + form, + self._is_form, + self._on_register_success, + self._on_error) + + def _on_register_success(self): + log.info('Show Success page') + self.set_current_page(Page.SUCCESS) + + +class RequestPage(Gtk.Box): + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(18) + spinner = Gtk.Spinner() + self.pack_start(spinner, True, True, 0) + spinner.start() + + +class SendingPage(RequestPage): + def __init__(self): + super().__init__() + + +class FormPage(Gtk.Box): + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + + +class SuccessfulPage(Gtk.Box): + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(12) + self.set_homogeneous(True) + + icon = Gtk.Image.new_from_icon_name('object-select-symbolic', + Gtk.IconSize.DIALOG) + icon.get_style_context().add_class('success-color') + icon.set_valign(Gtk.Align.END) + label = Gtk.Label(label=_('Registration successful')) + label.get_style_context().add_class('bold16') + label.set_valign(Gtk.Align.START) + + self.add(icon) + self.add(label) + + +class ErrorPage(Gtk.Box): + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(12) + self.set_homogeneous(True) + + icon = Gtk.Image.new_from_icon_name('dialog-error-symbolic', + Gtk.IconSize.DIALOG) + icon.get_style_context().add_class('error-color') + icon.set_valign(Gtk.Align.END) + self._label = Gtk.Label() + self._label.get_style_context().add_class('bold16') + self._label.set_valign(Gtk.Align.START) + + self.add(icon) + self.add(self._label) + + def set_text(self, text): + self._label.set_text(text) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -580,17 +580,6 @@ class Interface: 'unsubscribed', 'gajim-unsubscribed', event_type, obj.jid) - @staticmethod - def handle_event_register_agent_info(obj): - # ('REGISTER_AGENT_INFO', account, (agent, infos, is_form)) - # info in a dataform if is_form is True - if obj.is_form or 'instructions' in obj.config: - config.ServiceRegistrationWindow(obj.agent, obj.config, - obj.conn.name, obj.is_form) - else: - ErrorDialog(_('Contact with "%s" cannot be established') % \ - obj.agent, _('Check your connection or try again later.')) - def handle_event_gc_config(self, obj): #('GC_CONFIG', account, (jid, form_node)) config is a dict account = obj.conn.name @@ -1565,7 +1554,6 @@ class Interface: 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection], 'presence-received': [self.handle_event_presence], - 'register-agent-info-received': [self.handle_event_register_agent_info], 'roster-info': [self.handle_event_roster_info], 'roster-item-exchange-received': \ [self.handle_event_roster_item_exchange], ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -71,6 +71,7 @@ from gajim.gtk import AddNewContactWindow from gajim.gtk import ManagePEPServicesWindow from gajim.gtk import ManageBookmarksWindow from gajim.gtk import AccountCreationWizard +from gajim.gtk import ServiceRegistration from gajim.common.const import AvatarSize @@ -2790,7 +2791,7 @@ class RosterWindow: """ When we want to modify the agent registration """ - app.connections[account].request_register_agent_info(contact.jid) + ServiceRegistration(account, contact.jid) def on_remove_agent(self, widget, list_): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/043e764896c9d15f7f0b5f12812fef176a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/043e764896c9d15f7f0b5f12812fef176a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework History Dialog
by Philipp Hörist 04 Aug '18

04 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 99ec8008 by Sophie Herold at 2018-08-04T09:04:36Z Rework History Dialog - - - - - 4 changed files: - gajim/common/config.py - gajim/data/gui/history_window.ui - gajim/data/style/gajim.css - gajim/history_window.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -169,7 +169,7 @@ class Config: 'roster_height': [ opt_int, 400 ], 'roster_hpaned_position': [opt_int, 200], 'roster_on_the_right': [opt_bool, False, _('Place the roster on the right in single window mode'), True], - 'history_window_width': [ opt_int, 650 ], + 'history_window_width': [ opt_int, -1 ], 'history_window_height': [ opt_int, 450 ], 'history_window_x-position': [ opt_int, 0 ], 'history_window_y-position': [ opt_int, 0 ], ===================================== gajim/data/gui/history_window.ui ===================================== --- a/gajim/data/gui/history_window.ui +++ b/gajim/data/gui/history_window.ui @@ -1,41 +1,148 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkApplicationWindow" id="history_window"> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Hello</col> + <col id="1" translatable="yes">user-offline-symbolic</col> + </row> + </data> + </object> + <object class="GtkPopoverMenu" id="more_menu"> <property name="can_focus">False</property> - <property name="title" translatable="yes">Conversation History</property> - <property name="window_position">center</property> - <property name="default_width">650</property> - <property name="default_height">450</property> - <property name="show_menubar">False</property> - <signal name="destroy" handler="on_history_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_history_window_key_press_event" swapped="no"/> <child> - <object class="GtkBox" id="vbox"> + <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="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="show_status_checkbutton"> + <property name="label" translatable="yes">Display status changes</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_status_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkModelButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">app.history-manager</property> + <property name="text" translatable="yes">History Manager</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="submenu">main</property> + <property name="position">1</property> + </packing> + </child> + </object> + <object class="GtkPopover" id="search_menu"> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</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="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Date</property> + <style> + <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="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="valign">start</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> - <object class="GtkBox" id="hbox1"> + <object class="GtkCalendar" id="calendar"> + <property name="width_request">270</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="day-selected" handler="on_calendar_day_selected" swapped="no"/> + <signal name="month-changed" handler="on_calendar_month_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="spacing">6</property> + <property name="valign">start</property> + <property name="homogeneous">True</property> + <property name="layout_style">expand</property> <child> - <object class="GtkEntry" id="query_entry"> + <object class="GtkButton" id="button_first_day"> + <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="placeholder_text" translatable="yes">Enter name / JID of contact or groupchat</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_change_date" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-first-symbolic</property> + </object> + </child> </object> <packing> <property name="expand">True</property> @@ -44,206 +151,373 @@ </packing> </child> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkButton" id="button_previous_day"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Search:</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_change_date" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-previous-symbolic</property> + </object> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkEntry" id="search_entry"> + <object class="GtkButton" id="button_next_day"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="activates_default">True</property> - <signal name="activate" handler="on_search_entry_activate" swapped="no"/> + <property name="receives_default">True</property> + <signal name="clicked" handler="_change_date" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-next-symbolic</property> + </object> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="search_in_date"> - <property name="label" translatable="yes">_In date search</property> + <object class="GtkButton" id="button_last_day"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Only searching within selected day</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_change_date" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-last-symbolic</property> + </object> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> + <style> + <class name="linked-up"/> + </style> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> + <style> + <class name="linked"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</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="margin_top">12</property> + <property name="label" translatable="yes">Mode</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="search_complete_history"> + <property name="label" translatable="yes">Search complete history</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_search_complete_history_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="search_in_date"> + <property name="label" translatable="yes">Search selected day only</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="draw_indicator">True</property> + <property name="group">search_complete_history</property> + <signal name="toggled" handler="on_search_in_date_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkApplicationWindow" id="history_window"> + <property name="can_focus">False</property> + <property name="title" translatable="yes">Conversation History</property> + <property name="window_position">center</property> + <property name="show_menubar">False</property> + <signal name="delete-event" handler="on_history_window_delete_event" swapped="no"/> + <signal name="destroy" handler="on_history_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_history_window_key_press_event" swapped="no"/> + <child> + <object class="GtkBox" id="vbox"> + <property name="width_request">600</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">18</property> + <property name="margin_right">18</property> + <property name="margin_top">18</property> + <property name="margin_bottom">18</property> + <property name="orientation">vertical</property> + <property name="spacing">24</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkPaned" id="vpaned1"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Chat</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="log_history_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkPaned" id="hpaned"> + <property name="tooltip_text" translatable="yes">Record history for this chat</property> + <signal name="notify::active" handler="on_log_history_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">6</property> + <property name="label" translatable="yes">Record History</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="query_entry"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="model">liststore1</property> + <property name="tearoff_title" translatable="yes">Ttitle</property> + <property name="has_entry">True</property> + <property name="entry_text_column">1</property> + <property name="id_column">1</property> + <signal name="changed" handler="on_jid_entry_changed" swapped="no"/> + <child internal-child="entry"> + <object class="GtkEntry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_bottom">5</property> - <property name="position">165</property> + <signal name="activate" handler="on_jid_entry_activate" swapped="no"/> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">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="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child type="center"> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="vbox2"> + <object class="GtkSearchEntry" id="search_entry"> + <property name="width_request">300</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">5</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkCalendar" id="calendar"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="day-selected" handler="on_calendar_day_selected" swapped="no"/> - <signal name="month-changed" handler="on_calendar_month_changed" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="primary_icon_name">edit-find-symbolic</property> + <property name="primary_icon_activatable">False</property> + <property name="primary_icon_sensitive">False</property> + <signal name="activate" handler="on_search_entry_activate" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="search_menu_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="popover">search_menu</property> <child> - <object class="GtkButtonBox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="spacing">5</property> - <property name="layout_style">expand</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="button_first_day"> + <object class="GtkLabel" id="date_label"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_change_date" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">go-first-symbolic</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="margin_left">3</property> + <property name="margin_right">3</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="button_previous_day"> + <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_change_date" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">go-previous-symbolic</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="icon_name">pan-down-symbolic</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkButton" id="button_next_day"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_change_date" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">go-next-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_last_day"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_change_date" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">go-last-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> </object> <packing> - <property name="resize">False</property> - <property name="shrink">False</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="linked"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkMenuButton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">etched-in</property> + <property name="receives_default">True</property> + <property name="popover">more_menu</property> <child> - <placeholder/> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">view-more-symbolic</property> + </object> </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">False</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> <packing> - <property name="resize">False</property> - <property name="shrink">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="inline-toolbar"/> + <class name="ontop-bar"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkPaned"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow" id="results_scrolledwindow"> <property name="can_focus">True</property> @@ -254,9 +528,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> - <signal name="row-activated" handler="on_results_treeview_row_activated" swapped="no"/> + <property name="hover_expand">True</property> + <signal name="cursor-changed" handler="on_results_treeview_cursor_changed" swapped="no"/> <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> + <object class="GtkTreeSelection"/> </child> </object> </child> @@ -266,6 +541,21 @@ <property name="shrink">True</property> </packing> </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">etched-in</property> + <property name="min_content_height">200</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> @@ -275,86 +565,15 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkCheckButton" id="log_history_checkbutton"> - <property name="label" translatable="yes">_Log conversation history</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_status_checkbutton"> - <property name="label" translatable="yes">_Show status changes</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_status_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </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">False</property> <property name="position">2</property> </packing> </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -110,6 +110,32 @@ list.settings > row > box { .popover_treeview { padding: 6px; } .popover_treeview :hover { background-color: @theme_selected_bg_color; } +/* .inline-toolbar linked from top */ +.ontop-bar { + border-width: 1px; + border-bottom: none; + border-radius: 3px 3px 0 0; + padding: 5px; +} + +/* Container with buttons linked from below */ +.linked-up * { + border-top: none; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +/* Highlighted label */ +.tagged { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; + padding: 0 3px; + margin: 0 -3px; + border-radius: 3px; + text-shadow: none; + opacity: 0.95; +} + /* Text style */ .bold16 { font-size: 16px; font-weight: bold; } ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -82,16 +82,17 @@ class HistoryWindow: self.history_buffer.create_tag('highlight', background='yellow') self.history_buffer.create_tag('invisible', invisible=True) self.checkbutton = xml.get_object('log_history_checkbutton') - self.checkbutton.connect('toggled', - self.on_log_history_checkbutton_toggled) self.show_status_checkbutton = xml.get_object('show_status_checkbutton') self.search_entry = xml.get_object('search_entry') self.query_liststore = xml.get_object('query_liststore') self.jid_entry = xml.get_object('query_entry') - self.jid_entry.connect('activate', self.on_jid_entry_activate) self.results_treeview = xml.get_object('results_treeview') self.results_window = xml.get_object('results_scrolledwindow') self.search_in_date = xml.get_object('search_in_date') + self.date_label = xml.get_object('date_label') + self.search_menu_button = xml.get_object('search_menu_button') + + self.clearing_search = False # jid, contact_name, date, message, time, log_line_id model = Gtk.ListStore(str, str, str, str, str, int) @@ -130,7 +131,7 @@ class HistoryWindow: GLib.idle_add(next, task) if jid: - self.jid_entry.set_text(jid) + self.jid_entry.get_child().set_text(jid) else: self._load_history(None) @@ -160,7 +161,12 @@ class HistoryWindow: {key : (jid, account, nick_name, full_completion_name} This is a generator and does pseudo-threading via idle_add(). """ - liststore = gtkgui_helpers.get_completion_liststore(self.jid_entry) + liststore = gtkgui_helpers.get_completion_liststore(self.jid_entry.get_child()) + liststore.set_sort_column_id(1, Gtk.SortType.ASCENDING) + self.jid_entry.get_child().get_completion().connect( + 'match-selected', self.on_jid_entry_match_selected) + + self.jid_entry.set_model(liststore) # Add all jids in logs.db: db_jids = app.logger.get_jids_in_db() @@ -177,7 +183,7 @@ class HistoryWindow: keys = list(completion_dict.keys()) # Move the actual jid at first so we load history faster - actual_jid = self.jid_entry.get_text() + actual_jid = self.jid_entry.get_child().get_text() if actual_jid in keys: keys.remove(actual_jid) keys.insert(0, actual_jid) @@ -251,6 +257,9 @@ class HistoryWindow: break return account + def on_history_window_delete_event(self, widget, *args): + self.save_state() + def on_history_window_destroy(self, widget): # PluginSystem: removing GUI extension points connected with # HistoryWindow instance object @@ -264,18 +273,23 @@ class HistoryWindow: self.save_state() self.window.destroy() - def on_close_button_clicked(self, widget): - self.save_state() - self.window.destroy() + def on_jid_entry_match_selected(self, widget, model, iter_, *args): + self._jid_entry_search(model[iter_][1]) + return True + + def on_jid_entry_changed(self, widget): + # only if selected from combobox + jid = self.jid_entry.get_child().get_text() + if jid == self.jid_entry.get_active_id(): + self._jid_entry_search(jid) def on_jid_entry_activate(self, widget): - jid = self.jid_entry.get_text() + self._jid_entry_search(self.jid_entry.get_child().get_text()) + + def _jid_entry_search(self, jid): self._load_history(jid, self.account) self.results_window.set_property('visible', False) - def on_jid_entry_focus(self, widget, event): - widget.select_region(0, -1) # select text - def _load_history(self, jid_or_name, account=None): """ Load history for the given jid/name and show it @@ -321,7 +335,7 @@ class HistoryWindow: self.last_day = self._get_date_from_timestamp(self.last_log) # Select logs for last date we have logs with contact - self.calendar.set_sensitive(True) + self.search_menu_button.set_sensitive(True) gtk_month = gtkgui_helpers.make_python_month_gtk_month( self.last_day.month) self.calendar.select_month(gtk_month, self.last_day.year) @@ -335,9 +349,7 @@ class HistoryWindow: self.search_entry.set_sensitive(True) self.search_entry.grab_focus() - title = _('Conversation History with %s') % info_name - self.window.set_title(title) - self.jid_entry.set_text(info_completion) + self.jid_entry.get_child().set_text(info_completion) else: # neither a valid jid, nor an existing contact name was entered # we have got nothing to show or to search in @@ -348,7 +360,7 @@ class HistoryWindow: self.search_entry.set_sensitive(False) self.checkbutton.set_sensitive(False) - self.calendar.set_sensitive(False) + self.search_menu_button.set_sensitive(False) self.calendar.clear_marks() self.button_previous_day.set_sensitive(False) self.button_next_day.set_sensitive(False) @@ -357,14 +369,13 @@ class HistoryWindow: self.results_window.set_property('visible', False) - title = _('Conversation History') - self.window.set_title(title) - def on_calendar_day_selected(self, widget): if not self.jid: return year, month, day = self.calendar.get_date() # integers month = gtkgui_helpers.make_gtk_month_python_month(month) + date_str = datetime.date(year, month, day).strftime('%x') + self.date_label.set_text(date_str) self._load_conversation(year, month, day) def on_calendar_month_changed(self, widget): @@ -594,10 +605,24 @@ class HistoryWindow: xhtml=xhtml, additional_data=additional_data) self.history_textview.print_real_text('\n', text_tags=['eol']) + def on_search_complete_history_toggled(self, widget): + self.date_label.get_style_context().remove_class('tagged') + + def on_search_in_date_toggled(self, widget): + self.date_label.get_style_context().add_class('tagged') + def on_search_entry_activate(self, widget): text = self.search_entry.get_text() + model = self.results_treeview.get_model() + self.clearing_search = True model.clear() + self.clearing_search = False + + start = self.history_buffer.get_start_iter() + end = self.history_buffer.get_end_iter() + self.history_buffer.remove_tag_by_name('highlight', start, end) + if text == '': self.results_window.set_property('visible', False) return @@ -624,6 +649,7 @@ class HistoryWindow: show_status = self.show_status_checkbutton.get_active() results = app.logger.search_log(account, jid, text, date) + result_found = False #FIXME: # add "subject: | message: " in message column if kind is single # also do we need show at all? (we do not search on subject) @@ -642,18 +668,30 @@ class HistoryWindow: local_time = time.localtime(row.time) date = time.strftime('%Y-%m-%d', local_time) + result_found = True model.append((jid, contact_name, date, row.message, str(row.time), row.log_line_id)) - def on_results_treeview_row_activated(self, widget, path, column): + if result_found: + self.results_treeview.set_cursor(0) + + def on_results_treeview_cursor_changed(self, *args): """ - A row was double clicked, get date from row, and select it in calendar + A row was selected, get date from row, and select it in calendar which results to showing conversation logs for that date """ + if self.clearing_search: + return + # get currently selected date cur_year, cur_month, cur_day = self.calendar.get_date() cur_month = gtkgui_helpers.make_gtk_month_python_month(cur_month) - model = widget.get_model() + model, paths = self.results_treeview.get_selection().get_selected_rows() + + if not paths: + return + + path = paths[0] # make it a tuple (Y, M, D, 0, 0, 0...) tim = time.strptime(model[path][Column.UNIXTIME], '%Y-%m-%d') year = tim[0] @@ -706,7 +744,7 @@ class HistoryWindow: mark = self.history_buffer.create_mark('match', match_start, True) GLib.idle_add(self.history_textview.tv.scroll_to_mark, mark, 0, True, 0.0, 0.5) - def on_log_history_checkbutton_toggled(self, widget): + def on_log_history_checkbutton_toggled(self, widget, *args): # log conversation history? oldlog = True no_log_for = app.config.get_per('accounts', self.account, @@ -730,7 +768,7 @@ class HistoryWindow: """ Load chat history of the specified jid """ - self.jid_entry.set_text(jid) + self.jid_entry.get_child().set_text(jid) if account and account not in self.accounts_seen_online: # Update dict to not only show bare jid GLib.idle_add(next, self._fill_completion_dict()) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/99ec800856c5ddd347b32b3a9ee6b45236… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/99ec800856c5ddd347b32b3a9ee6b45236… 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 August 2018