Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] Add error message to change password dialog
by Philipp Hörist 31 Jul '18

31 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 560a122a by Philipp Hörist at 2018-07-31T22:35:42Z Add error message to change password dialog - Move register methods to own module - - - - - 8 changed files: - gajim/common/connection.py - + gajim/common/modules/register.py - gajim/data/gui/change_password_dialog.ui - gajim/data/style/gajim.css - gajim/dialogs.py - gajim/gtk/__init__.py - gajim/gtk/dialogs.py - gajim/options_dialog.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1835,17 +1835,6 @@ class Connection(CommonConnection, ConnectionHandlers): # disconnect from jabber server self.connection.send(p) - def change_password(self, password): - if not app.account_is_connected(self.name): - return - hostname = app.config.get_per('accounts', self.name, 'hostname') - username = app.config.get_per('accounts', self.name, 'name') - iq = nbxmpp.Iq(typ='set', to=hostname) - q = iq.setTag(nbxmpp.NS_REGISTER + ' query') - q.setTagData('username', username) - q.setTagData('password', password) - self.connection.send(iq) - def get_password(self, callback, type_): if app.config.get_per('accounts', self.name, 'anonymous_auth') and \ type_ != 'ANONYMOUS': ===================================== gajim/common/modules/register.py ===================================== --- /dev/null +++ b/gajim/common/modules/register.py @@ -0,0 +1,62 @@ +# 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/>. + +# XEP-0077: In-Band Registration + +import logging +import weakref + +import nbxmpp + +from gajim.common import app + +log = logging.getLogger('gajim.c.m.register') + + +class Register: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [] + + def change_password(self, password, success_cb, error_cb): + if not app.account_is_connected(self._account): + return + hostname = app.config.get_per('accounts', self._account, 'hostname') + username = app.config.get_per('accounts', self._account, 'name') + iq = nbxmpp.Iq(typ='set', to=hostname) + q = iq.setTag(nbxmpp.NS_REGISTER + ' query') + q.setTagData('username', username) + q.setTagData('password', password) + + weak_success_cb = weakref.WeakMethod(success_cb) + weak_error_cb = weakref.WeakMethod(error_cb) + log.info('Send password change') + self._con.connection.SendAndCallForResponse( + iq, self._change_password_response, {'success_cb': weak_success_cb, + 'error_cb': weak_error_cb}) + + def _change_password_response(self, con, stanza, success_cb, error_cb): + if not nbxmpp.isResultNode(stanza): + error = stanza.getErrorMsg() + log.info('Error: %s', error) + error_cb()(error) + else: + log.info('Password changed') + success_cb()() + + +def get_instance(*args, **kwargs): + return Register(*args, **kwargs), 'Register' ===================================== gajim/data/gui/change_password_dialog.ui ===================================== --- a/gajim/data/gui/change_password_dialog.ui +++ b/gajim/data/gui/change_password_dialog.ui @@ -1,157 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="change_password_dialog"> + <object class="GtkBox" id="change_password_box"> + <property name="width_request">220</property> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="title" translatable="yes">Change Password</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox7"> + <property name="margin_bottom">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkEntry" id="password1_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="placeholder_text" translatable="yes">New Password</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="password2_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">Confirm New Password</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="error_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancelbutton2"> - <property name="label">gtk-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="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="okbutton2"> - <property name="label">gtk-ok</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> - </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">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox2928"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <object class="GtkImage" id="image416"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="vbox54"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label208"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Enter new password:</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password1_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label209"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Enter it again for confirmation:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password2_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="error-color"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> - <action-widgets> - <action-widget response="-6">cancelbutton2</action-widget> - <action-widget response="-5">okbutton2</action-widget> - </action-widgets> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -21,6 +21,8 @@ background-image: none; } +.dialog-margin > box { margin: 18px;} + #MessageWindow, #RosterWindow paned { background-color: @theme_base_color; } .chatcontrol-separator-top {margin-top: 5px;} ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1058,41 +1058,6 @@ class SynchroniseSelectContactsDialog: iter_ = model.iter_next(iter_) self.dialog.destroy() -class ChangePasswordDialog: - def __init__(self, account, on_response, transient_for=None): - # 'account' can be None if we are about to create our first one - if not account or app.connections[account].connected < 2: - ErrorDialog(_('You are not connected to the server'), - _('Without a connection, you can not change your password.')) - raise GajimGeneralException('You are not connected to the server') - self.account = account - self.on_response = on_response - self.xml = gtkgui_helpers.get_gtk_builder('change_password_dialog.ui') - self.dialog = self.xml.get_object('change_password_dialog') - self.dialog.set_transient_for(transient_for) - self.password1_entry = self.xml.get_object('password1_entry') - self.password2_entry = self.xml.get_object('password2_entry') - self.dialog.connect('response', self.on_dialog_response) - - self.dialog.show_all() - - def on_dialog_response(self, dialog, response): - if response != Gtk.ResponseType.OK: - dialog.destroy() - self.on_response(None) - return - password1 = self.password1_entry.get_text() - if not password1: - ErrorDialog(_('Invalid password'), _('You must enter a password.')) - return - password2 = self.password2_entry.get_text() - if password1 != password2: - ErrorDialog(_('Passwords do not match'), - _('The passwords typed in both fields must be identical.')) - return - dialog.destroy() - self.on_response(password1) - #Action that can be done with an incoming list of contacts TRANSLATED_ACTION = {'add': _('add'), 'modify': _('modify'), ===================================== gajim/gtk/__init__.py ===================================== --- a/gajim/gtk/__init__.py +++ b/gajim/gtk/__init__.py @@ -51,6 +51,7 @@ from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.dialogs import HigDialog from gajim.gtk.dialogs import SSLErrorDialog +from gajim.gtk.dialogs import ChangePasswordDialog from gajim.gtk.about import AboutDialog from gajim.gtk.join_groupchat import JoinGroupchatWindow ===================================== gajim/gtk/dialogs.py ===================================== --- a/gajim/gtk/dialogs.py +++ b/gajim/gtk/dialogs.py @@ -13,6 +13,7 @@ # 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 @@ -931,3 +932,57 @@ class SSLErrorDialog(ConfirmationDialogDoubleCheck): def on_cert_clicked(self, button): CertificatDialog(self, self.account, self.cert) + + +class ChangePasswordDialog(Gtk.Dialog): + def __init__(self, account, success_cb, transient_for): + flags = Gtk.DialogFlags.DESTROY_WITH_PARENT + super().__init__(_('Change Password'), None, flags) + + self._account = account + self._success_cb = success_cb + + self._builder = get_builder('change_password_dialog.ui') + self.get_content_area().add( + self._builder.get_object('change_password_box')) + self._password1_entry = self._builder.get_object('password1_entry') + self._password2_entry = self._builder.get_object('password2_entry') + self._error_label = self._builder.get_object('error_label') + + self.set_transient_for(transient_for) + + self.add_button(_('_OK'), Gtk.ResponseType.OK) + self.set_default_response(Gtk.ResponseType.OK) + self.get_style_context().add_class('dialog-margin') + self.connect('response', self._on_dialog_response) + self.show_all() + + def _on_dialog_response(self, dialog, response): + if response != Gtk.ResponseType.OK: + self.destroy() + return + + password1 = self._password1_entry.get_text() + if not password1: + self._error_label.set_text(_('You must enter a password')) + return + password2 = self._password2_entry.get_text() + if password1 != password2: + self._error_label.set_text(_('Passwords do not match')) + return + + self._password1_entry.set_sensitive(False) + self._password2_entry.set_sensitive(False) + + con = app.connections[self._account] + con.get_module('Register').change_password( + password1, self._on_success, self._on_error) + + def _on_success(self): + self._success_cb(self._password1_entry.get_text()) + self.destroy() + + def _on_error(self, error_text): + self._error_label.set_text(error_text) + self._password1_entry.set_sensitive(True) + self._password2_entry.set_sensitive(True) ===================================== gajim/options_dialog.py ===================================== --- a/gajim/options_dialog.py +++ b/gajim/options_dialog.py @@ -6,6 +6,8 @@ from gajim.common.const import OptionKind, OptionType from gajim.common.exceptions import GajimGeneralException from gajim import dialogs from gajim.gtk import ErrorDialog +from gajim.gtk import ChangePasswordDialog + class OptionsDialog(Gtk.ApplicationWindow): def __init__(self, parent, title, flags, options, account, @@ -530,16 +532,14 @@ class ChangePasswordOption(DialogOption): def show_dialog(self, parent): try: - self.change_dialog = dialogs.ChangePasswordDialog( + self.change_dialog = ChangePasswordDialog( self.account, self.on_changed, parent) except GajimGeneralException: return - self.change_dialog.dialog.set_modal(True) + self.change_dialog.set_modal(True) def on_changed(self, new_password): - if new_password is not None: - app.connections[self.account].change_password(new_password) - self.set_value(new_password) + self.set_value(new_password) def set_activatable(self, name, value): activatable = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/560a122ab59d5918fc7039c15bcd8987c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/560a122ab59d5918fc7039c15bcd8987c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix detecting oob data
by Philipp Hörist 31 Jul '18

31 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4096ab5d by Philipp Hörist at 2018-07-31T19:20:02Z Fix detecting oob data - - - - - 1 changed file: - gajim/common/modules/misc.py Changes: ===================================== gajim/common/modules/misc.py ===================================== --- a/gajim/common/modules/misc.py +++ b/gajim/common/modules/misc.py @@ -80,7 +80,7 @@ def parse_delay(stanza, epoch=True, convert='utc'): # XEP-0066: Out of Band Data -def parse_oob(stanza, dict_=None, key='Gajim'): +def parse_oob(stanza, dict_=None, key='gajim'): oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is None: return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4096ab5db56630b21959c3fd2821e87a9d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4096ab5db56630b21959c3fd2821e87a9d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Handle messages without 'to' correctly
by Philipp Hörist 30 Jul '18

30 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 85bc3896 by Philipp Hörist at 2018-07-30T19:58:22Z Handle messages without 'to' correctly - - - - - 2 changed files: - gajim/common/modules/carbons.py - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/carbons.py ===================================== --- a/gajim/common/modules/carbons.py +++ b/gajim/common/modules/carbons.py @@ -73,7 +73,7 @@ def parse_carbon(con, stanza): type_ = carbon.getName() to = message.getTo() frm = message.getFrom() - log.info('Received type: %s, from: %s, to: %s', type_, to, frm) + log.info('Received type: %s, from: %s', type_, frm) if type_ == 'received': sent = False ===================================== gajim/common/modules/message.py ===================================== --- a/gajim/common/modules/message.py +++ b/gajim/common/modules/message.py @@ -58,6 +58,23 @@ class Message: nbxmpp.NS_IBB]) def _message_received(self, con, stanza): + # https://tools.ietf.org/html/rfc6120#section-8.1.1.1 + # If the stanza does not include a 'to' address then the client MUST + # treat it as if the 'to' address were included with a value of the + # client's full JID. + # + # Implementation Note: However, if the client does + # check the 'to' address then it is suggested to check at most the + # bare JID portion (not the full JID) + + own_jid = self._con.get_own_jid().getStripped() + to = stanza.getTo() + if to is None: + stanza.setTo(own_jid) + elif not to.bareMatch(own_jid): + log.warning('Message addressed to someone else: %s', stanza) + raise nbxmpp.NodeProcessed + # Check if a child of the message contains any # namespaces that we handle in other modules. # nbxmpp executes less common handlers last @@ -118,7 +135,7 @@ class Message: if type_ == 'groupchat': archive_jid = stanza.getFrom().getStripped() else: - archive_jid = self._con.get_own_jid().getStripped() + archive_jid = own_jid if app.logger.find_stanza_id(self._account, archive_jid, stanza_id, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/85bc3896abcb21041bd89c7fefd96927dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/85bc3896abcb21041bd89c7fefd96927dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Windows build
by Philipp Hörist 30 Jul '18

30 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ac81552 by Philipp Hörist at 2018-07-30T18:28:31Z Fix Windows build - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -19,6 +19,7 @@ clone_depth: 1 build_script: - C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20 + - C:\msys64\usr\bin\pacman -Su --needed --noconfirm - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ac815529706e5617ee0afb99b17376645… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ac815529706e5617ee0afb99b17376645… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move shortcuts dialog into gtk folder
by Philipp Hörist 29 Jul '18

29 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 23e39dc9 by Philipp Hörist at 2018-07-29T22:24:43Z Move shortcuts dialog into gtk folder - - - - - 3 changed files: - gajim/app_actions.py - + gajim/gtk/shortcuts_window.py - − gajim/shortcuts_window.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -21,7 +21,7 @@ from gajim.common.app import interface from gajim.common.exceptions import GajimGeneralException from gajim import config from gajim import dialogs -from gajim import shortcuts_window +from gajim.gtk import shortcuts_window from gajim import accounts_window import gajim.plugins.gui from gajim import history_window ===================================== gajim/gtk/shortcuts_window.py ===================================== --- /dev/null +++ b/gajim/gtk/shortcuts_window.py @@ -0,0 +1,43 @@ +# 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.gtk.util import get_builder +from gajim.common import helpers + +__all__ = ['show'] + + +class ShortcutsWindow: + def __init__(self): + self.window = None + + def show(self, parent=None): + if self.window is None: + builder = get_builder('shortcuts_window.ui') + self.window = builder.get_object('shortcuts_window') + self.window.connect('destroy', self._on_window_destroy) + self.window.set_transient_for(parent) + self.window.show_all() + self.window.present() + + def _on_window_destroy(self, widget): + self.window = None + + +def show_shortcuts_webpage(self, parent=None): + helpers.launch_browser_mailer( + 'url', + 'https://dev.gajim.org/gajim/gajim/wikis/help/keyboardshortcuts') + +show = ShortcutsWindow().show ===================================== gajim/shortcuts_window.py deleted ===================================== --- a/gajim/shortcuts_window.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding:utf-8 -*- -## src/shortcuts_window.py -## -## 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 gajim import gtkgui_helpers - -from gajim.common import helpers - -__all__ = ['show'] - -class ShortcutsWindow: - def __init__(self): - self.window = None - - def show(self, parent=None): - if self.window is None: - builder = gtkgui_helpers.get_gtk_builder('shortcuts_window.ui') - self.window = builder.get_object('shortcuts_window') - self.window.connect('destroy', self._on_window_destroy) - self.window.set_transient_for(parent) - self.window.show_all() - self.window.present() - - def _on_window_destroy(self, widget): - self.window = None - -def show_shortcuts_webpage(self, parent=None): - helpers.launch_browser_mailer('url', - 'https://dev.gajim.org/gajim/gajim/wikis/help/keyboardshortcuts') - -if (3, 19) <= (Gtk.get_major_version(), Gtk.get_minor_version()): - show = ShortcutsWindow().show -else: - show = show_shortcuts_webpage View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/23e39dc9e69138294880126b80a9ebacbc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/23e39dc9e69138294880126b80a9ebacbc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move features dialog into gtk folder
by Philipp Hörist 29 Jul '18

29 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b3f1416c by Philipp Hörist at 2018-07-29T21:58:38Z Move features dialog into gtk folder - - - - - a7d9701c by Philipp Hörist at 2018-07-29T22:20:38Z Move AccountCreationWizard into gtk folder - - - - - 7 changed files: - gajim/app_actions.py - gajim/config.py - gajim/data/gui/features_window.ui - gajim/gtk/__init__.py - + gajim/gtk/account_wizard.py - gajim/features_window.py → gajim/gtk/features.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -21,7 +21,6 @@ from gajim.common.app import interface from gajim.common.exceptions import GajimGeneralException from gajim import config from gajim import dialogs -from gajim import features_window from gajim import shortcuts_window from gajim import accounts_window import gajim.plugins.gui @@ -38,6 +37,8 @@ from gajim.gtk import XMLConsoleWindow from gajim.gtk import AboutDialog from gajim.gtk import PrivacyListsWindow from gajim.gtk import ManageBookmarksWindow +from gajim.gtk import FeaturesDialog +from gajim.gtk import AccountCreationWizard # General Actions @@ -176,7 +177,7 @@ def on_add_account(action, param): app.interface.instances['account_creation_wizard'].window.present() else: app.interface.instances['account_creation_wizard'] = \ - config.AccountCreationWizardWindow() + AccountCreationWizard() def on_import_contacts(action, param): @@ -283,7 +284,7 @@ def on_keyboard_shortcuts(action, param): def on_features(action, param): - features_window.FeaturesWindow() + FeaturesDialog() def on_about(action, param): ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1883,559 +1883,6 @@ class RemoveAccountWindow: app.interface.instances['accounts'].remove_account(self.account) self.window.destroy() -class AccountCreationWizardWindow: - def __init__(self): - self.xml = gtkgui_helpers.get_gtk_builder( - 'account_creation_wizard_window.ui') - self.window = self.xml.get_object('account_creation_wizard_window') - active_window = app.app.get_active_window() - self.window.set_transient_for(active_window) - - # Connect events from comboboxtext_entry - server_comboboxtext = self.xml.get_object('server_comboboxtext') - entry = self.xml.get_object('server_comboboxtext_entry') - entry.connect('key_press_event', - self.on_server_comboboxentry_key_press_event, server_comboboxtext) - - server_comboboxtext1 = self.xml.get_object('server_comboboxtext1') - - self.update_proxy_list() - - # parse servers.xml - servers_xml = os.path.join( - configpaths.get('DATA'), 'other', 'servers.xml') - servers = gtkgui_helpers.parse_server_xml(servers_xml) - servers_model = self.xml.get_object('server_liststore') - for server in servers: - servers_model.append((server,)) - - server_comboboxtext.set_model(servers_model) - server_comboboxtext1.set_model(servers_model) - - # Generic widgets - self.notebook = self.xml.get_object('notebook') - self.cancel_button = self.xml.get_object('cancel_button') - self.back_button = self.xml.get_object('back_button') - self.forward_button = self.xml.get_object('forward_button') - self.finish_button = self.xml.get_object('finish_button') - self.advanced_button = self.xml.get_object('advanced_button') - self.finish_label = self.xml.get_object('finish_label') - self.go_online_checkbutton = self.xml.get_object( - 'go_online_checkbutton') - self.show_vcard_checkbutton = self.xml.get_object( - 'show_vcard_checkbutton') - self.progressbar = self.xml.get_object('progressbar') - - # some vars - self.update_progressbar_timeout_id = None - - self.notebook.set_current_page(0) - self.xml.connect_signals(self) - self.window.show_all() - app.ged.register_event_handler('new-account-connected', ged.GUI1, - self._nec_new_acc_connected) - app.ged.register_event_handler('new-account-not-connected', ged.GUI1, - self._nec_new_acc_not_connected) - app.ged.register_event_handler('account-created', ged.GUI1, - self._nec_acc_is_ok) - app.ged.register_event_handler('account-not-created', ged.GUI1, - self._nec_acc_is_not_ok) - - def on_wizard_window_destroy(self, widget): - page = self.notebook.get_current_page() - if page in (4, 5) and self.account in app.connections: - # connection instance is saved in app.connections and we canceled - # the addition of the account - del app.connections[self.account] - if self.account in app.config.get_per('accounts'): - app.config.del_per('accounts', self.account) - app.ged.remove_event_handler('new-account-connected', ged.GUI1, - self._nec_new_acc_connected) - app.ged.remove_event_handler('new-account-not-connected', ged.GUI1, - self._nec_new_acc_not_connected) - app.ged.remove_event_handler('account-created', ged.GUI1, - self._nec_acc_is_ok) - app.ged.remove_event_handler('account-not-created', ged.GUI1, - self._nec_acc_is_not_ok) - del app.interface.instances['account_creation_wizard'] - - def on_save_password_checkbutton_toggled(self, widget): - self.xml.get_object('password_entry').grab_focus() - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def on_back_button_clicked(self, widget): - cur_page = self.notebook.get_current_page() - self.forward_button.set_sensitive(True) - if cur_page in (1, 2): - self.notebook.set_current_page(0) - self.back_button.set_sensitive(False) - elif cur_page == 3: - self.xml.get_object('form_vbox').remove(self.data_form_widget) - self.notebook.set_current_page(2) # show server page - elif cur_page == 4: - if self.account in app.connections: - del app.connections[self.account] - if self.account in app.config.get_per('accounts'): - app.config.del_per('accounts', self.account) - self.notebook.set_current_page(2) - self.xml.get_object('form_vbox').remove(self.data_form_widget) - elif cur_page == 6: # finish page - self.forward_button.show() - if self.modify: - self.notebook.set_current_page(1) # Go to parameters page - else: - self.notebook.set_current_page(2) # Go to server page - - def on_anonymous_checkbutton1_toggled(self, widget): - active = widget.get_active() - self.xml.get_object('username_entry').set_sensitive(not active) - self.xml.get_object('password_entry').set_sensitive(not active) - self.xml.get_object('save_password_checkbutton').set_sensitive( - not active) - - def show_finish_page(self): - self.cancel_button.hide() - self.back_button.hide() - self.forward_button.hide() - if self.modify: - finish_text = '<big><b>%s</b></big>\n\n%s' % ( - _('Account has been added successfully'), - _('You can set advanced account options by pressing the ' - 'Advanced button, or later by choosing the Accounts menu item ' - 'under the Edit menu from the main window.')) - else: - finish_text = '<big><b>%s</b></big>\n\n%s' % ( - _('Your new account has been created successfully'), - _('You can set advanced account options by pressing the ' - 'Advanced button, or later by choosing the Accounts menu item ' - 'under the Edit menu from the main window.')) - self.finish_label.set_markup(finish_text) - self.finish_button.show() - self.finish_button.set_property('has-default', True) - self.advanced_button.show() - self.go_online_checkbutton.show() - img = self.xml.get_object('finish_image') - if self.modify: - img.set_from_icon_name(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG) - else: - path_to_file = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) - img.set_from_file(path_to_file) - self.show_vcard_checkbutton.set_active(not self.modify) - self.notebook.set_current_page(6) # show finish page - - def on_forward_button_clicked(self, widget): - cur_page = self.notebook.get_current_page() - - if cur_page == 0: - widget = self.xml.get_object('use_existing_account_radiobutton') - if widget.get_active(): - self.modify = True - self.notebook.set_current_page(1) - else: - self.modify = False - self.notebook.set_current_page(2) - self.back_button.set_sensitive(True) - return - - elif cur_page == 1: - # We are adding an existing account - anonymous = self.xml.get_object('anonymous_checkbutton1').\ - get_active() - username = self.xml.get_object('username_entry').get_text().strip() - if not username and not anonymous: - pritext = _('Invalid username') - sectext = _( - 'You must provide a username to configure this account.') - ErrorDialog(pritext, sectext) - return - server = self.xml.get_object('server_comboboxtext_entry').\ - get_text().strip() - savepass = self.xml.get_object('save_password_checkbutton').\ - get_active() - password = self.xml.get_object('password_entry').get_text() - - if anonymous: - jid = '' - else: - jid = username + '@' - jid += server - # check if jid is conform to RFC and stringprep it - try: - jid = helpers.parse_jid(jid) - except helpers.InvalidFormat as s: - pritext = _('Invalid JID') - ErrorDialog(pritext, str(s)) - return - - self.account = server - i = 1 - while self.account in app.config.get_per('accounts'): - self.account = server + str(i) - i += 1 - - username, server = app.get_name_and_server_from_jid(jid) - if self.xml.get_object('anonymous_checkbutton1').get_active(): - self.save_account('', server, False, '', anonymous=True) - else: - self.save_account(username, server, savepass, password) - self.show_finish_page() - elif cur_page == 2: - # We are creating a new account - server = self.xml.get_object('server_comboboxtext_entry1').\ - get_text() - - if not server: - ErrorDialog(_('Invalid server'), - _('Please provide a server on which you want to register.')) - return - self.account = server - i = 1 - while self.account in app.config.get_per('accounts'): - self.account = server + str(i) - i += 1 - - config = self.get_config('', server, '', '') - # Get advanced options - proxies_combobox = self.xml.get_object('proxies_combobox') - active = proxies_combobox.get_active() - proxy = proxies_combobox.get_model()[active][0] - if proxy == _('None'): - proxy = '' - config['proxy'] = proxy - - config['use_custom_host'] = self.xml.get_object( - 'custom_host_port_checkbutton').get_active() - custom_port = self.xml.get_object('custom_port_entry').get_text() - try: - custom_port = int(custom_port) - except Exception: - ErrorDialog(_('Invalid entry'), - _('Custom port must be a port number.')) - return - config['custom_port'] = custom_port - config['custom_host'] = self.xml.get_object( - 'custom_host_entry').get_text() - - if self.xml.get_object('anonymous_checkbutton2').get_active(): - self.modify = True - self.save_account('', server, False, '', anonymous=True) - self.show_finish_page() - else: - self.notebook.set_current_page(5) # show creating page - self.back_button.hide() - self.forward_button.hide() - self.update_progressbar_timeout_id = GLib.timeout_add(100, - self.update_progressbar) - # Get form from serveur - con = connection.Connection(self.account) - app.connections[self.account] = con - con.new_account(self.account, config) - elif cur_page == 3: - checked = self.xml.get_object('ssl_checkbutton').get_active() - if checked: - hostname = app.connections[self.account].new_account_info[ - 'hostname'] - # Check if cert is already in file - certs = '' - my_ca_certs = configpaths.get('MY_CACERTS') - if os.path.isfile(my_ca_certs): - with open(my_ca_certs) as f: - certs = f.read() - if self.ssl_cert in certs: - ErrorDialog(_('Certificate Already in File'), - _('This certificate is already in file %s, so it\'s ' - 'not added again.') % my_ca_certs) - else: - with open(my_ca_certs, 'a') as f: - f.write(hostname + '\n') - f.write(self.ssl_cert + '\n\n') - app.connections[self.account].new_account_info[ - 'ssl_fingerprint_sha1'] = self.ssl_fingerprint_sha1 - app.connections[self.account].new_account_info[ - 'ssl_fingerprint_sha256'] = self.ssl_fingerprint_sha256 - self.notebook.set_current_page(4) # show fom page - elif cur_page == 4: - if self.is_form: - form = self.data_form_widget.data_form - else: - form = self.data_form_widget.get_infos() - app.connections[self.account].send_new_account_infos(form, - self.is_form) - self.xml.get_object('form_vbox').remove(self.data_form_widget) - self.xml.get_object('progressbar_label').set_markup( - '<b>Account is being created</b>\n\nPlease wait…') - self.notebook.set_current_page(5) # show creating page - self.back_button.hide() - self.forward_button.hide() - self.update_progressbar_timeout_id = GLib.timeout_add(100, - self.update_progressbar) - - def update_proxy_list(self): - proxies_combobox = self.xml.get_object('proxies_combobox') - model = Gtk.ListStore(str) - proxies_combobox.set_model(model) - l = app.config.get_per('proxies') - l.insert(0, _('None')) - for i in range(len(l)): - model.append([l[i]]) - proxies_combobox.set_active(0) - - 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() - - def on_custom_host_port_checkbutton_toggled(self, widget): - self.xml.get_object('custom_host_hbox').set_sensitive(widget.\ - get_active()) - - def update_progressbar(self): - self.progressbar.pulse() - return True # loop forever - - def _nec_new_acc_connected(self, obj): - """ - Connection to server succeded, present the form to the user - """ - # We receive events from all accounts from GED - if obj.conn.name != self.account: - return - if self.update_progressbar_timeout_id is not None: - GLib.source_remove(self.update_progressbar_timeout_id) - self.back_button.show() - self.forward_button.show() - self.is_form = obj.is_form - empty_config = True - if obj.is_form: - dataform = dataforms.ExtendForm(node=obj.config) - self.data_form_widget = dataforms_widget.DataFormWidget() - self.data_form_widget.selectable = True - self.data_form_widget.set_data_form(dataform) - empty_config = False - else: - self.data_form_widget = FakeDataForm(obj.config, selectable=True) - for field in obj.config: - if field in ('key', 'instructions', 'x', 'registered'): - continue - empty_config = False - break - self.data_form_widget.show_all() - self.xml.get_object('form_vbox').pack_start(self.data_form_widget, True, True, 0) - if empty_config: - self.forward_button.set_sensitive(False) - self.notebook.set_current_page(4) # show form page - return - self.ssl_fingerprint_sha1 = obj.ssl_fingerprint_sha1 - self.ssl_fingerprint_sha256 = obj.ssl_fingerprint_sha256 - self.ssl_cert = obj.ssl_cert - if obj.ssl_msg: - # An SSL warning occured, show it - hostname = app.connections[self.account].new_account_info[ - 'hostname'] - self.xml.get_object('ssl_label').set_markup(_( - '<b>Security Warning</b>' - '\n\nThe authenticity of the %(hostname)s SSL certificate could' - ' be invalid.\nSSL Error: %(error)s\n' - 'Do you still want to connect to this server?') % { - 'hostname': hostname, 'error': obj.ssl_msg}) - if obj.errnum in (18, 27): - text = _('Add this certificate to the list of trusted ' - 'certificates.\nSHA-1 fingerprint of the certificate:\n' - '%(sha1)s\nSHA-256 fingerprint of the certificate:\n' - '%(sha256)s') % {'sha1': obj.ssl_fingerprint_sha1, - 'sha256': obj.ssl_fingerprint_sha256} - self.xml.get_object('ssl_checkbutton').set_label(text) - else: - self.xml.get_object('ssl_checkbutton').set_no_show_all(True) - self.xml.get_object('ssl_checkbutton').hide() - self.notebook.set_current_page(3) # show SSL page - else: - self.notebook.set_current_page(4) # show form page - - def _nec_new_acc_not_connected(self, obj): - """ - Account creation failed: connection to server failed - """ - # We receive events from all accounts from GED - if obj.conn.name != self.account: - return - if self.account not in app.connections: - return - if self.update_progressbar_timeout_id is not None: - GLib.source_remove(self.update_progressbar_timeout_id) - del app.connections[self.account] - if self.account in app.config.get_per('accounts'): - app.config.del_per('accounts', self.account) - self.back_button.show() - self.cancel_button.show() - self.go_online_checkbutton.hide() - self.show_vcard_checkbutton.hide() - img = self.xml.get_object('finish_image') - img.set_from_icon_name("dialog-error", Gtk.IconSize.DIALOG) - finish_text = '<big><b>%s</b></big>\n\n%s' % ( - _('An error occurred during account creation'), obj.reason) - self.finish_label.set_markup(finish_text) - self.notebook.set_current_page(6) # show finish page - - def _nec_acc_is_ok(self, obj): - """ - Account creation succeeded - """ - # We receive events from all accounts from GED - if obj.conn.name != self.account: - return - self.create_vars(obj.account_info) - self.show_finish_page() - - if self.update_progressbar_timeout_id is not None: - GLib.source_remove(self.update_progressbar_timeout_id) - - def _nec_acc_is_not_ok(self, obj): - """ - Account creation failed - """ - # We receive events from all accounts from GED - if obj.conn.name != self.account: - return - self.back_button.show() - self.cancel_button.show() - self.go_online_checkbutton.hide() - self.show_vcard_checkbutton.hide() - del app.connections[self.account] - if self.account in app.config.get_per('accounts'): - app.config.del_per('accounts', self.account) - img = self.xml.get_object('finish_image') - img.set_from_icon_name("dialog-error", Gtk.IconSize.DIALOG) - finish_text = '<big><b>%s</b></big>\n\n%s' % (_( - 'An error occurred during account creation'), obj.reason) - self.finish_label.set_markup(finish_text) - self.notebook.set_current_page(6) # show finish page - - if self.update_progressbar_timeout_id is not None: - GLib.source_remove(self.update_progressbar_timeout_id) - - def on_advanced_button_clicked(self, widget): - if 'accounts' in app.interface.instances: - app.interface.instances['accounts'].present() - else: - app.interface.instances['accounts'] = AccountsWindow() - app.interface.instances['accounts'].select_account(self.account) - self.window.destroy() - - def on_finish_button_clicked(self, widget): - go_online = self.xml.get_object('go_online_checkbutton').get_active() - show_vcard = self.xml.get_object('show_vcard_checkbutton').get_active() - self.window.destroy() - if show_vcard: - app.interface.show_vcard_when_connect.append(self.account) - if go_online: - app.interface.roster.send_status(self.account, 'online', '') - - def on_username_entry_key_press_event(self, widget, event): - # Check for pressed @ and jump to combobox if found - if event.keyval == Gdk.KEY_at: - entry = self.xml.get_object('server_comboboxtext_entry') - entry.grab_focus() - entry.set_position(-1) - return True - - def on_server_comboboxentry_key_press_event(self, widget, event, combobox): - # If backspace is pressed in empty field, return to the nick entry field - backspace = event.keyval == Gdk.KEY_BackSpace - empty = len(combobox.get_active_text()) == 0 - if backspace and empty and self.modify: - username_entry = self.xml.get_object('username_entry') - username_entry.grab_focus() - username_entry.set_position(-1) - return True - - def get_config(self, login, server, savepass, password, anonymous=False): - config = {} - config['name'] = login - config['account_label'] = '%s@%s' % (login, server) - config['hostname'] = server - config['savepass'] = savepass - config['password'] = password - config['anonymous_auth'] = anonymous - config['priority'] = 5 - config['autoconnect'] = True - config['no_log_for'] = '' - config['sync_with_global_status'] = True - config['proxy'] = '' - config['use_custom_host'] = False - config['custom_port'] = 0 - config['custom_host'] = '' - config['keyname'] = '' - config['keyid'] = '' - return config - - def save_account(self, login, server, savepass, password, anonymous=False): - if self.account in app.connections: - ErrorDialog(_('Account name is in use'), - _('You already have an account using this name.')) - return - con = connection.Connection(self.account) - con.password = password - - config = self.get_config(login, server, savepass, password, anonymous) - - if not self.modify: - con.new_account(self.account, config) - return - app.connections[self.account] = con - self.create_vars(config) - - def create_vars(self, config): - app.config.add_per('accounts', self.account) - - if not config['savepass']: - config['password'] = '' - - for opt in config: - app.config.set_per('accounts', self.account, opt, config[opt]) - - # update variables - app.interface.instances[self.account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}, 'online_dialog': {}, - 'sub_request': {}} - app.interface.minimized_controls[self.account] = {} - app.connections[self.account].connected = 0 - app.connections[self.account].keepalives = app.config.get_per( - 'accounts', self.account, 'keep_alive_every_foo_secs') - app.groups[self.account] = {} - app.contacts.add_account(self.account) - app.gc_connected[self.account] = {} - app.automatic_rooms[self.account] = {} - app.newly_added[self.account] = [] - app.to_be_removed[self.account] = [] - app.nicks[self.account] = config['name'] - app.block_signed_in_notifications[self.account] = True - app.sleeper_state[self.account] = 'off' - app.encrypted_chats[self.account] = [] - app.last_message_time[self.account] = {} - app.status_before_autoaway[self.account] = '' - app.transport_avatar[self.account] = {} - app.gajim_optional_features[self.account] = [] - app.caps_hash[self.account] = '' - helpers.update_optional_features(self.account) - # action must be added before account window is updated - app.app.add_account_actions(self.account) - # refresh accounts window - if 'accounts' in app.interface.instances: - app.interface.instances['accounts'].add_account(self.account) - # refresh roster - if len(app.connections) >= 2: - # Do not merge accounts if only one exists - app.interface.roster.regroup = app.config.get('mergeaccounts') - else: - app.interface.roster.regroup = False - app.interface.roster.setup_and_draw_roster() - gui_menu_builder.build_accounts_menu() - class ManageSoundsWindow: def __init__(self): ===================================== gajim/data/gui/features_window.ui ===================================== --- a/gajim/data/gui/features_window.ui +++ b/gajim/data/gui/features_window.ui @@ -1,125 +1,90 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> - <object class="GtkWindow" id="features_window"> + <object class="GtkBox" id="features_box"> + <property name="width_request">300</property> + <property name="height_request">530</property> + <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="border_width">12</property> - <property name="title" translatable="yes">Features</property> - <property name="default_width">300</property> - <property name="default_height">530</property> - <property name="type_hint">dialog</property> - <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> + <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">6</property> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkLabel"> <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="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1"> - <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"><b>List of possible features in Gajim:</b></property> - <property name="use_markup">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="label" translatable="yes"><b>List of possible features in Gajim:</b></property> + <property name="use_markup">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="vexpand">True</property> + <property name="shadow_type">out</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkTreeView" id="features_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="shadow_type">out</property> - <child> - <object class="GtkTreeView" id="features_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <signal name="cursor-changed" handler="on_features_treeview_cursor_changed" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> + <signal name="cursor-changed" handler="on_features_treeview_cursor_changed" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">3</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkLabel" id="feature_desc_label"> <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="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="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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> + <property name="margin_left">12</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkFrame" id="frame2"> + <child type="label"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">3</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkLabel" id="feature_desc_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Description</b></property> - <property name="use_markup">True</property> - </object> - </child> + <property name="label" translatable="yes"><b>Description</b></property> + <property name="use_markup">True</property> </object> - <packing> - <property name="expand">False</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> </interface> ===================================== gajim/gtk/__init__.py ===================================== --- a/gajim/gtk/__init__.py +++ b/gajim/gtk/__init__.py @@ -1,16 +1,22 @@ # Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> +# Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> +# Stéphan Kochen <stephan AT kochen.nl> +# Alex Mauer <hawke AT hawkesnest.net> # Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> # Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> # Travis Shirk <travis AT pobox.com> # Copyright (C) 2005-2008 Nikos Kouremenos <kourem AT gmail.com> +# Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> +# Copyright (C) 2006-2007 Travis Shirk <travis AT pobox.com> +# Stefan Bethge <stefan AT lanpartei.de> # Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +# Copyright (C) 2007 James Newton <redshodan AT gmail.com> +# Lukas Petrovicky <lukas AT petrovicky.net> # Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> # Julien Pivotto <roidelapluie AT gmail.com> # Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> # # This file is part of Gajim. # @@ -57,3 +63,5 @@ from gajim.gtk.server_info import ServerInfoDialog from gajim.gtk.pep_config import ManagePEPServicesWindow 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 ===================================== gajim/gtk/account_wizard.py ===================================== --- /dev/null +++ b/gajim/gtk/account_wizard.py @@ -0,0 +1,602 @@ +# 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 GLib + +from gajim.common import app +from gajim.common import ged +from gajim.common import configpaths +from gajim.common import helpers +from gajim.common import connection +from gajim.common.modules import dataforms +from gajim.gtk.util import get_builder +from gajim.gtk import ErrorDialog +from gajim import gtkgui_helpers +from gajim import dataforms_widget +from gajim import config +from gajim import gui_menu_builder + + +class AccountCreationWizard: + def __init__(self): + self.xml = get_builder('account_creation_wizard_window.ui') + self.window = self.xml.get_object('account_creation_wizard_window') + active_window = app.app.get_active_window() + self.window.set_transient_for(active_window) + + # Connect events from comboboxtext_entry + server_comboboxtext = self.xml.get_object('server_comboboxtext') + entry = self.xml.get_object('server_comboboxtext_entry') + entry.connect('key_press_event', + self.on_entry_key_press_event, server_comboboxtext) + + server_comboboxtext1 = self.xml.get_object('server_comboboxtext1') + + self.update_proxy_list() + + # parse servers.xml + servers_xml = os.path.join( + configpaths.get('DATA'), 'other', 'servers.xml') + servers = gtkgui_helpers.parse_server_xml(servers_xml) + servers_model = self.xml.get_object('server_liststore') + for server in servers: + servers_model.append((server,)) + + server_comboboxtext.set_model(servers_model) + server_comboboxtext1.set_model(servers_model) + + # Generic widgets + self.notebook = self.xml.get_object('notebook') + self.cancel_button = self.xml.get_object('cancel_button') + self.back_button = self.xml.get_object('back_button') + self.forward_button = self.xml.get_object('forward_button') + self.finish_button = self.xml.get_object('finish_button') + self.advanced_button = self.xml.get_object('advanced_button') + self.finish_label = self.xml.get_object('finish_label') + self.go_online_checkbutton = self.xml.get_object( + 'go_online_checkbutton') + self.show_vcard_checkbutton = self.xml.get_object( + 'show_vcard_checkbutton') + self.progressbar = self.xml.get_object('progressbar') + + # some vars + self.update_progressbar_timeout_id = None + + self.notebook.set_current_page(0) + self.xml.connect_signals(self) + self.window.show_all() + app.ged.register_event_handler( + 'new-account-connected', ged.GUI1, + self._nec_new_acc_connected) + app.ged.register_event_handler( + 'new-account-not-connected', ged.GUI1, + self._nec_new_acc_not_connected) + app.ged.register_event_handler( + 'account-created', ged.GUI1, + self._nec_acc_is_ok) + app.ged.register_event_handler( + 'account-not-created', ged.GUI1, + self._nec_acc_is_not_ok) + + def on_wizard_window_destroy(self, widget): + page = self.notebook.get_current_page() + if page in (4, 5) and self.account in app.connections: + # connection instance is saved in app.connections and we canceled + # the addition of the account + del app.connections[self.account] + if self.account in app.config.get_per('accounts'): + app.config.del_per('accounts', self.account) + app.ged.remove_event_handler( + 'new-account-connected', ged.GUI1, + self._nec_new_acc_connected) + app.ged.remove_event_handler( + 'new-account-not-connected', ged.GUI1, + self._nec_new_acc_not_connected) + app.ged.remove_event_handler( + 'account-created', ged.GUI1, + self._nec_acc_is_ok) + app.ged.remove_event_handler( + 'account-not-created', ged.GUI1, + self._nec_acc_is_not_ok) + del app.interface.instances['account_creation_wizard'] + + def on_save_password_checkbutton_toggled(self, widget): + self.xml.get_object('password_entry').grab_focus() + + def on_cancel_button_clicked(self, widget): + self.window.destroy() + + def on_back_button_clicked(self, widget): + cur_page = self.notebook.get_current_page() + self.forward_button.set_sensitive(True) + if cur_page in (1, 2): + self.notebook.set_current_page(0) + self.back_button.set_sensitive(False) + elif cur_page == 3: + self.xml.get_object('form_vbox').remove(self.data_form_widget) + self.notebook.set_current_page(2) # show server page + elif cur_page == 4: + if self.account in app.connections: + del app.connections[self.account] + if self.account in app.config.get_per('accounts'): + app.config.del_per('accounts', self.account) + self.notebook.set_current_page(2) + self.xml.get_object('form_vbox').remove(self.data_form_widget) + elif cur_page == 6: # finish page + self.forward_button.show() + if self.modify: + self.notebook.set_current_page(1) # Go to parameters page + else: + self.notebook.set_current_page(2) # Go to server page + + def on_anonymous_checkbutton1_toggled(self, widget): + active = widget.get_active() + self.xml.get_object('username_entry').set_sensitive(not active) + self.xml.get_object('password_entry').set_sensitive(not active) + self.xml.get_object('save_password_checkbutton').set_sensitive( + not active) + + def show_finish_page(self): + self.cancel_button.hide() + self.back_button.hide() + self.forward_button.hide() + if self.modify: + finish_text = '<big><b>%s</b></big>\n\n%s' % ( + _('Account has been added successfully'), + _('You can set advanced account options by pressing the ' + 'Advanced button, or later by choosing the Accounts menu item ' + 'under the Edit menu from the main window.')) + else: + finish_text = '<big><b>%s</b></big>\n\n%s' % ( + _('Your new account has been created successfully'), + _('You can set advanced account options by pressing the ' + 'Advanced button, or later by choosing the Accounts menu item ' + 'under the Edit menu from the main window.')) + self.finish_label.set_markup(finish_text) + self.finish_button.show() + self.finish_button.set_property('has-default', True) + self.advanced_button.show() + self.go_online_checkbutton.show() + img = self.xml.get_object('finish_image') + if self.modify: + img.set_from_icon_name(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG) + else: + path_to_file = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) + img.set_from_file(path_to_file) + self.show_vcard_checkbutton.set_active(not self.modify) + self.notebook.set_current_page(6) # show finish page + + def on_forward_button_clicked(self, widget): + cur_page = self.notebook.get_current_page() + + if cur_page == 0: + widget = self.xml.get_object('use_existing_account_radiobutton') + if widget.get_active(): + self.modify = True + self.notebook.set_current_page(1) + else: + self.modify = False + self.notebook.set_current_page(2) + self.back_button.set_sensitive(True) + return + + elif cur_page == 1: + # We are adding an existing account + anonymous = self.xml.get_object('anonymous_checkbutton1').\ + get_active() + username = self.xml.get_object('username_entry').get_text().strip() + if not username and not anonymous: + pritext = _('Invalid username') + sectext = _( + 'You must provide a username to configure this account.') + ErrorDialog(pritext, sectext) + return + server = self.xml.get_object('server_comboboxtext_entry').\ + get_text().strip() + savepass = self.xml.get_object('save_password_checkbutton').\ + get_active() + password = self.xml.get_object('password_entry').get_text() + + if anonymous: + jid = '' + else: + jid = username + '@' + jid += server + # check if jid is conform to RFC and stringprep it + try: + jid = helpers.parse_jid(jid) + except helpers.InvalidFormat as s: + pritext = _('Invalid JID') + ErrorDialog(pritext, str(s)) + return + + self.account = server + i = 1 + while self.account in app.config.get_per('accounts'): + self.account = server + str(i) + i += 1 + + username, server = app.get_name_and_server_from_jid(jid) + if self.xml.get_object('anonymous_checkbutton1').get_active(): + self.save_account('', server, False, '', anonymous=True) + else: + self.save_account(username, server, savepass, password) + self.show_finish_page() + elif cur_page == 2: + # We are creating a new account + server = self.xml.get_object('server_comboboxtext_entry1').\ + get_text() + + if not server: + ErrorDialog( + _('Invalid server'), + _('Please provide a server on which you want to register.')) + return + self.account = server + i = 1 + while self.account in app.config.get_per('accounts'): + self.account = server + str(i) + i += 1 + + config = self.get_config('', server, '', '') + # Get advanced options + proxies_combobox = self.xml.get_object('proxies_combobox') + active = proxies_combobox.get_active() + proxy = proxies_combobox.get_model()[active][0] + if proxy == _('None'): + proxy = '' + config['proxy'] = proxy + + config['use_custom_host'] = self.xml.get_object( + 'custom_host_port_checkbutton').get_active() + custom_port = self.xml.get_object('custom_port_entry').get_text() + try: + custom_port = int(custom_port) + except Exception: + ErrorDialog( + _('Invalid entry'), + _('Custom port must be a port number.')) + return + config['custom_port'] = custom_port + config['custom_host'] = self.xml.get_object( + 'custom_host_entry').get_text() + + if self.xml.get_object('anonymous_checkbutton2').get_active(): + self.modify = True + self.save_account('', server, False, '', anonymous=True) + self.show_finish_page() + else: + self.notebook.set_current_page(5) # show creating page + self.back_button.hide() + self.forward_button.hide() + self.update_progressbar_timeout_id = GLib.timeout_add( + 100, self.update_progressbar) + # Get form from serveur + con = connection.Connection(self.account) + app.connections[self.account] = con + con.new_account(self.account, config) + elif cur_page == 3: + checked = self.xml.get_object('ssl_checkbutton').get_active() + if checked: + hostname = app.connections[self.account].new_account_info[ + 'hostname'] + # Check if cert is already in file + certs = '' + my_ca_certs = configpaths.get('MY_CACERTS') + if os.path.isfile(my_ca_certs): + with open(my_ca_certs) as f: + certs = f.read() + if self.ssl_cert in certs: + ErrorDialog( + _('Certificate Already in File'), + _('This certificate is already in file %s, so it\'s ' + 'not added again.') % my_ca_certs) + else: + with open(my_ca_certs, 'a') as f: + f.write(hostname + '\n') + f.write(self.ssl_cert + '\n\n') + app.connections[self.account].new_account_info[ + 'ssl_fingerprint_sha1'] = self.ssl_fingerprint_sha1 + app.connections[self.account].new_account_info[ + 'ssl_fingerprint_sha256'] = self.ssl_fingerprint_sha256 + self.notebook.set_current_page(4) # show fom page + elif cur_page == 4: + if self.is_form: + form = self.data_form_widget.data_form + else: + form = self.data_form_widget.get_infos() + app.connections[self.account].send_new_account_infos( + form, self.is_form) + self.xml.get_object('form_vbox').remove(self.data_form_widget) + self.xml.get_object('progressbar_label').set_markup( + '<b>Account is being created</b>\n\nPlease wait…') + self.notebook.set_current_page(5) # show creating page + self.back_button.hide() + self.forward_button.hide() + self.update_progressbar_timeout_id = GLib.timeout_add( + 100, self.update_progressbar) + + def update_proxy_list(self): + proxies_combobox = self.xml.get_object('proxies_combobox') + model = Gtk.ListStore(str) + proxies_combobox.set_model(model) + proxies = app.config.get_per('proxies') + proxies.insert(0, _('None')) + for i in range(len(proxies)): + model.append([proxies[i]]) + proxies_combobox.set_active(0) + + 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'] = \ + config.ManageProxiesWindow() + + def on_custom_host_port_checkbutton_toggled(self, widget): + self.xml.get_object('custom_host_hbox').set_sensitive( + widget.get_active()) + + def update_progressbar(self): + self.progressbar.pulse() + return True # loop forever + + def _nec_new_acc_connected(self, obj): + """ + Connection to server succeded, present the form to the user + """ + # We receive events from all accounts from GED + if obj.conn.name != self.account: + return + if self.update_progressbar_timeout_id is not None: + GLib.source_remove(self.update_progressbar_timeout_id) + self.back_button.show() + self.forward_button.show() + self.is_form = obj.is_form + empty_config = True + if obj.is_form: + dataform = dataforms.ExtendForm(node=obj.config) + self.data_form_widget = dataforms_widget.DataFormWidget() + self.data_form_widget.selectable = True + self.data_form_widget.set_data_form(dataform) + empty_config = False + else: + self.data_form_widget = config.FakeDataForm( + obj.config, selectable=True) + for field in obj.config: + if field in ('key', 'instructions', 'x', 'registered'): + continue + empty_config = False + break + self.data_form_widget.show_all() + self.xml.get_object('form_vbox').pack_start( + self.data_form_widget, True, True, 0) + if empty_config: + self.forward_button.set_sensitive(False) + self.notebook.set_current_page(4) # show form page + return + self.ssl_fingerprint_sha1 = obj.ssl_fingerprint_sha1 + self.ssl_fingerprint_sha256 = obj.ssl_fingerprint_sha256 + self.ssl_cert = obj.ssl_cert + if obj.ssl_msg: + # An SSL warning occured, show it + hostname = app.connections[self.account].new_account_info[ + 'hostname'] + self.xml.get_object('ssl_label').set_markup(_( + '<b>Security Warning</b>' + '\n\nThe authenticity of the %(hostname)s SSL certificate could' + ' be invalid.\nSSL Error: %(error)s\n' + 'Do you still want to connect to this server?') % { + 'hostname': hostname, 'error': obj.ssl_msg}) + if obj.errnum in (18, 27): + text = _( + 'Add this certificate to the list of trusted ' + 'certificates.\nSHA-1 fingerprint of the certificate:\n' + '%(sha1)s\nSHA-256 fingerprint of the certificate:\n' + '%(sha256)s') % {'sha1': obj.ssl_fingerprint_sha1, + 'sha256': obj.ssl_fingerprint_sha256} + self.xml.get_object('ssl_checkbutton').set_label(text) + else: + self.xml.get_object('ssl_checkbutton').set_no_show_all(True) + self.xml.get_object('ssl_checkbutton').hide() + self.notebook.set_current_page(3) # show SSL page + else: + self.notebook.set_current_page(4) # show form page + + def _nec_new_acc_not_connected(self, obj): + """ + Account creation failed: connection to server failed + """ + # We receive events from all accounts from GED + if obj.conn.name != self.account: + return + if self.account not in app.connections: + return + if self.update_progressbar_timeout_id is not None: + GLib.source_remove(self.update_progressbar_timeout_id) + del app.connections[self.account] + if self.account in app.config.get_per('accounts'): + app.config.del_per('accounts', self.account) + self.back_button.show() + self.cancel_button.show() + self.go_online_checkbutton.hide() + self.show_vcard_checkbutton.hide() + img = self.xml.get_object('finish_image') + img.set_from_icon_name("dialog-error", Gtk.IconSize.DIALOG) + finish_text = '<big><b>%s</b></big>\n\n%s' % ( + _('An error occurred during account creation'), obj.reason) + self.finish_label.set_markup(finish_text) + self.notebook.set_current_page(6) # show finish page + + def _nec_acc_is_ok(self, obj): + """ + Account creation succeeded + """ + # We receive events from all accounts from GED + if obj.conn.name != self.account: + return + self.create_vars(obj.account_info) + self.show_finish_page() + + if self.update_progressbar_timeout_id is not None: + GLib.source_remove(self.update_progressbar_timeout_id) + + def _nec_acc_is_not_ok(self, obj): + """ + Account creation failed + """ + # We receive events from all accounts from GED + if obj.conn.name != self.account: + return + self.back_button.show() + self.cancel_button.show() + self.go_online_checkbutton.hide() + self.show_vcard_checkbutton.hide() + del app.connections[self.account] + if self.account in app.config.get_per('accounts'): + app.config.del_per('accounts', self.account) + img = self.xml.get_object('finish_image') + img.set_from_icon_name("dialog-error", Gtk.IconSize.DIALOG) + finish_text = '<big><b>%s</b></big>\n\n%s' % (_( + 'An error occurred during account creation'), obj.reason) + self.finish_label.set_markup(finish_text) + self.notebook.set_current_page(6) # show finish page + + if self.update_progressbar_timeout_id is not None: + GLib.source_remove(self.update_progressbar_timeout_id) + + def on_advanced_button_clicked(self, widget): + from gajim.accounts_window import AccountsWindow + if 'accounts' in app.interface.instances: + app.interface.instances['accounts'].present() + else: + app.interface.instances['accounts'] = AccountsWindow() + app.interface.instances['accounts'].select_account(self.account) + self.window.destroy() + + def on_finish_button_clicked(self, widget): + go_online = self.xml.get_object('go_online_checkbutton').get_active() + show_vcard = self.xml.get_object('show_vcard_checkbutton').get_active() + self.window.destroy() + if show_vcard: + app.interface.show_vcard_when_connect.append(self.account) + if go_online: + app.interface.roster.send_status(self.account, 'online', '') + + def on_username_entry_key_press_event(self, widget, event): + # Check for pressed @ and jump to combobox if found + if event.keyval == Gdk.KEY_at: + entry = self.xml.get_object('server_comboboxtext_entry') + entry.grab_focus() + entry.set_position(-1) + return True + + def on_entry_key_press_event(self, widget, event, combobox): + # If backspace is pressed in empty field, return to the nick entry field + backspace = event.keyval == Gdk.KEY_BackSpace + empty = len(combobox.get_active_text()) == 0 + if backspace and empty and self.modify: + username_entry = self.xml.get_object('username_entry') + username_entry.grab_focus() + username_entry.set_position(-1) + return True + + def get_config(self, login, server, savepass, password, anonymous=False): + config = {} + config['name'] = login + config['account_label'] = '%s@%s' % (login, server) + config['hostname'] = server + config['savepass'] = savepass + config['password'] = password + config['anonymous_auth'] = anonymous + config['priority'] = 5 + config['autoconnect'] = True + config['no_log_for'] = '' + config['sync_with_global_status'] = True + config['proxy'] = '' + config['use_custom_host'] = False + config['custom_port'] = 0 + config['custom_host'] = '' + config['keyname'] = '' + config['keyid'] = '' + return config + + def save_account(self, login, server, savepass, password, anonymous=False): + if self.account in app.connections: + ErrorDialog( + _('Account name is in use'), + _('You already have an account using this name.')) + return + con = connection.Connection(self.account) + con.password = password + + config = self.get_config(login, server, savepass, password, anonymous) + + if not self.modify: + con.new_account(self.account, config) + return + app.connections[self.account] = con + self.create_vars(config) + + def create_vars(self, config): + app.config.add_per('accounts', self.account) + + if not config['savepass']: + config['password'] = '' + + for opt in config: + app.config.set_per('accounts', self.account, opt, config[opt]) + + # update variables + app.interface.instances[self.account] = { + 'infos': {}, 'disco': {}, + 'gc_config': {}, 'search': {}, 'online_dialog': {}, + 'sub_request': {}} + app.interface.minimized_controls[self.account] = {} + app.connections[self.account].connected = 0 + app.connections[self.account].keepalives = app.config.get_per( + 'accounts', self.account, 'keep_alive_every_foo_secs') + app.groups[self.account] = {} + app.contacts.add_account(self.account) + app.gc_connected[self.account] = {} + app.automatic_rooms[self.account] = {} + app.newly_added[self.account] = [] + app.to_be_removed[self.account] = [] + app.nicks[self.account] = config['name'] + app.block_signed_in_notifications[self.account] = True + app.sleeper_state[self.account] = 'off' + app.encrypted_chats[self.account] = [] + app.last_message_time[self.account] = {} + app.status_before_autoaway[self.account] = '' + app.transport_avatar[self.account] = {} + app.gajim_optional_features[self.account] = [] + app.caps_hash[self.account] = '' + helpers.update_optional_features(self.account) + # action must be added before account window is updated + app.app.add_account_actions(self.account) + # refresh accounts window + if 'accounts' in app.interface.instances: + app.interface.instances['accounts'].add_account(self.account) + # refresh roster + if len(app.connections) >= 2: + # Do not merge accounts if only one exists + app.interface.roster.regroup = app.config.get('mergeaccounts') + else: + app.interface.roster.regroup = False + app.interface.roster.setup_and_draw_roster() + gui_menu_builder.build_accounts_menu() ===================================== gajim/features_window.py → gajim/gtk/features.py ===================================== --- a/gajim/features_window.py +++ b/gajim/gtk/features.py @@ -1,83 +1,93 @@ -# -*- coding:utf-8 -*- -## src/features_window.py -## -## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## Julien Pivotto <roidelapluie AT gmail.com> -## Stefan Bethge <stefan AT lanpartei.de> -## Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## -## 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) 2007 Jean-Marie Traissard <jim AT lapin.org> +# Julien Pivotto <roidelapluie AT gmail.com> +# Stefan Bethge <stefan AT lanpartei.de> +# Stephan Erb <steve-e AT h3c.de> +# Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +# +# 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 + import gi from gi.repository import Gtk, Gdk -from gajim import gtkgui_helpers from gajim.common import app from gajim.common.i18n import Q_ +from gajim.gtk.util import get_builder -class FeaturesWindow: - """ - Class for features window - """ +class FeaturesDialog(Gtk.Dialog): def __init__(self): - self.xml = gtkgui_helpers.get_gtk_builder('features_window.ui') - self.window = self.xml.get_object('features_window') - self.window.set_transient_for(app.interface.roster.window) - treeview = self.xml.get_object('features_treeview') - self.desc_label = self.xml.get_object('feature_desc_label') + flags = Gtk.DialogFlags.DESTROY_WITH_PARENT + super().__init__(_('Features'), None, flags) + + self.connect('key-press-event', self.on_key_press_event) + self.set_transient_for(app.interface.roster.window) + + self.builder = get_builder('features_window.ui') + content = self.get_content_area() + content.add(self.builder.get_object('features_box')) + + treeview = self.builder.get_object('features_treeview') + self.desc_label = self.builder.get_object('feature_desc_label') # {name: (available_function, unix_text, windows_text)} self.features = { - _('Bonjour / Zeroconf'): (self.zeroconf_available, + _('Bonjour / Zeroconf'): ( + self.zeroconf_available, _('Serverless chatting with autodetected clients in a local network.'), _('Requires python-dbus.'), _('Requires pybonjour and bonjour SDK running (%(url)s)') % {'url': 'https://developer.apple.com/opensource/).'}), - _('Command line'): (self.dbus_available, + _('Command line'): ( + self.dbus_available, _('A script to control Gajim via commandline.'), _('Requires python-dbus.'), _('Feature not available under Windows.')), - _('OpenPGP message encryption'): (self.gpg_available, + _('OpenPGP message encryption'): ( + self.gpg_available, _('Ability to encrypting chat messages with OpenPGP.'), _('Requires gpg and python-gnupg (%(url)s).') % {'url': 'https://bitbucket.org/vinay.sajip/python-gnupg'}, _('Requires gpg.exe in PATH.')), - _('Password encryption'): (self.some_keyring_available, + _('Password encryption'): ( + self.some_keyring_available, _('Passwords can be stored securely and not just in plaintext.'), _('Requires libsecret and a provider (such as GNOME Keyring and KSecretService).'), _('On Windows the Windows Credential Vault is used.')), - _('Spell Checker'): (self.speller_available, + _('Spell Checker'): ( + self.speller_available, _('Spellchecking of composed messages.'), _('Requires Gspell'), _('Requires Gspell')), - _('Automatic status'): (self.idle_available, + _('Automatic status'): ( + self.idle_available, _('Ability to measure idle time, in order to set auto status.'), _('Requires libxss library.'), _('Requires python2.5.')), - _('RST Generator'): (self.docutils_available, + _('RST Generator'): ( + self.docutils_available, _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'), _('Requires python-docutils.'), _('Requires python-docutils.')), - _('Audio / Video'): (self.farstream_available, + _('Audio / Video'): ( + self.farstream_available, _('Ability to start audio and video chat.'), _('Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and gstreamer1.0-plugins-ugly.'), _('Feature not available under Windows.')), - _('UPnP-IGD'): (self.gupnp_igd_available, + _('UPnP-IGD'): ( + self.gupnp_igd_available, _('Ability to request your router to forward port for file transfer.'), _('Requires gir1.2-gupnpigd-1.0.'), _('Feature not available under Windows.')), @@ -108,16 +118,15 @@ class FeaturesWindow: self.model.set_sort_column_id(0, Gtk.SortType.ASCENDING) - self.xml.connect_signals(self) - self.window.show_all() - self.xml.get_object('close_button').grab_focus() + self.builder.connect_signals(self) + self.show_all() def on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: - self.window.destroy() + self.destroy() def on_close_button_clicked(self, widget): - self.window.destroy() + self.destroy() def on_features_treeview_cursor_changed(self, widget): selection = widget.get_selection() ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -70,6 +70,7 @@ from gajim.gtk import SingleMessageWindow from gajim.gtk import AddNewContactWindow from gajim.gtk import ManagePEPServicesWindow from gajim.gtk import ManageBookmarksWindow +from gajim.gtk import AccountCreationWizard from gajim.common.const import AvatarSize @@ -5881,7 +5882,7 @@ class RosterWindow: # if we have no account configured or only Local account but not enabled def _open_wizard(): app.interface.instances['account_creation_wizard'] = \ - config.AccountCreationWizardWindow() + AccountCreationWizard() # Open wizard only after roster is created, so we can make it # transient for the roster window GLib.idle_add(_open_wizard) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/137bf1f8311c2a244718c738a0963669e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/137bf1f8311c2a244718c738a0963669e… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits