deskbar-applet r2356 - trunk/deskbar/ui

[sebp svn gnome org]

Author: sebp
Date: Tue Aug 26 17:28:42 2008
New Revision: 2356
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2356&view=rev

Log:
2008-08-26  Sebastian PÃlsterl  <sebp cvs gnome org>

    * deskbar/ui/AbstractCuemiacDeskbarIcon.py:
    * deskbar/ui/DeskbarApplet.py:
    Save correct active state in AbstractCuemiacDeskbarIcon based on changes
    to view's visible property 
    
    * deskbar/ui/CuemiacWindowController.py
    Fixed bug #549375: history dropdown doesn't dismiss after selection


Modified:
   trunk/deskbar/ui/AbstractCuemiacDeskbarIcon.py
   trunk/deskbar/ui/CuemiacWindowController.py
   trunk/deskbar/ui/DeskbarApplet.py

Modified: trunk/deskbar/ui/AbstractCuemiacDeskbarIcon.py
==============================================================================
--- trunk/deskbar/ui/AbstractCuemiacDeskbarIcon.py	(original)
+++ trunk/deskbar/ui/AbstractCuemiacDeskbarIcon.py	Tue Aug 26 17:28:42 2008
@@ -55,6 +55,9 @@
 
         self._view.set_sensitive(False)
         
+        # we want to update active when the window is closed
+        self._view.get_toplevel().connect("notify::visible", self.__on_toplevel_visible_notify)
+        
         GconfStore.get_instance().connect("ui-name-changed", self._on_ui_name_changed)
             
     def _setup_mvc(self):
@@ -81,7 +84,10 @@
             if format["name"] == "svg":
                 return True
         return False
-   
+    
+    def __on_toplevel_visible_notify(self, widget, param):
+        self.active = widget.get_property("visible")
+        
     def get_deskbar_icon(self, size):
         if size < 24:
             size = 16

Modified: trunk/deskbar/ui/CuemiacWindowController.py
==============================================================================
--- trunk/deskbar/ui/CuemiacWindowController.py	(original)
+++ trunk/deskbar/ui/CuemiacWindowController.py	Tue Aug 26 17:28:42 2008
@@ -46,7 +46,6 @@
             self._model.set_window_y(y)
         
         window.hide()
-        return True
 
     def on_show_about(self, sender):
         show_about(self._view.get_toplevel())

Modified: trunk/deskbar/ui/DeskbarApplet.py
==============================================================================
--- trunk/deskbar/ui/DeskbarApplet.py	(original)
+++ trunk/deskbar/ui/DeskbarApplet.py	Tue Aug 26 17:28:42 2008
@@ -163,7 +163,7 @@
 
     def _setup_history(self):
         self.hview = CuemiacHistoryView(self._core.get_history())
-        self.hview.connect("match-selected", self._controller.on_history_match_selected)
+        self.hview.connect("match-selected", self.__on_history_match_selected)
         self.hview.show()
         
         self.history_popup = CuemiacHistoryPopup (self.tray.button_arrow,
@@ -194,12 +194,15 @@
         return False
     
     def on_toggled_main(self, widget):
-         self.set_active (not self.get_active(),
+        self.set_active (not self.get_active(),
                           gtk.get_current_event_time())
     
     def on_toggled_arrow(self, widget):
         self._controller.on_quit()
-        self.history_popup.popup ()
+        if self.history_popup.get_property("visible"):
+            self.history_popup.popdown()
+        else:
+            self.history_popup.popup()
     
     def get_reference_widget(self):
         return self.tray
@@ -220,4 +223,8 @@
             ("Clear", lambda a,b: self._controller.on_clear_history(a),),
             ("Help", lambda a,b: self._controller.on_show_help(a),)
             ])
+        
+    def __on_history_match_selected(self, history, text, action):
+        self._controller.on_history_match_selected(history, text, action)
+        self.tray.set_active_arrow(False)
         
\ No newline at end of file