Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Remove default status settings
by Philipp Hörist 29 Jul '20

29 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 24abd478 by lovetox at 2020-07-29T09:31:06+02:00 Remove default status settings Presets can be used instead - - - - - 4 changed files: - gajim/common/config.py - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py - gajim/roster_window.py Changes: ===================================== gajim/common/config.py ===================================== @@ -337,10 +337,6 @@ class Config: 'mood': [opt_str, ''], 'mood_text': [opt_str, ''], }, {}), - 'defaultstatusmsg': ({ - 'enabled': [opt_bool, False], - 'message': [opt_str, ''], - }, {}), 'soundevents': ({ 'enabled': [opt_bool, True], 'path': [opt_str, ''], @@ -390,14 +386,6 @@ class Config: '_last_offline': ['', '', '', '', '', ''], } - defaultstatusmsg_default = { - 'online': [False, _('I’m available.')], - 'away': [False, _('Be right back.')], - 'xa': [False, _('I’m not available.')], - 'dnd': [False, _('Do not disturb.')], - 'offline': [False, _('Bye!')], - } - soundevents_default = { 'attention_received': [True, 'attention.wav'], 'first_message_received': [True, 'message1.wav'], @@ -691,9 +679,3 @@ class Config: self.add_per('soundevents', event) self.set_per('soundevents', event, 'enabled', default[0]) self.set_per('soundevents', event, 'path', default[1]) - - for status in self.defaultstatusmsg_default: - default = self.defaultstatusmsg_default[status] - self.add_per('defaultstatusmsg', status) - self.set_per('defaultstatusmsg', status, 'enabled', default[0]) - self.set_per('defaultstatusmsg', status, 'message', default[1]) ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1258,6 +1258,7 @@ <object class="GtkBox" id="status_tab"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> @@ -1436,6 +1437,7 @@ $T will be replaced by auto-not-available timeout.</property> <object class="GtkFrame"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -1443,6 +1445,7 @@ $T will be replaced by auto-not-available timeout.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="valign">start</property> <property name="margin_top">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> @@ -1536,74 +1539,6 @@ $T will be replaced by auto-not-available timeout.</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkScrolledWindow" id="default_message_scrolledwindow"> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">If enabled, Gajim will not ask for a status message. The specified default message will be used instead.</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="default_msg_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">default_message_liststore</property> - <property name="search_column">0</property> - <signal name="cursor-changed" handler="on_msg_treeview_cursor_changed" swapped="no"/> - <signal name="key-press-event" handler="on_msg_treeview_key_press_event" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> - <child> - <object class="GtkTreeViewColumn" id="status"> - <property name="resizable">True</property> - <property name="title" translatable="yes">Status</property> - <child> - <object class="GtkCellRendererText" id="statustext"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="defaultmsg"> - <property name="resizable">True</property> - <property name="title" translatable="yes">Default Message</property> - <property name="expand">True</property> - <child> - <object class="GtkCellRendererText" id="defaultmessage"> - <property name="editable">True</property> - <signal name="edited" handler="on_default_msg_cell_edited" swapped="no"/> - </object> - <attributes> - <attribute name="text">2</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="enabled"> - <property name="title" translatable="yes">Enabled</property> - <child> - <object class="GtkCellRendererToggle" id="enable"> - <signal name="toggled" handler="default_msg_toggled_cb" swapped="no"/> - </object> - <attributes> - <attribute name="active">3</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> </child> <child type="label"> @@ -1640,6 +1575,7 @@ $T will be replaced by auto-not-available timeout.</property> <property name="column_spacing">12</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="height_request">250</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> ===================================== gajim/gtk/preferences.py ===================================== @@ -278,9 +278,6 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('ask_offline_status') self._ui.prompt_offline_status_message_checkbutton.set_active(st) - # Default status messages - self.fill_default_msg_treeview() - # Status messages renderer = Gtk.CellRendererText() renderer.connect('edited', self.on_msg_cell_edited) @@ -442,8 +439,6 @@ class Preferences(Gtk.ApplicationWindow): self.on_msg_treemodel_row_changed) self._ui.msg_treeview.get_model().connect('row-deleted', self.on_msg_treemodel_row_deleted) - self._ui.default_msg_treeview.get_model().connect('row-changed', - self.on_default_msg_treemodel_row_changed) self.sounds_preferences = None self.theme_preferences = None @@ -704,38 +699,6 @@ class Preferences(Gtk.ApplicationWindow): def on_prompt_offline_status_message_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'ask_offline_status') - def fill_default_msg_treeview(self): - model = self._ui.default_msg_treeview.get_model() - model.clear() - status = [] - for status_ in app.config.get_per('defaultstatusmsg'): - status.append(status_) - status.sort() - for status_ in status: - msg = app.config.get_per('defaultstatusmsg', status_, 'message') - msg = helpers.from_one_line(msg) - enabled = app.config.get_per('defaultstatusmsg', status_, 'enabled') - iter_ = model.append() - uf_show = helpers.get_uf_show(status_) - model.set(iter_, 0, status_, 1, uf_show, 2, msg, 3, enabled) - - def on_default_msg_cell_edited(self, cell, row, new_text): - model = self._ui.default_msg_treeview.get_model() - iter_ = model.get_iter_from_string(row) - model.set_value(iter_, 2, new_text) - - def default_msg_toggled_cb(self, cell, path): - model = self._ui.default_msg_treeview.get_model() - model[path][3] = not model[path][3] - - def on_default_msg_treemodel_row_changed(self, model, path, iter_): - status = model[iter_][0] - message = model[iter_][2] - message = helpers.to_one_line(message) - app.config.set_per('defaultstatusmsg', status, 'enabled', - model[iter_][3]) - app.config.set_per('defaultstatusmsg', status, 'message', message) - def save_status_messages(self, model): for msg in app.config.get_per('statusmsg'): app.config.del_per('statusmsg', msg) ===================================== gajim/roster_window.py ===================================== @@ -2160,23 +2160,19 @@ class RosterWindow: self._status_selector.update() def get_status_message(self, show, on_response, show_pep=True, - always_ask=False): + always_ask=False): """ Get the status message by: - 1/ looking in default status message - 2/ asking to user if needed depending on ask_on(ff)line_status and - always_ask + asking to user if needed depending on ask_on(ff)line_status and + always_ask show_pep can be False to hide pep things from status message or True """ - empty_pep = {'activity': '', 'subactivity': '', 'activity_text': '', - 'mood': '', 'mood_text': ''} - if show in app.config.get_per('defaultstatusmsg'): - if app.config.get_per('defaultstatusmsg', show, 'enabled'): - msg = app.config.get_per('defaultstatusmsg', show, 'message') - msg = helpers.from_one_line(msg) - on_response(msg, empty_pep) - return + empty_pep = {'activity': '', + 'subactivity': '', + 'activity_text': '', + 'mood': '', + 'mood_text': ''} if not always_ask and ((show == 'online' and not app.config.get( 'ask_online_status')) or (show == 'offline' and not \ app.config.get('ask_offline_status'))): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/24abd47827b04c9e7a7825644b06ff6c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/24abd47827b04c9e7a7825644b06ff6c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatRoster: Don’t fix height of rows
by Philipp Hörist 27 Jul '20

27 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab799177 by lovetox at 2020-07-27T21:57:31+02:00 GroupchatRoster: Don’t fix height of rows Fixes #10201 - - - - - 2 changed files: - gajim/data/gui/groupchat_roster.ui - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/data/gui/groupchat_roster.ui ===================================== @@ -38,11 +38,12 @@ <child> <object class="GtkCellRendererPixbuf" id="avatar_renderer"> <property name="width">40</property> + <property name="ypad">3</property> <property name="xalign">0</property> </object> <attributes> <attribute name="visible">3</attribute> - <attribute name="surface">0</attribute> + <attribute name="surface">0</attribute> </attributes> </child> <child> ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -260,13 +260,7 @@ class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): if not has_parent: renderer.set_property('weight', 600) - renderer.set_property('height', 32) - - elif app.config.get('show_status_msgs_in_roster'): - renderer.set_property('height', 38) - - else: - renderer.set_property('height', 32) + renderer.set_property('ypad', 6) def _on_roster_row_activated(self, _treeview, path, _column): iter_ = self._store.get_iter(path) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab799177efdd926fbba9bd392036901c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab799177efdd926fbba9bd392036901c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AccountWizard: Validate host and port
by Philipp Hörist 27 Jul '20

27 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 618b9b07 by lovetox at 2020-07-27T13:09:58+02:00 AccountWizard: Validate host and port - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -22,6 +22,7 @@ from gi.repository import Gio from nbxmpp.client import Client from nbxmpp.protocol import JID +from nbxmpp.protocol import validate_domainpart from nbxmpp.const import Mode from nbxmpp.const import StreamError from nbxmpp.const import ConnectionProtocol @@ -61,7 +62,8 @@ class AccountWizard(Assistant): css_class='suggested-action') self.add_button('connect', _('Connect'), css_class='suggested-action') self.add_button('next', _('Next'), css_class='suggested-action') - self.add_button('login', _('Log In'), css_class='suggested-action') + self.add_button('login', _('Log In'), complete=True, + css_class='suggested-action') self.add_button('back', _('Back')) self.add_pages({'login': Login(self._on_button_clicked), @@ -302,7 +304,8 @@ class AccountWizard(Assistant): advanced, ignore_all_errors) - self._client.subscribe('anonymous-supported', self._on_anonymous_supported) + self._client.subscribe('anonymous-supported', + self._on_anonymous_supported) self._client.connect() def _register_with_server(self, ignore_all_errors=False): @@ -675,38 +678,16 @@ class Signup(Page): open_uri(server) return Gdk.EVENT_STOP - def _check_port_entry(self): - port = self._ui.custom_port_entry.get_text() - if port == '': - self._show_icon(False) - return False + def _set_complete(self, *args): try: - port = int(port) + self.get_server() except Exception: - self._show_icon(True) - self._ui.custom_port_entry.set_icon_tooltip_text( - Gtk.EntryIconPosition.SECONDARY, _('Must be a port number')) - return False - - if port not in range(0, 65535): - self._show_icon(True) - self._ui.custom_port_entry.set_icon_tooltip_text( - Gtk.EntryIconPosition.SECONDARY, - _('Port must be a number between 0 and 65535')) - return False - - self._show_icon(False) - return True - - def _show_icon(self, show): - icon = 'dialog-warning-symbolic' if show else None - self._ui.log_in_address_entry.set_icon_from_icon_name( - Gtk.EntryIconPosition.SECONDARY, icon) + self.complete = False + self._ui.visit_server_button.set_visible(False) + else: + self.complete = True + self._ui.visit_server_button.set_visible(True) - def _set_complete(self, *args): - server = self._ui.server_comboboxtext_sign_up_entry.get_text() - self._ui.visit_server_button.set_visible(server) - self.complete = server self.get_toplevel().update_page_complete() def is_anonymous(self): @@ -716,7 +697,8 @@ class Signup(Page): return self._ui.sign_up_advanced_checkbutton.get_active() def get_server(self): - return self._ui.server_comboboxtext_sign_up_entry.get_text() + return validate_domainpart( + self._ui.server_comboboxtext_sign_up_entry.get_text()) @staticmethod def _on_activate_link(_label, uri): @@ -730,10 +712,13 @@ class AdvancedSettings(Page): def __init__(self): Page.__init__(self) self.title = _('Advanced settings') + self.complete = False self._ui = get_builder('account_wizard.ui') self._ui.manage_proxies_button.connect('clicked', self._on_proxy_manager) + self._ui.custom_host_entry.connect('changed', self._set_complete) + self._ui.custom_port_entry.connect('changed', self._set_complete) self.pack_start(self._ui.advanced_grid, True, True, 0) self.show_all() @@ -771,6 +756,59 @@ class AdvancedSettings(Page): protocol, ConnectionType(con_type)) + def _show_host_icon(self, show): + icon = 'dialog-warning-symbolic' if show else None + self._ui.custom_host_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) + + def _show_port_icon(self, show): + icon = 'dialog-warning-symbolic' if show else None + self._ui.custom_port_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) + + def _validate_host(self): + host = self._ui.custom_host_entry.get_text() + try: + validate_domainpart(host) + except Exception: + self._show_host_icon(True) + self._ui.custom_host_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, _('Invalid domain name')) + return False + + self._show_host_icon(False) + return True + + def _validate_port(self): + port = self._ui.custom_port_entry.get_text() + if not port: + self._show_port_icon(False) + return False + + try: + port = int(port) + except Exception: + self._show_port_icon(True) + self._ui.custom_port_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, _('Must be a port number')) + return False + + if port not in range(0, 65535): + self._show_port_icon(True) + self._ui.custom_port_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, + _('Port must be a number between 0 and 65535')) + return False + + self._show_port_icon(False) + return True + + def _set_complete(self, *args): + port_valid = self._validate_port() + host_valid = self._validate_host() + self.complete = port_valid and host_valid + self.get_toplevel().update_page_complete() + class SecurityWarning(Page): def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/618b9b076d4917ff63323963a0a50b3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/618b9b076d4917ff63323963a0a50b3a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Perform UTS46 mapping on domain names
by Philipp Hörist 26 Jul '20

26 Jul '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 16f028a3 by lovetox at 2020-07-26T18:30:08+02:00 Perform UTS46 mapping on domain names http://unicode.org/reports/tr46/ - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -735,7 +735,7 @@ def validate_domainpart(domainpart): domainpart = domainpart[:-1] try: - domainpart = idna.encode(domainpart) + domainpart = idna.encode(domainpart, uts46=True) except Exception: raise DomainpartNotAllowedChar View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/16f028a3fa83eb5481c60425… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/16f028a3fa83eb5481c60425… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: PrivacyLists: Remove obsolete UI files
by Philipp Hörist 26 Jul '20

26 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: fca90629 by wurstsalat at 2020-07-26T12:07:10+02:00 PrivacyLists: Remove obsolete UI files - - - - - ce419810 by wurstsalat at 2020-07-26T12:08:57+02:00 AddContactWindow: Make button strings translatable - - - - - 3 changed files: - gajim/data/gui/add_new_contact_window.ui - − gajim/data/gui/privacy_list_window.ui - − gajim/data/gui/privacy_lists_window.ui Changes: ===================================== gajim/data/gui/add_new_contact_window.ui ===================================== @@ -16,11 +16,6 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">user-info-symbolic</property> - </object> <object class="GtkTextBuffer" id="message_textbuffer"> <property name="text" translatable="yes">I would like to add you to my contact list.</property> <signal name="end-user-action" handler="on_message_textbuffer_changed" swapped="no"/> @@ -45,12 +40,9 @@ <property name="width_request">400</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_start">18</property> - <property name="margin_end">18</property> - <property name="margin_bottom">18</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <property name="baseline_position">top</property> <child> <object class="GtkLabel" id="prompt_label"> <property name="can_focus">False</property> @@ -293,8 +285,14 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Query Contact Info</property> - <property name="image">image1</property> <signal name="clicked" handler="on_show_contact_info_button_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">user-info-symbolic</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> @@ -450,7 +448,7 @@ to add a contact from this protocol.</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">_Cancel</property> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -466,7 +464,7 @@ to add a contact from this protocol.</property> </child> <child> <object class="GtkButton" id="add_button"> - <property name="label">_Add</property> + <property name="label" translatable="yes">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> ===================================== gajim/data/gui/privacy_list_window.ui deleted ===================================== @@ -1,700 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">100</property> - <property name="value">1</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">none</col> - </row> - <row> - <col id="0" translatable="yes">both</col> - </row> - <row> - <col id="0" translatable="yes">from</col> - </row> - <row> - <col id="0" translatable="yes">to</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkListStore" id="liststore3"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkWindow" id="privacy_list_edit_window"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="title" translatable="yes">Privacy List</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="_on_edit_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> - <child> - <object class="GtkBox" id="main_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="title_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkLabel" id="privacy_lists_title_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Privacy List</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="privacy_list_active_checkbutton"> - <property name="label" translatable="yes">Active for this session</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="_on_privacy_list_active_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="privacy_list_default_checkbutton"> - <property name="label" translatable="yes">Active on each startup</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="_on_privacy_list_default_toggled" swapped="no"/> - </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">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="title_hseparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="list_of_rules_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">List of rules</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="list_of_rules_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore3</property> - <signal name="changed" handler="_on_list_of_rules_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext3"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="delete_open_buttons_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton" id="new_rule_button"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">5</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_new_rule_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="delete_rule_button"> - <property name="label">gtk-remove</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">5</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_delete_rule_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="open_rule_button"> - <property name="label">gtk-edit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">6</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_open_rule_button_clicked" swapped="no"/> - </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">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkBox" id="add_edit_vbox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="border_width">5</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkSeparator" id="edit_between_list_edit_hseparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="add_edit_rule_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Add / Edit a rule</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="edit_fields_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkBox" id="edit_allow_deny_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkRadioButton" id="edit_allow_radiobutton"> - <property name="label" translatable="yes">Allow</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="edit_deny_radiobutton"> - <property name="label" translatable="yes">Deny</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - <property name="group">edit_allow_radiobutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="edit_type_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkBox" id="edit_type_jabberid_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <child> - <object class="GtkRadioButton" id="edit_type_jabberid_radiobutton"> - <property name="label" translatable="yes">XMPP Address</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edit_type_jabberid_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</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="GtkBox" id="edit_type_group_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <child> - <object class="GtkRadioButton" id="edit_type_group_radiobutton"> - <property name="label" translatable="yes">all in the group</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - <property name="group">edit_type_jabberid_radiobutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="edit_type_group_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore2</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="edit_type_subscription_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <child> - <object class="GtkRadioButton" id="edit_type_subscription_radiobutton"> - <property name="label" translatable="yes">all by subscription</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - <property name="group">edit_type_jabberid_radiobutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="edit_type_subscription_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</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> - <child> - <object class="GtkBox" id="edit_type_select_all_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">10</property> - <child> - <object class="GtkRadioButton" id="edit_type_select_all_radiobutton"> - <property name="label" translatable="yes">All</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - <property name="group">edit_type_jabberid_radiobutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="edit_items_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkCheckButton" id="edit_send_messages_checkbutton"> - <property name="label" translatable="yes">to send me messages</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="edit_queries_send_checkbutton"> - <property name="label" translatable="yes">to send me queries</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="edit_send_status_checkbutton"> - <property name="label" translatable="yes">to view my status</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="edit_view_status_checkbutton"> - <property name="label" translatable="yes">to send me status</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="xalign">0.5</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="edit_all_checkbutton"> - <property name="label" translatable="yes">All (including subscription)</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_edit_all_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="edit_order_new_save_buttons_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkBox" id="edit_order_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="edit_order_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Order:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="edit_order_spinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="save_rule_button"> - <property name="label">gtk-save</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">5</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_save_rule_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="edit_last_buttons_separator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_close_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== gajim/data/gui/privacy_lists_window.ui deleted ===================================== @@ -1,194 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkWindow" id="privacy_lists_first_window"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="title">window1</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="_on_privacy_lists_first_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> - <child> - <object class="GtkBox" id="vbox1"> - <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" id="hbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Privacy Lists:</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="list_of_privacy_lists_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="vbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkButtonBox" id="hbuttonbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">spread</property> - <child> - <object class="GtkButton" id="delete_privacy_list_button"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">5</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_delete_privacy_list_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="open_privacy_list_button"> - <property name="label">gtk-edit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">5</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_open_privacy_list_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkEntry" id="new_privacy_list_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="new_privacy_list_button"> - <property name="label">gtk-new</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">5</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_new_privacy_list_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_privacy_lists_window_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">5</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_close_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - </object> -</interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/426500fbdf1f44587056ab4a20176b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/426500fbdf1f44587056ab4a20176b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove show value 'chat' from status selectors
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 426500fb by Daniel Brötzmann at 2020-07-25T13:41:29+02:00 Remove show value 'chat' from status selectors - - - - - 2 changed files: - gajim/common/config.py - gajim/roster_window.py Changes: ===================================== gajim/common/config.py ===================================== @@ -391,10 +391,9 @@ class Config: } defaultstatusmsg_default = { - 'online': [False, _('I\'m available.')], - 'chat': [False, _('I\'m free for chat.')], + 'online': [False, _('I’m available.')], 'away': [False, _('Be right back.')], - 'xa': [False, _('I\'m not available.')], + 'xa': [False, _('I’m not available.')], 'dnd': [False, _('Do not disturb.')], 'offline': [False, _('Bye!')], } ===================================== gajim/roster_window.py ===================================== @@ -4506,7 +4506,7 @@ class RosterWindow: sub_menu = Gtk.Menu() status_menuitem.set_submenu(sub_menu) - for show in ('online', 'chat', 'away', 'xa', 'dnd'): + for show in ('online', 'away', 'xa', 'dnd'): uf_show = helpers.get_uf_show(show, use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/426500fbdf1f44587056ab4a20176b82… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/426500fbdf1f44587056ab4a20176b82… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Change order and visibilty of checkbuttons
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 11a687b5 by lovetox at 2020-07-25T13:39:03+02:00 Preferences: Change order and visibilty of checkbuttons - Hide update check on linux - Remove Windows only tooltip - Change order of elements - - - - - 1 changed file: - gajim/data/gui/preferences_window.ui Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment_status_auto_away"> @@ -2719,6 +2719,25 @@ to discover one from the server. (Example: stun.iptel.org)</property> <property name="position">2</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="update_check"> + <property name="label" translatable="yes">_Check for Gajim updates periodically</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Enables a weekly update check</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_update_check_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -2768,27 +2787,7 @@ to discover one from the server. (Example: stun.iptel.org)</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="update_check"> - <property name="label" translatable="yes">_Check for Gajim updates periodically</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Enables a weekly update check (Windows only)</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="_on_update_check_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -2805,7 +2804,7 @@ to discover one from the server. (Example: stun.iptel.org)</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </object> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11a687b5f230cbaf33c70e69eed575fd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11a687b5f230cbaf33c70e69eed575fd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Introduce automatic update check for Gajim
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 14cae62b by wurstsalat at 2020-07-25T13:24:19+02:00 Introduce automatic update check for Gajim - - - - - 4 changed files: - gajim/common/config.py - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== @@ -250,6 +250,8 @@ class Config: 'groupchat_roster_width': [opt_int, 210, _('Width of group chat roster in pixel')], 'dev_force_bookmark_2': [opt_bool, False, _('Force Bookmark 2 usage')], 'show_help_start_chat': [opt_bool, True, _('Shows an info bar with helpful hints in the Start / Join Chat dialog')], + 'check_for_update': [opt_bool, True, _('Check for Gajim updates periodically')], + 'last_update_check': [opt_str, '', _('Date of the last update check')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -2771,6 +2771,26 @@ to discover one from the server. (Example: stun.iptel.org)</property> <property name="position">3</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="update_check"> + <property name="label" translatable="yes">_Check for Gajim updates periodically</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Enables a weekly update check (Windows only)</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_update_check_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> <child> <object class="GtkButton" id="reset_help"> <property name="label" translatable="yes">_Reset Hints</property> ===================================== gajim/gtk/preferences.py ===================================== @@ -14,6 +14,7 @@ import logging import os +import sys from gi.repository import GLib from gi.repository import Gtk @@ -429,6 +430,11 @@ class Preferences(Gtk.ApplicationWindow): self._ui.enable_logging.set_active(app.get_debug_mode()) self._ui.enable_logging.show() + if sys.platform in ('win32', 'darwin'): + st = app.config.get('check_for_update') + self._ui.update_check.set_active(st) + self._ui.update_check.show() + self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) @@ -1066,6 +1072,9 @@ class Preferences(Gtk.ApplicationWindow): def _on_debug_folder_clicked(self, _widget): open_file(configpaths.get('DEBUG')) + def _on_update_check_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'check_for_update') + def _on_reset_help_clicked(self, widget): widget.set_sensitive(False) helping_hints = [ ===================================== gajim/gui_interface.py ===================================== @@ -35,14 +35,18 @@ import os import sys import re import time +import json import logging from functools import partial from threading import Thread +from datetime import datetime from importlib.util import find_spec +from packaging.version import Version as V from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gio +from gi.repository import Soup from nbxmpp import idlequeue from nbxmpp import Hashes2 @@ -91,6 +95,7 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import InvitationReceivedDialog @@ -1839,6 +1844,81 @@ class Interface: app.config.set_per('accounts', app.ZEROCONF_ACC_NAME, 'active', False) + def check_for_updates(self): + if not app.config.get('check_for_update'): + return + + now = datetime.now() + last_check = app.config.get('last_update_check') + if not last_check: + def _on_cancel(): + app.config.set('check_for_update', False) + + def _on_check(): + self._get_latest_release() + + NewConfirmationDialog( + _('Update Check'), + _('Gajim Update Check'), + _('Search for Gajim updates periodically?'), + [DialogButton.make('Cancel', + text=_('_No'), + callback=_on_cancel), + DialogButton.make('Accept', + text=_('_Search Periodically'), + callback=_on_check)]).show() + return + + last_check_time = datetime.strptime(last_check, '%Y-%m-%d %H:%M') + if (now - last_check_time).days < 7: + return + + self._get_latest_release() + + def _get_latest_release(self): + log.info('Checking for Gajim updates') + session = Soup.Session() + session.props.user_agent = 'Gajim %s' % app.version + message = Soup.Message.new('GET', 'https://gajim.org/current-version.json') + session.queue_message(message, self._on_update_checked) + + def _on_update_checked(self, _session, message): + now = datetime.now() + app.config.set('last_update_check', now.strftime('%Y-%m-%d %H:%M')) + + body = message.props.response_body.data + if not body: + log.warning('Could not reach gajim.org for update check') + return + + data = json.loads(body) + latest_version = data['current_version'] + + if V(latest_version) > V(app.version): + def _on_cancel(is_checked): + if is_checked: + app.config.set('check_for_update', False) + + def _on_update(is_checked): + if is_checked: + app.config.set('check_for_update', False) + helpers.open_uri('https://gajim.org/download') + + NewConfirmationCheckDialog( + _('Update Available'), + _('Gajim Update Available'), + _('There is an update available for Gajim ' + '(latest version: %s)' % str(latest_version)), + _('_Do not show again'), + [DialogButton.make('Cancel', + text=_('_Later'), + callback=_on_cancel), + DialogButton.make('Accept', + text=_('_Update Now'), + callback=_on_update)]).show() + else: + log.info('Gajim is up to date') + def run(self, application): if app.config.get('trayicon') != 'never': self.show_systray() @@ -1997,6 +2077,8 @@ class Interface: if sys.platform not in ('win32', 'darwin'): logind.enable() music_track.enable() + else: + GLib.timeout_add_seconds(20, self.check_for_updates) idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, app.config.get('autoxatime') * 60) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/14cae62baa288f1bc9fa8baa23f492cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/14cae62baa288f1bc9fa8baa23f492cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add checkbutton for use_keyring
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 556a861d by wurstsalat at 2020-07-25T12:50:36+02:00 Preferences: Add checkbutton for use_keyring - - - - - 2 changed files: - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -2702,6 +2702,23 @@ to discover one from the server. (Example: stun.iptel.org)</property> <property name="position">1</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="use_keyring_checkbutton"> + <property name="label" translatable="yes">Use your system’s _keyring to store passwords</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_use_keyring_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -2751,7 +2768,7 @@ to discover one from the server. (Example: stun.iptel.org)</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -2768,7 +2785,7 @@ to discover one from the server. (Example: stun.iptel.org)</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> ===================================== gajim/gtk/preferences.py ===================================== @@ -423,6 +423,9 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('log_contact_status_changes') self._ui.log_show_changes_checkbutton.set_active(st) + st = app.config.get('use_keyring') + self._ui.use_keyring_checkbutton.set_active(st) + self._ui.enable_logging.set_active(app.get_debug_mode()) self._ui.enable_logging.show() @@ -1052,6 +1055,10 @@ class Preferences(Gtk.ApplicationWindow): def on_log_show_changes_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'log_contact_status_changes') + # Use system’s keyring + def _on_use_keyring_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'use_keyring') + # Enable debug logging def on_enable_logging_toggled(self, widget): app.set_debug_mode(widget.get_active()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/556a861d0185b678cbc70e2387dd8fe7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/556a861d0185b678cbc70e2387dd8fe7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add StatusSelector with popover
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0d7f2706 by Daniel Brötzmann at 2020-07-25T12:27:43+02:00 Add StatusSelector with popover - - - - - 4 changed files: - gajim/data/gui/roster_window.ui - gajim/data/style/gajim.css - + gajim/gtk/status_selector.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/roster_window.ui ===================================== @@ -3,74 +3,6 @@ <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAccelGroup" id="accelgroup1"/> - <object class="GtkListStore" id="status_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gboolean"/> - </columns> - <data> - <row> - <col id="0">online</col> - <col id="1">online</col> - <col id="2">online</col> - <col id="3">True</col> - </row> - <row> - <col id="0">chat</col> - <col id="1">chat</col> - <col id="2">chat</col> - <col id="3">True</col> - </row> - <row> - <col id="0">away</col> - <col id="1">away</col> - <col id="2">away</col> - <col id="3">True</col> - </row> - <row> - <col id="0">xa</col> - <col id="1">xa</col> - <col id="2">xa</col> - <col id="3">True</col> - </row> - <row> - <col id="0">dnd</col> - <col id="1">dnd</col> - <col id="2">dnd</col> - <col id="3">True</col> - </row> - <row> - <col id="0">SEPARATOR</col> - <col id="1">None</col> - <col id="2">None</col> - <col id="3">True</col> - </row> - <row> - <col id="0" translatable="yes">Change Status Message…</col> - <col id="1">gajim-kbd_input</col> - <col id="2">status</col> - <col id="3">False</col> - </row> - <row> - <col id="0">SEPARATOR</col> - <col id="1">None</col> - <col id="2">None</col> - <col id="3">True</col> - </row> - <row> - <col id="0">offline</col> - <col id="1">offline</col> - <col id="2">offline</col> - <col id="3">True</col> - </row> - </data> - </object> <object class="GtkApplicationWindow" id="roster_window"> <property name="name">RosterWindow</property> <property name="width_request">85</property> @@ -151,36 +83,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkComboBox" id="status_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">status_liststore</property> - <signal name="changed" handler="on_status_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererPixbuf"/> - <attributes> - <attribute name="sensitive">3</attribute> - <attribute name="icon-name">1</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererText"> - <property name="xpad">5</property> - <property name="ellipsize">end</property> - </object> - <attributes> - <attribute name="sensitive">3</attribute> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="resize">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -242,6 +242,7 @@ infobar.error > revealer > box { /* Padding/Margins */ .margin-top6 { margin-top: 6px; } .margin-top12 { margin-top: 12px; } +.margin-3 { margin: 3px; } .margin-12 { margin: 12px; } .margin-18 { margin: 18px; } .padding-18 { margin: 18px; } ===================================== gajim/gtk/status_selector.py ===================================== @@ -0,0 +1,139 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common.helpers import get_uf_show +from gajim.common.helpers import get_global_show +from gajim.common.helpers import statuses_unified +from gajim.common.i18n import _ +from gajim.dialogs import ChangeStatusMessageDialog + +from gajim.gtk.util import get_icon_name + + +class StatusSelector(Gtk.MenuButton): + def __init__(self, compact=False): + Gtk.MenuButton.__init__(self) + self.set_direction(Gtk.ArrowType.UP) + self._compact = compact + self._create_popover() + + self._current_show_icon = Gtk.Image() + self._current_show_icon.set_from_icon_name( + get_icon_name('offline'), Gtk.IconSize.MENU) + + box = Gtk.Box(spacing=6) + box.add(self._current_show_icon) + if not self._compact: + self._current_show_label = Gtk.Label(label=get_uf_show('offline')) + self._current_show_label.set_ellipsize(Pango.EllipsizeMode.END) + self._current_show_label.set_halign(Gtk.Align.START) + self._current_show_label.set_xalign(0) + box.add(self._current_show_label) + self.add(box) + + def _create_popover(self): + popover_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + popover_box.get_style_context().add_class('margin-3') + popover_items = [ + 'online', + 'away', + 'xa', + 'dnd', + 'separator', + 'change_status_message', + 'separator', + 'offline', + ] + + for item in popover_items: + if item == 'separator': + popover_box.add(Gtk.Separator()) + continue + + show_icon = Gtk.Image() + show_label = Gtk.Label() + show_label.set_halign(Gtk.Align.START) + + if item == 'change_status_message': + show_icon.set_from_icon_name('document-edit-symbolic', + Gtk.IconSize.MENU) + show_label.set_text_with_mnemonic(_('_Change Status Message')) + else: + show_icon.set_from_icon_name(get_icon_name(item), + Gtk.IconSize.MENU) + show_label.set_text_with_mnemonic( + get_uf_show(item, use_mnemonic=True)) + + show_box = Gtk.Box(spacing=6) + show_box.add(show_icon) + show_box.add(show_label) + + button = Gtk.Button() + button.set_name(item) + button.set_relief(Gtk.ReliefStyle.NONE) + button.add(show_box) + button.connect('clicked', self._on_change_status) + + if item == 'change_status_message': + self._change_status_message = button + + popover_box.add(button) + + popover_box.show_all() + self._status_popover = Gtk.Popover() + self._status_popover.add(popover_box) + self.set_popover(self._status_popover) + + def _on_change_status(self, button): + def _on_response(message, pep_dict): + if message is None: # None if user pressed Cancel + return + for account in app.contacts.get_accounts(): + sync_account = app.config.get_per( + 'accounts', account, 'sync_with_global_status') + if not sync_account: + continue + app.interface.roster.send_status(account, new_show, message) + app.interface.roster.send_pep(account, pep_dict) + + self._status_popover.popdown() + new_show = button.get_name() + if new_show == 'change_status_message': + new_show = get_global_show() + ChangeStatusMessageDialog(_on_response, new_show) + return + + app.interface.roster.get_status_message(new_show, _on_response) + + def update(self): + show = get_global_show() + uf_show = get_uf_show(show) + self._current_show_icon.set_from_icon_name( + get_icon_name(show), Gtk.IconSize.MENU) + if statuses_unified(): + self._current_show_icon.set_tooltip_text(_('Status: %s') % uf_show) + if not self._compact: + self._current_show_label.set_text(uf_show) + else: + show_label = _('%s (desynced)') % uf_show + self._current_show_icon.set_tooltip_text( + _('Status: %s') % show_label) + if not self._compact: + self._current_show_label.set_text(show_label) + + self._change_status_message.set_sensitive(show != 'offline') ===================================== gajim/roster_window.py ===================================== @@ -76,6 +76,7 @@ from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.adhoc import AdHocCommand +from gajim.gtk.status_selector import StatusSelector from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import restore_roster_position @@ -247,26 +248,6 @@ class RosterWindow: return True return False - @staticmethod - def _status_cell_data_func(cell_layout, cell, tree_model, iter_): - if isinstance(cell, Gtk.CellRendererPixbuf): - icon_name = tree_model[iter_][1] - if icon_name is None: - return - if tree_model[iter_][2] == 'status': - cell.set_property('icon_name', icon_name) - else: - iconset_name = get_icon_name(icon_name) - cell.set_property('icon_name', iconset_name) - else: - show = tree_model[iter_][0] - id_ = tree_model[iter_][2] - if id_ not in ('status', 'desync'): - show = helpers.get_uf_show(show) - cell.set_property('text', show) - - - ############################################################################# ### Methods for adding and removing roster window items ############################################################################# @@ -2083,6 +2064,7 @@ class RosterWindow: self.delete_pep(app.get_jid_from_account(account), account) app.connections[account].change_status(status, txt) + self._status_selector.update() def chg_contact_status(self, contact, show, status, account): """ @@ -2173,7 +2155,9 @@ class RosterWindow: for contact in [c for c in lcontact if ( (c.show != 'offline' or c.is_transport()) and not ctrl)]: self.chg_contact_status(contact, 'offline', '', account) - self.update_status_combobox() + if app.interface.systray_enabled: + app.interface.systray.change_status(show) + self._status_selector.update() def get_status_message(self, show, on_response, show_pep=True, always_ask=False): @@ -2211,44 +2195,6 @@ class RosterWindow: self.send_pep(account, pep_dict) self.get_status_message(status, on_response) - def update_status_combobox(self): - # table to change index in connection.connected to index in combobox - table = { - 'offline':8, - 'connecting':8, - 'error': 8, - 'online':0, - 'chat':1, - 'away':2, - 'xa':3, - 'dnd':4 - } - - liststore = self.status_combobox.get_model() - - # Check if a desync'ed status entry and separator is currently - # in the liststore and remove it. - while len(liststore) > 9: - titer = liststore.get_iter_first() - liststore.remove(titer) - - show = helpers.get_global_show() - # temporarily block signal in order not to send status that we show - # in the combobox - self.combobox_callback_active = False - if helpers.statuses_unified(): - self.status_combobox.set_active(table[show]) - else: - uf_show = helpers.get_uf_show(show) - liststore.prepend(['SEPARATOR', None, '', True]) - status_combobox_text = uf_show + ' (' + _("desynced") + ')' - liststore.prepend( - [status_combobox_text, show, 'desync', False]) - self.status_combobox.set_active(0) - self.combobox_callback_active = True - if app.interface.systray_enabled: - app.interface.systray.change_status(show) - def get_show(self, lcontact): prio = lcontact[0].priority show = lcontact[0].show @@ -2545,17 +2491,10 @@ class RosterWindow: self.rename_self_contact(obj.old_jid, obj.new_jid, obj.conn.name) def _nec_our_show(self, event): - model = self.status_combobox.get_model() - iter_ = model.get_iter_from_string('6') if event.show == 'offline': - # sensitivity for this menuitem - if app.get_number_of_connected_accounts() == 0: - model[iter_][3] = False self.application.set_account_actions_state(event.account) self.application.update_app_actions_state() - else: - # sensitivity for this menuitem - model[iter_][3] = True + self.on_status_changed(event.account, event.show) def _nec_connection_type(self, obj): @@ -3091,20 +3030,18 @@ class RosterWindow: def accel_group_func(self, accel_group, acceleratable, keyval, modifier): # CTRL mask if modifier & Gdk.ModifierType.CONTROL_MASK: - if keyval == Gdk.KEY_s: # CTRL + s - model = self.status_combobox.get_model() - accounts = list(app.connections.keys()) - status = model[self.previous_status_combobox_active][2] - def on_response(message, pep_dict): - if message is not None: # None if user pressed Cancel - for account in accounts: - if not app.config.get_per('accounts', account, - 'sync_with_global_status'): + if keyval == Gdk.KEY_s: # CTRL + s + show = helpers.get_global_show() + def _on_response(message, pep_dict): + if message is not None: # None if user pressed Cancel + for account in app.contacts.get_accounts(): + sync_account = app.config.get_per( + 'accounts', account, 'sync_with_global_status') + if not sync_account: continue - current_show = app.connections[account].status - self.send_status(account, current_show, message) + self.send_status(account, show, message) self.send_pep(account, pep_dict) - dialogs.ChangeStatusMessageDialog(on_response, status) + dialogs.ChangeStatusMessageDialog(_on_response, show) return True if keyval == Gdk.KEY_k: # CTRL + k self.enable_rfilter('') @@ -3281,78 +3218,6 @@ class RosterWindow: DialogButton.make('Remove', callback=on_ok2)]).show() - def on_status_combobox_changed(self, widget): - """ - When we change our status via the combobox - """ - model = self.status_combobox.get_model() - active = self.status_combobox.get_active() - if active == -1: # no active item - return - if not self.combobox_callback_active: - self.previous_status_combobox_active = active - return - accounts = list(app.connections.keys()) - if not accounts: - ErrorDialog(_('No account available'), - _('You must create an account before you can chat with other ' - 'contacts.')) - self.update_status_combobox() - return - - status = model[active][2] - if status == 'status': - # 'Change status message' selected: - # do not change show, just show change status dialog - status = model[self.previous_status_combobox_active][2] - def on_response(message, pep_dict): - if message is not None: # None if user pressed Cancel - for account in accounts: - if not app.config.get_per('accounts', account, - 'sync_with_global_status'): - continue - current_show = app.connections[account].status - self.send_status(account, current_show, message) - self.send_pep(account, pep_dict) - self.combobox_callback_active = False - self.status_combobox.set_active( - self.previous_status_combobox_active) - self.combobox_callback_active = True - dialogs.ChangeStatusMessageDialog(on_response, status) - return - # we are about to change show, so save this new show so in case - # after user chooses "Change status message" menuitem - # we can return to this show - self.previous_status_combobox_active = active - - def on_continue(message, pep_dict): - if message is None: - # user pressed Cancel to change status message dialog - self.update_status_combobox() - return - global_sync_accounts = [] - for acct in accounts: - if app.config.get_per('accounts', acct, - 'sync_with_global_status'): - global_sync_accounts.append(acct) - global_sync_connected_accounts = \ - app.get_number_of_connected_accounts(global_sync_accounts) - for account in accounts: - if not app.config.get_per('accounts', account, - 'sync_with_global_status'): - continue - # we are connected (so we wanna change show and status) - # or no account is connected and we want to connect with new - # show and status - - if not global_sync_connected_accounts > 0 or \ - app.account_is_available(account): - self.send_status(account, status, message) - self.send_pep(account, pep_dict) - self.update_status_combobox() - - self.get_status_message(status, on_continue) - def on_publish_tune_toggled(self, widget, account): active = widget.get_active() app.connections[account].get_module('UserTune').set_enabled(active) @@ -4321,18 +4186,19 @@ class RosterWindow: def update_icons(self): # Update the roster self.setup_and_draw_roster() - # Update the status combobox - self.status_combobox.queue_draw() + # Update the systray if app.interface.systray_enabled: app.interface.systray.set_img() + app.interface.systray.change_status(helpers.get_global_show()) for win in app.interface.msg_win_mgr.windows(): for ctrl in win.controls(): ctrl.update_ui() win.redraw_tab(ctrl) - self.update_status_combobox() + self._status_selector.update() + def set_account_status_icon(self, account): child_iterA = self._get_account_iter(account, self.model) @@ -5294,20 +5160,9 @@ class RosterWindow: # accounts to draw next time we draw accounts. self.accounts_to_draw = [] - # StatusComboBox - self.status_combobox = self.xml.get_object('status_combobox') - pixbuf_renderer, text_renderer = self.status_combobox.get_cells() - self.status_combobox.set_cell_data_func( - pixbuf_renderer, self._status_cell_data_func) - self.status_combobox.set_cell_data_func( - text_renderer, self._status_cell_data_func) - self.status_combobox.set_row_separator_func(self._iter_is_separator) - - self.status_combobox.set_active(8) - # holds index to previously selected item so if - # "change status message..." is selected we can fallback to previously - # selected item and not stay with that item selected - self.previous_status_combobox_active = 8 + # Status selector + self._status_selector = StatusSelector() + self.xml.roster_vbox2.add(self._status_selector) # Enable/Disable checkboxes at start if app.config.get('showoffline'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d7f27068bf86dc988489096af727c6c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d7f27068bf86dc988489096af727c6c… 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