deskbar-applet r1874 - in branches/button-ui/deskbar/ui: . cuemiac

[sebp svn gnome org]

Author: sebp
Date: Fri Jan 25 22:27:07 2008
New Revision: 1874
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=1874&view=rev

Log:
Fixed bug in LingeringSelectionWindow that the window was not at the place where the selected item was
Removed obsolete code

Modified:
   branches/button-ui/deskbar/ui/CuemiacAlignedView.py
   branches/button-ui/deskbar/ui/CuemiacWindowView.py
   branches/button-ui/deskbar/ui/cuemiac/LingeringSelectionWindow.py

Modified: branches/button-ui/deskbar/ui/CuemiacAlignedView.py
==============================================================================
--- branches/button-ui/deskbar/ui/CuemiacAlignedView.py	(original)
+++ branches/button-ui/deskbar/ui/CuemiacAlignedView.py	Fri Jan 25 22:27:07 2008
@@ -24,9 +24,8 @@
     
     def __init__(self, controller, model, widget, applet):
         deskbar.interfaces.View.__init__(self, controller, model)
-        CuemiacAlignedWindow.__init__(self, widget, applet)#, gtk.WINDOW_POPUP)
+        CuemiacAlignedWindow.__init__(self, widget, applet)
         self._controller.register_view(self)
-        self.__small_window_height = None
         self._do_clear = True
         self.applet = applet
         
@@ -43,7 +42,6 @@
         self.connect("delete-event", self._controller.on_quit)
         self.connect("destroy-event", self._controller.on_quit)
         self.connect("key-press-event", self.__on_window_key_press_event)
-        self.connect("button-press-event", self.__on_button_press_event)
        
         self.set_title("Deskbar Applet")
         self.set_default_size( self._model.get_window_width(), -1 )
@@ -164,15 +162,8 @@
         self.__set_layout_by_orientation(self.applet.get_orient())
         self.__adjust_popup_size()
    
-    def __on_row_act(self, view, path, column):
-        print "======================"
-    
     def clear_all(self):
         deskbar.interfaces.View.clear_all(self)
-#        width, height = self.get_size()
-#        
-#        if self.__small_window_height != None:
-#            self.resize( width, self.__small_window_height )
         self.applet.set_state(gtk.STATE_NORMAL)
         self.results_box.hide()
         self.resize( *self.size_request() )
@@ -215,10 +206,8 @@
         self.actions_box.show()
     
     def show_results(self):
-        #width, height = self.get_size()
         self.results_box.show()
         self.__show_matches()
-        #self.resize( width, self._model.get_window_height() )
     
     def display_actions(self, actions, qstring):
         self.actions_model.clear()
@@ -276,9 +265,6 @@
                 
         return False
     
-    def __on_button_press_event(self, window, event):
-        print event
-    
     def __focus_matches_if_visible(self, mode):
         if (self.results_box.get_property("visible")):
             if mode == "top":

Modified: branches/button-ui/deskbar/ui/CuemiacWindowView.py
==============================================================================
--- branches/button-ui/deskbar/ui/CuemiacWindowView.py	(original)
+++ branches/button-ui/deskbar/ui/CuemiacWindowView.py	Fri Jan 25 22:27:07 2008
@@ -150,9 +150,6 @@
         self.results_box.pack_start(self.actions_box)
         self.vbox_main.pack_start(self.results_box)
    
-    def __on_row_act(self, view, path, column):
-        print "======================"
-    
     def clear_all(self):
         deskbar.interfaces.View.clear_all(self)
         width, height = self.get_size()

Modified: branches/button-ui/deskbar/ui/cuemiac/LingeringSelectionWindow.py
==============================================================================
--- branches/button-ui/deskbar/ui/cuemiac/LingeringSelectionWindow.py	(original)
+++ branches/button-ui/deskbar/ui/cuemiac/LingeringSelectionWindow.py	Fri Jan 25 22:27:07 2008
@@ -49,8 +49,8 @@
 		"""
 		ox, oy = view.window.get_origin ()
 		area = view.get_background_area (path, column)
-		x, y = view.tree_to_widget_coords (area.x, area.y)
-		self.move (x + ox, y + oy)
+		#x, y = view.tree_to_widget_coords (area.x, area.y)
+		self.move (x + ox, area.y + oy)
 		self.resize (area.width, area.height)
 		
 	def _linger (self):