Commits January 2019

commits@gajim.org

1 participants
85 discussions

[Git][gajim/gajim][master] Update CONTRIBUTING.md
by Philipp Hörist 07 Jan '19

07 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab1a64b3 by Philipp Hörist at 2019-01-07T21:20:37Z Update CONTRIBUTING.md - - - - - 1 changed file: - CONTRIBUTING.md Changes: ===================================== CONTRIBUTING.md ===================================== @@ -1,6 +1,8 @@ +If you want to create a fork and use an external account (Github, Google) drop us a message at gajim(a)conference.gajim.org so we can give you the necessary rights + - master - Development branch - gajim_1.0 - Stable Gajim 1.0.x branch - gajim_0.16 - Stable Gajim 0.16.x branch -If you are not familiar with Git please read the [HowTo](https://dev.gajim.org/gajim/gajim/wikis/howtogit) \ No newline at end of file +If you are not familiar with Git please read the [HowTo](https://dev.gajim.org/gajim/gajim/wikis/development/howtogit) \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab1a64b35205970a9870c73ebcfcc5a251… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab1a64b35205970a9870c73ebcfcc5a251… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update README.md
by Philipp Hörist 07 Jan '19

07 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: de8b5cb7 by Philipp Hörist at 2019-01-07T19:59:28Z Update README.md Fixes #9531 - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -7,7 +7,7 @@ - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp +- python3-nbxmpp (>=0.9.90.2) - python3-openssl (>=0.14) - python3-cssutils (>=1.0.2) - python3-keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de8b5cb7a6a376296f0654c560cd0e58fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de8b5cb7a6a376296f0654c560cd0e58fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Downgrade to Gtk 3.24.1
by Philipp Hörist 07 Jan '19

07 Jan '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 60b3a1d0 by Philipp Hörist at 2019-01-07T19:49:37Z Windows: Downgrade to Gtk 3.24.1 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -69,13 +69,20 @@ function create_root { build_pacman --noconfirm -S base } +function download_install_dep () { + curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz \ + http://repo.msys2.org/mingw/"${ARCH}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz + build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz +} + function install_deps { + # Downgrade GLIB, resolver is broken on Windows 7 - curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz \ - https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz - build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz + download_install_dep glib2-2.56.2-1 + # Downgrade Gtk, Gtk 24.2 has broken keyboard layout change + download_install_dep gtk3-3.24.1-1 - build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ + build_pacman --noconfirm -S mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/60b3a1d02e581f678ea85ed331abda34c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/60b3a1d02e581f678ea85ed331abda34c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Chatstates: Add more log output
by Philipp Hörist 06 Jan '19

06 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5776d3de by Philipp Hörist at 2019-01-06T10:23:30Z Chatstates: Add more log output - - - - - 1 changed file: - gajim/common/modules/chatstates.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -301,12 +301,15 @@ class Chatstate: # which are not allowed to see our status if not contact.is_pm_contact: if contact and contact.sub in ('to', 'none'): + log.info('Contact not subscribed: %s', contact.jid) return if contact.show == 'offline': + log.info('Contact offline: %s', contact.jid) return if not contact.supports(nbxmpp.NS_CHATSTATES): + log.info('Chatstates not supported: %s', contact.jid) return if state in (State.ACTIVE, State.COMPOSING): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5776d3de4824cd74c1b9be7bc41277ae66… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5776d3de4824cd74c1b9be7bc41277ae66… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint error
by Philipp Hörist 06 Jan '19

06 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a64d986c by Philipp Hörist at 2019-01-06T01:15:17Z Fix pylint error - - - - - 6a958c57 by Philipp Hörist at 2019-01-06T10:10:07Z Pass contact instead of string Fixes #9529 - - - - - 1 changed file: - gajim/common/modules/chatstates.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -237,7 +237,7 @@ class Chatstate: if not contact.supports(nbxmpp.NS_CHATSTATES): return None - self.set_active(contact.jid) + self.set_active(contact) return 'active' @ensure_enabled @@ -355,8 +355,7 @@ class Chatstate: if contact.is_groupchat(): return app.config.get_per( 'rooms', contact.jid, 'send_chatstate', 'composing_only') - else: - return app.config.get('outgoing_chat_state_notifications') + return app.config.get('outgoing_chat_state_notifications') def remove_delay_timeout(self, contact): timeout = self._delay_timeout_ids.get(contact.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/eb99291d44626eb3dfbdb6ebd72f70652… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/eb99291d44626eb3dfbdb6ebd72f70652… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove unused vars
by Philipp Hörist 06 Jan '19

06 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e308d7a2 by Philipp Hörist at 2019-01-05T23:32:59Z Remove unused vars - - - - - 777b8d72 by Philipp Hörist at 2019-01-05T23:58:07Z Remove print statement - - - - - eb99291d by Philipp Hörist at 2019-01-06T01:01:12Z Add chat state setting per room - Add menu option to the group chat menu for setting the chat state - Up the paused timer to 10 seconds - Default for group chats is composing only - - - - - 6 changed files: - gajim/chat_control_base.py - gajim/common/config.py - gajim/common/modules/bookmarks.py - gajim/common/modules/chatstates.py - gajim/groupchat_control.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -339,7 +339,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.seclabel_combo = self.xml.get_object('label_selector') con = app.connections[self.account] - con.get_module('Chatstate').set_active(self.contact.jid) + con.get_module('Chatstate').set_active(self.contact) id_ = self.msg_textview.connect('text-changed', self._on_message_tv_buffer_changed) @@ -813,7 +813,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if self.parent_win.get_active_jid() == self.contact.jid: # if window is the active one, set last interaction con = app.connections[self.account] - con.get_module('Chatstate').set_mouse_activity(self.contact) + con.get_module('Chatstate').set_mouse_activity( + self.contact, self.msg_textview.has_text()) def _on_message_tv_buffer_changed(self, textview, textbuffer): if textbuffer.get_char_count() and self.encryption: ===================================== gajim/common/config.py ===================================== @@ -443,6 +443,7 @@ class Config: 'print_join_left': [opt_bool, False, _('Show a status message for every join or leave in a group chat')], 'minimize_on_autojoin': [opt_bool, True, _('If the group chat is minimized into the roster on autojoin')], 'minimize_on_close': [opt_bool, True, _('If the group chat is minimized into the roster on close')], + 'send_chatstate': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: all, composing_only, disabled')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -329,10 +329,8 @@ class Bookmarks(AbstractPEPModule): if jid not in app.gc_connected[self._account]: # we are not already connected log.info('Autojoin Bookmark: %s', jid) - minimize = app.config.get_per('rooms', jid, 'minimize_on_autojoin', True) - print(minimize) app.interface.join_gc_room( self._account, jid, bookmark['nick'], bookmark['password'], minimize=minimize) ===================================== gajim/common/modules/chatstates.py ===================================== @@ -40,7 +40,7 @@ from gajim.common.types import ConnectionT log = logging.getLogger('gajim.c.m.chatstates') INACTIVE_AFTER = 60 -PAUSED_AFTER = 5 +PAUSED_AFTER = 10 def ensure_enabled(func): @@ -174,10 +174,6 @@ class Chatstate: @ensure_enabled def _check_last_interaction(self) -> GLib.SOURCE_CONTINUE: - setting = app.config.get('outgoing_chat_state_notifications') - if setting in ('composing_only', 'disabled'): - return GLib.SOURCE_CONTINUE - now = time.time() for jid in list(self._last_mouse_activity.keys()): time_ = self._last_mouse_activity[jid] @@ -222,17 +218,15 @@ class Chatstate: return GLib.SOURCE_CONTINUE @ensure_enabled - def set_active(self, jid: str) -> None: - self._last_mouse_activity[jid] = time.time() - setting = app.config.get('outgoing_chat_state_notifications') - if setting == 'disabled': + def set_active(self, contact: ContactT) -> None: + if self._get_chatstate_setting(contact) == 'disabled': return - self._chatstates[jid] = State.ACTIVE + self._last_mouse_activity[contact.jid] = time.time() + self._chatstates[contact.jid] = State.ACTIVE def get_active_chatstate(self, contact: ContactT) -> Optional[str]: # determines if we add 'active' on outgoing messages - setting = app.config.get('outgoing_chat_state_notifications') - if setting == 'disabled': + if self._get_chatstate_setting(contact) == 'disabled': return None if not contact.is_groupchat(): @@ -277,11 +271,13 @@ class Chatstate: self.remove_delay_timeout(contact) current_state = self._chatstates.get(contact.jid) - setting = app.config.get('outgoing_chat_state_notifications') + setting = self._get_chatstate_setting(contact) if setting == 'disabled': # Send a last 'active' state after user disabled chatstates if current_state is not None: - log.info('Send: %-10s - %s', State.ACTIVE, contact.jid) + log.info('Disabled for %s', contact.jid) + log.info('Send last state: %-10s - %s', + State.ACTIVE, contact.jid) event_attrs = {'account': self._account, 'jid': contact.jid, @@ -317,7 +313,7 @@ class Chatstate: self._last_mouse_activity[contact.jid] = time.time() if setting == 'composing_only': - if state in (State.INACTIVE, State.GONE, State.PAUSED): + if state in (State.INACTIVE, State.GONE): state = State.ACTIVE if current_state == state: @@ -340,18 +336,28 @@ class Chatstate: self._chatstates[contact.jid] = state @ensure_enabled - def set_mouse_activity(self, contact: ContactT) -> None: - self._last_mouse_activity[contact.jid] = time.time() - setting = app.config.get('outgoing_chat_state_notifications') - if setting == 'disabled': + def set_mouse_activity(self, contact: ContactT, was_paused: bool) -> None: + if self._get_chatstate_setting(contact) == 'disabled': return + self._last_mouse_activity[contact.jid] = time.time() if self._chatstates.get(contact.jid) == State.INACTIVE: - self.set_chatstate(contact, State.ACTIVE) + if was_paused: + self.set_chatstate(contact, State.PAUSED) + else: + self.set_chatstate(contact, State.ACTIVE) @ensure_enabled def set_keyboard_activity(self, contact: ContactT) -> None: self._last_keyboard_activity[contact.jid] = time.time() + @staticmethod + def _get_chatstate_setting(contact): + if contact.is_groupchat(): + return app.config.get_per( + 'rooms', contact.jid, 'send_chatstate', 'composing_only') + else: + return app.config.get('outgoing_chat_state_notifications') + def remove_delay_timeout(self, contact): timeout = self._delay_timeout_ids.get(contact.jid) if timeout is not None: ===================================== gajim/groupchat_control.py ===================================== @@ -393,6 +393,16 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_minimize_on_autojoin) self.parent_win.window.add_action(act) + chatstate = app.config.get_per( + 'rooms', self.contact.jid, 'send_chatstate', 'composing_only') + + act = Gio.SimpleAction.new_stateful( + 'send-chatstate-' + self.control_id, + GLib.VariantType.new("s"), + GLib.Variant("s", chatstate)) + act.connect('change-state', self._on_send_chatstate) + self.parent_win.window.add_action(act) + # Enable notify on all for private rooms members_only = muc_caps_cache.supports(self.contact.jid, 'muc#roomconfig_membersonly') @@ -705,13 +715,18 @@ class GroupchatControl(ChatControlBase): def _on_minimize_on_close(self, action, param): action.set_state(param) - minimize = app.config.set_per( - 'rooms', self.contact.jid, 'minimize_on_close', param.get_boolean()) + app.config.set_per('rooms', self.contact.jid, + 'minimize_on_close', param.get_boolean()) def _on_minimize_on_autojoin(self, action, param): action.set_state(param) - minimize = app.config.set_per( - 'rooms', self.contact.jid, 'minimize_on_autojoin', param.get_boolean()) + app.config.set_per('rooms', self.contact.jid, + 'minimize_on_autojoin', param.get_boolean()) + + def _on_send_chatstate(self, action, param): + action.set_state(param) + app.config.set_per('rooms', self.contact.jid, + 'send_chatstate', param.get_string()) def _on_notify_on_all_messages(self, action, param): action.set_state(param) ===================================== gajim/gui_menu_builder.py ===================================== @@ -665,8 +665,9 @@ def get_groupchat_menu(control_id, account, jid): ('win.notify-on-message-', _('Notify on all messages')), ('win.minimize-on-close-', _('Minimize on close')), ('win.minimize-on-autojoin-', _('Minimize on autojoin')), + (_('Send Chatstate'), ['chatstate']), ]), - (_('Sync Threshold'), []), + (_('Sync Threshold'), ['sync']), ('win.change-nick-', _('Change Nick')), ('win.bookmark-', _('Bookmark Room')), ('win.request-voice-', _('Request Voice')), @@ -692,9 +693,11 @@ def get_groupchat_menu(control_id, account, jid): menu.append(label, action_name + control_id) else: label, sub_menu = item - if not sub_menu: + if 'sync' in sub_menu: # Sync threshold menu submenu = build_sync_menu() + elif 'chatstate' in sub_menu: + submenu = build_chatstate_menu() else: # This is a submenu submenu = build_menu(sub_menu) @@ -714,6 +717,20 @@ def get_groupchat_menu(control_id, account, jid): menu.append(label, '%s%s' % (action_name, day)) return menu + def build_chatstate_menu(): + menu = Gio.Menu() + entrys = [ + (_('Disabled'), 'disabled'), + (_('Composing only'), 'composing_only'), + (_('All chat states'), 'all') + ] + + for entry in entrys: + label, setting = entry + action = 'win.send-chatstate-%s::%s' % (control_id, setting) + menu.append(label, action) + return menu + return build_menu(groupchat_menu) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/eebccaf07d2d9709875b0530605d8b3a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/eebccaf07d2d9709875b0530605d8b3a2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: eebccaf0 by Philipp Hörist at 2019-01-05T23:05:12Z Remove unused import - - - - - 1 changed file: - gajim/gtk/bookmarks.py Changes: ===================================== gajim/gtk/bookmarks.py ===================================== @@ -19,7 +19,6 @@ from gi.repository import Gdk from gajim.common import app from gajim.common import helpers -from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim import gui_menu_builder View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eebccaf07d2d9709875b0530605d8b3a28… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eebccaf07d2d9709875b0530605d8b3a28… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont save Gajim settings in bookmarks
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55694b60 by Philipp Hörist at 2019-01-05T23:00:42Z Dont save Gajim settings in bookmarks - Remove print status from bookmarks - Remove minimize on join from bookmarks - Add options to the groupchat menu for both settings Fixes #9463 - - - - - 9 changed files: - gajim/chat_control_base.py - gajim/common/config.py - gajim/common/modules/bookmarks.py - gajim/data/gui/manage_bookmarks_window.ui - gajim/groupchat_control.py - gajim/gtk/bookmarks.py - gajim/gtk/discovery.py - gajim/gtk/join_groupchat.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1065,24 +1065,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return _on_ok(self.contact) - def on_minimize_menuitem_toggled(self, widget): - """ - When a groupchat is minimized, unparent the tab, put it in roster etc - """ - old_value = True - non_minimized_gc = app.config.get_per('accounts', self.account, - 'non_minimized_gc').split() - if self.contact.jid in non_minimized_gc: - old_value = False - minimize = widget.get_active() - if not minimize and not self.contact.jid in non_minimized_gc: - non_minimized_gc.append(self.contact.jid) - if minimize and self.contact.jid in non_minimized_gc: - non_minimized_gc.remove(self.contact.jid) - if old_value != minimize: - app.config.set_per('accounts', self.account, 'non_minimized_gc', - ' '.join(non_minimized_gc)) - def on_notify_menuitem_toggled(self, widget): app.config.set_per('rooms', self.contact.jid, 'notify_on_all_messages', widget.get_active()) ===================================== gajim/common/config.py ===================================== @@ -346,7 +346,6 @@ class Config: 'no_log_for': [opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')], 'sync_logs_with_server': [opt_bool, True, _('On startup, Gajim will download logs stored on server, provided the server supports XEP-0313')], 'allow_no_log_for': [opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')], - 'non_minimized_gc': [opt_str, ''], 'attached_gpg_keys': [opt_str, ''], 'keep_alives_enabled': [opt_bool, True, _('Whitespace sent after inactivity')], 'ping_alives_enabled': [opt_bool, True, _('XMPP ping sent after inactivity')], @@ -442,6 +441,8 @@ class Config: 'notify_on_all_messages': [opt_bool, False, _('State whether a notification is created for every message in this room')], 'print_status': [opt_bool, False, _('Show a status message for all status (away, dnd, etc.) changes of users in a group chat')], 'print_join_left': [opt_bool, False, _('Show a status message for every join or leave in a group chat')], + 'minimize_on_autojoin': [opt_bool, True, _('If the group chat is minimized into the roster on autojoin')], + 'minimize_on_close': [opt_bool, True, _('If the group chat is minimized into the roster on close')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -39,8 +39,6 @@ from gajim.common.modules.util import to_xs_boolean log = logging.getLogger('gajim.c.m.bookmarks') -NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' - class BookmarksData(AbstractPEPData): @@ -222,18 +220,6 @@ class Bookmarks(AbstractPEPModule): if not autojoin_val: # not there (it's optional) autojoin_val = False - minimize_val = conf.getTag('minimize', namespace=NS_GAJIM_BM) - if not minimize_val: - minimize_val = False - else: - minimize_val = minimize_val.getData() - - print_status = conf.getTag('print_status', namespace=NS_GAJIM_BM) - if not print_status: # not there, try old Gajim behaviour - print_status = None - else: - print_status = print_status.getData() - try: jid = helpers.parse_jid(conf.getAttr('jid')) except helpers.InvalidFormat: @@ -245,12 +231,10 @@ class Bookmarks(AbstractPEPModule): 'name': conf.getAttr('name'), 'password': conf.getTagData('password'), 'nick': conf.getTagData('nick'), - 'print_status': print_status } try: bookmark['autojoin'] = from_xs_boolean(autojoin_val) - bookmark['minimize'] = from_xs_boolean(minimize_val) except ValueError as error: log.warning(error) continue @@ -269,8 +253,6 @@ class Bookmarks(AbstractPEPModule): conf_node.setAttr('jid', jid) conf_node.setAttr('autojoin', to_xs_boolean(bm['autojoin'])) conf_node.setAttr('name', bm['name']) - conf_node.setTag('minimize', namespace=NS_GAJIM_BM).setData( - to_xs_boolean(bm['minimize'])) # Only add optional elements if not empty # Note: need to handle both None and '' as empty # thus shouldn't use "is not None" @@ -278,10 +260,6 @@ class Bookmarks(AbstractPEPModule): conf_node.setTagData('nick', bm['nick']) if bm.get('password', None): conf_node.setTagData('password', bm['password']) - if bm.get('print_status', None): - conf_node.setTag( - 'print_status', - namespace=NS_GAJIM_BM).setData(bm['print_status']) return storage_node def _build_node(self, _data): @@ -351,19 +329,21 @@ class Bookmarks(AbstractPEPModule): if jid not in app.gc_connected[self._account]: # we are not already connected log.info('Autojoin Bookmark: %s', jid) + + minimize = app.config.get_per('rooms', jid, + 'minimize_on_autojoin', True) + print(minimize) app.interface.join_gc_room( self._account, jid, bookmark['nick'], - bookmark['password'], minimize=bookmark['minimize']) + bookmark['password'], minimize=minimize) - def add_bookmark(self, name, jid, autojoin, - minimize, password, nick): + def add_bookmark(self, name, jid, autojoin, password, nick): self.bookmarks[jid] = { 'name': name, 'autojoin': autojoin, - 'minimize': minimize, 'password': password, 'nick': nick, - 'print_status': None} + } self.store_bookmarks() app.nec.push_incoming_event( ===================================== gajim/data/gui/manage_bookmarks_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.18"/> <object class="GtkListStore" id="liststore1"> @@ -15,6 +15,9 @@ <property name="default_height">300</property> <property name="type_hint">dialog</property> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> + <child type="titlebar"> + <placeholder/> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -31,7 +34,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow37"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> @@ -324,95 +327,6 @@ </child> </object> </child> - <child> - <object class="GtkListBoxRow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Minimize on Auto Join</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="minimize_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <signal name="state-set" handler="on_minimize_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkListBoxRow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Status messages displayed in chat window</property> - <property name="valign">center</property> - <property name="spacing">18</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Status Messages</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="print_status_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <signal name="changed" handler="on_print_status_combobox_changed" swapped="no"/> - <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="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> <style> <class name="settings"/> </style> @@ -481,8 +395,5 @@ </child> </object> </child> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface> ===================================== gajim/groupchat_control.py ===================================== @@ -375,14 +375,22 @@ class GroupchatControl(ChatControlBase): act.connect("activate", func) self.parent_win.window.add_action(act) - non_minimized_gc = app.config.get_per( - 'accounts', self.account, 'non_minimized_gc').split() - value = self.contact.jid not in non_minimized_gc + minimize = app.config.get_per( + 'rooms', self.contact.jid, 'minimize_on_close', True) act = Gio.SimpleAction.new_stateful( - 'minimize-' + self.control_id, None, - GLib.Variant.new_boolean(value)) - act.connect('change-state', self._on_minimize) + 'minimize-on-close-' + self.control_id, None, + GLib.Variant.new_boolean(minimize)) + act.connect('change-state', self._on_minimize_on_close) + self.parent_win.window.add_action(act) + + minimize = app.config.get_per( + 'rooms', self.contact.jid, 'minimize_on_autojoin', True) + + act = Gio.SimpleAction.new_stateful( + 'minimize-on-autojoin-' + self.control_id, None, + GLib.Variant.new_boolean(minimize)) + act.connect('change-state', self._on_minimize_on_autojoin) self.parent_win.window.add_action(act) # Enable notify on all for private rooms @@ -684,7 +692,6 @@ class GroupchatControl(ChatControlBase): con.get_module('Bookmarks').add_bookmark(self.name, self.room_jid, True, - True, password, self.nick) self.update_actions() @@ -696,22 +703,15 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').request_voice(self.room_jid) - def _on_minimize(self, action, param): - """ - When a groupchat is minimized, unparent the tab, put it in roster etc - """ + def _on_minimize_on_close(self, action, param): action.set_state(param) - non_minimized_gc = app.config.get_per( - 'accounts', self.account, 'non_minimized_gc').split() - - minimize = param.get_boolean() - if minimize: - non_minimized_gc.remove(self.contact.jid) - else: - non_minimized_gc.append(self.contact.jid) + minimize = app.config.set_per( + 'rooms', self.contact.jid, 'minimize_on_close', param.get_boolean()) - app.config.set_per('accounts', self.account, - 'non_minimized_gc', ' '.join(non_minimized_gc)) + def _on_minimize_on_autojoin(self, action, param): + action.set_state(param) + minimize = app.config.set_per( + 'rooms', self.contact.jid, 'minimize_on_autojoin', param.get_boolean()) def _on_notify_on_all_messages(self, action, param): action.set_state(param) @@ -2310,10 +2310,8 @@ class GroupchatControl(ChatControlBase): def minimizable(self): if self.force_non_minimizable: return False - if self.contact.jid not in app.config.get_per('accounts', self.account, - 'non_minimized_gc').split(' '): - return True - return False + return app.config.get_per('rooms', self.contact.jid, + 'minimize_on_close', True) def minimize(self, status='offline'): # Minimize it ===================================== gajim/gtk/bookmarks.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from enum import IntEnum + from gi.repository import Gtk from gi.repository import Gdk @@ -26,6 +28,16 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.util import get_builder +class Row(IntEnum): + ACCOUNT_JID = 0 + ROOM_NAME = 1 + ROOM_JID = 2 + AUTOJOIN = 3 + PASSWORD = 4 + NICK = 5 + LABEL = 6 + + class ManageBookmarksWindow: def __init__(self): self.xml = get_builder('manage_bookmarks_window.ui') @@ -34,10 +46,8 @@ class ManageBookmarksWindow: self.ignore_events = False - # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Password, Nick, - # Show_Status - self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, - str, str, str) + # Account-JID, RoomName, Room-JID, Autojoin, Password, Nick, Name + self.treestore = Gtk.TreeStore(str, str, str, bool, str, str, str) self.treestore.set_sort_column_id(1, Gtk.SortType.ASCENDING) # Store bookmarks in treeview. @@ -45,45 +55,26 @@ class ManageBookmarksWindow: connected_only=True, private_storage_only=True): iter_ = self.treestore.append(None, [ None, account, None, None, - None, None, None, None, account_label]) + None, None, account_label]) con = app.connections[account] bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks() for jid, bookmark in bookmarks.items(): - print_status = bookmark.get('print_status', '') - if print_status not in ('', 'all', 'in_and_out', 'none'): - print_status = '' self.treestore.append(iter_, [account, bookmark['name'], jid, bookmark['autojoin'], - bookmark['minimize'], bookmark['password'], bookmark['nick'], - print_status, bookmark['name']]) - self.print_status_combobox = self.xml.get_object( - 'print_status_combobox') - model = Gtk.ListStore(str, str) - - self.option_list = { - '': _('Default'), 'all': Q_('?print_status:All'), - 'in_and_out': _('Enter and leave only'), - 'none': Q_('?print_status:None')} - for opt, label in sorted(self.option_list.items()): - model.append([label, opt]) - - self.print_status_combobox.set_model(model) - self.print_status_combobox.set_active(1) - self.view = self.xml.get_object('bookmarks_treeview') self.view.set_model(self.treestore) self.view.expand_all() renderer = Gtk.CellRendererText() - column = Gtk.TreeViewColumn('Bookmarks', renderer, text=8) + column = Gtk.TreeViewColumn('Bookmarks', renderer, text=Row.LABEL) self.view.append_column(column) self.selection = self.view.get_selection() @@ -103,7 +94,6 @@ class ManageBookmarksWindow: self.pass_entry = self.xml.get_object('pass_entry') self.pass_entry.connect('changed', self.on_pass_entry_changed) self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton') - self.minimize_checkbutton = self.xml.get_object('minimize_checkbutton') self.settings_box = self.xml.get_object('settings_box') self.remove_bookmark_button = self.xml.get_object( 'remove_bookmark_button') @@ -142,7 +132,7 @@ class ManageBookmarksWindow: nick = app.nicks[account] label = _('New Group Chat') iter_ = self.treestore.append(add_to, [ - account, label, '@', False, False, '', nick, 'in_and_out', label]) + account, label, '@', False, '', nick, label]) self.view.expand_row(model.get_path(add_to), True) self.view.set_cursor(model.get_path(iter_)) @@ -208,14 +198,13 @@ class ManageBookmarksWindow: for bm in account.iterchildren(): # create the bookmark-dict bmdict = { - 'name': bm[1], - 'autojoin': bm[3], - 'minimize': bm[4], - 'password': bm[5], - 'nick': bm[6], - 'print_status': bm[7]} - - jid = bm[2] + 'name': bm[Row.ROOM_NAME], + 'autojoin': bm[Row.AUTOJOIN], + 'password': bm[Row.PASSWORD], + 'nick': bm[Row.NICK], + } + + jid = bm[Row.ROOM_JID] con.get_module('Bookmarks').bookmarks[jid] = bmdict con.get_module('Bookmarks').store_bookmarks() @@ -247,8 +236,8 @@ class ManageBookmarksWindow: return # Fill in the data for childs - self.title_entry.set_text(model[iter_][1]) - room_jid = model[iter_][2] + self.title_entry.set_text(model[iter_][Row.ROOM_NAME]) + room_jid = model[iter_][Row.ROOM_JID] room_jid_s = room_jid.split('@') if len(room_jid_s) == 1: room = '' @@ -260,13 +249,11 @@ class ManageBookmarksWindow: self.room_entry.handler_unblock(self.room_entry_changed_id) self.server_entry.set_text(server) - self.autojoin_checkbutton.set_active(model[iter_][3]) - self.minimize_checkbutton.set_active(model[iter_][4]) + self.autojoin_checkbutton.set_active(model[iter_][Row.AUTOJOIN]) # sensitive only if auto join is checked - self.minimize_checkbutton.set_sensitive(model[iter_][3]) - if model[iter_][5] is not None: - password = model[iter_][5] + if model[iter_][Row.PASSWORD] is not None: + password = model[iter_][Row.PASSWORD] else: password = None @@ -274,16 +261,12 @@ class ManageBookmarksWindow: self.pass_entry.set_text(password) else: self.pass_entry.set_text('') - nick = model[iter_][6] + nick = model[iter_][Row.NICK] if nick: self.nick_entry.set_text(nick) else: self.nick_entry.set_text('') - print_status = model[iter_][7] - opts = sorted(self.option_list.keys()) - self.print_status_combobox.set_active(opts.index(print_status)) - def on_title_entry_changed(self, widget): if self.ignore_events: return @@ -291,7 +274,7 @@ class ManageBookmarksWindow: if iter_: # After removing a bookmark, we got nothing selected if model.iter_parent(iter_): # Don't clear the title field for account nodes - model[iter_][1] = self.title_entry.get_text() + model[iter_][Row.ROOM_NAME] = self.title_entry.get_text() def on_nick_entry_changed(self, widget): if self.ignore_events: @@ -306,9 +289,9 @@ class ManageBookmarksWindow: _('Invalid nickname'), _('Character not allowed'), transient_for=self.window) - self.nick_entry.set_text(model[iter_][6]) + self.nick_entry.set_text(model[iter_][Row.NICK]) return True - model[iter_][6] = nick + model[iter_][Row.NICK] = nick def on_server_entry_focus_out(self, widget, event): if self.ignore_events: @@ -337,9 +320,9 @@ class ManageBookmarksWindow: _('Invalid server'), _('Character not allowed'), transient_for=self.window) - self.server_entry.set_text(model[iter_][2].split('@')[1]) + self.server_entry.set_text(model[iter_][Row.ROOM_JID].split('@')[1]) return True - model[iter_][2] = room_jid + model[iter_][Row.ROOM_JID] = room_jid def on_room_entry_changed(self, widget): if self.ignore_events: @@ -368,39 +351,21 @@ class ManageBookmarksWindow: _('Character not allowed'), transient_for=self.window) return True - model[iter_][2] = room_jid + model[iter_][Row.ROOM_JID] = room_jid def on_pass_entry_changed(self, widget): if self.ignore_events: return (model, iter_) = self.selection.get_selected() if iter_: - model[iter_][5] = self.pass_entry.get_text() + model[iter_][Row.PASSWORD] = self.pass_entry.get_text() def on_autojoin_checkbutton_toggled(self, widget, *args): if self.ignore_events: return (model, iter_) = self.selection.get_selected() if iter_: - model[iter_][3] = self.autojoin_checkbutton.get_active() - self.minimize_checkbutton.set_sensitive(model[iter_][3]) - - def on_minimize_checkbutton_toggled(self, widget, *args): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: - model[iter_][4] = self.minimize_checkbutton.get_active() - - def on_print_status_combobox_changed(self, widget): - if self.ignore_events: - return - active = widget.get_active() - model = widget.get_model() - print_status = model[active][1] - (model2, iter_) = self.selection.get_selected() - if iter_: - model2[iter_][7] = print_status + model[iter_][Row.AUTOJOIN] = self.autojoin_checkbutton.get_active() def clear_fields(self): widgets = [ @@ -409,8 +374,6 @@ class ManageBookmarksWindow: for field in widgets: field.set_text('') self.autojoin_checkbutton.set_active(False) - self.minimize_checkbutton.set_active(False) - self.print_status_combobox.set_active(1) def set_sensitive_all(self, sensitive): widgets = [ ===================================== gajim/gtk/discovery.py ===================================== @@ -1717,7 +1717,6 @@ class MucBrowser(AgentBrowser): con.get_module('Bookmarks').add_bookmark(room_jid.split('@')[0], room_jid, False, - False, '' '') ===================================== gajim/gtk/join_groupchat.py ===================================== @@ -266,7 +266,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): con.get_module('Bookmarks').add_bookmark(name, self.room_jid, autojoin, - True, password, nickname) ===================================== gajim/gui_menu_builder.py ===================================== @@ -663,7 +663,8 @@ def get_groupchat_menu(control_id, account, jid): ('win.print-join-left-', _('Show join/leave')), ('win.print-status-', _('Show status changes')), ('win.notify-on-message-', _('Notify on all messages')), - ('win.minimize-', _('Minimize on close')), + ('win.minimize-on-close-', _('Minimize on close')), + ('win.minimize-on-autojoin-', _('Minimize on autojoin')), ]), (_('Sync Threshold'), []), ('win.change-nick-', _('Change Nick')), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/55694b60bf10b31d0e78a5b1aade51cfce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/55694b60bf10b31d0e78a5b1aade51cfce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint error
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4c17b55a by Philipp Hörist at 2019-01-05T19:17:20Z Fix pylint error - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -431,7 +431,7 @@ class GroupchatControl(ChatControlBase): def update_actions(self): if self.parent_win is None: return - win = self.parent_win.window + contact = app.contacts.get_gc_contact( self.account, self.room_jid, self.nick) con = app.connections[self.account] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4c17b55a91cca31e4b5ec5c3c070652da6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4c17b55a91cca31e4b5ec5c3c070652da6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MUC: Update menu after preference change
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7b558d69 by Philipp Hörist at 2019-01-05T18:43:11Z MUC: Update menu after preference change - Simplify action lookup - - - - - 4aa26545 by Philipp Hörist at 2019-01-05T19:10:08Z MUC: Use default value when printing the status - - - - - 3 changed files: - gajim/groupchat_control.py - gajim/gtk/preferences.py - gajim/privatechat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -437,48 +437,45 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] # Destroy Room - win.lookup_action('destroy-' + self.control_id).set_enabled( - self.is_connected and contact.affiliation.is_owner) + self._get_action('destroy-').set_enabled(self.is_connected and + contact.affiliation.is_owner) # Configure Room - win.lookup_action('configure-' + self.control_id).set_enabled( + self._get_action('configure-').set_enabled( self.is_connected and contact.affiliation in (Affiliation.ADMIN, Affiliation.OWNER)) # Bookmarks con = app.connections[self.account] bookmarked = self.room_jid in con.get_module('Bookmarks').bookmarks - win.lookup_action('bookmark-' + self.control_id).set_enabled( - self.is_connected and not bookmarked) + self._get_action('bookmark-').set_enabled(self.is_connected and + not bookmarked) # Request Voice role = self.get_role(self.nick) - win.lookup_action('request-voice-' + self.control_id).set_enabled( - self.is_connected and role.is_visitor) + self._get_action('request-voice-').set_enabled(self.is_connected and + role.is_visitor) # Change Subject subject = False if contact is not None: subject = muc_caps_cache.is_subject_change_allowed( self.room_jid, contact.affiliation) - win.lookup_action('change-subject-' + self.control_id).set_enabled( - self.is_connected and subject) + self._get_action('change-subject-').set_enabled(self.is_connected and + subject) # Change Nick - win.lookup_action('change-nick-' + self.control_id).set_enabled( - self.is_connected) + self._get_action('change-nick-').set_enabled(self.is_connected) # Execute command - win.lookup_action('execute-command-' + self.control_id).set_enabled( - self.is_connected) + self._get_action('execute-command-').set_enabled(self.is_connected) # Send file (HTTP File Upload) - httpupload = win.lookup_action( - 'send-file-httpupload-' + self.control_id) - httpupload.set_enabled( - self.is_connected and con.get_module('HTTPUpload').available) - win.lookup_action('send-file-' + self.control_id).set_enabled( - httpupload.get_enabled()) + httpupload = self._get_action( + 'send-file-httpupload-') + httpupload.set_enabled(self.is_connected and + con.get_module('HTTPUpload').available) + self._get_action('send-file-').set_enabled(httpupload.get_enabled()) if self.is_connected and httpupload.get_enabled(): tooltip_text = _('Send File…') @@ -488,12 +485,32 @@ class GroupchatControl(ChatControlBase): # Upload Avatar vcard_support = muc_caps_cache.supports(self.room_jid, nbxmpp.NS_VCARD) - win.lookup_action('upload-avatar-' + self.control_id).set_enabled( - self.is_connected and vcard_support and contact.affiliation.is_owner) + self._get_action('upload-avatar-').set_enabled( + self.is_connected and + vcard_support and + contact.affiliation.is_owner) # Sync Threshold has_mam = muc_caps_cache.has_mam(self.room_jid) - win.lookup_action('choose-sync-' + self.control_id).set_enabled(has_mam) + self._get_action('choose-sync-').set_enabled(has_mam) + + # Print join/left + join_default = app.config.get('print_join_left_default') + value = app.config.get_per('rooms', self.contact.jid, + 'print_join_left', join_default) + self._get_action('print-join-left-').set_state( + GLib.Variant.new_boolean(value)) + + # Print join/left + status_default = app.config.get('print_status_muc_default') + value = app.config.get_per('rooms', self.contact.jid, + 'print_status', status_default) + self._get_action('print-status-').set_state( + GLib.Variant.new_boolean(value)) + + def _get_action(self, name): + win = self.parent_win.window + return win.lookup_action(name + self.control_id) def _cell_data_func(self, column, renderer, model, iter_, user_data): # Background color has to be rendered for all cells @@ -1845,12 +1862,15 @@ class GroupchatControl(ChatControlBase): status = '' if status is None else ' (%s)' % status show = helpers.get_uf_show(event.properties.show.value) + status_default = app.config.get('print_status_muc_default') + if event.properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) self.print_conversation(message, 'info', graphics=False) - elif app.config.get_per('rooms', self.room_jid, 'print_status'): + elif app.config.get_per('rooms', self.room_jid, + 'print_status', status_default): message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) ===================================== gajim/gtk/preferences.py ===================================== @@ -621,9 +621,13 @@ class Preferences(Gtk.ApplicationWindow): def _on_join_leave_toggled(self, widget): self.on_checkbutton_toggled(widget, 'print_join_left_default') + for control in self._get_all_muc_controls(): + control.update_actions() def _on_status_change_toggled(self, widget): self.on_checkbutton_toggled(widget, 'print_status_muc_default') + for control in self._get_all_muc_controls(): + control.update_actions() def on_show_chatstate_in_tabs_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_chatstate_in_tabs') ===================================== gajim/privatechat_control.py ===================================== @@ -135,12 +135,15 @@ class PrivateChatControl(ChatControl): status = '' if status is None else ' (%s)' % status show = helpers.get_uf_show(event.properties.show.value) + status_default = app.config.get('print_status_muc_default') + if event.properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) self.print_conversation(message, 'info') - elif app.config.get_per('rooms', self.room_name, 'print_status'): + elif app.config.get_per('rooms', self.room_name, + 'print_status', status_default): message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/19c45510a03bd771238038f61657f460d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/19c45510a03bd771238038f61657f460d… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2019