diff -Naur deskbar-applet-2.14.0.1.orig/ChangeLog deskbar-applet-2.14.0.1/ChangeLog --- deskbar-applet-2.14.0.1.orig/ChangeLog 2006-03-13 17:08:33.000000000 -0600 +++ deskbar-applet-2.14.0.1/ChangeLog 2006-04-10 10:02:18.000000000 -0500 @@ -1,6 +1,12 @@ ========== Version 2.14.0.1 released ========== +2006-04-06 Mikkel Kamstrup Erlandsen + + * deskbar/ui/cuemiac/Cuemiac.py: + * deskbar/ui/entriac/CuemiacEntryUI.py: + Fix bug #335367. Activate the bottom hit of the view when the cuem/entr-iac is at a bottom panel. + 2006-03-14 Raphael Slinckx * deskbar/deskbar-applet.py: diff -Naur deskbar-applet-2.14.0.1.orig/deskbar/ui/cuemiac/Cuemiac.py deskbar-applet-2.14.0.1/deskbar/ui/cuemiac/Cuemiac.py --- deskbar-applet-2.14.0.1.orig/deskbar/ui/cuemiac/Cuemiac.py 2006-03-05 13:40:27.000000000 -0600 +++ deskbar-applet-2.14.0.1/deskbar/ui/cuemiac/Cuemiac.py 2006-04-10 10:03:32.000000000 -0500 @@ -888,12 +888,18 @@ iter = self.model.get_iter (path) if iter is None: - # No selection, select top element # FIXME do this - iter = self.model.get_iter_first() - while (not self.model.iter_has_child(iter)) or (not self.cview.row_expanded(self.model.get_path(iter))): - iter = self.model.iter_next(iter) - iter = self.model.iter_children(iter) - + if self.applet.get_orient () in [gnomeapplet.ORIENT_DOWN, gnomeapplet.ORIENT_LEFT, gnomeapplet.ORIENT_RIGHT]: + # No selection, select top element # FIXME do this + iter = self.model.get_iter_first() + while (not self.model.iter_has_child(iter)) or (not self.cview.row_expanded(self.model.get_path(iter))): + iter = self.model.iter_next(iter) + iter = self.model.iter_children(iter) + + else: + # We are on a bottom panel - select the bottom element in the list + #FIXME: Should we iterate backwards up the list if the hit is a category? + iter = self.model.get_iter (self.cview.last_visible_path()) + if iter is None: return diff -Naur deskbar-applet-2.14.0.1.orig/deskbar/ui/entriac/CuemiacEntryUI.py deskbar-applet-2.14.0.1/deskbar/ui/entriac/CuemiacEntryUI.py --- deskbar-applet-2.14.0.1.orig/deskbar/ui/entriac/CuemiacEntryUI.py 2006-03-01 16:29:29.000000000 -0600 +++ deskbar-applet-2.14.0.1/deskbar/ui/entriac/CuemiacEntryUI.py 2006-04-10 10:04:26.000000000 -0500 @@ -346,13 +346,17 @@ iter = self.model.get_iter (path) if iter is None: - # No selection, select top element # FIXME do this - iter = self.model.get_iter_first() - if iter == None: - return - while (not self.model.iter_has_child(iter)) or (not self.cview.row_expanded(self.model.get_path(iter))): - iter = self.model.iter_next(iter) - iter = self.model.iter_children(iter) + if self.applet.get_orient () in [gnomeapplet.ORIENT_DOWN, gnomeapplet.ORIENT_LEFT, gnomeapplet.ORIENT_RIGHT]: + # No selection, select top element # FIXME do this + iter = self.model.get_iter_first() + while (not self.model.iter_has_child(iter)) or (not self.cview.row_expanded(self.model.get_path(iter))): + iter = self.model.iter_next(iter) + iter = self.model.iter_children(iter) + + else: + # We are on a bottom panel - select the bottom element in the list + #FIXME: Should we iterate backwards up the list if the hit is a category? + iter = self.model.get_iter (self.cview.last_visible_path()) if iter is None: return