diff --git a/data/gui/add_new_contact_window.ui b/data/gui/add_new_contact_window.ui index e9f713f1e..cee67a0bb 100644 --- a/data/gui/add_new_contact_window.ui +++ b/data/gui/add_new_contact_window.ui @@ -1,22 +1,23 @@ - + - - + + False 6 Add New Contact False dialog - - + + True - vertical + False 6 True + False False @@ -27,10 +28,12 @@ True + False 6 True + False 0 A_ccount: True @@ -44,8 +47,9 @@ True + False liststore3 - + @@ -64,16 +68,20 @@ + True + True 1 True + False 6 True + False 0 _Protocol: True @@ -88,7 +96,8 @@ True - + False + False @@ -99,9 +108,10 @@ True + False True liststore2 - + @@ -110,17 +120,22 @@ + True + True 2 + True + True 2 True + False True 6 3 @@ -130,6 +145,7 @@ True + False 0 _User ID: True @@ -137,7 +153,7 @@ GTK_FILL - + @@ -145,16 +161,18 @@ True True True + Type User ID 1 2 - + True + False 0 _Nickname: True @@ -164,7 +182,7 @@ 1 2 GTK_FILL - + @@ -172,18 +190,20 @@ True True True + Type Nickname 1 2 1 2 - + True + False 0 _Group: True @@ -192,37 +212,48 @@ 2 3 GTK_FILL - + - + True - groups_liststore - 0 + False + True + 0 + 1 + + + True + Choose a group of type a new group + + 1 2 2 3 - GTK_FILL False + True 3 A_llow this contact to view my status + False True True False True + False True + 0 True True @@ -238,9 +269,8 @@ True True 6 - automatic - automatic etched-in + 5 True @@ -251,30 +281,39 @@ + True + True 5 _Save subscription message + False True True False + False True + 0 True + True + True 6 True + False True 6 True + False 0 You have to register with this transport to be able to add a contact from this @@ -283,18 +322,22 @@ proceed. True + True + True 0 _Register + False True True True False + False True - + False @@ -304,12 +347,15 @@ proceed. + True + True 7 True + False True You must be connected to the transport to be able to add a contact from this protocol. @@ -323,18 +369,21 @@ to add a contact from this protocol. True + False 5 12 end gtk-cancel + False True True True False + False True - + False @@ -345,13 +394,15 @@ to add a contact from this protocol. gtk-add + False True True True True False + False True - + False @@ -369,9 +420,6 @@ to add a contact from this protocol. - - I would like to add you to my contact list. - @@ -390,4 +438,7 @@ to add a contact from this protocol. + + I would like to add you to my contact list. + diff --git a/data/gui/dubbleinput_dialog.ui b/data/gui/dubbleinput_dialog.ui index 159939468..8770d27df 100644 --- a/data/gui/dubbleinput_dialog.ui +++ b/data/gui/dubbleinput_dialog.ui @@ -1,50 +1,105 @@ - + - - + + False 6 dialog - False - + - + True + False vertical 6 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 6 - vertical 6 True + False 12 True + False gtk-dialog-question 6 False + True 0 True + False True + True + True 1 False + True 0 @@ -63,6 +118,7 @@ True + False False @@ -82,50 +138,10 @@ - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/data/gui/esession_info_window.ui b/data/gui/esession_info_window.ui index 9e6dee5b2..bd6489024 100644 --- a/data/gui/esession_info_window.ui +++ b/data/gui/esession_info_window.ui @@ -1,93 +1,46 @@ - + - - + + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 center-on-parent dialog - False - + True + False vertical 2 - - - True - - - 32 - 32 - True - - - False - 0 - - - - - True - 0 - - - 1 - - - - - 1 - - - - - True - 4 - - - True - (<b>ESession</b> info) - True - True - - - False - False - 10 - 0 - - - - - False - False - 2 - - - + True + False end + False True True False - + False + True + False 0 0 True + False 2 True + False gtk-apply @@ -99,6 +52,7 @@ True + False _Verify True @@ -122,11 +76,13 @@ gtk-close + False True True False + False True - + False @@ -137,10 +93,74 @@ False + True end 0 + + + True + False + + + 32 + 32 + True + False + + + False + True + 0 + + + + + True + False + 0 + + + True + True + 1 + + + + + False + True + 1 + + + + + True + False + 4 + + + True + False + (<b>ESession</b> info) + True + True + + + False + False + 10 + 0 + + + + + False + False + 2 + + diff --git a/data/gui/input_dialog.ui b/data/gui/input_dialog.ui index 1e475eb2b..64c7269c1 100644 --- a/data/gui/input_dialog.ui +++ b/data/gui/input_dialog.ui @@ -1,51 +1,106 @@ - + - - + + False 6 dialog - False - - + + - + True + False vertical 6 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 6 - vertical 6 True + False 12 True + False gtk-dialog-question 6 False + True 0 True + False True + True + True 1 False + True 0 @@ -62,50 +117,10 @@ - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/data/gui/input_text_dialog.ui b/data/gui/input_text_dialog.ui index 68fc57979..c8584f696 100644 --- a/data/gui/input_text_dialog.ui +++ b/data/gui/input_text_dialog.ui @@ -1,89 +1,32 @@ - + - - + + False 6 400 dialog - False - + - + True + False vertical 6 - - - True - 6 - vertical - 6 - - - True - 12 - - - True - gtk-dialog-question - 6 - - - False - 0 - - - - - True - True - - - 1 - - - - - False - 0 - - - - - True - True - automatic - never - in - - - True - True - word - - - - - 1 - - - - - 1 - - - + True + False end gtk-cancel + False True True True False + False True @@ -95,11 +38,13 @@ gtk-ok + False True True True True False + False True @@ -111,10 +56,81 @@ False + True end 0 + + + True + False + 6 + 6 + + + True + False + 12 + + + True + False + gtk-dialog-question + 6 + + + False + True + 0 + + + + + True + False + True + + + True + True + 1 + + + + + False + True + 0 + + + + + True + True + never + in + + + True + True + word + + + + + True + True + 1 + + + + + False + True + 1 + + diff --git a/data/gui/roster_window.ui b/data/gui/roster_window.ui index a0fd915e2..81259d8fc 100644 --- a/data/gui/roster_window.ui +++ b/data/gui/roster_window.ui @@ -1,10 +1,95 @@ - + - - + + + + True + False + gtk-jump-to + 1 + + + True + False + gtk-help + 1 + + + True + False + gtk-dialog-question + 1 + + + True + False + gtk-properties + 1 + + + True + False + gtk-disconnect + 1 + + + True + False + gtk-info + 1 + + + True + False + gtk-new + 1 + + + True + False + gtk-connect + 1 + + + True + False + gtk-add + 1 + + + True + False + gtk-find + 1 + + + True + False + gtk-network + 1 + + + True + False + gtk-properties + 1 + + + True + False + gtk-save + 1 + + + True + False + gtk-justify-fill + 1 + 85 200 + False Gajim roster 250 @@ -12,30 +97,36 @@ - - - - - + + + + + True - vertical + False True + False + False True + False _Actions True - + + False _Start Chat... + False True + False True image1 False @@ -45,6 +136,8 @@ Send Single _Message... + False + False True image2 False @@ -54,7 +147,9 @@ Join _Group Chat... + False True + False True image3 False @@ -64,12 +159,15 @@ True + False Add _Contact... + False True + False True image4 False @@ -79,7 +177,9 @@ _Discover Services + False True + False True image5 False @@ -88,7 +188,9 @@ + False True + False _Advanced True @@ -96,17 +198,20 @@ True + False gtk-quit + False True + False True True accelgroup1 - + @@ -115,28 +220,35 @@ + False True + False _Edit True - + + False _Accounts + False True + False True image6 False accelgroup1 - + Profile, A_vatar + False True + False True image7 False @@ -146,27 +258,32 @@ True + False gtk-preferences + False True + False True True accelgroup1 - + P_lugins + False True + False True image13 False - + @@ -175,76 +292,92 @@ + False True + False _View True - + + False + False True + False Show _Offline Contacts True - + + False True + False Show Only _Active Contacts True - + + False True + False Show T_ransports True - + + False True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Show _Roster True True - + True + False File _Transfers + False True + False True image8 False accelgroup1 - + _History + False True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True image9 False accelgroup1 - + @@ -253,70 +386,84 @@ + False True + False _Help True + False _Contents + False True + False Help online True image10 False accelgroup1 - + _FAQ + False True + False Frequently Asked Questions (online) True image11 False accelgroup1 - + Keyboard Shortcuts + False True + False True image14 False - + True + False Fea_tures + False True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True image12 False accelgroup1 - + gtk-about + False True + False True True accelgroup1 - + @@ -335,24 +482,24 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True True False gtk-clear - True - - + + False + True 0 @@ -361,36 +508,43 @@ True True never - automatic True True + True False True - - - - - - - - - + + + + + + + + + + + + + True + True 1 True - + False + False + True 2 @@ -405,81 +559,12 @@ + True + True 1 - - - True - gtk-jump-to - 1 - - - True - gtk-new - 1 - - - True - gtk-connect - 1 - - - True - gtk-add - 1 - - - True - gtk-find - 1 - - - True - gtk-network - 1 - - - True - gtk-properties - 1 - - - True - gtk-save - 1 - - - True - gtk-justify-fill - 1 - - - True - gtk-help - 1 - - - True - gtk-dialog-question - 1 - - - True - gtk-properties - 1 - - - True - gtk-disconnect - 1 - - - True - gtk-info - 1 - diff --git a/src/chat_control.py b/src/chat_control.py index 39335ea74..97e6eba90 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -255,7 +255,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): Derives types SHOULD implement this, rather than connection to the even itself """ - event = Gdk.Event(Gdk.KEY_PRESS) + event = Gdk.Event(Gdk.EventType.KEY_PRESS) event.keyval = event_keyval event.state = event_keymod event.time = 0 @@ -709,7 +709,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def set_emoticons_menu_position(w, msg_tv=self.msg_textview): window = msg_tv.get_window(Gtk.TextWindowType.WIDGET) # get the window position - origin = window.get_origin() + origin = window.get_origin()[1:] size = window.get_size() buf = msg_tv.get_buffer() # get the cursor position @@ -734,7 +734,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return (x, y, True) # push_in True gajim.interface.emoticon_menuitem_clicked = self.append_emoticon gajim.interface.emoticons_menu.popup(None, None, - set_emoticons_menu_position, 1, 0) + set_emoticons_menu_position, None, 1, 0) def _on_message_textview_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_space: @@ -788,7 +788,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): xhtml = self.msg_textview.get_xhtml() # construct event instance from binding - event = Gdk.Event(Gdk.KEY_PRESS) # it's always a key-press here + event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here event.keyval = event_keyval event.state = event_keymod event.time = 0 # assign current time @@ -1981,7 +1981,7 @@ class ChatControl(ChatControlBase): menu.connect('selection-done', lambda w: w.destroy()) # show the menu menu.show_all() - menu.popup(None, None, None, event.button, event.time) + menu.popup(None, None, None, None, event.button, event.time) return True def on_location_eventbox_button_release_event(self, widget, event): @@ -3049,7 +3049,7 @@ class ChatControl(ChatControlBase): window.window.shape_combine_mask(mask, 0, 0) # make the bigger avatar window show up centered - x0, y0 = small_avatar.window.get_origin() + x0, y0 = small_avatar.window.get_origin()[1:] x0 += small_avatar.allocation.x y0 += small_avatar.allocation.y center_x= x0 + (small_avatar.allocation.width / 2) diff --git a/src/conversation_textview.py b/src/conversation_textview.py index 778c4686e..6506a40b5 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -600,7 +600,7 @@ class ConversationTextview(GObject.GObject): break if xep0184_warning and not self.xep0184_warning_tooltip.win: # check if the current pointer is still over the line - position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin() + position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:] self.xep0184_warning_tooltip.show_tooltip(_('This icon indicates that ' 'this message has not yet\nbeen received by the remote end. ' "If this icon stays\nfor a long time, it's likely the message got " @@ -619,7 +619,7 @@ class ConversationTextview(GObject.GObject): break if over_line and not self.line_tooltip.win: # check if the current pointer is still over the line - position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin() + position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:] self.line_tooltip.show_tooltip(_('Text below this line is what has ' 'been said since the\nlast time you paid attention to this group ' 'chat'), 8, position[1] + pointer[2]) @@ -945,7 +945,7 @@ class ConversationTextview(GObject.GObject): childs[0].hide() # copy link location childs[1].hide() # open link in browser - menu.popup(None, None, None, event.button, event.time) + menu.popup(None, None, None, None, event.button, event.time) def hyperlink_handler(self, texttag, widget, event, iter_, kind): if event.type == Gdk.EventType.BUTTON_PRESS: diff --git a/src/dialogs.py b/src/dialogs.py index 242f47363..d88f3428f 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -30,6 +30,7 @@ ## from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject import os @@ -915,11 +916,11 @@ class AddNewContactWindow: # Combobox with transport/jabber icons liststore = Gtk.ListStore(str, GdkPixbuf.Pixbuf, str) cell = Gtk.CellRendererPixbuf() - self.protocol_combobox.pack_start(cell, False, True, 0) + self.protocol_combobox.pack_start(cell, False) self.protocol_combobox.add_attribute(cell, 'pixbuf', 1) cell = Gtk.CellRendererText() cell.set_property('xpad', 5) - self.protocol_combobox.pack_start(cell, True, True, 0) + self.protocol_combobox.pack_start(cell, True) self.protocol_combobox.add_attribute(cell, 'text', 0) self.protocol_combobox.set_model(liststore) uf_type = {'jabber': 'Jabber', 'aim': 'AIM', 'gadu-gadu': 'Gadu Gadu', @@ -996,7 +997,7 @@ class AddNewContactWindow: self.group_comboboxentry.set_active(i) i += 1 - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.window.show_all() if self.account: @@ -2703,6 +2704,7 @@ class NewChatDialog(InputDialog): title = _('Start Chat') prompt_text = _('Fill in the nickname or the Jabber ID of the contact you would like\nto send a chat message to:') InputDialog.__init__(self, title, prompt_text, is_modal=False) + self.input_entry.set_placeholder_text(_('Nickname / Jabber ID')) self.completion_dict = {} liststore = gtkgui_helpers.get_completion_liststore(self.input_entry) diff --git a/src/disco.py b/src/disco.py index 2f954707a..c3a51f7a9 100644 --- a/src/disco.py +++ b/src/disco.py @@ -1244,7 +1244,7 @@ class ToplevelAgentBrowser(AgentBrowser): # bounding rectangle of coordinates for the cell within the treeview rect = view.get_cell_area(props[0], props[1]) # position of the treeview on the screen - position = view.window.get_origin() + position = view.get_window().get_origin()[1:] self.tooltip.show_tooltip(state, rect.height, position[1] + rect.y) else: self.tooltip.hide_tooltip() diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py index a92a01ad8..33ae185b8 100644 --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -963,7 +963,7 @@ class FileTransfersWindow: # 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.window.get_origin() + position = widget.get_window().get_origin()[1:] self.tooltip.show_tooltip(file_props, rect.height, position[1] + rect.y + self.height_diff) else: @@ -989,7 +989,7 @@ class FileTransfersWindow: event_button = gtkgui_helpers.get_possible_button_event(event) self.file_transfers_menu.show_all() - self.file_transfers_menu.popup(None, self.tree, None, + self.file_transfers_menu.popup(None, self.tree, None, None, event_button, event.time) def on_transfers_list_key_press_event(self, widget, event): diff --git a/src/groupchat_control.py b/src/groupchat_control.py index fd705214b..2887f50a1 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -2151,7 +2151,7 @@ class GroupchatControl(ChatControlBase): # Textview is not sensitive, don't handle keypress return # construct event instance from binding - event = Gdk.Event(Gdk.KEY_PRESS) # it's always a key-press here + event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here event.keyval = event_keyval event.state = event_keymod event.time = 0 # assign current time @@ -2452,7 +2452,7 @@ class GroupchatControl(ChatControlBase): # show the popup now! menu = xml.get_object('gc_occupants_menu') menu.show_all() - menu.popup(None, None, None, event.button, event.time) + menu.popup(None, None, None, None, event.button, event.time) def _start_private_message(self, nick): gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) @@ -2591,7 +2591,7 @@ class GroupchatControl(ChatControlBase): # as it was before setting the timeout if props and self.tooltip.id == props[0]: rect = self.list_treeview.get_cell_area(props[0], props[1]) - position = self.list_treeview.window.get_origin() + position = self.list_treeview.get_window().get_origin()[1:] self.tooltip.show_tooltip(contact, rect.height, position[1] + rect.y) else: diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py index 28de9421b..79f11591b 100644 --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -109,12 +109,9 @@ def get_completion_liststore(entry): liststore = Gtk.ListStore(GdkPixbuf.Pixbuf, str) render_pixbuf = Gtk.CellRendererPixbuf() - completion.pack_start(render_pixbuf, False, True, 0) + completion.pack_start(render_pixbuf, False) completion.add_attribute(render_pixbuf, 'pixbuf', 0) - render_text = Gtk.CellRendererText() - completion.pack_start(render_text, True, True, 0) - completion.add_attribute(render_text, 'text', 1) completion.set_property('text_column', 1) completion.set_model(liststore) entry.set_completion(completion) @@ -125,10 +122,11 @@ 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() - def position_menu_under_button(menu): + window_x1, window_y1 = parent_win.get_origin()[1:] + def position_menu_under_button(menu, data): # inline function, which will not keep refs, when used as CB - button_x, button_y = button.allocation.x, button.allocation.y + alloc = button.get_allocation() + button_x, button_y = alloc.x, alloc.y # now convert them to X11-relative window_x, window_y = window_x1, window_y1 @@ -138,10 +136,9 @@ def popup_emoticons_under_button(menu, button, parent_win): menu_height = menu.size_request()[1] ## should we pop down or up? - if (y + button.allocation.height + menu_height - < Gdk.Screen.height()): + if (y + alloc.height + menu_height < Gdk.Screen.height()): # now move the menu below the button - y += button.allocation.height + y += alloc.height else: # now move the menu above the button y -= menu_height @@ -150,7 +147,7 @@ def popup_emoticons_under_button(menu, button, parent_win): push_in = True return (x, y, push_in) - menu.popup(None, None, position_menu_under_button, 1, 0) + menu.popup(None, None, position_menu_under_button, None, 1, 0) def get_theme_font_for_option(theme, option): """ @@ -806,7 +803,7 @@ def get_possible_button_event(event): """ Mouse or keyboard caused the event? """ - if event.type == Gdk.KEY_PRESS: + if event.type == Gdk.EventType.KEY_PRESS: return 0 # no event.button so pass 0 # BUTTON_PRESS event, so pass event.button return event.button diff --git a/src/history_manager.py b/src/history_manager.py index 4b9292590..1d005cb2a 100644 --- a/src/history_manager.py +++ b/src/history_manager.py @@ -464,7 +464,7 @@ class HistoryManager: self.on_delete_menuitem_activate, widget) xml.connect_signals(self) - xml.get_object('context_menu').popup(None, None, None, + xml.get_object('context_menu').popup(None, None, None, None, event.button, event.time) return True diff --git a/src/htmltextview.py b/src/htmltextview.py index 3b31e6da9..b668466c2 100644 --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -843,7 +843,7 @@ class HtmlTextView(Gtk.TextView): text = getattr(tag, 'title', False) if text: pointer = self.get_pointer() - position = self.get_window(Gtk.TextWindowType.TEXT).get_origin() + position = self.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:] self.tooltip.show_tooltip(text, 8, position[1] + pointer[2]) def __motion_notify_event(self, widget, event): diff --git a/src/message_window.py b/src/message_window.py index f47b09db4..2cf5cdaeb 100644 --- a/src/message_window.py +++ b/src/message_window.py @@ -325,7 +325,7 @@ class MessageWindow(object): # NOTE: handles mykeypress which is custom signal; see message_textview.py # construct event instance from binding - event = Gdk.Event(Gdk.KEY_PRESS) # it's always a key-press here + event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here event.keyval = event_keyval event.state = event_keymod event.time = 0 # assign current time @@ -395,7 +395,7 @@ class MessageWindow(object): elif keyval in (Gdk.KEY_Page_Up, Gdk.KEY_Page_Down): # CTRL + PageUp | PageDown # Create event and send it to notebook - event = Gdk.Event(Gdk.KEY_PRESS) + event = Gdk.Event(Gdk.EventType.KEY_PRESS) event.window = self.window.window event.time = int(time.time()) event.state = Gdk.ModifierType.CONTROL_MASK @@ -686,7 +686,7 @@ class MessageWindow(object): return self.window.is_active() def get_origin(self): - return self.window.window.get_origin() + return self.window.get_window().get_origin() def get_control(self, key, acct): """ @@ -791,7 +791,7 @@ class MessageWindow(object): def popup_menu(self, event): menu = self.get_active_control().prepare_context_menu() # show the menu - menu.popup(None, None, None, event.button, event.time) + menu.popup(None, None, None, None, event.button, event.time) menu.show_all() def _on_notebook_switch_page(self, notebook, page, page_num): diff --git a/src/profile_window.py b/src/profile_window.py index 8b13d4198..058b7295d 100644 --- a/src/profile_window.py +++ b/src/profile_window.py @@ -219,7 +219,7 @@ class ProfileWindow: menu.connect('selection-done', lambda w:w.destroy()) # show the menu menu.show_all() - menu.popup(None, None, None, event.button, event.time) + menu.popup(None, None, None, None, event.button, event.time) elif event.button == 1: # left click self.on_set_avatar_button_clicked(widget) diff --git a/src/roster_window.py b/src/roster_window.py index 865552ec3..3810c30a7 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -2392,7 +2392,7 @@ class RosterWindow: if isinstance(w, dict): self.close_all_from_dict(w) else: - w.window.destroy() + w.window().destroy() def close_all(self, account, force=False): """ @@ -2403,7 +2403,7 @@ class RosterWindow: self.close_all_from_dict(gajim.interface.instances[account]) for ctrl in gajim.interface.msg_win_mgr.get_controls(acct=account): ctrl.parent_win.remove_tab(ctrl, ctrl.parent_win.CLOSE_CLOSE_BUTTON, - force = force) + force=force) def on_roster_window_delete_event(self, widget, event): """ @@ -4113,7 +4113,7 @@ class RosterWindow: self.on_history(widget, contact, account) def on_roster_window_popup_menu(self, widget): - event = Gdk.Event(Gdk.KEY_PRESS) + event = Gdk.Event(Gdk.EventType.KEY_PRESS) self.show_treeview_menu(event) def on_row_activated(self, widget, path): @@ -4909,7 +4909,7 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - menu.popup(None, None, None, 1, etime) + menu.popup(None, None, None, None, 1, etime) ################################################################################ ### Everything about images and icons.... @@ -5751,7 +5751,7 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - menu.popup(None, None, None, event_button, event.time) + menu.popup(None, None, None, None, event_button, event.time) def make_group_menu(self, event, titer): """ @@ -5913,7 +5913,7 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - menu.popup(None, None, None, event_button, event.time) + menu.popup(None, None, None, None, event_button, event.time) def make_contact_menu(self, event, titer): """ @@ -5926,7 +5926,7 @@ class RosterWindow: menu = gui_menu_builder.get_contact_menu(contact, account) event_button = gtkgui_helpers.get_possible_button_event(event) menu.attach_to_widget(self.tree, None) - menu.popup(None, None, None, event_button, event.time) + menu.popup(None, None, None, None, event_button, event.time) def make_multiple_contact_menu(self, event, iters): """ @@ -6030,7 +6030,7 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - menu.popup(None, None, None, event_button, event.time) + menu.popup(None, None, None, None, event_button, event.time) def make_transport_menu(self, event, titer): """ @@ -6169,7 +6169,7 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - menu.popup(None, None, None, event_button, event.time) + menu.popup(None, None, None, None, event_button, event.time) def make_groupchat_menu(self, event, titer): model = self.modelfilter @@ -6219,7 +6219,7 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - menu.popup(None, None, None, event_button, event.time) + menu.popup(None, None, None, None, event_button, event.time) def get_and_connect_advanced_menuitem_menu(self, account): """ diff --git a/src/statusicon.py b/src/statusicon.py index 6ce82586f..3fb273230 100644 --- a/src/statusicon.py +++ b/src/statusicon.py @@ -369,8 +369,7 @@ class StatusIcon: self.added_hide_menuitem = True self.systray_context_menu.show_all() - self.systray_context_menu.popup(None, None, None, 0, - event_time) + self.systray_context_menu.popup(None, None, None, None, 0, event_time) def on_show_all_events_menuitem_activate(self, widget): events = gajim.events.get_systray_events() diff --git a/src/tooltips.py b/src/tooltips.py index 386a6d4bb..f51429724 100644 --- a/src/tooltips.py +++ b/src/tooltips.py @@ -93,8 +93,8 @@ class BaseTooltip: self.win.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) self.win.set_events(Gdk.EventMask.POINTER_MOTION_MASK) - self.win.connect_after('expose_event', self.expose) - self.win.connect('size-request', self.on_size_request) +# self.win.connect_after('draw', self.on_draw) +# self.win.connect('size-request', self.on_size_request) self.win.connect('motion-notify-event', self.motion_notify_event) self.screen = self.win.get_screen() @@ -133,12 +133,12 @@ class BaseTooltip: self.preferred_position[1] = 0 self.win.move(self.preferred_position[0], self.preferred_position[1]) - def expose(self, widget, event): - style = self.win.get_style() - size = self.win.get_size() - style.paint_shadow(self.win.window, Gtk.StateType.NORMAL, Gtk.ShadowType.OUT, - None, self.win, 'tooltip', 0, 0, size[0], size[1]) - return True +# def expose(self, widget, event): +# style = self.win.get_style() +# size = self.win.get_size() +# style.paint_shadow(self.win.window, Gtk.StateType.NORMAL, Gtk.ShadowType.OUT, +# None, self.win, 'tooltip', 0, 0, size[0], size[1]) +# return True def show_tooltip(self, data, widget_height, widget_y_position): """ diff --git a/src/vcard.py b/src/vcard.py index 9d9dabe7b..242316e5f 100644 --- a/src/vcard.py +++ b/src/vcard.py @@ -190,7 +190,7 @@ class VcardWindow: menu.connect('selection-done', lambda w:w.destroy()) # show the menu menu.show_all() - menu.popup(None, None, None, event.button, event.time) + menu.popup(None, None, None, None, event.button, event.time) def set_value(self, entry_name, value): try: @@ -533,7 +533,7 @@ class ZeroconfVcardWindow: menu.connect('selection-done', lambda w:w.destroy()) # show the menu menu.show_all() - menu.popup(None, None, None, event.button, event.time) + menu.popup(None, None, None, None, event.button, event.time) def set_value(self, entry_name, value): try: