Commits December 2017

commits@gajim.org

1 participants
64 discussions

[Git][gajim/gajim][master] 6 commits: Refactor FileTransferWindow tooltip
by Philipp Hörist 24 Dec '17

24 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9db9e69c by Philipp Hörist at 2017-12-23T22:04:49+01:00 Refactor FileTransferWindow tooltip - - - - - 912192ed by Philipp Hörist at 2017-12-23T22:04:54+01:00 NotificationAreaTooltip: Dont inherit from BaseTooltip - - - - - 2a41c719 by Philipp Hörist at 2017-12-23T22:04:54+01:00 Remove BaseTooltip We dont needed anymore - - - - - bc5d9c76 by Philipp Hörist at 2017-12-23T22:04:54+01:00 pep8/pylint: Fix imports - - - - - 8116ef13 by Philipp Hörist at 2017-12-23T22:04:54+01:00 Refactor GCTooltip - Dont create a Tooltip window - Just return the tooltip grid, so we can use it with set_custom() - - - - - fd7f3020 by Philipp Hörist at 2017-12-24T08:40:04+01:00 Merge branch 'master' into 'master' Refactor some Tooltips See merge request gajim/gajim!180 - - - - - 7 changed files: - gajim/data/gui/filetransfers.ui - gajim/filetransfers_window.py - gajim/groupchat_control.py - gajim/htmltextview.py - gajim/message_textview.py - gajim/statusicon.py - gajim/tooltips.py Changes: ===================================== gajim/data/gui/filetransfers.ui ===================================== --- a/gajim/data/gui/filetransfers.ui +++ b/gajim/data/gui/filetransfers.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -101,8 +101,6 @@ <signal name="button-press-event" handler="on_transfers_list_button_press_event" swapped="no"/> <signal name="button-release-event" handler="on_transfers_list_button_release_event" swapped="no"/> <signal name="key-press-event" handler="on_transfers_list_key_press_event" swapped="no"/> - <signal name="leave-notify-event" handler="on_transfers_list_leave_notify_event" swapped="no"/> - <signal name="motion-notify-event" handler="on_transfers_list_motion_notify_event" swapped="no"/> <signal name="row-activated" handler="on_transfers_list_row_activated" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> @@ -247,6 +245,9 @@ </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> <child internal-child="accessible"> <object class="AtkObject" id="file_transfers_window-atkobject"> <property name="AtkObject::accessible-name" translatable="yes">File Transfers</property> ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -140,7 +140,12 @@ class FileTransfersWindow: self.tree.get_selection().set_mode(Gtk.SelectionMode.SINGLE) self.tree.get_selection().connect('changed', self.selection_changed) + + # Tooltip + self.tree.connect('query-tooltip', self._query_tooltip) + self.tree.set_has_tooltip(True) self.tooltip = tooltips.FileTransfersTooltip() + self.file_transfers_menu = self.xml.get_object('file_transfers_menu') self.open_folder_menuitem = self.xml.get_object('open_folder_menuitem') self.cancel_menuitem = self.xml.get_object('cancel_menuitem') @@ -149,6 +154,33 @@ class FileTransfersWindow: self.remove_menuitem = self.xml.get_object('remove_menuitem') self.xml.connect_signals(self) + def _query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + try: + x_pos, y_pos = widget.convert_widget_to_bin_window_coords( + x_pos, y_pos) + row = widget.get_path_at_pos(x_pos, y_pos)[0] + except TypeError: + self.tooltip.clear_tooltip() + return False + if not row: + self.tooltip.clear_tooltip() + return False + + iter_ = None + try: + model = widget.get_model() + iter_ = model.get_iter(row) + except Exception: + self.tooltip.clear_tooltip() + return False + + sid = self.model[iter_][Column.SID] + file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) + + value, widget = self.tooltip.get_tooltip(file_props, sid) + tooltip.set_custom(widget) + return value + def find_transfer_by_jid(self, account, jid): """ Find all transfers with peer 'jid' that belong to 'account' @@ -301,9 +333,7 @@ class FileTransfersWindow: def on_ok(widget): file_dir = None files_path_list = dialog.get_filenames() - text_buffer = desc_entry.get_buffer() - desc = text_buffer.get_text(text_buffer.get_start_iter(), - text_buffer.get_end_iter(), True) + desc = desc_entry.get_text() for file_path in files_path_list: if self.send_file(account, contact, file_path, desc) \ and file_dir is None: @@ -721,7 +751,6 @@ class FileTransfersWindow: """ Add new transfer to FT window and show the FT window """ - self.on_transfers_list_leave_notify_event(None) if file_props is None: return file_props.elapsed_time = 0 @@ -752,45 +781,6 @@ class FileTransfersWindow: self.set_cleanup_sensitivity() self.window.show_all() - def on_transfers_list_motion_notify_event(self, widget, event): - w = self.tree.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = widget.get_path_at_pos(int(event.x), int(event.y)) - self.height_diff = pointer[2] - int(event.y) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id != props[0]: - self.tooltip.hide_tooltip() - if props: - row = props[0] - iter_ = None - try: - iter_ = self.model.get_iter(row) - except Exception: - self.tooltip.hide_tooltip() - return - sid = self.model[iter_][Column.SID] - file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) - if file_props is not None: - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: - self.tooltip.id = row - self.tooltip.timeout = GLib.timeout_add(500, - self.show_tooltip, widget) - - def on_transfers_list_leave_notify_event(self, widget=None, event=None): - if event is not None: - self.height_diff = int(event.y) - elif self.height_diff is 0: - return - w = self.tree.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = self.tree.get_path_at_pos(pointer[1], - pointer[2] - self.height_diff) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id == props[0]: - self.tooltip.hide_tooltip() - def on_transfers_list_row_activated(self, widget, path, col): # try to open the containing folder self.on_open_folder_menuitem_activate(widget) @@ -954,37 +944,11 @@ class FileTransfersWindow: con.disconnect_transfer(file_props) self.set_status(file_props, 'stop') - def show_tooltip(self, widget): - self.tooltip.timeout = 0 - if self.height_diff == 0: - self.tooltip.hide_tooltip() - return - w = self.tree.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = self.tree.get_path_at_pos(pointer[1], - pointer[2] - self.height_diff) - # check if the current pointer is at the same path - # as it was before setting the timeout - if props and self.tooltip.id == props[0]: - iter_ = self.model.get_iter(props[0]) - sid = self.model[iter_][Column.SID] - file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) - # bounding rectangle of coordinates for the cell within the treeview - rect = self.tree.get_cell_area(props[0], props[1]) - # position of the treeview on the screen - position = widget.get_window().get_origin()[1:] - self.tooltip.show_tooltip(file_props, rect.height, - position[1] + rect.y + self.height_diff) - else: - self.tooltip.hide_tooltip() - def on_notify_ft_complete_checkbox_toggled(self, widget): app.config.set('notify_on_file_complete', widget.get_active()) def on_file_transfers_dialog_delete_event(self, widget, event): - self.on_transfers_list_leave_notify_event(widget, None) self.window.hide() return True # do NOT destory window @@ -1006,7 +970,6 @@ class FileTransfersWindow: """ When a key is pressed in the treeviews """ - self.tooltip.hide_tooltip() iter_ = None try: iter_ = self.tree.get_selection().get_selected()[1] @@ -1024,7 +987,6 @@ class FileTransfersWindow: def on_transfers_list_button_release_event(self, widget, event): # hide tooltip, no matter the button is pressed - self.tooltip.hide_tooltip() path = None try: path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0] @@ -1037,7 +999,6 @@ class FileTransfersWindow: def on_transfers_list_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed - self.tooltip.hide_tooltip() path, iter_ = None, None try: path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0] ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -303,7 +303,6 @@ class GroupchatControl(ChatControlBase): formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(False) - self.current_tooltip = None if parent_win is not None: # On AutoJoin with minimize Groupchats are created without parent # Tooltip Window and Actions have to be created with parent @@ -474,6 +473,9 @@ class GroupchatControl(ChatControlBase): self.banner_actionbar.pack_end(self.hide_roster_button) self.banner_actionbar.pack_start(self.subject_button) + # GC Roster tooltip + self.gc_tooltip = tooltips.GCTooltip() + self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id) app.ged.register_event_handler('gc-presence-received', ged.GUI1, @@ -714,8 +716,6 @@ class GroupchatControl(ChatControlBase): if widget.get_tooltip_window(): return widget.set_has_tooltip(True) - widget.set_tooltip_window(tooltips.GCTooltip( - self.account, self.parent_win.window)) id_ = widget.connect('query-tooltip', self.query_tooltip) self.handlers[id_] = widget @@ -723,41 +723,35 @@ class GroupchatControl(ChatControlBase): try: row = self.list_treeview.get_path_at_pos(x_pos, y_pos)[0] except TypeError: + self.gc_tooltip.clear_tooltip() return False if not row: + self.gc_tooltip.clear_tooltip() return False iter_ = None try: iter_ = self.model.get_iter(row) except Exception: + self.gc_tooltip.clear_tooltip() return False typ = self.model[iter_][Column.TYPE] nick = self.model[iter_][Column.NICK] if typ != 'contact': + self.gc_tooltip.clear_tooltip() return False - if self.current_tooltip != row: - # If the row changes we hide the current tooltip - self.current_tooltip = row - return False - - tooltip = widget.get_tooltip_window() - - if tooltip.row == row: - # We already populated the window with the row data - return True - tooltip.row = row - contact = app.contacts.get_gc_contact( self.account, self.room_jid, nick) if not contact: + self.gc_tooltip.clear_tooltip() return False - tooltip.populate(contact) - return True + value, widget = self.gc_tooltip.get_tooltip(contact) + tooltip.set_custom(widget) + return value def fill_column(self, col): for rend in self.renderers_list: ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -1102,8 +1102,6 @@ if __name__ == '__main__': htmlview = ConversationTextview(None) - tooltip = tooltips.BaseTooltip() - def on_textview_motion_notify_event(widget, event): """ Change the cursor to a hand when we are over a mail or an url @@ -1129,17 +1127,6 @@ if __name__ == '__main__': except Exception: pass - #if line_tooltip.timeout != 0: - # Check if we should hide the line tooltip - # if not over_line: - # line_tooltip.hide_tooltip() - #if over_line and not line_tooltip.win: - # line_tooltip.timeout = GLib.timeout_add(500, - # show_line_tooltip) - # htmlview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - # gtkgui_helpers.get_cursor('LEFT_PTR')) - # change_cursor = tag - htmlview.tv.connect('motion_notify_event', on_textview_motion_notify_event) def handler(texttag, widget, event, iter_, kind): ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -102,6 +102,15 @@ class MessageTextView(Gtk.TextView): text = buf.get_text(start, end, True) return text != self.PLACEHOLDER and text != '' + def get_text(self): + # gets the text if its not PLACEHOLDER + buf = self.get_buffer() + start, end = buf.get_bounds() + text = self.get_buffer().get_text(start, end, True) + if text == self.PLACEHOLDER: + return '' + return text + def is_placeholder(self): buf = self.get_buffer() start, end = buf.get_bounds() ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -104,8 +104,7 @@ class StatusIcon: self.make_menu(event_button, event_time) def on_status_icon_query_tooltip(self, widget, x, y, keyboard_mode, tooltip): - self.tooltip.populate() - tooltip.set_custom(self.tooltip.hbox) + tooltip.set_custom(self.tooltip.get_tooltip()) return True def hide_icon(self): ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -28,14 +28,14 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import os +import time +from datetime import datetime + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib from gi.repository import Pango -import os -import time -from datetime import datetime -from datetime import timedelta from gajim import gtkgui_helpers from gajim.common.const import AvatarSize @@ -43,147 +43,6 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import Q_ -class BaseTooltip: - """ - Base Tooltip class - - Usage: - tooltip = BaseTooltip() - .... - tooltip.show_tooltip(data, widget_height, widget_y_position) - .... - if tooltip.timeout != 0: - tooltip.hide_tooltip() - - * data - the text to be displayed (extenders override this argument and - display more complex contents) - * widget_height - the height of the widget on which we want to show tooltip - * widget_y_position - the vertical position of the widget on the screen - - Tooltip is displayed aligned centered to the mouse poiner and 4px below the widget. - In case tooltip goes below the visible area it is shown above the widget. - """ - - def __init__(self): - self.timeout = 0 - self.preferred_position = [0, 0] - self.win = None - self.id = None - self.cur_data = None - self.shown = False - self.position_computed = False - - def populate(self, data): - """ - This method must be overriden by all extenders. This is the most simple - implementation: show data as value of a label - """ - self.create_window() - self.win.add(Gtk.Label(label=data)) - - def create_window(self): - """ - Create a popup window each time tooltip is requested - """ - self.win = Gtk.Window.new(Gtk.WindowType.POPUP) - self.win.set_title('tooltip') - self.win.set_border_width(3) - self.win.set_resizable(False) - self.win.set_name('gtk-tooltips') - self.win.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) - - self.win.set_events(Gdk.EventMask.POINTER_MOTION_MASK) - self.win.connect('size-allocate', self.on_size_allocate) - self.win.connect('motion-notify-event', self.motion_notify_event) - self.screen = self.win.get_screen() - - def _get_icon_name_for_tooltip(self, contact): - """ - Helper function used for tooltip contacts/acounts - - Tooltip on account has fake contact with sub == '', in this case we show - real status of the account - """ - if contact.ask == 'subscribe': - return 'requested' - elif contact.sub in ('both', 'to', ''): - return contact.show - return 'not in roster' - - def motion_notify_event(self, widget, event): - GLib.idle_add(self.hide_tooltip) - - def on_size_allocate(self, widget, rect): - if not self.position_computed: - half_width = rect.width / 2 + 1 - if self.preferred_position[1] + rect.height > \ - self.screen.get_height(): - # flip tooltip up - self.preferred_position[1] -= rect.height + self.widget_height \ - + 8 - if self.preferred_position[1] < 0: - self.preferred_position[1] = self.screen.get_height() - \ - rect.height - 2 - - if self.preferred_position[0] + rect.width + 7 < \ - self.screen.get_width(): - self.preferred_position[0] = self.preferred_position[0]\ - + 7 - else: - self.preferred_position[0] = self.preferred_position[0]\ - - rect.width - 7 - self.win.move(self.preferred_position[0], - self.preferred_position[1]) - return - if self.preferred_position[0] < half_width: - self.preferred_position[0] = 0 - elif self.preferred_position[0] + rect.width > \ - self.screen.get_width() + half_width: - self.preferred_position[0] = self.screen.get_width() - \ - rect.width - else: - self.preferred_position[0] -= half_width - self.position_computed = True - self.win.move(self.preferred_position[0], self.preferred_position[1]) - - def show_tooltip(self, data, widget_height, widget_y_position): - """ - Show tooltip on widget - - Data contains needed data for tooltip contents. - widget_height is the height of the widget on which we show the tooltip. - widget_y_position is vertical position of the widget on the screen. - """ - if self.shown: - return - self.position_computed = False - self.cur_data = data - # set tooltip contents - self.populate(data) - - # get the X position of mouse pointer on the screen - pointer_x = self.screen.get_display().get_device_manager().\ - get_client_pointer().get_position()[1] - - # get the prefered X position of the tooltip on the screen in case this position is > - # than the height of the screen, tooltip will be shown above the widget - preferred_y = widget_y_position + widget_height + 4 - - self.preferred_position = [pointer_x, preferred_y] - self.widget_height = widget_height - self.win.show_all() - self.shown = True - - def hide_tooltip(self): - if self.timeout > 0: - GLib.source_remove(self.timeout) - self.timeout = 0 - if self.win: - self.win.destroy() - self.win = None - self.id = None - self.cur_data = None - self.shown = False class StatusTable: """ @@ -263,13 +122,13 @@ class StatusTable: self.table.attach(lock_image, 4, self.current_row, 1, 1) self.current_row += 1 -class NotificationAreaTooltip(BaseTooltip, StatusTable): + +class NotificationAreaTooltip(StatusTable): """ Tooltip that is shown in the notification area """ def __init__(self): - BaseTooltip.__init__(self) StatusTable.__init__(self) def fill_table_with_accounts(self, accounts): @@ -297,8 +156,7 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable): for line in acct['event_lines']: self.add_text_row(' ' + line, 1) - def populate(self, data=''): - self.create_window() + def get_tooltip(self): self.create_table() accounts = helpers.get_notification_icon_tooltip_dict() @@ -308,40 +166,43 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable): self.hbox.add(self.table) self.hbox.show_all() + return self.hbox -class GCTooltip(Gtk.Window): + +class GCTooltip(): # pylint: disable=E1101 - def __init__(self, account, parent): - Gtk.Window.__init__(self, type=Gtk.WindowType.POPUP, transient_for=parent) - self.account = account - self.row = None - self.set_title('tooltip') - self.set_border_width(3) - self.set_resizable(False) - self.set_name('gtk-tooltips') - self.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) + def __init__(self): + self.contact = None self.xml = gtkgui_helpers.get_gtk_builder('tooltip_gc_contact.ui') for name in ('nick', 'status', 'jid', 'user_show', 'fillelement', - 'resource', 'affiliation', 'avatar', 'resource_label', - 'jid_label', 'tooltip_grid'): + 'resource', 'affiliation', 'avatar', 'resource_label', + 'jid_label', 'tooltip_grid'): setattr(self, name, self.xml.get_object(name)) - self.add(self.tooltip_grid) - self.tooltip_grid.show() - def clear_tooltip(self): + self.contact = None + + def get_tooltip(self, contact): + if self.contact == contact: + return True, self.tooltip_grid + + self._populate_grid(contact) + self.contact = contact + return False, self.tooltip_grid + + def _hide_grid_childs(self): """ Hide all Elements of the Tooltip Grid """ for child in self.tooltip_grid.get_children(): child.hide() - def populate(self, contact): + def _populate_grid(self, contact): """ Populate the Tooltip Grid with data of from the contact """ - self.clear_tooltip() + self._hide_grid_childs() self.nick.set_text(contact.get_shown_name()) self.nick.show() @@ -750,19 +611,28 @@ class RosterTooltip(Gtk.Window, StatusTable): return 'not in roster' -class FileTransfersTooltip(BaseTooltip): - """ - Tooltip that is shown in the notification area - """ - +class FileTransfersTooltip(): def __init__(self): - BaseTooltip.__init__(self) + self.sid = None + self.widget = None + + def clear_tooltip(self): + self.sid = None + self.widget = None + + def get_tooltip(self, file_props, sid): + if self.sid == sid: + return True, self.widget - def populate(self, file_props): + self.widget = self._create_tooltip(file_props, sid) + self.sid = sid + return False, self.widget + + @staticmethod + def _create_tooltip(file_props, sid): ft_table = Gtk.Table(2, 1) ft_table.set_property('column-spacing', 2) current_row = 1 - self.create_window() properties = [] name = file_props.name if file_props.type_ == 'r': @@ -794,18 +664,18 @@ class FileTransfersTooltip(BaseTooltip): status = '' if file_props.started: status = _('Not started') - if file_props.stopped == True: + if file_props.stopped: status = _('Stopped') elif file_props.completed: status = _('Completed') - elif file_props.connected == False: + elif not file_props.connected: if file_props.completed: status = _('Completed') else: - if file_props.paused == True: + if file_props.paused: status = Q_('?transfer status:Paused') - elif file_props.stalled == True: - #stalled is not paused. it is like 'frozen' it stopped alone + elif file_props.stalled: + # stalled is not paused. it is like 'frozen' it stopped alone status = _('Stalled') else: status = _('Transferring') @@ -832,7 +702,8 @@ class FileTransfersTooltip(BaseTooltip): ft_table.attach(label, 2, 3, current_row, current_row + 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) - self.win.add(ft_table) + ft_table.show_all() + return ft_table def colorize_status(status): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bf3aac28cbfac3f0829f2fc84cd60e720… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bf3aac28cbfac3f0829f2fc84cd60e720… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2017