1 --- deskbar-applet-2.23.2.old/deskbar/ui/AbstractCuemiacDeskbarIcon.py 2008-05-29 16:18:39.929746000 +0100 2 +++ deskbar-applet-2.23.2/deskbar/ui/AbstractCuemiacDeskbarIcon.py 2008-05-29 16:20:59.272081000 +0100 3 @@ -31,7 +31,7 @@ 4 self._active_view = deskbar.BUTTON_UI_NAME 5 6 def create_window_ui(self): 7 - self._view = CuemiacWindowView(self._controller, self._core) 8 + self._view = CuemiacWindowView(self._controller, self._core, self.applet) 9 self._active_view = deskbar.WINDOW_UI_NAME 10 11 def _setup_core (self): 12 --- deskbar-applet-2.23.2.old/deskbar/ui/CuemiacAlignedView.py 2008-05-29 16:18:39.930265000 +0100 13 +++ deskbar-applet-2.23.2/deskbar/ui/CuemiacAlignedView.py 2008-05-29 16:27:55.476993000 +0100 14 @@ -24,6 +24,7 @@ 15 self.set_type_hint (gtk.gdk.WINDOW_TYPE_HINT_MENU) 16 self.applet.set_applet_flags(gnomeapplet.EXPAND_MINOR) 17 self.applet.set_flags(gtk.CAN_FOCUS) 18 + self.set_screen(applet.get_screen()) 19 self.applet.connect("change-orient", self._on_change_orient) 20 21 self._screen_height = self.get_screen().get_height () 22 @@ -59,6 +60,9 @@ 23 24 def get_toplevel(self): 25 return self 26 + 27 + def get_topwindow(self): 28 + return self.applet.window 29 30 def receive_focus(self, time): 31 self.applet.set_state(gtk.STATE_SELECTED) 32 --- deskbar-applet-2.23.5.old/deskbar/ui/CuemiacWindowView.py 2008-05-29 16:18:39.930125000 +0100 33 +++ deskbar-applet-2.23.5/deskbar/ui/CuemiacWindowView.py 2008-05-29 16:25:32.072521000 +0100 34 @@ -8,11 +8,13 @@ 35 This class is responsible for setting up the GUI. 36 """ 37 38 - def __init__(self, controller, model): 39 + def __init__(self, controller, model, applet): 40 AbstractCuemiacView.__init__(self, controller, model) 41 gtk.Window.__init__(self) 42 self._controller.register_view(self) 43 self.__small_window_height = None 44 + self.applet = applet 45 + self.set_screen(applet.get_screen()) 46 47 self.connect("configure-event", self.__save_window_size) 48 self.connect("delete-event", self._controller.on_quit) 49 @@ -50,6 +50,9 @@ 50 def get_toplevel(self): 51 return self 52 53 + def get_topwindow(self): 54 + return self.applet.window 55 + 56 def receive_focus(self, time): 57 self.move( self._model.get_window_x(), self._model.get_window_y() ) 58 self.entry.grab_focus() 59 --- deskbar-applet-2.23.2.old/deskbar/ui/CuemiacWindowController.py 2008-05-29 16:18:39.929974000 +0100 60 +++ deskbar-applet-2.23.2/deskbar/ui/CuemiacWindowController.py 2008-05-29 16:24:18.865026000 +0100 61 @@ -1,6 +1,6 @@ 62 import gtk 63 import gtk.gdk 64 -import gnomevfs 65 +import gnome 66 import logging 67 import deskbar 68 import deskbar.interfaces.Controller 69 @@ -48,14 +48,14 @@ 70 window.hide() 71 72 def on_show_about(self, sender): 73 - show_about(self._view.get_toplevel()) 74 + show_about(self._view.get_topwindow()) 75 76 def on_show_preferences(self, sender): 77 prefs = DeskbarPreferences(self._model) 78 - prefs.show_run_hide(self._view.get_toplevel()) 79 + prefs.show_run_hide(self._view.get_topwindow()) 80 81 def on_show_help(self, sender): 82 - gnomevfs.url_show("ghelp:deskbar") 83 + gnome.ui.help_display_uri_on_screen("ghelp:deskbar", (self._view_get_topwindow()).get_screen()) 84 85 def on_query_entry_changed(self, entry): 86 self._view.set_clear() 87