Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] StatusIcon: Simplify start chat menuitem
by Philipp Hörist 09 Jul '19

09 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 58cfd1e4 by Philipp Hörist at 2019-07-09T22:43:30Z StatusIcon: Simplify start chat menuitem - - - - - 2 changed files: - gajim/data/gui/systray_context_menu.ui - gajim/gtk/statusicon.py Changes: ===================================== gajim/data/gui/systray_context_menu.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -14,11 +14,12 @@ </object> </child> <child> - <object class="GtkMenuItem" id="chat_with_menuitem"> + <object class="GtkMenuItem" id="start_chat_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Start Chat...</property> <property name="use_underline">True</property> + <signal name="activate" handler="on_new_chat" swapped="no"/> </object> </child> <child> ===================================== gajim/gtk/statusicon.py ===================================== @@ -46,7 +46,6 @@ class StatusIcon: def __init__(self): self.single_message_handler_id = None self.show_roster_handler_id = None - self.new_chat_handler_id = None # click somewhere else does not popdown menu. workaround this. self.added_hide_menuitem = False self.status = 'offline' @@ -170,7 +169,7 @@ class StatusIcon: def on_single_message_menuitem_activate(self, widget, account): SingleMessageWindow(account, action='send') - def on_new_chat(self, widget, account): + def on_new_chat(self, _widget): app.app.activate_action('start-chat', GLib.Variant('s', '')) def make_menu(self, event_button, event_time): @@ -180,7 +179,7 @@ class StatusIcon: for m in self.popup_menus: m.destroy() - chat_with_menuitem = self._ui.chat_with_menuitem + start_chat_menuitem = self._ui.start_chat_menuitem single_message_menuitem = self._ui.single_message_menuitem status_menuitem = self._ui.status_menu join_gc_menuitem = self._ui.join_gc_menuitem @@ -191,9 +190,6 @@ class StatusIcon: single_message_menuitem.handler_disconnect( self.single_message_handler_id) self.single_message_handler_id = None - if self.new_chat_handler_id: - chat_with_menuitem.disconnect(self.new_chat_handler_id) - self.new_chat_handler_id = None sub_menu = Gtk.Menu() self.popup_menus.append(sub_menu) @@ -229,34 +225,11 @@ class StatusIcon: iskey = connected_accounts > 0 and not (connected_accounts == 1 and app.zeroconf_is_connected()) - chat_with_menuitem.set_sensitive(iskey) + start_chat_menuitem.set_sensitive(iskey) single_message_menuitem.set_sensitive(iskey) join_gc_menuitem.set_sensitive(iskey) accounts_list = sorted(app.contacts.get_accounts()) - # items that get shown whether an account is zeroconf or not - if connected_accounts > 1: # 2 or more connections? make submenus - account_menu_for_chat_with = Gtk.Menu() - chat_with_menuitem.set_submenu(account_menu_for_chat_with) - self.popup_menus.append(account_menu_for_chat_with) - - for account in accounts_list: - account_label = app.get_account_label(account) - if app.account_is_connected(account): - # for chat_with - item = Gtk.MenuItem.new_with_label( - _('using account %s') % account_label) - account_menu_for_chat_with.append(item) - item.connect('activate', self.on_new_chat, account) - - elif connected_accounts == 1: # one account - # one account connected, no need to show 'as jid' - for account in app.connections: - if app.connections[account].connected > 1: - # for start chat - self.new_chat_handler_id = chat_with_menuitem.connect( - 'activate', self.on_new_chat, account) - break # No other connected account # menu items that don't apply to zeroconf connections if connected_accounts == 1 or (connected_accounts == 2 and \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58cfd1e44fe99b31f0bdf4d928c268e1bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58cfd1e44fe99b31f0bdf4d928c268e1bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused code
by Philipp Hörist 09 Jul '19

09 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7310a2ce by Philipp Hörist at 2019-07-09T20:42:33Z Remove unused code - - - - - 1fa6eeac by Philipp Hörist at 2019-07-09T22:14:34Z StartChat: Add search text argument to action - Remove usage of instance dict - - - - - 7 changed files: - gajim/app_actions.py - gajim/application.py - gajim/data/gui/application_menu.ui - gajim/gtk/start_chat.py - gajim/gtk/statusicon.py - gajim/message_window.py - gajim/remote_control.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -96,11 +96,17 @@ def on_quit(action, param): interface.roster.on_quit_request() -def on_new_chat(action, param): - if 'start_chat' in app.interface.instances: - app.interface.instances['start_chat'].present() +def on_new_chat(_action, param): + search_text = param.get_string() + window = app.get_app_window(StartChatDialog) + if window is None: + window = StartChatDialog() else: - app.interface.instances['start_chat'] = StartChatDialog() + window.present() + + if search_text: + window.set_search_text(search_text) + # Accounts Actions @@ -376,12 +382,6 @@ def start_chat(_action, param): app.interface.new_chat_from_jid(account, jid) -def join_groupchat(_action, param): - account, jid = param.get_strv() - room_jid = jid.split('?')[0] - app.interface.join_gc_minimal(account, room_jid) - - def on_browse_history(_action, param): jid, account = None, None if param is not None: ===================================== gajim/application.py ===================================== @@ -267,9 +267,9 @@ class GajimApplication(Gtk.Application): if len(accounts) == 1: app.interface.new_chat_from_jid(accounts[0], jid, message) else: - self.activate_action('start-chat') - start_chat_window = app.interface.instances['start_chat'] - start_chat_window.search_entry.set_text(jid) + self.activate_action('start-chat', GLib.Variant('s', '')) + start_chat = app.get_app_window('StartChatDialog') + start_chat.set_search_text(jid) def do_shutdown(self, *args): Gtk.Application.do_shutdown(self) @@ -395,7 +395,6 @@ class GajimApplication(Gtk.Application): ('add-account', app_actions.on_add_account), ('join-groupchat', app_actions.on_join_gc), ('manage-proxies', app_actions.on_manage_proxies), - ('start-chat', app_actions.on_new_chat), ('bookmarks', app_actions.on_manage_bookmarks), ('history-manager', app_actions.on_history_manager), ('preferences', app_actions.on_preferences), @@ -411,6 +410,10 @@ class GajimApplication(Gtk.Application): ('show-next-pending-event', app_actions.show_next_pending_event), ] + act = Gio.SimpleAction.new('start-chat', GLib.VariantType.new('s')) + act.connect("activate", app_actions.on_new_chat) + self.add_action(act) + act = Gio.SimpleAction.new('accounts', GLib.VariantType.new('s')) act.connect("activate", app_actions.on_accounts) self.add_action(act) ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -71,6 +71,7 @@ <attribute name="label" translatable="yes">Start Chat</attribute> <attribute name="action">app.start-chat</attribute> <attribute name="accel"><Primary>N</attribute> + <attribute name="target"></attribute> </item> <item> <attribute name="label" translatable="yes">Create Group Chat</attribute> ===================================== gajim/gtk/start_chat.py ===================================== @@ -87,6 +87,9 @@ class StartChatDialog(Gtk.ApplicationWindow): self.select_first_row() self.show_all() + def set_search_text(self, text): + self._ui.search_entry.set_text(text) + def add_contacts(self): show_account = len(self.accounts) > 1 for account in self.accounts: @@ -379,7 +382,6 @@ class StartChatDialog(Gtk.ApplicationWindow): def _destroy(self, *args): self._destroyed = True - del app.interface.instances['start_chat'] class ContactRow(Gtk.Grid): ===================================== gajim/gtk/statusicon.py ===================================== @@ -22,6 +22,7 @@ import os from gi.repository import Gtk +from gi.repository import GLib from gajim import dialogs @@ -170,7 +171,7 @@ class StatusIcon: SingleMessageWindow(account, action='send') def on_new_chat(self, widget, account): - app.app.activate_action('start-chat') + app.app.activate_action('start-chat', GLib.Variant('s', '')) def make_menu(self, event_button, event_time): """ ===================================== gajim/message_window.py ===================================== @@ -199,9 +199,9 @@ class MessageWindow: # again. if destroy() is called from the StartChat Dialog, this # Window is not yet focused, because present() seems to be asynchron # at least on KDE, and takes time. - if 'start_chat' in app.interface.instances: - if app.interface.instances['start_chat'].ready_to_destroy: - app.interface.instances['start_chat'].destroy() + start_chat = app.get_app_window('StartChatDialog') + if start_chat is not None and start_chat.ready_to_destroy: + start_chat.destroy() # window received focus, so if we had urgency REMOVE IT # NOTE: we do not have to read the message (it maybe in a bg tab) ===================================== gajim/remote_control.py ===================================== @@ -888,7 +888,7 @@ class GajimRemote(Server): if not account: # error is shown in gajim-remote check_arguments(..) return False - app.app.activate_action('start-chat') + app.app.activate_action('start-chat', GLib.Variant('s', '')) return True def send_xml(self, xml, account): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f4225008e9209d75be37b65e01d1cfa1c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f4225008e9209d75be37b65e01d1cfa1c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatInfo: Refine some strings
by Philipp Hörist 09 Jul '19

09 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 13754945 by Philipp Hörist at 2019-07-09T17:00:04Z GroupchatInfo: Refine some strings Use only participant on user facing strings - - - - - f4225008 by Philipp Hörist at 2019-07-09T17:00:04Z GroupchatInfo: Fix visible state - - - - - 2 changed files: - gajim/data/gui/groupchat_info_scrolled.ui - gajim/gtk/groupchat_info.py Changes: ===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -191,8 +191,8 @@ </child> <child> <object class="GtkLabel" id="lang"> - <property name="visible">True</property> <property name="can_focus">False</property> + <property name="no_show_all">True</property> <property name="halign">start</property> <property name="valign">start</property> </object> @@ -238,9 +238,9 @@ </child> <child> <object class="GtkImage" id="users_image"> - <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Occupants</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Participants</property> <property name="halign">end</property> <property name="valign">center</property> <property name="icon_name">system-users-symbolic</property> @@ -255,8 +255,8 @@ </child> <child> <object class="GtkImage" id="lang_image"> - <property name="visible">True</property> <property name="can_focus">False</property> + <property name="no_show_all">True</property> <property name="tooltip_text" translatable="yes">Group Chat Language</property> <property name="halign">end</property> <property name="valign">center</property> ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -37,12 +37,12 @@ MUC_FEATURES = { 'feather-hard-drive-symbolic', Q_('?Group chat feature:Persistent'), _('This group chat persists ' - 'even if it\'s unoccupied')), + 'even if there are no participants')), 'muc_temporary': ( 'feather-clock-symbolic', Q_('?Group chat feature:Temporary'), _('This group chat will be destroyed ' - 'once the last occupant left')), + 'once the last participant left')), 'muc_moderated': ( 'feather-mic-off-symbolic', Q_('?Group chat feature:Moderated'), @@ -51,8 +51,8 @@ MUC_FEATURES = { 'muc_unmoderated': ( 'feather-mic-symbolic', Q_('?Group chat feature:Not Moderated'), - _('Participants entering this group chat can ' - 'write messages to all participants')), + _('Participants entering this group chat are ' + 'allowed to send messages')), 'muc_open': ( 'feather-globe-symbolic', Q_('?Group chat feature:Open'), @@ -73,7 +73,7 @@ MUC_FEATURES = { 'muc_nonanonymous': ( 'feather-shield-off-symbolic', Q_('?Group chat feature:Not Anonymous'), - _('All other group chat occupants ' + _('All other group chat participants ' 'can see your XMPP address')), 'muc_semianonymous': ( 'feather-shield-symbolic', View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0ccf4391b3e95926fb936c85e20ccbd1a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0ccf4391b3e95926fb936c85e20ccbd1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix attribute error
by Philipp Hörist 09 Jul '19

09 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ccf4391 by Philipp Hörist at 2019-07-09T10:19:56Z Fix attribute error Fixes #9755 - - - - - 1 changed file: - gajim/common/modules/discovery.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== @@ -141,7 +141,7 @@ class Discovery(BaseModule): continue self._log.info('Found transport: %s %s %s', - info.jid, info.category, identity.type) + info.jid, identity.category, identity.type) jid = str(info.jid) if jid not in app.transport_type: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0ccf4391b3e95926fb936c85e20ccbd1a8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0ccf4391b3e95926fb936c85e20ccbd1a8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Replace YesNoDialogs with NewConfirmationDialogs
by Philipp Hörist 08 Jul '19

08 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c723247a by Daniel Brötzmann at 2019-07-08T21:30:22Z Replace YesNoDialogs with NewConfirmationDialogs - - - - - 66e191a1 by Daniel Brötzmann at 2019-07-08T21:30:35Z Remove YesNoDialog - - - - - 7 changed files: - gajim/gtk/accounts.py - gajim/gtk/dialogs.py - gajim/gtk/filetransfer.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/message_window.py - gajim/plugins/gui.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -34,7 +34,6 @@ from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import PassphraseDialog -from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.const import Setting from gajim.gtk.const import SettingKind from gajim.gtk.const import SettingType @@ -134,12 +133,16 @@ class AccountsWindow(Gtk.ApplicationWindow): account, 'offline', _('Be right back.')) GLib.timeout_add(500, login, account, show_before, status_before) - YesNoDialog( - _('Relogin now?'), - _('If you want all the changes to apply instantly, ' - 'you must relogin.'), - transient_for=self, - on_response_yes=lambda *args: relog(account)) + NewConfirmationDialog( + _('Re-Login'), + _('Re-Login now?'), + _('To apply all changes instantly, you have to re-login.'), + [DialogButton.make('Cancel', + text=_('_Later')), + DialogButton.make('OK', + text=_('_Re-Login'), + callback=lambda *args: relog(account))], + transient_for=self).show() @staticmethod def _get_relogin_settings(account): ===================================== gajim/gtk/dialogs.py ===================================== @@ -243,93 +243,6 @@ class ErrorDialog(HigDialog): self.popup() -class YesNoDialog(HigDialog): - """ - HIG compliant YesNo dialog - """ - - def __init__(self, pritext, sectext='', checktext='', text_label=None, - on_response_yes=None, on_response_no=None, type_=Gtk.MessageType.QUESTION, - transient_for=None): - self.user_response_yes = on_response_yes - self.user_response_no = on_response_no - if transient_for is None: - transient_for = app.app.get_active_window() - HigDialog.__init__(self, transient_for, type_, Gtk.ButtonsType.YES_NO, pritext, - sectext, on_response_yes=self.on_response_yes, - on_response_no=self.on_response_no) - - vbox = self.get_content_area() - if checktext: - self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) - vbox.pack_start(self.checkbutton, False, True, 0) - else: - self.checkbutton = None - if text_label: - label = Gtk.Label(label=text_label) - vbox.pack_start(label, False, True, 0) - buff = Gtk.TextBuffer() - self.textview = Gtk.TextView.new_with_buffer(buff) - frame = Gtk.Frame() - frame.set_shadow_type(Gtk.ShadowType.IN) - frame.add(self.textview) - vbox.pack_start(frame, False, True, 0) - else: - self.textview = None - self.set_modal(False) - self.popup() - - def on_response_yes(self, widget): - if self.user_response_yes: - if self.textview: - buff = self.textview.get_buffer() - start, end = buff.get_bounds() - txt = self.textview.get_buffer().get_text(start, end, True) - - if isinstance(self.user_response_yes, tuple): - if self.textview: - self.user_response_yes[0](self.is_checked(), txt, - *self.user_response_yes[1:]) - else: - self.user_response_yes[0](self.is_checked(), - *self.user_response_yes[1:]) - else: - if self.textview: - self.user_response_yes(self.is_checked(), txt) - else: - self.user_response_yes(self.is_checked()) - self.call_cancel_on_destroy = False - self.destroy() - - def on_response_no(self, widget): - if self.user_response_no: - if self.textview: - buff = self.textview.get_buffer() - start, end = buff.get_bounds() - txt = self.textview.get_buffer().get_text(start, end, True) - - if isinstance(self.user_response_no, tuple): - if self.textview: - self.user_response_no[0](txt, *self.user_response_no[1:]) - else: - self.user_response_no[0](*self.user_response_no[1:]) - else: - if self.textview: - self.user_response_no(txt) - else: - self.user_response_no() - self.call_cancel_on_destroy = False - self.destroy() - - def is_checked(self): - """ - Get active state of the checkbutton - """ - if not self.checkbutton: - return False - return self.checkbutton.get_active() - - class ConfirmationDialogDoubleCheck(ConfirmationDialog): """ HIG compliant confirmation dialog with 2 checkbuttons ===================================== gajim/gtk/filetransfer.py ===================================== @@ -44,7 +44,6 @@ from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import HigDialog from gajim.gtk.dialogs import InformationDialog -from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.filechoosers import FileChooserDialog @@ -329,14 +328,20 @@ class FileTransfersWindow: file_name = os.path.basename(file_props.file_name) else: file_name = file_props.name - YesNoDialog( - _('File transfer error'), - _('The file %(file)s has been received, but it seems to have ' + NewConfirmationDialog( + _('File Transfer Error'), + _('File Transfer Error'), + _('The file %s has been received, but it seems to have ' 'been damaged along the way.\n' - 'Do you want to download it again?') % - {'file': file_name}, - on_response_yes=(on_yes, jid, file_props, account), - type_=Gtk.MessageType.ERROR) + 'Do you want to download it again?') % file_name, + [DialogButton.make('Cancel', + text=_('_No')), + DialogButton.make('OK', + text=_('_Download Again'), + callback=on_yes, + args=[jid, + file_props, + account])]).show() def show_file_send_request(self, account, contact): send_callback = partial(self.send_file, account, contact) ===================================== gajim/gui_interface.py ===================================== @@ -98,8 +98,9 @@ from gajim.gtk.notification import Notification from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import InputDialog -from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog @@ -161,24 +162,35 @@ class Interface: @staticmethod def handle_event_http_auth(obj): - #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) - def response(account, answer): + # ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) + def _response(account, answer): obj.conn.get_module('HTTPAuth').build_http_auth_answer( obj.stanza, answer) - def on_yes(is_checked, obj): - response(obj, 'yes') - account = obj.conn.name + pri_msg = _('HTTP (%(method)s) Authorization ' + 'for %(url)s (ID: %(id)s)') % { + 'method': obj.method, + 'url': obj.url, + 'id': obj.iq_id} sec_msg = _('Do you accept this request?') if app.get_number_of_connected_accounts() > 1: - sec_msg = _('Do you accept this request on account %s?') % account + sec_msg = _('Do you accept this request (account: %s)?') % account if obj.msg: sec_msg = obj.msg + '\n' + sec_msg - YesNoDialog(_('HTTP (%(method)s) Authorization for ' - '%(url)s (ID: %(id)s)') % {'method': obj.method, 'url': obj.url, - 'id': obj.iq_id}, sec_msg, on_response_yes=(on_yes, obj), - on_response_no=(response, obj, 'no')) + + NewConfirmationDialog( + _('Authorization'), + pri_msg, + sec_msg, + [DialogButton.make('Cancel', + text=_('_No'), + callback=_response, + args=[obj, 'yes']), + DialogButton.make('OK', + text=_('_Accept'), + callback=_response, + args=[obj, 'no'])]).show() def handle_event_iq_error(self, event): ctrl = self.msg_win_mgr.get_control(event.properties.jid.getBare(), @@ -424,16 +436,22 @@ class Interface: % obj.jid) def show_unsubscribed_dialog(self, account, contact): - def on_yes(is_checked, list_): + def _remove(list_): self.roster.on_req_usub(None, list_) list_ = [(contact, account)] - YesNoDialog( - _('Contact "%s" removed subscription from you') % contact.jid, - _('You will always see them as offline.\nDo you want to ' - 'remove them from your contact list?'), - on_response_yes=(on_yes, list_)) - # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does - # not show deny + + NewConfirmationDialog( + _('Subscription Removed'), + _('Contact \'%s\' removed subscription from you') % contact.jid, + _('You will always see this contact as offline.\n' + 'Do you want to remove them from your contact list?'), + [DialogButton.make('Cancel', + text=_('_No')), + DialogButton.make('Remove', + callback=_remove(list_))]).show() + + # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does + # not show deny def handle_event_unsubscribed_presence(self, obj): #('UNSUBSCRIBED', account, jid) ===================================== gajim/history_manager.py ===================================== @@ -82,7 +82,6 @@ if is_standalone(): # pylint: disable=C0413 from gajim.common import helpers -from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import DialogButton @@ -234,27 +233,27 @@ class HistoryManager: Gtk.main_quit() return - def on_yes(clicked): + def _on_yes(): self.cur.execute('VACUUM') self.con.commit() if is_standalone(): Gtk.main_quit() - def on_no(): + def _on_no(): if is_standalone(): Gtk.main_quit() - dialog = YesNoDialog( + NewConfirmationDialog( + _('Database Cleanup'), _('Do you want to clean up the database? ' '(STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)'), - _('Normally allocated database size will not be freed, ' - 'it will just become reusable. If you really want to reduce ' - 'database filesize, click YES, else click NO.' - '\n\nIn case you click YES, please wait…'), - on_response_yes=on_yes, on_response_no=on_no) - dialog.set_title(_('Database Cleanup')) - button_box = dialog.get_children()[0].get_children()[1] - button_box.get_children()[0].grab_focus() + _('Normally, the allocated database size will not be freed, it ' + 'will just become reusable. This operation may take a while.'), + [DialogButton.make('Cancel', + callback=_on_no), + DialogButton.make('Remove', + text=_('_Cleanup'), + callback=_on_yes)]).show() def _fill_jids_listview(self): # get those jids that have at least one entry in logs @@ -581,7 +580,7 @@ class HistoryManager: if paths_len == 0: # nothing is selected return - def on_ok(liststore, list_of_paths): + def on_ok(): # delete rows from db that match log_line_id list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) ===================================== gajim/message_window.py ===================================== @@ -40,7 +40,8 @@ from gajim import message_control from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl -from gajim.gtk.dialogs import YesNoDialog +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import move_window @@ -231,7 +232,7 @@ class MessageWindow: number_of_closed_control += 1 if number_of_closed_control > 1: - def on_yes1(checked): + def _on_yes1(checked): if checked: app.config.set('confirm_close_multiple_tabs', False) self.dont_warn_on_delete = True @@ -246,11 +247,16 @@ class MessageWindow: ctrl.minimize() # destroy window return False - YesNoDialog( + + NewConfirmationCheckDialog( + _('Close Tabs'), _('You are going to close several tabs'), _('Do you really want to close them all?'), - checktext=_('_Do not ask me again'), on_response_yes=on_yes1, - transient_for=self.window) + _('_Do not ask me again'), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + callback=_on_yes1)], + transient_for=self.window).show() return True def on_yes(ctrl): ===================================== gajim/plugins/gui.py ===================================== @@ -39,7 +39,8 @@ from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.plugins_i18n import _ from gajim.gtk.dialogs import WarningDialog -from gajim.gtk.dialogs import YesNoDialog +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.filechoosers import ArchiveChooserDialog from gajim.gtk.util import get_builder from gajim.gtk.util import load_icon @@ -260,9 +261,9 @@ class PluginsWindow: dialog.popup() def _on_plugin_exists(zip_filename): - def on_yes(is_checked): + def _on_yes(): plugin = app.plugin_manager.install_from_zip(zip_filename, - True) + True) if not plugin: show_warn_dialog() return @@ -273,13 +274,24 @@ class PluginsWindow: model.remove(row.iter) break - iter_ = model.append([plugin, plugin.name, False, - plugin.activatable, self.get_plugin_icon(plugin)]) + iter_ = model.append([ + plugin, + plugin.name, + False, + plugin.activatable, + self.get_plugin_icon(plugin)]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) - YesNoDialog(_('Plugin already exists'), sectext=_('Overwrite?'), - on_response_yes=on_yes, transient_for=self.window) + NewConfirmationDialog( + _('Overwrite Plugin?'), + _('Plugin already exists'), + _('Do you want to overwrite the currently installed version?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Overwrite'), + callback=_on_yes)], + transient_for=self.window).show() def _try_install(zip_filename): try: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c34545bdf2833684c1e5f10c5a7a38707… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c34545bdf2833684c1e5f10c5a7a38707… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatCreation: Use MUC_DISCO_ERRORS
by Philipp Hörist 08 Jul '19

08 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5a024f1 by Philipp Hörist at 2019-07-08T21:05:05Z GroupchatCreation: Use MUC_DISCO_ERRORS - - - - - c34545bd by Philipp Hörist at 2019-07-08T21:07:34Z StartChat: Fix incorrect type - - - - - 2 changed files: - gajim/gtk/groupchat_creation.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -24,6 +24,7 @@ from nbxmpp.util import is_error_result from gajim.common import app from gajim.common.const import MUC_CREATION_EXAMPLES +from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.i18n import _ from gajim.gtk.dialogs import ErrorDialog @@ -48,16 +49,6 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): self._destroyed = False - not_muc_error = _('Address does not belong to a group chat server') - self._error_messages = { - 'remote-server-not-found': _('Remote server not found'), - 'remote-server-timeout': _('Remote server timeout'), - 'service-unavailable': not_muc_error, - 'subscription-required': not_muc_error, - 'not-muc-service': not_muc_error, - 'already-exists': _('Group chat already exists') - } - self._account = self._fill_account_combo(account) self._create_entry_completion() @@ -168,11 +159,11 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): self._ui.create_button.set_sensitive(False) def _set_warning_from_error(self, error): - text = self._error_messages.get(error.type, str(error)) + text = MUC_DISCO_ERRORS.get(error.type, str(error)) self._set_warning(text) def _set_warning_from_error_code(self, error_code): - self._set_warning(self._error_messages[error_code]) + self._set_warning(MUC_DISCO_ERRORS[error_code]) def _on_address_entry_changed(self, entry): text = entry.get_text() ===================================== gajim/gtk/start_chat.py ===================================== @@ -108,7 +108,7 @@ class StartChatDialog(Gtk.ApplicationWindow): bookmarks = con.get_module('Bookmarks').bookmarks groupchats = {} for bookmark in bookmarks: - groupchats[bookmark.jid] = bookmark.name + groupchats[str(bookmark.jid)] = bookmark.name for jid in app.contacts.get_gc_list(account): if jid in groupchats: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/84f3c0235613472dd9bae4aea6319d54d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/84f3c0235613472dd9bae4aea6319d54d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add new group chat join dialog
by Philipp Hörist 08 Jul '19

08 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 84f3c023 by Philipp Hörist at 2019-07-08T20:58:57Z Add new group chat join dialog - - - - - 30 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/const.py - gajim/common/helpers.py - + gajim/data/gui/groupchat_info_scrolled.ui - + gajim/data/icons/hicolor/16x16/devices/LICENSE - + gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.symbolic.png - + gajim/data/icons/hicolor/scalable/devices/LICENSE - + gajim/data/icons/hicolor/scalable/devices/feather-clock-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-eye-off-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-eye-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-globe-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-hard-drive-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-lock-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-mic-off-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-mic-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-server-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-shield-off-symbolic.svg The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84f3c0235613472dd9bae4aea6319d54db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84f3c0235613472dd9bae4aea6319d54db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Make DiscoInfo values available via propertys
by Philipp Hörist 08 Jul '19

08 Jul '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 44d57b9b by Philipp Hörist at 2019-07-08T20:49:12Z Make DiscoInfo values available via propertys - - - - - 2 changed files: - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -123,6 +123,7 @@ NS_MUC_OWNER = NS_MUC + '#owner' NS_MUC_UNIQUE = NS_MUC + '#unique' NS_MUC_CONFIG = NS_MUC + '#roomconfig' NS_MUC_REQUEST = NS_MUC + '#request' +NS_MUC_INFO = NS_MUC + '#roominfo' NS_NICK = 'http://jabber.org/protocol/nick' # XEP-0172 NS_OFFLINE = 'http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 NS_PHYSLOC = 'http://jabber.org/protocol/physloc' # XEP-0112 ===================================== nbxmpp/structs.py ===================================== @@ -24,6 +24,7 @@ from nbxmpp.protocol import NS_STANZAS from nbxmpp.protocol import NS_MAM_1 from nbxmpp.protocol import NS_MAM_2 from nbxmpp.protocol import NS_MUC +from nbxmpp.protocol import NS_MUC_INFO from nbxmpp.const import MessageType from nbxmpp.const import AvatarState from nbxmpp.const import StatusCode @@ -132,6 +133,20 @@ class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms' except Exception: return None + def _get_form_value(self, form_type, var): + for dataform in self.dataforms: + try: + is_info_form = dataform['FORM_TYPE'] != form_type + if not is_info_form: + continue + + if dataform[var].type_ == 'jid-multi': + return dataform[var].values or None + return dataform[var].value or None + + except Exception: + continue + @property def is_muc(self): for identity in self.identities: @@ -139,7 +154,95 @@ class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms' if NS_MUC in self.features: return True return False - + + @property + def muc_name(self): + for identity in self.identities: + if identity.category == 'conference': + return identity.name + + @property + def muc_description(self): + return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_description') + + @property + def muc_log_uri(self): + return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_logs') + + @property + def muc_users(self): + return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_occupants') + + @property + def muc_contacts(self): + return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_contactjid') + + @property + def muc_subject(self): + return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_subject') + + @property + def muc_subjectmod(self): + # muc#roominfo_changesubject stems from a wrong example in the MUC XEP + # Ejabberd and Prosody use this value + return (self._get_form_value(NS_MUC_INFO, 'muc#roominfo_subjectmod') or + self._get_form_value(NS_MUC_INFO, 'muc#roominfo_changesubject')) + + @property + def muc_lang(self): + return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_lang') + + @property + def muc_has_mam(self): + return NS_MAM_2 in self.features or NS_MAM_1 in self.features + + @property + def muc_is_persistent(self): + return 'muc_persistent' in self.features + + @property + def muc_is_moderated(self): + return 'muc_moderated' in self.features + + @property + def muc_is_open(self): + return 'muc_open' in self.features + + @property + def muc_is_members_only(self): + return 'muc_membersonly' in self.features + + @property + def muc_is_hidden(self): + return 'muc_hidden' in self.features + + @property + def muc_is_nonanonymous(self): + return 'muc_nonanonymous' in self.features + + @property + def muc_is_passwordprotected(self): + return 'muc_passwordprotected' in self.features + + @property + def muc_is_public(self): + return 'muc_public' in self.features + + @property + def muc_is_semianonymous(self): + return 'muc_semianonymous' in self.features + + @property + def muc_is_temporary(self): + return 'muc_temporary' in self.features + + @property + def muc_is_unmoderated(self): + return 'muc_unmoderated' in self.features + + @property + def muc_is_unsecured(self): + return 'muc_unsecured' in self.features class DiscoIdentity(namedtuple('DiscoIdentity', 'category type name lang')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/44d57b9b1a30968fbc7e2f507e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/44d57b9b1a30968fbc7e2f507e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Installer: Fix some german strings
by Philipp Hörist 06 Jul '19

06 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: df5315ad by Daniel Brötzmann at 2019-07-06T17:13:54Z Installer: Fix some german strings - - - - - 776b9b3d by Daniel Brötzmann at 2019-07-06T17:13:54Z Installer: Add svg graphics and tone down background color - - - - - 6 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi - win/misc/nsis_header.bmp - + win/misc/nsis_header.svg - win/misc/nsis_wizard.bmp - + win/misc/nsis_wizard.svg Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -63,8 +63,8 @@ LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Ga ; German -LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons" -LangString NAME_Iconsets ${LANG_GERMAN} "Symbolsets" +LangString NAME_Emoticons ${LANG_GERMAN} "Emojis" +LangString NAME_Iconsets ${LANG_GERMAN} "Iconsets" LangString NAME_Languages ${LANG_GERMAN} "Sprachen" LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" LangString NAME_Themes ${LANG_GERMAN} "Designs" ===================================== win/misc/gajim.nsi ===================================== @@ -85,19 +85,19 @@ LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ Fermez-le et redémarrez le désinstallateur." ; German -LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons" -LangString NAME_Iconsets ${LANG_GERMAN} "Symbolsets" +LangString NAME_Emoticons ${LANG_GERMAN} "Emojis" +LangString NAME_Iconsets ${LANG_GERMAN} "Iconsets" LangString NAME_Languages ${LANG_GERMAN} "Sprachen" LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" LangString NAME_Themes ${LANG_GERMAN} "Designs" LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." -LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." -LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." -LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" -LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits läuft.$\n\ - Bitte beenden Sie es und starten Sie den Installer erneut.." +LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Falls aktiviert, wird ein Icon für Gajim auf dem Desktop erstellt." +LangString DESC_SecAutostart ${LANG_GERMAN} "Falls aktiviert, wird Gajim beim Start von Windows automatisch gestartet." +LangString STR_Installed ${LANG_GERMAN} "Gajim ist anscheinend bereits installiert. Wollen Sie Gajim deinstallieren?" +LangString STR_Running ${LANG_GERMAN} "Gajim läuft zurzeit.$\n\ + Bitte beenden Sie Gajim und starten Sie das Setup erneut." ; Italian LangString NAME_Emoticons ${LANG_ITALIAN} "Emoticons" ===================================== win/misc/nsis_header.bmp ===================================== Binary files a/win/misc/nsis_header.bmp and b/win/misc/nsis_header.bmp differ ===================================== win/misc/nsis_header.svg ===================================== @@ -0,0 +1,421 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="150" + height="57" + viewBox="0 0 39.687499 15.08125" + version="1.1" + id="svg4545" + enable-background="new" + inkscape:version="0.92.4 5da689c313, 2019-01-14" + sodipodi:docname="nsis_header.svg"> + <defs + id="defs4539"> + <linearGradient + inkscape:collect="always" + id="linearGradient5449"> + <stop + style="stop-color:#37729e;stop-opacity:1" + offset="0" + id="stop5445" /> + <stop + style="stop-color:#396ea7;stop-opacity:0" + offset="1" + id="stop5447" /> + </linearGradient> + <linearGradient + id="linearGradient3106" + inkscape:collect="always"> + <stop + id="stop3108" + offset="0" + style="stop-color:black;stop-opacity:1;" /> + <stop + id="stop3110" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3103" + inkscape:collect="always"> + <stop + id="stop3105" + offset="0" + style="stop-color:#73d216;stop-opacity:1" /> + <stop + id="stop3107" + offset="1" + style="stop-color:#4e9a06;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient3223" + inkscape:collect="always"> + <stop + id="stop3225" + offset="0" + style="stop-color:#729fcf;stop-opacity:1;" /> + <stop + id="stop3227" + offset="1" + style="stop-color:#396ea7;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3128"> + <stop + style="stop-color:#fef291;stop-opacity:1" + offset="0" + id="stop3130" /> + <stop + style="stop-color:#edd400;stop-opacity:1" + offset="1" + id="stop3132" /> + </linearGradient> + <linearGradient + id="linearGradient3112" + inkscape:collect="always"> + <stop + id="stop3114" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3116" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3080" + inkscape:collect="always"> + <stop + id="stop3082" + offset="0" + style="stop-color:#ad7fa8;stop-opacity:1" /> + <stop + id="stop3084" + offset="1" + style="stop-color:#75507b;stop-opacity:1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.993546,0,0,0.998054,0.154891,5.053486)" + gradientUnits="userSpaceOnUse" + y2="31.587952" + x2="32.927006" + y1="2" + x1="16" + id="linearGradient3957" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <linearGradient + y2="3.3976703" + x2="8.4828358" + y1="53.76825" + x1="18.107143" + gradientTransform="translate(-1,3)" + gradientUnits="userSpaceOnUse" + id="linearGradient3092" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.119874,0,37.62294)" + r="16.010918" + fy="42.747208" + fx="23.081985" + cy="42.747208" + cx="23.081985" + id="radialGradient3102" + xlink:href="#linearGradient3106" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.13216,1.122823e-2,-1.1822e-2,2.244913,-18.75993,-30.16344)" + r="17.031612" + fy="24.508204" + fx="17.309582" + cy="24.508204" + cx="17.309582" + id="radialGradient3104" + xlink:href="#linearGradient3080" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="22.012075" + x2="24.832115" + y1="2.5335035" + x1="24.260687" + id="linearGradient3118" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <radialGradient + r="9" + fy="22.17857" + fx="21.142859" + cy="22.17857" + cx="21.142859" + gradientTransform="matrix(1.705883,0,0,1.667238,-17.94118,-19.21085)" + gradientUnits="userSpaceOnUse" + id="radialGradient3120" + xlink:href="#linearGradient3128" + inkscape:collect="always" /> + <radialGradient + r="9" + fy="22.17857" + fx="21.142859" + cy="22.17857" + cx="21.142859" + gradientTransform="matrix(0.999999,0,0,1.000342,1.223408e-6,-8.326495)" + gradientUnits="userSpaceOnUse" + id="radialGradient3221" + xlink:href="#linearGradient3128" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(0.679906,0,0,0.709362,7.683475,1.608315)" + gradientUnits="userSpaceOnUse" + y2="38.499996" + x2="30.00001" + y1="31.785711" + x1="24.000008" + id="linearGradient3229" + xlink:href="#linearGradient3223" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.989063,0,0,1.427178,-17.28077,-7.054682)" + r="19" + fy="24.907877" + fx="15.269456" + cy="24.907877" + cx="15.269456" + id="radialGradient3109" + xlink:href="#linearGradient3103" + inkscape:collect="always" /> + <linearGradient + y2="42.405006" + x2="38.465416" + y1="2" + x1="16" + gradientTransform="matrix(1.258493,0,0,1.2607,-6.203794,1.409664)" + gradientUnits="userSpaceOnUse" + id="linearGradient3111" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <linearGradient + y2="42.405006" + x2="38.465416" + y1="2" + x1="16" + gradientTransform="matrix(1.258493,0,0,1.260118,-6.203794,-0.58013)" + gradientUnits="userSpaceOnUse" + id="linearGradient3115" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <radialGradient + r="19" + fy="23.537582" + fx="16.488304" + cy="23.537582" + cx="16.488304" + gradientTransform="matrix(1.989063,0,0,1.76923,-17.28077,-17.61162)" + gradientUnits="userSpaceOnUse" + id="radialGradient3117" + xlink:href="#linearGradient3103" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.16707,0,37.07785)" + r="20.85965" + fy="44.514973" + fx="23.991123" + cy="44.514973" + cx="23.991123" + id="radialGradient3127" + xlink:href="#linearGradient3106" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(1)" + gradientUnits="userSpaceOnUse" + y2="42.285942" + x2="15.571428" + y1="29.99917" + x1="15.571428" + id="linearGradient3113" + xlink:href="#linearGradient3106" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(-1)" + gradientUnits="userSpaceOnUse" + y2="42.285942" + x2="15.571428" + y1="29.99917" + x1="15.571428" + id="linearGradient3116" + xlink:href="#linearGradient3106" + inkscape:collect="always" /> + <linearGradient + y2="24.431168" + x2="27.055439" + y1="3.860764" + x1="17.725422" + gradientTransform="matrix(0.993546,0,0,0.998054,0.154891,5.053486)" + gradientUnits="userSpaceOnUse" + id="linearGradient3122" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5449" + id="linearGradient5223" + x1="-0.13229166" + y1="7.4640684" + x2="39.688183" + y2="7.4640684" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.0033271,0,0,1.0076271,0,0.01962691)" /> + <filter + inkscape:collect="always" + style="color-interpolation-filters:sRGB" + id="filter5357"> + <feBlend + inkscape:collect="always" + mode="multiply" + in2="BackgroundImage" + id="feBlend5359" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="3.7074044" + inkscape:cx="82.21365" + inkscape:cy="40.056666" + inkscape:document-units="mm" + inkscape:current-layer="layer3" + showgrid="false" + units="px" + inkscape:window-width="1920" + inkscape:window-height="1027" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata4542"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="background" + style="display:inline;filter:url(#filter5357)"> + <rect + style="opacity:1;fill:url(#linearGradient5223);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26602992;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect5215" + width="39.6875" + height="15.08125" + x="0" + y="7.4506273e-10" /> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="logo" + style="display:inline"> + <g + inkscape:label="Layer 1" + id="layer1-9" + transform="matrix(0.35601782,0,0,0.33362648,-0.92725068,-1.2923699)"> + <ellipse + transform="matrix(0.91085,0,0,1.004296,2.147699,-1.206229)" + id="path3119" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient3127);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + cx="23.991123" + cy="44.514973" + rx="20.85965" + ry="3.4850264" /> + <path + sodipodi:nodetypes="csccccccsc" + id="rect2193" + d="m 24,20.499994 c -9.659998,0 -18.5000003,5.114081 -18.5000001,8.425151 0,1.540746 6.2829851,0.658209 6.5000001,2.009791 l 1.5625,10.559168 c 0,1.010151 0.531707,1.80127 1.21875,1.801269 6.262501,1.617995 12.413095,1.594266 18.40625,0 0.687044,0 1.249999,-0.791119 1.25,-1.801269 L 36,30.934936 c 0.288444,-1.138625 6.500001,-0.469045 6.5,-2.009791 0,-3.31107 -8.840002,-8.42515 -18.5,-8.425151 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3117);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="cccc" + id="path2203" + d="m 12,30 c 1.08167,0.07502 3.108027,0.873469 4,0 -1.85465,1.181252 -0.873011,8.878321 -1.785714,12.785714 C 13.476214,38.523473 12.935303,31.500991 12,30 Z" + style="opacity:0.13777777;fill:url(#linearGradient3116);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + style="opacity:0.13777777;fill:url(#linearGradient3113);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 36,30 c -1.08167,0.07502 -3.108027,0.873469 -4,0 1.85465,1.181252 0.873011,8.878321 1.785714,12.785714 C 34.523786,38.523473 35.064697,31.500991 36,30 Z" + id="path3092" + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3115);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 23.999995,21.49999 c -9.137834,0 -17.9081884,5.449846 -17.2857108,7.142358 0.085908,0.233583 5.9433628,0.279101 6.1486478,1.585243 l 1.692325,10.236417 c 0,0.976188 0.0744,2.026293 0.7243,2.026292 6.077911,1.370063 11.872117,1.322258 17.411314,0 0.649907,0 0.753861,-0.764523 0.753862,-1.74071 L 35.06563,30.298987 c 0.272852,-1.100344 5.937621,-0.861453 6.077218,-1.942221 0.261896,-2.027606 -8.005019,-6.856775 -17.142853,-6.856776 z" + id="path2200" + sodipodi:nodetypes="csccccccsc" + inkscape:connector-curvature="0" /> + <ellipse + transform="matrix(0.809624,0,0,1.685019,4.760218,-20.48733)" + id="path2201" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:0.05936076;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.85616213;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42352941;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + cx="23.763838" + cy="27.291872" + rx="6.7932758" + ry="2.3738585" /> + <path + sodipodi:nodetypes="csccccccsc" + id="path2159" + d="m 23.999992,6.5000004 c -4.694677,0 -8.499997,3.8093056 -8.499997,8.5029116 0,2.999773 1.551932,5.639273 3.899709,7.153253 1.532664,1.747842 0.850142,1.176487 1.100292,3.319084 0,0.567923 0.463522,1.031603 1.031245,1.031603 1.819981,1.396743 3.442269,1.249612 4.937499,0 0.567726,0 1.03125,-0.463681 1.03125,-1.031603 0.297753,-2.097288 -0.132842,-1.831066 0.961251,-3.231317 2.425347,-1.49836 4.038748,-4.182417 4.038748,-7.24102 0,-4.693606 -3.805321,-8.5029116 -8.499997,-8.5029116 z" + style="opacity:1;fill:url(#radialGradient3221);fill-opacity:1;stroke:#c4a000;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <ellipse + transform="matrix(0.457973,0,-0.285667,0.588089,13.52477,5.593519)" + id="path3110" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3118);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.90256411;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + cx="22.930462" + cy="12.594153" + rx="4.2426405" + ry="5.1012702" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3957);stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 23.999997,7.4999981 c -4.142363,0 -7.500001,3.4862079 -7.500001,7.7817099 0,2.745338 1.496903,4.745313 3.81643,6.546015 1.352348,1.599597 0.854299,1.381292 0.956399,3.055127 0,0.519751 0.171905,0.679377 0.672841,0.679377 1.403466,1.273464 2.842636,1.240539 4.19131,-0.04152 0.500939,0 0.547623,-0.232699 0.547623,-0.75245 0.174712,-2.16848 0.27213,-1.907786 1.237505,-3.189268 2.140015,-1.371271 3.577894,-3.498106 3.577894,-6.297284 0,-4.295503 -3.357639,-7.7817099 -7.500001,-7.7817099 z" + id="path3941" + sodipodi:nodetypes="csccccccsc" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="ccccccccc" + id="rect3216" + d="m 20.009177,22.868465 c 0.314701,0.54856 0.317852,1.114589 0.489098,2.597918 0,0.570506 0.455085,1.035939 1.019033,1.035939 1.80786,1.403093 3.427906,1.255294 4.913177,0 0.563946,0 1.09046,-0.447577 1.09046,-1.018082 0.194311,-1.384115 0.270949,-2.269972 0.475324,-2.752504 l -1.386487,0.806554 h -5.235111 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3229);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3122);stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 21.46429,24.50002 0.0537,1.009787 0.499938,-8.15e-4 c 1.816785,1.599209 2.931067,0.871375 4.000047,-0.0065 l 0.388976,-6.34e-4 0.128761,-1.001817 z" + id="path3118" + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" /> + </g> + </g> +</svg> ===================================== win/misc/nsis_wizard.bmp ===================================== Binary files a/win/misc/nsis_wizard.bmp and b/win/misc/nsis_wizard.bmp differ ===================================== win/misc/nsis_wizard.svg ===================================== @@ -0,0 +1,410 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="164" + height="314" + viewBox="0 0 43.391666 83.07917" + version="1.1" + id="svg823" + inkscape:version="0.92.4 5da689c313, 2019-01-14" + sodipodi:docname="nsis_wizard.svg"> + <defs + id="defs817"> + <linearGradient + inkscape:collect="always" + id="linearGradient1374"> + <stop + style="stop-color:#37729d;stop-opacity:1" + offset="0" + id="stop1370" /> + <stop + style="stop-color:#396da7;stop-opacity:0" + offset="1" + id="stop1372" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1374" + id="linearGradient1376" + x1="-0.13229166" + y1="140.13986" + x2="164.17397" + y2="140.13986" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.26451612,0,0,0.26481937,0,218.34887)" /> + <linearGradient + id="linearGradient3106" + inkscape:collect="always"> + <stop + id="stop3108" + offset="0" + style="stop-color:black;stop-opacity:1;" /> + <stop + id="stop3110" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3103" + inkscape:collect="always"> + <stop + id="stop3105" + offset="0" + style="stop-color:#73d216;stop-opacity:1" /> + <stop + id="stop3107" + offset="1" + style="stop-color:#4e9a06;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient3223" + inkscape:collect="always"> + <stop + id="stop3225" + offset="0" + style="stop-color:#729fcf;stop-opacity:1;" /> + <stop + id="stop3227" + offset="1" + style="stop-color:#396ea7;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3128"> + <stop + style="stop-color:#fef291;stop-opacity:1" + offset="0" + id="stop3130" /> + <stop + style="stop-color:#edd400;stop-opacity:1" + offset="1" + id="stop3132" /> + </linearGradient> + <linearGradient + id="linearGradient3112" + inkscape:collect="always"> + <stop + id="stop3114" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3116" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3080" + inkscape:collect="always"> + <stop + id="stop3082" + offset="0" + style="stop-color:#ad7fa8;stop-opacity:1" /> + <stop + id="stop3084" + offset="1" + style="stop-color:#75507b;stop-opacity:1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.993546,0,0,0.998054,0.154891,5.053486)" + gradientUnits="userSpaceOnUse" + y2="31.587952" + x2="32.927006" + y1="2" + x1="16" + id="linearGradient3957" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <linearGradient + y2="3.3976703" + x2="8.4828358" + y1="53.76825" + x1="18.107143" + gradientTransform="translate(-1,3)" + gradientUnits="userSpaceOnUse" + id="linearGradient3092" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.119874,0,37.62294)" + r="16.010918" + fy="42.747208" + fx="23.081985" + cy="42.747208" + cx="23.081985" + id="radialGradient3102" + xlink:href="#linearGradient3106" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.13216,0.01122823,-0.011822,2.244913,-18.75993,-30.16344)" + r="17.031612" + fy="24.508204" + fx="17.309582" + cy="24.508204" + cx="17.309582" + id="radialGradient3104" + xlink:href="#linearGradient3080" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="22.012075" + x2="24.832115" + y1="2.5335035" + x1="24.260687" + id="linearGradient3118" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <radialGradient + r="9" + fy="22.17857" + fx="21.142859" + cy="22.17857" + cx="21.142859" + gradientTransform="matrix(1.705883,0,0,1.667238,-17.94118,-19.21085)" + gradientUnits="userSpaceOnUse" + id="radialGradient3120" + xlink:href="#linearGradient3128" + inkscape:collect="always" /> + <radialGradient + r="9" + fy="22.17857" + fx="21.142859" + cy="22.17857" + cx="21.142859" + gradientTransform="matrix(0.999999,0,0,1.000342,1.223408e-6,-8.326495)" + gradientUnits="userSpaceOnUse" + id="radialGradient3221" + xlink:href="#linearGradient3128" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(0.679906,0,0,0.709362,7.683475,1.608315)" + gradientUnits="userSpaceOnUse" + y2="38.499996" + x2="30.00001" + y1="31.785711" + x1="24.000008" + id="linearGradient3229" + xlink:href="#linearGradient3223" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.989063,0,0,1.427178,-17.28077,-7.054682)" + r="19" + fy="24.907877" + fx="15.269456" + cy="24.907877" + cx="15.269456" + id="radialGradient3109" + xlink:href="#linearGradient3103" + inkscape:collect="always" /> + <linearGradient + y2="42.405006" + x2="38.465416" + y1="2" + x1="16" + gradientTransform="matrix(1.258493,0,0,1.2607,-6.203794,1.409664)" + gradientUnits="userSpaceOnUse" + id="linearGradient3111" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <linearGradient + y2="42.405006" + x2="38.465416" + y1="2" + x1="16" + gradientTransform="matrix(1.258493,0,0,1.260118,-6.203794,-0.58013)" + gradientUnits="userSpaceOnUse" + id="linearGradient3115" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + <radialGradient + r="19" + fy="23.537582" + fx="16.488304" + cy="23.537582" + cx="16.488304" + gradientTransform="matrix(1.989063,0,0,1.76923,-17.28077,-17.61162)" + gradientUnits="userSpaceOnUse" + id="radialGradient3117" + xlink:href="#linearGradient3103" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.16707,0,37.07785)" + r="20.85965" + fy="44.514973" + fx="23.991123" + cy="44.514973" + cx="23.991123" + id="radialGradient3127" + xlink:href="#linearGradient3106" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(1)" + gradientUnits="userSpaceOnUse" + y2="42.285942" + x2="15.571428" + y1="29.99917" + x1="15.571428" + id="linearGradient3113" + xlink:href="#linearGradient3106" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(-1)" + gradientUnits="userSpaceOnUse" + y2="42.285942" + x2="15.571428" + y1="29.99917" + x1="15.571428" + id="linearGradient3116" + xlink:href="#linearGradient3106" + inkscape:collect="always" /> + <linearGradient + y2="24.431168" + x2="27.055439" + y1="3.860764" + x1="17.725422" + gradientTransform="matrix(0.993546,0,0,0.998054,0.154891,5.053486)" + gradientUnits="userSpaceOnUse" + id="linearGradient3122" + xlink:href="#linearGradient3112" + inkscape:collect="always" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.4" + inkscape:cx="140.09613" + inkscape:cy="80.752268" + inkscape:document-units="mm" + inkscape:current-layer="layer2" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="1027" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + units="px" /> + <metadata + id="metadata820"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="background" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-213.92081)"> + <rect + style="opacity:1;fill:url(#linearGradient1376);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.07002668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1368" + width="43.391666" + height="83.07917" + x="0" + y="213.92102" /> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="logo" + transform="translate(0,-230.92081)"> + <g + inkscape:label="Layer 1" + id="layer1-6" + transform="matrix(0.72698668,0,0,0.72698668,-0.24628658,277.39229)"> + <ellipse + transform="matrix(0.91085,0,0,1.004296,2.147699,-1.206229)" + id="path3119" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient3127);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + cx="23.991123" + cy="44.514973" + rx="20.85965" + ry="3.4850264" /> + <path + sodipodi:nodetypes="csccccccsc" + id="rect2193" + d="m 24,20.499994 c -9.659998,0 -18.5000003,5.114081 -18.5000001,8.425151 0,1.540746 6.2829851,0.658209 6.5000001,2.009791 l 1.5625,10.559168 c 0,1.010151 0.531707,1.80127 1.21875,1.801269 6.262501,1.617995 12.413095,1.594266 18.40625,0 0.687044,0 1.249999,-0.791119 1.25,-1.801269 L 36,30.934936 c 0.288444,-1.138625 6.500001,-0.469045 6.5,-2.009791 0,-3.31107 -8.840002,-8.42515 -18.5,-8.425151 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3117);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="cccc" + id="path2203" + d="m 12,30 c 1.08167,0.07502 3.108027,0.873469 4,0 -1.85465,1.181252 -0.873011,8.878321 -1.785714,12.785714 C 13.476214,38.523473 12.935303,31.500991 12,30 Z" + style="opacity:0.13777777;fill:url(#linearGradient3116);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + style="opacity:0.13777777;fill:url(#linearGradient3113);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 36,30 c -1.08167,0.07502 -3.108027,0.873469 -4,0 1.85465,1.181252 0.873011,8.878321 1.785714,12.785714 C 34.523786,38.523473 35.064697,31.500991 36,30 Z" + id="path3092" + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3115);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 23.999995,21.49999 c -9.137834,0 -17.9081884,5.449846 -17.2857108,7.142358 0.085908,0.233583 5.9433628,0.279101 6.1486478,1.585243 l 1.692325,10.236417 c 0,0.976188 0.0744,2.026293 0.7243,2.026292 6.077911,1.370063 11.872117,1.322258 17.411314,0 0.649907,0 0.753861,-0.764523 0.753862,-1.74071 L 35.06563,30.298987 c 0.272852,-1.100344 5.937621,-0.861453 6.077218,-1.942221 0.261896,-2.027606 -8.005019,-6.856775 -17.142853,-6.856776 z" + id="path2200" + sodipodi:nodetypes="csccccccsc" + inkscape:connector-curvature="0" /> + <ellipse + transform="matrix(0.809624,0,0,1.685019,4.760218,-20.48733)" + id="path2201" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:0.05936076;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.85616213;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42352941;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + cx="23.763838" + cy="27.291872" + rx="6.7932758" + ry="2.3738585" /> + <path + sodipodi:nodetypes="csccccccsc" + id="path2159" + d="m 23.999992,6.5000004 c -4.694677,0 -8.499997,3.8093056 -8.499997,8.5029116 0,2.999773 1.551932,5.639273 3.899709,7.153253 1.532664,1.747842 0.850142,1.176487 1.100292,3.319084 0,0.567923 0.463522,1.031603 1.031245,1.031603 1.819981,1.396743 3.442269,1.249612 4.937499,0 0.567726,0 1.03125,-0.463681 1.03125,-1.031603 0.297753,-2.097288 -0.132842,-1.831066 0.961251,-3.231317 2.425347,-1.49836 4.038748,-4.182417 4.038748,-7.24102 0,-4.693606 -3.805321,-8.5029116 -8.499997,-8.5029116 z" + style="opacity:1;fill:url(#radialGradient3221);fill-opacity:1;stroke:#c4a000;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <ellipse + transform="matrix(0.457973,0,-0.285667,0.588089,13.52477,5.593519)" + id="path3110" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3118);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.90256411;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + cx="22.930462" + cy="12.594153" + rx="4.2426405" + ry="5.1012702" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3957);stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 23.999997,7.4999981 c -4.142363,0 -7.500001,3.4862079 -7.500001,7.7817099 0,2.745338 1.496903,4.745313 3.81643,6.546015 1.352348,1.599597 0.854299,1.381292 0.956399,3.055127 0,0.519751 0.171905,0.679377 0.672841,0.679377 1.403466,1.273464 2.842636,1.240539 4.19131,-0.04152 0.500939,0 0.547623,-0.232699 0.547623,-0.75245 0.174712,-2.16848 0.27213,-1.907786 1.237505,-3.189268 2.140015,-1.371271 3.577894,-3.498106 3.577894,-6.297284 0,-4.295503 -3.357639,-7.7817099 -7.500001,-7.7817099 z" + id="path3941" + sodipodi:nodetypes="csccccccsc" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="ccccccccc" + id="rect3216" + d="m 20.009177,22.868465 c 0.314701,0.54856 0.317852,1.114589 0.489098,2.597918 0,0.570506 0.455085,1.035939 1.019033,1.035939 1.80786,1.403093 3.427906,1.255294 4.913177,0 0.563946,0 1.09046,-0.447577 1.09046,-1.018082 0.194311,-1.384115 0.270949,-2.269972 0.475324,-2.752504 l -1.386487,0.806554 h -5.235111 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3229);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3122);stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 21.46429,24.50002 0.0537,1.009787 0.499938,-8.15e-4 c 1.816785,1.599209 2.931067,0.871375 4.000047,-0.0065 l 0.388976,-6.34e-4 0.128761,-1.001817 z" + id="path3118" + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" /> + </g> + </g> +</svg> View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b84bf3d788f62397610e5caa524bd4af8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b84bf3d788f62397610e5caa524bd4af8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Add permission for Fcitx
by Philipp Hörist 06 Jul '19

06 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b84bf3d7 by Philipp Hörist at 2019-07-06T08:23:27Z Flatpak: Add permission for Fcitx https://github.com/flatpak/flatpak/issues/2031 - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -16,6 +16,7 @@ finish-args: - --talk-name=org.freedesktop.Notifications - --talk-name=org.gnome.ScreenSaver - --talk-name=org.mpris.MediaPlayer2.* + - --talk-name=org.freedesktop.portal.Fcitx # Keyring - --talk-name=org.freedesktop.secrets # dconf View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b84bf3d788f62397610e5caa524bd4af87… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b84bf3d788f62397610e5caa524bd4af87… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits