Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: ability to call ad hoc commands on groupchats and groupchats occupants.
by Philipp Hörist 23 Dec '17

23 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c3369f03 by Yann Leboulanger at 2017-12-22T12:21:57+01:00 ability to call ad hoc commands on groupchats and groupchats occupants. Fixes #8819 - - - - - bf3aac28 by Philipp Hörist at 2017-12-23T22:31:45+01:00 Merge branch 'execute_command' into 'master' Add ad-hoc commands for Groupchats Closes #8819 See merge request gajim/gajim!179 - - - - - 4 changed files: - gajim/data/gui/gc_occupants_menu.ui - gajim/groupchat_control.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/gc_occupants_menu.ui ===================================== --- a/gajim/data/gui/gc_occupants_menu.ui +++ b/gajim/data/gui/gc_occupants_menu.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -126,6 +126,14 @@ </object> </child> <child> + <object class="GtkMenuItem" id="execute_command_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Execute command</property> + <property name="use_underline">True</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="block_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -46,6 +46,7 @@ from gajim import config from gajim import vcard from gajim import cell_renderer_image from gajim import dataforms_widget +from gajim import adhoc_commands from gajim.common.const import AvatarSize from gajim.common.caps_cache import muc_caps_cache import nbxmpp @@ -514,6 +515,7 @@ class GroupchatControl(ChatControlBase): ('configure-', self._on_configure_room), ('bookmark-', self._on_bookmark_room), ('request-voice-', self._on_request_voice), + ('execute-command-', self._on_execute_command), ] for action in actions: @@ -582,6 +584,10 @@ class GroupchatControl(ChatControlBase): win.lookup_action('change-nick-' + self.control_id).set_enabled( online) + # Execute command + win.lookup_action('execute-command-' + self.control_id).set_enabled( + online) + # Actions def _on_change_subject(self, action, param): @@ -679,6 +685,12 @@ class GroupchatControl(ChatControlBase): app.config.set_per('rooms', self.contact.jid, 'notify_on_all_messages', param.get_boolean()) + def _on_execute_command(self, action, param): + """ + Execute AdHoc commands on the current room + """ + adhoc_commands.CommandWindow(self.account, self.room_jid) + def show_roster(self): new_state = not self.hpaned.get_child2().is_visible() image = self.hide_roster_button.get_image() @@ -2560,6 +2572,10 @@ class GroupchatControl(ChatControlBase): id_ = item.connect('activate', self.on_add_to_roster, jid) self.handlers[id_] = item + item = xml.get_object('execute_command_menuitem') + id_ = item.connect('activate', self._on_execute_command_occupant, nick) + self.handlers[id_] = item + item = xml.get_object('block_menuitem') item2 = xml.get_object('unblock_menuitem') if not app.connections[self.account].privacy_rules_supported: @@ -2608,6 +2624,10 @@ class GroupchatControl(ChatControlBase): return ctrl + def _on_execute_command_occupant(self, widget, nick): + jid = self.room_jid + '/' + nick + adhoc_commands.CommandWindow(self.account, jid) + def on_row_activated(self, widget, path): """ When an iter is activated (dubblick or single click if gnome is set this ===================================== 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): ('win.request-voice-', _('Request Voice')), ('win.notify-on-message-', _('Notify on all messages')), ('win.minimize-', _('Minimize on close')), + ('win.execute-command-', _('Execute command')), ('win.browse-history-', _('History')), ('win.disconnect-', _('Disconnect')), ] ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -5389,8 +5389,16 @@ class RosterWindow: item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) + adhoc_menuitem = Gtk.MenuItem.new_with_mnemonic(_('Execute command')) + adhoc_menuitem.connect('activate', self.on_execute_command, contact, + account) + menu.append(adhoc_menuitem) + + item = Gtk.SeparatorMenuItem.new() # separator + menu.append(item) + history_menuitem = Gtk.MenuItem.new_with_mnemonic(_('_History')) - history_menuitem .connect('activate', self.on_history, contact, account) + history_menuitem.connect('activate', self.on_history, contact, account) menu.append(history_menuitem) event_button = gtkgui_helpers.get_possible_button_event(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ed0e2dd82be55f10efeafa8374562ef84… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ed0e2dd82be55f10efeafa8374562ef84… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] prevent TB loop and 100% CPU on connection cut
by Yann Leboulanger 22 Dec '17

22 Dec '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 650450d4 by Yann Leboulanger at 2017-12-22T12:45:47+01:00 prevent TB loop and 100% CPU on connection cut - - - - - 1 changed file: - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/transports_nb.py ===================================== --- a/nbxmpp/transports_nb.py +++ b/nbxmpp/transports_nb.py @@ -609,13 +609,13 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): try: # get as many bites, as possible, but not more than RECV_BUFSIZE received = self._recv(RECV_BUFSIZE) - except socket.error as e: - log.info("_do_receive: got %s:" % received, exc_info=True) except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) errnum, errstr = e.errno,\ decode_py2(e.strerror, locale.getpreferredencoding()) + except socket.error as e: + log.info("_do_receive: got %s:" % received, exc_info=True) if received == '': errstr = 'zero bytes on recv' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/650450d448f2828af3717bc544… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/650450d448f2828af3717bc544… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: dialogs: Use get_widget_for_response() to access buttons
by Philipp Hörist 20 Dec '17

20 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 65bc9659 by Marc Schink at 2017-12-19T22:23:27+01:00 dialogs: Use get_widget_for_response() to access buttons The get_action_area() API is deprecated and under some circumstances the wrong button gets accessed. - - - - - ed0e2dd8 by Philipp Hörist at 2017-12-20T20:45:48+01:00 Merge branch 'plain_connection_dialog_fix' into 'master' Dialogs: Use get_widget_for_response() to access buttons See merge request gajim/gajim!178 - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1722,7 +1722,7 @@ class ConfirmationDialogCheck(ConfirmationDialog): self.set_default_response(Gtk.ResponseType.OK) - ok_button = self.get_action_area().get_children()[0] # right to left + ok_button = self.get_widget_for_response(Gtk.ResponseType.OK) ok_button.grab_focus() self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) @@ -1777,7 +1777,7 @@ class ConfirmationDialogDoubleCheck(ConfirmationDialog): self.set_default_response(Gtk.ResponseType.OK) - ok_button = self.get_action_area().get_children()[0] # right to left + ok_button = self.get_widget_for_response(Gtk.ResponseType.OK) ok_button.grab_focus() vbox = self.get_content_area() @@ -1847,7 +1847,7 @@ class PlainConnectionDialog(ConfirmationDialogDoubleCheck): ConfirmationDialogDoubleCheck.__init__(self, pritext, sectext, checktext1, checktext2, tooltip1=tooltip1, on_response_ok=on_ok, on_response_cancel=on_cancel, is_modal=False) - self.ok_button = self.get_action_area().get_children()[0] # right to left + self.ok_button = self.get_widget_for_response(Gtk.ResponseType.OK) self.ok_button.set_sensitive(False) self.checkbutton1.connect('clicked', self.on_checkbutton_clicked) self.set_title(_('Insecure connection')) @@ -1875,7 +1875,7 @@ class ConfirmationDialogDoubleRadio(ConfirmationDialog): self.set_default_response(Gtk.ResponseType.OK) - ok_button = self.get_action_area().get_children()[0] # right to left + ok_button = self.get_widget_for_response(Gtk.ResponseType.OK) ok_button.grab_focus() vbox = self.get_content_area() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e7df2d93b6bb10cab7ec1558f0782c670… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e7df2d93b6bb10cab7ec1558f0782c670… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistorySync: Fix first time sync
by Philipp Hörist 19 Dec '17

19 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: e7df2d93 by Philipp Hörist at 2017-12-19T21:12:07+01:00 HistorySync: Fix first time sync Fixes #8810 Also remove mam_start_date migration. mam_start_date didnt exist in Gajim 0.16.x and it doesnt hurt if people who used the dev version download some extra messages. Our deduplication algorithm should take care of it. - - - - - 1 changed file: - gajim/history_sync.py Changes: ===================================== gajim/history_sync.py ===================================== --- a/gajim/history_sync.py +++ b/gajim/history_sync.py @@ -58,16 +58,13 @@ class HistorySyncAssistant(Gtk.Assistant): self.event_id = id(self) own_jid = self.con.get_own_jid().getStripped() - archive = app.logger.get_archive_timestamp(own_jid) - if archive is not None: - mam_start = float(archive.oldest_mam_timestamp) - else: - # Migration from old config value - mam_start = app.config.get_per( - 'accounts', account, 'mam_start_date') + mam_start = ArchiveState.NEVER + archive = app.logger.get_archive_timestamp(own_jid) + if archive is not None and archive.oldest_mam_timestamp is not None: + mam_start = int(float(archive.oldest_mam_timestamp)) - if not mam_start or mam_start == ArchiveState.NEVER: + if mam_start == ArchiveState.NEVER: self.current_start = self.now elif mam_start == ArchiveState.ALL: self.current_start = datetime.utcfromtimestamp(0) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e7df2d93b6bb10cab7ec1558f0782c6709… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e7df2d93b6bb10cab7ec1558f0782c6709… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GUI interface: fix resource warning
by Philipp Hörist 19 Dec '17

19 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f3bde561 by André Apitzsch at 2017-12-18T23:14:22+01:00 GUI interface: fix resource warning - - - - - f7260823 by Philipp Hörist at 2017-12-19T19:11:02+01:00 Merge branch 'resource' into 'master' GUI interface: fix resource warning See merge request gajim/gajim!175 - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2443,7 +2443,9 @@ class Interface: 'loading avatar %s failed. Try to convert ' 'avatar image using pillow', filename) try: - avatar = Image.open(path).convert("RGBA") + with open(path, 'rb') as im_handle: + img = Image.open(im_handle) + avatar = img.convert("RGBA") except (NameError, OSError): app.log('avatar').warning('Pillow convert failed: %s', filename) app.log('avatar').debug('Error', exc_info=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/01d535527e1e3324af08ccb6102b34e0f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/01d535527e1e3324af08ccb6102b34e0f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Zeroconf: fix unexpected keyword argument
by Yann Leboulanger 18 Dec '17

18 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 8b960238 by André Apitzsch at 2017-12-18T22:52:06+01:00 Zeroconf: fix unexpected keyword argument _update_status() got an unexpected keyword argument 'idle_time' introduced by 28917aaf5647b6cc0c8e8d62d5dfe19fba48ef4b - - - - - 01d53552 by Yann Leboulanger at 2017-12-18T23:08:14+01:00 Merge branch 'zero_con' into 'master' Zeroconf: fix unexpected keyword argument See merge request gajim/gajim!174 - - - - - 1 changed file: - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -325,7 +325,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def _change_from_invisible(self): self.connection.announce() - def _update_status(self, show, msg): + def _update_status(self, show, msg, idle_time=None): if self.connection.set_show_msg(show, msg): app.nec.push_incoming_event(OurShowEvent(None, conn=self, show=show)) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5a33a59ee6f58364eb00d8d52e96d13bb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5a33a59ee6f58364eb00d8d52e96d13bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Zeroconf: Fix get_own_jid()
by Yann Leboulanger 18 Dec '17

18 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 0ffd7b69 by André Apitzsch at 2017-12-18T22:16:22+01:00 Zeroconf: Fix get_own_jid() - - - - - 5a33a59e by Yann Leboulanger at 2017-12-18T22:19:21+01:00 Merge branch 'hostname' into 'master' Zeroconf: Fix get_own_jid() See merge request gajim/gajim!173 - - - - - 1 changed file: - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -125,7 +125,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): return jid def get_own_jid(self): - return nbxmpp.JID(self.username + '@' + self.hostname) + return nbxmpp.JID(self.username + '@' + self.host) def reconnect(self): # Do not try to reco while we are already trying View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/53a92bdee814751dcddbb67dbf122b20e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/53a92bdee814751dcddbb67dbf122b20e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] add get_own_jid method to ConnectionZeroconf. Fixes #8809
by Yann Leboulanger 18 Dec '17

18 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 53a92bde by Yann Leboulanger at 2017-12-18T14:44:38+01:00 add get_own_jid method to ConnectionZeroconf. Fixes #8809 - - - - - 1 changed file: - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -36,6 +36,8 @@ import socket import random random.seed() +import nbxmpp + import signal if os.name != 'nt': signal.signal(signal.SIGPIPE, signal.SIG_DFL) @@ -122,6 +124,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def check_jid(self, jid): return jid + def get_own_jid(self): + return nbxmpp.JID(self.username + '@' + self.hostname) + def reconnect(self): # Do not try to reco while we are already trying self.time_to_reconnect = None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/53a92bdee814751dcddbb67dbf122b20e5… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/53a92bdee814751dcddbb67dbf122b20e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Replace deprecated override_background_color()
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: bdf16c51 by Philipp Hörist at 2017-12-18T00:11:39+01:00 Replace deprecated override_background_color() - - - - - c18ef648 by Philipp Hörist at 2017-12-18T00:25:19+01:00 Replace deprecated get_background_color() - - - - - 3 changed files: - gajim/data/gui/popup_notification_window.ui - gajim/dialogs.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/data/gui/popup_notification_window.ui ===================================== --- a/gajim/data/gui/popup_notification_window.ui +++ b/gajim/data/gui/popup_notification_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkWindow" id="popup_notification_window"> @@ -16,6 +16,7 @@ <signal name="button-press-event" handler="on_popup_notification_window_button_press_event" swapped="no"/> <child> <object class="GtkEventBox" id="eventbox"> + <property name="name">PopupNotificationEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -116,5 +117,8 @@ </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3114,10 +3114,10 @@ class PopupNotificationWindow: self.jid = jid self.msg_type = msg_type self.index = len(app.interface.roster.popup_notification_windows) - xml = gtkgui_helpers.get_gtk_builder('popup_notification_window.ui') self.window = xml.get_object('popup_notification_window') self.window.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) + self.window.set_name('NotificationPopup') close_button = xml.get_object('close_button') event_type_label = xml.get_object('event_type_label') event_description_label = xml.get_object('event_description_label') @@ -3133,10 +3133,8 @@ class PopupNotificationWindow: '<span foreground="black" weight="bold">%s</span>' % GLib.markup_escape_text(title)) - # set colors [ http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html ] - color = Gdk.RGBA() - Gdk.RGBA.parse(color, 'black') - self.window.override_background_color(Gtk.StateType.NORMAL, color) + css = '#NotificationPopup {background-color: black }' + gtkgui_helpers.add_css_to_widget(self.window, css) # default image if not path_to_image: @@ -3162,11 +3160,19 @@ class PopupNotificationWindow: bg_color = app.config.get('notif_status_color') else: # Unknown event! Shouldn't happen but deal with it bg_color = app.config.get('notif_other_color') - popup_bg_color = Gdk.RGBA() - Gdk.RGBA.parse(popup_bg_color, bg_color) - close_button.override_background_color(Gtk.StateType.NORMAL, - popup_bg_color) - eventbox.override_background_color(Gtk.StateType.NORMAL, popup_bg_color) + + background_class = ''' + .popup-style { + border-image: none; + background-image: none; + background-color: %s }''' % bg_color + + gtkgui_helpers.add_css_to_widget(eventbox, background_class) + eventbox.get_style_context().add_class('popup-style') + + gtkgui_helpers.add_css_to_widget(close_button, background_class) + eventbox.get_style_context().add_class('popup-style') + event_description_label.set_markup('<span foreground="black">%s</span>' % GLib.markup_escape_text(text)) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -398,7 +398,8 @@ def get_fade_color(treeview, selected, focused): state = Gtk.StateFlags.ACTIVE else: state = Gtk.StateFlags.NORMAL - bg = context.get_background_color(state) + + bg = context.get_property('background-color', state) fg = context.get_color(state) p = 0.3 # background @@ -851,6 +852,13 @@ def add_css_class(widget, class_name): if class_name: style.add_class('theme_' + class_name) +def add_css_to_widget(widget, css): + provider = Gtk.CssProvider() + provider.load_from_data(bytes(css.encode())) + context = widget.get_style_context() + context.add_provider(provider, + Gtk.STYLE_PROVIDER_PRIORITY_USER) + def remove_css_class(widget, class_name): style = widget.get_style_context() style.remove_class('theme_' + class_name) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f4a6b0299a324648e42e73545c2c48479… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f4a6b0299a324648e42e73545c2c48479… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove unused methods
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 80ceee57 by Philipp Hörist at 2017-12-17T22:30:16+01:00 Remove unused methods Action Button was removed in the last ChatControl redesign - - - - - e3effdcb by Philipp Hörist at 2017-12-17T22:30:16+01:00 Refactor SubscriptionWindow - - - - - f4a6b029 by Philipp Hörist at 2017-12-17T22:30:16+01:00 Remove deprecated Gdk.Screen methods height() and weidth() is not supported any more - - - - - 7 changed files: - gajim/chat_control_base.py - − gajim/data/gui/subscription_request_popup_menu.ui - gajim/data/gui/subscription_request_window.ui - gajim/dialogs.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/message_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -1044,16 +1044,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def on_clear_formatting_menuitem_activate(self, widget): self.msg_textview.clear_tags() - def on_actions_button_clicked(self, widget): - """ - Popup action menu - """ - menu = self.prepare_context_menu(hide_buttonbar_items=True) - menu.show_all() - menu.attach_to_widget(widget, None) - gtkgui_helpers.popup_emoticons_under_button(menu, widget, - self.parent_win) - def update_tags(self): self.conv_textview.update_tags() ===================================== gajim/data/gui/subscription_request_popup_menu.ui deleted ===================================== --- a/gajim/data/gui/subscription_request_popup_menu.ui +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkAccelGroup" id="accelgroup1"/> - <object class="GtkMenu" id="subscription_request_popup_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="start_chat_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Start Chat</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_start_chat_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="information_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">_Information</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_contact_info_activate" swapped="no"/> - </object> - </child> - </object> -</interface> ===================================== gajim/data/gui/subscription_request_window.ui ===================================== --- a/gajim/data/gui/subscription_request_window.ui +++ b/gajim/data/gui/subscription_request_window.ui @@ -1,35 +1,88 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> - <object class="GtkImage" id="image1"> + <object class="GtkMenu" id="subscription_request_popup_menu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <child> + <object class="GtkMenuItem" id="start_chat_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Start Chat</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_start_chat_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="information_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label">_Information</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_contact_info_activate" swapped="no"/> + </object> + </child> </object> - <object class="GtkImage" id="image2"> + <object class="GtkBox" id="subscription_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-cancel</property> - </object> - <object class="GtkTextBuffer" id="textbuffer1"/> - <object class="GtkWindow" id="subscription_request_window"> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="title" translatable="yes">Subscription Request</property> - <property name="resizable">False</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_subscription_request_window_destroy" swapped="no"/> + <property name="margin_left">18</property> + <property name="margin_right">18</property> + <property name="margin_top">18</property> + <property name="margin_bottom">18</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> <child> - <object class="GtkBox" id="vbox10"> + <object class="GtkLabel" id="from_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow8"> + <property name="height_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">5</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="message_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="cursor_visible">False</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="hbuttonbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> <child> - <object class="GtkLabel" id="from_label"> + <object class="GtkButton" id="close_button"> + <property name="label">_Close</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -38,154 +91,66 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow8"> - <property name="height_request">100</property> + <object class="GtkButton" id="deny_button"> + <property name="label" translatable="yes">_Deny</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">5</property> - <property name="shadow_type">in</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Deny authorization from contact so he or she cannot know when you're connected</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_deny_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="popup">subscription_request_popup_menu</property> + <property name="use_popover">False</property> <child> - <object class="GtkTextView" id="message_textview"> + <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="wrap_mode">word</property> - <property name="cursor_visible">False</property> - <property name="buffer">textbuffer1</property> + <property name="can_focus">False</property> + <property name="icon_name">applications-system-symbolic</property> </object> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox3"> + <object class="GtkButton" id="authorize_button"> + <property name="label" translatable="yes">Au_thorize</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</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> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="deny_button"> - <property name="label" translatable="yes">_Deny</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="tooltip_text" translatable="yes">Deny authorization from contact so he or she cannot know when you're connected</property> - <property name="image">image2</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_deny_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="actions_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="on_actions_button_clicked" swapped="no"/> - <child> - <object class="GtkBox" id="hbox3009"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1338"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-execute</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label372"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Actions</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkArrow" id="arrow4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="arrow_type">down</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="authorize_button"> - <property name="label" translatable="yes">Au_thorize</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="tooltip_text" translatable="yes">Authorize contact so he or she can know when you're connected</property> - <property name="image">image1</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_authorize_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Authorize contact so he or she can know when you're connected</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_authorize_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2269,10 +2269,18 @@ class DoubleInputDialog: else: self.cancel_handler() -class SubscriptionRequestWindow: +class SubscriptionRequestWindow(Gtk.ApplicationWindow): def __init__(self, jid, text, account, user_nick=None): + Gtk.ApplicationWindow.__init__(self) + self.set_name('SubscriptionRequest') + self.set_application(app.app) + self.set_show_menubar(False) + self.set_resizable(False) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_title(_('Subscription Request')) + xml = gtkgui_helpers.get_gtk_builder('subscription_request_window.ui') - self.window = xml.get_object('subscription_request_window') + self.add(xml.get_object('subscription_box')) self.jid = jid self.account = account self.user_nick = user_nick @@ -2282,10 +2290,16 @@ class SubscriptionRequestWindow: % {'account': account, 'jid': self.jid} else: prompt_text = _('Subscription request from %s') % self.jid - xml.get_object('from_label').set_text(prompt_text) - xml.get_object('message_textview').get_buffer().set_text(text) + + from_label = xml.get_object('from_label') + from_label.set_text(prompt_text) + + textview = xml.get_object('message_textview') + textview.get_buffer().set_text(text) + + self.set_default(xml.get_object('authorize_button')) xml.connect_signals(self) - self.window.show_all() + self.show_all() def on_subscription_request_window_destroy(self, widget): """ @@ -2295,21 +2309,15 @@ class SubscriptionRequestWindow: # remove us from open windows del app.interface.instances[self.account]['sub_request'][self.jid] - def prepare_popup_menu(self): - xml = gtkgui_helpers.get_gtk_builder('subscription_request_popup_menu.ui') - menu = xml.get_object('subscription_request_popup_menu') - xml.connect_signals(self) - return menu - def on_close_button_clicked(self, widget): - self.window.destroy() + self.destroy() def on_authorize_button_clicked(self, widget): """ Accept the request """ app.connections[self.account].send_authorization(self.jid) - self.window.destroy() + self.destroy() contact = app.contacts.get_contact(self.account, self.jid) if not contact or _('Not in Roster') in contact.groups: AddNewContactWindow(self.account, self.jid, self.user_nick) @@ -2342,16 +2350,7 @@ class SubscriptionRequestWindow: contact = app.contacts.get_contact(self.account, self.jid) if contact and _('Not in Roster') in contact.get_shown_groups(): app.interface.roster.remove_contact(self.jid, self.account) - self.window.destroy() - - def on_actions_button_clicked(self, widget): - """ - Popup action menu - """ - menu = self.prepare_popup_menu() - menu.show_all() - gtkgui_helpers.popup_emoticons_under_button(menu, widget, - self.window.get_window()) + self.destroy() class JoinGroupchatWindow(Gtk.ApplicationWindow): def __init__(self, account, room_jid, password=None, automatic=None): @@ -3178,11 +3177,12 @@ class PopupNotificationWindow: window_width, self.window_height = self.window.get_size() app.interface.roster.popups_notification_height += self.window_height pos_x = app.config.get('notification_position_x') + screen_w, screen_h = gtkgui_helpers.get_display_geometry() if pos_x < 0: - pos_x = Gdk.Screen.width() - window_width + pos_x + 1 + pos_x = screen_w - window_width + pos_x + 1 pos_y = app.config.get('notification_position_y') if pos_y < 0: - pos_y = Gdk.Screen.height() - \ + pos_y = screen_h - \ app.interface.roster.popups_notification_height + pos_y + 1 self.window.move(pos_x, pos_y) @@ -3214,8 +3214,9 @@ class PopupNotificationWindow: current_index += 1 window_width, window_height = window_instance.window.get_size() app.interface.roster.popups_notification_height += window_height - window_instance.window.move(Gdk.Screen.width() - window_width, - Gdk.Screen.height() - \ + screen_w, screen_h = gtkgui_helpers.get_display_geometry() + window_instance.window.move(screen_w - window_width, + screen_h - \ app.interface.roster.popups_notification_height) def on_popup_notification_window_button_press_event(self, widget, event): ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -99,8 +99,11 @@ if os.name == 'nt': from gajim.common import helpers -screen_w = Gdk.Screen.width() -screen_h = Gdk.Screen.height() +def get_display_geometry(): + display = Gdk.Display.get_default() + monitor = display.get_monitor(0) + geometry = monitor.get_geometry() + return geometry.width, geometry.height def add_image_to_button(button, icon_name): img = Gtk.Image() @@ -151,43 +154,6 @@ def get_completion_liststore(entry): entry.set_completion(completion) return liststore - -def popup_emoticons_under_button(menu, button, parent_win): - """ - Popup the emoticons menu under button, which is in parent_win - """ - window_x1, window_y1 = parent_win.get_origin()[1:] - - def position_menu_under_button(menu, _x=None, _y=None, data=None): - # inline function, which will not keep refs, when used as CB - alloc = button.get_allocation() - button_x, button_y = alloc.x, alloc.y - translated_coordinates = button.translate_coordinates( - app.interface.roster.window, 0, 0) - if translated_coordinates: - button_x, button_y = translated_coordinates - - # now convert them to X11-relative - window_x, window_y = window_x1, window_y1 - x = window_x + button_x - y = window_y + button_y - - menu_height = menu.get_preferred_size()[0].height - - ## should we pop down or up? - if (y + alloc.height + menu_height < Gdk.Screen.height()): - # now move the menu below the button - y += alloc.height - else: - # now move the menu above the button - y -= menu_height - - # push_in is True so all the menuitems are always inside screen - push_in = True - return (x, y, push_in) - - menu.popup(None, None, position_menu_under_button, None, 1, 0) - def get_theme_font_for_option(theme, option): """ Return string description of the font, stored in theme preferences @@ -208,6 +174,7 @@ def move_window(window, x, y): """ Move the window, but also check if out of screen """ + screen_w, screen_h = get_display_geometry() if x < 0: x = 0 if y < 0: @@ -223,6 +190,7 @@ def resize_window(window, w, h): """ Resize window, but also checks if huge window or negative values """ + screen_w, screen_h = get_display_geometry() if not w or not h: return if w > screen_w: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -499,7 +499,7 @@ class Interface: account = obj.conn.name if helpers.allow_popup_window(account) or not self.systray_enabled: if obj.jid in self.instances[account]['sub_request']: - self.instances[account]['sub_request'][obj.jid].window.destroy() + self.instances[account]['sub_request'][obj.jid].destroy() self.instances[account]['sub_request'][obj.jid] = \ dialogs.SubscriptionRequestWindow(obj.jid, obj.status, account, obj.user_nick) @@ -829,7 +829,7 @@ class Interface: self.roster.draw_contact(obj.jid, account) if obj.jid in self.instances[account]['sub_request'] and obj.sub in ( 'from', 'both'): - self.instances[account]['sub_request'][obj.jid].window.destroy() + self.instances[account]['sub_request'][obj.jid].destroy() def handle_event_bookmarks(self, obj): # ('BOOKMARKS', account, [{name,jid,autojoin,password,nick}, {}]) ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -451,11 +451,6 @@ class MessageWindow(object): elif keyval == Gdk.KEY_m: # ALT + M show emoticons menu control.emoticons_button.get_popover().show() return True - elif keyval == Gdk.KEY_d: # ALT + D show actions menu - if Gtk.Settings.get_default().get_property( - 'gtk-key-theme-name') != 'Emacs': - control.on_actions_button_clicked(control.actions_button) - return True elif control.type_id == message_control.TYPE_GC and \ keyval == Gdk.KEY_t: # ALT + t control._on_change_subject_menuitem_activate(None) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8f2630b10f18edf0741ad6bf3267bcc37… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8f2630b10f18edf0741ad6bf3267bcc37… 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