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