Commits March 2019

commits@gajim.org

1 participants
63 discussions

[Git][gajim/gajim][master] Rework HTTPUpload dialog
by Philipp Hörist 27 Mar '19

27 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 74ed71f5 by Daniel Brötzmann at 2019-03-26T23:40:46Z Rework HTTPUpload dialog - - - - - 2 changed files: - gajim/data/gui/httpupload_progress_dialog.ui - gajim/dialogs.py Changes: ===================================== gajim/data/gui/httpupload_progress_dialog.ui ===================================== @@ -1,29 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.14"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="box"> + <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">8</property> - <property name="bottom_padding">4</property> - <property name="left_padding">8</property> - <property name="right_padding">8</property> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <attributes> - <attribute name="weight" value="bold"/> - <attribute name="variant" value="normal"/> - </attributes> - </object> - </child> + <property name="icon_name">document-send-symbolic</property> + <property name="icon_size">6</property> </object> <packing> <property name="expand">False</property> @@ -32,21 +23,14 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">4</property> - <property name="bottom_padding">4</property> - <property name="left_padding">8</property> - <property name="right_padding">8</property> - <child> - <object class="GtkProgressBar" id="progressbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pulse_step">0.10000000149</property> - <property name="show_text">True</property> - </object> - </child> + <property name="margin_top">6</property> + <property name="label"><placeholder></property> + <style> + <class name="bold"/> + </style> </object> <packing> <property name="expand">False</property> @@ -54,5 +38,52 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="progress_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><progress></property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="progressbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="pulse_step">0.10000000149</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel_upload_button"> + <property name="label" translatable="yes">Cancel Upload</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="margin_top">6</property> + <signal name="clicked" handler="on_cancel_upload_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== @@ -1727,21 +1727,18 @@ class ProgressWindow(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('File Transfer')) - self.set_default_size(250, -1) self.event = file.event self.file = file - self.xml = get_builder('httpupload_progress_dialog.ui') + self._ui = get_builder('httpupload_progress_dialog.ui') - self.label = self.xml.get_object('label') - self.progressbar = self.xml.get_object('progressbar') - - self.add(self.xml.get_object('box')) + self.add(self._ui.box) self.pulse = GLib.timeout_add(100, self._pulse_progressbar) self.show_all() self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) app.ged.register_event_handler('httpupload-progress', ged.CORE, self._on_httpupload_progress) @@ -1749,20 +1746,23 @@ class ProgressWindow(Gtk.ApplicationWindow): if self.file != obj.file: return if obj.status == 'request': - self.label.set_text(_('Requesting HTTP Upload Slot…')) + self._ui.label.set_text(_('Requesting HTTP Upload Slot…')) elif obj.status == 'close': self.destroy() elif obj.status == 'upload': - self.label.set_text(_('Uploading file via HTTP File Upload…')) + self._ui.label.set_text(_('Uploading file via HTTP File Upload…')) elif obj.status == 'update': self.update_progress(obj.seen, obj.total) elif obj.status == 'encrypt': - self.label.set_text(_('Encrypting file…')) + self._ui.label.set_text(_('Encrypting file…')) def _pulse_progressbar(self): - self.progressbar.pulse() + self._ui.progressbar.pulse() return True + def on_cancel_upload_button_clicked(self, widget): + self.destroy() + def _on_destroy(self, *args): self.event.set() if self.pulse: @@ -1776,6 +1776,9 @@ class ProgressWindow(Gtk.ApplicationWindow): if self.pulse: GLib.source_remove(self.pulse) self.pulse = None - pct = (float(seen) / total) * 100.0 - self.progressbar.set_fraction(float(seen) / total) - self.progressbar.set_text(str(int(pct)) + "%") + self._ui.progressbar.set_fraction(float(seen) / total) + size_total = round(total / (1024 * 1024), 1) + size_progress = round(seen / (1024 * 1024), 1) + self._ui.progress_label.set_text( + _('%(progress)s of %(total)s MiB sent') % \ + {'progress': str(size_progress), 'total': str(size_total)}) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/74ed71f57e6b675bfd8bc81b0193f7e44e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/74ed71f57e6b675bfd8bc81b0193f7e44e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Remove unused imports
by Philipp Hörist 26 Mar '19

26 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ca037665 by Philipp Hörist at 2019-03-26T20:55:51Z Remove unused imports - - - - - bbada2ec by Philipp Hörist at 2019-03-26T22:49:45Z Improve NewConfirmationDialog - Add setting for modal/non-modal - Add default transient - Dont call run() it only returns after response - - - - - 4c062bf9 by Philipp Hörist at 2019-03-26T22:53:12Z Call show() on new dialogs - run() was removed from the dialog because it blocks - - - - - 760b94f2 by Philipp Hörist at 2019-03-26T23:14:00Z Add NewConfirmationCheckDialog - - - - - 4 changed files: - gajim/gtk/dialogs.py - gajim/gtk/themes.py - gajim/history_manager.py - gajim/roster_window.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -15,6 +15,7 @@ from collections import namedtuple from gi.repository import Gtk +from gi.repository import Pango from gajim.common import app from gajim.common import helpers @@ -53,6 +54,11 @@ class DialogButton(namedtuple('DialogButton', ('response text callback args ' default_kwargs['response'] = Gtk.ResponseType.OK default_kwargs['text'] = _('Delete') default_kwargs['action'] = ButtonAction.DESTRUCTIVE + + elif type_ == 'Remove': + default_kwargs['response'] = Gtk.ResponseType.OK + default_kwargs['text'] = _('Remove') + default_kwargs['action'] = ButtonAction.DESTRUCTIVE else: raise ValueError('Unknown button type: %s ' % type_) @@ -990,12 +996,16 @@ class ChangePasswordDialog(Gtk.Dialog): class NewConfirmationDialog(Gtk.MessageDialog): - def __init__(self, title, text, sec_text, buttons, transient_for=None): + def __init__(self, title, text, sec_text, buttons, + modal=True, transient_for=None): + if transient_for is None: + transient_for = app.app.get_active_window() Gtk.MessageDialog.__init__(self, title=title, text=text, transient_for=transient_for, - message_type=Gtk.MessageType.QUESTION) + message_type=Gtk.MessageType.QUESTION, + modal=modal) self._buttons = {} @@ -1012,8 +1022,6 @@ class NewConfirmationDialog(Gtk.MessageDialog): self.connect('response', self._on_response) - self.run() - def _on_response(self, _dialog, response): if response == Gtk.ResponseType.DELETE_EVENT: # Look if DELETE_EVENT is mapped to another response @@ -1031,6 +1039,40 @@ class NewConfirmationDialog(Gtk.MessageDialog): button.callback(*button.args, **button.kwargs) self.destroy() + def show(self): + self.show_all() + + +class NewConfirmationCheckDialog(NewConfirmationDialog): + def __init__(self, title, text, sec_text, check_text, + buttons, modal=True, transient_for=None): + NewConfirmationDialog.__init__(self, + title, + text, + sec_text, + buttons, + transient_for=transient_for, + modal=modal) + + self._checkbutton = Gtk.CheckButton.new_with_mnemonic(check_text) + self._checkbutton.set_can_focus(False) + self._checkbutton.set_margin_start(30) + self._checkbutton.set_margin_end(30) + label = self._checkbutton.get_child() + label.set_line_wrap(True) + label.set_max_width_chars(50) + label.set_halign(Gtk.Align.START) + label.set_line_wrap_mode(Pango.WrapMode.WORD) + label.set_margin_start(10) + + self.get_content_area().add(self._checkbutton) + + def _on_response(self, _dialog, response): + button = self._buttons.get(response) + if button is not None: + button.args.insert(0, self._checkbutton.get_active()) + super()._on_response(_dialog, response) + class ShortcutsWindow: def __init__(self): ===================================== gajim/gtk/themes.py ===================================== @@ -24,7 +24,6 @@ from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.const import StyleAttr -from gajim.common.const import ButtonAction from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import DialogButton @@ -326,7 +325,7 @@ class Themes(Gtk.ApplicationWindow): _('Do you want to permanently delete this theme?'), [DialogButton.make('Cancel'), DialogButton.make('Delete', callback=_remove_theme)], - transient_for=self) + transient_for=self).show() @staticmethod def _on_destroy(*args): ===================================== gajim/history_manager.py ===================================== @@ -44,7 +44,6 @@ from gi.repository import Gio from gi.repository import Pango from gajim.common import app -from gajim.common import i18n from gajim.common import configpaths from gajim.common.i18n import _ from gajim.common.i18n import ngettext @@ -578,7 +577,7 @@ class HistoryManager: paths_len, liststore[list_of_paths[0]][0]), [DialogButton.make('Cancel'), DialogButton.make('Delete', callback=on_ok)], - transient_for=self._ui.history_manager_window) + transient_for=self._ui.history_manager_window).show() def _delete_logs(self, liststore, list_of_paths): paths_len = len(list_of_paths) @@ -615,7 +614,7 @@ class HistoryManager: paths_len), [DialogButton.make('Cancel'), DialogButton.make('Delete', callback=on_ok)], - transient_for=self._ui.history_manager_window) + transient_for=self._ui.history_manager_window).show() def on_search_db_button_clicked(self, widget): text = self._ui.search_entry.get_text() ===================================== gajim/roster_window.py ===================================== @@ -71,6 +71,8 @@ from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow @@ -3347,7 +3349,7 @@ class RosterWindow: """ Remove a contact. list_ is a list of (contact, account) tuples """ - def on_ok(is_checked, list_): + def on_ok(is_checked): remove_auth = True if len(list_) == 1: contact = list_[0][0] @@ -3366,8 +3368,8 @@ class RosterWindow: contact.show = 'offline' app.contacts.add_contact(account, contact) self.add_contact(contact.jid, account) - def on_ok2(list_): - on_ok(False, list_) + def on_ok2(): + on_ok(False) if len(list_) == 1: contact = list_[0][0] @@ -3380,19 +3382,22 @@ class RosterWindow: ConfirmationDialog(pritext, sectext + \ _('By removing this contact you also remove authorization ' 'resulting in them always seeing you as offline.'), - on_response_ok=(on_ok2, list_)) + on_response_ok=on_ok2) elif _('Not in Roster') in contact.get_shown_groups(): # Contact is not in roster ConfirmationDialog(pritext, sectext + \ - _('Do you want to continue?'), on_response_ok=(on_ok2, - list_)) + _('Do you want to continue?'), on_response_ok=on_ok2) else: - ConfirmationDialogCheck(pritext, sectext + \ + NewConfirmationCheckDialog( + _('Remove'), + pritext, sectext + \ _('By removing this contact you also by default remove ' - 'authorization resulting in them always seeing you as' - ' offline.'), - _('I want this contact to know my status after removal'), - on_response_ok=(on_ok, list_)) + 'authorization resulting in them always seeing you as' + ' offline.'), + _('_I want this contact to know my status after removal'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', callback=on_ok)], + modal=False).show() else: # several contact to remove at the same time pritext = _('Contacts will be removed from your roster') @@ -3403,8 +3408,7 @@ class RosterWindow: sectext = _('By removing these contacts:%s\nyou also remove ' 'authorization resulting in them always seeing you as ' 'offline.') % jids - ConfirmationDialog(pritext, sectext, - on_response_ok=(on_ok2, list_)) + ConfirmationDialog(pritext, sectext, on_response_ok=on_ok2) def on_send_custom_status(self, widget, contact_list, show, group=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/acd9f67d926e9c971aba82ef08cc2bfe1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/acd9f67d926e9c971aba82ef08cc2bfe1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryManager: Use NewConfirmationDialog
by Philipp Hörist 26 Mar '19

26 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: acd9f67d by Philipp Hörist at 2019-03-26T20:47:18Z HistoryManager: Use NewConfirmationDialog - - - - - 3 changed files: - gajim/gtk/dialogs.py - gajim/gtk/themes.py - gajim/history_manager.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -19,6 +19,7 @@ from gi.repository import Gtk from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ +from gajim.common.const import ButtonAction from gajim.gtk.util import get_builder from gajim.gtk.util import load_icon @@ -47,6 +48,11 @@ class DialogButton(namedtuple('DialogButton', ('response text callback args ' elif type_ == 'Cancel': default_kwargs['response'] = Gtk.ResponseType.CANCEL default_kwargs['text'] = _('Cancel') + + elif type_ == 'Delete': + default_kwargs['response'] = Gtk.ResponseType.OK + default_kwargs['text'] = _('Delete') + default_kwargs['action'] = ButtonAction.DESTRUCTIVE else: raise ValueError('Unknown button type: %s ' % type_) ===================================== gajim/gtk/themes.py ===================================== @@ -323,13 +323,9 @@ class Themes(Gtk.ApplicationWindow): NewConfirmationDialog( _('Delete'), _('Delete Theme'), - _('Do you want to permanently ' - 'delete this theme?'), + _('Do you want to permanently delete this theme?'), [DialogButton.make('Cancel'), - DialogButton.make('OK', - text=_('Delete'), - callback=_remove_theme, - action=ButtonAction.DESTRUCTIVE)], + DialogButton.make('Delete', callback=_remove_theme)], transient_for=self) @staticmethod ===================================== gajim/history_manager.py ===================================== @@ -47,6 +47,7 @@ from gajim.common import app from gajim.common import i18n from gajim.common import configpaths from gajim.common.i18n import _ +from gajim.common.i18n import ngettext from gajim.common.const import StyleAttr from gajim.common.const import JIDConstant from gajim.common.const import KindConstant @@ -88,7 +89,8 @@ if is_standalone(): from gajim.common import helpers from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.util import convert_rgb_to_hex from gajim.gtk.util import get_builder @@ -539,7 +541,7 @@ class HistoryManager: if paths_len == 0: # nothing is selected return - def on_ok(liststore, list_of_paths): + def on_ok(): # delete all rows from db that match jid_id list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) @@ -567,21 +569,16 @@ class HistoryManager: self.AT_LEAST_ONE_DELETION_DONE = True - if paths_len == 1: - jid_id = '<i>%s</i>' % liststore[list_of_paths[0]][0] - pri_text = _('Do you wish to delete all correspondence with %(jid)s?') \ - % {'jid': jid_id} - else: - pri_text = _( - 'Do you wish to delete all correspondence with the selected contacts?') - dialog = ConfirmationDialog('', - _('This can not be undone.'), on_response_ok=(on_ok, - liststore, list_of_paths)) - dialog.set_title(_('Deletion Confirmation')) - dialog.set_markup(pri_text) - ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] - ok_button.grab_focus() - dialog.set_transient_for(self._ui.history_manager_window) + NewConfirmationDialog( + _('Delete'), + ngettext('Delete Conversation', 'Delete Conversations', paths_len), + ngettext('Do you want to permanently delete this ' + 'conversation with <b>%s</b>', + 'Do you want to permanently delete these Conversations', + paths_len, liststore[list_of_paths[0]][0]), + [DialogButton.make('Cancel'), + DialogButton.make('Delete', callback=on_ok)], + transient_for=self._ui.history_manager_window) def _delete_logs(self, liststore, list_of_paths): paths_len = len(list_of_paths) @@ -610,16 +607,15 @@ class HistoryManager: self.AT_LEAST_ONE_DELETION_DONE = True - pri_text = i18n.ngettext( - 'Do you really want to delete the selected message?', - 'Do you really want to delete the selected messages?', paths_len) - dialog = ConfirmationDialog(pri_text, - _('This can not be undone.'), on_response_ok=(on_ok, - liststore, list_of_paths)) - dialog.set_title(_('Deletion Confirmation')) - ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] - ok_button.grab_focus() - dialog.set_transient_for(self._ui.history_manager_window) + NewConfirmationDialog( + _('Delete'), + ngettext('Delete Message', 'Delete Messages', paths_len), + ngettext('Do you want to permanently delete this message', + 'Do you want to permanently delete these messages', + paths_len), + [DialogButton.make('Cancel'), + DialogButton.make('Delete', callback=on_ok)], + transient_for=self._ui.history_manager_window) def on_search_db_button_clicked(self, widget): text = self._ui.search_entry.get_text() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/acd9f67d926e9c971aba82ef08cc2bfe1f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/acd9f67d926e9c971aba82ef08cc2bfe1f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor NewConfirmationDialog
by Philipp Hörist 26 Mar '19

26 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 21aa352a by Philipp Hörist at 2019-03-26T19:19:50Z Refactor NewConfirmationDialog - - - - - 3 changed files: - gajim/common/const.py - gajim/gtk/dialogs.py - gajim/gtk/themes.py Changes: ===================================== gajim/common/const.py ===================================== @@ -6,9 +6,6 @@ from gajim.common.i18n import _ Option = namedtuple('Option', 'kind label type value name callback data desc enabledif props') Option.__new__.__defaults__ = (None,) * len(Option._fields) # type: ignore -DialogButton = namedtuple('DialogButton', 'text callback action') -DialogButton.__new__.__defaults__ = (None, None) # type: ignore - EncryptionData = namedtuple('EncryptionData', 'additional_data') EncryptionData.__new__.__defaults__ = (None,) # type: ignore ===================================== gajim/gtk/dialogs.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from collections import namedtuple + from gi.repository import Gtk from gajim.common import app @@ -22,6 +24,36 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import load_icon +class DialogButton(namedtuple('DialogButton', ('response text callback args ' + 'kwargs action is_default'))): + @classmethod + def make(cls, type_=None, **kwargs): + # Defaults + default_kwargs = { + 'response': None, + 'text': None, + 'callback': None, + 'args': [], + 'kwargs': {}, + 'action': None, + 'is_default': False + } + + if type_ is not None: + if type_ == 'OK': + default_kwargs['response'] = Gtk.ResponseType.OK + default_kwargs['text'] = 'OK' + + elif type_ == 'Cancel': + default_kwargs['response'] = Gtk.ResponseType.CANCEL + default_kwargs['text'] = _('Cancel') + else: + raise ValueError('Unknown button type: %s ' % type_) + + default_kwargs.update(kwargs) + return cls(**default_kwargs) + + class HigDialog(Gtk.MessageDialog): def __init__(self, parent, type_, buttons, pritext, sectext, on_response_ok=None, on_response_cancel=None, on_response_yes=None, @@ -952,18 +984,22 @@ class ChangePasswordDialog(Gtk.Dialog): class NewConfirmationDialog(Gtk.MessageDialog): - def __init__(self, text, sec_text, buttons, transient_for=None): + def __init__(self, title, text, sec_text, buttons, transient_for=None): Gtk.MessageDialog.__init__(self, + title=title, + text=text, transient_for=transient_for, - message_type=Gtk.MessageType.QUESTION, - text=text) + message_type=Gtk.MessageType.QUESTION) - self._buttons = buttons + self._buttons = {} - for response, button in buttons.items(): - self.add_button(button.text, response) + for button in buttons: + self._buttons[button.response] = button + self.add_button(button.text, button.response) + if button.is_default: + self.set_default_response(button.response) if button.action is not None: - widget = self.get_widget_for_response(response) + widget = self.get_widget_for_response(button.response) widget.get_style_context().add_class(button.action.value) self.format_secondary_markup(sec_text) @@ -972,7 +1008,7 @@ class NewConfirmationDialog(Gtk.MessageDialog): self.run() - def _on_response(self, dialog, response): + def _on_response(self, _dialog, response): if response == Gtk.ResponseType.DELETE_EVENT: # Look if DELETE_EVENT is mapped to another response response = self._buttons.get(response, None) @@ -986,7 +1022,7 @@ class NewConfirmationDialog(Gtk.MessageDialog): return if button.callback is not None: - button.callback() + button.callback(*button.args, **button.kwargs) self.destroy() ===================================== gajim/gtk/themes.py ===================================== @@ -24,10 +24,10 @@ from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.const import StyleAttr -from gajim.common.const import DialogButton from gajim.common.const import ButtonAction from gajim.gtk.dialogs import ErrorDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.util import get_builder @@ -320,17 +320,17 @@ class Themes(Gtk.ApplicationWindow): self._add_option_button.set_sensitive(False) self._clear_options() - buttons = { - Gtk.ResponseType.CANCEL: DialogButton('Keep Theme'), - Gtk.ResponseType.OK: DialogButton('Delete', - _remove_theme, - ButtonAction.DESTRUCTIVE), - } - - NewConfirmationDialog('Delete Theme', - 'Do you want to permanently delete this theme?', - buttons, - transient_for=self) + NewConfirmationDialog( + _('Delete'), + _('Delete Theme'), + _('Do you want to permanently ' + 'delete this theme?'), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('Delete'), + callback=_remove_theme, + action=ButtonAction.DESTRUCTIVE)], + transient_for=self) @staticmethod def _on_destroy(*args): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21aa352a344948d076f0fc033aa021312c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21aa352a344948d076f0fc033aa021312c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Remove reimport
by Philipp Hörist 25 Mar '19

25 Mar '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 366b3df2 by Philipp Hörist at 2019-03-25T23:03:36Z Remove reimport - - - - - 1 changed file: - gajim/plugins/gui.py Changes: ===================================== gajim/plugins/gui.py ===================================== @@ -42,7 +42,6 @@ from gajim.common.helpers import launch_browser_mailer from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.plugins_i18n import _ -from gajim.common.exceptions import PluginsystemError @unique View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/366b3df235cdb1cdd54dc909ea5c2900af… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/366b3df235cdb1cdd54dc909ea5c2900af… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 9 commits: Add server blabber.im to servers.json
by Philipp Hörist 25 Mar '19

25 Mar '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 40cf9488 by Dominion at 2019-03-25T22:15:26Z Add server blabber.im to servers.json - - - - - 64bda9cf by Daniel Brötzmann at 2019-03-25T22:19:11Z Flatpak: Disable install from ZIP - - - - - 838b04d6 by Daniel Brötzmann at 2019-03-25T22:24:33Z Improve dark theme colors - - - - - 23c08892 by Philipp Hörist at 2019-03-25T22:30:10Z Add method to determine window manager - - - - - 2f5d00d1 by Philipp Hörist at 2019-03-25T22:46:53Z Refactor saving roster position - Dont save roster position on Wayland - - - - - 0e9422ae by Philipp Hörist at 2019-03-25T22:51:46Z Refactor restoring roster position - - - - - 669671e0 by Philipp Hörist at 2019-03-25T22:52:37Z Move imports to the top - - - - - da5ffe4b by Philipp Hörist at 2019-03-25T22:53:05Z Correctly get the total screen geometry get_root_window() does not work on Wayland Fixes #9637 - - - - - f9872d3a by Philipp Hörist at 2019-03-25T22:59:07Z Update ChangeLog - - - - - 12 changed files: - ChangeLog - gajim/common/app.py - gajim/common/const.py - gajim/common/helpers.py - gajim/data/gui/plugins_window.ui - gajim/data/other/servers.json - gajim/data/style/default-dark.css - gajim/gtk/history.py - gajim/gtk/util.py - gajim/plugins/gui.py - gajim/roster_window.py - gajim/statusicon.py Changes: ===================================== ChangeLog ===================================== @@ -6,6 +6,9 @@ Gajim 1.1.3 (TBA) * #9573 Dont leak DNS query when connecting over proxy * #9578 Determine Windows version more reliably * #9622 Fix an error while quitting Gajim + * #9637 Restore window size correctly on wayland + * Improve dark theme colors + * Fix access to GnuPG keys * Use UUID4 item ids for pubsub posts * Various smaller improvements ===================================== gajim/common/app.py ===================================== @@ -39,11 +39,13 @@ from distutils.version import LooseVersion as V from collections import namedtuple import nbxmpp +from gi.repository import Gdk import gajim from gajim.common import config as c_config from gajim.common import configpaths from gajim.common import ged as ged_module +from gajim.common.const import Display from gajim.common.contacts import LegacyContactsAPI from gajim.common.events import Events from gajim.common.types import NetworkEventsControllerT # pylint: disable=unused-import @@ -193,6 +195,18 @@ def is_installed(dependency): def is_flatpak(): return gajim.IS_FLATPAK +def is_display(display): + # XWayland reports as Display X11, so try with env var + is_wayland = os.environ.get('XDG_SESSION_TYPE') == 'wayland' + if is_wayland and display == Display.WAYLAND: + return True + + default = Gdk.Display.get_default() + if default is None: + log('gajim').warning('Could not determine window manager') + return False + return default.__class__.__name__ == display.value + def disable_dependency(dependency): _dependencies[dependency] = False ===================================== gajim/common/const.py ===================================== @@ -193,6 +193,13 @@ class SyncThreshold(IntEnum): return str(self.value) +class Display(Enum): + X11 = 'X11Display' + WAYLAND = 'GdkWaylandDisplay' + WIN32 = 'GdkWin32Display' + QUARTZ = 'GdkQuartzDisplay' + + ACTIVITIES = { 'doing_chores': { 'category': _('Doing Chores'), ===================================== gajim/common/helpers.py ===================================== @@ -42,6 +42,7 @@ import logging import json import shutil import collections +from io import StringIO from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode @@ -51,11 +52,17 @@ import nbxmpp from nbxmpp.stringprepare import nameprep import precis_i18n.codec # pylint: disable=unused-import +from gajim.common import app from gajim.common import caps_cache from gajim.common import configpaths from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext +from gajim.common.const import Display + +if app.is_installed('PYCURL'): + import pycurl + log = logging.getLogger('gajim.c.helpers') @@ -552,12 +559,6 @@ def datetime_tuple(timestamp): tim = tim.timetuple() return tim - -from gajim.common import app -if app.is_installed('PYCURL'): - import pycurl - from io import StringIO - def convert_bytes(string): suffix = '' # IEC standard says KiB = 1024 bytes KB = 1000 bytes @@ -1534,3 +1535,14 @@ class AdditionalDataDict(collections.UserDict): del _dict[key] except KeyError: return + + +def save_roster_position(window): + if not app.config.get('save-roster-position'): + return + if app.is_display(Display.WAYLAND): + return + x_pos, y_pos = window.get_position() + log.debug('Save roster position: %s %s', x_pos, y_pos) + app.config.set('roster_x-position', x_pos) + app.config.set('roster_y-position', y_pos) ===================================== gajim/data/gui/plugins_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="plugins_window"> @@ -13,6 +13,9 @@ <property name="type_hint">dialog</property> <signal name="destroy" handler="on_plugins_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> + <child type="titlebar"> + <placeholder/> + </child> <child> <object class="GtkNotebook" id="plugins_notebook"> <property name="visible">True</property> @@ -232,6 +235,7 @@ <property name="wrap">True</property> <property name="wrap_mode">word-char</property> <property name="selectable">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -375,9 +379,6 @@ </child> </object> </child> - <child type="titlebar"> - <placeholder/> - </child> </object> <object class="GtkTextBuffer" id="textbuffer1"> <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> ===================================== gajim/data/other/servers.json ===================================== @@ -2,6 +2,7 @@ "servers":[ "0nl1ne.at", "404.city", + "blabber.im", "brauchen.info", "chatme.im", "comm.unicate.me", ===================================== gajim/data/style/default-dark.css ===================================== @@ -1,11 +1,11 @@ .gajim-incoming-nickname { - color: rgb(164, 0, 0) + color: rgb(207, 49, 47) } .gajim-outgoing-nickname { - color: rgb(52, 101, 164) + color: rgb(38, 139, 210) } .gajim-url { - color: rgb(117, 80, 123) + color: rgb(53, 132, 228) } .gajim-highlight-message { color: rgb(245, 121, 0) @@ -15,4 +15,4 @@ } .gajim-status-message { color: rgb(115, 210, 22) - } \ No newline at end of file + } ===================================== gajim/gtk/history.py ===================================== @@ -33,7 +33,9 @@ from gajim.common import app from gajim.common import helpers from gajim.common import exceptions from gajim.common.i18n import _ -from gajim.common.const import ShowConstant, KindConstant +from gajim.common.const import ShowConstant +from gajim.common.const import KindConstant +from gajim.common.const import StyleAttr from gajim import conversation_textview @@ -79,7 +81,9 @@ class HistoryWindow: account, used_in_history_window=True) scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() - self.history_buffer.create_tag('highlight', background='yellow') + highlight_color = app.css_config.get_value( + '.gajim-highlight-message', StyleAttr.COLOR) + self.history_buffer.create_tag('highlight', background=highlight_color) self.history_buffer.create_tag('invisible', invisible=True) self.checkbutton = xml.get_object('log_history_checkbutton') self.show_status_checkbutton = xml.get_object('show_status_checkbutton') ===================================== gajim/gtk/util.py ===================================== @@ -30,6 +30,7 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.const import Display _icon_theme = Gtk.IconTheme.get_default() _icon_theme.append_search_path(configpaths.get('ICONS')) @@ -117,11 +118,17 @@ def get_iconset_name_for(name: str) -> str: def get_total_screen_geometry() -> Tuple[int, int]: - screen = Gdk.Screen.get_default() - window = Gdk.Screen.get_root_window(screen) - width, height = window.get_width(), window.get_height() - log.debug('Get screen geometry: %s %s', width, height) - return width, height + total_width = 0 + total_height = 0 + display = Gdk.Display.get_default() + monitors = display.get_n_monitors() + for num in range(0, monitors): + monitor = display.get_monitor(num) + geometry = monitor.get_geometry() + total_width += geometry.width + total_height = max(total_height, geometry.height) + log.debug('Get screen geometry: %s %s', total_width, total_height) + return total_width, total_height def resize_window(window: Gtk.Window, width: int, height: int) -> None: @@ -155,6 +162,16 @@ def move_window(window: Gtk.Window, pos_x: int, pos_y: int) -> None: window.move(pos_x, pos_y) +def restore_roster_position(window): + if not app.config.get('save-roster-position'): + return + if app.is_display(Display.WAYLAND): + return + move_window(window, + app.config.get('roster_x-position'), + app.config.get('roster_y-position')) + + def get_completion_liststore(entry: Gtk.Entry) -> Gtk.ListStore: """ Create a completion model for entry widget completion list consists of ===================================== gajim/plugins/gui.py ===================================== @@ -36,6 +36,9 @@ from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.filechoosers import ArchiveChooserDialog from gajim.common import app from gajim.common import configpaths +from gajim.common.exceptions import PluginsystemError +from gajim.common.helpers import launch_browser_mailer + from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.plugins_i18n import _ @@ -63,14 +66,21 @@ class PluginsWindow: widgets_to_extract = ('plugins_notebook', 'plugin_name_label', 'plugin_version_label', 'plugin_authors_label', - 'plugin_homepage_linkbutton', 'uninstall_plugin_button', - 'configure_plugin_button', 'installed_plugins_treeview', - 'available_text', 'available_text_label') + 'plugin_homepage_linkbutton', 'install_plugin_button', + 'uninstall_plugin_button', 'configure_plugin_button', + 'installed_plugins_treeview', 'available_text', + 'available_text_label') for widget_name in widgets_to_extract: setattr(self, widget_name, builder.get_object(widget_name)) self.plugin_description_textview = builder.get_object('description') + + # Disable 'Install from ZIP' for Flatpak installs + if app.is_flatpak(): + self.install_plugin_button.set_tooltip_text( + _('Click to view Gajim\'s wiki page on how to install plugins in Flatpak.')) + self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool, GdkPixbuf.Pixbuf) self.installed_plugins_treeview.set_model(self.installed_plugins_model) @@ -237,6 +247,10 @@ class PluginsWindow: @log_calls('PluginsWindow') def on_install_plugin_button_clicked(self, widget): + if app.is_flatpak(): + launch_browser_mailer('url', 'https://dev.gajim.org/gajim/gajim/wikis/help/flathub') + return + def show_warn_dialog(): text = _('Archive is malformed') dialog = WarningDialog(text, '', transient_for=self.window) ===================================== gajim/roster_window.py ===================================== @@ -59,6 +59,7 @@ from gajim.common import helpers from gajim.common import idle from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n +from gajim.common.helpers import save_roster_position from gajim.common.i18n import _ from gajim.common.const import PEPEventType, AvatarSize, StyleAttr from gajim.common.dbus import location @@ -83,6 +84,8 @@ from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.history import HistoryWindow from gajim.gtk.accounts import AccountsWindow +from gajim.gtk.util import restore_roster_position + log = logging.getLogger('gajim.roster') @@ -2407,11 +2410,7 @@ class RosterWindow: if not app.config.get('quit_on_roster_x_button') and ( (app.interface.systray_enabled and app.config.get('trayicon') != \ 'on_event') or app.config.get('allow_hide_roster')): - if app.config.get('save-roster-position'): - x, y = self.window.get_position() - log.debug('Save roster position (get_position): %s %s', x, y) - app.config.set('roster_x-position', x) - app.config.set('roster_y-position', y) + save_roster_position(self.window) if os.name == 'nt' or app.config.get('hide_on_roster_x_button'): self.window.hide() else: @@ -2436,11 +2435,7 @@ class RosterWindow: # in case show_roster_on_start is False and roster is never shown # window.window is None if self.window.get_window() is not None: - if app.config.get('save-roster-position'): - x, y = self.window.get_window().get_root_origin() - log.debug('Save roster position (get_root_origin): %s %s', x, y) - app.config.set('roster_x-position', x) - app.config.set('roster_y-position', y) + save_roster_position(self.window) width, height = self.window.get_size() app.config.set('roster_width', width) app.config.set('roster_height', height) @@ -5706,13 +5701,11 @@ class RosterWindow: if len(app.connections) < 2: # Do not merge accounts if only one exists self.regroup = False + gtkgui_helpers.resize_window(self.window, app.config.get('roster_width'), app.config.get('roster_height')) - if app.config.get('save-roster-position'): - gtkgui_helpers.move_window(self.window, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + restore_roster_position(self.window) self.popups_notification_height = 0 self.popup_notification_windows = [] ===================================== gajim/statusicon.py ===================================== @@ -30,6 +30,8 @@ from gajim import gtkgui_helpers from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ +from gajim.common.helpers import save_roster_position +from gajim.gtk.util import restore_roster_position from gajim.gtk.single_message import SingleMessageWindow @@ -371,18 +373,11 @@ class StatusIcon: # No pending events, so toggle visible/hidden for roster window if win.get_property('visible'): if win.get_property('has-toplevel-focus') or os.name == 'nt': - if app.config.get('save-roster-position'): - x, y = win.get_position() - app.config.set('roster_x-position', x) - app.config.set('roster_y-position', y) + save_roster_position(win) win.hide() # else we hide it from VD that was visible in else: - if not win.get_property('visible'): - win.show_all() - if app.config.get('save-roster-position'): - gtkgui_helpers.move_window(win, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + win.show_all() + restore_roster_position(win) if not app.config.get('roster_window_skip_taskbar'): win.set_property('skip-taskbar-hint', False) win.present_with_time(Gtk.get_current_event_time()) @@ -394,11 +389,9 @@ class StatusIcon: if not event: return win = app.interface.roster.window - if not win.get_property('visible') and app.config.get( - 'save-roster-position'): - gtkgui_helpers.move_window(win, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + if not win.get_property('visible'): + # Needed if we are in one window mode + restore_roster_position(win) app.interface.handle_event(account, jid, event.type_) def on_middle_click(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/65dc8ed89254a8bec6e8eb0eb31ca0640… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/65dc8ed89254a8bec6e8eb0eb31ca0640… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Correctly get the total screen geometry
by Philipp Hörist 25 Mar '19

25 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1551ffa0 by Philipp Hörist at 2019-03-25T22:09:06Z Correctly get the total screen geometry get_root_window() does not work on Wayland Fixes #9637 - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -271,11 +271,17 @@ def get_available_iconsets(): def get_total_screen_geometry() -> Tuple[int, int]: - screen = Gdk.Screen.get_default() - window = Gdk.Screen.get_root_window(screen) - width, height = window.get_width(), window.get_height() - log.debug('Get screen geometry: %s %s', width, height) - return width, height + total_width = 0 + total_height = 0 + display = Gdk.Display.get_default() + monitors = display.get_n_monitors() + for num in range(0, monitors): + monitor = display.get_monitor(num) + geometry = monitor.get_geometry() + total_width += geometry.width + total_height = max(total_height, geometry.height) + log.debug('Get screen geometry: %s %s', total_width, total_height) + return total_width, total_height def resize_window(window: Gtk.Window, width: int, height: int) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1551ffa0b402f07a913b101c8421f1830e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1551ffa0b402f07a913b101c8421f1830e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move imports to the top
by Philipp Hörist 25 Mar '19

25 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 82016886 by Philipp Hörist at 2019-03-25T21:26:55Z Move imports to the top - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -42,6 +42,7 @@ import logging import json import shutil import collections +from io import StringIO from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode @@ -60,6 +61,10 @@ from gajim.common.i18n import ngettext from gajim.common.const import ShowConstant from gajim.common.const import Display +if app.is_installed('PYCURL'): + import pycurl + + log = logging.getLogger('gajim.c.helpers') special_groups = (_('Transports'), _('Not in Roster'), _('Observers'), _('Groupchats')) @@ -558,12 +563,6 @@ def datetime_tuple(timestamp): tim = tim.timetuple() return tim - -from gajim.common import app -if app.is_installed('PYCURL'): - import pycurl - from io import StringIO - def convert_bytes(string): suffix = '' # IEC standard says KiB = 1024 bytes KB = 1000 bytes View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/82016886843c1c2b65dd592000913b75b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/82016886843c1c2b65dd592000913b75b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor saving roster position
by Philipp Hörist 25 Mar '19

25 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a9efde13 by Philipp Hörist at 2019-03-25T21:20:19Z Refactor saving roster position - Dont save roster position on Wayland - - - - - 7a5d791b by Philipp Hörist at 2019-03-25T21:20:19Z Refactor restoring roster position - - - - - 4 changed files: - gajim/common/helpers.py - gajim/gtk/statusicon.py - gajim/gtk/util.py - gajim/roster_window.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -51,12 +51,14 @@ import nbxmpp from nbxmpp.stringprepare import nameprep import precis_i18n.codec # pylint: disable=unused-import +from gajim.common import app from gajim.common import caps_cache from gajim.common import configpaths from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.const import ShowConstant +from gajim.common.const import Display log = logging.getLogger('gajim.c.helpers') @@ -1508,3 +1510,14 @@ class AdditionalDataDict(collections.UserDict): del _dict[key] except KeyError: return + + +def save_roster_position(window): + if not app.config.get('save-roster-position'): + return + if app.is_display(Display.WAYLAND): + return + x_pos, y_pos = window.get_position() + log.debug('Save roster position: %s %s', x_pos, y_pos) + app.config.set('roster_x-position', x_pos) + app.config.set('roster_y-position', y_pos) ===================================== gajim/gtk/statusicon.py ===================================== @@ -28,10 +28,11 @@ from gajim import dialogs from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ +from gajim.common.helpers import save_roster_position from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name -from gajim.gtk.util import move_window +from gajim.gtk.util import restore_roster_position from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.tooltips import NotificationAreaTooltip @@ -375,18 +376,11 @@ class StatusIcon: # No pending events, so toggle visible/hidden for roster window if win.get_property('visible'): if win.get_property('has-toplevel-focus') or os.name == 'nt': - if app.config.get('save-roster-position'): - x, y = win.get_position() - app.config.set('roster_x-position', x) - app.config.set('roster_y-position', y) + save_roster_position(win) win.hide() # else we hide it from VD that was visible in else: - if not win.get_property('visible'): - win.show_all() - if app.config.get('save-roster-position'): - move_window(win, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + win.show_all() + restore_roster_position(win) if not app.config.get('roster_window_skip_taskbar'): win.set_property('skip-taskbar-hint', False) win.present_with_time(Gtk.get_current_event_time()) @@ -398,11 +392,9 @@ class StatusIcon: if not event: return win = app.interface.roster.window - if not win.get_property('visible') and app.config.get( - 'save-roster-position'): - move_window(win, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + if not win.get_property('visible'): + # Needed if we are in one window mode + restore_roster_position(win) app.interface.handle_event(account, jid, event.type_) def on_middle_click(self): ===================================== gajim/gtk/util.py ===================================== @@ -40,6 +40,7 @@ from gajim.common.i18n import _ from gajim.common.const import MOODS from gajim.common.const import ACTIVITIES from gajim.common.const import LOCATION_DATA +from gajim.common.const import Display from gajim.gtk.const import GajimIconSet @@ -308,6 +309,16 @@ def move_window(window: Gtk.Window, pos_x: int, pos_y: int) -> None: window.move(pos_x, pos_y) +def restore_roster_position(window): + if not app.config.get('save-roster-position'): + return + if app.is_display(Display.WAYLAND): + return + move_window(window, + app.config.get('roster_x-position'), + app.config.get('roster_y-position')) + + def get_completion_liststore(entry: Gtk.Entry) -> Gtk.ListStore: """ Create a completion model for entry widget completion list consists of ===================================== gajim/roster_window.py ===================================== @@ -56,6 +56,7 @@ from gajim.common import helpers from gajim.common import idle from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n +from gajim.common.helpers import save_roster_position from gajim.common.i18n import _ from gajim.common.const import PEPEventType, AvatarSize, StyleAttr from gajim.common.dbus import location @@ -83,7 +84,7 @@ from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.adhoc_commands import CommandWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window -from gajim.gtk.util import move_window +from gajim.gtk.util import restore_roster_position from gajim.gtk.util import get_metacontact_surface from gajim.gtk.util import get_builder from gajim.gtk.util import set_urgency_hint @@ -2365,11 +2366,7 @@ class RosterWindow: if not app.config.get('quit_on_roster_x_button') and ( (app.interface.systray_enabled and app.config.get('trayicon') != \ 'on_event') or app.config.get('allow_hide_roster')): - if app.config.get('save-roster-position'): - x, y = self.window.get_position() - log.debug('Save roster position (get_position): %s %s', x, y) - app.config.set('roster_x-position', x) - app.config.set('roster_y-position', y) + save_roster_position(self.window) if os.name == 'nt' or app.config.get('hide_on_roster_x_button'): self.window.hide() else: @@ -2394,11 +2391,7 @@ class RosterWindow: # in case show_roster_on_start is False and roster is never shown # window.window is None if self.window.get_window() is not None: - if app.config.get('save-roster-position'): - x, y = self.window.get_window().get_root_origin() - log.debug('Save roster position (get_root_origin): %s %s', x, y) - app.config.set('roster_x-position', x) - app.config.set('roster_y-position', y) + save_roster_position(self.window) width, height = self.window.get_size() app.config.set('roster_width', width) app.config.set('roster_height', height) @@ -5625,10 +5618,7 @@ class RosterWindow: resize_window(self.window, app.config.get('roster_width'), app.config.get('roster_height')) - if app.config.get('save-roster-position'): - move_window(self.window, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + restore_roster_position(self.window) # Remove contact from roster when last event opened # { (contact, account): { backend: boolean } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b6e7f5c6d2ecfa6be6044e2bec58ed93f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b6e7f5c6d2ecfa6be6044e2bec58ed93f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Format OMEMO fingerprint in tooltip
by Philipp Hörist 25 Mar '19

25 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b6e7f5c6 by Daniel Brötzmann at 2019-03-25T20:00:40Z Format OMEMO fingerprint in tooltip - - - - - 2 changed files: - gajim/conversation_textview.py - gajim/gtk/util.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -49,6 +49,7 @@ from gajim.common.const import StyleAttr, Trust from gajim.gtk import util from gajim.gtk.util import load_icon from gajim.gtk.util import get_cursor +from gajim.gtk.util import format_fingerprint from gajim.gtk.emoji_data import emoji_pixbufs from gajim.gtk.emoji_data import is_emoji from gajim.gtk.emoji_data import get_emoji_pixbuf @@ -1159,7 +1160,8 @@ class ConversationTextview(GObject.GObject): icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] tooltip = tooltip + '\n' + trust_tooltip if fingerprint is not None: - tooltip = tooltip + ' (' + fingerprint + ')' + fingerprint = format_fingerprint(fingerprint) + tooltip = tooltip + '\n' + fingerprint temp_mark = self._buffer.create_mark(None, iter_, True) self._buffer.insert(iter_, ' ') ===================================== gajim/gtk/util.py ===================================== @@ -23,6 +23,7 @@ from typing import Optional import os import sys import logging +import textwrap import xml.etree.ElementTree as ET from pathlib import Path from functools import wraps @@ -578,3 +579,13 @@ def format_location(location): 'tag': tag.capitalize(), 'text': text} return location_string.strip() + + +def format_fingerprint(fingerprint): + fplen = len(fingerprint) + wordsize = fplen // 8 + buf = '' + for w in range(0, fplen, wordsize): + buf += '{0} '.format(fingerprint[w:w + wordsize]) + buf = textwrap.fill(buf, width=36) + return buf.rstrip().upper() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6e7f5c6d2ecfa6be6044e2bec58ed93fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6e7f5c6d2ecfa6be6044e2bec58ed93fe… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2019