Commits April 2019

commits@gajim.org

1 participants
87 discussions

[Git][gajim/gajim][master] Shortcuts: Add shortcuts to move tab left or right
by Philipp Hörist 30 Apr '19

30 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b59d5434 by Daniel Brötzmann at 2019-04-30T20:51:01Z Shortcuts: Add shortcuts to move tab left or right - - - - - 2 changed files: - gajim/data/gui/shortcuts_window.ui - gajim/message_window.py Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -109,7 +109,7 @@ <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><alt>Left <ctrl>Page_Up</property> + <property name="accelerator"><alt>Left <ctrl>Page_Up</property> <property name="title" translatable="yes">Switch to the previous tab</property> </object> </child> @@ -141,6 +141,20 @@ <property name="title" translatable="yes">Switch to the next unread tab</property> </object> </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl><shift>Page_Up</property> + <property name="title" translatable="yes">Move tab to the left</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl><shift>Page_Down</property> + <property name="title" translatable="yes">Move tab to the right</property> + </object> + </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> ===================================== gajim/message_window.py ===================================== @@ -121,6 +121,7 @@ class MessageWindow: keys = ['<Control>f', '<Control>g', '<Control>h', '<Control>i', '<Control>l', '<Control>L', '<Control><Shift>n', '<Control>u', '<Control>b', '<Control>F4', + '<Control><Shift>Page_Up', '<Control><Shift>Page_Down', '<Control>w', '<Control>Page_Up', '<Control>Page_Down', '<Alt>Right', '<Alt>Left', '<Alt>d', '<Alt>c', '<Alt>m', '<Alt>t', 'Escape'] + \ ['<Alt>'+str(i) for i in range(10)] @@ -411,7 +412,8 @@ class MessageWindow: 'gtk-key-theme-name') == 'Emacs': self.remove_tab(control, self.CLOSE_CTRL_KEY) return True - elif keyval in (Gdk.KEY_Page_Up, Gdk.KEY_Page_Down): + elif keyval in (Gdk.KEY_Page_Up, Gdk.KEY_Page_Down) and not \ + modifier & Gdk.ModifierType.SHIFT_MASK: # CTRL + PageUp | PageDown # Create event and send it to notebook event = Gdk.Event.new(Gdk.EventType.KEY_PRESS) @@ -425,10 +427,24 @@ class MessageWindow: if modifier & Gdk.ModifierType.SHIFT_MASK: # CTRL + SHIFT if control.type_id == message_control.TYPE_GC and \ - keyval == Gdk.KEY_n: # CTRL + SHIFT + n + keyval == Gdk.KEY_n: # CTRL + SHIFT + n self.window.lookup_action( 'change-nick-%s' % control.control_id).activate() return True + # CTRL + SHIFT + PageUp | PageDown + old_position = self.notebook.get_current_page() + total_pages = self.notebook.get_n_pages() + if keyval == Gdk.KEY_Page_Up: + self.notebook.reorder_child(control.widget, + old_position - 1) + return True + if keyval == Gdk.KEY_Page_Down: + if old_position == total_pages - 1: + self.notebook.reorder_child(control.widget, 0) + return True + self.notebook.reorder_child(control.widget, + old_position + 1) + return True # MOD1 (ALT) mask elif modifier & Gdk.ModifierType.MOD1_MASK: # Tab switch bindings View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b59d5434f2d922ea395eb81d486b87b3dd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b59d5434f2d922ea395eb81d486b87b3dd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Simplify code around feature creation
by Philipp Hörist 30 Apr '19

30 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9e259301 by Daniel Brötzmann at 2019-04-30T17:32:00Z ServerInfo: Simplify code around feature creation - Fix traceback when httpupload is not available - Improve copy to clipboard text - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -159,52 +159,54 @@ class ServerInfoDialog(Gtk.Dialog): def add_feature(self, feature): item = FeatureItem(feature) self.feature_listbox.add(item) - item.get_parent().set_tooltip_text(item.tooltip) + item.get_parent().set_tooltip_text(item.tooltip or '') def get_features(self): con = app.connections[self.account] Feature = namedtuple('Feature', ['name', 'available', 'tooltip', 'enabled']) + Feature.__new__.__defaults__ = (None, None) # type: ignore # HTTP File Upload - max_file_size = con.get_module('HTTPUpload').max_file_size - tooltip_size = '' - if max_file_size is not None: - max_file_size = max_file_size / (1024 * 1024) - tooltip_size = ' (max. %s MiB)' % max_file_size + http_upload_info = con.get_module('HTTPUpload').httpupload_namespace + if con.get_module('HTTPUpload').available: + max_file_size = con.get_module('HTTPUpload').max_file_size + if max_file_size is not None: + max_file_size = max_file_size / (1024 * 1024) + http_upload_info = http_upload_info + ' (max. %s MiB)' % \ + max_file_size return [ Feature('XEP-0016: Privacy Lists', - con.get_module('PrivacyLists').supported, '', None), - Feature('XEP-0045: Multi-User Chat', con.muc_jid, '', None), + con.get_module('PrivacyLists').supported), + Feature('XEP-0045: Multi-User Chat', con.muc_jid), Feature('XEP-0054: vcard-temp', - con.get_module('VCardTemp').supported, '', None), + con.get_module('VCardTemp').supported), Feature('XEP-0163: Personal Eventing Protocol', - con.get_module('PEP').supported, '', None), + con.get_module('PEP').supported), Feature('XEP-0163: #publish-options', - con.get_module('PubSub').publish_options, '', None), + con.get_module('PubSub').publish_options), Feature('XEP-0191: Blocking Command', con.get_module('Blocking').supported, - nbxmpp.NS_BLOCKING, None), + nbxmpp.NS_BLOCKING), Feature('XEP-0198: Stream Management', - con.connection.sm_enabled, nbxmpp.NS_STREAM_MGMT, None), + con.connection.sm_enabled, nbxmpp.NS_STREAM_MGMT), Feature('XEP-0258: Security Labels in XMPP', con.get_module('SecLabels').supported, - nbxmpp.NS_SECLABEL, None), + nbxmpp.NS_SECLABEL), Feature('XEP-0280: Message Carbons', con.get_module('Carbons').supported, - nbxmpp.NS_CARBONS, None), + nbxmpp.NS_CARBONS), Feature('XEP-0313: Message Archive Management', - con.get_module('MAM').archiving_namespace, - con.get_module('MAM').archiving_namespace, None), + con.get_module('MAM').available, + con.get_module('MAM').archiving_namespace), Feature('XEP-0363: HTTP File Upload', con.get_module('HTTPUpload').available, - con.get_module('HTTPUpload').httpupload_namespace + \ - tooltip_size, None), + http_upload_info), Feature('XEP-0398: Avatar Conversion', - con.avatar_conversion, '', None), + con.avatar_conversion), Feature('XEP-0411: Bookmarks Conversion', - con.get_module('Bookmarks').conversion, '', None) + con.get_module('Bookmarks').conversion) ] def add_info(self, info): @@ -226,7 +228,7 @@ class ServerInfoDialog(Gtk.Dialog): available = 'Yes' else: available = 'No' - if feature.tooltip != '': + if feature.tooltip is not None: tooltip = '(%s)' % feature.tooltip else: tooltip = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e259301060c50c0178ffd591a9dff9d25… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e259301060c50c0178ffd591a9dff9d25… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Treat incoming messages as 'chat' by default
by Philipp Hörist 30 Apr '19

30 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ed770d7 by Daniel Brötzmann at 2019-04-30T15:33:12Z Treat incoming messages as 'chat' by default Incomming messages of type 'normal' have to be acknowledged one by one, which can be time consuming when many messages are received. - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== @@ -257,7 +257,7 @@ class Config: 'confirm_custom_status': [opt_str, '', _('Show the confirm custom status dialog or not? Empty string means never show the dialog.')], 'enable_negative_priority': [opt_bool, False, _('If true, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], 'show_contacts_number': [opt_bool, True, _('If true, Gajim will show number of online and total contacts in account and group rows.')], - 'treat_incoming_messages': [opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], + 'treat_incoming_messages': [opt_str, 'chat', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], 'scroll_roster_to_last_message': [opt_bool, True, _('If true, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ed770d7c83deb9190eb129781da61cb08… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ed770d7c83deb9190eb129781da61cb08… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] SingleMessageWindow: Do not translate placeholder labels
by Philipp Hörist 30 Apr '19

30 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 606b5e8a by Daniel Brötzmann at 2019-04-30T06:13:30Z SingleMessageWindow: Do not translate placeholder labels - - - - - 1 changed file: - gajim/data/gui/single_message_window.ui Changes: ===================================== gajim/data/gui/single_message_window.ui ===================================== @@ -225,7 +225,7 @@ <object class="GtkLabel" id="from_entry_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"><user(a)example.org></property> + <property name="label"><user(a)example.org></property> <property name="xalign">0</property> <style> <class name="bold"/> @@ -240,7 +240,7 @@ <object class="GtkLabel" id="subject_from_entry_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"><from Subject></property> + <property name="label"><from Subject></property> <property name="wrap">True</property> <property name="max_width_chars">50</property> <property name="xalign">0</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/606b5e8a2b692f932c35fe0a4333074cc0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/606b5e8a2b692f932c35fe0a4333074cc0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use native GTK icons for audio and video
by Philipp Hörist 29 Apr '19

29 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5fb23187 by Daniel Brötzmann at 2019-04-29T19:35:54Z Use native GTK icons for audio and video - - - - - 7 changed files: - gajim/chat_control.py - gajim/data/gui/chat_control.ui - − gajim/data/icons/hicolor/16x16/actions/gajim-cam_active.png - − gajim/data/icons/hicolor/16x16/actions/gajim-cam_inactive.png - − gajim/data/icons/hicolor/16x16/actions/gajim-mic_active.png - − gajim/data/icons/hicolor/16x16/actions/gajim-mic_inactive.png - gajim/gui_interface.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -165,16 +165,6 @@ class ChatControl(ChatControlBase): id_ = widget.connect('released', self.on_num_button_released) self.handlers[id_] = widget - self.dtmf_window = self.xml.get_object('dtmf_window') - self.dtmf_window.get_child().set_direction(Gtk.TextDirection.LTR) - id_ = self.dtmf_window.connect('focus-out-event', - self.on_dtmf_window_focus_out_event) - self.handlers[id_] = self.dtmf_window - - widget = self.xml.get_object('dtmf_button') - id_ = widget.connect('clicked', self.on_dtmf_button_clicked) - self.handlers[id_] = widget - widget = self.xml.get_object('mic_hscale') id_ = widget.connect('value_changed', self.on_mic_hscale_value_changed) self.handlers[id_] = widget @@ -512,16 +502,16 @@ class ChatControl(ChatControlBase): banner_image.show() if state == self.JINGLE_STATE_CONNECTING: banner_image.set_from_icon_name( - Gtk.STOCK_CONVERT, Gtk.IconSize.MENU) + 'network-transmit-symbolic', Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_CONNECTION_RECEIVED: banner_image.set_from_icon_name( - "network-workgroup", Gtk.IconSize.MENU) + 'network-receive-symbolic', Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_CONNECTED: banner_image.set_from_icon_name( - Gtk.STOCK_CONNECT, Gtk.IconSize.MENU) + 'network-transmit-receive-symbolic', Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_ERROR: banner_image.set_from_icon_name( - "dialog-warning", Gtk.IconSize.MENU) + 'network-error-symbolic', Gtk.IconSize.MENU) self.update_toolbar() def update_audio(self): @@ -614,12 +604,6 @@ class ChatControl(ChatControlBase): def on_num_button_released(self, released): self._get_audio_content()._stop_dtmf() - def on_dtmf_button_clicked(self, widget): - self.dtmf_window.show_all() - - def on_dtmf_window_focus_out_event(self, widget, event): - self.dtmf_window.hide() - def on_mic_hscale_value_changed(self, widget, value): self._get_audio_content().set_mic_volume(value / 100) # Save volume to config ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -14,23 +14,13 @@ <property name="page_increment">10</property> <property name="page_size">10</property> </object> - <object class="GtkWindow" id="dtmf_window"> + <object class="GtkPopover" id="dtmf_popover"> <property name="can_focus">False</property> - <property name="resizable">False</property> - <property name="modal">True</property> - <property name="window_position">mouse</property> - <property name="type_hint">menu</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="decorated">False</property> - <property name="deletable">False</property> - <child type="titlebar"> - <placeholder/> - </child> <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <child> <object class="GtkButton" id="1_button"> <property name="visible">True</property> @@ -41,6 +31,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> <property name="label" translatable="yes"><b>1</b></property> <property name="use_markup">True</property> <property name="xalign">0</property> @@ -58,7 +49,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="xalign">0</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> @@ -79,7 +69,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="xalign">0</property> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> @@ -100,7 +89,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="xalign">0</property> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> @@ -121,7 +109,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="xalign">0</property> <child> <object class="GtkLabel" id="label5"> <property name="visible">True</property> @@ -142,7 +129,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="xalign">0</property> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> @@ -183,7 +169,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="xalign">0</property> <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> @@ -204,7 +189,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="xalign">0</property> <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> @@ -725,11 +709,13 @@ <property name="has_tooltip">True</property> <property name="relief">none</property> <property name="orientation">vertical</property> + <property name="size">menu</property> <property name="adjustment">adjustment1</property> - <property name="icons">audio-volume-muted -audio-volume-high -audio-volume-low -audio-volume-medium</property> + <property name="icons">audio-volume-muted-symbolic +audio-volume-low-symbolic +audio-volume-medium-symbolic +audio-volume-high-symbolic</property> + <property name="use_symbolic">False</property> <child internal-child="plus_button"> <object class="GtkButton" id="volumebutton-plus_button1"> <property name="can_focus">False</property> @@ -742,6 +728,9 @@ audio-volume-medium</property> <property name="receives_default">False</property> </object> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> @@ -758,11 +747,13 @@ audio-volume-medium</property> <property name="has_tooltip">True</property> <property name="relief">none</property> <property name="orientation">vertical</property> + <property name="size">menu</property> <property name="adjustment">adjustment2</property> - <property name="icons">audio-mic-volume-muted -audio-mic-volume-high -audio-mic-volume-medium -audio-mic-volume-low</property> + <property name="icons">microphone-sensitivity-muted-symbolic +microphone-sensitivity-low-symbolic +microphone-sensitivity-medium-symbolic +microphone-sensitivity-high-symbolic</property> + <property name="use_symbolic">False</property> <child internal-child="plus_button"> <object class="GtkButton" id="volumebutton-plus_button2"> <property name="can_focus">False</property> @@ -775,6 +766,9 @@ audio-mic-volume-low</property> <property name="receives_default">False</property> </object> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> @@ -783,17 +777,29 @@ audio-mic-volume-low</property> </packing> </child> <child> - <object class="GtkButton" id="dtmf_button"> - <property name="label" translatable="yes">#</property> + <object class="GtkMenuButton" id="dtmf_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> + <property name="direction">up</property> + <property name="popover">dtmf_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">input-dialpad-symbolic</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> ===================================== gajim/data/icons/hicolor/16x16/actions/gajim-cam_active.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/actions/gajim-cam_active.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/actions/gajim-cam_inactive.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/actions/gajim-cam_inactive.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/actions/gajim-mic_active.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/actions/gajim-mic_active.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/actions/gajim-mic_inactive.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/actions/gajim-mic_inactive.png and /dev/null differ ===================================== gajim/gui_interface.py ===================================== @@ -1088,7 +1088,7 @@ class Interface: event_type = _('Voice Chat Request') app.notification.popup( event_type, obj.fjid, account, 'jingle-incoming', - icon_name='gajim-mic_active', title=event_type, text=txt) + icon_name='call-start-symbolic', title=event_type, text=txt) def handle_event_jingle_connected(self, obj): # ('JINGLE_CONNECTED', account, (peerjid, sid, media)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fb231876d26a0ff590aad9a0ea7277751… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fb231876d26a0ff590aad9a0ea7277751… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] RosterWindow: Remove blocked contacts from contact list if not in roster
by Philipp Hörist 27 Apr '19

27 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ba1f88a0 by Daniel Brötzmann at 2019-04-27T12:04:19Z RosterWindow: Remove blocked contacts from contact list if not in roster When blocking a contact which is not in the roster, the contact is removed and the ChatControl is closed (if any). - - - - - 2 changed files: - gajim/data/gui/blocking_list.ui - gajim/roster_window.py Changes: ===================================== gajim/data/gui/blocking_list.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkListStore" id="blocking_store"> <columns>  @@ -13,10 +13,7 @@ <property name="height_request">300</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> + <property name="border_width">18</property> <property name="row_spacing">5</property> <property name="column_spacing">10</property> <child> @@ -83,6 +80,9 @@ <property name="halign">end</property> <property name="always_show_image">True</property> <signal name="clicked" handler="_on_save" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/roster_window.py ===================================== @@ -64,8 +64,8 @@ from gajim.common.dbus import location from gajim.common import ged from gajim.message_window import MessageWindowMgr -from gajim.gtk.dialogs import ConfirmationDialogCheck from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialogCheck from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog @@ -2789,6 +2789,15 @@ class RosterWindow: con = app.connections[acct] con.get_module('PrivacyLists').block_contacts(l_, msg) for contact in l_: + ctrl = app.interface.msg_win_mgr.get_control( + contact.jid, acct) + if ctrl: + ctrl.parent_win.remove_tab( + ctrl, ctrl.parent_win.CLOSE_COMMAND, force=True) + if contact.show == 'not in roster': + self.remove_contact(contact.jid, acct, force=True, + backend=True) + return self.draw_contact(contact.jid, acct) else: for acct in accounts: @@ -2801,7 +2810,7 @@ class RosterWindow: def _block_it(is_checked=None): if is_checked is not None: # dialog has been shown - if is_checked: # user does not want to be asked again + if is_checked: # user does not want to be asked again app.config.set('confirm_block', 'no') else: app.config.set('confirm_block', 'yes') @@ -2811,12 +2820,17 @@ class RosterWindow: if confirm_block == 'no': _block_it() return - pritext = _('You are about to block a contact. Are you sure you want' - ' to continue?') - sectext = _('This contact will see you offline and you will not ' - 'receive messages it sends you.') - ConfirmationDialogCheck(pritext, sectext, - _('_Do not ask me again'), on_response_ok=_block_it) + NewConfirmationCheckDialog(_('Block Contact'), + _('Really block this contact?'), + _('This contact will see you offline and ' + 'you will not receive messages sent to ' + 'you by this contact.'), + _('_Do not ask me again'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('Block Contact'), + callback=_block_it)], + modal=False).show() def on_unblock(self, widget, list_, group=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ba1f88a006909856d94ea9f827678b25cc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ba1f88a006909856d94ea9f827678b25cc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move log message
by Philipp Hörist 27 Apr '19

27 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a50cedaa by Philipp Hörist at 2019-04-27T10:39:34Z Move log message - - - - - 2 changed files: - gajim/gtk/htmltextview.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/htmltextview.py ===================================== @@ -882,6 +882,7 @@ class HtmlTextView(Gtk.TextView): def show_context_menu(self, uri): menu = get_conv_context_menu(self.account, uri) if menu is None: + log.warning('No handler for URI type: %s', uri) return def destroy(menu, _pspec): ===================================== gajim/gui_menu_builder.py ===================================== @@ -961,7 +961,6 @@ def get_conv_context_menu(account, uri): ('-add-contact', _('Add to Roster…')), ] else: - log.warning('No handler for URI type: %s', uri) return menu = Gtk.Menu() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a50cedaa6b6439d86db2a6c2281c50c548… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a50cedaa6b6439d86db2a6c2281c50c548… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Add dedicated method for parsing and opening URIs
by Philipp Hörist 27 Apr '19

27 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: dd7496d7 by Philipp Hörist at 2019-04-27T10:30:56Z Add dedicated method for parsing and opening URIs - - - - - 423cfb9f by Philipp Hörist at 2019-04-27T10:30:56Z Add method to generate map links - - - - - b9b5690b by Philipp Hörist at 2019-04-27T10:30:56Z Use https instead of http - - - - - 2eb2039a by Philipp Hörist at 2019-04-27T10:30:56Z Remove Google as default search engine - - - - - 16 changed files: - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/config.py - gajim/common/const.py - gajim/common/helpers.py - + gajim/common/structs.py - gajim/conversation_textview.py - gajim/groupchat_control.py - gajim/gtk/about.py - gajim/gtk/dataform.py - gajim/gtk/htmltextview.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/plugins/gui.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -285,13 +285,11 @@ def on_delete_motd(action, param): def on_contents(action, param): - helpers.launch_browser_mailer( - 'url', 'https://dev.gajim.org/gajim/gajim/wikis') + helpers.open_uri('https://dev.gajim.org/gajim/gajim/wikis') def on_faq(action, param): - helpers.launch_browser_mailer( - 'url', 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq') + helpers.open_uri('https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq') def on_keyboard_shortcuts(action, param): @@ -351,8 +349,8 @@ def show_next_pending_event(action, param): def open_link(_action, param): - kind, link = param.get_strv() - helpers.launch_browser_mailer(kind, link) + uri = param.get_string() + helpers.open_uri(uri) def copy_text(_action, param): ===================================== gajim/application.py ===================================== @@ -420,7 +420,7 @@ class GajimApplication(Gtk.Application): act.connect("activate", app_actions.copy_text) self.add_action(act) - act = Gio.SimpleAction.new('open-link', GLib.VariantType.new('as')) + act = Gio.SimpleAction.new('open-link', GLib.VariantType.new('s')) act.connect("activate", app_actions.open_link) self.add_action(act) ===================================== gajim/chat_control.py ===================================== @@ -43,6 +43,8 @@ from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import open_uri +from gajim.common.helpers import geo_provider_from_location from gajim.common.contacts import GC_Contact from gajim.common.const import AvatarSize from gajim.common.const import KindConstant @@ -647,11 +649,10 @@ class ChatControl(ChatControlBase): def on_location_eventbox_button_release_event(self, widget, event): if 'geoloc' in self.contact.pep: location = self.contact.pep['geoloc'].data - if ('lat' in location) and ('lon' in location): - uri = 'https://www.openstreetmap.org/?' + \ - 'mlat=%(lat)s&mlon=%(lon)s&zoom=16' % {'lat': location['lat'], - 'lon': location['lon']} - helpers.launch_browser_mailer('url', uri) + if 'lat' in location and 'lon' in location: + uri = geo_provider_from_location(location['lat'], + location['lon']) + open_uri(uri) def on_location_eventbox_leave_notify_event(self, widget, event): """ ===================================== gajim/chat_control_base.py ===================================== @@ -96,7 +96,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): color = convert_rgb_to_hex(url_color) url = match.group() if '://' not in url: - url = 'http://' + url + url = 'https://' + url return '<a href="%s"><span foreground="%s">%s</span></a>' % ( url, color, match.group()) @@ -167,9 +167,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if self.parent_win: self.parent_win.redraw_tab(self) - def status_url_clicked(self, widget, url): - helpers.launch_browser_mailer('url', url) - def setup_seclabel(self): self.seclabel_combo.hide() self.seclabel_combo.set_no_show_all(True) ===================================== gajim/common/config.py ===================================== @@ -178,7 +178,7 @@ class Config: 'last_roster_visible': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')], 'version': [opt_str, gajim.__version__], # which version created the config - 'search_engine': [opt_str, 'https://www.google.com/search?&q=%s&sourceid=gajim'], + 'search_engine': [opt_str, 'https://duckduckgo.com/?q=%s'], 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom URL with %%s in it where %%s is the word/phrase or 'WIKTIONARY' which means use Wikitionary.")], 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], ===================================== gajim/common/const.py ===================================== @@ -184,6 +184,22 @@ class Display(Enum): QUARTZ = 'GdkQuartzDisplay' +class URIType(Enum): + UNKNOWN = 'unknown' + XMPP = 'xmpp' + MAIL = 'mail' + GEO = 'geo' + WEB = 'web' + FILE = 'file' + AT = 'at' + + +class URIAction(Enum): + MESSAGE = 'message' + JOIN = 'join' + SUBSCRIBE = 'subscribe' + + EME_MESSAGES = { 'urn:xmpp:otr:0': _('This message was encrypted with OTR ' ===================================== gajim/common/helpers.py ===================================== @@ -65,6 +65,9 @@ from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.const import ShowConstant from gajim.common.const import Display +from gajim.common.const import URIType +from gajim.common.const import URIAction +from gajim.common.structs import URI if app.is_installed('PYCURL'): import pycurl @@ -629,35 +632,6 @@ def get_contact_dict_for_account(account): contacts_dict[name] = contact return contacts_dict -def launch_browser_mailer(kind, uri): - # kind = 'url' or 'mail' - if kind == 'url' and uri.startswith('file://'): - launch_file_manager(uri) - return - if kind in ('mail', 'sth_at_sth') and not uri.startswith('mailto:'): - uri = 'mailto:' + uri - - if kind == 'url' and uri.startswith('www.'): - uri = 'http://' + uri - - if not app.config.get('autodetect_browser_mailer'): - if kind == 'url': - command = app.config.get('custombrowser') - elif kind in ('mail', 'sth_at_sth'): - command = app.config.get('custommailapp') - if command == '': # if no app is configured - return - - command = build_command(command, uri) - try: - exec_command(command) - except Exception: - pass - - else: - webbrowser.open(uri) - - def launch_file_manager(path_to_open): if os.name == 'nt': try: @@ -1502,3 +1476,96 @@ def delay_execution(milliseconds): milliseconds, timeout_wrapper) return func_wrapper return delay_execution_decorator + + +def parse_uri(uri): + if uri.startswith('xmpp:'): + uri = uri[5:] + if '?' in uri: + jid, action = uri.split('?') + try: + return URI(type=URIType.XMPP, + action=URIAction(action), + data=jid) + except ValueError: + # Unknown action + pass + + return URI(type=URIType.XMPP, action=URIAction.MESSAGE, data=uri) + + if uri.startswith('mailto:'): + uri = uri[7:] + return URI(type=URIType.MAIL, data=uri) + + if app.interface.sth_at_sth_dot_sth_re.match(uri): + return URI(type=URIType.AT, data=uri) + + if uri.startswith('geo:'): + location = uri[4:] + lat, _, lon = location.partition(',') + if not lon: + return URI(type=URIType.UNKNOWN, data=uri) + + uri = geo_provider_from_location(lat, lon) + return URI(type=URIType.GEO, data=uri) + + if uri.startswith('file://'): + return URI(type=URIType.FILE, data=uri) + + return URI(type=URIType.WEB, data=uri) + + +def open_uri(uri, account=None): + if not isinstance(uri, URI): + uri = parse_uri(uri) + + if uri.type == URIType.FILE: + launch_file_manager(uri.data) + + elif uri.type == URIType.MAIL: + uri = 'mailto:%s' % uri.data + if not app.config.get('autodetect_browser_mailer'): + open_uri_with_custom('custommailapp', 'mailto:%s' % uri) + else: + webbrowser.open(uri) + + elif uri.type in (URIType.WEB, URIType.GEO): + if not app.config.get('autodetect_browser_mailer'): + open_uri_with_custom('custombrowser', uri.data) + else: + webbrowser.open(uri.data) + + elif uri.type == URIType.AT: + app.interface.new_chat_from_jid(account, uri.data) + + elif uri.type == URIType.XMPP: + if account is None: + log.warning('Account must be specified to open XMPP uri') + return + + if uri.action == URIAction.JOIN: + app.interface.join_gc_minimal(account, uri.data) + elif uri.action == URIAction.MESSAGE: + app.interface.new_chat_from_jid(account, uri.data) + else: + log.warning('Cant open URI: %s', uri) + + else: + log.warning('Cant open URI: %s', uri) + + +def open_uri_with_custom(config_app, uri): + command = app.config.get(config_app) + if not command: + log.warning('No custom application set') + return + command = build_command(command, uri) + try: + exec_command(command) + except Exception: + pass + + +def geo_provider_from_location(lat, lon): + return ('https://www.openstreetmap.org/?' + 'mlat=%s&mlon=%s&zoom=16') % (lat, lon) ===================================== gajim/common/structs.py ===================================== @@ -0,0 +1,18 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from collections import namedtuple + +URI = namedtuple('URI', 'type action data') +URI.__new__.__defaults__ = (None, None) # type: ignore ===================================== gajim/conversation_textview.py ===================================== @@ -518,7 +518,7 @@ class ConversationTextview(GObject.GObject): """ Basically it filters out the widget instance """ - helpers.launch_browser_mailer('url', link) + helpers.open_uri(link) def on_textview_populate_popup(self, textview, menu): """ @@ -561,10 +561,10 @@ class ConversationTextview(GObject.GObject): always_use_en = app.config.get('always_english_wikipedia') if always_use_en: - link = 'http://en.wikipedia.org/wiki/Special:Search?search=%s'\ + link = 'https://en.wikipedia.org/wiki/Special:Search?search=%s'\ % phrase_for_url else: - link = 'http://%s.wikipedia.org/wiki/Special:Search?search=%s'\ + link = 'https://%s.wikipedia.org/wiki/Special:Search?search=%s'\ % (i18n.get_short_lang_code(), phrase_for_url) item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) id_ = item.connect('activate', self.visit_url_from_menuitem, link) @@ -577,10 +577,10 @@ class ConversationTextview(GObject.GObject): # special link (yeah undocumented but default) always_use_en = app.config.get('always_english_wiktionary') if always_use_en: - link = 'http://en.wiktionary.org/wiki/Special:Search?search=%s'\ + link = 'https://en.wiktionary.org/wiki/Special:Search?search=%s'\ % phrase_for_url else: - link = 'http://%s.wiktionary.org/wiki/Special:Search?search=%s'\ + link = 'https://%s.wiktionary.org/wiki/Special:Search?search=%s'\ % (i18n.get_short_lang_code(), phrase_for_url) id_ = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id_] = item ===================================== gajim/groupchat_control.py ===================================== @@ -55,7 +55,7 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.common import events from gajim.common import app from gajim.common import helpers -from gajim.common.helpers import launch_browser_mailer +from gajim.common.helpers import open_uri from gajim.common.helpers import AdditionalDataDict from gajim.common import ged from gajim.common.i18n import _ @@ -3106,5 +3106,5 @@ class SubjectPopover(Gtk.Popover): def _on_activate_link(_label, uri): # We have to use this, because the default GTK handler # is not cross-platform compatible - launch_browser_mailer(None, uri) + open_uri(uri) return Gdk.EVENT_STOP ===================================== gajim/gtk/about.py ===================================== @@ -19,7 +19,7 @@ from gi.repository import Gtk from gi.repository import GObject from gajim.common import app -from gajim.common.helpers import launch_browser_mailer +from gajim.common.helpers import open_uri from gajim.common.i18n import _ from gajim.common.const import DEVS_CURRENT from gajim.common.const import DEVS_PAST @@ -75,7 +75,7 @@ class AboutDialog(Gtk.AboutDialog): def _on_activate_link(_label, uri): # We have to use this, because the default GTK handler # is not cross-platform compatible - launch_browser_mailer(None, uri) + open_uri(uri) return Gdk.EVENT_STOP def _connect_link_handler(self, parent): ===================================== gajim/gtk/dataform.py ===================================== @@ -21,7 +21,7 @@ from gajim.gtkgui_helpers import scale_pixbuf_from_data from gajim.common import app from gajim.common.i18n import _ -from gajim.common.helpers import launch_browser_mailer +from gajim.common.helpers import open_uri from gajim.common.modules.dataforms import extend_form from gajim.gtk.util import MultiLineLabel @@ -588,9 +588,7 @@ class FakeDataFormWidget(Gtk.ScrolledWindow): button = Gtk.Button(label='Register') button.set_halign(Gtk.Align.CENTER) button.get_style_context().add_class('suggested-action') - button.connect('clicked', - lambda *args: launch_browser_mailer('url', - redirect_url)) + button.connect('clicked', lambda *args: open_uri(redirect_url)) self._grid.attach(button, 0, self._row_count, 2, 1) else: self._add_fields() ===================================== gajim/gtk/htmltextview.py ===================================== @@ -49,6 +49,8 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.const import StyleAttr +from gajim.common.helpers import open_uri +from gajim.common.helpers import parse_uri from gajim.gtk.util import load_icon from gajim.gtk.util import get_cursor @@ -877,8 +879,8 @@ class HtmlTextView(Gtk.TextView): self._cursor_changed = False return False - def show_context_menu(self, _event, kind, text): - menu = get_conv_context_menu(self.account, kind, text) + def show_context_menu(self, uri): + menu = get_conv_context_menu(self.account, uri) if menu is None: return @@ -904,53 +906,21 @@ class HtmlTextView(Gtk.TextView): # Detect XHTML-IM link word = getattr(texttag, 'href', None) - if word: - if word.startswith('xmpp'): - kind = 'xmpp' - elif word.startswith('mailto:'): - kind = 'mail' - elif app.interface.sth_at_sth_dot_sth_re.match(word): - # it's a JID or mail - kind = 'sth_at_sth' - else: + if not word: word = self.get_buffer().get_text(begin_iter, end_iter, True) + uri = parse_uri(word) if event.button.button == 3: # right click - self.show_context_menu(event, kind, word) + self.show_context_menu(uri) return True self.plugin_modified = False app.plugin_manager.extension_point( - 'hyperlink_handler', word, kind, self, - self.get_toplevel()) + 'hyperlink_handler', uri, self, self.get_toplevel()) if self.plugin_modified: return - # we launch the correct application - if kind == 'xmpp': - word = word[5:] - if '?' in word: - (jid, action) = word.split('?') - if action == 'join': - app.interface.join_gc_minimal(self.account, jid) - else: - app.interface.new_chat_from_jid(self.account, jid) - else: - app.interface.new_chat_from_jid(self.account, word) - - # handle geo:-URIs - elif word[:4] == 'geo:': - location = word[4:] - lat, _, lon = location.partition(',') - if lon == '': - return - uri = 'https://www.openstreetmap.org/?' \ - 'mlat=%(lat)s&mlon=%(lon)s&zoom=16' % \ - {'lat': lat, 'lon': lon} - helpers.launch_browser_mailer(kind, uri) - else: - # other URIs - helpers.launch_browser_mailer(kind, word) + open_uri(uri, account=self.account) def display_html(self, html, textview, conv_textview, iter_=None): buffer_ = self.get_buffer() ===================================== gajim/gui_interface.py ===================================== @@ -1957,10 +1957,6 @@ class Interface: self.systray_enabled = False self.systray.hide_icon() - @staticmethod - def on_launch_browser_mailer(widget, url, kind): - helpers.launch_browser_mailer(kind, url) - def process_connections(self): """ Called each foo (200) milliseconds. Check for idlequeue timeouts @@ -2381,11 +2377,6 @@ class Interface: app.config.get_per('accounts', account, 'active'): app.connections[account] = Connection(account) - # gtk hooks -# Gtk.about_dialog_set_email_hook(self.on_launch_browser_mailer, 'mail') -# Gtk.about_dialog_set_url_hook(self.on_launch_browser_mailer, 'url') -# Gtk.link_button_set_uri_hook(self.on_launch_browser_mailer, 'url') - self.instances = {} for a in app.connections: ===================================== gajim/gui_menu_builder.py ===================================== @@ -25,6 +25,8 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import ngettext from gajim.common.i18n import _ +from gajim.common.const import URIType +from gajim.common.const import URIAction from gajim.gtk.util import get_builder @@ -918,9 +920,9 @@ def get_encryption_menu(control_id, type_id, zeroconf=False): return menu -def get_conv_context_menu(account, kind, text): - if kind == 'xmpp': - if '?join' in text: +def get_conv_context_menu(account, uri): + if uri.type == URIType.XMPP: + if uri.action == URIAction.JOIN: context_menu = [ ('copy-text', _('Copy JID')), ('-join-groupchat', _('Join Groupchat')), @@ -932,19 +934,25 @@ def get_conv_context_menu(account, kind, text): ('-add-contact', _('Add to Roster…')), ] - elif kind == 'url': + elif uri.type == URIType.WEB: context_menu = [ ('copy-text', _('Copy Link Location')), ('open-link', _('Open Link in Browser')), ] - elif kind == 'mail': + elif uri.type == URIType.MAIL: context_menu = [ ('copy-text', _('Copy Email Address')), ('open-link', _('Open Email Composer')), ] - elif kind == 'sth_at_sth': + elif uri.type == URIType.GEO: + context_menu = [ + ('copy-text', _('Copy Location')), + ('open-link', _('Show Location')), + ] + + elif uri.type == URIType.AT: context_menu = [ ('copy-text', _('Copy JID/Email')), ('open-link', _('Open Email Composer')), @@ -953,6 +961,7 @@ def get_conv_context_menu(account, kind, text): ('-add-contact', _('Add to Roster…')), ] else: + log.warning('No handler for URI type: %s', uri) return menu = Gtk.Menu() @@ -962,19 +971,15 @@ def get_conv_context_menu(account, kind, text): menuitem.set_label(label) if action.startswith('-'): - text = text.replace('xmpp:', '') - text = text.split('?')[0] action = 'app.%s%s' % (account, action) else: action = 'app.%s' % action menuitem.set_action_name(action) - if action == 'app.open-link': - value = GLib.Variant.new_strv([kind, text]) - elif action == 'app.copy-text': - value = GLib.Variant.new_string(text) + if action in ('app.open-link', 'app.copy-text'): + value = GLib.Variant.new_string(uri.data) else: - value = GLib.Variant.new_strv([account, text]) + value = GLib.Variant.new_strv([account, uri.data]) menuitem.set_action_target_value(value) menuitem.show() menu.append(menuitem) ===================================== gajim/plugins/gui.py ===================================== @@ -32,7 +32,7 @@ from gi.repository import Gdk from gajim.common import app from gajim.common import configpaths from gajim.common.exceptions import PluginsystemError -from gajim.common.helpers import launch_browser_mailer +from gajim.common.helpers import open_uri from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import GajimPluginActivateException @@ -250,7 +250,7 @@ class PluginsWindow: @log_calls('PluginsWindow') def on_install_plugin_button_clicked(self, widget): if app.is_flatpak(): - launch_browser_mailer('url', 'https://dev.gajim.org/gajim/gajim/wikis/help/flathub') + open_uri('https://dev.gajim.org/gajim/gajim/wikis/help/flathub') return def show_warn_dialog(): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c6c4bdcfe96430b07fb619d6ff09fb42… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c6c4bdcfe96430b07fb619d6ff09fb42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix installation of dependencies
by Philipp Hörist 26 Apr '19

26 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6c6c4bdc by Markus Wintermann at 2019-04-26T19:41:38Z Fix installation of dependencies Install precis-i18n before the other dependencies, because it is needed by python-nbxmpp - - - - - 1 changed file: - win/dev_env.sh Changes: ===================================== win/dev_env.sh ===================================== @@ -27,9 +27,8 @@ python-gnupg keyring cssutils qrcode -precis-i18n " - +pip3 install precis-i18n pip3 install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c6c4bdcfe96430b07fb619d6ff09fb426… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c6c4bdcfe96430b07fb619d6ff09fb426… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add max file size (http_upload) to tooltip and server info
by Philipp Hörist 26 Apr '19

26 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2f5f3225 by Daniel Brötzmann at 2019-04-26T18:15:31Z Add max file size (http_upload) to tooltip and server info - - - - - 2 changed files: - gajim/groupchat_control.py - gajim/gtk/server_info.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -495,6 +495,10 @@ class GroupchatControl(ChatControlBase): if self.is_connected and httpupload.get_enabled(): tooltip_text = _('Send File…') + max_file_size = con.get_module('HTTPUpload').max_file_size + if max_file_size is not None: + max_file_size = max_file_size / (1024 * 1024) + tooltip_text = _('Send File (max. %s MiB)…') % max_file_size else: tooltip_text = _('No File Transfer available') self.sendfile_button.set_tooltip_text(tooltip_text) ===================================== gajim/gtk/server_info.py ===================================== @@ -166,6 +166,13 @@ class ServerInfoDialog(Gtk.Dialog): Feature = namedtuple('Feature', ['name', 'available', 'tooltip', 'enabled']) + # HTTP File Upload + max_file_size = con.get_module('HTTPUpload').max_file_size + tooltip_size = '' + if max_file_size is not None: + max_file_size = max_file_size / (1024 * 1024) + tooltip_size = ' (max. %s MiB)' % max_file_size + return [ Feature('XEP-0016: Privacy Lists', con.get_module('PrivacyLists').supported, '', None), @@ -192,7 +199,8 @@ class ServerInfoDialog(Gtk.Dialog): con.get_module('MAM').archiving_namespace, None), Feature('XEP-0363: HTTP File Upload', con.get_module('HTTPUpload').available, - con.get_module('HTTPUpload').httpupload_namespace, None), + con.get_module('HTTPUpload').httpupload_namespace + \ + tooltip_size, None), Feature('XEP-0398: Avatar Conversion', con.avatar_conversion, '', None), Feature('XEP-0411: Bookmarks Conversion', View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2f5f32257d8746aa8e25a1e6bd2ded67a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2f5f32257d8746aa8e25a1e6bd2ded67a4… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2019