Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Fix displaying PEP icons
by Philipp Hörist 02 Nov '18

02 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf9e01ee by Philipp Hörist at 2018-11-02T21:51:57Z Fix displaying PEP icons - Rename get_pep_as_pixbuf to get_pep_icon - - - - - 3 changed files: - gajim/chat_control.py - gajim/gtkgui_helpers.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -416,7 +416,11 @@ class ChatControl(ChatControlBase): pep = self.contact.pep img = self._pep_images[pep_type] if pep_type in pep: - img.set_from_pixbuf(gtkgui_helpers.get_pep_as_pixbuf(pep[pep_type])) + icon = gtkgui_helpers.get_pep_icon(pep[pep_type]) + if isinstance(icon, str): + img.set_from_icon_name(icon, Gtk.IconSize.MENU) + else: + img.set_from_pixbuf(icon) img.set_tooltip_markup(pep[pep_type].as_markup_text()) img.show() else: ===================================== gajim/gtkgui_helpers.py ===================================== @@ -383,7 +383,7 @@ def load_activity_icon(category, activity=None): icon_list = _load_icon_list([activity], path) return icon_list[activity] -def get_pep_as_pixbuf(pep_class): +def get_pep_icon(pep_class): if pep_class == PEPEventType.MOOD: received_mood = pep_class.data['mood'] mood = received_mood if received_mood in MOODS else 'unknown' ===================================== gajim/roster_window.py ===================================== @@ -1088,27 +1088,27 @@ class RosterWindow: pep_dict = app.connections[account].pep if app.config.get('show_mood_in_roster') and 'mood' in pep_dict: self.model[child_iter][Column.MOOD_PIXBUF] = \ - gtkgui_helpers.get_pep_as_pixbuf(pep_dict['mood']) + gtkgui_helpers.get_pep_icon(pep_dict['mood']) else: self.model[child_iter][Column.MOOD_PIXBUF] = None if app.config.get('show_activity_in_roster') and 'activity' in \ pep_dict: self.model[child_iter][Column.ACTIVITY_PIXBUF] = \ - gtkgui_helpers.get_pep_as_pixbuf(pep_dict['activity']) + gtkgui_helpers.get_pep_icon(pep_dict['activity']) else: self.model[child_iter][Column.ACTIVITY_PIXBUF] = None if app.config.get('show_tunes_in_roster') and 'tune' in pep_dict: self.model[child_iter][Column.TUNE_ICON] = \ - gtkgui_helpers.get_pep_as_pixbuf(pep_dict['tune']) + gtkgui_helpers.get_pep_icon(pep_dict['tune']) else: self.model[child_iter][Column.TUNE_ICON] = None if app.config.get('show_location_in_roster') and 'geoloc' in \ pep_dict: self.model[child_iter][Column.LOCATION_ICON] = \ - gtkgui_helpers.get_pep_as_pixbuf(pep_dict['geoloc']) + gtkgui_helpers.get_pep_icon(pep_dict['geoloc']) else: self.model[child_iter][Column.LOCATION_ICON] = None @@ -1392,7 +1392,7 @@ class RosterWindow: pixbuf = None if pep_type in contact.pep: - pixbuf = gtkgui_helpers.get_pep_as_pixbuf(contact.pep[pep_type]) + pixbuf = gtkgui_helpers.get_pep_icon(contact.pep[pep_type]) for child_iter in iters: self.model[child_iter][model_column] = pixbuf View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf9e01ee31a231118c9c73d9f3e0d9dd1a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf9e01ee31a231118c9c73d9f3e0d9dd1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Set active window as transient for dialogs
by Philipp Hörist 02 Nov '18

02 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0662374c by Philipp Hörist at 2018-11-02T21:17:08Z Set active window as transient for dialogs - - - - - e615a8e2 by Philipp Hörist at 2018-11-02T21:21:15Z Add possibility to get windows by jid This also makes it possible to get windows by an account/jid combination - - - - - 61a791d6 by Philipp Hörist at 2018-11-02T21:24:28Z Rewrite GroupchatConfig dialog - Complete rewrite of the dialog - Use new DataFormWidget - - - - - 9 changed files: - gajim/common/app.py - gajim/common/const.py - gajim/common/modules/muc.py - + gajim/data/gui/groupchat_config.ui - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/dialogs.py - gajim/gtk/groupchat_config.py - gajim/gui_interface.py Changes: ===================================== gajim/common/app.py ===================================== @@ -630,19 +630,22 @@ def prefers_app_menu(): return False return app.prefers_app_menu() -def get_app_window(cls, account=None): +def get_app_window(cls, account=None, jid=None): for win in app.get_windows(): if isinstance(cls, str): - if type(win).__name__ == cls: - if account is not None: - if account != win.account: - continue - return win - elif isinstance(win, cls): - if account is not None: - if account != win.account: - continue - return win + if type(win).__name__ != cls: + continue + elif not isinstance(win, cls): + continue + + if account is not None: + if account != win.account: + continue + + if jid is not None: + if jid != win.jid: + continue + return win return None def load_css_config(): ===================================== gajim/common/const.py ===================================== @@ -193,6 +193,16 @@ class SyncThreshold(IntEnum): return str(self.value) +class MUCUser(IntEnum): + JID = 0 + NICK = 1 + REASON = 1 + NICK_OR_REASON = 1 + ROLE = 2 + AFFILIATION = 3 + AFFILIATION_TEXT = 4 + + ACTIVITIES = { 'doing_chores': { 'category': _('Doing Chores'), ===================================== gajim/common/modules/muc.py ===================================== @@ -17,6 +17,7 @@ import time import logging +import weakref import nbxmpp @@ -187,28 +188,40 @@ class MUC: item = iq.setQuery() for jid in users_dict: affiliation = users_dict[jid].get('affiliation') - reason = users_dict[jid].get('reason') or None + reason = users_dict[jid].get('reason') + nick = users_dict[jid].get('nick') item_tag = item.addChild('item', {'jid': jid, 'affiliation': affiliation}) if reason is not None: item_tag.setTagData('reason', reason) + + if nick is not None: + item_tag.setAttr('nick', nick) log.info('Set affiliation for %s: %s', room_jid, users_dict) self._con.connection.SendAndCallForResponse( iq, self._default_response, {}) - def get_affiliation(self, room_jid, affiliation): + def get_affiliation(self, room_jid, affiliation, success_cb, error_cb): if not app.account_is_connected(self._account): return iq = nbxmpp.Iq(typ='get', to=room_jid, queryNS=nbxmpp.NS_MUC_ADMIN) item = iq.setQuery().setTag('item') item.setAttr('affiliation', affiliation) log.info('Get affiliation %s for %s', affiliation, room_jid) + + weak_success_cb = weakref.WeakMethod(success_cb) + weak_error_cb = weakref.WeakMethod(error_cb) + self._con.connection.SendAndCallForResponse( - iq, self._affiliation_received) + iq, self._affiliation_received, {'affiliation': affiliation, + 'success_cb': weak_success_cb, + 'error_cb': weak_error_cb}) - def _affiliation_received(self, stanza): + def _affiliation_received(self, _con, stanza, affiliation, + success_cb, error_cb): if not nbxmpp.isResultNode(stanza): - log.info('Error: %s', stanza.getError()) + if error_cb() is not None: + error_cb()(affiliation, stanza.getError()) return room_jid = stanza.getFrom().getStripped() @@ -222,8 +235,8 @@ class MUC: log.warning('Invalid JID: %s, ignoring it', item.getAttr('jid')) continue - affiliation = item.getAttr('affiliation') - users_dict[jid] = {'affiliation': affiliation} + + users_dict[jid] = {} if item.has_attr('nick'): users_dict[jid]['nick'] = item.getAttr('nick') if item.has_attr('role'): @@ -231,9 +244,12 @@ class MUC: reason = item.getTagData('reason') if reason: users_dict[jid]['reason'] = reason - log.info('Affiliations received from %s: %s', room_jid, users_dict) - app.nec.push_incoming_event(MucAdminReceivedEvent( - None, conn=self._con, room_jid=room_jid, users_dict=users_dict)) + + log.info('%s affiliations received from %s: %s', + affiliation, room_jid, users_dict) + + if success_cb() is not None: + success_cb()(self._account, room_jid, affiliation, users_dict) def set_role(self, room_jid, nick, role, reason=''): if not app.account_is_connected(self._account): @@ -423,10 +439,6 @@ class GcDeclineReceived(NetworkIncomingEvent): name = 'gc-decline-received' -class MucAdminReceivedEvent(NetworkIncomingEvent): - name = 'muc-admin-received' - - class MucOwnerReceivedEvent(NetworkIncomingEvent): name = 'muc-owner-received' ===================================== gajim/data/gui/groupchat_config.ui ===================================== @@ -0,0 +1,493 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="affiliation_store"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> +  + <column type="gboolean"/> + </columns> + </object> + <object class="GtkListStore" id="combo_store"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Owner</col> + <col id="1">owner</col> + </row> + <row> + <col id="0" translatable="yes">Admin</col> + <col id="1">admin</col> + </row> + <row> + <col id="0" translatable="yes">Member</col> + <col id="1">member</col> + </row> + </data> + </object> + <object class="GtkPopover" id="info_popover"> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="margin_right">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes"><b>Jabber-ID</b> +&lt;user@domain/resource&gt; (only that resource matches) +&lt;user@domain&gt; (any resource matches) +&lt;domain/resource&gt; (only that resource matches) +&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/resource) +</property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <object class="GtkListStore" id="outcast_store"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> +  + <column type="gboolean"/> + </columns> + </object> + <object class="GtkGrid" id="grid"> + <property name="name">GroupchatConfig</property> + <property name="width_request">700</property> + <property name="height_request">500</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">False</property> + <child> + <object class="GtkBox" id="treeview_buttonbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="margin_left">12</property> + <property name="vexpand">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkMenuButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="popover">info_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">dialog-information-symbolic</property> + </object> + </child> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="add_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Only Admins and Owners can modify the affiliation</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_add" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-add-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="label" translatable="yes">Remove</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Only Admins and Owners can modify the affiliation</property> + <signal name="clicked" handler="_on_remove" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="close_ok_button_box"> + <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"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="_on_cancel" 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> + <child> + <object class="GtkButton"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="_on_ok" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="transition_duration">300</property> + <property name="transition_type">crossfade</property> + <signal name="notify::visible-child-name" handler="_on_switch_page" swapped="no"/> + <child> + <object class="GtkGrid" id="config_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="name">config</property> + <property name="title" translatable="yes">Configuration</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="affiliation_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">affiliation_store</property> + <property name="search_column">0</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"> + <property name="mode">multiple</property> + <signal name="changed" handler="_on_selection_changed" swapped="no"/> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="sizing">autosize</property> + <property name="title">Jabber-ID</property> + <property name="expand">True</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">0</property> + <child> + <object class="GtkCellRendererText"> + <property name="placeholder_text">user(a)example.org</property> + <signal name="edited" handler="_on_jid_edited" swapped="no"/> + </object> + <attributes> + <attribute name="editable">6</attribute> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="reserved_name_column"> + <property name="resizable">True</property> + <property name="sizing">autosize</property> + <property name="title" translatable="yes">Reserved Name</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">1</property> + <child> + <object class="GtkCellRendererText"> + <signal name="edited" handler="_on_nick_edited" swapped="no"/> + </object> + <attributes> + <attribute name="editable">6</attribute> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="role_column"> + <property name="visible">False</property> + <property name="resizable">True</property> + <property name="sizing">autosize</property> + <property name="min_width">100</property> + <property name="title" translatable="yes">Role</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">2</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="sizing">autosize</property> + <property name="min_width">120</property> + <property name="title" translatable="yes">Affiliation</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">3</property> + <child> + <object class="GtkCellRendererCombo"> + <property name="has_entry">False</property> + <property name="model">combo_store</property> + <property name="text_column">0</property> + <signal name="changed" handler="_on_affiliation_changed" swapped="no"/> + </object> + <attributes> + <attribute name="editable">5</attribute> + <attribute name="text">4</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + <style> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">affiliation</property> + <property name="title" translatable="yes">Affiliations</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="outcast_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">outcast_store</property> + <property name="search_column">0</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"> + <property name="mode">multiple</property> + <signal name="changed" handler="_on_selection_changed" swapped="no"/> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="sizing">autosize</property> + <property name="title">Jabber-ID</property> + <property name="expand">True</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">0</property> + <child> + <object class="GtkCellRendererText"> + <property name="placeholder_text">user(a)example.org</property> + <signal name="edited" handler="_on_outcast_jid_edited" swapped="no"/> + </object> + <attributes> + <attribute name="editable">6</attribute> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="sizing">autosize</property> + <property name="min_width">250</property> + <property name="title" translatable="yes">Reason</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">1</property> + <child> + <object class="GtkCellRendererText"> + <property name="placeholder_text">spam</property> + <signal name="edited" handler="_on_reason_edited" swapped="no"/> + </object> + <attributes> + <attribute name="editable">6</attribute> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + <style> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">outcast</property> + <property name="title" translatable="yes">Ban List</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkStackSidebar"> + <property name="width_request">140</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stack">stack</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -146,6 +146,14 @@ list.settings > row > box { #StartChatListBox > row { padding: 10px 20px 10px 10px; } #StartChatListBox > row:not(.activatable) label { color: @insensitive_fg_color } +/* GroupchatConfig */ +#GroupchatConfig buttonbox { margin: 0px 12px 12px 12px; } +#GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;} +#GroupchatConfig stacksidebar > scrolledwindow { + background-color:@theme_base_color; + border-bottom: 1px solid; + border-color: @borders;} + /* Popover Treeview */ .popover_treeview { border-radius: 3px; background-color: @theme_bg_color; } .popover_treeview { padding: 6px; } @@ -211,6 +219,7 @@ list.settings > row > box { /* Padding/Margins */ .margin-top6 { margin-top: 6px; } +.margin-12 { margin: 12px; } /* Treeview */ treeview.space { padding: 6px; } ===================================== gajim/groupchat_control.py ===================================== @@ -728,18 +728,21 @@ class GroupchatControl(ChatControlBase): _('You may also enter an alternate venue:'), ok_handler=on_ok, transient_for=self.parent_win.window) - def _on_configure_room(self, action, param): - c = app.contacts.get_gc_contact( + def _on_configure_room(self, _action, _param): + contact = app.contacts.get_gc_contact( self.account, self.room_jid, self.nick) - if c.affiliation == 'owner': + if contact.affiliation == 'owner': con = app.connections[self.account] con.get_module('MUC').request_config(self.room_jid) - elif c.affiliation == 'admin': - if self.room_jid not in app.interface.instances[self.account][ - 'gc_config']: - app.interface.instances[self.account]['gc_config'][ - self.room_jid] = GroupchatConfig(self.account, - self.room_jid) + elif contact.affiliation == 'admin': + win = app.get_app_window( + 'GroupchatConfig', self.account, self.room_jid) + if win is not None: + win.present() + else: + GroupchatConfig(self.account, + self.room_jid, + contact.affiliation) def _on_bookmark_room(self, action, param): """ ===================================== gajim/gtk/dialogs.py ===================================== @@ -128,11 +128,8 @@ class NonModalConfirmationDialog(HigDialog): on_response_cancel=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - if hasattr(app.interface, 'roster') and app.interface.roster: - parent = app.interface.roster.window - else: - parent = None - HigDialog.__init__(self, parent, Gtk.MessageType.QUESTION, + transient_for = app.app.get_active_window() + HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) self.set_modal(False) @@ -162,9 +159,8 @@ class WarningDialog(HigDialog): """ def __init__(self, pritext, sectext='', transient_for=None): - if not transient_for and hasattr(app.interface, 'roster') and \ - app.interface.roster: - transient_for = app.interface.roster.window + if transient_for is None: + transient_for = app.app.get_active_window() HigDialog.__init__(self, transient_for, Gtk.MessageType.WARNING, Gtk.ButtonsType.OK, pritext, sectext) self.set_modal(False) @@ -177,13 +173,9 @@ class InformationDialog(HigDialog): """ def __init__(self, pritext, sectext='', transient_for=None): - if transient_for: - parent = transient_for - elif hasattr(app.interface, 'roster') and app.interface.roster: - parent = app.interface.roster.window - else: - parent = None - HigDialog.__init__(self, parent, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, + if transient_for is None: + transient_for = app.app.get_active_window() + HigDialog.__init__(self, transient_for, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, pritext, sectext) self.set_modal(False) self.popup() @@ -196,13 +188,9 @@ class ErrorDialog(HigDialog): def __init__(self, pritext, sectext='', on_response_ok=None, on_response_cancel=None, transient_for=None): - if transient_for: - parent = transient_for - elif hasattr(app.interface, 'roster') and app.interface.roster: - parent = app.interface.roster.window - else: - parent = None - HigDialog.__init__(self, parent, Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, + if transient_for is None: + transient_for = app.app.get_active_window() + HigDialog.__init__(self, transient_for, Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, pritext, sectext, on_response_ok=on_response_ok, on_response_cancel=on_response_cancel) self.popup() @@ -218,13 +206,9 @@ class YesNoDialog(HigDialog): transient_for=None): self.user_response_yes = on_response_yes self.user_response_no = on_response_no - if transient_for: - parent = transient_for - elif hasattr(app.interface, 'roster') and app.interface.roster: - parent = app.interface.roster.window - else: - parent = None - HigDialog.__init__(self, parent, type_, Gtk.ButtonsType.YES_NO, pritext, + if transient_for is None: + transient_for = app.app.get_active_window() + HigDialog.__init__(self, transient_for, type_, Gtk.ButtonsType.YES_NO, pritext, sectext, on_response_yes=self.on_response_yes, on_response_no=self.on_response_no) @@ -308,14 +292,9 @@ class ConfirmationDialogCheck(ConfirmationDialog): on_response_cancel=None, is_modal=True, transient_for=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - - if transient_for: - parent = transient_for - elif hasattr(app.interface, 'roster') and app.interface.roster: - parent = app.interface.roster.window - else: - parent = None - HigDialog.__init__(self, parent, Gtk.MessageType.QUESTION, + if transient_for is None: + transient_for = app.app.get_active_window() + HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) @@ -363,15 +342,12 @@ class ConfirmationDialogDoubleCheck(ConfirmationDialog): def __init__(self, pritext, sectext='', checktext1='', checktext2='', tooltip1='', tooltip2='', on_response_ok=None, on_response_cancel=None, - is_modal=True): + transient_for=None, is_modal=True): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - - if hasattr(app.interface, 'roster') and app.interface.roster: - parent = app.interface.roster.window - else: - parent = None - HigDialog.__init__(self, parent, Gtk.MessageType.QUESTION, + if transient_for is None: + transient_for = app.app.get_active_window() + HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) @@ -524,13 +500,9 @@ class FTOverwriteConfirmationDialog(ConfirmationDialog): """ def __init__(self, pritext, sectext='', propose_resume=True, on_response=None, transient_for=None): - if transient_for: - parent = transient_for - elif hasattr(app.interface, 'roster') and app.interface.roster: - parent = app.interface.roster.window - else: - parent = None - HigDialog.__init__(self, parent, Gtk.MessageType.QUESTION, + if transient_for is None: + transient_for = app.app.get_active_window() + HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, Gtk.ButtonsType.CANCEL, pritext, sectext) self.on_response = on_response @@ -578,10 +550,9 @@ class CommonInputDialog: label.set_markup(label_str) self.cancel_handler = cancel_handler self.vbox = self.xml.get_object('vbox') - if transient_for: - self.dialog.set_transient_for(transient_for) - else: - self.dialog.set_transient_for(app.interface.roster.window) + if transient_for is None: + transient_for = app.app.get_active_window() + self.dialog.set_transient_for(transient_for) self.ok_handler = ok_handler okbutton = self.xml.get_object('okbutton') @@ -821,8 +792,9 @@ class DoubleInputDialog: if input_str2: self.input_entry2.set_text(input_str2) self.input_entry2.select_region(0, -1) # select all - if transient_for: - self.dialog.set_transient_for(transient_for) + if transient_for is None: + transient_for = app.app.get_active_window() + self.dialog.set_transient_for(transient_for) self.dialog.set_modal(is_modal) @@ -865,7 +837,7 @@ class DoubleInputDialog: class CertificatDialog(InformationDialog): - def __init__(self, parent, account, cert): + def __init__(self, transient_for, account, cert): issuer = cert.get_issuer() subject = cert.get_subject() InformationDialog.__init__(self, @@ -903,7 +875,7 @@ SHA-256 Fingerprint: %(sha256)s img = Gtk.Image.new_from_surface(surface) img.show_all() self.set_image(img) - self.set_transient_for(parent) + self.set_transient_for(transient_for) self.set_title(_('Certificate for account %s') % account) ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -12,237 +12,365 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging + +import nbxmpp from gi.repository import Gtk from gajim.common import app from gajim.common.i18n import _ +from gajim.common.const import MUCUser +from gajim.common.caps_cache import muc_caps_cache -from gajim import dataforms_widget - +from gajim.gtk.dialogs import ErrorDialog +from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import get_builder -from gajim.gtk.dialogs import InputDialog + +log = logging.getLogger('gajim.gtk.groupchat_config') -class GroupchatConfig: - def __init__(self, account, room_jid, form=None): +class GroupchatConfig(Gtk.ApplicationWindow): + def __init__(self, account, jid, own_affiliation, form=None): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Group Chat Configuration')) + self.account = account - self.room_jid = room_jid - self.form = form - self.remove_button = {} - self.affiliation_treeview = {} - self.start_users_dict = {} # list at the beginning - self.affiliation_labels = { - 'outcast': _('Ban List'), - 'member': _('Member List'), - 'owner': _('Owner List'), - 'admin':_('Administrator List') - } - - self._ui = get_builder('data_form_window.ui', ['data_form_window']) - self.window = self._ui.data_form_window - self.window.set_transient_for(app.interface.roster.window) - - if self.form: - self.data_form_widget = dataforms_widget.DataFormWidget(self.form) - # hide scrollbar of this data_form_widget, we already have in this - # widget - sw = self.data_form_widget.xml.get_object( - 'single_form_scrolledwindow') - sw.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) - if self.form.title: - self._ui.title_label.set_text(self.form.title) - else: - self._ui.title_hseparator.set_no_show_all(True) - self._ui.title_hseparator.hide() + self.jid = jid + self._own_affiliation = own_affiliation - self.data_form_widget.show() - self._ui.config_vbox.pack_start(self.data_form_widget, True, True, 0) - else: - self._ui.title_label.set_no_show_all(True) - self._ui.title_label.hide() - self._ui.title_hseparator.set_no_show_all(True) - self._ui.title_hseparator.hide() - self._ui.config_hseparator.set_no_show_all(True) - self._ui.config_hseparator.hide() - - # Draw the edit affiliation list things - add_on_vbox = self._ui.add_on_vbox - - for affiliation in self.affiliation_labels: - self.start_users_dict[affiliation] = {} - hbox = Gtk.HBox(spacing=5) - add_on_vbox.pack_start(hbox, False, True, 0) - - label = Gtk.Label(label=self.affiliation_labels[affiliation]) - hbox.pack_start(label, False, True, 0) - - bb = Gtk.HButtonBox() - bb.set_layout(Gtk.ButtonBoxStyle.END) - bb.set_spacing(5) - hbox.pack_start(bb, True, True, 0) - add_button = Gtk.Button(stock=Gtk.STOCK_ADD) - add_button.connect( - 'clicked', self.on_add_button_clicked, affiliation) - bb.pack_start(add_button, True, True, 0) - self.remove_button[affiliation] = Gtk.Button(stock=Gtk.STOCK_REMOVE) - self.remove_button[affiliation].set_sensitive(False) - self.remove_button[affiliation].connect( - 'clicked', self.on_remove_button_clicked, affiliation) - bb.pack_start(self.remove_button[affiliation], True, True, 0) - - # jid, reason, nick, role - liststore = Gtk.ListStore(str, str, str, str) - self.affiliation_treeview[affiliation] = Gtk.TreeView(liststore) - self.affiliation_treeview[affiliation].get_selection().set_mode( - Gtk.SelectionMode.MULTIPLE) - self.affiliation_treeview[affiliation].connect( - 'cursor-changed', - self.on_affiliation_treeview_cursor_changed, - affiliation) - renderer = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(_('JID'), renderer) - col.add_attribute(renderer, 'text', 0) - col.set_resizable(True) - col.set_sort_column_id(0) - self.affiliation_treeview[affiliation].append_column(col) + self._ui = get_builder('groupchat_config.ui') + self.add(self._ui.grid) - if affiliation == 'outcast': - renderer = Gtk.CellRendererText() - renderer.set_property('editable', True) - renderer.connect('edited', self.on_cell_edited) - col = Gtk.TreeViewColumn(_('Reason'), renderer) - col.add_attribute(renderer, 'text', 1) - col.set_resizable(True) - col.set_sort_column_id(1) - self.affiliation_treeview[affiliation].append_column(col) - elif affiliation == 'member': - renderer = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(_('Nick'), renderer) - col.add_attribute(renderer, 'text', 2) - col.set_resizable(True) - col.set_sort_column_id(2) - self.affiliation_treeview[affiliation].append_column(col) - renderer = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(_('Role'), renderer) - col.add_attribute(renderer, 'text', 3) - col.set_resizable(True) - col.set_sort_column_id(3) - self.affiliation_treeview[affiliation].append_column(col) - - sw = Gtk.ScrolledWindow() - sw.add(self.affiliation_treeview[affiliation]) - add_on_vbox.pack_start(sw, True, True, 0) - con = app.connections[self.account] - con.get_module('MUC').get_affiliation(self.room_jid, affiliation) + # Activate Add button only for Admins and Owners + if self._own_affiliation in ('admin', 'owner'): + self._ui.add_button.set_sensitive(True) + self._ui.add_button.set_tooltip_text('') - self._ui.connect_signals(self) - self.window.connect('delete-event', self.on_cancel_button_clicked) - self.window.show_all() + visible = muc_caps_cache.supports(jid, nbxmpp.NS_REGISTER) + self._ui.reserved_name_column.set_visible(visible) - def on_cancel_button_clicked(self, *args): - if self.form: - con = app.connections[self.account] - con.get_module('MUC').cancel_config(self.room_jid) - self.window.destroy() + self._form = form + self._affiliations = {} + self._new_affiliations = {} - def on_cell_edited(self, _cell, path, new_text): - model = self.affiliation_treeview['outcast'].get_model() - new_text = new_text - iter_ = model.get_iter(path) - model[iter_][1] = new_text + con = app.connections[self.account] + for affiliation in ('owner', 'admin', 'member', 'outcast'): + con.get_module('MUC').get_affiliation( + self.jid, + affiliation, + self._on_affiliations_received, + self._on_affiliations_error) - def on_add_button_clicked(self, _widget, affiliation): - if affiliation == 'outcast': - title = _('Banning…') - #You can move '\n' before user@domain if that line is TOO BIG - prompt = _('<b>Whom do you want to ban?</b>\n\n') - elif affiliation == 'member': - title = _('Adding Member…') - prompt = _('<b>Whom do you want to make a member?</b>\n\n') - elif affiliation == 'owner': - title = _('Adding Owner…') - prompt = _('<b>Whom do you want to make an owner?</b>\n\n') + if form is not None: + self._ui.stack.set_visible_child_name('config') + self._data_form_widget = DataFormWidget(form) + self._ui.config_grid.add(self._data_form_widget) + # self._ui.stack.set_visible_child_name('affiliation') + else: + self._ui.stack.get_child_by_name('config').hide() + self._ui.stack.get_child_by_name('config').set_no_show_all(True) + self._ui.stack.set_visible_child_name('affiliation') + + self._ui.connect_signals(self) + self.show_all() + self._ui.stack.notify('visible-child-name') + + def _get_current_treeview(self): + page_name = self._ui.stack.get_visible_child_name() + return getattr(self._ui, '%s_treeview' % page_name) + + def _on_add(self, *args): + page_name = self._ui.stack.get_visible_child_name() + if page_name == 'outcast': + affiliation_edit, jid_edit = self._allowed_to_edit('outcast') + text = None + affiliation = 'outcast' else: - title = _('Adding Administrator…') - prompt = _('<b>Whom do you want to make an administrator?</b>\n\n') - prompt += _( - 'Can be one of the following:\n' - '1. user@domain/resource (only that resource matches).\n' - '2. user@domain (any resource matches).\n' - '3. domain/resource (only that resource matches).\n' - '4. domain (the domain itself matches, as does any user@domain,\n' - 'domain/resource, or address containing a subdomain).') - - def on_ok(jid): - if not jid: - return - model = self.affiliation_treeview[affiliation].get_model() - model.append((jid, '', '', '')) - InputDialog(title, prompt, ok_handler=on_ok) - - def on_remove_button_clicked(self, _widget, affiliation): - selection = self.affiliation_treeview[affiliation].get_selection() - model, paths = selection.get_selected_rows() - row_refs = [] + affiliation_edit, jid_edit = self._allowed_to_edit('member') + text = _('Member') + affiliation = 'member' + + treeview = self._get_current_treeview() + treeview.get_model().append([None, + None, + None, + affiliation, + text, + affiliation_edit, + jid_edit]) + + # Scroll to added row + row = treeview.get_model()[-1] + treeview.scroll_to_cell(row.path, None, False, 0, 0) + treeview.get_selection().unselect_all() + treeview.get_selection().select_path(row.path) + + def _on_remove(self, *args): + treeview = self._get_current_treeview() + model, paths = treeview.get_selection().get_selected_rows() + + owner_count = self._get_owner_count() + references = [] for path in paths: - row_refs.append(Gtk.TreeRowReference.new(model, path)) - for row_ref in row_refs: - path = row_ref.get_path() - iter_ = model.get_iter(path) + if model[path][MUCUser.AFFILIATION] == 'owner': + if owner_count < 2: + # There must be at least one owner + ErrorDialog(_('Error'), + _('A Group Chat needs at least one Owner')) + return + owner_count -= 1 + references.append(Gtk.TreeRowReference.new(model, path)) + + for ref in references: + iter_ = model.get_iter(ref.get_path()) model.remove(iter_) - self.remove_button[affiliation].set_sensitive(False) - - def on_affiliation_treeview_cursor_changed(self, _widget, affiliation): - self.remove_button[affiliation].set_sensitive(True) - - def affiliation_list_received(self, users_dict): - """ - Fill the affiliation treeview - """ - for jid in users_dict: - affiliation = users_dict[jid]['affiliation'] - if affiliation not in self.affiliation_labels.keys(): - # Unknown affiliation or 'none' affiliation, do not show it - continue - self.start_users_dict[affiliation][jid] = users_dict[jid] - tv = self.affiliation_treeview[affiliation] - model = tv.get_model() - reason = users_dict[jid].get('reason', '') - nick = users_dict[jid].get('nick', '') - role = users_dict[jid].get('role', '') - model.append((jid, reason, nick, role)) - - def on_data_form_window_destroy(self, _widget): - del app.interface.instances[self.account]['gc_config'][self.room_jid] - - def on_ok_button_clicked(self, _widget): - if self.form: - form = self.data_form_widget.data_form + + def _on_jid_edited(self, _renderer, path, new_text): + old_text = self._ui.affiliation_store[path][MUCUser.JID] + if new_text == old_text: + return + + if self._jid_exists(new_text): + self._raise_error() + return + + self._ui.affiliation_store[path][MUCUser.JID] = new_text + + def _on_outcast_jid_edited(self, _renderer, path, new_text): + old_text = self._ui.outcast_store[path][MUCUser.JID] + if new_text == old_text: + return + + if self._jid_exists(new_text): + self._raise_error() + return + + self._ui.outcast_store[path][MUCUser.JID] = new_text + self._ui.outcast_store[path][MUCUser.AFFILIATION] = 'outcast' + + def _on_nick_edited(self, _renderer, path, new_text): + self._ui.affiliation_store[path][MUCUser.NICK] = new_text + + def _on_reason_edited(self, _renderer, path, new_text): + self._ui.outcast_store[path][MUCUser.REASON] = new_text + + def _on_affiliation_changed(self, cell_renderer_combo, + path_string, new_iter): + combo_store = cell_renderer_combo.get_property('model') + affiliation_text = combo_store.get_value(new_iter, 0) + affiliation = combo_store.get_value(new_iter, 1) + + store = self._ui.affiliation_treeview.get_model() + + store[path_string][MUCUser.AFFILIATION] = affiliation + store[path_string][MUCUser.AFFILIATION_TEXT] = affiliation_text + + def _on_selection_changed(self, tree_selection): + sensitive = bool(tree_selection.count_selected_rows()) + selected_affiliations = self._get_selected_affiliations(tree_selection) + self._set_remove_button_state(sensitive, selected_affiliations) + + def _jid_exists(self, jid): + stores = [self._ui.affiliation_store, self._ui.outcast_store] + + for store in stores: + for row in store: + if row[MUCUser.JID] == jid: + return True + return False + + @staticmethod + def _get_selected_affiliations(tree_selection): + model, paths = tree_selection.get_selected_rows() + selected_affiliations = set() + for path in paths: + selected_affiliations.add(model[path][MUCUser.AFFILIATION]) + return selected_affiliations + + def _on_switch_page(self, stack, _pspec): + page_name = stack.get_visible_child_name() + self._set_button_box_state(page_name) + if page_name == 'config': + return + + treeview = getattr(self._ui, '%s_treeview' % page_name) + sensitive = bool(treeview.get_selection().count_selected_rows()) + + selected_affiliations = self._get_selected_affiliations( + treeview.get_selection()) + self._set_remove_button_state(sensitive, selected_affiliations) + + def _set_button_box_state(self, page_name): + affiliation = self._own_affiliation in ('admin', 'owner') + page = page_name != 'config' + self._ui.treeview_buttonbox.set_visible(affiliation and page) + + def _set_remove_button_state(self, sensitive, selected_affiliations): + if self._own_affiliation not in ('admin', 'owner'): + self._ui.remove_button.set_sensitive(False) + return + + self._ui.remove_button.set_tooltip_text('') + + if not sensitive: + self._ui.remove_button.set_sensitive(False) + return + + if self._own_affiliation == 'owner': + self._ui.remove_button.set_sensitive(True) + return + + if set(['owner', 'admin']).intersection(selected_affiliations): + self._ui.remove_button.set_sensitive(False) + self._ui.remove_button.set_tooltip_text( + _('You are not allowed to modify the affiliation ' + 'of Admins and Owners')) + return + + self._ui.remove_button.set_sensitive(True) + + def _get_owner_count(self): + owner_count = 0 + for row in self._ui.affiliation_store: + if row[MUCUser.AFFILIATION] == 'owner': + owner_count += 1 + return owner_count + + def _allowed_to_edit(self, affiliation): + if self._own_affiliation == 'owner': + return True, True + + if self._own_affiliation == 'admin': + if affiliation in ('admin', 'owner'): + return False, False + return False, True + return False, False + + def _on_ok(self, *args): + if self._own_affiliation in ('admin', 'owner'): + self._set_affiliations() + + if self._form is not None and self._own_affiliation == 'owner': + form = self._data_form_widget.get_submit_form() con = app.connections[self.account] - con.get_module('MUC').set_config(self.room_jid, form) - for affiliation in self.affiliation_labels: - users_dict = {} - actual_jid_list = [] - model = self.affiliation_treeview[affiliation].get_model() - iter_ = model.get_iter_first() - # add new jid - while iter_: - jid = model[iter_][0] - actual_jid_list.append(jid) - if jid not in self.start_users_dict[affiliation] or \ - (affiliation == 'outcast' and 'reason' in self.start_users_dict[ - affiliation][jid] and self.start_users_dict[affiliation][jid]\ - ['reason'] != model[iter_][1]): - users_dict[jid] = {'affiliation': affiliation} - if affiliation == 'outcast': - users_dict[jid]['reason'] = model[iter_][1] - iter_ = model.iter_next(iter_) - # remove removed one - for jid in self.start_users_dict[affiliation]: - if jid not in actual_jid_list: - users_dict[jid] = {'affiliation': 'none'} - if users_dict: - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, users_dict) - self.window.destroy() + con.get_module('MUC').set_config(self.jid, form) + self.destroy() + + def _get_diff(self): + stores = [self._ui.affiliation_store, self._ui.outcast_store] + + self._new_affiliations = {} + for store in stores: + for row in store: + if not row[MUCUser.JID]: + # Ignore empty JID field + continue + + attr = 'nick' + if row[MUCUser.AFFILIATION] == 'outcast': + attr = 'reason' + + self._new_affiliations[row[MUCUser.JID]] = { + 'affiliation': row[MUCUser.AFFILIATION], + attr: row[MUCUser.NICK_OR_REASON]} + + old_jids = set(self._affiliations.keys()) + new_jids = set(self._new_affiliations.keys()) + remove = old_jids - new_jids + add = new_jids - old_jids + modified = new_jids - remove - add + + return add, remove, modified + + def _on_cancel(self, *args): + if self._form and self._own_affiliation == 'owner': + con = app.connections[self.account] + con.get_module('MUC').cancel_config(self.jid) + self.destroy() + + def _set_affiliations(self): + add, remove, modified = self._get_diff() + + diff_dict = {} + for jid in add: + diff_dict[jid] = self._new_affiliations[jid] + + for jid in remove: + diff_dict[jid] = {'affiliation': 'none'} + + for jid in modified: + if self._new_affiliations[jid] == self._affiliations[jid]: + # Not modified + continue + + diff_dict[jid] = self._new_affiliations[jid] + if self._new_affiliations[jid]['affiliation'] == 'outcast': + # New affiliation is outcast, check if the reason changed. + # In case the affiliation was 'admin', 'owner' or 'member' + # before, there is no reason. + new_reason = self._new_affiliations[jid]['reason'] + old_reason = self._affiliations[jid].get('reason') + if new_reason == old_reason: + diff_dict[jid].pop('reason', None) + + else: + # New affiliation is not outcast, check if the nick has changed. + # In case the affiliation was 'outcast' there is no nick. + new_nick = self._new_affiliations[jid]['nick'] + old_nick = self._affiliations[jid].get('nick') + if new_nick == old_nick: + diff_dict[jid].pop('nick', None) + + if not diff_dict: + # No changes were made + return + con = app.connections[self.account] + con.get_module('MUC').set_affiliation(self.jid, diff_dict) + + def _on_affiliations_error(self, affiliation, error): + log.info('Error while requesting %s affiliations: %s', + affiliation, error) + + def _on_affiliations_received(self, _account, _room_jid, + affiliation, users): + + if affiliation == 'outcast': + self._ui.stack.get_child_by_name('outcast').show() + + for jid, attrs in users.items(): + affiliation_edit, jid_edit = self._allowed_to_edit(affiliation) + if affiliation == 'outcast': + reason = attrs.get('reason') + self._ui.outcast_store.append( + [jid, + reason, + None, + affiliation, + None, + affiliation_edit, + jid_edit]) + self._affiliations[jid] = {'affiliation': affiliation, + 'reason': reason} + else: + nick = attrs.get('nick') + role = attrs.get('role') + self._ui.affiliation_store.append( + [jid, + nick, + role, + affiliation, + _(affiliation.capitalize()), + affiliation_edit, + jid_edit]) + self._affiliations[jid] = {'affiliation': affiliation, + 'nick': nick} + if role is not None: + self._ui.role_column.set_visible(True) + + @staticmethod + def _raise_error(): + ErrorDialog(_('Error'), + _('An entry with this Jabber-ID already exists')) ===================================== gajim/gui_interface.py ===================================== @@ -601,16 +601,12 @@ class Interface: _('%(jid)s has been invited in this room') % { 'jid': jid}, graphics=False) del app.automatic_rooms[account][obj.jid] - elif obj.jid not in self.instances[account]['gc_config']: - self.instances[account]['gc_config'][obj.jid] = \ - GroupchatConfig(account, obj.jid, obj.dataform) - - def handle_event_gc_affiliation(self, obj): - #('GC_AFFILIATION', account, (room_jid, users_dict)) - account = obj.conn.name - if obj.room_jid in self.instances[account]['gc_config']: - self.instances[account]['gc_config'][obj.room_jid].\ - affiliation_list_received(obj.users_dict) + else: + win = app.get_app_window('GroupchatConfig', account, obj.jid) + if win is not None: + win.present() + else: + GroupchatConfig(account, obj.jid, 'owner', obj.dataform) def handle_event_gc_decline(self, obj): gc_control = self.msg_win_mgr.get_gc_control(obj.room_jid, obj.account) @@ -1531,7 +1527,6 @@ class Interface: 'message-not-sent': [self.handle_event_msgnotsent], 'message-sent': [self.handle_event_msgsent], 'metacontacts-received': [self.handle_event_metacontacts], - 'muc-admin-received': [self.handle_event_gc_affiliation], 'muc-owner-received': [self.handle_event_gc_config], 'oauth2-credentials-required': [self.handle_oauth2_credentials], 'our-show': [self.handle_event_status], View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/32e736aa32710164cd4fd7412126d0074… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/32e736aa32710164cd4fd7412126d0074… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused shortcut
by Philipp Hörist 02 Nov '18

02 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 32e736aa by Philipp Hörist at 2018-11-02T20:01:26Z Remove unused shortcut - - - - - 1 changed file: - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -75,19 +75,6 @@ </child> </object> </child> - <child> - <object class="GtkShortcutsGroup"> - <property name="visible">1</property> - <property name="title" translatable="yes">Appearance</property> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><alt>c</property> - <property name="title" translatable="yes">Toggle full / compact view</property> - </object> - </child> - </object> - </child> <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/32e736aa32710164cd4fd7412126d00744… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/32e736aa32710164cd4fd7412126d00744… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ManageSounds GUI Update
by Philipp Hörist 02 Nov '18

02 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7cae8809 by Daniel Brötzmann at 2018-11-02T16:09:28Z ManageSounds GUI Update - - - - - 3 changed files: - gajim/data/gui/manage_sounds_window.ui - gajim/gtk/preferences.py - gajim/gtk/sounds.py Changes: ===================================== gajim/data/gui/manage_sounds_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -19,16 +19,19 @@ <property name="width_request">400</property> <property name="height_request">370</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">18</property> <property name="title" translatable="yes">Manage sounds</property> <property name="window_position">center-on-parent</property> + <property name="default_width">400</property> + <property name="default_height">370</property> <property name="type_hint">dialog</property> - <signal name="delete-event" handler="_on_destroy" swapped="no"/> + <signal name="destroy" handler="_on_destroy" swapped="no"/> + <signal name="key-press-event" handler="_on_key_press" swapped="no"/> <child> <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> @@ -106,7 +109,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Clear File</property> + <property name="tooltip_text" translatable="yes">Clear Sound</property> <signal name="clicked" handler="_on_clear" swapped="no"/> <child> <object class="GtkImage"> @@ -127,9 +130,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Play Sound</property> <signal name="clicked" handler="_on_play" swapped="no"/> <child> - <object class="GtkImage" id="image1370"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="icon_name">media-playback-start-symbolic</property> @@ -150,35 +154,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_destroy" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> </object> </child> </object> ===================================== gajim/gtk/preferences.py ===================================== @@ -682,7 +682,7 @@ class Preferences(Gtk.ApplicationWindow): def on_manage_sounds_button_clicked(self, widget): if self.sounds_preferences is None: - self.sounds_preferences = ManageSounds(self) + self.sounds_preferences = ManageSounds() else: self.sounds_preferences.window.present() ===================================== gajim/gtk/sounds.py ===================================== @@ -14,6 +14,7 @@ import os +from gi.repository import Gdk from gi.repository import Gtk from gajim.common import app @@ -24,10 +25,10 @@ from gajim.gtk.util import get_builder class ManageSounds: - def __init__(self, transient): + def __init__(self): self._ui = get_builder('manage_sounds_window.ui') self.window = self._ui.manage_sounds_window - self.window.set_transient_for(transient) + self.window.set_transient_for(app.app.get_active_window()) filter_ = Gtk.FileFilter() filter_.set_name(_('All files')) @@ -115,8 +116,11 @@ class ManageSounds: snd_event_config_name = model[iter_][3] helpers.play_sound(snd_event_config_name) + def _on_key_press(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def _on_destroy(self, *args): - self.window.destroy() window = app.get_app_window('Preferences') if window is not None: window.sounds_preferences = None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7cae880920736ae8ad39ea204afd1a09c6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7cae880920736ae8ad39ea204afd1a09c6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update win/README.md
by Philipp Hörist 01 Nov '18

01 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55eef518 by Philipp Hörist at 2018-11-01T13:57:30Z Update win/README.md - - - - - 1 changed file: - win/README.md Changes: ===================================== win/README.md ===================================== @@ -10,7 +10,7 @@ and development on Windows. Download [msys2](http://www.msys2.org/) (msys2-x86_64-xxx.exe) and follow the install instructions on the [msys2](http://www.msys2.org/) startpage (**Important!**) * Fork the master branch on dev.gajim.org -* Execute ``C:\msys64\mingw32.exe`` +* Execute ``C:\msys64\msys2_shell.cmd -mingw64`` * Run ``pacman -S git`` to install git * Run ``git clone https://dev.gajim.org/USERNAME/gajim.git`` * Run ``cd gajim/win`` to end up where this README exists. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/55eef5188775cc1a21c2d0418d47762b43… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/55eef5188775cc1a21c2d0418d47762b43… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove all non-ascii chars from setup.cfg
by Philipp Hörist 01 Nov '18

01 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 110da017 by Philipp Hörist at 2018-11-01T07:40:57Z Remove all non-ascii chars from setup.cfg https://github.com/pypa/setuptools/issues/1062 - - - - - 1 changed file: - setup.cfg Changes: ===================================== setup.cfg ===================================== @@ -2,7 +2,7 @@ name = gajim version = attr: gajim.__version__ description = A GTK+ Jabber client -author = Philipp Hörist, Yann Leboulanger +author = Philipp Hoerist, Yann Leboulanger author_email = gajim-devel(a)gajim.org url = https://gajim.org license = GPL v3 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/110da0172fd3cf758bf0ea380d63d258e1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/110da0172fd3cf758bf0ea380d63d258e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix dev_env.sh
by Philipp Hörist 01 Nov '18

01 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7d5f1fba by Philipp Hörist at 2018-11-01T07:28:20Z Windows: Fix dev_env.sh - - - - - 1 changed file: - win/dev_env.sh Changes: ===================================== win/dev_env.sh ===================================== @@ -29,3 +29,9 @@ cssutils qrcode precis-i18n " + +pip3 install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) + +} + +main; View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d5f1fba5036f3a42027efb87d81a04800… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d5f1fba5036f3a42027efb87d81a04800… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Make DataFormWidget configurable
by Philipp Hörist 01 Nov '18

01 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f46fdee4 by Philipp Hörist at 2018-11-01T07:23:04Z Make DataFormWidget configurable - A option dict can be passed which controls how the DataForfWidget looks - Analyse the field label lengths and adjust the label justification (left/right) - - - - - c2521a41 by Philipp Hörist at 2018-11-01T07:23:04Z Add margin to DataFormWidget - - - - - 1aba2b2d by Philipp Hörist at 2018-11-01T07:23:04Z Windows: Update dev_env.sh - - - - - 3 changed files: - gajim/data/style/gajim.css - gajim/gtk/dataform.py - win/dev_env.sh Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -237,5 +237,6 @@ button.flat.link { padding: 0; border: 0; } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} .data-form-title { font-size: 16px; font-weight: bold; } +.data-form-widget grid { margin: 18px; } .data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } .data-form-widget treeview { padding: 5px; } ===================================== gajim/gtk/dataform.py ===================================== @@ -17,7 +17,7 @@ from gi.repository import Pango class DataFormWidget(Gtk.ScrolledWindow): - def __init__(self, form_node): + def __init__(self, form_node, options=None): Gtk.ScrolledWindow.__init__(self) self.set_hexpand(True) self.set_vexpand(True) @@ -25,7 +25,9 @@ class DataFormWidget(Gtk.ScrolledWindow): self._form_node = form_node - self._form_grid = FormGrid(form_node) + if options is None: + options = {} + self._form_grid = FormGrid(form_node, options) self.add(self._form_grid) @@ -43,7 +45,7 @@ class DataFormWidget(Gtk.ScrolledWindow): class FormGrid(Gtk.Grid): - def __init__(self, form_node): + def __init__(self, form_node, options): Gtk.Grid.__init__(self) self.set_column_spacing(12) self.set_row_spacing(12) @@ -75,20 +77,39 @@ class FormGrid(Gtk.Grid): self.instructions = form_node.instructions self.add_row(Instructions(form_node.instructions)) - self.parse_form(form_node) + self.analyse_fields(form_node, options) + self.parse_form(form_node, options) def add_row(self, field): field.add(self, self.row_count) self.row_count += 1 self.rows.append(field) - def parse_form(self, form_node): + @staticmethod + def analyse_fields(form_node, options): + if 'right_align' in options: + # Dont overwrite option + return + + label_lengths = set([0]) + for field in form_node.iter_fields(): + if field.type_ == 'hidden': + continue + + if field.label is None: + continue + + label_lengths.add(len(field.label)) + + options['right_align'] = max(label_lengths) < 30 + + def parse_form(self, form_node, options): for field in form_node.iter_fields(): if field.type_ == 'hidden': continue widget = self._fields[field.type_] - self.add_row(widget(field)) + self.add_row(widget(field, options)) def is_valid(self): return self._data_form.is_valid() @@ -114,7 +135,7 @@ class Instructions: class Field: - def __init__(self, field): + def __init__(self, field, options): self._field = field self._label = Gtk.Label(label=field.label) @@ -123,7 +144,7 @@ class Field: self._label.set_line_wrap_mode(Pango.WrapMode.WORD) self._label.set_width_chars(15) self._label.set_size_request(100, -1) - self._label.set_xalign(1) + self._label.set_xalign(bool(options.get('right_align'))) self._label.set_tooltip_text(field.description) def add(self, form_grid, row_number): @@ -133,40 +154,40 @@ class Field: class BooleanField(Field): - def __init__(self, field): - Field.__init__(self, field) + def __init__(self, field, options): + Field.__init__(self, field, options) self._widget = Gtk.CheckButton() self._widget.set_active(field.value) self._widget.connect('toggled', self._toggled) - def _toggled(self, widget): + def _toggled(self, _widget): self._field.value = self._widget.get_active() class FixedField(Field): - def __init__(self, field): - Field.__init__(self, field) + def __init__(self, field, options): + Field.__init__(self, field, options) self._label.set_text(field.value) - # If the value is more than 30 chars it proabably isnt + # If the value is more than 40 chars it proabably isnt # meant as a section header - if len(field.value) < 30: + if len(field.value) < 40: self._label.get_style_context().add_class('field-fixed') else: self._label.set_xalign(0.5) def add(self, form_grid, row_number): - if len(self._field.value) < 30: + if len(self._field.value) < 40: form_grid.attach(self._label, 0, row_number, 1, 1) else: form_grid.attach(self._label, 0, row_number, 2, 1) class ListSingleField(Field): - def __init__(self, field): - Field.__init__(self, field) + def __init__(self, field, options): + Field.__init__(self, field, options) self._widget = Gtk.ComboBoxText() for value, label in field.iter_options(): @@ -182,8 +203,8 @@ class ListSingleField(Field): class ListMultiField(Field): - def __init__(self, field): - Field.__init__(self, field) + def __init__(self, field, options): + Field.__init__(self, field, options) self._label.set_valign(Gtk.Align.START) self._treeview = ListMutliTreeView(field) @@ -226,7 +247,7 @@ class ListMutliTreeView(Gtk.TreeView): self.set_model(self._store) - def _toggled(self, renderer, path): + def _toggled(self, _renderer, path): iter_ = self._store.get_iter(path) current_value = self._store[iter_][2] self._store.set_value(iter_, 2, not current_value) @@ -242,8 +263,8 @@ class ListMutliTreeView(Gtk.TreeView): class JidMultiField(Field): - def __init__(self, field): - Field.__init__(self, field) + def __init__(self, field, options): + Field.__init__(self, field, options) self._label.set_valign(Gtk.Align.START) self._treeview = JidMutliTreeView(field) @@ -278,10 +299,10 @@ class JidMultiField(Field): self._widget.pack_start(self._scrolled_window, True, True, 0) self._widget.pack_end(self._button_box, False, False, 0) - def _add_clicked(self, widget): + def _add_clicked(self, _widget): self._treeview.get_model().append(['']) - def _remove_clicked(self, widget): + def _remove_clicked(self, _widget): mod, paths = self._treeview.get_selection().get_selected_rows() for path in paths: iter_ = mod.get_iter(path) @@ -319,7 +340,7 @@ class JidMutliTreeView(Gtk.TreeView): self.set_model(self._store) - def _jid_edited(self, renderer, path, new_text): + def _jid_edited(self, _renderer, path, new_text): iter_ = self._store.get_iter(path) self._store.set_value(iter_, 0, new_text) self._set_values() @@ -334,32 +355,32 @@ class JidMutliTreeView(Gtk.TreeView): class TextSingleField(Field): - def __init__(self, field): - Field.__init__(self, field) + def __init__(self, field, options): + Field.__init__(self, field, options) self._widget = Gtk.Entry() self._widget.set_text(field.value) self._widget.connect('changed', self._changed) - def _changed(self, widget): + def _changed(self, _widget): self._field.value = self._widget.get_text() class TextPrivateField(TextSingleField): - def __init__(self, field): - TextSingleField.__init__(self, field) + def __init__(self, field, options): + TextSingleField.__init__(self, field, options) self._widget.set_input_purpose(Gtk.InputPurpose.PASSWORD) self._widget.set_visibility(False) class JidSingleField(TextSingleField): - def __init__(self, field): - TextSingleField.__init__(self, field) + def __init__(self, field, options): + TextSingleField.__init__(self, field, options) class TextMultiField(Field): - def __init__(self, field): - Field.__init__(self, field) + def __init__(self, field, options): + Field.__init__(self, field, options) self._label.set_valign(Gtk.Align.START) self._widget = Gtk.ScrolledWindow() ===================================== win/dev_env.sh ===================================== @@ -9,22 +9,23 @@ function main { mingw-w64-x86_64-python3-gobject \ mingw-w64-x86_64-python3-pip \ mingw-w64-x86_64-toolchain \ + mingw-w64-x86_64-adwaita-icon-theme \ mingw-w64-x86_64-gtk3 \ + mingw-w64-x86_64-python3-setuptools-scm \ + mingw-w64-x86_64-python3-cryptography \ + mingw-w64-x86_64-python3-certifi \ mingw-w64-x86_64-python3-pyopenssl \ - mingw-w64-x86_64-python3-pillow + mingw-w64-x86_64-python3-pillow \ + mingw-w64-x86_64-python3-six PIP_REQUIREMENTS="\ -certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git +git+https://github.com/enthought/pywin32-ctypes.git python-axolotl python-gnupg keyring cssutils +qrcode +precis-i18n " - -pip3 install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) - -} - -main; View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4736f518d62b1684e8ec3c339bae0d285… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4736f518d62b1684e8ec3c339bae0d285… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Scroll history window to bottom when day changed or selected
by Philipp Hörist 31 Oct '18

31 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4736f518 by Daniel Brötzmann at 2018-10-31T23:29:40Z Scroll history window to bottom when day changed or selected - - - - - 1 changed file: - gajim/gtk/history.py Changes: ===================================== gajim/gtk/history.py ===================================== @@ -46,6 +46,7 @@ from gajim.gtk.util import move_window from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_completion_liststore from gajim.gtk.util import get_builder +from gajim.gtk.util import scroll_to_end from gajim.gtk.dialogs import ErrorDialog @@ -74,39 +75,23 @@ class HistoryWindow: """ def __init__(self, jid=None, account=None): - xml = get_builder('history_window.ui') - self.window = xml.get_object('history_window') - self.window.set_application(app.app) - self.calendar = xml.get_object('calendar') - self.button_first_day = xml.get_object('button_first_day') - self.button_previous_day = xml.get_object('button_previous_day') - self.button_next_day = xml.get_object('button_next_day') - self.button_last_day = xml.get_object('button_last_day') - scrolledwindow = xml.get_object('scrolledwindow') + self._ui = get_builder('history_window.ui') + self._ui.history_window.set_application(app.app) + self.history_textview = conversation_textview.ConversationTextview( account, used_in_history_window=True) - scrolledwindow.add(self.history_textview.tv) + self._ui.scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() self.history_buffer.create_tag('highlight', background='yellow') self.history_buffer.create_tag('invisible', invisible=True) - self.checkbutton = xml.get_object('log_history_checkbutton') - self.show_status_checkbutton = xml.get_object('show_status_checkbutton') - self.search_entry = xml.get_object('search_entry') - self.query_liststore = xml.get_object('query_liststore') - self.jid_entry = xml.get_object('query_entry') - self.results_treeview = xml.get_object('results_treeview') - self.results_window = xml.get_object('results_scrolledwindow') - self.search_in_date = xml.get_object('search_in_date') - self.date_label = xml.get_object('date_label') - self.search_menu_button = xml.get_object('search_menu_button') self.clearing_search = False # jid, contact_name, date, message, time, log_line_id model = Gtk.ListStore(str, str, str, str, str, int) - self.results_treeview.set_model(model) + self._ui.results_treeview.set_model(model) col = Gtk.TreeViewColumn(_('Name')) - self.results_treeview.append_column(col) + self._ui.results_treeview.append_column(col) renderer = Gtk.CellRendererText() col.pack_start(renderer, True) col.add_attribute(renderer, 'text', Column.CONTACT_NAME) @@ -115,7 +100,7 @@ class HistoryWindow: col.set_resizable(True) col = Gtk.TreeViewColumn(_('Date')) - self.results_treeview.append_column(col) + self._ui.results_treeview.append_column(col) renderer = Gtk.CellRendererText() col.pack_start(renderer, True) col.add_attribute(renderer, 'text', Column.UNIXTIME) @@ -124,7 +109,7 @@ class HistoryWindow: col.set_resizable(True) col = Gtk.TreeViewColumn(_('Message')) - self.results_treeview.append_column(col) + self._ui.results_treeview.append_column(col) renderer = Gtk.CellRendererText() col.pack_start(renderer, True) col.add_attribute(renderer, 'text', Column.MESSAGE) @@ -141,19 +126,19 @@ class HistoryWindow: GLib.idle_add(next, task) if jid: - self.jid_entry.get_child().set_text(jid) + self._ui.query_entry.get_child().set_text(jid) else: self._load_history(None) - resize_window(self.window, + resize_window(self._ui.history_window, app.config.get('history_window_width'), app.config.get('history_window_height')) - move_window(self.window, + move_window(self._ui.history_window, app.config.get('history_window_x-position'), app.config.get('history_window_y-position')) - xml.connect_signals(self) - self.window.show_all() + self._ui.connect_signals(self) + self._ui.history_window.show_all() # PluginSystem: adding GUI extension point for # HistoryWindow instance object @@ -172,12 +157,12 @@ class HistoryWindow: This is a generator and does pseudo-threading via idle_add(). """ liststore = get_completion_liststore( - self.jid_entry.get_child()) + self._ui.query_entry.get_child()) liststore.set_sort_column_id(1, Gtk.SortType.ASCENDING) - self.jid_entry.get_child().get_completion().connect( + self._ui.query_entry.get_child().get_completion().connect( 'match-selected', self.on_jid_entry_match_selected) - self.jid_entry.set_model(liststore) + self._ui.query_entry.set_model(liststore) # Add all jids in logs.db: db_jids = app.logger.get_jids_in_db() @@ -196,7 +181,7 @@ class HistoryWindow: keys = list(completion_dict.keys()) # Move the actual jid at first so we load history faster - actual_jid = self.jid_entry.get_child().get_text() + actual_jid = self._ui.query_entry.get_child().get_text() if actual_jid in keys: keys.remove(actual_jid) keys.insert(0, actual_jid) @@ -284,7 +269,7 @@ class HistoryWindow: def on_history_window_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: self.save_state() - self.window.destroy() + self._ui.history_window.destroy() def on_jid_entry_match_selected(self, widget, model, iter_, *args): self._jid_entry_search(model[iter_][1]) @@ -292,16 +277,16 @@ class HistoryWindow: def on_jid_entry_changed(self, widget): # only if selected from combobox - jid = self.jid_entry.get_child().get_text() - if jid == self.jid_entry.get_active_id(): + jid = self._ui.query_entry.get_child().get_text() + if jid == self._ui.query_entry.get_active_id(): self._jid_entry_search(jid) def on_jid_entry_activate(self, widget): - self._jid_entry_search(self.jid_entry.get_child().get_text()) + self._jid_entry_search(self._ui.query_entry.get_child().get_text()) def _jid_entry_search(self, jid): self._load_history(jid, self.account) - self.results_window.set_property('visible', False) + self._ui.results_scrolledwindow.set_property('visible', False) def _load_history(self, jid_or_name, account=None): """ @@ -321,21 +306,21 @@ class HistoryWindow: # We don't know account. Probably a gc not opened or an # account not connected. # Disable possibility to say if we want to log or not - self.checkbutton.set_sensitive(False) + self._ui.log_history_checkbutton.set_sensitive(False) else: # Are log disabled for account ? if self.account in app.config.get_per( 'accounts', self.account, 'no_log_for').split(' '): - self.checkbutton.set_active(False) - self.checkbutton.set_sensitive(False) + self._ui.log_history_checkbutton.set_active(False) + self._ui.log_history_checkbutton.set_sensitive(False) else: # Are log disabled for jid ? log = True if self.jid in app.config.get_per( 'accounts', self.account, 'no_log_for').split(' '): log = False - self.checkbutton.set_active(log) - self.checkbutton.set_sensitive(True) + self._ui.log_history_checkbutton.set_active(log) + self._ui.log_history_checkbutton.set_sensitive(True) self.jids_to_search = [info_jid] @@ -348,20 +333,20 @@ class HistoryWindow: self.last_day = self._get_date_from_timestamp(self.last_log) # Select logs for last date we have logs with contact - self.search_menu_button.set_sensitive(True) + self._ui.search_menu_button.set_sensitive(True) month = gtk_month(self.last_day.month) - self.calendar.select_month(month, self.last_day.year) - self.calendar.select_day(self.last_day.day) + self._ui.calendar.select_month(month, self.last_day.year) + self._ui.calendar.select_day(self.last_day.day) - self.button_previous_day.set_sensitive(True) - self.button_next_day.set_sensitive(True) - self.button_first_day.set_sensitive(True) - self.button_last_day.set_sensitive(True) + self._ui.button_previous_day.set_sensitive(True) + self._ui.button_next_day.set_sensitive(True) + self._ui.button_first_day.set_sensitive(True) + self._ui.button_last_day.set_sensitive(True) - self.search_entry.set_sensitive(True) - self.search_entry.grab_focus() + self._ui.search_entry.set_sensitive(True) + self._ui.search_entry.grab_focus() - self.jid_entry.get_child().set_text(info_completion) + self._ui.query_entry.get_child().set_text(info_completion) else: # neither a valid jid, nor an existing contact name was entered @@ -370,26 +355,27 @@ class HistoryWindow: self.account = None self.history_buffer.set_text('') # clear the buffer - self.search_entry.set_sensitive(False) + self._ui.search_entry.set_sensitive(False) - self.checkbutton.set_sensitive(False) - self.search_menu_button.set_sensitive(False) - self.calendar.clear_marks() - self.button_previous_day.set_sensitive(False) - self.button_next_day.set_sensitive(False) - self.button_first_day.set_sensitive(False) - self.button_last_day.set_sensitive(False) + self._ui.log_history_checkbutton.set_sensitive(False) + self._ui.search_menu_button.set_sensitive(False) + self._ui.calendar.clear_marks() + self._ui.button_previous_day.set_sensitive(False) + self._ui.button_next_day.set_sensitive(False) + self._ui.button_first_day.set_sensitive(False) + self._ui.button_last_day.set_sensitive(False) - self.results_window.set_property('visible', False) + self._ui.results_scrolledwindow.set_property('visible', False) def on_calendar_day_selected(self, widget): if not self.jid: return - year, month, day = self.calendar.get_date() # integers + year, month, day = self._ui.calendar.get_date() # integers month = python_month(month) date_str = datetime.date(year, month, day).strftime('%x') - self.date_label.set_text(date_str) + self._ui.date_label.set_text(date_str) self._load_conversation(year, month, day) + GLib.idle_add(scroll_to_end, self._ui.scrolledwindow) def on_calendar_month_changed(self, widget): """ @@ -426,29 +412,29 @@ class HistoryWindow: def _change_date(self, widget): # Get day selected in calendar - y, m, d = self.calendar.get_date() + y, m, d = self._ui.calendar.get_date() py_m = python_month(m) _date = datetime.datetime(y, py_m, d) - if widget is self.button_first_day: + if widget is self._ui.button_first_day: gtk_m = gtk_month(self.first_day.month) - self.calendar.select_month(gtk_m, self.first_day.year) - self.calendar.select_day(self.first_day.day) + self._ui.calendar.select_month(gtk_m, self.first_day.year) + self._ui.calendar.select_day(self.first_day.day) return - if widget is self.button_last_day: + if widget is self._ui.button_last_day: gtk_m = gtk_month( self.last_day.month) - self.calendar.select_month(gtk_m, self.last_day.year) - self.calendar.select_day(self.last_day.day) + self._ui.calendar.select_month(gtk_m, self.last_day.year) + self._ui.calendar.select_day(self.last_day.day) return - if widget is self.button_previous_day: + if widget is self._ui.button_previous_day: end_date = self.first_day timedelta = datetime.timedelta(days=-1) if end_date >= _date: return - elif widget is self.button_next_day: + elif widget is self._ui.button_next_day: end_date = self.last_day timedelta = datetime.timedelta(days=1) if end_date <= _date: @@ -469,8 +455,8 @@ class HistoryWindow: return gtk_m = gtk_month(_date.month) - self.calendar.select_month(gtk_m, _date.year) - self.calendar.select_day(_date.day) + self._ui.calendar.select_month(gtk_m, _date.year) + self._ui.calendar.select_day(_date.day) def _get_string_show_from_constant_int(self, show): if show == ShowConstant.ONLINE: @@ -496,7 +482,7 @@ class HistoryWindow: """ self.history_buffer.set_text('') self.last_time_printout = 0 - show_status = self.show_status_checkbutton.get_active() + show_status = self._ui.show_status_checkbutton.get_active() date = datetime.datetime(year, month, day) @@ -638,15 +624,15 @@ class HistoryWindow: self.history_textview.print_real_text('\n', text_tags=['eol']) def on_search_complete_history_toggled(self, widget): - self.date_label.get_style_context().remove_class('tagged') + self._ui.date_label.get_style_context().remove_class('tagged') def on_search_in_date_toggled(self, widget): - self.date_label.get_style_context().add_class('tagged') + self._ui.date_label.get_style_context().add_class('tagged') def on_search_entry_activate(self, widget): - text = self.search_entry.get_text() + text = self._ui.search_entry.get_text() - model = self.results_treeview.get_model() + model = self._ui.results_treeview.get_model() self.clearing_search = True model.clear() self.clearing_search = False @@ -656,10 +642,10 @@ class HistoryWindow: self.history_buffer.remove_tag_by_name('highlight', start, end) if text == '': - self.results_window.set_property('visible', False) + self._ui.results_scrolledwindow.set_property('visible', False) return - self.results_window.set_property('visible', True) + self._ui.results_scrolledwindow.set_property('visible', True) # perform search in preselected jids # jids are preselected with the query_entry @@ -673,12 +659,12 @@ class HistoryWindow: account = list(app.contacts.get_accounts())[0] date = None - if self.search_in_date.get_active(): - year, month, day = self.calendar.get_date() # integers + if self._ui.search_in_date.get_active(): + year, month, day = self._ui.calendar.get_date() # integers month = python_month(month) date = datetime.datetime(year, month, day) - show_status = self.show_status_checkbutton.get_active() + show_status = self._ui.show_status_checkbutton.get_active() results = app.logger.search_log(account, jid, text, date) result_found = False @@ -705,7 +691,7 @@ class HistoryWindow: str(row.time), row.log_line_id)) if result_found: - self.results_treeview.set_cursor(0) + self._ui.results_treeview.set_cursor(0) def on_results_treeview_cursor_changed(self, *args): """ @@ -716,9 +702,9 @@ class HistoryWindow: return # get currently selected date - cur_year, cur_month, cur_day = self.calendar.get_date() + cur_year, cur_month, cur_day = self._ui.calendar.get_date() cur_month = python_month(cur_month) - model, paths = self.results_treeview.get_selection().get_selected_rows() + model, paths = self._ui.results_treeview.get_selection().get_selected_rows() if not paths: return @@ -738,10 +724,10 @@ class HistoryWindow: # avoid reruning mark days algo if same month and year! if year != cur_year or gtk_m != cur_month: - self.calendar.select_month(month, year) + self._ui.calendar.select_month(month, year) if year != cur_year or gtk_m != cur_month or day != cur_day: - self.calendar.select_day(day) + self._ui.calendar.select_day(day) self._scroll_to_message_and_highlight(model[path][Column.LOG_LINE_ID]) @@ -802,7 +788,7 @@ class HistoryWindow: """ Load chat history of the specified jid """ - self.jid_entry.get_child().set_text(jid) + self._ui.query_entry.get_child().set_text(jid) if account and account not in self.accounts_seen_online: # Update dict to not only show bare jid GLib.idle_add(next, self._fill_completion_dict()) @@ -810,11 +796,11 @@ class HistoryWindow: # Only in that case because it's called by # self._fill_completion_dict() otherwise self._load_history(jid, account) - self.results_window.set_property('visible', False) + self._ui.results_scrolledwindow.set_property('visible', False) def save_state(self): - x, y = self.window.get_window().get_root_origin() - width, height = self.window.get_size() + x, y = self._ui.history_window.get_window().get_root_origin() + width, height = self._ui.history_window.get_size() app.config.set('history_window_x-position', x) app.config.set('history_window_y-position', y) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4736f518d62b1684e8ec3c339bae0d2854… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4736f518d62b1684e8ec3c339bae0d2854… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Setup: move configuration to setup.cfg to improve readability
by Philipp Hörist 31 Oct '18

31 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3eeed7d2 by André Apitzsch at 2018-10-31T21:47:33Z Setup: move configuration to setup.cfg to improve readability - - - - - 2 changed files: - + setup.cfg - setup.py Changes: ===================================== setup.cfg ===================================== @@ -0,0 +1,43 @@ +[metadata] +name = gajim +version = attr: gajim.__version__ +description = A GTK+ Jabber client +author = Philipp Hörist, Yann Leboulanger +author_email = gajim-devel(a)gajim.org +url = https://gajim.org +license = GPL v3 +classifiers = + Programming Language :: Python :: 3 + +[options] +python_requires = >=3.5 +packages = find: +install_requires = + cssutils>=1.0.2 + keyring + nbxmpp>=0.6.8,<0.7.0 + precis-i18n>=1.0.0 + pyOpenSSL>=0.12 + +[options.package_data] +gajim = + data/activities/*/*/*.png + data/emoticons/*/*.png + data/emoticons/*/LICENSE + data/gui/*.ui + data/icons/hicolor/*/*/*.png + data/icons/hicolor/*/*/*.svg + data/iconsets/*/*/*.gif + data/iconsets/*/*/*.png + data/iconsets/transports/*/*/*.png + data/moods/*/*.png + data/other/* + data/sounds/*.wav + data/style/*.css + data/plugins/*/* + +[options.packages.find] +exclude = + gajim.dev + test* + ===================================== setup.py ===================================== @@ -15,8 +15,6 @@ from distutils.util import convert_path, newer import subprocess -import gajim - pos = [x for x in os.listdir('po') if x[-3:] == ".po"] ALL_LINGUAS = sorted([os.path.split(x)[-1][:-3] for x in pos]) MAN_FILES = ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1'] @@ -213,32 +211,6 @@ class update_po(Command): update_trans() -package_data_activities = ['data/activities/*/*/*.png'] -package_data_emoticons = ['data/emoticons/*/*.png', - 'data/emoticons/*/LICENSE'] -package_data_gui = ['data/gui/*.ui'] -package_data_icons = ['data/icons/hicolor/*/*/*.png', - 'data/icons/hicolor/*/*/*.svg'] -package_data_iconsets = ['data/iconsets/*/*/*.gif', - 'data/iconsets/*/*/*.png', - 'data/iconsets/transports/*/*/*.png'] -package_data_moods = ['data/moods/*/*.png'] -package_data_other = ['data/other/*'] -package_data_sounds = ['data/sounds/*.wav'] -package_data_style = ['data/style/*.css'] -package_plugins_data = ['data/plugins/*/*'] -package_data = (package_data_activities - + package_data_emoticons - + package_data_gui - + package_data_icons - + package_data_iconsets - + package_data_moods - + package_data_other - + package_data_sounds - + package_data_style - + package_plugins_data) - - # only install subdirectories of data data_files_app_icon = [ ("share/icons/hicolor/64x64/apps", @@ -254,16 +226,6 @@ data_files_app_icon = [ data_files = data_files_app_icon setup( - name="gajim", - description='A GTK+ Jabber client', - version=gajim.__version__, - author="Philipp Hörist, Yann Leboulanger", - author_email="gajim-devel(a)gajim.org", - url='https://gajim.org', - license='GPL v3', - classifiers=[ - 'Programming Language :: Python :: 3', - ], cmdclass={ 'build_py': build, 'install': install, @@ -280,14 +242,5 @@ setup( 'gajim-history-manager = gajim.history_manager:main', ] }, - packages=find_packages(exclude=["gajim.dev", "test*"]), - package_data={'gajim': package_data}, - data_files=data_files, - install_requires=[ - 'keyring', - 'nbxmpp>=0.6.8,<0.7.0', - 'pyOpenSSL>=0.12', - 'cssutils>=1.0.2', - 'precis-i18n>=1.0.0', - ] + data_files=data_files ) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3eeed7d2b4c8acf3c7bc10e7d17254e8f3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3eeed7d2b4c8acf3c7bc10e7d17254e8f3… 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