Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Add event_filter decorator
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ebca28bd by Philipp Hörist at 2019-06-20T18:05:43Z Add event_filter decorator Filters events with supplied attributes - - - - - 5 changed files: - gajim/common/helpers.py - gajim/common/modules/mam.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/roster_window.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1481,6 +1481,18 @@ def delay_execution(milliseconds): return delay_execution_decorator +def event_filter(filter_): + def event_filter_decorator(func): + @wraps(func) + def func_wrapper(self, event, *args, **kwargs): + for attr in filter_: + if getattr(event, attr) != getattr(self, attr): + return + return func(self, event, *args, **kwargs) + return func_wrapper + return event_filter_decorator + + def parse_uri_actions(uri): uri = uri[5:] if '?' not in uri: ===================================== gajim/common/modules/mam.py ===================================== @@ -149,6 +149,7 @@ class MAM(BaseModule): event_attrs.update( {'conn': self._con, + 'account': self._account, 'additional_data': additional_data, 'encrypted': False, 'timestamp': properties.mam.timestamp, ===================================== gajim/common/modules/muc.py ===================================== @@ -423,7 +423,7 @@ class MUC(BaseModule): app.nec.push_incoming_event( NetworkEvent('muc-subject', account=self._account, - jid=jid, + room_jid=jid, subject=properties.subject, nickname=properties.muc_nickname, user_timestamp=properties.user_timestamp)) @@ -445,6 +445,7 @@ class MUC(BaseModule): app.nec.push_incoming_event( NetworkEvent('muc-voice-approval', account=self._account, + room_jid=room_jid, jid=jid, form=properties.voice_request.form)) raise nbxmpp.NodeProcessed @@ -464,7 +465,7 @@ class MUC(BaseModule): app.nec.push_incoming_event( NetworkEvent('muc-captcha-challenge', account=self._account, - jid=properties.jid, + room_jid=properties.jid.getBare(), form=properties.captcha.form)) raise nbxmpp.NodeProcessed @@ -472,12 +473,13 @@ class MUC(BaseModule): if not properties.is_muc_config_change: return + room_jid = properties.jid.getBare() self._log.info('Received config change: %s %s', - properties.jid, properties.muc_status_codes) + room_jid, properties.muc_status_codes) app.nec.push_incoming_event( NetworkEvent('muc-config-changed', account=self._account, - jid=properties.jid, + room_jid=room_jid, status_codes=properties.muc_status_codes)) raise nbxmpp.NodeProcessed ===================================== gajim/groupchat_control.py ===================================== @@ -56,6 +56,7 @@ from gajim.common import events from gajim.common import app from gajim.common import helpers from gajim.common.helpers import open_uri +from gajim.common.helpers import event_filter from gajim.common import ged from gajim.common.i18n import _ from gajim.common import contacts @@ -1139,23 +1140,16 @@ class GroupchatControl(ChatControlBase): return self._update_banner_state_image() + @event_filter(['account', 'room_jid']) def _on_voice_approval(self, event): - if event.account != self.account: - return - if event.jid != self.room_jid: - return SingleMessageWindow(self.account, self.room_jid, action='receive', from_whom=self.room_jid, form_node=event.form) + @event_filter(['account', 'room_jid']) def _on_captcha_challenge(self, event): - if event.account != self.account: - return - if event.jid != self.room_jid: - return - self._remove_captcha_request() def on_send_dataform_clicked(*args): @@ -1181,9 +1175,8 @@ class GroupchatControl(ChatControlBase): self._captcha_request.destroy() self._captcha_request = None + @event_filter(['account']) def _nec_mam_decrypted_message_received(self, obj): - if obj.conn.name != self.account: - return if not obj.groupchat: return if obj.archive_jid != self.room_jid: @@ -1195,10 +1188,8 @@ class GroupchatControl(ChatControlBase): message_id=obj.message_id, additional_data=obj.additional_data) + @event_filter(['account', 'room_jid']) def _nec_gc_message_received(self, obj): - if obj.room_jid != self.room_jid or obj.conn.name != self.account: - return - if not obj.nick: # message from server self.add_message( @@ -1408,11 +1399,8 @@ class GroupchatControl(ChatControlBase): self.subject = subject self.draw_banner_text() + @event_filter(['account', 'room_jid']) def _on_subject(self, event): - if event.account != self.account: - return - if event.jid != self.room_jid: - return if self.subject == event.subject: # Probably a rejoin, we already showed that subject return @@ -1434,35 +1422,37 @@ class GroupchatControl(ChatControlBase): else: self.subject_button.show() + @event_filter(['account', 'room_jid']) def _on_config_changed(self, event): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify - if event.account != self.account: - return - - if event.jid != self.room_jid: - return - changes = [] if StatusCode.SHOWING_UNAVAILABLE in event.status_codes: changes.append(_('Room now shows unavailable members')) + if StatusCode.NOT_SHOWING_UNAVAILABLE in event.status_codes: changes.append(_('Room now does not show unavailable members')) + if StatusCode.CONFIG_NON_PRIVACY_RELATED in event.status_codes: changes.append(_('A setting not related to privacy has been ' 'changed')) app.connections[self.account].get_module('Discovery').disco_muc( self.room_jid, self.update_actions, update=True) + if StatusCode.CONFIG_ROOM_LOGGING in event.status_codes: # Can be a presence (see chg_contact_status in groupchat_control.py) changes.append(_('Room logging is now enabled')) + if StatusCode.CONFIG_NO_ROOM_LOGGING in event.status_codes: changes.append(_('Room logging is now disabled')) + if StatusCode.CONFIG_NON_ANONYMOUS in event.status_codes: changes.append(_('Room is now non-anonymous')) self.is_anonymous = False + if StatusCode.CONFIG_SEMI_ANONYMOUS in event.status_codes: changes.append(_('Room is now semi-anonymous')) self.is_anonymous = True + if StatusCode.CONFIG_FULL_ANONYMOUS in event.status_codes: changes.append(_('Room is now fully anonymous')) self.is_anonymous = True @@ -1708,12 +1698,8 @@ class GroupchatControl(ChatControlBase): self.nick = new_nick self._nick_completion.change_nick(new_nick) + @event_filter(['account', 'room_jid']) def _on_self_presence(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - nick = event.properties.muc_nickname affiliation = event.properties.affiliation jid = str(event.properties.jid) @@ -1765,12 +1751,8 @@ class GroupchatControl(ChatControlBase): # Update Actions self.update_actions() + @event_filter(['account', 'room_jid']) def _on_nickname_changed(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - nick = event.properties.muc_nickname new_nick = event.properties.muc_user.nick if event.properties.is_muc_self_presence: @@ -1792,12 +1774,8 @@ class GroupchatControl(ChatControlBase): self.remove_contact(nick) self.add_contact_to_roster(new_nick) + @event_filter(['account', 'room_jid']) def _on_status_show_changed(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - nick = event.properties.muc_nickname status = event.properties.status status = '' if status is None else ' - %s' % status @@ -1819,12 +1797,8 @@ class GroupchatControl(ChatControlBase): self.draw_contact(nick) + @event_filter(['account', 'room_jid']) def _on_affiliation_changed(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - affiliation = helpers.get_uf_affiliation( event.properties.affiliation) nick = event.properties.muc_nickname @@ -1853,12 +1827,8 @@ class GroupchatControl(ChatControlBase): self.draw_contact(nick) self.update_actions() + @event_filter(['account', 'room_jid']) def _on_role_changed(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - role = helpers.get_uf_role(event.properties.role) nick = event.properties.muc_nickname reason = event.properties.muc_user.reason @@ -1885,12 +1855,8 @@ class GroupchatControl(ChatControlBase): self.add_contact_to_roster(nick) self.update_actions() + @event_filter(['account', 'room_jid']) def _on_self_kicked(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - self.autorejoin = False status_codes = event.properties.muc_status_codes or [] @@ -1950,12 +1916,8 @@ class GroupchatControl(ChatControlBase): # Update Actions self.update_actions() + @event_filter(['account', 'room_jid']) def _on_user_left(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - status_codes = event.properties.muc_status_codes or [] nick = event.properties.muc_nickname @@ -2015,12 +1977,8 @@ class GroupchatControl(ChatControlBase): self.remove_contact(nick) self.draw_all_roles() + @event_filter(['account', 'room_jid']) def _on_user_joined(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - nick = event.properties.muc_nickname join_default = app.config.get('print_join_left_default') print_join_left = app.config.get_per( @@ -2031,12 +1989,8 @@ class GroupchatControl(ChatControlBase): if self.is_connected and print_join_left: self.add_info_message(_('%s has joined the group chat') % nick) + @event_filter(['account', 'room_jid']) def _on_presence_error(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - nick = event.properties.muc_nickname error_type = event.properties.error.type error_message = event.properties.error.message @@ -2124,12 +2078,8 @@ class GroupchatControl(ChatControlBase): if self.is_continued: self.draw_banner_text() + @event_filter(['account', 'room_jid']) def _on_destroyed(self, event): - if event.account != self.account: - return - if event.room_jid != self.room_jid: - return - destroyed = event.properties.muc_destroyed reason = destroyed.reason @@ -2186,11 +2136,10 @@ class GroupchatControl(ChatControlBase): del self._role_refs[Role(role)] self.model.remove(parent_iter) + @event_filter(['account']) def _message_sent(self, obj): if not obj.message: return - if obj.account != self.account: - return if obj.jid != self.room_jid: return # we'll save sent message text when we'll receive it in ===================================== gajim/roster_window.py ===================================== @@ -2643,7 +2643,7 @@ class RosterWindow: self.draw_avatar(obj.jid, obj.account) def _nec_muc_subject_received(self, event): - self.draw_contact(event.jid, event.account) + self.draw_contact(event.room_jid, event.account) def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ebca28bd6de2e8204cd55a5cd2ba01368f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ebca28bd6de2e8204cd55a5cd2ba01368f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor sending directed presence
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fa4ecfa6 by Philipp Hörist at 2019-06-20T12:57:31Z Refactor sending directed presence - - - - - 3 changed files: - gajim/common/connection.py - gajim/common/modules/privacylists.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1496,29 +1496,6 @@ class Connection(CommonConnection, ConnectionHandlers): modules.send_stored_publish(self.name) self.continue_connect_info = None - def send_custom_status(self, show, msg, jid): - if show not in app.SHOW_LIST: - return -1 - if not app.account_is_connected(self.name): - return - sshow = helpers.get_xmpp_show(show) - if not msg: - msg = '' - if show == 'offline': - self.get_module('Presence').send_presence( - jid, - 'unavailable', - caps=False, - status=msg) - - else: - priority = app.get_priority(self.name, sshow) - self.get_module('Presence').send_presence( - jid, - priority=priority, - show=sshow, - status=msg) - def _change_to_invisible(self, msg): self.send_invisible_presence(msg) ===================================== gajim/common/modules/privacylists.py ===================================== @@ -294,7 +294,8 @@ class PrivacyLists(BaseModule): for contact in contact_list: self._log.info('Block contacts: %s', contact.jid) contact.show = 'offline' - self._con.send_custom_status('offline', message, contact.jid) + self._con.get_module('Presence').send_presence(contact.jid, + typ='unavailable') max_order = self._get_max_blocked_list_order() new_rule = {'order': str(max_order + 1), 'type': 'jid', @@ -364,7 +365,8 @@ class PrivacyLists(BaseModule): if show == 'invisible': return for contact in contact_list: - self._con.send_custom_status(show, self._con.status, contact.jid) + self._con.get_module('Presence').send_presence( + contact.jid, show=show, status=self._con.status) self._presence_probe(contact.jid) def block_group(self, group, contact_list, message): @@ -380,7 +382,8 @@ class PrivacyLists(BaseModule): self.default_list = 'block' for contact in contact_list: - self._con.send_custom_status('offline', message, contact.jid) + self._con.get_module('Presence').send_presence( + contact.jid, typ='unavailable') max_order = self._get_max_blocked_list_order() new_rule = {'order': str(max_order + 1), @@ -424,7 +427,8 @@ class PrivacyLists(BaseModule): if show == 'invisible': return for contact in contact_list: - self._con.send_custom_status(show, self._con.status, contact.jid) + self._con.get_module('Presence').send_presence( + contact.jid, show=show, status=self._con.status) def _presence_probe(self, jid): self._log.info('Presence probe: %s', jid) ===================================== gajim/roster_window.py ===================================== @@ -2056,16 +2056,15 @@ class RosterWindow: def set_connecting_state(self, account): self.set_state(account, 'connecting') - def send_status(self, account, status, txt, auto=False, to=None): + def send_status(self, account, status, txt, auto=False): if status != 'offline': - if to is None: - app.config.set_per('accounts', account, 'last_status', status) - app.config.set_per('accounts', account, 'last_status_msg', - helpers.to_one_line(txt)) + app.config.set_per('accounts', account, 'last_status', status) + app.config.set_per('accounts', account, 'last_status_msg', + helpers.to_one_line(txt)) if not app.account_is_connected(account): self.set_connecting_state(account) - self.send_status_continue(account, status, txt, auto, to) + self.send_status_continue(account, status, txt, auto) def send_pep(self, account, pep_dict): connection = app.connections[account] @@ -2098,34 +2097,30 @@ class RosterWindow: if ctrl: ctrl.update_all_pep_types() - def send_status_continue(self, account, status, txt, auto, to): - if app.account_is_connected(account) and not to: + def send_status_continue(self, account, status, txt, auto): + if app.account_is_connected(account): if status == 'online' and not idle.Monitor.is_unknown(): app.sleeper_state[account] = 'online' elif app.sleeper_state[account] not in ('autoaway', 'autoxa') or \ status == 'offline': app.sleeper_state[account] = 'off' - if to: - app.connections[account].send_custom_status(status, txt, to) - else: - if status in ('invisible', 'offline'): - self.delete_pep(app.get_jid_from_account(account), account) - was_invisible = app.is_invisible(account) - app.connections[account].change_status(status, txt, auto) - - for gc_control in app.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - list(app.interface.minimized_controls[account].values()): - if gc_control.account == account: - if app.gc_connected[account][gc_control.room_jid]: - app.connections[account].get_module('MUC').send_muc_presence( - gc_control.room_jid, auto=auto) - if was_invisible and status != 'offline': - # We come back from invisible, join bookmarks - con = app.connections[account] - con.get_module('Bookmarks').auto_join_bookmarks() - + if status in ('invisible', 'offline'): + self.delete_pep(app.get_jid_from_account(account), account) + was_invisible = app.is_invisible(account) + app.connections[account].change_status(status, txt, auto) + + for gc_control in app.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC) + \ + list(app.interface.minimized_controls[account].values()): + if gc_control.account == account: + if app.gc_connected[account][gc_control.room_jid]: + app.connections[account].get_module('MUC').send_muc_presence( + gc_control.room_jid, auto=auto) + if was_invisible and status != 'offline': + # We come back from invisible, join bookmarks + con = app.connections[account] + con.get_module('Bookmarks').auto_join_bookmarks() def chg_contact_status(self, contact, show, status, account): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fa4ecfa698895adf64c3368d02b162045c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fa4ecfa698895adf64c3368d02b162045c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make some strings translatable
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 125fe1e0 by Daniel Brötzmann at 2019-06-20T12:56:12Z Make some strings translatable Sync threshold options in the preferences window did not translate correctly, Add Account was not translatable in accounts window, Context menu Delete item was not translatable in history manager - - - - - 5 changed files: - gajim/data/gui/history_manager.ui - gajim/gtk/accounts.py - gajim/gtk/features.py - gajim/gtk/preferences.py - gajim/history_manager.py Changes: ===================================== gajim/data/gui/history_manager.ui ===================================== @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="delete_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">_Delete</property> + <property name="label" translatable="yes">_Delete</property> <property name="use_underline">True</property> </object> </child> ===================================== gajim/gtk/accounts.py ===================================== @@ -670,7 +670,7 @@ class AddNewAccountPage(Gtk.Box): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self.set_vexpand(True) self.set_hexpand(True) - button = Gtk.Button(label='Add Account') + button = Gtk.Button(label=_('Add Account')) button.get_style_context().add_class('suggested-action') button.set_action_name('app.add-account') button.set_halign(Gtk.Align.CENTER) ===================================== gajim/gtk/features.py ===================================== @@ -207,7 +207,7 @@ class FeatureItem(Gtk.Grid): self.box.pack_start(self.feature_dependency_u, True, True, 0) self.icon = Gtk.Image() - self.label_disabled = Gtk.Label(label='Disabled in Preferences') + self.label_disabled = Gtk.Label(label=_('Disabled in Preferences')) self.label_disabled.get_style_context().add_class('dim-label') self.set_feature(feature.available, feature.enabled) ===================================== gajim/gtk/preferences.py ===================================== @@ -148,15 +148,15 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('show_subject_on_join') self._ui.subject_on_join_checkbutton.set_active(st) - # Group chat settings threshold_model = self._ui.sync_threshold_combobox.get_model() - for day in app.config.get_options('threshold_options'): - if day == '0': + days = app.config.get_options('threshold_options', return_type=int) + for day in days: + if day == 0: label = _('No threshold') else: - label = ngettext('%s day' % day, '%s days' % day, int(day)) - threshold_model.append([day, label]) + label = ngettext('%i day', '%i days', day, day, day) + threshold_model.append([str(day), label]) public_threshold = app.config.get('public_room_sync_threshold') self._ui.sync_threshold_combobox.set_id_column(0) self._ui.sync_threshold_combobox.set_active_id(str(public_threshold)) ===================================== gajim/history_manager.py ===================================== @@ -105,7 +105,7 @@ class HistoryManager: log_db_path = configpaths.get('LOG_DB') if not os.path.exists(log_db_path): ErrorDialog(_('Cannot find history logs database'), - '%s does not exist.' % log_db_path) + _('%s does not exist.') % log_db_path) sys.exit() self._ui = get_builder('history_manager.ui') @@ -246,11 +246,11 @@ class HistoryManager: dialog = YesNoDialog( _('Do you want to clean up the database? ' - '(STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)'), + '(STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)'), _('Normally allocated database size will not be freed, ' - 'it will just become reusable. If you really want to reduce ' - 'database filesize, click YES, else click NO.' - '\n\nIn case you click YES, please wait…'), + 'it will just become reusable. If you really want to reduce ' + 'database filesize, click YES, else click NO.' + '\n\nIn case you click YES, please wait…'), on_response_yes=on_yes, on_response_no=on_no) dialog.set_title(_('Database Cleanup')) button_box = dialog.get_children()[0].get_children()[1] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/125fe1e0f6c8f909104726a8c4b1584e91… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/125fe1e0f6c8f909104726a8c4b1584e91… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Notifications: Do not play sound if message has more than one recipient
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 881238de by Daniel Brötzmann at 2019-06-20T12:37:23Z Notifications: Do not play sound if message has more than one recipient This prevents Gajim from playing the message_sent sound multiple times - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -361,10 +361,13 @@ class Interface: @staticmethod def handle_event_msgsent(obj): - #('MSGSENT', account, (jid, msg)) - # do not play sound when standalone chatstate message (eg no msg) + # ('MSGSENT', account, (jid, msg)) + # Do not play sound if it is a standalone chatstate message (eg no msg) + # or if it is a message to more than one recipient if obj.message and app.config.get_per('soundevents', 'message_sent', 'enabled'): + if isinstance(obj.jid, list) and len(obj.jid) > 1: + return helpers.play_sound('message_sent') @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/881238de9ed5332912f440032919cc5b5a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/881238de9ed5332912f440032919cc5b5a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework file transfer windows
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 93057ab6 by Daniel Brötzmann at 2019-06-20T12:04:58Z Rework file transfer windows - - - - - 5 changed files: - gajim/data/gui/filetransfers.ui - gajim/data/gui/send_file_dialog.ui → gajim/data/gui/filetransfers_send_file_dialog.ui - gajim/data/style/gajim.css - gajim/gtk/filetransfer.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/data/gui/filetransfers.ui ===================================== @@ -1,89 +1,133 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkAccelGroup" id="accelgroup1"/> <object class="GtkMenu" id="file_transfers_menu"> <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="remove_menuitem"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Remove</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_remove_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="continue_menuitem"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Con_tinue</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_continue_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_remove_menuitem_activate" swapped="no"/> </object> </child> <child> - <object class="GtkMenuItem" id="pause_menuitem"> + <object class="GtkMenuItem" id="pause_resume_menuitem"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Pause</property> + <property name="label" translatable="yes">Pa_use/Resume</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_pause_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_pause_resume_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="cancel_menuitem"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Cancel</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_cancel_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_cancel_menuitem_activate" swapped="no"/> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator11"> + <object class="GtkSeparatorMenuItem"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> <object class="GtkMenuItem" id="open_folder_menuitem"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Open Containing Folder</property> + <property name="label" translatable="yes">_Open Folder</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_open_folder_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_open_folder_menuitem_activate" swapped="no"/> </object> </child> </object> <object class="GtkWindow" id="file_transfers_window"> + <property name="width_request">500</property> + <property name="height_request">350</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">18</property> <property name="title" translatable="yes">File Transfers</property> + <property name="window_position">center-always</property> + <property name="default_width">450</property> + <property name="default_height">350</property> <property name="type_hint">dialog</property> - <signal name="delete-event" handler="on_file_transfers_dialog_delete_event" swapped="no"/> - <signal name="key-press-event" handler="on_file_transfers_window_key_press_event" swapped="no"/> + <signal name="delete-event" handler="_on_file_transfers_dialog_delete_event" swapped="no"/> + <signal name="key-press-event" handler="_on_file_transfers_window_key_press_event" swapped="no"/> + <child type="titlebar"> + <placeholder/> + </child> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkSwitch" id="notify_ft_complete"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="notify::active" handler="_on_notify_ft_complete_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Show notification when file transfer is complete</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">notify_ft_complete</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</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="GtkScrolledWindow" id="transfers_scrolledwindow"> <property name="width_request">460</property> <property name="height_request">150</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="transfers_list"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="enable_search">False</property> - <signal name="button-press-event" handler="on_transfers_list_button_press_event" swapped="no"/> - <signal name="button-release-event" handler="on_transfers_list_button_release_event" swapped="no"/> - <signal name="key-press-event" handler="on_transfers_list_key_press_event" swapped="no"/> - <signal name="row-activated" handler="on_transfers_list_row_activated" swapped="no"/> + <signal name="button-press-event" handler="_on_transfers_list_button_press_event" swapped="no"/> + <signal name="button-release-event" handler="_on_transfers_list_button_release_event" swapped="no"/> + <signal name="key-press-event" handler="_on_transfers_list_key_press_event" swapped="no"/> + <signal name="row-activated" handler="_on_transfers_list_row_activated" swapped="no"/> <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> + <object class="GtkTreeSelection"/> </child> <child internal-child="accessible"> <object class="AtkObject" id="transfers_list-atkobject"> @@ -97,132 +141,69 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkToolbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> <child> - <object class="GtkButton" id="cleanup_button"> - <property name="label" translatable="yes">Clean _up</property> + <object class="GtkToolButton" id="cleanup_button"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Remove completed, cancelled and failed file transfers from the list</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_cleanup_button_clicked" swapped="no"/> - <child internal-child="accessible"> - <object class="AtkObject" id="cleanup_button-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Remove file transfer from the list.</property> - <property name="AtkObject::accessible-description" translatable="yes">This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed</property> - </object> - </child> + <property name="label" translatable="yes">toolbutton</property> + <property name="icon_name">edit-clear-all-symbolic</property> + <signal name="clicked" handler="_on_cleanup_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkButton" id="pause_restore_button"> - <property name="label" translatable="yes">_Pause</property> + <object class="GtkToolButton" id="pause_resume_button"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Pause or resume file transfer</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_pause_restore_button_clicked" swapped="no"/> + <property name="icon_name">media-playback-pause-symbolic</property> + <signal name="clicked" handler="_on_pause_resume_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">_Cancel</property> + <object class="GtkToolButton" id="cancel_button"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Cancel the selected file transfer and remove incomplete files</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - <child internal-child="accessible"> - <object class="AtkObject" id="cancel_button-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Cancel file transfer</property> - <property name="AtkObject::accessible-description" translatable="yes">Cancels the selected file transfer</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close_button"> - <property name="label" translatable="yes">_Close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Hide the window</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> + <property name="icon_name">process-stop-symbolic</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">3</property> + <property name="homogeneous">False</property> </packing> </child> + <style> + <class name="inline-toolbar"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="notify_ft_complete_checkbox"> - <property name="label" translatable="yes">_Notify me when a file transfer is complete</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="draw_indicator">True</property> - <signal name="toggled" handler="on_notify_ft_complete_checkbox_toggled" swapped="no"/> - <child internal-child="accessible"> - <object class="AtkObject" id="notify_ft_complete_checkbox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes">When a file transfer is complete show a popup notification</property> - </object> - </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> <child internal-child="accessible"> <object class="AtkObject" id="file_transfers_window-atkobject"> <property name="AtkObject::accessible-name" translatable="yes">File Transfers</property> ===================================== gajim/data/gui/send_file_dialog.ui → gajim/data/gui/filetransfers_send_file_dialog.ui ===================================== @@ -5,43 +5,18 @@ <object class="GtkGrid" id="send_file_grid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkListBox" id="listbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="vexpand">True</property> - <property name="selection_mode">none</property> - <property name="activate_on_single_click">False</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> + <property name="column_spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Description:</property> + <property name="label" translatable="yes">Description</property> <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -51,10 +26,9 @@ </child> <child> <object class="GtkScrolledWindow"> - <property name="height_request">40</property> + <property name="height_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> <child> @@ -62,6 +36,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="wrap_mode">word-char</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> </object> </child> </object> @@ -73,42 +51,123 @@ </child> <child> <object class="GtkButton"> - <property name="label" translatable="yes">Select Files</property> + <property name="label" translatable="yes">_Send Files</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="halign">start</property> - <signal name="clicked" handler="_select_files" swapped="no"/> + <property name="tooltip_text" translatable="yes">Send</property> + <property name="halign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_send" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Send</property> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <signal name="clicked" handler="_send" swapped="no"/> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Files to send</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Files:</property> - <property name="xalign">0</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkListBox" id="listbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="selection_mode">multiple</property> + <property name="activate_on_single_click">False</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Add Files</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="_select_files" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Remove Files</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="_remove_files" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <style> + <class name="inline-toolbar"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> <property name="width">2</property> </packing> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -114,6 +114,9 @@ list.settings > row > box { margin: 6px 18px; } +/*SendFileDialog*/ +#SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } + /* Preferences Window */ .PreferencesWindow { background-color: @theme_base_color; } .PreferencesStack { background-color: @theme_bg_color; } @@ -231,10 +234,6 @@ button.flat.link { padding: 0; border: 0; } /*MessageWindow Notebook*/ .notebook-tab-label {min-width: 80px} -/*SendFileDialog*/ -#SendFileDialog grid {padding: 12px} -#SendFileDialog grid list { background-color: @theme_bg_color} - /*Icon colors*/ .success-color { color: @success_color; } .error-color { color: @error_color; } ===================================== gajim/gtk/filetransfer.py ===================================== @@ -36,8 +36,9 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.file_props import FilesProp -from gajim.common.modules.bytestream import (is_transfer_active, is_transfer_paused, - is_transfer_stopped) +from gajim.common.modules.bytestream import (is_transfer_active, + is_transfer_paused, + is_transfer_stopped) from gajim.gtk.dialogs import HigDialog from gajim.gtk.dialogs import InformationDialog @@ -50,7 +51,8 @@ from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.tooltips import FileTransfersTooltip from gajim.gtk.util import get_builder -log = logging.getLogger('gajim.filetransfer_window') +log = logging.getLogger('gajim.gtk.filetransfer') + @unique class Column(IntEnum): @@ -66,46 +68,42 @@ class Column(IntEnum): class FileTransfersWindow: def __init__(self): - self.files_props = {'r' : {}, 's': {}} + self.files_props = {'r': {}, 's': {}} self.height_diff = 0 - self.xml = get_builder('filetransfers.ui') - self.window = self.xml.get_object('file_transfers_window') - self.tree = self.xml.get_object('transfers_list') - self.cancel_button = self.xml.get_object('cancel_button') - self.pause_button = self.xml.get_object('pause_restore_button') - self.cleanup_button = self.xml.get_object('cleanup_button') - self.notify_ft_checkbox = self.xml.get_object( - 'notify_ft_complete_checkbox') - - shall_notify = app.config.get('notify_on_file_complete') - self.notify_ft_checkbox.set_active(shall_notify) + self._ui = get_builder('filetransfers.ui') + + self.window = self._ui.file_transfers_window + show_notification = app.config.get('notify_on_file_complete') + self._ui.notify_ft_complete.set_active(show_notification) self.model = Gtk.ListStore(str, str, str, str, str, int, int, str) - self.tree.set_model(self.model) + self._ui.transfers_list.set_model(self.model) col = Gtk.TreeViewColumn() render_pixbuf = Gtk.CellRendererPixbuf() col.pack_start(render_pixbuf, True) - render_pixbuf.set_property('xpad', 3) - render_pixbuf.set_property('ypad', 3) - render_pixbuf.set_property('yalign', .0) + render_pixbuf.set_property('xpad', 6) + render_pixbuf.set_property('ypad', 6) + render_pixbuf.set_property('yalign', 0.5) col.add_attribute(render_pixbuf, 'icon_name', 0) - self.tree.append_column(col) + self._ui.transfers_list.append_column(col) col = Gtk.TreeViewColumn(_('File')) renderer = Gtk.CellRendererText() col.pack_start(renderer, False) col.add_attribute(renderer, 'markup', Column.LABELS) - renderer.set_property('yalign', 0.) + renderer.set_property('xalign', 0.0) + renderer.set_property('yalign', 0.0) renderer = Gtk.CellRendererText() col.pack_start(renderer, True) col.add_attribute(renderer, 'markup', Column.FILE) - renderer.set_property('xalign', 0.) - renderer.set_property('yalign', 0.) + renderer.set_property('xalign', 0.0) + renderer.set_property('yalign', 0.0) renderer.set_property('ellipsize', Pango.EllipsizeMode.END) col.set_resizable(True) + col.set_min_width(160) col.set_expand(True) - self.tree.append_column(col) + self._ui.transfers_list.append_column(col) col = Gtk.TreeViewColumn(_('Time')) renderer = Gtk.CellRendererText() @@ -115,9 +113,10 @@ class FileTransfersWindow: renderer.set_property('xalign', 0.5) renderer = Gtk.CellRendererText() renderer.set_property('ellipsize', Pango.EllipsizeMode.END) + renderer.set_property('xalign', 0.5) col.set_resizable(True) - col.set_expand(False) - self.tree.append_column(col) + col.set_min_width(70) + self._ui.transfers_list.append_column(col) col = Gtk.TreeViewColumn(_('Progress')) renderer = Gtk.CellRendererProgress() @@ -127,37 +126,33 @@ class FileTransfersWindow: col.add_attribute(renderer, 'text', Column.PROGRESS) col.add_attribute(renderer, 'value', Column.PERCENT) col.add_attribute(renderer, 'pulse', Column.PULSE) - col.set_resizable(True) - col.set_expand(False) - self.tree.append_column(col) + col.set_resizable(False) + col.set_fixed_width(150) + self._ui.transfers_list.append_column(col) self.icons = { - 'upload': 'go-up', - 'download': 'go-down', - 'stop': 'window-close', - 'waiting': 'view-refresh', - 'pause': 'media-playback-pause', - 'continue': 'media-playback-start', - 'ok': 'emblem-ok-symbolic', - 'computing': 'system-run', - 'hash_error': 'network-error-symbolic', + 'upload': 'go-up-symbolic', + 'download': 'go-down-symbolic', + 'stop': 'process-stop-symbolic', + 'waiting': 'emblem-synchronizing-symbolic', + 'pause': 'media-playback-pause-symbolic', + 'continue': 'media-playback-start-symbolic', + 'ok': 'emblem-ok-symbolic', + 'computing': 'system-run-symbolic', + 'hash_error': 'network-error-symbolic', } - self.tree.get_selection().set_mode(Gtk.SelectionMode.SINGLE) - self.tree.get_selection().connect('changed', self.selection_changed) + self._ui.transfers_list.get_selection().set_mode( + Gtk.SelectionMode.SINGLE) + self._ui.transfers_list.get_selection().connect( + 'changed', self._selection_changed) # Tooltip - self.tree.connect('query-tooltip', self._query_tooltip) - self.tree.set_has_tooltip(True) + self._ui.transfers_list.connect('query-tooltip', self._query_tooltip) + self._ui.transfers_list.set_has_tooltip(True) self.tooltip = FileTransfersTooltip() - self.file_transfers_menu = self.xml.get_object('file_transfers_menu') - self.open_folder_menuitem = self.xml.get_object('open_folder_menuitem') - self.cancel_menuitem = self.xml.get_object('cancel_menuitem') - self.pause_menuitem = self.xml.get_object('pause_menuitem') - self.continue_menuitem = self.xml.get_object('continue_menuitem') - self.remove_menuitem = self.xml.get_object('remove_menuitem') - self.xml.connect_signals(self) + self._ui.connect_signals(self) def _query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): try: @@ -190,7 +185,7 @@ class FileTransfersWindow: """ Find all transfers with peer 'jid' that belong to 'account' """ - active_transfers = [[], []] # ['senders', 'receivers'] + active_transfers = [[], []] # ['senders', 'receivers'] allfp = FilesProp.getAllFileProp() for file_props in allfp: if file_props.type_ == 's' and file_props.tt_account == account: @@ -218,7 +213,7 @@ class FileTransfersWindow: path = os.path.split(file_props.file_name)[0] if os.path.exists(path) and os.path.isdir(path): helpers.launch_file_manager(path) - self.tree.get_selection().unselect_all() + self._ui.transfers_list.get_selection().unselect_all() if file_props.type_ == 'r': # file path is used below in 'Save in' @@ -226,36 +221,40 @@ class FileTransfersWindow: else: file_name = file_props.name sectext = '\t' + _('Filename: %s') % GLib.markup_escape_text(file_name) - sectext += '\n\t' + _('Size: %s') % \ - helpers.convert_bytes(file_props.size) + sectext += '\n\t' + _('Size: %s') % helpers.convert_bytes( + file_props.size) if file_props.type_ == 'r': jid = file_props.sender.split('/')[0] sender_name = app.contacts.get_first_contact_from_jid( - file_props.tt_account, jid).get_shown_name() + file_props.tt_account, jid).get_shown_name() sender = sender_name else: - #You is a reply of who sent a file + # You is a reply of who sent a file sender = _('You') sectext += '\n\t' + _('Sender: %s') % sender sectext += '\n\t' + _('Recipient: ') if file_props.type_ == 's': jid = file_props.receiver.split('/')[0] receiver_name = app.contacts.get_first_contact_from_jid( - file_props.tt_account, jid).get_shown_name() + file_props.tt_account, jid).get_shown_name() recipient = receiver_name else: - #You is a reply of who received a file + # You is a reply of who received a file recipient = _('You') sectext += recipient if file_props.type_ == 'r': sectext += '\n\t' + _('Saved in: %s') % file_path - dialog = HigDialog(app.interface.roster.window, Gtk.MessageType.INFO, - Gtk.ButtonsType.NONE, _('File transfer completed'), sectext) + dialog = HigDialog(app.interface.roster.window, + Gtk.MessageType.INFO, + Gtk.ButtonsType.NONE, + _('File transfer completed'), + sectext) if file_props.type_ == 'r': button = Gtk.Button.new_with_mnemonic(_('Open _Containing Folder')) button.connect('clicked', on_open, file_props) dialog.action_area.pack_start(button, True, True, 0) ok_button = dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK) + def on_ok(widget): dialog.destroy() ok_button.connect('clicked', on_ok) @@ -263,18 +262,22 @@ class FileTransfersWindow: def show_request_error(self, file_props): """ - Show error dialog to the recipient saying that transfer has been canceled + Show error dialog to the recipient saying that + transfer has been canceled """ - InformationDialog(_('File transfer cancelled'), _('Connection with peer cannot be established.')) - self.tree.get_selection().unselect_all() + InformationDialog( + _('File transfer cancelled'), + _('Connection with peer could not be established.')) + self._ui.transfers_list.get_selection().unselect_all() def show_send_error(self, file_props): """ Show error dialog to the sender saying that transfer has been canceled """ - InformationDialog(_('File transfer cancelled'), - _('Connection with peer cannot be established.')) - self.tree.get_selection().unselect_all() + InformationDialog( + _('File transfer cancelled'), + _('Connection with peer could not be established.')) + self._ui.transfers_list.get_selection().unselect_all() def show_stopped(self, jid, file_props, error_msg=''): if file_props.type_ == 'r': @@ -286,7 +289,7 @@ class FileTransfersWindow: if error_msg: sectext += '\n\t' + _('Error message: %s') % error_msg ErrorDialog(_('File transfer stopped'), sectext) - self.tree.get_selection().unselect_all() + self._ui.transfers_list.get_selection().unselect_all() def show_hash_error(self, jid, file_props, account): @@ -310,8 +313,9 @@ class FileTransfersWindow: new_file_props.date = file_props.date new_file_props.hash_ = file_props.hash_ new_file_props.type_ = 'r' - tsid = app.connections[account].get_module('Jingle').start_file_transfer( - fjid, new_file_props, True) + tsid = app.connections[account].get_module( + 'Jingle').start_file_transfer(fjid, new_file_props, True) + new_file_props.transport_sid = tsid self.add_transfer(account, contact, new_file_props) @@ -319,11 +323,14 @@ class FileTransfersWindow: file_name = os.path.basename(file_props.file_name) else: file_name = file_props.name - YesNoDialog(('File transfer error'), + YesNoDialog( + _('File transfer error'), _('The file %(file)s has been received, but it seems to have ' - 'been damaged along the way.\nDo you want to download it again?') % \ - {'file': file_name}, on_response_yes=(on_yes, jid, file_props, - account), type_=Gtk.MessageType.ERROR) + 'been damaged along the way.\n' + 'Do you want to download it again?') % + {'file': file_name}, + on_response_yes=(on_yes, jid, file_props, account), + type_=Gtk.MessageType.ERROR) def show_file_send_request(self, account, contact): send_callback = partial(self.send_file, account, contact) @@ -344,16 +351,17 @@ class FileTransfersWindow: return (jid, resource) = contact.split('/', 1) contact = app.contacts.create_contact(jid=jid, account=account, - resource=resource) + resource=resource) file_name = os.path.split(file_path)[1] - file_props = self.get_send_file_props(account, contact, - file_path, file_name, file_desc) + file_props = self.get_send_file_props(account, contact, file_path, + file_name, file_desc) if file_props is None: return False app.connections[account].get_module('Jingle').start_file_transfer( contact.get_full_jid(), file_props) self.add_transfer(account, contact, file_props) + return True def _start_receive(self, file_path, account, contact, file_props): @@ -363,7 +371,8 @@ class FileTransfersWindow: file_props.file_name = file_path file_props.type_ = 'r' self.add_transfer(account, contact, file_props) - app.connections[account].get_module('Bytestream').send_file_approval(file_props) + app.connections[account].get_module('Bytestream').send_file_approval( + file_props) def on_file_request_accepted(self, account, contact, file_props): def on_ok(account, contact, file_props, file_path): @@ -371,12 +380,12 @@ class FileTransfersWindow: app.config.set('last_save_dir', os.path.dirname(file_path)) # check if we have write permissions if not os.access(file_path, os.W_OK): - file_name = GLib.markup_escape_text(os.path.basename( - file_path)) + file_name = GLib.markup_escape_text( + os.path.basename(file_path)) ErrorDialog( _('Cannot overwrite existing file "%s"' % file_name), - _('A file with this name already exists and you do not ' - 'have permission to overwrite it.')) + _('A file with this name already exists and you do ' + 'not have permission to overwrite it.')) return stat = os.stat(file_path) dl_size = stat.st_size @@ -391,8 +400,10 @@ class FileTransfersWindow: self._start_receive(file_path, account, contact, file_props) dialog = FTOverwriteConfirmationDialog( - _('This file already exists'), _('What do you want to do?'), - propose_resume=not dl_finished, on_response=on_response) + _('This file already exists'), + _('What do you want to do?'), + propose_resume=not dl_finished, + on_response=on_response) dialog.set_destroy_with_parent(True) return @@ -410,7 +421,8 @@ class FileTransfersWindow: con = app.connections[account] accept_cb = partial(on_ok, account, contact, file_props) - cancel_cb = partial(con.get_module('Bytestream').send_file_rejection, file_props) + cancel_cb = partial(con.get_module('Bytestream').send_file_rejection, + file_props) FileSaveDialog(accept_cb, cancel_cb, path=app.config.get('last_save_dir'), @@ -427,10 +439,10 @@ class FileTransfersWindow: file_props.name) if file_props.size: sec_text += '\n\t' + _('Size: %s') % \ - helpers.convert_bytes(file_props.size) + helpers.convert_bytes(file_props.size) if file_props.mime_type: sec_text += '\n\t' + _('Type: %s') % file_props.mime_type - if file_props.desc: + if file_props.desc: sec_text += '\n\t' + _('Description: %s') % file_props.desc prim_text = _('%s wants to send you a file:') % contact.jid dialog = None @@ -439,13 +451,16 @@ class FileTransfersWindow: self.on_file_request_accepted(account, contact, file_props) def on_response_cancel(account, file_props): - app.connections[account].get_module('Bytestream').send_file_rejection(file_props) - - dialog = NonModalConfirmationDialog(prim_text, sec_text, - on_response_ok=(on_response_ok, account, contact, file_props), - on_response_cancel=(on_response_cancel, account, file_props)) + app.connections[account].get_module( + 'Bytestream').send_file_rejection(file_props) + + dialog = NonModalConfirmationDialog( + prim_text, + sec_text, + on_response_ok=(on_response_ok, account, contact, file_props), + on_response_cancel=(on_response_cancel, account, file_props)) dialog.connect('delete-event', lambda widget, event: - on_response_cancel(account, file_props)) + on_response_cancel(account, file_props)) dialog.popup() def set_status(self, file_props, status): @@ -475,6 +490,7 @@ class FileTransfersWindow: text += helpers.convert_bytes(received_size) + '/' + \ helpers.convert_bytes(full_size) self.model.set(iter_, Column.PROGRESS, text) + def pulse(): p = self.model.get(iter_, Column.PULSE)[0] if p == GLib.MAXINT32: @@ -492,12 +508,12 @@ class FileTransfersWindow: self.model.set(iter_, Column.PULSE, GLib.MAXINT32) self.model.set(iter_, Column.IMAGE, self.icons[status]) path = self.model.get_path(iter_) - self.select_func(path) + self._select_func(path) def _format_percent(self, percent): """ - Add extra spaces from both sides of the percent, so that progress string - has always a fixed size + Add extra spaces from both sides of the percent, so that progress + string has always a fixed size """ _str = ' ' if percent != 100.: @@ -517,9 +533,9 @@ class FileTransfersWindow: if _time >= 60: times['hours'] = _time / 60 - #Print remaining time in format 00:00:00 - #You can change the places of (hours), (minutes), (seconds) - - #they are not translatable. + # Print remaining time in format 00:00:00 + # You can change the places of (hours), (minutes), (seconds) - + # they are not translatable. return _('%(hours)02.d:%(minutes)02.d:%(seconds)02.d') % times def _get_eta_and_speed(self, full_size, transfered_size, file_props): @@ -552,17 +568,19 @@ class FileTransfersWindow: account = file_props.tt_account if account in app.connections: # there is a connection to the account - app.connections[account].get_module('Bytestream').remove_transfer(file_props) - if file_props.type_ == 'r': # we receive a file + app.connections[account].get_module( + 'Bytestream').remove_transfer(file_props) + if file_props.type_ == 'r': # we receive a file other = file_props.sender - else: # we send a file + else: # we send a file other = file_props.receiver if isinstance(other, str): jid = app.get_jid_without_resource(other) - else: # It's a Contact instance + else: # It's a Contact instance jid = other.jid - for ev_type in ('file-error', 'file-completed', 'file-request-error', - 'file-send-error', 'file-stopped'): + for ev_type in ('file-error', 'file-completed', + 'file-request-error', 'file-send-error', + 'file-stopped'): for event in app.events.get_events(account, jid, [ev_type]): if event.file_props.sid == file_props.sid: app.events.remove_events(account, jid, event) @@ -601,21 +619,22 @@ class FileTransfersWindow: full_size -= file_props.offset if file_props.elapsed_time > 0: - file_props.transfered_size.append((file_props.last_time, transfered_size)) + file_props.transfered_size.append((file_props.last_time, + transfered_size)) if len(file_props.transfered_size) > 6: file_props.transfered_size.pop(0) eta, speed = self._get_eta_and_speed(full_size, transfered_size, - file_props) + file_props) self.model.set(iter_, Column.PROGRESS, text) self.model.set(iter_, Column.PERCENT, int(percent)) text = self._format_time(eta) text += '\n' - #This should make the string Kb/s, - #where 'Kb' part is taken from %s. - #Only the 's' after / (which means second) should be translated. - text += _('(%(filesize_unit)s/s)') % {'filesize_unit': - helpers.convert_bytes(speed)} + # This should make the string Kb/s, + # where 'Kb' part is taken from %s. + # Only the 's' after / (which means second) should be translated. + text += _('(%(filesize_unit)s/s)') % { + 'filesize_unit': helpers.convert_bytes(speed)} self.model.set(iter_, Column.TIME, text) # try to guess what should be the status image @@ -640,7 +659,7 @@ class FileTransfersWindow: self.set_status(file_props, 'ok') elif just_began: path = self.model.get_path(iter_) - self.select_func(path) + self._select_func(path) def get_iter_by_sid(self, typ, sid): """ @@ -659,7 +678,7 @@ class FileTransfersWindow: return dt.isoformat() + 'Z' def get_send_file_props(self, account, contact, file_path, file_name, - file_desc=''): + file_desc=''): """ Create new file_props object and set initial file transfer properties in it @@ -670,11 +689,12 @@ class FileTransfersWindow: ErrorDialog(_('Invalid File'), _('File: ') + file_path) return None if stat[6] == 0: - ErrorDialog(_('Invalid File'), - _('It is not possible to send empty files')) + ErrorDialog( + _('Invalid File'), + _('It is not possible to send empty files')) return None - file_props = FilesProp.getNewFileProp(account, - sid=helpers.get_random_string_16()) + file_props = FilesProp.getNewFileProp( + account, sid=helpers.get_random_string_16()) mod_date = os.path.getmtime(file_path) file_props.file_name = file_path file_props.name = file_name @@ -696,11 +716,10 @@ class FileTransfersWindow: return file_props.elapsed_time = 0 iter_ = self.model.prepend() - text_labels = '<b>' + _('Name: ') + '</b>\n' if file_props.type_ == 'r': - text_labels += '<b>' + _('Sender: ') + '</b>' + text_labels = '\n<b>' + _('Sender: ') + '</b>' else: - text_labels += '<b>' + _('Recipient: ') + '</b>' + text_labels = '\n<b>' + _('Recipient: ') + '</b>' if file_props.type_ == 'r': file_name = os.path.split(file_props.file_name)[1] @@ -708,8 +727,15 @@ class FileTransfersWindow: file_name = file_props.name text_props = GLib.markup_escape_text(file_name) + '\n' text_props += contact.get_shown_name() - self.model.set(iter_, 1, text_labels, 2, text_props, Column.PULSE, -1, Column.SID, - file_props.type_ + file_props.sid) + self.model.set(iter_, + 1, + text_labels, + 2, + text_props, + Column.PULSE, + -1, + Column.SID, + file_props.type_ + file_props.sid) self.set_progress(file_props.type_, file_props.sid, 0, iter_) if file_props.started is False: status = 'waiting' @@ -719,77 +745,76 @@ class FileTransfersWindow: status = 'upload' file_props.tt_account = account self.set_status(file_props, status) - self.set_cleanup_sensitivity() + self._set_cleanup_sensitivity() self.window.show_all() - def on_transfers_list_row_activated(self, widget, path, col): + def _on_transfers_list_row_activated(self, widget, path, col): # try to open the containing folder - self.on_open_folder_menuitem_activate(widget) + self._on_open_folder_menuitem_activate(widget) - def set_cleanup_sensitivity(self): + def _set_cleanup_sensitivity(self): """ Check if there are transfer rows and set cleanup_button sensitive, or insensitive if model is empty """ if not self.model: - self.cleanup_button.set_sensitive(False) + self._ui.cleanup_button.set_sensitive(False) else: - self.cleanup_button.set_sensitive(True) + self._ui.cleanup_button.set_sensitive(True) - def set_all_insensitive(self): + def _set_all_insensitive(self): """ Make all buttons/menuitems insensitive """ - self.pause_button.set_sensitive(False) - self.pause_menuitem.set_sensitive(False) - self.continue_menuitem.set_sensitive(False) - self.remove_menuitem.set_sensitive(False) - self.cancel_button.set_sensitive(False) - self.cancel_menuitem.set_sensitive(False) - self.open_folder_menuitem.set_sensitive(False) - self.set_cleanup_sensitivity() - - def set_buttons_sensitive(self, path, is_row_selected): + self._ui.pause_resume_button.set_sensitive(False) + self._ui.pause_resume_menuitem.set_sensitive(False) + self._ui.remove_menuitem.set_sensitive(False) + self._ui.cancel_button.set_sensitive(False) + self._ui.cancel_menuitem.set_sensitive(False) + self._ui.open_folder_menuitem.set_sensitive(False) + self._set_cleanup_sensitivity() + + def _set_buttons_sensitive(self, path, is_row_selected): """ Make buttons/menuitems sensitive as appropriate to the state of file transfer located at path 'path' """ if path is None: - self.set_all_insensitive() + self._set_all_insensitive() return current_iter = self.model.get_iter(path) sid = self.model[current_iter][Column.SID] file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) - self.remove_menuitem.set_sensitive(is_row_selected) - self.open_folder_menuitem.set_sensitive(is_row_selected) + self._ui.remove_menuitem.set_sensitive(is_row_selected) + self._ui.open_folder_menuitem.set_sensitive(is_row_selected) is_stopped = False if is_transfer_stopped(file_props): is_stopped = True - self.cancel_button.set_sensitive(not is_stopped) - self.cancel_menuitem.set_sensitive(not is_stopped) + self._ui.cancel_button.set_sensitive(not is_stopped) + self._ui.cancel_menuitem.set_sensitive(not is_stopped) if not is_row_selected: - # no selection, disable the buttons - self.set_all_insensitive() + # No selection, disable the buttons + self._set_all_insensitive() elif not is_stopped and file_props.continue_cb: if is_transfer_active(file_props): - # file transfer is active - self.toggle_pause_continue(True) - self.pause_button.set_sensitive(True) + # File transfer is active + self._toggle_pause_continue(True) + self._ui.pause_resume_button.set_sensitive(True) + self._ui.pause_resume_menuitem.set_sensitive(True) elif is_transfer_paused(file_props): - # file transfer is paused - self.toggle_pause_continue(False) - self.pause_button.set_sensitive(True) + # File transfer is paused + self._toggle_pause_continue(False) + self._ui.pause_resume_button.set_sensitive(True) + self._ui.pause_resume_menuitem.set_sensitive(True) else: - self.pause_button.set_sensitive(False) - self.pause_menuitem.set_sensitive(False) - self.continue_menuitem.set_sensitive(False) + self._ui.pause_resume_button.set_sensitive(False) + self._ui.pause_resume_menuitem.set_sensitive(False) else: - self.pause_button.set_sensitive(False) - self.pause_menuitem.set_sensitive(False) - self.continue_menuitem.set_sensitive(False) + self._ui.pause_resume_button.set_sensitive(False) + self._ui.pause_resume_menuitem.set_sensitive(False) return True - def selection_changed(self, args): + def _selection_changed(self, args): """ Selection has changed - change the sensitivity of the buttons/menuitems """ @@ -797,22 +822,22 @@ class FileTransfersWindow: selected = selection.get_selected_rows() if selected[1] != []: selected_path = selected[1][0] - self.select_func(selected_path) + self._select_func(selected_path) else: - self.set_all_insensitive() + self._set_all_insensitive() - def select_func(self, path): + def _select_func(self, path): is_selected = False - selected = self.tree.get_selection().get_selected_rows() + selected = self._ui.transfers_list.get_selection().get_selected_rows() if selected[1] != []: selected_path = selected[1][0] if selected_path == path: is_selected = True - self.set_buttons_sensitive(path, is_selected) - self.set_cleanup_sensitivity() + self._set_buttons_sensitive(path, is_selected) + self._set_cleanup_sensitivity() return True - def on_cleanup_button_clicked(self, widget): + def _on_cleanup_button_clicked(self, widget): i = len(self.model) - 1 while i >= 0: iter_ = self.model.get_iter((i)) @@ -821,33 +846,19 @@ class FileTransfersWindow: if is_transfer_stopped(file_props): self._remove_transfer(iter_, sid, file_props) i -= 1 - self.tree.get_selection().unselect_all() - self.set_all_insensitive() + self._ui.transfers_list.get_selection().unselect_all() + self._set_all_insensitive() - def toggle_pause_continue(self, status): + def _toggle_pause_continue(self, status): if status: - label = _('Pause') - self.pause_button.set_label(label) - self.pause_button.set_image(Gtk.Image.new_from_icon_name( - "media-playback-pause", Gtk.IconSize.MENU)) - - self.pause_menuitem.set_sensitive(True) - self.pause_menuitem.set_no_show_all(False) - self.continue_menuitem.hide() - self.continue_menuitem.set_no_show_all(True) - + self._ui.pause_resume_button.set_icon_name( + 'media-playback-pause-symbolic') else: - label = _('_Continue') - self.pause_button.set_label(label) - self.pause_button.set_image(Gtk.Image.new_from_icon_name( - "media-playback-start", Gtk.IconSize.MENU)) - self.pause_menuitem.hide() - self.pause_menuitem.set_no_show_all(True) - self.continue_menuitem.set_sensitive(True) - self.continue_menuitem.set_no_show_all(False) - - def on_pause_restore_button_clicked(self, widget): - selected = self.tree.get_selection().get_selected() + self._ui.pause_resume_button.set_icon_name( + 'media-playback-start-symbolic') + + def _on_pause_resume_button_clicked(self, widget): + selected = self._ui.transfers_list.get_selection().get_selected() if selected is None or selected[1] is None: return s_iter = selected[1] @@ -856,20 +867,20 @@ class FileTransfersWindow: if is_transfer_paused(file_props): file_props.last_time = time.time() file_props.paused = False - types = {'r' : 'download', 's' : 'upload'} + types = {'r': 'download', 's': 'upload'} self.set_status(file_props, types[sid[0]]) - self.toggle_pause_continue(True) + self._toggle_pause_continue(True) if file_props.continue_cb: file_props.continue_cb() elif is_transfer_active(file_props): file_props.paused = True self.set_status(file_props, 'pause') - # reset that to compute speed only when we resume + # Reset that to compute speed only when we resume file_props.transfered_size = [] - self.toggle_pause_continue(False) + self._toggle_pause_continue(False) - def on_cancel_button_clicked(self, widget): - selected = self.tree.get_selection().get_selected() + def _on_cancel_button_clicked(self, widget): + selected = self._ui.transfers_list.get_selection().get_selected() if selected is None or selected[1] is None: return s_iter = selected[1] @@ -885,76 +896,78 @@ class FileTransfersWindow: con.get_module('Bytestream').disconnect_transfer(file_props) self.set_status(file_props, 'stop') - def on_notify_ft_complete_checkbox_toggled(self, widget): - app.config.set('notify_on_file_complete', - widget.get_active()) - - def on_file_transfers_dialog_delete_event(self, widget, event): - self.window.hide() - return True # do NOT destroy window + def _on_notify_ft_complete_toggled(self, widget, *args): + app.config.set('notify_on_file_complete', widget.get_active()) - def on_close_button_clicked(self, widget): + def _on_file_transfers_dialog_delete_event(self, widget, event): self.window.hide() + return True # Do NOT destroy window - def show_context_menu(self, event, iter_): + def _show_context_menu(self, event, iter_): # change the sensitive property of the buttons and menuitems if iter_: path = self.model.get_path(iter_) - self.set_buttons_sensitive(path, True) + self._set_buttons_sensitive(path, True) event_button = gtkgui_helpers.get_possible_button_event(event) - self.file_transfers_menu.show_all() - self.file_transfers_menu.popup(None, self.tree, None, None, - event_button, event.time) - - def on_transfers_list_key_press_event(self, widget, event): + self._ui.file_transfers_menu.show_all() + self._ui.file_transfers_menu.popup( + None, + self._ui.transfers_list, + None, + None, + event_button, + event.time) + + def _on_transfers_list_key_press_event(self, widget, event): """ When a key is pressed in the treeviews """ iter_ = None try: - iter_ = self.tree.get_selection().get_selected()[1] + iter_ = self._ui.transfers_list.get_selection().get_selected()[1] except TypeError: - self.tree.get_selection().unselect_all() + self._ui.transfers_list.get_selection().unselect_all() if iter_ is not None: path = self.model.get_path(iter_) - self.tree.get_selection().select_path(path) + self._ui.transfers_list.get_selection().select_path(path) if event.keyval == Gdk.KEY_Menu: - self.show_context_menu(event, iter_) + self._show_context_menu(event, iter_) return True - - def on_transfers_list_button_release_event(self, widget, event): + def _on_transfers_list_button_release_event(self, widget, event): # hide tooltip, no matter the button is pressed path = None try: - path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0] + path = self._ui.transfers_list.get_path_at_pos(int(event.x), + int(event.y))[0] except TypeError: - self.tree.get_selection().unselect_all() + self._ui.transfers_list.get_selection().unselect_all() if path is None: - self.set_all_insensitive() + self._set_all_insensitive() else: - self.select_func(path) + self._select_func(path) - def on_transfers_list_button_press_event(self, widget, event): + def _on_transfers_list_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed path, iter_ = None, None try: - path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0] + path = self._ui.transfers_list.get_path_at_pos(int(event.x), + int(event.y))[0] except TypeError: - self.tree.get_selection().unselect_all() - if event.button == 3: # Right click + self._ui.transfers_list.get_selection().unselect_all() + if event.button == 3: # Right click if path: - self.tree.get_selection().select_path(path) + self._ui.transfers_list.get_selection().select_path(path) iter_ = self.model.get_iter(path) - self.show_context_menu(event, iter_) + self._show_context_menu(event, iter_) if path: return True - def on_open_folder_menuitem_activate(self, widget): - selected = self.tree.get_selection().get_selected() + def _on_open_folder_menuitem_activate(self, widget): + selected = self._ui.transfers_list.get_selection().get_selected() if not selected or not selected[1]: return s_iter = selected[1] @@ -966,51 +979,48 @@ class FileTransfersWindow: if os.path.exists(path) and os.path.isdir(path): helpers.launch_file_manager(path) - def on_cancel_menuitem_activate(self, widget): - self.on_cancel_button_clicked(widget) + def _on_cancel_menuitem_activate(self, widget): + self._on_cancel_button_clicked(widget) - def on_continue_menuitem_activate(self, widget): - self.on_pause_restore_button_clicked(widget) + def _on_continue_menuitem_activate(self, widget): + self._on_pause_resume_button_clicked(widget) - def on_pause_menuitem_activate(self, widget): - self.on_pause_restore_button_clicked(widget) + def _on_pause_resume_menuitem_activate(self, widget): + self._on_pause_resume_button_clicked(widget) - def on_remove_menuitem_activate(self, widget): - selected = self.tree.get_selection().get_selected() + def _on_remove_menuitem_activate(self, widget): + selected = self._ui.transfers_list.get_selection().get_selected() if not selected or not selected[1]: return s_iter = selected[1] sid = self.model[s_iter][Column.SID] file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) self._remove_transfer(s_iter, sid, file_props) - self.set_all_insensitive() + self._set_all_insensitive() - def on_file_transfers_window_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: # ESCAPE + def _on_file_transfers_window_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: # ESCAPE self.window.hide() class SendFileDialog(Gtk.ApplicationWindow): def __init__(self, send_callback, transient_for): - active_window = app.app.get_active_window() Gtk.ApplicationWindow.__init__(self) self.set_name('SendFileDialog') self.set_application(app.app) self.set_show_menubar(False) self.set_resizable(True) - self.set_default_size(400, 250) + self.set_default_size(500, 350) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self.set_transient_for(active_window) + self.set_transient_for(transient_for) self.set_title(_('Choose a File to Send…')) self.set_destroy_with_parent(True) self._send_callback = send_callback - self._ui = get_builder('send_file_dialog.ui') - + self._ui = get_builder('filetransfers_send_file_dialog.ui') self.add(self._ui.send_file_grid) self.connect('key-press-event', self._key_press_event) - self._ui.connect_signals(self) self.show_all() @@ -1025,10 +1035,12 @@ class SendFileDialog(Gtk.ApplicationWindow): transient_for=self, path=app.config.get('last_send_dir')) - def _set_files(self, filenames): - # Clear the ListBox - self._ui.listbox.foreach(self._remove_widget, None) + def _remove_files(self, button): + selected = self._ui.listbox.get_selected_rows() + for item in selected: + self._ui.listbox.remove(item) + def _set_files(self, filenames): for file in filenames: row = FileRow(file) if row.path.is_dir(): @@ -1038,9 +1050,6 @@ class SendFileDialog(Gtk.ApplicationWindow): self._ui.listbox.show_all() app.config.set('last_send_dir', str(last_dir)) - def _remove_widget(self, widget, data): - self._ui.listbox.remove(widget) - def _get_description(self): buffer_ = self._ui.description.get_buffer() start, end = buffer_.get_bounds() ===================================== gajim/gtk/tooltips.py ===================================== @@ -549,16 +549,19 @@ class FileTransfersTooltip(): return False, self.widget def _create_tooltip(self, file_props, _sid): - ft_table = Gtk.Table(2, 1) - ft_table.set_property('column-spacing', 2) - current_row = 1 + ft_grid = Gtk.Grid.new() + ft_grid.insert_column(0) + ft_grid.set_row_spacing(6) + ft_grid.set_column_spacing(12) + current_row = 0 properties = [] name = file_props.name if file_props.type_ == 'r': file_name = os.path.split(file_props.file_name)[1] else: file_name = file_props.name - properties.append((_('Name: '), GLib.markup_escape_text(file_name))) + properties.append((_('File Name: '), + GLib.markup_escape_text(file_name))) if file_props.type_ == 'r': type_ = Q_('?Noun:Download') actor = _('Sender: ') @@ -573,58 +576,55 @@ class FileTransfersTooltip(): name = receiver.get_shown_name() else: name = receiver.split('/')[0] - properties.append((_('Type: '), type_)) + properties.append((Q_('?transfer type:Type: '), type_)) properties.append((actor, GLib.markup_escape_text(name))) transfered_len = file_props.received_len if not transfered_len: transfered_len = 0 - properties.append((_('Transferred: '), helpers.convert_bytes(transfered_len))) + properties.append((Q_('?transfer status:Transferred: '), + helpers.convert_bytes(transfered_len))) status = self._get_current_status(file_props) - properties.append((_('Status: '), status)) + properties.append((Q_('?transfer status:Status: '), status)) file_desc = file_props.desc or '' - properties.append((_('Description: '), GLib.markup_escape_text( - file_desc))) + properties.append((_('Description: '), + GLib.markup_escape_text(file_desc))) + while properties: property_ = properties.pop(0) - current_row += 1 label = Gtk.Label() - label.set_halign(Gtk.Align.START) - label.set_valign(Gtk.Align.START) + label.set_halign(Gtk.Align.END) + label.set_valign(Gtk.Align.CENTER) label.set_markup(property_[0]) - ft_table.attach( - label, 1, 2, current_row, current_row + 1, - Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) + ft_grid.attach(label, 0, current_row, 1, 1) label = Gtk.Label() label.set_halign(Gtk.Align.START) label.set_valign(Gtk.Align.START) label.set_line_wrap(True) label.set_markup(property_[1]) - ft_table.attach( - label, 2, 3, current_row, current_row + 1, - Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, - Gtk.AttachOptions.FILL, 0, 0) + ft_grid.attach(label, 1, current_row, 1, 1) + current_row += 1 - ft_table.show_all() - return ft_table + ft_grid.show_all() + return ft_grid @staticmethod def _get_current_status(file_props): if file_props.stopped: - return _('Aborted') + return Q_('?transfer status:Aborted') if file_props.completed: - return _('Completed') + return Q_('?transfer status:Completed') if file_props.paused: return Q_('?transfer status:Paused') if file_props.stalled: # stalled is not paused. it is like 'frozen' it stopped alone - return _('Stalled') + return Q_('?transfer status:Stalled') if file_props.connected: if file_props.started: - return _('Transferring') - return _('Not started') - return _('Not started') + return Q_('?transfer status:Transferring') + return Q_('?transfer status:Not started') + return Q_('?transfer status:Not started') def colorize_status(status): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/93057ab66d71ddc8111e38f88067c0dad8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/93057ab66d71ddc8111e38f88067c0dad8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix rejecting file transfer
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 328ceedd by Philipp Hörist at 2019-06-20T11:08:15Z Fix rejecting file transfer - - - - - 3 changed files: - gajim/common/jingle_session.py - gajim/common/modules/bytestream.py - gajim/common/modules/jingle.py Changes: ===================================== gajim/common/jingle_session.py ===================================== @@ -538,7 +538,7 @@ class JingleSession: # If we are not receiving a file # Check if there's already a session with this user: if contents[0].media != 'file': - for session in self.connection.get_module('Jingle').iter_jingle_sessions(self.peerjid): + for session in self.connection.get_module('Jingle').get_jingle_sessions(self.peerjid): if session is not self: reason = nbxmpp.Node('reason') alternative_session = reason.setTag('alternative-session') ===================================== gajim/common/modules/bytestream.py ===================================== @@ -179,10 +179,9 @@ class Bytestream(BaseModule): if not app.account_is_connected(self._account): return - if file_props.sid in self._sessions: - jingle = self._sessions[file_props.sid] - jingle.cancel_session() - return + for session in self._con.get_module('Jingle').get_jingle_sessions( + None, file_props.sid): + session.cancel_session() def send_success_connect_reply(self, streamhost): """ ===================================== gajim/common/modules/jingle.py ===================================== @@ -230,16 +230,16 @@ class Jingle(BaseModule): return 'sha-256' return None - def iter_jingle_sessions(self, jid, sid=None, media=None): + def get_jingle_sessions(self, jid, sid=None, media=None): if sid: - return (session for session in self._sessions.values() if \ - session.sid == sid) - sessions = (session for session in self._sessions.values() if \ - session.peerjid == jid) + return [session for session in self._sessions.values() if \ + session.sid == sid] + sessions = [session for session in self._sessions.values() if \ + session.peerjid == jid] if media: if media not in ('audio', 'video', 'file'): - return tuple() - return (session for session in sessions if session.get_content(media)) + return [] + return [session for session in sessions if session.get_content(media)] return sessions def set_file_info(self, file_): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/328ceedd2fe32eae9f0d97ce45fcc31074… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/328ceedd2fe32eae9f0d97ce45fcc31074… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DiscoWindow: Some code-cleanup
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 200428c0 by Daniel Brötzmann at 2019-06-20T09:51:53Z DiscoWindow: Some code-cleanup - - - - - 3 changed files: - gajim/data/gui/groups_post_window.ui - gajim/data/gui/service_discovery_window.ui - gajim/gtk/discovery.py Changes: ===================================== gajim/data/gui/groups_post_window.ui ===================================== @@ -1,32 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkTextBuffer" id="textbuffer1"/> <object class="GtkWindow" id="groups_post_window"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="title" translatable="yes">Create new post</property> <property name="type_hint">dialog</property> + <signal name="key-press-event" handler="_on_key_press_event" swapped="no"/> <child> - <object class="GtkBox" id="vbox1"> + <placeholder/> + </child> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> - <property name="spacing">4</property> + <property name="spacing">6</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">From</property> <property name="xalign">0</property> - <property name="label" translatable="yes">From:</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -34,11 +42,15 @@ </packing> </child> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Subject</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Subject:</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -60,7 +72,6 @@ <object class="GtkEntry" id="subject_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> @@ -75,7 +86,7 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> @@ -83,53 +94,32 @@ <object class="GtkTextView" id="contents_textview"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> <property name="buffer">textbuffer1</property> </object> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="hbox1"> + <object class="GtkButton" id="send_button"> + <property name="label">_Forward</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">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> - <placeholder/> - </child> - <child> - <object class="GtkButton" id="send_button"> - <property name="label">gtk-go-forward</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_send_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_send_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/gui/service_discovery_window.ui ===================================== @@ -1,61 +1,83 @@ <?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-jump-to</property> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> </object> <object class="GtkWindow" id="service_discovery_window"> <property name="can_focus">False</property> - <property name="border_width">6</property> <property name="role">Service Discovery</property> + <property name="window_position">center-always</property> <property name="default_width">550</property> - <property name="default_height">420</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_service_discovery_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> + <property name="default_height">550</property> + <signal name="destroy" handler="_on_service_discovery_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="_on_key_press_event" swapped="no"/> <child> - <object class="GtkBox" id="vbox11"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="service_discovery"> + <property name="width_request">400</property> + <property name="height_request">400</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkEventBox" id="banner_agent_eventbox"> - <property name="name">Discovery-BannerEventBox</property> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="banner_agent_icon"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</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="banner_agent_hbox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="banner_agent_label"> - <property name="name">Discovery-BannerLabel</property> + <object class="GtkLabel" id="banner_agent_header"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="ypad">6</property> - <property name="label"><span weight="heavy" size="large">Agent name</span> -Agent JID - node</property> - <property name="use_markup">True</property> - <property name="xalign">0.05000000074505806</property> + <property name="halign">start</property> + <property name="label">Agent name</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> </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="GtkImage" id="banner_agent_icon"> + <object class="GtkLabel" id="banner_agent_subheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xpad">6</property> - <property name="ypad">6</property> - <property name="stock">gtk-missing-image</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Agent JID - node</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -64,28 +86,34 @@ Agent JID - node</property> </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - <style> - <class name="gajim-banner"/> - </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="address_table"> + <object class="GtkBox" id="address_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label224"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Address:</property> + <property name="label" translatable="yes">_Address</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">address_comboboxtext_entry</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> @@ -99,8 +127,9 @@ Agent JID - node</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="has_entry">True</property> + <signal name="changed" handler="_on_address_comboboxtext_changed" swapped="no"/> <child internal-child="entry"> - <object class="GtkEntry" id="address_entry"> + <object class="GtkEntry" id="address_comboboxtext_entry"> <property name="can_focus">True</property> <property name="has_focus">True</property> <signal name="key-press-event" handler="_on_entry_key_press_event" swapped="no"/> @@ -115,15 +144,24 @@ Agent JID - node</property> </child> <child> <object class="GtkButton" id="browse_button"> - <property name="label" translatable="yes">G_o</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="tooltip_text" translatable="yes">Go</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_go_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_go_button_clicked" 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> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -138,6 +176,20 @@ Agent JID - node</property> <property name="position">1</property> </packing> </child> + <child> + <object class="GtkProgressBar" id="services_progressbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">center</property> + <property name="show_text">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkScrolledWindow" id="services_scrollwin"> <property name="visible">True</property> @@ -148,7 +200,6 @@ Agent JID - node</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - <signal name="row-activated" handler="on_services_treeview_row_activated" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -158,83 +209,26 @@ Agent JID - node</property> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkBox" id="hbox2994"> + <object class="GtkBox" id="action_buttonbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkProgressBar" id="services_progressbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="pulse_step">0.10000000149</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label363"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="action_buttonbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</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="has_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="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">2</property> - <property name="position">3</property> + <property name="pack_type">end</property> + <property name="position">4</property> </packing> </child> </object> </child> </object> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> </interface> ===================================== gajim/gtk/discovery.py ===================================== @@ -37,8 +37,8 @@ # - def _update_error(self, iter_, jid, node) # # * Should call the super class for this method. -# All others do not have to call back to the super class. (but can if they want -# the functionality) +# All others do not have to call back to the super class (but can if they want +# the functionality). # There are more methods, of course, but this is a basic set. import types @@ -46,33 +46,36 @@ import weakref import uuid import nbxmpp + from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gajim.common import app -from gajim.common.i18n import _ from gajim.common import helpers +from gajim.common.i18n import _ from gajim.common.const import StyleAttr +from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InformationDialog -from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.search import Search -from gajim.gtk.adhoc import AdHocCommand +from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.util import icon_exists from gajim.gtk.util import get_builder LABELS = { 1: _('This service has not yet responded with detailed information'), 2: _('This service could not respond with detailed information.\n' - 'It is most likely legacy or broken'), + 'It is most likely a legacy service or broken.'), } # Dictionary mapping category, type pairs to browser class, image pairs. # This is a function, so we can call it after the classes are declared. # For the browser class, None means that the service will only be browsable # when it advertises disco as it's feature, False means it's never browsable. + + def _gen_agent_type_info(): return { # Defaults @@ -93,7 +96,7 @@ def _gen_agent_type_info(): ('directory', 'user'): (None, 'jud'), ('pubsub', 'generic'): (PubSubBrowser, 'pubsub'), ('pubsub', 'service'): (PubSubBrowser, 'pubsub'), - ('proxy', 'bytestreams'): (None, 'bytestreams'), # Socks5 FT proxy + ('proxy', 'bytestreams'): (None, 'bytestreams'), # Socks5 FT proxy ('headline', 'newmail'): (ToplevelAgentBrowser, 'mail'), # Transports @@ -116,13 +119,14 @@ def _gen_agent_type_info(): ('gateway', 'twitter'): (False, 'twitter'), } + # Category type to "human-readable" description string +# Conference is a category for listing mostly groupchats in service discovery _cat_to_descr = { - 'other': _('Others'), - 'gateway': _('Transports'), - '_jid': _('Transports'), - #conference is a category for listing mostly groupchats in service discovery - 'conference': _('Conference'), + 'other': _('Others'), + 'gateway': _('Transports'), + '_jid': _('Transports'), + 'conference': _('Conference'), } @@ -172,7 +176,8 @@ class CacheDictionary: if item.source: GLib.source_remove(item.source) if self.lifetime: - source = GLib.timeout_add_seconds(int(self.lifetime/1000), self._expire_timeout, key) + source = GLib.timeout_add_seconds( + int(self.lifetime / 1000), self._expire_timeout, key) item.source = source def __getitem__(self, key): @@ -195,8 +200,10 @@ class CacheDictionary: def __contains__(self, key): return key in self.cache + _icon_cache = CacheDictionary(15) + def get_agent_address(jid, node=None): """ Get an agent's address for displaying in the GUI @@ -205,6 +212,7 @@ def get_agent_address(jid, node=None): return '%s@%s' % (node, str(jid)) return str(jid) + class Closure: """ A weak reference to a callback with arguments as an object @@ -318,7 +326,7 @@ class ServicesCache: if browser and browser == ToplevelAgentBrowser: return browser - # second pass, we haven't found a ToplevelAgentBrowser + # Second pass, we haven't found a ToplevelAgentBrowser for identity in identities: try: cat, type_ = identity['category'], identity['type'] @@ -353,7 +361,7 @@ class ServicesCache: # Create a closure object cbkey = ('info', addr) cb = Closure(cb, userargs=args, remove=self._clean_closure, - removeargs=cbkey) + removeargs=cbkey) # Are we already fetching this? if cbkey in self._cbs: self._cbs[cbkey].append(cb) @@ -471,9 +479,8 @@ class ServiceDiscoveryWindow: """ Class that represents the Services Discovery window """ - def __init__(self, account, jid='', node='', address_entry=False, - parent=None, initial_identities=None): + parent=None, initial_identities=None): self._account = account self.parent = parent if not jid: @@ -490,7 +497,8 @@ class ServiceDiscoveryWindow: # Check connection if not app.account_is_connected(account): ErrorDialog(_('You are not connected to the server'), -_('Without a connection, you can not browse available services')) + _('Without a connection, you can not browse ' + 'available services')) raise RuntimeError('You must be connected to browse services') # Get a ServicesCache object. @@ -502,31 +510,28 @@ _('Without a connection, you can not browse available services')) if initial_identities: self.cache._on_agent_info(jid, node, initial_identities, [], None) - self.xml = get_builder('service_discovery_window.ui') - self.window = self.xml.get_object('service_discovery_window') - self.services_treeview = self.xml.get_object('services_treeview') + self._ui = get_builder('service_discovery_window.ui') + self.window = self._ui.service_discovery_window + self.services_treeview = self._ui.services_treeview self.model = None # This is more reliable than the cursor-changed signal. selection = self.services_treeview.get_selection() - selection.connect_after('changed', - self.on_services_treeview_selection_changed) - self.services_scrollwin = self.xml.get_object('services_scrollwin') - self.progressbar = self.xml.get_object('services_progressbar') - self.banner = self.xml.get_object('banner_agent_label') - self.banner_icon = self.xml.get_object('banner_agent_icon') - self.banner_eventbox = self.xml.get_object('banner_agent_eventbox') + selection.connect_after( + 'changed', self._on_services_treeview_selection_changed) + self.services_treeview.connect( + 'row-activated', self._on_services_treeview_row_activated) + self.services_scrollwin = self._ui.services_scrollwin + self.progressbar = self._ui.services_progressbar + self.banner_header = self._ui.banner_agent_header + self.banner_subheader = self._ui.banner_agent_subheader + self.banner_icon = self._ui.banner_agent_icon self.style_event_id = 0 - self.banner.realize() - self.action_buttonbox = self.xml.get_object('action_buttonbox') + self.action_buttonbox = self._ui.action_buttonbox # Address combobox self.address_comboboxtext = None - address_table = self.xml.get_object('address_table') if address_entry: - self.address_comboboxtext = self.xml.get_object( - 'address_comboboxtext') - self.address_comboboxtext_entry = self.xml.get_object( - 'address_entry') + self.address_comboboxtext = self._ui.address_comboboxtext self.latest_addresses = app.config.get( 'latest_disco_addresses').split() @@ -540,17 +545,17 @@ _('Without a connection, you can not browse available services')) self.address_comboboxtext.get_child().set_text(jid) else: # Don't show it at all if we didn't ask for it - address_table.set_no_show_all(True) - address_table.hide() + self._ui.address_box.set_no_show_all(True) + self._ui.address_box.hide() accel_group = Gtk.AccelGroup() keyval, mod = Gtk.accelerator_parse('<Control>r') accel_group.connect(keyval, mod, Gtk.AccelFlags.VISIBLE, - self.accel_group_func) + self.accel_group_func) self.window.add_accel_group(accel_group) self._initial_state() - self.xml.connect_signals(self) + self._ui.connect_signals(self) self.travel(jid, node) self.window.show_all() @@ -565,7 +570,7 @@ _('Without a connection, you can not browse available services')) if self.browser: self.browser.account = value - def on_key_press_event(self, widget, event): + def _on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: self.window.destroy() @@ -583,15 +588,17 @@ _('Without a connection, you can not browse available services')) self.window.set_title(title_text) self._set_window_banner_text(_('Service Discovery')) self.banner_icon.clear() - self.banner_icon.hide() # Just clearing it doesn't work + self.banner_icon.hide() # Just clearing it doesn't work def _set_window_banner_text(self, text, text_after=None): - markup = '<span>%s</span>' % (text) + self.banner_header.set_text(text) if text_after is not None: - markup += '\n<span size="x-small">%s</span>' % text_after - self.banner.set_markup(markup) + self.banner_subheader.show() + self.banner_subheader.set_text(text_after) + else: + self.banner_subheader.hide() - def destroy(self, chain=False): + def _destroy(self, chain=False): """ Close the browser. This can optionally close its children and propagate to the parent. This should happen on actions like register, or join to @@ -660,7 +667,7 @@ _('Without a connection, you can not browse available services')) if not identities: if not self.address_comboboxtext: # We can't travel anywhere else. - self.destroy() + self._destroy() ErrorDialog( _('The service could not be found'), _('There is no service at the address you entered, or it is ' @@ -686,8 +693,8 @@ _('Without a connection, you can not browse available services')) Open an agent. By default, this happens in a new window """ try: - win = app.interface.instances[self.account]['disco']\ - [get_agent_address(jid, node)] + win = app.interface.instances[ + self.account]['disco'][get_agent_address(jid, node)] win.window.present() return except KeyError: @@ -699,34 +706,30 @@ _('Without a connection, you can not browse available services')) return self.children.append(win) - def on_service_discovery_window_destroy(self, widget): - self.destroy() + def _on_service_discovery_window_destroy(self, widget): + self._destroy() - def on_close_button_clicked(self, widget): - self.destroy() - - def on_address_comboboxtext_changed(self, widget): + def _on_address_comboboxtext_changed(self, widget): if self.address_comboboxtext.get_active() != -1: - # user selected one of the entries so do auto-visit - jid = self.address_comboboxtext_entry.get_text() + # User selected one of the entries so do auto-visit + jid = self._ui.address_comboboxtext_entry.get_text() try: jid = helpers.parse_jid(jid) except helpers.InvalidFormat as s: - pritext = _('Invalid Server Name') - ErrorDialog(pritext, str(s)) + ErrorDialog(_('Invalid Server Name'), str(s)) return self.travel(jid, '') - def on_go_button_clicked(self, widget): - jid = self.address_comboboxtext_entry.get_text() + def _on_go_button_clicked(self, widget): + jid = self._ui.address_comboboxtext_entry.get_text() try: jid = helpers.parse_jid(jid) except helpers.InvalidFormat as s: - pritext = _('Invalid Server Name') - ErrorDialog(pritext, str(s), - transient_for=self.window) + ErrorDialog(_('Invalid Server Name'), + str(s), + transient_for=self.window) return - if jid == self.jid: # jid has not changed + if jid == self.jid: # jid has not changed return if jid in self.latest_addresses: self.latest_addresses.remove(jid) @@ -737,20 +740,20 @@ _('Without a connection, you can not browse available services')) for j in self.latest_addresses: self.address_comboboxtext.append_text(j) app.config.set('latest_disco_addresses', - ' '.join(self.latest_addresses)) + ' '.join(self.latest_addresses)) self.travel(jid, '') - def on_services_treeview_row_activated(self, widget, path, col=0): + def _on_services_treeview_row_activated(self, widget, path, col=0): if self.browser: self.browser.default_action() - def on_services_treeview_selection_changed(self, widget): + def _on_services_treeview_selection_changed(self, widget): if self.browser: self.browser.update_actions() def _on_entry_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Return or event.keyval == Gdk.KEY_KP_Enter: - self.on_go_button_clicked(widget) + self._on_go_button_clicked(widget) class AgentBrowser: @@ -780,8 +783,9 @@ class AgentBrowser: """ Set the initial window title based on agent address """ - self.window.window.set_title(_('Browsing %(address)s using account ' - '%(account)s') % {'address': self._get_agent_address(), + self.window.window.set_title( + _('Browsing %(address)s using account %(account)s') % { + 'address': self._get_agent_address(), 'account': self.account}) self.window._set_window_banner_text(self._get_agent_address()) @@ -825,10 +829,7 @@ class AgentBrowser: self.browse_button = Gtk.Button() self.browse_button.connect('clicked', self.on_browse_button_clicked) self.window.action_buttonbox.add(self.browse_button) - image = Gtk.Image.new_from_icon_name("document-open", Gtk.IconSize.BUTTON) - self.browse_button.set_image(image) - label = _('Browse') - self.browse_button.set_label(label) + self.browse_button.set_label(_('Browse')) self.browse_button.show_all() def _clean_actions(self): @@ -860,7 +861,8 @@ class AgentBrowser: # Add an icon to the banner. icon_name = self.cache.get_icon(identities, addr=self._get_agent_address()) - self.window.banner_icon.set_from_icon_name(icon_name, Gtk.IconSize.DND) + self.window.banner_icon.set_from_icon_name(icon_name, + Gtk.IconSize.DIALOG) self.window.banner_icon.show() def _clean_title(self): @@ -880,13 +882,6 @@ class AgentBrowser: self._create_treemodel() self._add_actions() - # This is a hack. The buttonbox apparently doesn't care about pack_start - # or pack_end, so we repack the close button here to make sure it's last - close_button = self.window.xml.get_object('close_button') - self.window.action_buttonbox.remove(close_button) - self.window.action_buttonbox.pack_end(close_button, True, True, 0) - close_button.show_all() - self.update_actions() self.active = True @@ -914,7 +909,8 @@ class AgentBrowser: When we want to browse an agent: open a new services window with a browser for the agent type """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][0] @@ -928,7 +924,8 @@ class AgentBrowser: """ if self.browse_button: self.browse_button.set_sensitive(False) - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][0] @@ -951,7 +948,8 @@ class AgentBrowser: When we double-click a row: perform the default action on the selected item """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][0] @@ -978,7 +976,7 @@ class AgentBrowser: self.window.progressbar.show() self._pulse_timeout = GLib.timeout_add(250, self._pulse_timeout_cb) self.cache.get_items(self.jid, self.node, self._agent_items, - force=force, args=(force,)) + force=force, args=(force,)) def _pulse_timeout_cb(self, *args): """ @@ -1023,9 +1021,11 @@ class AgentBrowser: # We can't travel anywhere else. self.window.destroy() ErrorDialog(_('The service is not browsable'), - _('This service does not contain any items to browse.'), - transient_for=self.window.window) + _('This service does not contain any items ' + 'to browse.'), + transient_for=self.window.window) return + # We got a list of items def fill_partial_rows(items): '''Generator to fill the listmodel of a treeview progressively.''' @@ -1045,7 +1045,7 @@ class AgentBrowser: yield True self.window.services_treeview.freeze_child_notify() self.window.services_treeview.thaw_child_notify() - #stop idle_add() + # Stop idle_add() yield False loader = fill_partial_rows(items) GLib.idle_add(next, loader) @@ -1072,7 +1072,7 @@ class AgentBrowser: disco#items query """ self.model.append((jid, node, item.get('name', ''), - get_agent_address(jid, node))) + get_agent_address(jid, node))) self.cache.get_info(jid, node, self._agent_info, force=force) def _update_item(self, iter_, jid, node, item): @@ -1117,11 +1117,11 @@ class ToplevelAgentBrowser(AgentBrowser): def add_self_line(self): addr = get_agent_address(self.jid, self.node) - descr = "<b>%s</b>" % addr + descr = '<b>%s</b>' % addr # Guess which kind of service this is identities = [] type_ = app.get_transport_name_from_jid(self.jid, - use_config_setting=False) + use_config_setting=False) if type_: identity = {'category': '_jid', 'type': type_} identities.append(identity) @@ -1161,7 +1161,8 @@ class ToplevelAgentBrowser(AgentBrowser): # Normal/success cell.set_property('foreground_set', False) else: - bgcolor = app.css_config.get_value('.gajim-group-row', StyleAttr.BACKGROUND) + bgcolor = app.css_config.get_value('.gajim-group-row', + StyleAttr.BACKGROUND) if bgcolor: cell.set_property('cell_background_set', True) cell.set_property('foreground_set', False) @@ -1230,35 +1231,35 @@ class ToplevelAgentBrowser(AgentBrowser): def _add_actions(self): AgentBrowser._add_actions(self) - self.execute_button = Gtk.Button() - self.execute_button.connect('clicked', self.on_execute_button_clicked) - self.window.action_buttonbox.add(self.execute_button) - image = Gtk.Image.new_from_icon_name("system-run", Gtk.IconSize.BUTTON) + self.execute_button = Gtk.Button(label=_('_Command'), + use_underline=True) + self.execute_button.connect('clicked', self._on_execute_button_clicked) + image = Gtk.Image.new_from_icon_name( + 'utilities-terminal-symbolic', Gtk.IconSize.BUTTON) self.execute_button.set_image(image) - label = _('Execute Command') - self.execute_button.set_label(label) + self.window.action_buttonbox.add(self.execute_button) self.execute_button.show_all() - self.register_button = Gtk.Button(label=_("Re_gister"), - use_underline=True) - self.register_button.connect('clicked', self.on_register_button_clicked) + self.register_button = Gtk.Button(label=_('Re_gister'), + use_underline=True) + self.register_button.connect( + 'clicked', self._on_register_button_clicked) self.window.action_buttonbox.add(self.register_button) self.register_button.show_all() - self.join_button = Gtk.Button() - self.join_button.connect('clicked', self.on_join_button_clicked) + self.join_button = Gtk.Button(label=_('Join'), + use_underline=True) + self.join_button.connect('clicked', self._on_join_button_clicked) self.window.action_buttonbox.add(self.join_button) - label = _('Join') - self.join_button.set_label(label) self.join_button.show_all() - self.search_button = Gtk.Button() + self.search_button = Gtk.Button(label=_('_Search'), + use_underline=True) self.search_button.connect('clicked', self.on_search_button_clicked) - self.window.action_buttonbox.add(self.search_button) - image = Gtk.Image.new_from_icon_name("edit-find", Gtk.IconSize.BUTTON) + image = Gtk.Image.new_from_icon_name('edit-find-symbolic', + Gtk.IconSize.BUTTON) self.search_button.set_image(image) - label = _('Search') - self.search_button.set_label(label) + self.window.action_buttonbox.add(self.search_button) self.search_button.show_all() def _clean_actions(self): @@ -1280,7 +1281,8 @@ class ToplevelAgentBrowser(AgentBrowser): """ When we want to search something: open search window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0] @@ -1290,27 +1292,30 @@ class ToplevelAgentBrowser(AgentBrowser): AgentBrowser.cleanup(self) def update_theme(self): - bgcolor = app.css_config.get_value('.gajim-group-row', StyleAttr.BACKGROUND) + bgcolor = app.css_config.get_value('.gajim-group-row', + StyleAttr.BACKGROUND) if bgcolor: self._renderer.set_property('cell-background', bgcolor) self.window.services_treeview.queue_draw() - def on_execute_button_clicked(self, widget=None): + def _on_execute_button_clicked(self, widget=None): """ When we want to execute a command: open adhoc command window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0] AdHocCommand(self.account, service) - def on_register_button_clicked(self, widget=None): + def _on_register_button_clicked(self, widget=None): """ When we want to register an agent: request information about registering with the agent and close the window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][0] @@ -1318,17 +1323,18 @@ class ToplevelAgentBrowser(AgentBrowser): ServiceRegistration(self.account, jid) self.window.destroy(chain=True) - def on_join_button_clicked(self, widget): + def _on_join_button_clicked(self, widget): """ When we want to join an IRC room or create a new MUC room: Opens the join_groupchat_window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0] app.interface.join_gc_minimal(self.account, service, - transient_for=self.window.window) + transient_for=self.window.window) def update_actions(self): if self.execute_button: @@ -1341,7 +1347,8 @@ class ToplevelAgentBrowser(AgentBrowser): self.join_button.set_sensitive(False) if self.search_button: self.search_button.set_sensitive(False) - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return if not model[iter_][0]: @@ -1349,7 +1356,8 @@ class ToplevelAgentBrowser(AgentBrowser): return if model[iter_][4] is not None: # We don't have the info (yet) - # It's either unknown or a transport, register button should be active + # It's either unknown or a transport: + # Register button should be active if self.register_button: self.register_button.set_sensitive(True) # Guess what kind of service we're dealing with @@ -1370,7 +1378,8 @@ class ToplevelAgentBrowser(AgentBrowser): AgentBrowser.update_actions(self) def _update_actions(self, jid, node, identities, features, data): - AgentBrowser._update_actions(self, jid, node, identities, features, data) + AgentBrowser._update_actions( + self, jid, node, identities, features, data) if self.execute_button and nbxmpp.NS_COMMANDS in features: self.execute_button.set_sensitive(True) if self.search_button and nbxmpp.NS_SEARCH in features: @@ -1383,7 +1392,7 @@ class ToplevelAgentBrowser(AgentBrowser): jid_list = app.contacts.get_jid_list(self.account) for jid_ in jid_list: contact = app.contacts.get_first_contact_from_jid( - self.account, jid_) + self.account, jid_) if _('Transports') in contact.groups: registered_transports.append(jid_) registered_transports.append(self.jid) @@ -1396,11 +1405,12 @@ class ToplevelAgentBrowser(AgentBrowser): self.join_button.set_sensitive(True) def _default_action(self, jid, node, identities, features, data): - if AgentBrowser._default_action(self, jid, node, identities, features, data): + if AgentBrowser._default_action(self, jid, node, identities, + features, data): return True if nbxmpp.NS_REGISTER in features: # Register if we can't browse - self.on_register_button_clicked() + self._on_register_button_clicked() return True return False @@ -1412,13 +1422,6 @@ class ToplevelAgentBrowser(AgentBrowser): """ Expand all items in the treeview """ - # GTK apparently screws up here occasionally. :/ - #def expand_all(*args): - # self.window.services_treeview.expand_all() - # self.expanding = False - # return False - #self.expanding = True - #GLib.idle_add(expand_all) self.window.services_treeview.expand_all() def _update_progressbar(self): @@ -1431,8 +1434,10 @@ class ToplevelAgentBrowser(AgentBrowser): fraction = 0 if self._total_items: - self.window.progressbar.set_text(_("Scanning %(current)d / %(total)d.." - ) % {'current': self._progress, 'total': self._total_items}) + self.window.progressbar.set_text( + _('Scanning %(current)d / %(total)d ...') % { + 'current': self._progress, + 'total': self._total_items + 1}) fraction = float(self._progress) / float(self._total_items) if self._progress >= self._total_items: # We show the progressbar for just a bit before hiding it. @@ -1664,7 +1669,7 @@ class MucBrowser(AgentBrowser): self.vadj_cbid = self.vadj.connect('value-changed', self.on_scroll) # And to size changes self.size_cbid = self.window.services_scrollwin.connect( - 'size-allocate', self.on_scroll) + 'size-allocate', self.on_scroll) def _clean_treemodel(self): if self.size_cbid: @@ -1676,12 +1681,17 @@ class MucBrowser(AgentBrowser): AgentBrowser._clean_treemodel(self) def _add_actions(self): - self.bookmark_button = Gtk.Button(label=_('_Bookmark'), use_underline=True) - self.bookmark_button.connect('clicked', self.on_bookmark_button_clicked) + self.bookmark_button = Gtk.Button(label=_('_Bookmark'), + use_underline=True) + self.bookmark_button.connect( + 'clicked', self._on_bookmark_button_clicked) + image = Gtk.Image.new_from_icon_name( + 'bookmark-new-symbolic', Gtk.IconSize.BUTTON) + self.bookmark_button.set_image(image) self.window.action_buttonbox.add(self.bookmark_button) self.bookmark_button.show_all() self.join_button = Gtk.Button(label=_('_Join'), use_underline=True) - self.join_button.connect('clicked', self.on_join_button_clicked) + self.join_button.connect('clicked', self._on_join_button_clicked) self.window.action_buttonbox.add(self.join_button) self.join_button.show_all() @@ -1693,9 +1703,10 @@ class MucBrowser(AgentBrowser): self.join_button.destroy() self.join_button = None - def on_bookmark_button_clicked(self, *args): + def _on_bookmark_button_clicked(self, *args): con = app.connections[self.account] - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return @@ -1703,7 +1714,7 @@ class MucBrowser(AgentBrowser): if con.get_module('Bookmarks').is_bookmark(room_jid): ErrorDialog( _('Bookmark already set'), - _('Group Chat "%s" is already in your bookmarks.') % room_jid, + _('Group Chat \'%s\' is already in your bookmarks.') % room_jid, transient_for=self.window.window) return @@ -1715,15 +1726,17 @@ class MucBrowser(AgentBrowser): InformationDialog( _('Bookmark has been added successfully'), - _('You can manage your bookmarks via Actions menu in your roster.'), + _('You can manage your bookmarks by clicking the Bookmarks menu ' + 'item in your contact list.'), transient_for=self.window.window) - def on_join_button_clicked(self, *args): + def _on_join_button_clicked(self, *args): """ When we want to join a conference: ask specific informations about the selected agent and close the window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0] @@ -1736,14 +1749,15 @@ class MucBrowser(AgentBrowser): self.window.destroy() def update_actions(self): - sens = self.window.services_treeview.get_selection().count_selected_rows() + sens = \ + self.window.services_treeview.get_selection().count_selected_rows() if self.bookmark_button: self.bookmark_button.set_sensitive(sens > 0) if self.join_button: self.join_button.set_sensitive(sens > 0) def default_action(self): - self.on_join_button_clicked() + self._on_join_button_clicked() def _start_info_query(self): """ @@ -1791,8 +1805,9 @@ class MucBrowser(AgentBrowser): def _channel_altinfo(self, jid, node, items, name=None): """ - Callback for the alternate disco#items query. We try to at least get the - amount of users in the room if the service does not support MUC dataforms + Callback for the alternate disco#items query. We try to at least get + the amount of users in the room if the service does not support MUC + dataforms """ if items == 0: # The server returned an error @@ -1812,8 +1827,8 @@ class MucBrowser(AgentBrowser): if iter_: if name: self.model[iter_][2] = name - self.model[iter_][3] = len(items) # The number of users - self.model[iter_][4] = str(len(items)) # The number of users + self.model[iter_][3] = len(items) # The number of users + self.model[iter_][4] = str(len(items)) # The number of users self.model[iter_][6] = True self._fetch_source = None self._query_visible() @@ -1852,19 +1867,21 @@ class MucBrowser(AgentBrowser): self._query_visible() def _update_error(self, iter_, jid, node): - # switch to alternate query mode + # Switch to alternate query mode self.cache.get_items(jid, node, self._channel_altinfo) + def PubSubBrowser(account, jid, node): """ Return an AgentBrowser subclass that will display service discovery for particular pubsub service. Different pubsub services may need to present different data during browsing """ - # for now, only discussion groups are supported... + # For now, only discussion groups are supported... # TODO: check if it has appropriate features to be such kind of service return DiscussionGroupsBrowser(account, jid, node) + class DiscussionGroupsBrowser(AgentBrowser): """ For browsing pubsub-based discussion groups service @@ -1873,11 +1890,11 @@ class DiscussionGroupsBrowser(AgentBrowser): def __init__(self, account, jid, node): AgentBrowser.__init__(self, account, jid, node) - # this will become set object when we get subscriptions; None means + # This will become set object when we get subscriptions; None means # we don't know yet which groups are subscribed self.subscriptions = None - # this will become our action widgets when we create them; None means + # This will become our action widgets when we create them; None means # we don't have them yet (needed for check in callback) self.subscribe_button = None self.unsubscribe_button = None @@ -1890,9 +1907,10 @@ class DiscussionGroupsBrowser(AgentBrowser): """ Create treemodel for the window """ - # JID, node, name (with description) - pango markup, don't have info?, subscribed? + # JID, node, name (with description) - pango markup, + # don't have info?, subscribed? self.model = Gtk.TreeStore(str, str, str, bool, bool) - # sort by name + # Sort by name self.model.set_sort_column_id(2, Gtk.SortType.ASCENDING) self.window.services_treeview.set_model(self.model) @@ -1977,6 +1995,7 @@ class DiscussionGroupsBrowser(AgentBrowser): def _get_iter(self, node): ''' Look for an iter with the given node ''' self.found_iter = None + def is_node(model, path, iter_, node): if model[iter_][1] == node: self.found_iter = iter_ @@ -1985,21 +2004,28 @@ class DiscussionGroupsBrowser(AgentBrowser): return self.found_iter def _add_actions(self): - self.post_button = Gtk.Button(label=_('New post'), use_underline=True) + self.post_button = Gtk.Button(label=_('_New post'), use_underline=True) self.post_button.set_sensitive(False) - self.post_button.connect('clicked', self.on_post_button_clicked) + self.post_button.connect('clicked', self._on_post_button_clicked) + image = Gtk.Image.new_from_icon_name( + 'mail-message-new-symbolic', Gtk.IconSize.BUTTON) + self.post_button.set_image(image) self.window.action_buttonbox.add(self.post_button) self.post_button.show_all() - self.subscribe_button = Gtk.Button(label=_('_Subscribe'), use_underline=True) + self.subscribe_button = Gtk.Button(label=_('_Subscribe'), + use_underline=True) self.subscribe_button.set_sensitive(False) - self.subscribe_button.connect('clicked', self.on_subscribe_button_clicked) + self.subscribe_button.connect( + 'clicked', self._on_subscribe_button_clicked) self.window.action_buttonbox.add(self.subscribe_button) self.subscribe_button.show_all() - self.unsubscribe_button = Gtk.Button(label=_('_Unsubscribe'), use_underline=True) + self.unsubscribe_button = Gtk.Button(label=_('_Unsubscribe'), + use_underline=True) self.unsubscribe_button.set_sensitive(False) - self.unsubscribe_button.connect('clicked', self.on_unsubscribe_button_clicked) + self.unsubscribe_button.connect( + 'clicked', self._on_unsubscribe_button_clicked) self.window.action_buttonbox.add(self.unsubscribe_button) self.unsubscribe_button.show_all() @@ -2021,27 +2047,30 @@ class DiscussionGroupsBrowser(AgentBrowser): Called when user selected a row. Make subscribe/unsubscribe buttons sensitive appropriately """ - # we have nothing to do if we don't have buttons... + # We have nothing to do if we don't have buttons... if self.subscribe_button is None: return - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_ or self.subscriptions is None: - # no item selected or no subscriptions info, all buttons are insensitive + # No item selected or no subscriptions info, all buttons are + # insensitive self.post_button.set_sensitive(False) self.subscribe_button.set_sensitive(False) self.unsubscribe_button.set_sensitive(False) else: - subscribed = model.get_value(iter_, 4) # 4 = subscribed? + subscribed = model.get_value(iter_, 4) # 4 = subscribed? self.post_button.set_sensitive(subscribed) self.subscribe_button.set_sensitive(not subscribed) self.unsubscribe_button.set_sensitive(subscribed) - def on_post_button_clicked(self, widget): + def _on_post_button_clicked(self, widget): """ Called when 'post' button is pressed. Open window to create post """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if iter_ is None: return @@ -2049,11 +2078,12 @@ class DiscussionGroupsBrowser(AgentBrowser): GroupsPostWindow(self.account, self.jid, groupnode) - def on_subscribe_button_clicked(self, widget): + def _on_subscribe_button_clicked(self, widget): """ Called when 'subscribe' button is pressed. Send subscribtion request """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if iter_ is None: return @@ -2063,15 +2093,16 @@ class DiscussionGroupsBrowser(AgentBrowser): con.get_module('PubSub').send_pb_subscribe( self.jid, node, self._on_pep_subscribe, groupnode=node) - def on_unsubscribe_button_clicked(self, widget): + def _on_unsubscribe_button_clicked(self, widget): """ Called when 'unsubscribe' button is pressed. Send unsubscription request """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if iter_ is None: return - node = model.get_value(iter_, 1) # 1 = groupnode + node = model.get_value(iter_, 1) # 1 = groupnode con = app.connections[self.account] con.get_module('PubSub').send_pb_unsubscribe( @@ -2093,7 +2124,7 @@ class DiscussionGroupsBrowser(AgentBrowser): self.subscriptions = groups_ - # try to setup existing items in model + # Try to setup existing items in model model = self.window.services_treeview.get_model() for row in model: # 1 = group node @@ -2114,7 +2145,7 @@ class DiscussionGroupsBrowser(AgentBrowser): model = self.window.services_treeview.get_model() for row in model: - if row[1] == groupnode: # 1 = groupnode + if row[1] == groupnode: # 1 = groupnode row[4] = True break @@ -2128,12 +2159,13 @@ class DiscussionGroupsBrowser(AgentBrowser): model = self.window.services_treeview.get_model() for row in model: - if row[1] == groupnode: # 1 = groupnode + if row[1] == groupnode: # 1 = groupnode row[4] = False break self.update_actions() + # Fill the global agent type info dictionary _agent_type_info = _gen_agent_type_info() @@ -2141,8 +2173,8 @@ _agent_type_info = _gen_agent_type_info() class GroupsPostWindow: def __init__(self, account, servicejid, groupid): """ - Open new 'create post' window to create message for groupid on servicejid - service + Open new 'create post' window to create message for groupid on + servicejid service """ assert isinstance(servicejid, str) assert isinstance(groupid, str) @@ -2151,38 +2183,38 @@ class GroupsPostWindow: self.servicejid = servicejid self.groupid = groupid - self.xml = get_builder('groups_post_window.ui') - self.window = self.xml.get_object('groups_post_window') - for name in ('from_entry', 'subject_entry', 'contents_textview'): - self.__dict__[name] = self.xml.get_object(name) + self._ui = get_builder('groups_post_window.ui') + self.window = self._ui.groups_post_window - self.xml.connect_signals(self) + self._ui.connect_signals(self) self.window.show_all() - def on_cancel_button_clicked(self, w): - """ - Close window - """ - self.window.destroy() + def _on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() - def on_send_button_clicked(self, w): + def _on_send_button_clicked(self, w): """ Gather info from widgets and send it as a message """ - # constructing item to publish... that's atom:entry element - item = nbxmpp.Node('entry', {'xmlns':'http://www.w3.org/2005/Atom'}) + # Constructing item to publish... that's atom:entry element + item = nbxmpp.Node('entry', {'xmlns': 'http://www.w3.org/2005/Atom'}) author = item.addChild('author') - author.addChild('name', {}, [self.from_entry.get_text()]) + author.addChild('name', {}, [self._ui.from_entry.get_text()]) item.addChild('generator', {}, ['Gajim']) - item.addChild('title', {}, [self.subject_entry.get_text()]) + item.addChild('title', {}, [self._ui.subject_entry.get_text()]) - buf = self.contents_textview.get_buffer() - item.addChild('content', {}, [buf.get_text(buf.get_start_iter(), buf.get_end_iter(), True)]) + buf = self._ui.contents_textview.get_buffer() + item.addChild('content', + {}, + [buf.get_text(buf.get_start_iter(), + buf.get_end_iter(), + True)]) - # publish it to node + # Publish it to node con = app.connections[self.account] con.get_module('PubSub').send_pb_publish( self.servicejid, self.groupid, item, str(uuid.uuid4())) - # close the window + # Close the window self.window.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/200428c0cf3e3702d377fdb713e53d5bb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/200428c0cf3e3702d377fdb713e53d5bb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make use of NewConfirmationDialog
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0411d8fe by Daniel Brötzmann at 2019-06-20T09:37:57Z Make use of NewConfirmationDialog This replaces ConfirmationDialog by NewConfirmationDialog and ConfirmationDialogCheck by NewConfirmationCheckDialog in most places. - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/themes.py - gajim/gtkgui_helpers.py - gajim/history_manager.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -56,8 +56,8 @@ from gajim import gui_menu_builder from gajim import message_control from gajim import dialogs -from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_cursor @@ -1155,15 +1155,15 @@ class ChatControl(ChatControlBase): time_ = app.last_message_time[self.account][self.get_full_jid()] if time.time() - time_ < 2: # 2 seconds - NewConfirmationDialog( _('Close'), - _('You just received a new message from %s') % self.contact.jid, - _('If you close this tab and you have history disabled, ' + _('You just received a new message ' + 'from %s') % self.contact.jid, + _('If you close this tab while having chat history disabled, ' 'this message will be lost.'), [DialogButton.make('Cancel', callback=lambda: on_no(self)), - DialogButton.make('OK', + DialogButton.make('Remove', text=_('Close'), callback=lambda: on_yes(self))], transient_for=self.parent_win.window).show() ===================================== gajim/chat_control_base.py ===================================== @@ -52,8 +52,9 @@ from gajim.message_control import MessageControl from gajim.conversation_textview import ConversationTextview from gajim.message_textview import MessageTextView -from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk import util from gajim.gtk.util import convert_rgb_to_hex from gajim.gtk.util import at_the_end @@ -606,23 +607,27 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): image = clipboard.wait_for_image() if image is not None: if not app.config.get('confirm_paste_image'): - self._paste_event_confirmed(image) + self._paste_event_confirmed(True, image) return - NewConfirmationDialog( - _('Warning'), + NewConfirmationCheckDialog( + _('Paste Image'), _('You are trying to paste an image'), _('Are you sure you want to paste your ' - 'clipboard image in the chat?'), + 'clipboard\'s image into the chat window?'), + _('_Do not ask me again'), [DialogButton.make('Cancel'), DialogButton.make('OK', - callback=lambda: self._paste_event_confirmed(image))], - ).show() + text=_('_Paste'), + callback=self._paste_event_confirmed, + args=[image])]).show() - def _paste_event_confirmed(self, image): + def _paste_event_confirmed(self, is_checked, image): + if is_checked: + app.config.set('confirm_paste_image', False) tmp_dir = TemporaryDirectory() dir_ = tmp_dir.name - # get file transfer preference + # Get file transfer preference ft_pref = app.config.get_per('accounts', self.account, 'filetransfer_preference') path = os.path.join(dir_, '0.png') ===================================== gajim/dialogs.py ===================================== @@ -47,8 +47,9 @@ from gajim.common import app from gajim.common import helpers from gajim.common.exceptions import GajimGeneralException +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_icon_name @@ -675,7 +676,7 @@ class ChangeStatusMessageDialog(TimeoutDialog): if not msg_name: # msg_name was '' msg_name = msg_text_1l - def on_ok2(): + def _on_ok2(): self.preset_messages_dict[msg_name] = [ msg_text, self.pep_dict.get('activity'), self.pep_dict.get('subactivity'), @@ -694,12 +695,19 @@ class ChangeStatusMessageDialog(TimeoutDialog): app.config.set_per('statusmsg', msg_name, 'mood_text', self.pep_dict.get('mood_text')) if msg_name in self.preset_messages_dict: - ConfirmationDialog(_('Overwrite Status Message?'), - _('This name is already used. Do you want to overwrite this ' - 'status message?'), on_response_ok=on_ok2, transient_for=self.dialog) + NewConfirmationDialog( + _('Overwrite'), + _('Overwrite Status Message?'), + _('Preset name is already in use. ' + 'Do you want to overwrite this preset?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Overwrite'), + callback=_on_ok2)], + transient_for=self.dialog).show() return app.config.add_per('statusmsg', msg_name) - on_ok2() + _on_ok2() iter_ = self.message_liststore.append((msg_name,)) # select in combobox the one we just saved self.message_combobox.set_active_iter(iter_) ===================================== gajim/groupchat_control.py ===================================== @@ -67,9 +67,10 @@ from gajim.chat_control_base import ChatControlBase from gajim.command_system.implementation.hosts import GroupChatCommands from gajim.common.connection_handlers_events import GcMessageOutgoingEvent +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputTextDialog -from gajim.gtk.dialogs import ConfirmationDialogCheck from gajim.gtk.dialogs import DestroyMucDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import ChangeNickDialog @@ -2352,27 +2353,30 @@ class GroupchatControl(ChatControlBase): and self.is_connected and self.room_jid \ not in excludes: - def on_ok(clicked): - if clicked: - # user does not want to be asked again + def on_ok(is_checked): + if is_checked: + # User does not want to be asked again app.config.set('confirm_close_muc', False) on_yes(self) - def on_cancel(clicked): - if clicked: - # user does not want to be asked again + def on_cancel(is_checked): + if is_checked: + # User does not want to be asked again app.config.set('confirm_close_muc', False) on_no(self) - pritext = _('Are you sure you want to leave group chat "%s"?')\ - % self.name - sectext = _('If you close this window, you will be disconnected ' - 'from this group chat.') - - ConfirmationDialogCheck(pritext, sectext, - _('_Do not ask me again'), on_response_ok=on_ok, - on_response_cancel=on_cancel, - transient_for=self.parent_win.window) + NewConfirmationCheckDialog( + _('Leave Group Chat'), + _('Are you sure you want to leave this group chat?'), + _('If you close this window, you will be disconnected ' + 'from \'%s\'.') % self.name, + _('_Do not ask me again'), + [DialogButton.make('Cancel', + callback=on_cancel), + DialogButton.make('OK', + text=_('_Leave'), + callback=on_ok)], + transient_for=self.parent_win.window).show() return on_yes(self) ===================================== gajim/gtk/accounts.py ===================================== @@ -32,19 +32,18 @@ from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from gajim import gui_menu_builder -from gajim.gtk.settings import SettingsDialog -from gajim.gtk.settings import SettingsBox -from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import YesNoDialog -from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog -from gajim.gtk.util import get_builder from gajim.gtk.const import Setting from gajim.gtk.const import SettingKind from gajim.gtk.const import SettingType +from gajim.gtk.settings import SettingsDialog +from gajim.gtk.settings import SettingsBox +from gajim.gtk.util import get_builder log = logging.getLogger('gajim.gtk.accounts') @@ -180,7 +179,7 @@ class AccountsWindow(Gtk.ApplicationWindow): # Detect if we have opened windows for this account - def remove(account): + def remove(): if (account in app.interface.instances and 'remove_account' in app.interface.instances[account]): dialog = app.interface.instances[account]['remove_account'] @@ -191,14 +190,17 @@ class AccountsWindow(Gtk.ApplicationWindow): app.interface.instances[account]['remove_account'] = \ RemoveAccountWindow(account) if win_opened: - ConfirmationDialog( - _('You have opened chat in account %s') % account, - _('All chat and groupchat windows will be closed. ' + NewConfirmationDialog( + _('Remove Account'), + _('You still have open chats in your account %s') % account, + _('All chat and group chat windows will be closed.\n' 'Do you want to continue?'), - on_response_ok=(remove, account), - transient_for=self) + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=remove)], + transient_for=self).show() else: - remove(account) + remove() def remove_account(self, account): del self._need_relogin[account] @@ -649,7 +651,7 @@ class AccountRow(Gtk.ListBoxRow): [DialogButton.make('Cancel', callback=lambda: switch.set_active(True)), DialogButton.make('Remove', - text=_('Disable Account'), + text=_('_Disable Account'), callback=_disable)], transient_for=self.get_toplevel()).show() return Gdk.EVENT_STOP @@ -1047,11 +1049,15 @@ class RemoveAccountWindow: if self.account in app.connections and \ app.connections[self.account].connected: - ConfirmationDialog( - _('Account "%s" is connected to the server') % self.account, + NewConfirmationDialog( + _('Remove Account'), + _('Account \'%s\' is still connected to the ' + 'server') % self.account, _('If you remove it, the connection will be lost.'), - on_response_ok=remove, - transient_for=self._ui.remove_account_window) + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=remove)], + transient_for=self._ui.remove_account_window).show() else: remove() ===================================== gajim/gtk/themes.py ===================================== @@ -320,7 +320,8 @@ class Themes(Gtk.ApplicationWindow): _('Delete Theme'), _('Do you want to permanently delete this theme?'), [DialogButton.make('Cancel'), - DialogButton.make('Delete', callback=_remove_theme)], + DialogButton.make('Delete', + callback=_remove_theme)], transient_for=self).show() @staticmethod ===================================== gajim/gtkgui_helpers.py ===================================== @@ -147,11 +147,14 @@ def scale_pixbuf_from_data(data, size): pixbuf = get_pixbuf_from_data(data) return scale_pixbuf(pixbuf, size) + def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): + from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import ErrorDialog - from gajim.gtk.dialogs import ConfirmationDialog + from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import FTOverwriteConfirmationDialog from gajim.gtk.filechoosers import AvatarSaveDialog + def on_continue(response, file_path): if response < 0: return @@ -169,7 +172,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): image_format = 'png' file_path += '.png' else: - image_format = extension[1:] # remove leading dot + image_format = extension[1:] # remove leading dot # Save image try: @@ -179,13 +182,23 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): if os.path.exists(file_path): os.remove(file_path) new_file_path = '.'.join(file_path.split('.')[:-1]) + '.png' - def on_ok(file_path, pixbuf): + + def _on_ok(file_path, pixbuf): pixbuf.savev(file_path, 'png', [], []) - ConfirmationDialog(_('Extension not supported'), - _('Image cannot be saved in %(type)s format. Save as ' - '%(new_filename)s?') % {'type': image_format, - 'new_filename': new_file_path}, - on_response_ok=(on_ok, new_file_path, pixbuf)) + + NewConfirmationDialog( + _('Error While Saving'), + _('Extension not supported'), + _('Image cannot be saved in %(type)s format.\n' + 'Save as %(new_filename)s?') % { + 'type': image_format, + 'new_filename': new_file_path}, + [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('_Save'), + callback=_on_ok, + args=[new_file_path, + pixbuf])]).show() def on_ok(file_path): if os.path.exists(file_path): ===================================== gajim/history_manager.py ===================================== @@ -568,11 +568,12 @@ class HistoryManager: _('Delete'), ngettext('Delete Conversation', 'Delete Conversations', paths_len), ngettext('Do you want to permanently delete this ' - 'conversation with <b>%s</b>', - 'Do you want to permanently delete these Conversations', + 'conversation with <b>%s</b>?', + 'Do you want to permanently delete these conversations?', paths_len, liststore[list_of_paths[0]][0]), [DialogButton.make('Cancel'), - DialogButton.make('Delete', callback=on_ok)], + DialogButton.make('Delete', + callback=on_ok)], transient_for=self._ui.history_manager_window).show() def _delete_logs(self, liststore, list_of_paths): @@ -609,7 +610,8 @@ class HistoryManager: 'Do you want to permanently delete these messages', paths_len), [DialogButton.make('Cancel'), - DialogButton.make('Delete', callback=on_ok)], + DialogButton.make('Delete', + callback=on_ok)], transient_for=self._ui.history_manager_window).show() def on_search_db_button_clicked(self, widget): ===================================== gajim/roster_window.py ===================================== @@ -64,15 +64,14 @@ from gajim.common.dbus import location from gajim.common import ged from gajim.message_window import MessageWindowMgr -from gajim.gtk.dialogs import ConfirmationDialog -from gajim.gtk.dialogs import ConfirmationDialogCheck +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog -from gajim.gtk.dialogs import NewConfirmationCheckDialog -from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.single_message import SingleMessageWindow @@ -2249,7 +2248,7 @@ class RosterWindow: dlg.dialog.present() # show it on current workspace def change_status(self, widget, account, status): - def change(account, status): + def _change(account, status): def on_response(message, pep_dict): if message is None: # user pressed Cancel to change status message dialog @@ -2259,13 +2258,20 @@ class RosterWindow: self.get_status_message(status, on_response) if status == 'invisible' and self.connected_rooms(account): - ConfirmationDialog( + NewConfirmationDialog( + _('Disconnect for Invisibility'), _('You are participating in one or more group chats'), _('Changing your status to invisible will result in ' - 'disconnection from those group chats. Are you sure you want ' - 'to go invisible?'), on_response_ok=(change, account, status)) + 'disconnection from those group chats.\n' + 'Are you sure you want to go invisible?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Disconnect'), + callback=_change, + args=[account, + status])]).show() else: - change(account, status) + _change(account, status) def update_status_combobox(self): # table to change index in connection.connected to index in combobox @@ -2351,14 +2357,20 @@ class RosterWindow: elif app.config.get('quit_on_roster_x_button'): self.on_quit_request() else: - def on_ok(checked): - if checked: + def _on_ok(is_checked): + if is_checked: app.config.set('quit_on_roster_x_button', True) self.on_quit_request() - ConfirmationDialogCheck(_('Really quit Gajim?'), - _('Are you sure you want to quit Gajim?'), - _('Always close Gajim'), on_response_ok=on_ok) - return True # do NOT destroy the window + NewConfirmationCheckDialog( + _('Quit Gajim'), + _('You are about to quit Gajim'), + _('Are you sure you want to quit Gajim?'), + _('_Always quit when closing Gajim'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=_on_ok)]).show() + return True # Do NOT destroy the window def prepare_quit(self): if self.save_done: @@ -2444,10 +2456,18 @@ class RosterWindow: break if transfer_active: - ConfirmationDialog(_('You have running file transfers'), - _('If you quit now, the file(s) being transferred will ' - 'be stopped. Do you still want to quit?'), - on_response_ok=(on_continue3, message, pep_dict)) + NewConfirmationDialog( + _('Stop File Transfers'), + _('You still have running file transfers'), + _('If you quit now, the file(s) being transferred will ' + 'be lost.\n' + 'Do you still want to quit?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=on_continue3, + args=[message, + pep_dict])]).show() return on_continue3(message, pep_dict) @@ -2476,11 +2496,18 @@ class RosterWindow: break if unread or recent: - ConfirmationDialog(_('You have unread messages'), + NewConfirmationDialog( + _('Unread Messages'), + _('You still have unread messages'), _('Messages will only be available for reading them later ' - 'if you have history enabled and contact is in your ' - 'roster.'), on_response_ok=(on_continue2, - message, pep_dict)) + 'if storing chat history is enabled and if the contact ' + 'is in your contact list.'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=on_continue2, + args=[message, + pep_dict])]).show() return on_continue2(message, pep_dict) @@ -2726,7 +2753,7 @@ class RosterWindow: self.remove_contact(contact.jid, account, backend=True) return - def remove(list_): + def remove(): for (contact, account) in list_: full_jid = contact.get_full_jid() app.connections[account].get_module('Gateway').unsubscribe(full_jid) @@ -2741,13 +2768,14 @@ class RosterWindow: has_unread_events = True break if has_unread_events: - ErrorDialog(_('You have unread messages'), - _('You must read them before removing this transport.')) + ErrorDialog( + _('You have unread messages'), + _('You must read them before removing this transport.')) return if len(list_) == 1: - pritext = _('Transport "%s" will be removed') % list_[0][0].jid + pritext = _('Transport \'%s\' will be removed') % list_[0][0].jid sectext = _('You will no longer be able to send and receive ' - 'messages from contacts using this transport.') + 'messages from and to contacts using this transport.') else: pritext = _('Transports will be removed') jids = '' @@ -2755,9 +2783,16 @@ class RosterWindow: jids += '\n ' + contact.get_shown_name() + ',' jids = jids[:-1] + '.' sectext = _('You will no longer be able to send and receive ' - 'messages to contacts from these transports: %s') % jids - ConfirmationDialog(pritext, sectext, - on_response_ok=(remove, list_), transient_for=self.window) + 'messages from and to contacts using these ' + 'transports:\n%s') % jids + NewConfirmationDialog( + _('Remove Transport'), + pritext, + sectext, + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=remove)], + transient_for=self.window).show() def _nec_blocking(self, obj): for jid in obj.changed: @@ -2817,17 +2852,17 @@ class RosterWindow: if confirm_block == 'no': _block_it() return - NewConfirmationCheckDialog(_('Block Contact'), - _('Really block this contact?'), - _('This contact will see you offline and ' - 'you will not receive messages sent to ' - 'you by this contact.'), - _('_Do not ask me again'), - [DialogButton.make('Cancel'), - DialogButton.make('Remove', - text=_('Block Contact'), - callback=_block_it)], - modal=False).show() + NewConfirmationCheckDialog( + _('Block Contact'), + _('Really block this contact?'), + _('This contact will see you offline and you will not receive ' + 'any messages sent to you by this contact.'), + _('_Do not ask me again'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Block Contact'), + callback=_block_it)], + modal=False).show() def on_unblock(self, widget, list_, group=None): """ @@ -2915,20 +2950,25 @@ class RosterWindow: old_text), on_canceled, transient_for=self.window) def on_remove_group_item_activated(self, widget, group, account): - def on_ok(checked): + def _on_ok(is_checked): for contact in app.contacts.get_contacts_from_group(account, group): - if not checked: + if not is_checked: self.remove_contact_from_groups(contact.jid, account, [group]) else: - app.connections[account].get_module('Presence').unsubscribe(contact.jid) + app.connections[account].get_module( + 'Presence').unsubscribe(contact.jid) self.remove_contact(contact.jid, account, backend=True) - ConfirmationDialogCheck(_('Remove Group'), - _('Do you want to remove group %s from the roster?') % group, - _('Also remove all contacts in this group from your roster'), - on_response_ok=on_ok) + NewConfirmationCheckDialog( + _('Remove Group'), + _('Remove Group'), + _('Do you want to remove %s from the contact list?') % group, + _('_Also remove all contacts of this group from contact list'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=_on_ok)]).show() def on_edit_groups(self, widget, list_): dialogs.EditGroupsDialog(list_) @@ -3322,42 +3362,62 @@ class RosterWindow: if len(list_) == 1: contact = list_[0][0] - pritext = _('Contact "%s" will be removed from your roster') % \ - contact.get_shown_name() - sectext = _('You are about to remove "%(name)s" (%(jid)s) from ' - 'your roster.\n') % {'name': contact.get_shown_name(), - 'jid': contact.jid} + title = _('Remove Contact') + pritext = _('Remove contact from contact list') + sectext = _('You are about to remove \'%(name)s\' (%(jid)s) from ' + 'your contact list.\n') % { + 'name': contact.get_shown_name(), + 'jid': contact.jid} if contact.sub == 'to': - ConfirmationDialog(pritext, sectext + \ - _('By removing this contact you also remove authorization ' - 'resulting in them always seeing you as offline.'), - on_response_ok=on_ok2) + NewConfirmationDialog( + title, + pritext, + sectext + \ + _('By removing this contact you also remove authorization. ' + 'This means the contact will see you as offline.'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=on_ok2)]).show() elif _('Not in Roster') in contact.get_shown_groups(): # Contact is not in roster - ConfirmationDialog(pritext, sectext + \ - _('Do you want to continue?'), on_response_ok=on_ok2) + NewConfirmationDialog( + title, + pritext, + sectext + \ + _('Do you want to continue?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=on_ok2)]).show() else: NewConfirmationCheckDialog( - _('Remove'), - pritext, sectext + \ - _('By removing this contact you also by default remove ' - 'authorization resulting in them always seeing you as' - ' offline.'), + title, + pritext, + sectext + \ + _('By removing this contact you also remove authorization. ' + 'This means the contact will see you as offline.'), _('_I want this contact to know my status after removal'), [DialogButton.make('Cancel'), - DialogButton.make('Remove', callback=on_ok)], - modal=False).show() + DialogButton.make('Remove', + callback=on_ok)], + modal=False).show() else: # several contact to remove at the same time - pritext = _('Contacts will be removed from your roster') + pritext = _('Remove contacts from contact list') jids = '' for contact, _account in list_: - jids += '\n ' + contact.get_shown_name() + ' (%s)' % \ - contact.jid + ',' - sectext = _('By removing these contacts:%s\nyou also remove ' - 'authorization resulting in them always seeing you as ' - 'offline.') % jids - ConfirmationDialog(pritext, sectext, on_response_ok=on_ok2) + jids += '%(name)s (%(jid)s)\n' % { + 'name': contact.get_shown_name(), + 'jid': contact.jid} + sectext = _('By removing the following contacts, you will also ' + 'remove authorization. This means they will see you ' + 'as offline:\n\n%s') % jids + NewConfirmationDialog( + _('Remove Contacts'), + pritext, + sectext, + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=on_ok2)]).show() def on_status_combobox_changed(self, widget): """ @@ -3452,12 +3512,17 @@ class RosterWindow: def on_cancel(): self.update_status_combobox() - ConfirmationDialog( + NewConfirmationDialog( + _('Disconnect for Invisibility'), _('You are participating in one or more group chats'), _('Changing your status to invisible will result in ' - 'disconnection from those group chats. Are you sure you ' - 'want to go invisible?'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + 'disconnection from those group chats.\n' + 'Are you sure you want to go invisible?'), + [DialogButton.make('Cancel', + callback=on_cancel), + DialogButton.make('Remove', + text=_('_Disconnect'), + callback=on_ok)]).show() return self.get_status_message(status, on_continue) @@ -4103,15 +4168,19 @@ class RosterWindow: if confirm_metacontacts == 'no' or dest_family == source_family: merge_contacts() return - pritext = _('You are about to create a metacontact. Are you sure you ' - 'want to continue?') - sectext = _('Metacontacts are a way to regroup several contacts in one ' - 'line. Generally it is used when the same person has several ' - 'XMPP- or transport -accounts.') - dlg = ConfirmationDialogCheck(pritext, sectext, - _('_Do not ask me again'), on_response_ok=merge_contacts) - if not confirm_metacontacts: # First time we see this window - dlg.checkbutton.set_active(True) + pritext = _('You are about to create a metacontact') + sectext = _('Metacontacts are a way to regroup several contacts in ' + 'one single contact. Generally it is used when the same ' + 'person has several XMPP- or Transport-Accounts.') + NewConfirmationCheckDialog( + _('Create Metacontact'), + pritext, + sectext, + _('_Do not ask me again'), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('_Create'), + callback=merge_contacts)]).show() def on_drop_in_group(self, widget, account, c_source, grp_dest, is_big_brother, context, etime, grp_source=None): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0411d8fe34cf17b234eb1eebd07cc0a014… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0411d8fe34cf17b234eb1eebd07cc0a014… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ManagePEPServices: Rework window
by Philipp Hörist 19 Jun '19

19 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 407f65fd by Daniel Brötzmann at 2019-06-19T21:57:05Z ManagePEPServices: Rework window - - - - - 3 changed files: - gajim/data/gui/manage_pep_services_window.ui - gajim/gtk/pep_config.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/manage_pep_services_window.ui ===================================== @@ -1,111 +1,91 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkImage" id="image1"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkBox" id="manage_pep_services"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-preferences</property> - </object> - <object class="GtkWindow" id="manage_pep_services_window"> - <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="title" translatable="yes">PEP Service Configuration</property> - <property name="default_width">350</property> - <property name="default_height">150</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_manage_pep_services_window_destroy" swapped="no"/> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkScrolledWindow"> + <property name="width_request">350</property> + <property name="height_request">250</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="services_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</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> + <property name="halign">end</property> + <property name="spacing">12</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkButton" id="configure_button"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Configure</property> + <property name="halign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_configure_button_clicked" swapped="no"/> <child> - <object class="GtkTreeView" id="services_treeview"> + <object class="GtkImage" id="image1"> <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> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> + <property name="can_focus">False</property> + <property name="icon_name">preferences-system-symbolic</property> </object> </child> </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="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkButton" id="delete_button"> + <property name="label">_Delete</property> <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="delete_button"> - <property name="label">gtk-delete</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_delete_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="configure_button"> - <property name="label" translatable="yes">_Configure</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="image">image1</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_configure_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <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">3</property> - </packing> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_delete_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">6</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> </object> </interface> ===================================== gajim/gtk/pep_config.py ===================================== @@ -12,6 +12,7 @@ # 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 Gdk from gi.repository import Gtk from gajim.common import app @@ -24,46 +25,57 @@ from gajim.gtk.dataform import DataFormDialog from gajim.gtk.util import get_builder -class ManagePEPServicesWindow: +class ManagePEPServicesWindow(Gtk.ApplicationWindow): def __init__(self, account): - self.xml = get_builder('manage_pep_services_window.ui') - self.window = self.xml.get_object('manage_pep_services_window') - self.window.set_transient_for(app.interface.roster.window) - self.xml.get_object('configure_button').set_sensitive(False) - self.xml.get_object('delete_button').set_sensitive(False) - self.xml.connect_signals(self) + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_name('ManagePEPServicesWindow') + self.set_default_size(300, 350) + self.set_resizable(True) + self.set_transient_for(app.interface.roster.window) + + self._ui = get_builder('manage_pep_services_window.ui') + self.add(self._ui.manage_pep_services) + self.account = account + self.set_title(_('PEP Service Configuration (%s)') % self.account) self._con = app.connections[self.account] - self.init_services() - self.xml.get_object('services_treeview').get_selection().connect( - 'changed', self.on_services_selection_changed) + self._init_services() + self._ui.services_treeview.get_selection().connect( + 'changed', self._on_services_selection_changed) app.ged.register_event_handler( 'pubsub-config-received', ged.GUI1, self._nec_pep_config_received) - self.window.show_all() + self.show_all() + self.connect('key-press-event', self._on_key_press_event) + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + + def _on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() - def on_manage_pep_services_window_destroy(self, widget): - del app.interface.instances[self.account]['pep_services'] + def _on_destroy(self, *args): app.ged.remove_event_handler( 'pubsub-config-received', ged.GUI1, self._nec_pep_config_received) - def on_close_button_clicked(self, widget): - self.window.destroy() - - def on_services_selection_changed(self, sel): - self.xml.get_object('configure_button').set_sensitive(True) - self.xml.get_object('delete_button').set_sensitive(True) + def _on_services_selection_changed(self, sel): + self._ui.configure_button.set_sensitive(True) + self._ui.delete_button.set_sensitive(True) - def init_services(self): - self.treeview = self.xml.get_object('services_treeview') + def _init_services(self): # service, access_model, group self.treestore = Gtk.ListStore(str) - self.treeview.set_model(self.treestore) + self.treestore.set_sort_column_id(0, Gtk.SortType.ASCENDING) + self._ui.services_treeview.set_model(self.treestore) - col = Gtk.TreeViewColumn('Service') - self.treeview.append_column(col) + col = Gtk.TreeViewColumn(_('Service')) + col.set_sort_column_id(0) + self._ui.services_treeview.append_column(col) cellrenderer_text = Gtk.CellRendererText() col.pack_start(cellrenderer_text, True) @@ -71,7 +83,9 @@ class ManagePEPServicesWindow: jid = self._con.get_own_jid().getStripped() self._con.get_module('Discovery').disco_items( - jid, success_cb=self._items_received, error_cb=self._items_error) + jid, + success_cb=self._items_received, + error_cb=self._items_error) def _items_received(self, from_, node, items): jid = self._con.get_own_jid().getStripped() @@ -82,10 +96,10 @@ class ManagePEPServicesWindow: def _items_error(self, from_, error): ErrorDialog('Error', error) - def node_removed(self, jid, node): + def _node_removed(self, jid, node): if jid != app.get_jid_from_account(self.account): return - model = self.treeview.get_model() + model = self._ui.services_treeview.get_model() iter_ = model.get_iter_first() while iter_: if model[iter_][0] == node: @@ -93,16 +107,16 @@ class ManagePEPServicesWindow: break iter_ = model.iter_next(iter_) - def node_not_removed(self, jid, node, msg): + def _node_not_removed(self, jid, node, msg): if jid != app.get_jid_from_account(self.account): return WarningDialog( _('PEP node was not removed'), - _('PEP node %(node)s was not removed: %(message)s') % { + _('PEP node %(node)s was not removed:\n%(message)s') % { 'node': node, 'message': msg}) - def on_delete_button_clicked(self, widget): - selection = self.treeview.get_selection() + def _on_delete_button_clicked(self, widget): + selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() @@ -110,11 +124,11 @@ class ManagePEPServicesWindow: our_jid = app.get_jid_from_account(self.account) con = app.connections[self.account] con.get_module('PubSub').send_pb_delete(our_jid, node, - on_ok=self.node_removed, - on_fail=self.node_not_removed) + on_ok=self._node_removed, + on_fail=self._node_not_removed) - def on_configure_button_clicked(self, widget): - selection = self.treeview.get_selection() + def _on_configure_button_clicked(self, widget): + selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() @@ -130,7 +144,7 @@ class ManagePEPServicesWindow: def _nec_pep_config_received(self, obj): DataFormDialog(_('Configure %s') % obj.node, - self.window, + self, obj.form, obj.node, self._on_config_submit) ===================================== gajim/roster_window.py ===================================== @@ -3488,12 +3488,12 @@ class RosterWindow: helpers.update_optional_features(account) - def on_pep_services_menuitem_activate(self, widget, account): - if 'pep_services' in app.interface.instances[account]: - app.interface.instances[account]['pep_services'].window.present() + def _on_pep_services_menuitem_activate(self, widget, account): + window = app.get_app_window(ManagePEPServicesWindow, account) + if window is None: + ManagePEPServicesWindow(account) else: - app.interface.instances[account]['pep_services'] = \ - ManagePEPServicesWindow(account) + window.present() def on_add_new_contact(self, widget, account): AddNewContactWindow(account) @@ -4814,7 +4814,7 @@ class RosterWindow: pep_config.set_sensitive(True) pep_submenu.append(pep_config) pep_config.connect('activate', - self.on_pep_services_menuitem_activate, account) + self._on_pep_services_menuitem_activate, account) else: pep_menuitem.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/407f65fd08c6a9fb720cd75fbe63c72e4f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/407f65fd08c6a9fb720cd75fbe63c72e4f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: RosterWindow: Enable invite on drop to group chat
by Philipp Hörist 19 Jun '19

19 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0029580 by Daniel Brötzmann at 2019-06-19T21:42:41Z RosterWindow: Enable invite on drop to group chat - - - - - a59679f5 by Daniel Brötzmann at 2019-06-19T21:42:41Z Roster build_invite_submenu: Enable MUC invite menu for offline contacts - - - - - 2 changed files: - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -97,7 +97,7 @@ show_bookmarked=False, force_resource=False): if len(contact_list) > 1: # several resources invite_to_new_room_menuitem.set_submenu(build_resources_submenu( contact_list, account, roster.on_invite_to_new_room, cap=NS_MUC)) - elif len(list_) == 1 and contact.supports(NS_MUC): + elif len(list_) == 1: invite_menuitem.set_sensitive(True) # use resource if it's self contact if contact.jid == app.get_jid_from_account(account) or force_resource: ===================================== gajim/roster_window.py ===================================== @@ -4271,8 +4271,12 @@ class RosterWindow: return if type_dest == 'groupchat': - # drop on a minimized groupchat - # TODO: Invite to groupchat if type_dest = contact + # Drop on a minimized groupchat + if type_source != 'contact': + return + contact_jid = data + con = app.connections[account_dest] + con.get_module('MUC').invite(jid_dest, contact_jid) return if type_source == 'group': @@ -4287,6 +4291,9 @@ class RosterWindow: new_grp = grp_source_list[-1] elif type_dest == 'group': grp_dest = model[iter_dest][Column.JID] + # Don't allow to drop on e.g. Groupchats group + if grp_dest in helpers.special_groups: + return grp_dest_list = grp_dest.split(delimiter) # Do not allow to drop on a subgroup of source group if grp_source_list[0] != grp_dest_list[0]: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e47062a6daeaf0cf088d12a7a5785ec9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e47062a6daeaf0cf088d12a7a5785ec9… 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