13275N/A--- deskbar-applet-2.23.2.old/deskbar/ui/AbstractCuemiacDeskbarIcon.py 2008-05-29 16:18:39.929746000 +0100

13275N/A+++ deskbar-applet-2.23.2/deskbar/ui/AbstractCuemiacDeskbarIcon.py 2008-05-29 16:20:59.272081000 +0100

13275N/A@@ -31,7 +31,7 @@

12868N/A self._active_view = deskbar.BUTTON_UI_NAME

12868N/A

13275N/A def create_window_ui(self):

13275N/A- self._view = CuemiacWindowView(self._controller, self._core)

13275N/A+ self._view = CuemiacWindowView(self._controller, self._core, self.applet)

12868N/A self._active_view = deskbar.WINDOW_UI_NAME

13275N/A

13275N/A def _setup_core (self):

13275N/A--- deskbar-applet-2.23.2.old/deskbar/ui/CuemiacAlignedView.py 2008-05-29 16:18:39.930265000 +0100

13275N/A+++ deskbar-applet-2.23.2/deskbar/ui/CuemiacAlignedView.py 2008-05-29 16:27:55.476993000 +0100

13275N/A@@ -24,6 +24,7 @@

13275N/A self.set_type_hint (gtk.gdk.WINDOW_TYPE_HINT_MENU)

12868N/A self.applet.set_applet_flags(gnomeapplet.EXPAND_MINOR)

12868N/A self.applet.set_flags(gtk.CAN_FOCUS)

13275N/A+ self.set_screen(applet.get_screen())

13114N/A self.applet.connect("change-orient", self._on_change_orient)

12868N/A

12868N/A self._screen_height = self.get_screen().get_height ()

13275N/A@@ -59,6 +60,9 @@

12868N/A

12868N/A def get_toplevel(self):

12868N/A return self

12868N/A+

12868N/A+ def get_topwindow(self):

12868N/A+ return self.applet.window

13275N/A

13275N/A def receive_focus(self, time):

13275N/A self.applet.set_state(gtk.STATE_SELECTED)

13642N/A--- deskbar-applet-2.23.5.old/deskbar/ui/CuemiacWindowView.py 2008-05-29 16:18:39.930125000 +0100

13642N/A+++ deskbar-applet-2.23.5/deskbar/ui/CuemiacWindowView.py 2008-05-29 16:25:32.072521000 +0100

13275N/A@@ -8,11 +8,13 @@

13275N/A This class is responsible for setting up the GUI.

13275N/A """

12868N/A

13275N/A- def __init__(self, controller, model):

13275N/A+ def __init__(self, controller, model, applet):

13275N/A AbstractCuemiacView.__init__(self, controller, model)

13275N/A gtk.Window.__init__(self)

13275N/A self._controller.register_view(self)

13275N/A self.__small_window_height = None

13275N/A+ self.applet = applet

13275N/A+ self.set_screen(applet.get_screen())

13275N/A

13275N/A self.connect("configure-event", self.__save_window_size)

13275N/A self.connect("delete-event", self._controller.on_quit)

13642N/A@@ -50,6 +50,9 @@

13275N/A def get_toplevel(self):

13275N/A return self

13642N/A

13275N/A+ def get_topwindow(self):

13275N/A+ return self.applet.window

13642N/A+

13275N/A def receive_focus(self, time):

13642N/A self.move( self._model.get_window_x(), self._model.get_window_y() )

13275N/A self.entry.grab_focus()

16064N/A/jds/bin/diff -uprN deskbar-applet-2.25.90.old/deskbar/ui/CuemiacWindowController.py deskbar-applet-2.25.90/deskbar/ui/CuemiacWindowController.py

16630N/A--- deskbar-applet-2.26.2/deskbar/ui/CuemiacWindowController.py-orig 2009-06-08 16:26:29.545137000 -0500

16630N/A+++ deskbar-applet-2.26.2/deskbar/ui/CuemiacWindowController.py 2009-06-08 16:28:02.044898000 -0500

16630N/A@@ -1,6 +1,7 @@

16630N/A import glib

12868N/A import gtk

12868N/A import gtk.gdk

12868N/A+import gnome

12868N/A import logging

12868N/A import deskbar

12868N/A import deskbar.interfaces.Controller

16630N/A@@ -67,14 +68,14 @@ class CuemiacWindowController(deskbar.in

16630N/A self._focus_out = False

12868N/A

12868N/A def on_show_about(self, sender):

12868N/A- show_about(self._view.get_toplevel())

12868N/A+ show_about(self._view.get_topwindow())

12868N/A

12868N/A def on_show_preferences(self, sender):

12868N/A prefs = DeskbarPreferences(self._model)

12868N/A- prefs.show_run_hide(self._view.get_toplevel())

12868N/A+ prefs.show_run_hide(self._view.get_topwindow())

12868N/A

12868N/A def on_show_help(self, sender):

15713N/A- deskbar.core.Utils.launch_default_for_uri_and_scheme("ghelp:deskbar")

16064N/A+ gnome.ui.help_display_uri_on_screen("ghelp:deskbar", (self._view.get_topwindow()).get_screen())

12868N/A

12868N/A def on_query_entry_changed(self, entry):

12868N/A self._view.set_clear()