Commits July 2020

commits@gajim.org

1 participants
77 discussions

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist 29 Jul '20

29 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 840dc749 by lovetox at 2020-07-29T16:07:36+02:00 Remove unused code - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== @@ -150,26 +150,6 @@ class OptionsParser: app.config.set('version', new_version) - @staticmethod - def update_ft_proxies(to_remove=None, to_add=None): - if to_remove is None: - to_remove = [] - if to_add is None: - to_add = [] - for account in app.config.get_per('accounts'): - proxies_str = app.config.get_per('accounts', account, - 'file_transfer_proxies') - proxies = [p.strip() for p in proxies_str.split(',')] - for wrong_proxy in to_remove: - if wrong_proxy in proxies: - proxies.remove(wrong_proxy) - for new_proxy in to_add: - if new_proxy not in proxies: - proxies.append(new_proxy) - proxies_str = ', '.join(proxies) - app.config.set_per('accounts', account, 'file_transfer_proxies', - proxies_str) - def update_config_to_01641(self): for account in self.old_values['accounts'].keys(): connection_types = self.old_values['accounts'][account][ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/840dc749dd24f908a60826b5a9db6080… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/840dc749dd24f908a60826b5a9db6080… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist 29 Jul '20

29 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d8101ac4 by lovetox at 2020-07-29T15:43:48+02:00 Remove unused code - - - - - 2 changed files: - gajim/gtk/const.py - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/const.py ===================================== @@ -57,8 +57,7 @@ class SettingKind(IntEnum): FILECHOOSER = 10 CHANGEPASSWORD = 11 COMBO = 12 - CHATSTATE_COMBO = 13 - COLOR = 14 + COLOR = 13 @unique ===================================== gajim/gtk/settings.py ===================================== @@ -98,7 +98,6 @@ class SettingsBox(Gtk.ListBox): SettingKind.HOSTNAME: CutstomHostnameSetting, SettingKind.CHANGEPASSWORD: ChangePasswordSetting, SettingKind.COMBO: ComboSetting, - SettingKind.CHATSTATE_COMBO: ChatstateComboSetting, } if extend is not None: @@ -575,15 +574,6 @@ class ComboSetting(GenericSetting): pass -class ChatstateComboSetting(ComboSetting): - def on_value_change(self, combo): - self.set_value(combo.get_active_id()) - if 'muc' in self.value: - app.config.del_all_per('rooms', 'send_chatstate') - else: - app.config.del_all_per('contacts', 'send_chatstate') - - class ProxyComboSetting(GenericSetting): __gproperties__ = { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d8101ac4ca0f5517ddd5c6c149d6235c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d8101ac4ca0f5517ddd5c6c149d6235c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Don’t create zeroconf default config
by Philipp Hörist 29 Jul '20

29 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e5da209 by lovetox at 2020-07-29T13:31:40+02:00 Don’t create zeroconf default config - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -2047,7 +2047,7 @@ class Interface: self.create_core_handlers_list() self.register_core_handlers() - self.create_zeroconf_default_config() + # self.create_zeroconf_default_config() # if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'active') \ # and app.is_installed('ZEROCONF'): # app.connections[app.ZEROCONF_ACC_NAME] = \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3e5da209c27f23bd6e1299f6e00453c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3e5da209c27f23bd6e1299f6e00453c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move notify_for_muc() into helpers module
by Philipp Hörist 29 Jul '20

29 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a287b218 by lovetox at 2020-07-29T13:20:53+02:00 Move notify_for_muc() into helpers module - - - - - 9 changed files: - gajim/chat_control_base.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/helpers.py - gajim/groupchat_control.py - gajim/gtk/util.py - gajim/message_window.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1138,7 +1138,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if kind == 'incoming': if (not self._type.is_groupchat or - app.config.notify_for_muc(jid) or + helpers.notify_for_muc(jid) or 'marked' in other_tags_for_text): # it's a normal message, or a muc message with want to be # notified about if quitting just after ===================================== gajim/common/config.py ===================================== @@ -628,11 +628,6 @@ class Config: return obj[subname][Option.RESTART] return False - def notify_for_muc(self, room): - all_ = self.get('notify_on_all_muc_messages') - room = self.get_per('rooms', room, 'notify_on_all_messages') - return all_ or room - def get_options(self, optname, return_type=str): options = self.get(optname).split(',') options = [return_type(option.strip()) for option in options] ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -305,7 +305,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.control_focused = self.control.has_focus() if app.config.get('notify_on_new_message'): - notify_for_muc = (app.config.notify_for_muc(self.jid) or + notify_for_muc = (helpers.notify_for_muc(self.jid) or sound == 'highlight') if not notify_for_muc: self.do_popup = False ===================================== gajim/common/helpers.py ===================================== @@ -1570,3 +1570,9 @@ def should_log(account, jid): no_log_for = no_log_for.split() return (account not in no_log_for) and (jid not in no_log_for) + + +def notify_for_muc(room): + all_ = app.config.get('notify_on_all_muc_messages') + room = app.config.get_per('rooms', room, 'notify_on_all_messages') + return all_ or room ===================================== gajim/groupchat_control.py ===================================== @@ -962,7 +962,7 @@ class GroupchatControl(ChatControlBase): def get_nb_unread(self): type_events = ['printed_marked_gc_msg'] - if app.config.notify_for_muc(self.room_jid): + if helpers.notify_for_muc(self.room_jid): type_events.append('printed_gc_msg') nb = len(app.events.get_events(self.account, self.room_jid, @@ -984,7 +984,7 @@ class GroupchatControl(ChatControlBase): """ highlight, sound = None, None - notify = app.config.notify_for_muc(self.room_jid) + notify = helpers.notify_for_muc(self.room_jid) message_sound_enabled = app.config.get_per('soundevents', 'muc_message_received', 'enabled') ===================================== gajim/gtk/util.py ===================================== @@ -48,6 +48,7 @@ from gajim.common import configpaths from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import URL_REGEX +from gajim.common.helpers import notify_for_muc from gajim.common.const import MOODS from gajim.common.const import ACTIVITIES from gajim.common.const import LOCATION_DATA @@ -500,7 +501,7 @@ def get_show_in_systray(type_, jid): """ Return True if this event must be shown in systray, else False """ - notify = app.config.notify_for_muc(jid) + notify = notify_for_muc(jid) if type_ == 'printed_gc_msg' and not notify: # it's not an highlighted message, don't show in systray return False ===================================== gajim/message_window.py ===================================== @@ -36,6 +36,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import Q_ from gajim.common.i18n import _ +from gajim.common.helpers import notify_for_muc from gajim.common.nec import EventHelper from gajim import gtkgui_helpers @@ -491,7 +492,7 @@ class MessageWindow(EventHelper): unread = 0 for ctrl in self.controls(): if (ctrl.is_groupchat and - not app.config.notify_for_muc(ctrl.room_jid) and + not notify_for_muc(ctrl.room_jid) and not ctrl.attention_flag): # count only pm messages unread += ctrl.get_nb_unread_pm() @@ -509,7 +510,7 @@ class MessageWindow(EventHelper): if control.is_groupchat: name = control.contact.get_shown_name() urgent = (control.attention_flag or - app.config.notify_for_muc(control.room_jid)) + notify_for_muc(control.room_jid)) else: name = control.contact.get_shown_name() if control.resource: ===================================== gajim/remote_control.py ===================================== @@ -884,7 +884,7 @@ class GajimRemote(Server): def get_unread_msgs_number(self): unread = app.events.get_nb_events() for event in app.events.get_all_events(['printed_gc_msg']): - if not app.config.notify_for_muc(event.jid): + if not helpers.notify_for_muc(event.jid): unread -= 1 return str(unread) ===================================== gajim/roster_window.py ===================================== @@ -2368,7 +2368,7 @@ class RosterWindow: unread = app.events.get_nb_events() for event in app.events.get_all_events(['printed_gc_msg']): - if not app.config.notify_for_muc(event.jid): + if not helpers.notify_for_muc(event.jid): unread -= 1 # check if we have recent messages View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a287b218a58d8715bb3167c18af7572a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a287b218a58d8715bb3167c18af7572a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move should_log() into helpers module
by Philipp Hörist 29 Jul '20

29 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: cd7c43de by lovetox at 2020-07-29T13:11:55+02:00 Move should_log() into helpers module - - - - - 6 changed files: - gajim/common/config.py - gajim/common/helpers.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/session.py Changes: ===================================== gajim/common/config.py ===================================== @@ -628,19 +628,6 @@ class Config: return obj[subname][Option.RESTART] return False - def should_log(self, account, jid): - """ - Should conversations between a local account and a remote jid be logged? - """ - no_log_for = self.get_per('accounts', account, 'no_log_for') - - if not no_log_for: - no_log_for = '' - - no_log_for = no_log_for.split() - - return (account not in no_log_for) and (jid not in no_log_for) - def notify_for_muc(self, room): all_ = self.get('notify_on_all_muc_messages') room = self.get_per('rooms', room, 'notify_on_all_messages') ===================================== gajim/common/helpers.py ===================================== @@ -1556,3 +1556,17 @@ def get_idle_status_message(state, status_message): 'time': app.config.get(f'auto{state}time') } return message + + +def should_log(account, jid): + """ + Should conversations between a local account and a remote jid be logged? + """ + no_log_for = app.config.get_per('accounts', account, 'no_log_for') + + if not no_log_for: + no_log_for = '' + + no_log_for = no_log_for.split() + + return (account not in no_log_for) and (jid not in no_log_for) ===================================== gajim/common/modules/message.py ===================================== @@ -24,6 +24,7 @@ from nbxmpp.util import generate_id from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import should_log from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message @@ -236,7 +237,7 @@ class Message(BaseModule): def _log_muc_message(self, event): self._check_for_mam_compliance(event.room_jid, event.stanza_id) - if (app.config.should_log(self._account, event.jid) and + if (should_log(self._account, event.jid) and event.msgtxt and event.properties.muc_nickname): # if not event.nick, it means message comes from room itself # usually it hold description and can be send at each connection @@ -355,7 +356,7 @@ class Message(BaseModule): if not message.is_loggable: return - if not app.config.should_log(self._account, message.jid): + if not should_log(self._account, message.jid): return if message.message is None: ===================================== gajim/common/modules/muc.py ===================================== @@ -540,7 +540,7 @@ class MUC(BaseModule): return if (not app.config.get('log_contact_status_changes') or - not app.config.should_log(self._account, properties.jid)): + not helpers.should_log(self._account, properties.jid)): return additional_data = AdditionalDataDict() ===================================== gajim/common/modules/presence.py ===================================== @@ -25,6 +25,7 @@ from gajim.common import app from gajim.common import idle from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent +from gajim.common.helpers import should_log from gajim.common.const import KindConstant from gajim.common.const import ShowConstant from gajim.common.modules.base import BaseModule @@ -228,7 +229,7 @@ class Presence(BaseModule): def _log_presence(self, properties): if not app.config.get('log_contact_status_changes'): return - if not app.config.should_log(self._account, properties.jid.getBare()): + if not should_log(self._account, properties.jid.getBare()): return show = ShowConstant[properties.show.name] ===================================== gajim/session.py ===================================== @@ -66,8 +66,7 @@ class ChatControlSession: ) def is_loggable(self): - return app.config.should_log(self.conn.name, - self.jid.getStripped()) + return helpers.should_log(self.conn.name, self.jid.getStripped()) def get_to(self): bare_jid = self.jid.getBare() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd7c43dedb8cea2dbf4770b31455b6ca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd7c43dedb8cea2dbf4770b31455b6ca… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2020