Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Set no-store hint on groupchat chatstates
by Philipp Hörist 07 May '18

07 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8b9eb59e by Philipp Hörist at 2018-05-07T18:04:24+02:00 Set no-store hint on groupchat chatstates - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2683,6 +2683,8 @@ class Connection(CommonConnection, ConnectionHandlers): if obj.chatstate: msg_iq.setTag(obj.chatstate, namespace=nbxmpp.NS_CHATSTATES) + if not obj.message: + msg_iq.setTag('no-store', namespace=nbxmpp.NS_MSG_HINTS) if obj.label is not None: msg_iq.addChild(node=obj.label) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8b9eb59ee4d2b3cbccc94ce8d72e6f0472… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8b9eb59ee4d2b3cbccc94ce8d72e6f0472… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ChangeLog
by Philipp Hörist 06 May '18

06 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 63bd4967 by Philipp Hörist at 2018-05-06T13:47:46+02:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Gajim 1.1.0 (TBA) + + * Support http:upload:0 + * Support for displaying/uploading avatars for rooms + * Support for PKIX over Secure HTTP (POSH) + Gajim 1.0.2 (30 April 2018) Bugs fixed: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/63bd4967d921deb5217568c042a44e5c3b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/63bd4967d921deb5217568c042a44e5c3b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use NativeFileChoosers on Windows and MacOS
by Philipp Hörist 06 May '18

06 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1ecf0ec0 by Philipp Hörist at 2018-05-06T09:17:58+02:00 Use NativeFileChoosers on Windows and MacOS These platforms integrate a file preview in their native filechoosers - - - - - 1 changed file: - gajim/filechoosers.py Changes: ===================================== gajim/filechoosers.py ===================================== --- a/gajim/filechoosers.py +++ b/gajim/filechoosers.py @@ -18,6 +18,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +import sys from pathlib import Path from collections import namedtuple @@ -138,7 +139,7 @@ class FileSaveDialog(NativeFileChooserDialog): class AvatarSaveDialog(FileSaveDialog): - if os.name == 'nt': + if sys.platform == 'win32': _filters = [Filter(_('Images'), '*.png;*.jpg;*.jpeg;*.svg', True)] @@ -199,14 +200,22 @@ class GtkAvatarChooserDialog(BaseAvatarChooserDialog, GtkFileChooserDialog): def FileChooserDialog(*args, **kwargs): - if app.is_flatpak(): + if _require_native(): return NativeFileOpenDialog(*args, **kwargs) else: return GtkFileOpenDialog(*args, **kwargs) def AvatarChooserDialog(*args, **kwargs): - if app.is_flatpak(): + if _require_native(): return NativeAvatarChooserDialog(*args, **kwargs) else: return GtkAvatarChooserDialog(*args, **kwargs) + + +def _require_native(): + if app.is_flatpak(): + return True + if sys.platform in ('win32', 'darwin'): + return True + return False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1ecf0ec0088e7c6d12fedce665e2871469… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1ecf0ec0088e7c6d12fedce665e2871469… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add menu for uploading room avatars
by Philipp Hörist 06 May '18

06 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 913634c4 by Philipp Hörist at 2018-05-06T09:11:32+02:00 Add menu for uploading room avatars - - - - - 4 changed files: - gajim/common/connection_handlers.py - gajim/dialog_messages.py - gajim/groupchat_control.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -479,6 +479,22 @@ class ConnectionVcard: self.connection.SendAndCallForResponse( iq, self._avatar_publish_result, {'sha': sha}) + def upload_room_avatar(self, room_jid, data): + iq = nbxmpp.Iq(typ='set', to=room_jid) + vcard = iq.addChild('vCard', namespace=nbxmpp.NS_VCARD) + photo = vcard.addChild('PHOTO') + photo.addChild('TYPE', payload='image/png') + photo.addChild('BINVAL', payload=data) + + self.connection.SendAndCallForResponse( + iq, self._upload_room_avatar_result) + + def _upload_room_avatar_result(self, stanza): + if not nbxmpp.isResultNode(stanza): + reason = stanza.getErrorMsg() or stanza.getError() + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='avatar-upload-error', args=reason)) + def _avatar_publish_result(self, con, stanza, sha): if stanza.getType() == 'result': current_sha = app.config.get_per( ===================================== gajim/dialog_messages.py ===================================== --- a/gajim/dialog_messages.py +++ b/gajim/dialog_messages.py @@ -173,6 +173,10 @@ messages = { _('For the choosen encryption there is no encryption method available'), ErrorDialog), + 'avatar-upload-error': Message( + _('Avatar upload failed'), + '%s', + ErrorDialog), } ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -29,6 +29,7 @@ import time import locale +import base64 from gi.repository import Gtk from gi.repository import Gdk @@ -61,6 +62,7 @@ from gajim.common import contacts from gajim.chat_control import ChatControl from gajim.chat_control_base import ChatControlBase +from gajim.filechoosers import AvatarChooserDialog from gajim.command_system.implementation.hosts import PrivateChatCommands from gajim.command_system.implementation.hosts import GroupChatCommands @@ -558,6 +560,7 @@ class GroupchatControl(ChatControlBase): ('bookmark-', self._on_bookmark_room), ('request-voice-', self._on_request_voice), ('execute-command-', self._on_execute_command), + ('upload-avatar-', self._on_upload_avatar), ] for action in actions: @@ -644,6 +647,10 @@ class GroupchatControl(ChatControlBase): tooltip_text = _('No File Transfer available') self.sendfile_button.set_tooltip_text(tooltip_text) + # Upload Avatar + vcard_support = muc_caps_cache.supports(self.room_jid, nbxmpp.NS_VCARD) + win.lookup_action('upload-avatar-' + self.control_id).set_enabled( + online and vcard_support and contact.affiliation == 'owner') def _connect_window_state_change(self, parent_win): if self._state_change_handler_id is None: @@ -759,6 +766,27 @@ class GroupchatControl(ChatControlBase): """ adhoc_commands.CommandWindow(self.account, self.room_jid) + def _on_upload_avatar(self, action, param): + def _on_accept(filename): + with open(filename, 'rb') as file: + data = file.read() + sha = app.interface.save_avatar(data, publish=True) + if sha is None: + dialogs.ErrorDialog( + _('Could not load image'), + transient_for=self.parent_win.window) + return + + publish = app.interface.get_avatar(sha, publish=True) + avatar = base64.b64encode(publish).decode('utf-8') + + app.connections[self.account].upload_room_avatar( + self.room_jid, avatar) + + AvatarChooserDialog(_on_accept, + transient_for=self.parent_win.window, + modal=True) + def show_roster(self): new_state = not self.hpaned.get_child2().is_visible() image = self.hide_roster_button.get_image() ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -642,6 +642,7 @@ def get_groupchat_menu(control_id): (_('Manage Room'), [ ('win.change-subject-', _('Change Subject')), ('win.configure-', _('Configure Room')), + ('win.upload-avatar-', _('Upload Avatar…')), ('win.destroy-', _('Destroy Room')), ]), ('win.change-nick-', _('Change Nick')), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/913634c4c60592f7205576996c2b8f2d9b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/913634c4c60592f7205576996c2b8f2d9b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Select account in account list if edited
by Philipp Hörist 05 May '18

05 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e9a4b372 by Markus Wintermann at 2018-05-05T14:19:17+02:00 Select account in account list if edited Before: After a rightclick -> "Modify Account" on an account in the roster the preferences of the account are shown but the account is not selected in the account list. After: account will be selected in the account list too - - - - - 1 changed file: - gajim/accounts_window.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -225,6 +225,7 @@ class AccountsWindow(Gtk.ApplicationWindow): def select_account(self, account): for row in self.account_list.get_children(): if row.get_child().account == account: + self.account_list.select_row(row) self.account_list.emit('row-activated', row) break View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e9a4b372e2d998074b971164d280378630… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e9a4b372e2d998074b971164d280378630… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor FileChooserDialogs
by Philipp Hörist 05 May '18

05 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c38db84e by Philipp Hörist at 2018-05-05T09:22:08+02:00 Refactor FileChooserDialogs Use GtkFileChooserDialog only when we need previews, default to NativeFileChooser otherwise. GtkFileChooserDialogs have a long list of issues, so lets only use it if we gain something from it. Flatpak should only run NativeFileChoosers because its sandboxed and this is needed for security purposes. As a result of that, Flatpak Users dont have image previews in the FileOpenDialogs Refactor all FileChoosers for a more simple approach when we use them Add a new SendFileDialog, so we dont have to put widgets into the FileChooser which forces non-native Dialogs. - - - - - 13 changed files: - gajim/common/app.py - gajim/data/gui/history_manager.ui - gajim/data/gui/profile_window.ui - + gajim/data/gui/send_file_dialog.ui - gajim/data/style/gajim.css - gajim/dialogs.py - + gajim/filechoosers.py - gajim/filetransfers_window.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/plugins/gui.py - gajim/profile_window.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -155,6 +155,7 @@ _dependencies = { 'PYCURL': False, 'GSPELL': False, 'IDLE': False, + 'RUN_AS_FLATPAK': False, } @@ -167,6 +168,9 @@ def is_installed(dependency): return _dependencies['AVAHI'] or _dependencies['PYBONJOUR'] return _dependencies[dependency] +def is_flatpak(): + return _dependencies['RUN_AS_FLATPAK'] + def disable_dependency(dependency): _dependencies[dependency] = False ===================================== gajim/data/gui/history_manager.ui ===================================== --- a/gajim/data/gui/history_manager.ui +++ b/gajim/data/gui/history_manager.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkMenu" id="context_menu"> @@ -22,70 +22,6 @@ </object> </child> </object> - <object class="GtkFileChooserDialog" id="filechooserdialog"> - <property name="can_focus">False</property> - <property name="type_hint">dialog</property> - <property name="action">save</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">24</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="save_button"> - <property name="label">gtk-save</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">save_button</action-widget> - </action-widgets> - <child> - <placeholder/> - </child> - </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -99,6 +35,9 @@ <property name="default_height">500</property> <signal name="delete-event" handler="on_history_manager_window_delete_event" swapped="no"/> <child> + <placeholder/> + </child> + <child> <object class="GtkBox" id="vbox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -306,8 +245,5 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </child> </object> </child> - <child> - <placeholder/> - </child> </object> </interface> ===================================== gajim/data/gui/profile_window.ui ===================================== --- a/gajim/data/gui/profile_window.ui +++ b/gajim/data/gui/profile_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkWindow" id="profile_window"> @@ -9,6 +9,9 @@ <signal name="destroy" handler="on_profile_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_profile_window_key_press_event" swapped="no"/> <child> + <placeholder/> + </child> + <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -30,10 +33,10 @@ <object class="GtkLabel" id="label24"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Name:</property> <property name="use_markup">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -54,10 +57,10 @@ <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Nickname:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -89,10 +92,10 @@ <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes" comments="Family Name">Family:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -113,10 +116,10 @@ <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes" comments="Given Name">Given:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -137,10 +140,10 @@ <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes" comments="Middle Name">Middle:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -151,10 +154,10 @@ <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes" comments="Prefix in Name">Prefix:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -185,10 +188,10 @@ <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes" comments="Suffix in Name">Suffix:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -217,10 +220,10 @@ <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Full Name</property> <property name="use_markup">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> </child> </object> @@ -245,10 +248,10 @@ <object class="GtkLabel" id="label31"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Street:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -269,10 +272,10 @@ <object class="GtkLabel" id="label29"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Extra Address:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -293,10 +296,10 @@ <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">City:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -317,10 +320,10 @@ <object class="GtkLabel" id="label26"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Postal Code:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -341,10 +344,10 @@ <object class="GtkLabel" id="label27"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">State:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -365,10 +368,10 @@ <object class="GtkLabel" id="label25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Country:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -391,10 +394,10 @@ <object class="GtkLabel" id="label30"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Address</property> <property name="use_markup">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> </child> </object> @@ -408,10 +411,10 @@ <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Homepage:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -433,9 +436,9 @@ <object class="GtkLabel" id="label57"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">E-Mail:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -457,10 +460,10 @@ <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Phone No.:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -492,10 +495,10 @@ <object class="GtkLabel" id="label58"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Avatar:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -506,12 +509,11 @@ <object class="GtkBox" id="hbox3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> <child> <object class="GtkButton" id="PHOTO_button"> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <signal name="button-press-event" handler="on_PHOTO_button_press_event" swapped="no"/> <child> <object class="GtkEventBox" id="PHOTO_eventbox3"> @@ -522,7 +524,6 @@ <object class="GtkImage" id="PHOTO_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</property> <property name="stock">gtk-missing-image</property> </object> </child> @@ -543,8 +544,6 @@ <property name="receives_default">False</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <signal name="button-press-event" handler="on_PHOTO_button_press_event" swapped="no"/> </object> <packing> @@ -553,10 +552,31 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="remove_avatar"> + <property name="label" translatable="yes">Remove Avatar</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Clear Avatar</property> + <property name="halign">start</property> + <property name="valign">end</property> + <signal name="clicked" handler="_clear_photo" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">6</property> + <property name="width">3</property> </packing> </child> <child> @@ -569,10 +589,10 @@ <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Birthday:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> </child> </object> @@ -581,21 +601,15 @@ <property name="top_attach">5</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> <child type="tab"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Personal Info</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Personal Info</property> </object> <packing> <property name="tab_fill">False</property> @@ -612,10 +626,10 @@ <object class="GtkLabel" id="label44"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Company:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -636,10 +650,10 @@ <object class="GtkLabel" id="label43"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Department:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -660,10 +674,10 @@ <object class="GtkLabel" id="label42"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Position:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -684,10 +698,10 @@ <object class="GtkLabel" id="label41"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Role:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -719,10 +733,10 @@ <object class="GtkLabel" id="label39"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Street:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -743,10 +757,10 @@ <object class="GtkLabel" id="label38"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Extra Address:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -767,10 +781,10 @@ <object class="GtkLabel" id="label37"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">City:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -791,10 +805,10 @@ <object class="GtkLabel" id="label35"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Postal Code:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -815,10 +829,10 @@ <object class="GtkLabel" id="label36"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">State:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -839,10 +853,10 @@ <object class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Country:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -865,10 +879,10 @@ <object class="GtkLabel" id="label40"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Address</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> </child> </object> @@ -882,10 +896,10 @@ <object class="GtkLabel" id="label32"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">E-Mail:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -907,10 +921,10 @@ <object class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="yalign">0</property> <property name="label" translatable="yes">Phone No.:</property> <property name="use_markup">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -942,9 +956,9 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Work</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Work</property> </object> <packing> <property name="position">1</property> @@ -974,9 +988,9 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" comments=""About" is the text of a tab of vcard window">About</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments=""About" is the text of a tab of vcard window">About</property> </object> <packing> <property name="position">2</property> ===================================== gajim/data/gui/send_file_dialog.ui ===================================== --- /dev/null +++ b/gajim/data/gui/send_file_dialog.ui @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkGrid" id="send_file_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkListBox" id="listbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="selection_mode">none</property> + <property name="activate_on_single_click">False</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Description:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="height_request">40</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="description"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word-char</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Select Files</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <signal name="clicked" handler="_select_files" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Send</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <signal name="clicked" handler="_send" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Files:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -99,3 +99,7 @@ popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } /*MessageWindow Notebook*/ .notebook-tab-label {min-width: 80px} + +/*SendFileDialog*/ +#SendFileDialog grid {padding: 12px} +#SendFileDialog grid list { background-color: @theme_bg_color} ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1426,74 +1426,6 @@ class HigDialog(Gtk.MessageDialog): vb.grab_focus() self.show_all() -class FileChooserDialog(Gtk.FileChooserDialog): - """ - Non-blocking FileChooser Dialog around Gtk.FileChooserDialog - """ - def __init__(self, title_text, action, buttons, default_response, - select_multiple=False, current_folder=None, on_response_ok=None, - on_response_cancel=None, preview=False, transient_for=None): - - Gtk.FileChooserDialog.__init__(self, title=title_text, - parent=transient_for, action=action) - self.add_button(buttons[0],buttons[1]) - if len(buttons) ==4: - self.add_button(buttons[2],buttons[3]) - self.set_default_response(default_response) - self.set_select_multiple(select_multiple) - if current_folder and os.path.isdir(current_folder): - self.set_current_folder(current_folder) - else: - self.set_current_folder(os.path.expanduser('~')) - self.response_ok, self.response_cancel = \ - on_response_ok, on_response_cancel - # in gtk+-2.10 clicked signal on some of the buttons in a dialog - # is emitted twice, so we cannot rely on 'clicked' signal - self.connect('response', self.on_dialog_response) - - if preview: - self.set_use_preview_label(False) - self.set_preview_widget(Gtk.Image()) - self.connect('selection-changed', self.update_preview) - - self.show_all() - - def on_dialog_response(self, dialog, response): - if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.CLOSE): - if self.response_cancel: - if isinstance(self.response_cancel, tuple): - self.response_cancel[0](dialog, *self.response_cancel[1:]) - else: - self.response_cancel(dialog) - else: - self.just_destroy(dialog) - elif response == Gtk.ResponseType.OK: - if self.response_ok: - if isinstance(self.response_ok, tuple): - self.response_ok[0](dialog, *self.response_ok[1:]) - else: - self.response_ok(dialog) - else: - self.just_destroy(dialog) - - def update_preview(self, widget): - path_to_file = widget.get_preview_filename() - preview = widget.get_preview_widget() - if path_to_file is None or os.path.isdir(path_to_file): - # nothing to preview or directory - # make sure you clean image do show nothing - preview.clear() - return - try: - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path_to_file, 200, 200) - except GObject.GError: - preview.clear() - return - widget.get_preview_widget().set_from_pixbuf(pixbuf) - - def just_destroy(self, widget): - self.destroy() - class AspellDictError: def __init__(self, lang): ErrorDialog( @@ -4773,139 +4705,6 @@ class ProgressDialog: def on_progress_dialog_delete_event(self, widget, event): return True # WM's X button or Escape key should not destroy the window -class ImageChooserDialog(FileChooserDialog): - def __init__(self, path_to_file='', on_response_ok=None, - on_response_cancel=None): - """ - Optionally accepts path_to_snd_file so it has that as selected - """ - def on_ok(widget, callback): - '''check if file exists and call callback''' - path_to_file = self.get_filename() - if not path_to_file: - return - if os.path.exists(path_to_file): - if isinstance(callback, tuple): - callback[0](widget, path_to_file, *callback[1:]) - else: - callback(widget, path_to_file) - - path = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_PICTURES) - FileChooserDialog.__init__(self, - title_text = _('Choose Image'), - action = Gtk.FileChooserAction.OPEN, - buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.OK), - default_response = Gtk.ResponseType.OK, - current_folder = path, - on_response_ok = (on_ok, on_response_ok), - on_response_cancel = on_response_cancel) - - if on_response_cancel: - self.connect('destroy', on_response_cancel) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('All files')) - filter_.add_pattern('*') - self.add_filter(filter_) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('Images')) - filter_.add_mime_type('image/png') - filter_.add_mime_type('image/jpeg') - filter_.add_mime_type('image/gif') - filter_.add_mime_type('image/tiff') - filter_.add_mime_type('image/svg+xml') - filter_.add_mime_type('image/x-xpixmap') # xpm - self.add_filter(filter_) - self.set_filter(filter_) - - if path_to_file: - self.set_filename(path_to_file) - - self.set_use_preview_label(False) - self.set_preview_widget(Gtk.Image()) - self.connect('selection-changed', self.update_preview) - - def update_preview(self, widget): - path_to_file = widget.get_preview_filename() - if path_to_file is None or os.path.isdir(path_to_file): - # nothing to preview or directory - # make sure you clean image do show nothing - preview = widget.get_preview_widget() - preview.clear() - return - try: - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path_to_file, 100, 100) - except GObject.GError: - return - widget.get_preview_widget().set_from_pixbuf(pixbuf) - -class AvatarChooserDialog(ImageChooserDialog): - def __init__(self, path_to_file='', on_response_ok=None, - on_response_cancel=None, on_response_clear=None): - ImageChooserDialog.__init__(self, path_to_file, on_response_ok, - on_response_cancel) - button = Gtk.Button(None, Gtk.STOCK_CLEAR) - self.response_clear = on_response_clear - if on_response_clear: - button.connect('clicked', self.on_clear) - button.show_all() - action_area = self.get_action_area() - action_area.pack_start(button, True, True, 0) - action_area.reorder_child(button, 0) - - def on_clear(self, widget): - if isinstance(self.response_clear, tuple): - self.response_clear[0](widget, *self.response_clear[1:]) - else: - self.response_clear(widget) - - -class ArchiveChooserDialog(FileChooserDialog): - def __init__(self, on_response_ok=None, on_response_cancel=None, - transient_for=None): - - def on_ok(widget, callback): - '''check if file exists and call callback''' - path_to_file = self.get_filename() - if not path_to_file: - return - if os.path.exists(path_to_file): - if isinstance(callback, tuple): - callback[0](path_to_file, *callback[1:]) - else: - callback(path_to_file) - self.destroy() - - path = os.path.expanduser('~') - - FileChooserDialog.__init__(self, - title_text=_('Choose Archive'), - action=Gtk.FileChooserAction.OPEN, - buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.OK), - default_response=Gtk.ResponseType.OK, - current_folder=path, - on_response_ok=(on_ok, on_response_ok), - on_response_cancel=on_response_cancel, - transient_for=transient_for) - - if on_response_cancel: - self.connect('destroy', on_response_cancel) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('All files')) - filter_.add_pattern('*') - self.add_filter(filter_) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('Zip files')) - filter_.add_pattern('*.zip') - - self.add_filter(filter_) - self.set_filter(filter_) - class TransformChatToMUC: # Keep a reference on windows so garbage collector don't restroy them instances = [] ===================================== gajim/filechoosers.py ===================================== --- /dev/null +++ b/gajim/filechoosers.py @@ -0,0 +1,212 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# 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, either version 3 of the License, or +# (at your option) any later version. +# +# 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/>. + +import os +from pathlib import Path +from collections import namedtuple + +from gi.repository import Gtk +from gi.repository import GdkPixbuf +from gi.repository import GObject + +from gajim.common import app + +Filter = namedtuple('Filter', 'name pattern default') + + +# Notes: Adding mime types to Gtk.FileFilter forces non-native dialogs + +class BaseFileChooser: + def _on_response(self, dialog, response, accept_cb, cancel_cb): + if response == Gtk.ResponseType.ACCEPT: + if self.get_select_multiple(): + accept_cb(dialog.get_filenames()) + else: + accept_cb(dialog.get_filename()) + + if response in (Gtk.ResponseType.CANCEL, + Gtk.ResponseType.DELETE_EVENT): + if cancel_cb is not None: + cancel_cb() + + def _add_filters(self, filters): + for filterinfo in filters: + filter_ = Gtk.FileFilter() + filter_.set_name(filterinfo.name) + if isinstance(filterinfo.pattern, list): + for mime_type in filterinfo.pattern: + filter_.add_mime_type(mime_type) + else: + filter_.add_pattern(filterinfo.pattern) + self.add_filter(filter_) + if filterinfo.default: + self.set_filter(filter_) + + def _update_preview(self, filechooser): + path_to_file = filechooser.get_preview_filename() + preview = filechooser.get_preview_widget() + if path_to_file is None or os.path.isdir(path_to_file): + # nothing to preview + preview.clear() + return + try: + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( + path_to_file, *self._preivew_size) + except GObject.GError: + preview.clear() + return + filechooser.get_preview_widget().set_from_pixbuf(pixbuf) + + +class BaseFileOpenDialog: + + _title = _('Choose File to Send…') + _filters = [Filter(_('All files'), '*', True)] + + +class BaseAvatarChooserDialog: + + _title = _('Choose Avatar…') + _preivew_size = (100, 100) + + if app.is_flatpak(): + _filters = [Filter(_('PNG files'), '*.png', True), + Filter(_('JPEG files'), '*.jp*g', False), + Filter(_('SVG files'), '*.svg', False)] + else: + _filters = [Filter(_('Images'), ['image/png', + 'image/jpeg', + 'image/svg+xml'], True)] + + +class NativeFileChooserDialog(Gtk.FileChooserNative, BaseFileChooser): + + _title = '' + _filters = [] + _action = Gtk.FileChooserAction.OPEN + + def __init__(self, accept_cb, cancel_cb=None, transient_for=None, + path=None, file_name=None, select_multiple=False, + modal=False): + + Gtk.FileChooserNative.__init__(self, + title=self._title, + action=self._action, + transient_for=transient_for) + + self.set_current_folder(path or str(Path.home())) + if file_name is not None: + self.set_current_name(file_name) + self.set_select_multiple(select_multiple) + self.set_do_overwrite_confirmation(True) + self.set_modal(modal) + self._add_filters(self._filters) + + self.connect('response', self._on_response, accept_cb, cancel_cb) + self.show() + + +class ArchiveChooserDialog(NativeFileChooserDialog): + + _title = _('Choose Archive') + _filters = [Filter(_('All files'), '*', False), + Filter(_('ZIP files'), '*.zip', True)] + + +class FileSaveDialog(NativeFileChooserDialog): + + _title = _('Save File as…') + _filters = [Filter(_('All files'), '*', True)] + _action = Gtk.FileChooserAction.SAVE + + +class AvatarSaveDialog(FileSaveDialog): + + if os.name == 'nt': + _filters = [Filter(_('Images'), '*.png;*.jpg;*.jpeg;*.svg', True)] + + +class NativeFileOpenDialog(BaseFileOpenDialog, NativeFileChooserDialog): + pass + + +class NativeAvatarChooserDialog(BaseAvatarChooserDialog, NativeFileChooserDialog): + pass + + +class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): + + _title = '' + _filters = [] + _action = Gtk.FileChooserAction.OPEN + _preivew_size = (200, 200) + + def __init__(self, accept_cb, cancel_cb=None, transient_for=None, + path=None, file_name=None, select_multiple=False, + preview=True, modal=False): + + Gtk.FileChooserDialog.__init__( + self, + title=self._title, + action=self._action, + buttons=[Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, + Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT], + transient_for=transient_for) + + self.set_current_folder(path or str(Path.home())) + if file_name is not None: + self.set_current_name(file_name) + self.set_select_multiple(select_multiple) + self.set_do_overwrite_confirmation(True) + self.set_modal(modal) + self._add_filters(self._filters) + + if preview: + self.set_use_preview_label(False) + self.set_preview_widget(Gtk.Image()) + self.connect('selection-changed', self._update_preview) + + self.connect('response', self._on_response, accept_cb, cancel_cb) + self.show() + + def _on_response(self, *args): + super()._on_response(*args) + self.destroy() + + +class GtkFileOpenDialog(BaseFileOpenDialog, GtkFileChooserDialog): + pass + + +class GtkAvatarChooserDialog(BaseAvatarChooserDialog, GtkFileChooserDialog): + pass + + +def FileChooserDialog(*args, **kwargs): + if app.is_flatpak(): + return NativeFileOpenDialog(*args, **kwargs) + else: + return GtkFileOpenDialog(*args, **kwargs) + + +def AvatarChooserDialog(*args, **kwargs): + if app.is_flatpak(): + return NativeAvatarChooserDialog(*args, **kwargs) + else: + return GtkAvatarChooserDialog(*args, **kwargs) ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -28,6 +28,8 @@ from gi.repository import GLib from gi.repository import Pango import os import time +from functools import partial +from pathlib import Path from enum import IntEnum, unique from datetime import datetime @@ -41,6 +43,7 @@ from gajim.common import helpers from gajim.common.file_props import FilesProp from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) +from gajim.filechoosers import FileSaveDialog, FileChooserDialog from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 import logging log = logging.getLogger('gajim.filetransfer_window') @@ -322,51 +325,8 @@ class FileTransfersWindow: account), type_=Gtk.MessageType.ERROR) def show_file_send_request(self, account, contact): - win = Gtk.ScrolledWindow() - win.set_shadow_type(Gtk.ShadowType.IN) - win.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) - - from gajim.message_textview import MessageTextView - desc_entry = MessageTextView() - win.add(desc_entry) - - def on_ok(widget): - file_dir = None - files_path_list = dialog.get_filenames() - desc = desc_entry.get_text() - for file_path in files_path_list: - if self.send_file(account, contact, file_path, desc) \ - and file_dir is None: - file_dir = os.path.dirname(file_path) - if file_dir: - app.config.set('last_send_dir', file_dir) - dialog.destroy() - - dialog = dialogs.FileChooserDialog(_('Choose File to Send…'), - Gtk.FileChooserAction.OPEN, (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL), - Gtk.ResponseType.OK, - True, # select multiple true as we can select many files to send - app.config.get('last_send_dir'), - on_response_ok=on_ok, - on_response_cancel=lambda e:dialog.destroy(), - preview=True, - transient_for=app.interface.roster.window - ) - - btn = Gtk.Button.new_with_mnemonic(_('_Send')) - btn.set_property('can-default', True) - # FIXME: add send icon to this button (JUMP_TO) - dialog.add_action_widget(btn, Gtk.ResponseType.OK) - dialog.set_default_response(Gtk.ResponseType.OK) - - desc_hbox = Gtk.HBox(homogeneous=False, spacing=5) - desc_hbox.pack_start(Gtk.Label.new(_('Description: ')), False, False, 0) - desc_hbox.pack_start(win, True, True, 0) - - dialog.vbox.pack_start(desc_hbox, False, False, 0) - - btn.show() - desc_hbox.show_all() + send_callback = partial(self.send_file, account, contact) + SendFileDialog(send_callback, self.window) def send_file(self, account, contact, file_path, file_desc=''): """ @@ -411,9 +371,9 @@ class FileTransfersWindow: app.connections[account].send_file_approval(file_props) def on_file_request_accepted(self, account, contact, file_props): - def on_ok(widget, account, contact, file_props): - file_path = dialog2.get_filename() + def on_ok(account, contact, file_props, file_path): if os.path.exists(file_path): + app.config.set('last_save_dir', os.path.dirname(file_path)) # check if we have write permissions if not os.access(file_path, os.W_OK): file_name = GLib.markup_escape_text(os.path.basename( @@ -433,13 +393,11 @@ class FileTransfersWindow: return elif response == 100: file_props.offset = dl_size - dialog2.destroy() self._start_receive(file_path, account, contact, file_props) dialog = dialogs.FTOverwriteConfirmationDialog( _('This file already exists'), _('What do you want to do?'), - propose_resume=not dl_finished, on_response=on_response, - transient_for=dialog2) + propose_resume=not dl_finished, on_response=on_response) dialog.set_destroy_with_parent(True) return else: @@ -452,26 +410,15 @@ class FileTransfersWindow: dirname, _('You do not have permission to create files ' 'in this directory.')) return - dialog2.destroy() self._start_receive(file_path, account, contact, file_props) - def on_cancel(widget, account, contact, file_props): - dialog2.destroy() - app.connections[account].send_file_rejection(file_props) - - dialog2 = dialogs.FileChooserDialog( - title_text=_('Save File as…'), - action=Gtk.FileChooserAction.SAVE, - buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_SAVE, Gtk.ResponseType.OK), - default_response=Gtk.ResponseType.OK, - current_folder=app.config.get('last_save_dir'), - on_response_ok=(on_ok, account, contact, file_props), - on_response_cancel=(on_cancel, account, contact, file_props)) - - dialog2.set_current_name(file_props.name) - dialog2.connect('delete-event', lambda widget, event: - on_cancel(widget, account, contact, file_props)) + con = app.connections[account] + accept_cb = partial(on_ok, account, contact, file_props) + cancel_cb = partial(con.send_file_rejection, file_props) + FileSaveDialog(accept_cb, + cancel_cb, + path=app.config.get('last_save_dir'), + file_name=file_props.name) def show_file_request(self, account, contact, file_props): """ @@ -1048,3 +995,78 @@ class FileTransfersWindow: def on_file_transfers_window_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: # ESCAPE self.window.hide() + + +class SendFileDialog(Gtk.ApplicationWindow): + def __init__(self, send_callback, transient_for): + active_window = app.app.get_active_window() + Gtk.ApplicationWindow.__init__(self) + self.set_name('SendFileDialog') + self.set_application(app.app) + self.set_show_menubar(False) + self.set_resizable(True) + self.set_default_size(400, 250) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_transient_for(active_window) + self.set_title(_('Choose a File to Send…')) + self.set_destroy_with_parent(True) + + self._send_callback = send_callback + + xml = gtkgui_helpers.get_gtk_builder('send_file_dialog.ui') + grid = xml.get_object('send_file_grid') + + self._filebox = xml.get_object('listbox') + self._description = xml.get_object('description') + + self.add(grid) + self.connect('key-press-event', self._key_press_event) + + xml.connect_signals(self) + self.show_all() + + def _send(self, button): + for file in self._filebox.get_children(): + self._send_callback(str(file.path), self._get_description()) + self.destroy() + + def _select_files(self, button): + FileChooserDialog(self._set_files, + select_multiple=True, + transient_for=self, + path=app.config.get('last_send_dir')) + + def _set_files(self, filenames): + # Clear the ListBox + self._filebox.foreach(self._remove_widget, None) + + for file in filenames: + row = FileRow(file) + if row.path.is_dir(): + continue + last_dir = row.path.parent + self._filebox.add(row) + self._filebox.show_all() + app.config.set('last_send_dir', str(last_dir)) + + def _remove_widget(self, widget, data): + self._filebox.remove(widget) + + def _get_description(self): + buffer_ = self._description.get_buffer() + start, end = buffer_.get_bounds() + return buffer_.get_text(start, end, False) + + def _key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + +class FileRow(Gtk.ListBoxRow): + def __init__(self, path): + Gtk.ListBoxRow.__init__(self) + self.path = Path(path) + label = Gtk.Label(self.path.name) + label.set_ellipsize(Pango.EllipsizeMode.END) + label.set_xalign(0) + self.add(label) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -51,6 +51,7 @@ from gajim.common import i18n from gajim.common import app from gajim.common import pep from gajim.common import configpaths +from gajim.filechoosers import AvatarSaveDialog gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(configpaths.get('ICONS')) @@ -450,6 +451,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): if response < 0: return + app.config.set('last_save_dir', os.path.dirname(file_path)) if isinstance(avatar, str): # We got a SHA pixbuf = app.interface.get_avatar(avatar) @@ -459,10 +461,8 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): extension = os.path.splitext(file_path)[1] if not extension: # Silently save as Jpeg image - image_format = 'jpeg' - file_path += '.jpeg' - elif extension == 'jpg': - image_format = 'jpeg' + image_format = 'png' + file_path += '.png' else: image_format = extension[1:] # remove leading dot @@ -473,19 +473,16 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): log.error('Error saving avatar: %s' % str(e)) if os.path.exists(file_path): os.remove(file_path) - new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg' + new_file_path = '.'.join(file_path.split('.')[:-1]) + '.png' def on_ok(file_path, pixbuf): - pixbuf.savev(file_path, 'jpeg', [], []) + pixbuf.savev(file_path, 'png', [], []) dialogs.ConfirmationDialog(_('Extension not supported'), _('Image cannot be saved in %(type)s format. Save as ' '%(new_filename)s?') % {'type': image_format, 'new_filename': new_file_path}, on_response_ok = (on_ok, new_file_path, pixbuf)) - else: - dialog.destroy() - def on_ok(widget): - file_path = dialog.get_filename() + def on_ok(file_path): if os.path.exists(file_path): # check if we have write permissions if not os.access(file_path, os.W_OK): @@ -496,8 +493,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): return dialog2 = dialogs.FTOverwriteConfirmationDialog( _('This file already exists'), _('What do you want to do?'), - propose_resume=False, on_response=(on_continue, file_path), - transient_for=dialog) + propose_resume=False, on_response=(on_continue, file_path)) dialog2.set_destroy_with_parent(True) else: dirname = os.path.dirname(file_path) @@ -509,19 +505,11 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): on_continue(0, file_path) - def on_cancel(widget): - dialog.destroy() - - dialog = dialogs.FileChooserDialog(title_text=_('Save Image as…'), - action=Gtk.FileChooserAction.SAVE, buttons=(Gtk.STOCK_CANCEL, - Gtk.ResponseType.CANCEL, Gtk.STOCK_SAVE, Gtk.ResponseType.OK), - default_response=Gtk.ResponseType.OK, - current_folder=app.config.get('last_save_dir'), on_response_ok=on_ok, - on_response_cancel=on_cancel) - - dialog.set_current_name(default_name + '.jpeg') - dialog.connect('delete-event', lambda widget, event: - on_cancel(widget)) + transient = app.app.get_active_window() + AvatarSaveDialog(on_ok, + path=app.config.get('last_save_dir'), + file_name='%s.png' % default_name, + transient_for=transient) def create_combobox(value_list, selected_value = None): """ ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -39,6 +39,7 @@ import sys import re import time import hashlib +from functools import partial from gi.repository import Gtk from gi.repository import GdkPixbuf @@ -66,7 +67,7 @@ from gajim import notify from gajim import message_control from gajim.dialog_messages import get_dialog from gajim.dialogs import ProgressWindow -from gajim.dialogs import FileChooserDialog +from gajim.filechoosers import FileChooserDialog from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl @@ -1147,22 +1148,13 @@ class Interface: ProgressWindow(file) def send_httpupload(self, chat_control): - FileChooserDialog( - on_response_ok=lambda widget: self.on_file_dialog_ok(widget, - chat_control), - title_text=_('Choose file to send'), - action=Gtk.FileChooserAction.OPEN, - buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.OK), - select_multiple=True, - default_response=Gtk.ResponseType.OK, - preview=True, - transient_for=chat_control.parent_win.window) + accept_cb = partial(self.on_file_dialog_ok, chat_control) + FileChooserDialog(accept_cb, + select_multiple=True, + transient_for=chat_control.parent_win.window) @staticmethod - def on_file_dialog_ok(widget, chat_control): - paths = widget.get_filenames() - widget.destroy() + def on_file_dialog_ok(chat_control, paths): con = app.connections[chat_control.account] groupchat = chat_control.type_id == message_control.TYPE_GC for path in paths: ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -83,10 +83,11 @@ if is_standalone(): configpaths.init() from gajim.common import app -from gajim import gtkgui_helpers from gajim.common.const import JIDConstant, KindConstant from gajim.common import helpers from gajim import dialogs +from gajim.filechoosers import FileSaveDialog +from gajim import gtkgui_helpers @unique @@ -465,24 +466,14 @@ class HistoryManager: return True def on_export_menuitem_activate(self, widget): - xml = gtkgui_helpers.get_gtk_builder('history_manager.ui', - 'filechooserdialog') - xml.connect_signals(self) - - dlg = xml.get_object('filechooserdialog') - dlg.set_title(_('Exporting History Logs…')) - dlg.set_current_folder(configpaths.get('HOME')) - dlg.props.do_overwrite_confirmation = True - response = dlg.run() + FileSaveDialog(self._on_export, + transient_for=self.window, + modal=True) - if response == Gtk.ResponseType.OK: # user want us to export ;) - liststore, list_of_paths = self.jids_listview.get_selection()\ - .get_selected_rows() - path_to_file = dlg.get_filename() - self._export_jids_logs_to_file(liststore, list_of_paths, - path_to_file) - - dlg.destroy() + def _on_export(self, filename): + liststore, list_of_paths = self.jids_listview.get_selection()\ + .get_selected_rows() + self._export_jids_logs_to_file(liststore, list_of_paths, filename) def on_delete_menuitem_activate(self, widget, listview): widget_name = Gtk.Buildable.get_name(listview) ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -35,7 +35,8 @@ import os from enum import IntEnum, unique from gajim import gtkgui_helpers -from gajim.dialogs import WarningDialog, YesNoDialog, ArchiveChooserDialog +from gajim.dialogs import WarningDialog, YesNoDialog +from gajim.filechoosers import ArchiveChooserDialog from gajim.htmltextview import HtmlTextView from gajim.common import app from gajim.common import configpaths @@ -309,8 +310,7 @@ class PluginsWindow(object): sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) - self.dialog = ArchiveChooserDialog( - on_response_ok=_try_install, transient_for=self.window) + ArchiveChooserDialog(_try_install, transient_for=self.window) class GajimPluginConfigDialog(Gtk.Dialog): ===================================== gajim/profile_window.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/profile_window.py @@ -33,6 +33,7 @@ import hashlib from gajim import gtkgui_helpers from gajim import dialogs +from gajim.filechoosers import AvatarChooserDialog from gajim.common.const import AvatarSize from gajim.common import app @@ -107,7 +108,7 @@ class ProfileWindow: if event.keyval == Gdk.KEY_Escape: self.window.destroy() - def on_clear_button_clicked(self, widget): + def _clear_photo(self, widget): # empty the image button = self.xml.get_object('PHOTO_button') image = button.get_image() @@ -115,12 +116,14 @@ class ProfileWindow: button.hide() text_button = self.xml.get_object('NOPHOTO_button') text_button.show() + remove_avatar = self.xml.get_object('remove_avatar') + remove_avatar.hide() self.avatar_encoded = None self.avatar_sha = None self.avatar_mime_type = None def on_set_avatar_button_clicked(self, widget): - def on_ok(widget, path_to_file): + def on_ok(path_to_file): with open(path_to_file, 'rb') as file: data = file.read() sha = app.interface.save_avatar(data, publish=True) @@ -129,9 +132,6 @@ class ProfileWindow: _('Could not load image'), transient_for=self.window) return - self.dialog.destroy() - self.dialog = None - scale = self.window.get_scale_factor() surface = app.interface.get_avatar(sha, AvatarSize.VCARD, scale) @@ -142,26 +142,15 @@ class ProfileWindow: text_button = self.xml.get_object('NOPHOTO_button') text_button.hide() + remove_avatar = self.xml.get_object('remove_avatar') + remove_avatar.show() + self.avatar_sha = sha publish = app.interface.get_avatar(sha, publish=True) self.avatar_encoded = base64.b64encode(publish).decode('utf-8') - self.avatar_mime_type = 'image/jpeg' - - def on_clear(widget): - self.dialog.destroy() - self.dialog = None - self.on_clear_button_clicked(widget) - - def on_cancel(widget): - self.dialog.destroy() - self.dialog = None + self.avatar_mime_type = 'image/png' - if self.dialog: - self.dialog.present() - else: - self.dialog = dialogs.AvatarChooserDialog( - on_response_ok=on_ok, on_response_cancel=on_cancel, - on_response_clear=on_clear) + AvatarChooserDialog(on_ok, transient_for=self.window) def on_PHOTO_button_press_event(self, widget, event): """ @@ -218,11 +207,13 @@ class ProfileWindow: button = self.xml.get_object('PHOTO_button') image = button.get_image() text_button = self.xml.get_object('NOPHOTO_button') + remove_avatar = self.xml.get_object('remove_avatar') if not 'PHOTO' in vcard_: # set default image image.set_from_pixbuf(None) button.hide() text_button.show() + remove_avatar.hide() for i in vcard_.keys(): if i == 'PHOTO': photo_encoded = vcard_[i]['BINVAL'] @@ -241,6 +232,7 @@ class ProfileWindow: GdkPixbuf.InterpType.BILINEAR) image.set_from_pixbuf(pixbuf) button.show() + remove_avatar.show() text_button.hide() continue if i == 'ADR' or i == 'TEL' or i == 'EMAIL': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c38db84e04b11408f3eb138b4e1be17c6e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c38db84e04b11408f3eb138b4e1be17c6e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Refactor ManageSoundsWindow
by Philipp Hörist 02 May '18

02 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fc9d242f by Philipp Hörist at 2018-05-02T22:38:07+02:00 Refactor ManageSoundsWindow - Move code into ui file - Use FileChooserButton instead of FileChooserDialog - Make methods private - Simplify code - - - - - 0f7097b7 by Philipp Hörist at 2018-05-02T22:38:07+02:00 Remove unused Dialog This was nonfunctional for a long time and nobody complained - - - - - 497c710d by Philipp Hörist at 2018-05-02T22:38:07+02:00 Remove unused Dialog Using a FileChooserDialog for this is overkill, use FileChooserButton in the future - - - - - bb33e055 by Philipp Hörist at 2018-05-02T22:38:07+02:00 Fix regression from refactoring regression was introduced in e2383fd7a4cfd8d1dc38ca51fb74f97e7a657ccf - - - - - 7 changed files: - gajim/chat_control_base.py - gajim/config.py - gajim/conversation_textview.py - gajim/data/gui/manage_sounds_window.ui - gajim/dialogs.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -47,6 +47,7 @@ from gajim.common import events from gajim.common import app from gajim.common import helpers from gajim.common import ged +from gajim.common import i18n from gajim.message_control import MessageControl from gajim.conversation_textview import ConversationTextview from gajim.message_textview import MessageTextView @@ -514,7 +515,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # use the default one lang = app.config.get('speller_language') if not lang: - lang = app.LANG + lang = i18n.LANG gspell_lang = Gspell.language_lookup(lang) if gspell_lang is None: gspell_lang = Gspell.language_get_default() ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2939,141 +2939,104 @@ class ManagePEPServicesWindow: window.set_title(title) window.show_all() + class ManageSoundsWindow: def __init__(self): - self.xml = gtkgui_helpers.get_gtk_builder('manage_sounds_window.ui') - self.window = self.xml.get_object('manage_sounds_window') + self._builder = gtkgui_helpers.get_gtk_builder( + 'manage_sounds_window.ui') + self.window = self._builder.get_object('manage_sounds_window') self.window.set_transient_for( app.interface.instances['preferences'].window) - # sounds treeview - self.sound_tree = self.xml.get_object('sounds_treeview') - - # active, event ui name, path to sound file, event_config_name - model = Gtk.ListStore(bool, str, str, str) - self.sound_tree.set_model(model) - - col = Gtk.TreeViewColumn(_('Active')) - self.sound_tree.append_column(col) - renderer = Gtk.CellRendererToggle() - renderer.set_property('activatable', True) - renderer.connect('toggled', self.sound_toggled_cb) - col.pack_start(renderer, True) - col.add_attribute(renderer, 'active', 0) - col = Gtk.TreeViewColumn(_('Event')) - self.sound_tree.append_column(col) - renderer = Gtk.CellRendererText() - col.pack_start(renderer, True) - col.add_attribute(renderer, 'text', 1) + self.sound_button = self._builder.get_object('filechooser') - self.fill_sound_treeview() + filter_ = Gtk.FileFilter() + filter_.set_name(_('All files')) + filter_.add_pattern('*') + self.sound_button.add_filter(filter_) - self.xml.connect_signals(self) + filter_ = Gtk.FileFilter() + filter_.set_name(_('Wav Sounds')) + filter_.add_pattern('*.wav') + self.sound_button.add_filter(filter_) + self.sound_button.set_filter(filter_) + + self.sound_tree = self._builder.get_object('sounds_treeview') - self.sound_tree.get_model().connect('row-changed', - self.on_sounds_treemodel_row_changed) + self._fill_sound_treeview() + + self._builder.connect_signals(self) self.window.show_all() - def on_sounds_treemodel_row_changed(self, model, path, iter_): + def _on_row_changed(self, model, path, iter_): sound_event = model[iter_][3] - app.config.set_per('soundevents', sound_event, 'enabled', - bool(model[path][0])) - app.config.set_per('soundevents', sound_event, 'path', - model[iter_][2]) + app.config.set_per('soundevents', sound_event, + 'enabled', bool(model[path][0])) + app.config.set_per('soundevents', sound_event, + 'path', model[iter_][2]) - def sound_toggled_cb(self, cell, path): + def _on_toggle(self, cell, path): + if self.sound_button.get_filename() is None: + return model = self.sound_tree.get_model() model[path][0] = not model[path][0] - def fill_sound_treeview(self): + def _fill_sound_treeview(self): model = self.sound_tree.get_model() model.clear() - model.set_sort_column_id(1, Gtk.SortType.ASCENDING) # NOTE: sounds_ui_names MUST have all items of # sounds = app.config.get_per('soundevents') as keys sounds_dict = { - 'attention_received': _('Attention Message Received'), - 'first_message_received': _('First Message Received'), - 'next_message_received_focused': _('Next Message Received Focused'), - 'next_message_received_unfocused': - _('Next Message Received Unfocused'), - 'contact_connected': _('Contact Connected'), - 'contact_disconnected': _('Contact Disconnected'), - 'message_sent': _('Message Sent'), - 'muc_message_highlight': _('Group Chat Message Highlight'), - 'muc_message_received': _('Group Chat Message Received'), + 'attention_received': _('Attention Message Received'), + 'first_message_received': _('First Message Received'), + 'next_message_received_focused': _('Next Message Received Focused'), + 'next_message_received_unfocused': _('Next Message Received Unfocused'), + 'contact_connected': _('Contact Connected'), + 'contact_disconnected': _('Contact Disconnected'), + 'message_sent': _('Message Sent'), + 'muc_message_highlight': _('Group Chat Message Highlight'), + 'muc_message_received': _('Group Chat Message Received'), } - for sound_event_config_name, sound_ui_name in sounds_dict.items(): - enabled = app.config.get_per('soundevents', - sound_event_config_name, 'enabled') - path = app.config.get_per('soundevents', - sound_event_config_name, 'path') - model.append((enabled, sound_ui_name, path, sound_event_config_name)) + for config_name, sound_name in sounds_dict.items(): + enabled = app.config.get_per('soundevents', config_name, 'enabled') + path = app.config.get_per('soundevents', config_name, 'path') + model.append((enabled, sound_name, path, config_name)) - def on_treeview_sounds_cursor_changed(self, widget, data = None): - sounds_entry = self.xml.get_object('sounds_entry') - sel = self.sound_tree.get_selection() - if not sel: - sounds_entry.set_text('') - return - (model, iter_) = sel.get_selected() - if not iter_: - sounds_entry.set_text('') - return - path_to_snd_file = model[iter_][2] - sounds_entry.set_text(path_to_snd_file) - - def on_browse_for_sounds_button_clicked(self, widget, data = None): - sel = self.sound_tree.get_selection() - if not sel: - return - (model, iter_) = sel.get_selected() - if not iter_: - return - def on_ok(widget, path_to_snd_file): - self.dialog.destroy() - model, iter_ = self.sound_tree.get_selection().get_selected() - if not path_to_snd_file: - model[iter_][2] = '' - self.xml.get_object('sounds_entry').set_text('') - model[iter_][0] = False - return - directory = os.path.dirname(path_to_snd_file) - app.config.set('last_sounds_dir', directory) - path_to_snd_file = helpers.strip_soundfile_path(path_to_snd_file) - self.xml.get_object('sounds_entry').set_text(path_to_snd_file) + def _on_cursor_changed(self, treeview): + model, iter_ = treeview.get_selection().get_selected() + path_to_snd_file = helpers.check_soundfile_path(model[iter_][2]) + if path_to_snd_file is None: + self.sound_button.unselect_all() + else: + self.sound_button.set_filename(path_to_snd_file) - model[iter_][2] = path_to_snd_file # set new path to sounds_model - model[iter_][0] = True # set the sound to enabled + def _on_file_set(self, button): + model, iter_ = self.sound_tree.get_selection().get_selected() - def on_cancel(widget): - self.dialog.destroy() + filename = button.get_filename() + directory = os.path.dirname(filename) + app.config.set('last_sounds_dir', directory) + path_to_snd_file = helpers.strip_soundfile_path(filename) - path_to_snd_file = model[iter_][2] - self.dialog = dialogs.SoundChooserDialog(path_to_snd_file, on_ok, - on_cancel, transient_for=self.window) + # set new path to sounds_model + model[iter_][2] = path_to_snd_file + # set the sound to enabled + model[iter_][0] = True - def on_sounds_entry_changed(self, widget): - path_to_snd_file = widget.get_text() + def _on_clear(self, *args): + self.sound_button.unselect_all() model, iter_ = self.sound_tree.get_selection().get_selected() - model[iter_][2] = path_to_snd_file # set new path to sounds_model + model[iter_][2] = '' + model[iter_][0] = False - def on_play_button_clicked(self, widget): - sel = self.sound_tree.get_selection() - if not sel: - return - model, iter_ = sel.get_selected() - if not iter_: - return + def _on_play(self, *args): + model, iter_ = self.sound_tree.get_selection().get_selected() snd_event_config_name = model[iter_][3] helpers.play_sound(snd_event_config_name) - def on_close_button_clicked(self, widget): - self.window.hide() - - def on_manage_sounds_window_delete_event(self, widget, event): - self.window.hide() - return True # do NOT destroy the window + def _on_destroy(self, *args): + self.window.destroy() + app.interface.instances['preferences'].sounds_preferences = None ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -562,7 +562,7 @@ class ConversationTextview(GObject.GObject): % phrase_for_url else: link = 'http://%s.wikipedia.org/wiki/Special:Search?search=%s'\ - % (app.LANG, phrase_for_url) + % (i18n.LANG, phrase_for_url) item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) id_ = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id_] = item @@ -578,7 +578,7 @@ class ConversationTextview(GObject.GObject): % phrase_for_url else: link = 'http://%s.wiktionary.org/wiki/Special:Search?search=%s'\ - % (app.LANG, phrase_for_url) + % (i18n.LANG, phrase_for_url) id_ = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id_] = item else: ===================================== gajim/data/gui/manage_sounds_window.ui ===================================== --- a/gajim/data/gui/manage_sounds_window.ui +++ b/gajim/data/gui/manage_sounds_window.ui @@ -1,7 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gboolean"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + <signal name="row-changed" handler="_on_row_changed" swapped="no"/> + </object> <object class="GtkWindow" id="manage_sounds_window"> <property name="width_request">400</property> <property name="height_request">370</property> @@ -10,7 +23,10 @@ <property name="title" translatable="yes">Manage sounds</property> <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> - <signal name="delete-event" handler="on_manage_sounds_window_delete_event" swapped="no"/> + <signal name="delete-event" handler="_on_destroy" swapped="no"/> + <child> + <placeholder/> + </child> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> @@ -26,10 +42,36 @@ <object class="GtkTreeView" id="sounds_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="cursor-changed" handler="on_treeview_sounds_cursor_changed" swapped="no"/> + <property name="model">liststore1</property> + <signal name="cursor-changed" handler="_on_cursor_changed" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">Active</property> + <property name="clickable">True</property> + <child> + <object class="GtkCellRendererToggle"> + <signal name="toggled" handler="_on_toggle" swapped="no"/> + </object> + <attributes> + <attribute name="active">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">Event</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> </object> </child> </object> @@ -45,29 +87,38 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkEntry" id="sounds_entry"> + <object class="GtkFileChooserButton" id="filechooser"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_sounds_entry_changed" swapped="no"/> + <property name="can_focus">False</property> + <property name="preview_widget_active">False</property> + <property name="use_preview_label">False</property> + <property name="title" translatable="yes">Choose Sound</property> + <signal name="file-set" handler="_on_file_set" swapped="no"/> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="browse_for_sounds_button"> - <property name="label">...</property> + <object class="GtkButton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_browse_for_sounds_button_clicked" swapped="no"/> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Clear File</property> + <signal name="clicked" handler="_on_clear" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">edit-clear-all-symbolic</property> + </object> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -76,12 +127,13 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <signal name="clicked" handler="on_play_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_play" swapped="no"/> <child> <object class="GtkImage" id="image1370"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-media-play</property> + <property name="icon_name">media-playback-start-symbolic</property> + <property name="use_fallback">True</property> </object> </child> </object> @@ -111,7 +163,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_destroy" swapped="no"/> </object> <packing> <property name="expand">False</property> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -4773,48 +4773,6 @@ class ProgressDialog: def on_progress_dialog_delete_event(self, widget, event): return True # WM's X button or Escape key should not destroy the window -class SoundChooserDialog(FileChooserDialog): - def __init__(self, path_to_snd_file='', on_response_ok=None, - on_response_cancel=None, transient_for=None): - """ - Optionally accepts path_to_snd_file so it has that as selected - """ - def on_ok(widget, callback): - """ - Check if file exists and call callback - """ - path_to_snd_file = self.get_filename() - if os.path.exists(path_to_snd_file): - callback(widget, path_to_snd_file) - - FileChooserDialog.__init__( - self, title_text=_('Choose Sound'), - action=Gtk.FileChooserAction.OPEN, - buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.OK), - default_response=Gtk.ResponseType.OK, - current_folder=app.config.get('last_sounds_dir'), - on_response_ok=(on_ok, on_response_ok), - on_response_cancel=on_response_cancel, - transient_for=transient_for) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('All files')) - filter_.add_pattern('*') - self.add_filter(filter_) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('Wav Sounds')) - filter_.add_pattern('*.wav') - self.add_filter(filter_) - self.set_filter(filter_) - - path_to_snd_file = helpers.check_soundfile_path(path_to_snd_file) - if path_to_snd_file: - # set_filename accept only absolute path - path_to_snd_file = os.path.abspath(path_to_snd_file) - self.set_filename(path_to_snd_file) - class ImageChooserDialog(FileChooserDialog): def __init__(self, path_to_file='', on_response_ok=None, on_response_cancel=None): @@ -4948,58 +4906,6 @@ class ArchiveChooserDialog(FileChooserDialog): self.add_filter(filter_) self.set_filter(filter_) - -class AddSpecialNotificationDialog: - def __init__(self, jid): - """ - jid is the jid for which we want to add special notification (sound and - notification popups) - """ - self.xml = gtkgui_helpers.get_gtk_builder( - 'add_special_notification_window.ui') - self.window = self.xml.get_object('add_special_notification_window') - self.condition_combobox = self.xml.get_object('condition_combobox') - self.condition_combobox.set_active(0) - self.notification_popup_yes_no_combobox = self.xml.get_object( - 'notification_popup_yes_no_combobox') - self.notification_popup_yes_no_combobox.set_active(0) - self.listen_sound_combobox = self.xml.get_object('listen_sound_combobox') - self.listen_sound_combobox.set_active(0) - - self.jid = jid - self.xml.get_object('when_foo_becomes_label').set_text( - _('When %s becomes:') % self.jid) - - self.window.set_title(_('Adding Special Notification for %s') % jid) - self.window.show_all() - self.xml.connect_signals(self) - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def on_add_special_notification_window_delete_event(self, widget, event): - self.window.destroy() - - def on_listen_sound_combobox_changed(self, widget): - active = widget.get_active() - if active == 1: # user selected 'choose sound' - def on_ok(widget, path_to_snd_file): - pass - - def on_cancel(widget): - widget.set_active(0) # go back to No Sound - - self.dialog = SoundChooserDialog(on_response_ok=on_ok, - on_response_cancel=on_cancel) - - def on_ok_button_clicked(self, widget): - conditions = ('online', 'chat', 'online_and_chat', - 'away', 'xa', 'away_and_xa', 'dnd', 'xa_and_dnd', 'offline') - active = self.condition_combobox.get_active() - - active_iter = self.listen_sound_combobox.get_active_iter() - listen_sound_model = self.listen_sound_combobox.get_model() - class TransformChatToMUC: # Keep a reference on windows so garbage collector don't restroy them instances = [] ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -424,8 +424,6 @@ control=None, gc_contact=None, is_anonymous=True): send_auth_menuitem.connect('activate', roster.authorize, jid, account) if contact.sub in ('to', 'both'): ask_auth_menuitem.set_sensitive(False) - add_special_notification_menuitem.connect('activate', - roster.on_add_special_notification_menuitem_activate, jid) else: ask_auth_menuitem.connect('activate', roster.req_sub, jid, _('I would like to add you to my roster'), account, ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3039,9 +3039,6 @@ class RosterWindow: app.interface.instances['file_transfers'].show_file_send_request( account, contact) - def on_add_special_notification_menuitem_activate(self, widget, jid): - dialogs.AddSpecialNotificationDialog(jid) - def on_invite_to_new_room(self, widget, list_, resource=None): """ Resource parameter MUST NOT be used if more than one contact in list View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ad4c1347ffd8b46045a13fe831f8d77c7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ad4c1347ffd8b46045a13fe831f8d77c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Be more descriptive about the ascii_emoticons configuration option
by Philipp Hörist 02 May '18

02 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ad4c1347 by Marcin Mielniczuk at 2018-05-02T20:19:24+02:00 Be more descriptive about the ascii_emoticons configuration option - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -124,7 +124,7 @@ class Config: 'print_time': [ opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], 'print_time_fuzzy': [ opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is \'sometimes\'.') ], 'emoticons_theme': [opt_str, 'noto-emoticons', '', True ], - 'ascii_emoticons': [opt_bool, True, _('Enable ASCII emoticons'), True], + 'ascii_emoticons': [opt_bool, True, _('When enabled, ASCII emoticons will be converted to graphical emojis.'), True], 'ascii_formatting': [ opt_bool, True, _('Treat * / _ pairs as possible formatting characters.'), True], 'show_ascii_formatting_chars': [ opt_bool, True, _('If true, do not ' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ad4c1347ffd8b46045a13fe831f8d77c74… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ad4c1347ffd8b46045a13fe831f8d77c74… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove not used Dialog
by Philipp Hörist 02 May '18

02 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ba08ddfe by Philipp Hörist at 2018-05-02T19:48:44+02:00 Remove not used Dialog We use now a Gtk.FileChooserButton for client certs - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -4773,49 +4773,6 @@ class ProgressDialog: def on_progress_dialog_delete_event(self, widget, event): return True # WM's X button or Escape key should not destroy the window - -class ClientCertChooserDialog(FileChooserDialog): - def __init__(self, path_to_clientcert_file='', on_response_ok=None, - on_response_cancel=None): - ''' - optionally accepts path_to_clientcert_file so it has that as selected - ''' - def on_ok(widget, callback): - ''' - check if file exists and call callback - ''' - path_to_clientcert_file = self.get_filename() - if os.path.exists(path_to_clientcert_file): - callback(widget, path_to_clientcert_file) - - FileChooserDialog.__init__(self, - title_text=_('Choose Client Cert #PCKS12'), - transient_for=app.interface.instances['accounts'], - action=Gtk.FileChooserAction.OPEN, - buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.OK), - current_folder='', - default_response=Gtk.ResponseType.OK, - on_response_ok=(on_ok, on_response_ok), - on_response_cancel=on_response_cancel) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('All files')) - filter_.add_pattern('*') - self.add_filter(filter_) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('PKCS12 Files')) - filter_.add_pattern('*.p12') - self.add_filter(filter_) - self.set_filter(filter_) - - if path_to_clientcert_file: - # set_filename accept only absolute path - path_to_clientcert_file = os.path.abspath(path_to_clientcert_file) - self.set_filename(path_to_clientcert_file) - - class SoundChooserDialog(FileChooserDialog): def __init__(self, path_to_snd_file='', on_response_ok=None, on_response_cancel=None, transient_for=None): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ba08ddfef0095c24bbb68065732ae1d20b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ba08ddfef0095c24bbb68065732ae1d20b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Support for PKIX over Secure HTTP (POSH)
by Philipp Hörist 01 May '18

01 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bcf27cb3 by Philipp Hörist at 2018-05-01T21:08:26+02:00 Support for PKIX over Secure HTTP (POSH) Fixes #9083 - - - - - 5 changed files: - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -409,6 +409,7 @@ class Config: 'recent_groupchats': [ opt_str, '' ], 'httpupload_verify': [ opt_bool, True, _('HTTP Upload: Enable HTTPS Verification')], 'filetransfer_preference' : [ opt_str, 'httpupload', _('Preferred file transfer mechanism for file drag&drop on chat window. Can be \'httpupload\' (default) or \'jingle\'')], + 'allow_posh': [ opt_bool, True, _('Allow cert verification with POSH')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -43,8 +43,11 @@ import hmac import hashlib import json import logging +import base64 from functools import partial from string import Template +from urllib.request import urlopen +from urllib.error import URLError try: randomsource = random.SystemRandom() @@ -75,42 +78,6 @@ from gajim.gtkgui_helpers import get_action log = logging.getLogger('gajim.c.connection') -ssl_error = { - 2: _("Unable to get issuer certificate"), - 3: _("Unable to get certificate CRL"), - 4: _("Unable to decrypt certificate's signature"), - 5: _("Unable to decrypt CRL's signature"), - 6: _("Unable to decode issuer public key"), - 7: _("Certificate signature failure"), - 8: _("CRL signature failure"), - 9: _("Certificate is not yet valid"), - 10: _("Certificate has expired"), - 11: _("CRL is not yet valid"), - 12: _("CRL has expired"), - 13: _("Format error in certificate's notBefore field"), - 14: _("Format error in certificate's notAfter field"), - 15: _("Format error in CRL's lastUpdate field"), - 16: _("Format error in CRL's nextUpdate field"), - 17: _("Out of memory"), - 18: _("Self signed certificate"), - 19: _("Self signed certificate in certificate chain"), - 20: _("Unable to get local issuer certificate"), - 21: _("Unable to verify the first certificate"), - 22: _("Certificate chain too long"), - 23: _("Certificate revoked"), - 24: _("Invalid CA certificate"), - 25: _("Path length constraint exceeded"), - 26: _("Unsupported certificate purpose"), - 27: _("Certificate not trusted"), - 28: _("Certificate rejected"), - 29: _("Subject issuer mismatch"), - 30: _("Authority and subject key identifier mismatch"), - 31: _("Authority and issuer serial number mismatch"), - 32: _("Key usage does not include certificate signing"), - 50: _("Application verification failure") - #100 is for internal usage: host not correct -} - SERVICE_START_TLS = 'xmpp-client' SERVICE_DIRECT_TLS = 'xmpps-client' @@ -693,6 +660,13 @@ class Connection(CommonConnection, ConnectionHandlers): self.secret_hmac = str(random.random())[2:].encode('utf-8') self.removing_account = False + # We only request POSH once + self._posh_requested = False + # Fingerprints received via POSH + self._posh_hashes = [] + # The SSL Errors that we can override with POSH + self._posh_errors = [18, 19] + self.sm = Smacks(self) # Stream Management app.ged.register_event_handler('privacy-list-received', ged.CORE, @@ -1374,25 +1348,85 @@ class Connection(CommonConnection, ConnectionHandlers): cert = self.connection.Connection.ssl_certificate errnum = self._ssl_errors.pop() - hostname = app.config.get_per('accounts', self.name, 'hostname') - text = _('The authenticity of the %s ' - 'certificate could be invalid') % hostname - if errnum in ssl_error: - text += _('\nSSL Error: %s') % ssl_error[errnum] - else: - text += _('\nUnknown SSL error: %d') % errnum - fingerprint_sha1 = cert.digest('sha1').decode('utf-8') - fingerprint_sha256 = cert.digest('sha256').decode('utf-8') - pem = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') - app.nec.push_incoming_event( - SSLErrorEvent(None, conn=self, - error_text=text, - error_num=errnum, - cert=pem, - fingerprint_sha1=fingerprint_sha1, - fingerprint_sha256=fingerprint_sha256, - certificate=cert)) + + # Check if we can verify the cert with POSH + if errnum in self._posh_errors: + # Request the POSH json file + self._get_posh_file(self._hostname) + self._posh_requested = True + cert_hash256 = self._calculate_cert_sha256(cert) + print(cert_hash256) + if cert_hash256 in self._posh_hashes: + # Ignore this error if this cert is + # verifyed with POSH + self.process_ssl_errors() + return + + app.nec.push_incoming_event(SSLErrorEvent(None, conn=self, + error_num=errnum, + cert=cert)) + + @staticmethod + def _calculate_cert_sha256(cert): + der_encoded = OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_ASN1, cert) + hash_obj = hashlib.sha256(der_encoded) + hash256 = base64.b64encode(hash_obj.digest()).decode('utf8') + return hash256 + + def _get_posh_file(self, hostname=None, redirect=None): + if self._posh_requested: + # We already have requested POSH + return + + if not app.config.get_per('accounts', self.name, 'allow_posh'): + return + + if hostname is None and redirect is None: + raise ValueError('There must be either a hostname or a url') + + url = redirect + if hostname is not None: + url = 'https://%s/.well-known/posh/xmpp-client.json' % hostname + + cafile = None + if os.name == 'nt': + cafile = certifi.where() + + log.info('Request POSH from %s', url) + try: + file = urlopen( + url, cafile=cafile, timeout=2) + except URLError as exc: + log.info('Error while requesting POSH: %s' % exc) + return + + if file.getcode() != 200: + log.info('No POSH file found at %s', url) + return + + try: + posh = json.loads(file.read()) + except json.decoder.JSONDecodeError as json_error: + log.warning(json_error) + return + + # Redirect + if 'url' in posh and redirect is None: + # We dont allow redirects in redirects + log.info('POSH redirect found') + self._get_posh_file(redirect=posh['url']) + return + + if 'fingerprints' in posh: + fingerprints = posh['fingerprints'] + for fingerprint in fingerprints: + if 'sha-256' not in fingerprint: + continue + self._posh_hashes.append(fingerprint['sha-256']) + + log.info('POSH sha-256 fingerprints found: %s', + self._posh_hashes) def ssl_certificate_accepted(self): if not self.connection: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -42,7 +42,7 @@ from gajim.common import i18n from gajim.common import dataforms from gajim.common import configpaths from gajim.common.zeroconf.zeroconf import Constant -from gajim.common.const import KindConstant +from gajim.common.const import KindConstant, SSLError from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp @@ -1985,8 +1985,7 @@ class NewAccountConnectedEvent(nec.NetworkIncomingEvent): self.errnum = 0 # we don't have an errnum self.ssl_msg = '' if self.errnum > 0: - from gajim.common.connection import ssl_error - self.ssl_msg = ssl_error.get(self.errnum, + self.ssl_msg = SSLError.get(self.errnum, _('Unknown SSL error: %d') % self.errnum) self.ssl_cert = '' self.ssl_fingerprint_sha1 = '' ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -107,6 +107,42 @@ class JIDConstant(IntEnum): ROOM_TYPE = 1 +SSLError = { + 2: _("Unable to get issuer certificate"), + 3: _("Unable to get certificate CRL"), + 4: _("Unable to decrypt certificate's signature"), + 5: _("Unable to decrypt CRL's signature"), + 6: _("Unable to decode issuer public key"), + 7: _("Certificate signature failure"), + 8: _("CRL signature failure"), + 9: _("Certificate is not yet valid"), + 10: _("Certificate has expired"), + 11: _("CRL is not yet valid"), + 12: _("CRL has expired"), + 13: _("Format error in certificate's notBefore field"), + 14: _("Format error in certificate's notAfter field"), + 15: _("Format error in CRL's lastUpdate field"), + 16: _("Format error in CRL's nextUpdate field"), + 17: _("Out of memory"), + 18: _("Self signed certificate"), + 19: _("Self signed certificate in certificate chain"), + 20: _("Unable to get local issuer certificate"), + 21: _("Unable to verify the first certificate"), + 22: _("Certificate chain too long"), + 23: _("Certificate revoked"), + 24: _("Invalid CA certificate"), + 25: _("Path length constraint exceeded"), + 26: _("Unsupported certificate purpose"), + 27: _("Certificate not trusted"), + 28: _("Certificate rejected"), + 29: _("Subject issuer mismatch"), + 30: _("Authority and subject key identifier mismatch"), + 31: _("Authority and issuer serial number mismatch"), + 32: _("Key usage does not include certificate signing"), + 50: _("Application verification failure"), + } + + THANKS = u"""\ Alexander Futász Alexander V. Butenko ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -98,7 +98,7 @@ from gajim.common.connection import Connection from gajim.common.file_props import FilesProp from gajim.common import pep from gajim import emoticons -from gajim.common.const import AvatarSize +from gajim.common.const import AvatarSize, SSLError from gajim import roster_window from gajim import profile_window @@ -1343,7 +1343,6 @@ class Interface: obj.exchange_items_list, obj.fjid) def handle_event_ssl_error(self, obj): - # ('SSL_ERROR', account, (text, errnum, cert, sha1_fingerprint, sha256_fingerprint)) account = obj.conn.name server = app.config.get_per('accounts', account, 'hostname') @@ -1379,22 +1378,32 @@ class Interface: app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, show='offline')) + text = _('The authenticity of the %s ' + 'certificate could be invalid') % server + + default_text = _('\nUnknown SSL error: %d') % obj.error_num + ssl_error_text = SSLError.get(obj.error_num, default_text) + text += _('\nSSL Error: %s') % ssl_error_text + + fingerprint_sha1 = obj.cert.digest('sha1').decode('utf-8') + fingerprint_sha256 = obj.cert.digest('sha256').decode('utf-8') + pritext = _('Error verifying SSL certificate') sectext = _('There was an error verifying the SSL certificate of your ' 'XMPP server: %(error)s\nDo you still want to connect to this ' - 'server?') % {'error': obj.error_text} + 'server?') % {'error': text} if obj.error_num in (18, 27): checktext1 = _('Add this certificate to the list of trusted ' 'certificates.\nSHA-1 fingerprint of the certificate:\n%(sha1)s' '\nSHA-256 fingerprint of the certificate:\n%(sha256)s') % \ - {'sha1': obj.fingerprint_sha1, 'sha256': obj.fingerprint_sha256} + {'sha1': fingerprint_sha1, 'sha256': fingerprint_sha256} else: checktext1 = '' checktext2 = _('Ignore this error for this certificate.') if 'ssl_error' in self.instances[account]['online_dialog']: self.instances[account]['online_dialog']['ssl_error'].destroy() self.instances[account]['online_dialog']['ssl_error'] = \ - dialogs.SSLErrorDialog(obj.conn.name, obj.certificate, pritext, + dialogs.SSLErrorDialog(obj.conn.name, obj.cert, pritext, sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) self.instances[account]['online_dialog']['ssl_error'].set_title( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bcf27cb3c15b049ab5c8ff57800928c1c7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bcf27cb3c15b049ab5c8ff57800928c1c7… 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