Merge lp:~mmcg069/software-center/viewswitcher2 into lp:software-center

[Matthew McGowan]

In this branch Viewswitcher is essentially a frakenstein of vbox & treeview, enabling all vboxes nice padding and spacing attributes while offering node navigation simialr to a treeview+treestore.

Moreover, a new cellrenderer and api is provided which allows the setting of the "action count" on a node, which subsequently displays an 'action_count' bubble in the 'treeview' for the appropriate node.

As well; misc bug fixes.

Note: please pay close attention to the touches on viewmanager.py, as viewmanager seems closely aligned with the plugin architecture, not sure if my changes are desirable...

[Matthew Paul Thomas (mpt)]

This is a good start, and I'd love to see this fix in Maverick. But as shown in <http://imgur.com/vJe6F>, it needs a little work. In that screenshot, the red, lime, and purple stripes should all be the same length.

review: Needs Fixing (design)

[Matthew Paul Thomas (mpt)]

Also, the lozenge currently has a mouseover effect and should not.

review: Needs Fixing (design)

[lp:~mmcg069/software-center/viewswitcher2]

931. By Matthew McGowan on 2010-08-17

make spacing and padding uniform.

932. By Matthew McGowan on 2010-08-17

stop lozenge from changing colour when selecting the row or mousing over the row.

933. By Matthew McGowan on 2010-08-17

some small tweaks.

[Matthew McGowan (mmcg069)]

Hi,

The spacing should now be fixed. The red, lime, and purple lines
should all be 6 pixels. This value is easily tweakable by setting the
value of ViewSwitcher.ITEM_SPACING in
softwarecenter/view/viewswitcher.py.

Also, the lozenge no longer has a moueover effect.
.

On Wed, Aug 18, 2010 at 2:21 AM, Matthew Paul Thomas <email address hidden> wrote:
> Review: Needs Fixing design
> Also, the lozenge currently has a mouseover effect and should not.
> --
> https://code.launchpad.net/~mmcg069/software-center/viewswitcher2/+merge/32867
> You are the owner of lp:~mmcg069/software-center/viewswitcher2.
>

--
From the mind of me!

[Matthew Paul Thomas (mpt)]

Nicely done, thanks. Design approved.

review: Approve (design)

[Matthew McGowan (mmcg069)]

Thanks :)

On Wed, Aug 18, 2010 at 10:49 PM, Matthew Paul Thomas <email address hidden> wrote:
> Review: Approve design
> Nicely done, thanks. Design approved.
> --
> https://code.launchpad.net/~mmcg069/software-center/viewswitcher2/+merge/32867
> You are the owner of lp:~mmcg069/software-center/viewswitcher2.
>

--
From the mind of me!

[lp:~mmcg069/software-center/viewswitcher2]

934. By Matthew McGowan on 2010-08-25

merge w trunk.

935. By Matthew McGowan on 2010-08-29

merge w trunk.

936. By Matthew McGowan on 2010-08-31

merge w trunk.

937. By Matthew McGowan on 2010-10-14

merge w trunk and resolve.

938. By Matthew McGowan on 2010-11-24

merge w trunk and a few tweaks.

939. By Matthew McGowan on 2010-11-24

remove some stuff that existsed for testing only.

940. By Matthew McGowan on 2010-11-24

merge w trunk and resolve.

941. By Matthew McGowan on 2010-11-26

stuff

942. By Matthew McGowan on 2010-11-26

merge

943. By Matthew McGowan on 2010-11-26

misc changes

944. By Matthew McGowan on 2010-11-26

merge w lp branch of viewswitcher2.

[Michael Vogt (mvo)]

With the new gtk3 UI this branch is no longer relevant, right? Or will it need porting?

review: Needs Information

[Matthew McGowan (mmcg069)]

i think this can die.

On Thu, Jan 5, 2012 at 10:03 PM, Michael Vogt <email address hidden>wrote:

> Review: Needs Information
>
> With the new gtk3 UI this branch is no longer relevant, right? Or will it
> need porting?
> --
>
> https://code.launchpad.net/~mmcg069/software-center/viewswitcher2/+merge/32867
> You are the owner of lp:~mmcg069/software-center/viewswitcher2.
>

--
From the mind of me!

[Michael Vogt (mvo)]

Thanks! I set it to rejected to clean the merge overview page now.

And HAPPY NEW YEAR to you :)

[Matthew McGowan (mmcg069)]

HAPPY NEW YEAR :D

See ya on IRC once i stop being lazy :)

On Fri, Jan 6, 2012 at 7:54 AM, Michael Vogt <email address hidden>wrote:

> Thanks! I set it to rejected to clean the merge overview page now.
>
> And HAPPY NEW YEAR to you :)
> --
>
> https://code.launchpad.net/~mmcg069/software-center/viewswitcher2/+merge/32867
> You are the owner of lp:~mmcg069/software-center/viewswitcher2.
>

--
From the mind of me!

Unmerged revisions

944. By Matthew McGowan on 2010-11-26

merge w lp branch of viewswitcher2.

943. By Matthew McGowan on 2010-11-26

misc changes

942. By Matthew McGowan on 2010-11-26

merge

941. By Matthew McGowan on 2010-11-26

stuff

940. By Matthew McGowan on 2010-11-24

merge w trunk and resolve.

939. By Matthew McGowan on 2010-11-24

remove some stuff that existsed for testing only.

938. By Matthew McGowan on 2010-11-24

merge w trunk and a few tweaks.

937. By Matthew McGowan on 2010-10-14

merge w trunk and resolve.

936. By Matthew McGowan on 2010-08-31

merge w trunk.

935. By Matthew McGowan on 2010-08-29

merge w trunk.

=== modified file 'softwarecenter/app.py'
--- softwarecenter/app.py	2010-11-24 22:30:43 +0000
+++ softwarecenter/app.py	2010-11-26 21:34:16 +0000
@@ -43,7 +43,7 @@
 from softwarecenter.view.widgets.mkit import floats_from_string
 
 import view.dialogs
-from view.viewswitcher import ViewSwitcher, ViewSwitcherList
+from view.viewswitcher import ViewSwitcher, ViewReference
 from view.pendingview import PendingView
 from view.installedpane import InstalledPane
 from view.channelpane import ChannelPane
@@ -63,6 +63,9 @@
 from apt.aptcache import AptCache
 from gettext import gettext as _
 
+#from softwarecenter.widgets.animatedimage import AnimatedImage
+
+
 class SoftwarecenterDbusController(dbus.service.Object):
     """ 
     This is a helper to provide the SoftwarecenterIFace
@@ -91,7 +94,7 @@
         self.parent.cache.emit("cache-ready")
 
 class SoftwareCenterApp(SimpleGtkbuilderApp):
-    
+
     WEBLINK_URL = "http://apt.ubuntu.com/p/%s"
     
     # the size of the icon for dialogs
@@ -224,7 +227,7 @@
         self.available_pane.connect("app-list-changed", 
                                     self.on_app_list_changed,
                                     VIEW_PAGE_AVAILABLE)
-        self.view_manager.register(self.available_pane, VIEW_PAGE_AVAILABLE)
+        self.view_manager.register_primary(self.available_pane, VIEW_PAGE_AVAILABLE)
 
         # channel pane
         self.channel_pane = ChannelPane(self.cache,
@@ -248,7 +251,7 @@
         self.channel_pane.connect("app-list-changed", 
                                     self.on_app_list_changed,
                                     VIEW_PAGE_CHANNEL)
-        self.view_manager.register(self.channel_pane, VIEW_PAGE_CHANNEL)
+        self.view_manager.register_secondary(self.channel_pane, VIEW_PAGE_CHANNEL)
         
         # installed pane
         self.installed_pane = InstalledPane(self.cache,
@@ -272,7 +275,8 @@
         self.installed_pane.connect("app-list-changed", 
                                     self.on_app_list_changed,
                                     VIEW_PAGE_INSTALLED)
-        self.view_manager.register(self.installed_pane, VIEW_PAGE_INSTALLED)
+        self.view_manager.register_primary(self.installed_pane,
+                                           VIEW_PAGE_INSTALLED)
 
         # history pane (not fully loaded at this point)
         self.history_pane = HistoryPane(self.cache,
@@ -280,24 +284,32 @@
                                         self.distro,
                                         self.icons,
                                         datadir)
+
         self.history_pane.connect("app-list-changed", 
                                   self.on_app_list_changed,
                                   VIEW_PAGE_HISTORY)
-        self.view_manager.register(self.history_pane, VIEW_PAGE_HISTORY)
+        self.view_manager.register_primary(self.history_pane,
+                                           VIEW_PAGE_HISTORY)
 
         # pending view
         self.pending_view = PendingView(self.icons)
-        self.view_manager.register(self.pending_view, VIEW_PAGE_PENDING)
+        self.view_manager.register_primary(self.pending_view, VIEW_PAGE_PENDING)
         
         # keep track of the current active pane
         self.active_pane = self.available_pane
 
         # view switcher
         self.view_switcher = ViewSwitcher(self.view_manager, datadir, self.db, self.cache, self.icons)
+        self.view_switcher.show()
+        self.view_switcher.build_primary_views()
+
+        # increase the padding around the Pending item
+        from softwarecenter.view.widgets.mkit import EM
+        #self.view_switcher.set_item_padding(VIEW_PAGE_PENDING, int(1.75*EM))
         self.scrolledwindow_viewswitcher.add(self.view_switcher)
-        self.view_switcher.show()
         self.view_switcher.connect("view-changed", 
                                    self.on_view_switcher_changed)
+
         self.view_switcher.width = self.scrolledwindow_viewswitcher.get_property('width-request')
         self.view_switcher.connect('size-allocate', self.on_viewswitcher_resized)
         self.view_switcher.set_view(VIEW_PAGE_AVAILABLE)
@@ -428,7 +440,7 @@
             self.glaunchpad.shutdown()
         self.save_state()
         gtk.main_quit()
-        
+
     def on_window_main_key_press_event(self, widget, event):
         if (event.keyval == gtk.gdk.keyval_from_name("BackSpace") and 
             self.active_pane and
@@ -444,6 +456,7 @@
         # set menu sensitve
         self.menuitem_view_supported_only.set_sensitive(self.active_pane != None)
         self.menuitem_view_all.set_sensitive(self.active_pane != None)
+
         # set menu state
         if self.active_pane:
             self._block_menuitem_view = True
@@ -455,6 +468,7 @@
             else:
                 self.menuitem_view_all.activate()
             self._block_menuitem_view = False
+
         if view_id == VIEW_PAGE_AVAILABLE:
             back_action = self.available_pane.nav_history.navhistory_back_action
             forward_action = self.available_pane.nav_history.navhistory_forward_action
@@ -542,7 +556,7 @@
             action_func(app.pkgname, app.appname, appdetails.icon, addons_install=addons_install, addons_remove=addons_remove)
         else:
             logging.error("Not a valid action in AptdaemonBackend: '%s'" % action)
-            
+
     def get_icon_filename(self, iconname, iconsize):
         iconinfo = self.icons.lookup_icon(iconname, iconsize, 0)
         if not iconinfo:
@@ -819,6 +833,11 @@
             (or a cache reload) has finished 
         """
         self.cache.open()
+        self.update_app_status_menu()
+
+    def _on_transaction_stopped(self, *args, **kwargs):
+        """ callback when an application install/remove transaction has stopped """
+        self.update_app_status_menu()
 
     def on_channels_changed(self, backend, res):
         """ callback when the set of software channels has changed """
@@ -854,7 +873,7 @@
             return
         if channel:
             self.channel_pane.set_channel(channel)
-            self.active_pane.refresh_apps()
+            self.channel_pane.refresh_apps()
         self.active_pane.update_app_view()
 
     def _on_database_rebuilding_handler(self, is_rebuilding):

=== modified file 'softwarecenter/apt/aptcache.py'
--- softwarecenter/apt/aptcache.py	2010-11-23 14:56:54 +0000
+++ softwarecenter/apt/aptcache.py	2010-11-26 21:34:16 +0000
@@ -79,7 +79,8 @@
         self._ready = False
         self._timeout_id = None
         # async open cache
-        glib.timeout_add(10, self.open)
+        #glib.timeout_add(10, self.open)
+        self.open()
         # setup monitor watch for install/remove changes
         self.apt_finished_stamp=gio.File(self.APT_FINISHED_STAMP)
         self.apt_finished_monitor = self.apt_finished_stamp.monitor_file(
@@ -126,7 +127,9 @@
     def __iter__(self):
         return self._cache.__iter__()
     def __contains__(self, k):
-        return self._cache.__contains__(k)
+        if self._cache:
+            return self._cache.__contains__(k)
+        return False
     def _get_rdepends_by_type(self, pkg, type, onlyInstalled):
         rdeps = set()
         for rdep in pkg._pkg.rev_depends_list:

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2010-11-24 10:54:29 +0000
+++ softwarecenter/enums.py	2010-11-26 21:34:16 +0000
@@ -54,11 +54,12 @@
 # items considered "permanent", that is, if a item disappears
 # (e.g. progress) then switch back to the previous on in permanent
 # views (LP:  #431907)
-PERMANENT_VIEWS = [VIEW_PAGE_AVAILABLE,
+PERMANENT_VIEWS = (VIEW_PAGE_AVAILABLE,
                    VIEW_PAGE_INSTALLED,
+                   #VIEW_PAGE_CHANNEL,
                    VIEW_PAGE_CHANNEL,
                    VIEW_PAGE_HISTORY,
-                  ]
+                  )
 
 # icons
 MISSING_APP_ICON = "applications-other"

=== modified file 'softwarecenter/view/appview.py'
--- softwarecenter/view/appview.py	2010-11-23 14:56:54 +0000
+++ softwarecenter/view/appview.py	2010-11-26 21:34:16 +0000
@@ -1178,6 +1178,8 @@
 
     def __init__(self, show_ratings, store=None):
         gtk.TreeView.__init__(self)
+        #self.set_rules_hint(True)
+
         self._logger = logging.getLogger("softwarecenter.view.appview")
         #self.buttons = {}
         self.pressed = False
@@ -1571,8 +1573,20 @@
 
     def _on_transaction_finished(self, backend, result, tr):
         """ callback when an application install/remove transaction has finished """
-        # need to send a cursor-changed so the row button is properly updated
-        self.emit("cursor-changed")
+
+        # If this item has just been removed...
+        try:
+            pkgname = result.meta_data["sc_pkgname"]
+        except KeyError:
+            return
+        appname = result.meta_data.get("sc_appname", "")
+        db = self.get_model().db
+        appdetails = Application(appname, pkgname).get_details(db)
+        # ...then manually emit "cursor-changed" as an item has
+        # just been removed and so everything else needs to update
+        if appdetails.pkg_state == PKG_STATE_UNINSTALLED:
+            self.emit("cursor-changed")
+
         # remove pkg from the block list
         self._check_remove_pkg_from_blocklist(result.pkgname)
 

=== modified file 'softwarecenter/view/availablepane.py'
--- softwarecenter/view/availablepane.py	2010-11-24 14:49:46 +0000
+++ softwarecenter/view/availablepane.py	2010-11-26 21:34:16 +0000
@@ -64,7 +64,7 @@
     # constant for use in action bar (see _update_action_bar)
     _INSTALL_BTN_ID = 0
 
-    def __init__(self, 
+    def __init__(self,
                  cache,
                  db, 
                  distro, 
@@ -72,9 +72,14 @@
                  datadir, 
                  navhistory_back_action, 
                  navhistory_forward_action):
-        # parent
+
         SoftwarePane.__init__(self, cache, db, distro, icons, datadir)
         self._logger = logging.getLogger(__name__)
+
+        # available pane display name and icon
+        self.pane_name = _('Get Free Software')
+        self.pane_icon = self._get_viewswitcher_icon("softwarecenter")
+
         # navigation history actions
         self.navhistory_back_action = navhistory_back_action
         self.navhistory_forward_action = navhistory_forward_action
@@ -599,6 +604,7 @@
         self.action_bar.clear()
         self.searchentry.show()
         self.cat_view.stop_carousels()
+        self.action_bar.clear()
         return
 
     def display_details(self):

=== modified file 'softwarecenter/view/basepane.py'
--- softwarecenter/view/basepane.py	2010-11-19 23:03:15 +0000
+++ softwarecenter/view/basepane.py	2010-11-26 21:34:16 +0000
@@ -17,11 +17,31 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
+import gtk
+from widgets.animatedimage import AnimatedImage
+
+
 class BasePane(object):
     """ Base for all the View widgets that can be registered in a 
         ViewManager 
     """
 
+    VIEW_SWITCHER_ICON_SIZE = 24
+
+    def _get_viewswitcher_icon(self, icon_name):
+        size = self.VIEW_SWITCHER_ICON_SIZE
+        if self.icons.lookup_icon(icon_name, size, 0):
+            path = self.icons.lookup_icon(icon_name, size, 0).get_filename()
+            pb = gtk.gdk.pixbuf_new_from_file_at_size(path,
+                                                      size,
+                                                      size)
+            icon = AnimatedImage(pb)
+        else:
+            # icon not present in theme, probably because running uninstalled
+            icon = AnimatedImage(self.icons.load_icon("gtk-missing-image", 
+                                                      size, 0))
+        return icon
+
     def __init__(self):
         # stuff that is queried by app.py
         self.apps_filter = None

=== modified file 'softwarecenter/view/catview_gtk.py'
--- softwarecenter/view/catview_gtk.py	2010-11-22 16:45:17 +0000
+++ softwarecenter/view/catview_gtk.py	2010-11-26 21:34:16 +0000
@@ -391,7 +391,7 @@
         self.hbox_inner.set_homogeneous(True)
 
         featured_cat = get_category_by_name(self.categories,
-                                            'Featured')    # untranslated name
+                                            'Featured Applications')    # untranslated name
 
         # the spec says the carousel icons should be 4em
         # however, by not using a stock icon size, icons sometimes dont
@@ -420,7 +420,7 @@
 
         # create new-apps widget
         new_cat = get_category_by_name(self.categories, 
-                                       u"What\u2019s New")
+                                       "New Applications")
         if new_cat:
             new_apps = AppStore(self.cache,
                                 self.db,
@@ -432,6 +432,7 @@
                                 icon_size=best_stock_size,
                                 global_icon_cache=False,
                                 nonapps_visible=AppStore.NONAPPS_MAYBE_VISIBLE)
+
             self.newapps_carousel = CarouselView(
                 new_apps, _(u"What\u2019s New"), self.icons,
                 start_random=False)
@@ -458,8 +459,8 @@
         sorted_cats = categories_sorted_by_name(self.categories)
 
         for cat in sorted_cats:
-            if cat.untranslated_name not in ('Featured',
-                                             u"What\u2019s New"):
+            if cat.untranslated_name not in ('Featured Applications',
+                                             'New Applications'):
                 #enquirer.set_query(cat.query)
                 ## limiting the size here does not make it faster
                 #matches = enquirer.get_mset(0, len(self.db))
@@ -900,8 +901,6 @@
 
     def draw(self, cr, a, expose_area):
         if mkit.not_overlapping(a, expose_area): return
-        #mkit.FramedSection.draw(self, cr, a, expose_area)
-
         cr.save()
 
         lin = cairo.LinearGradient(a.x, a.y+80, a.x, a.y+a.height)
@@ -931,9 +930,35 @@
 
         cr.restore()
 
-        r,g,b = mkit.floats_from_gdkcolor(self.style.mid[0])
-        rr = mkit.ShapeRoundedRectangle()
-
+        #r,g,b = mkit.floats_from_gdkcolor(self.style.mid[0])
+        #rr = mkit.ShapeRoundedRectangle()
+
+        #rr.layout(cr, a.x, a.y, a.x+a.width, a.y+a.height, radius=5)
+        #cr.clip()
+        #cr.set_source_rgba(r,g,b,0.35)
+        #cr.mask(lin)
+
+        #cairo.Context.reset_clip(cr)
+        #cr.save()
+        #cr.translate(0.5,0.5)
+        #cr.set_line_width(1)
+
+        #r,g,b = mkit.floats_from_gdkcolor(self.style.light[0])
+        #rr.layout(cr, a.x, a.y, a.x+a.width-1, a.y+a.height, radius=5)
+        #lin = cairo.LinearGradient(a.x, a.y+80, a.x, a.y+a.height)
+        #lin.add_color_stop_rgba(0,r,g,b,1)
+        #lin.add_color_stop_rgba(1,r,g,b,0)
+        #cr.set_source(lin)
+        #cr.stroke()
+
+        #r,g,b = mkit.floats_from_gdkcolor(self.style.dark[0])
+        #rr.layout(cr, a.x, a.y, a.x+a.width, a.y+a.height, radius=5)
+        #lin = cairo.LinearGradient(a.x, a.y+80, a.x, a.y+a.height)
+        #lin.add_color_stop_rgba(0,r,g,b,1)
+        #lin.add_color_stop_rgba(1,r,g,b,0)
+        #cr.set_source(lin)
+        #cr.stroke()
+        #cr.restore()
         cr.restore()
 
         self.more_btn.draw(cr, self.more_btn.allocation, expose_area)
@@ -992,7 +1017,6 @@
 
     def __init__(self, markup='None', icon_name='None', icon_size=48, icons=None):
         mkit.VLinkButton.__init__(self, markup, icon_name, icon_size, icons)
-
         self.set_border_width(mkit.BORDER_WIDTH_LARGE)
         self.set_internal_spacing(mkit.SPACING_SMALL)
 

=== modified file 'softwarecenter/view/historypane.py'
--- softwarecenter/view/historypane.py	2010-11-24 14:49:46 +0000
+++ softwarecenter/view/historypane.py	2010-11-26 21:34:16 +0000
@@ -62,12 +62,16 @@
 
     def __init__(self, cache, db, distro, icons, datadir):
         gtk.VBox.__init__(self)
+
         self.cache = cache
         self.db = db
         self.distro = distro
         self.icons = icons
         self.datadir = datadir
 
+        self.pane_name = _('History')
+        self.pane_icon = self._get_viewswitcher_icon('clock')
+
         self.apps_filter = None
 
         # Icon cache, invalidated upon icon theme changes
@@ -258,6 +262,12 @@
 
         self.emit('app-list-changed', self.visible_changes)
 
+    def set_pane_name(self, name):
+        self.pane_name = name
+
+    def set_pane_icon(self, icon):
+        self.pane_icon = icon
+
     def _row_matches(self, store, iter):
         # Whether a child row matches the current filter and the search entry
         pkg = store.get_value(iter, self.COL_PKG) or ''

=== modified file 'softwarecenter/view/installedpane.py'
--- softwarecenter/view/installedpane.py	2010-11-16 23:59:07 +0000
+++ softwarecenter/view/installedpane.py	2010-11-26 21:34:16 +0000
@@ -41,8 +41,11 @@
      PAGE_APP_DETAILS) = range(2)
 
     def __init__(self, cache, db, distro, icons, datadir):
-        # parent
         SoftwarePane.__init__(self, cache, db, distro, icons, datadir, show_ratings=False)
+
+        self.pane_name = _('Installed Software')
+        self.pane_icon = self._get_viewswitcher_icon('computer')
+        
         # state
         self.apps_filter = AppViewFilter(db, cache)
         self.apps_filter.set_installed_only(True)

=== modified file 'softwarecenter/view/pendingview.py'
--- softwarecenter/view/pendingview.py	2010-09-15 23:37:35 +0000
+++ softwarecenter/view/pendingview.py	2010-11-26 21:34:16 +0000
@@ -35,6 +35,7 @@
 from softwarecenter.backend.transactionswatcher import TransactionsWatcher
 from softwarecenter.view.basepane import BasePane
 
+from widgets.animatedimage import AnimatedImage
 from gettext import gettext as _
 
 class PendingStore(gtk.ListStore, TransactionsWatcher):
@@ -208,12 +209,16 @@
 
 
 class PendingView(gtk.TreeView, BasePane):
-    
+
+    ANIMATION_PATH = "/usr/share/icons/hicolor/24x24/status/softwarecenter-progress.png"
     CANCEL_XPAD = 6
     CANCEL_YPAD = 6
 
     def __init__(self, icons):
         gtk.TreeView.__init__(self)
+        self.pane_name = _('In Progress...')
+        self.pane_icon = AnimatedImage(self.ANIMATION_PATH)
+        # softwarepane compat
         BasePane.__init__(self)
         # customization
         self.set_headers_visible(False)

=== modified file 'softwarecenter/view/softwarepane.py'
--- softwarecenter/view/softwarepane.py	2010-11-24 14:49:46 +0000
+++ softwarecenter/view/softwarepane.py	2010-11-26 21:34:16 +0000
@@ -38,8 +38,14 @@
 from softwarecenter.backend import get_install_backend
 from softwarecenter.view.basepane import BasePane
 
+from widgets.searchentry import SearchEntry
+
+#from widgets.actionbar2 import ActionBar
+from widgets.actionbar import ActionBar
+
 from appview import AppView, AppStore
 
+
 if "SOFTWARE_CENTER_APPDETAILS_WEBKIT" in os.environ:
     from appdetailsview_webkit import AppDetailsViewWebkit as AppDetailsView
 else:
@@ -130,6 +136,7 @@
                               (int, ),
                              ),
     }
+
     PADDING = 6
     
     (PAGE_APPVIEW,
@@ -137,6 +144,9 @@
 
     def __init__(self, cache, db, distro, icons, datadir, show_ratings=False):
         gtk.VBox.__init__(self)
+        self.pane_name = None
+        self.pane_icon = None
+
         BasePane.__init__(self)
         # other classes we need
         self.cache = cache
@@ -258,7 +268,21 @@
             index =  model.app_index_map.get(current_app)
             LOG.debug("found app: %s at index %s" % (current_app.pkgname, index))
             self.app_view.set_cursor(index)
-            
+
+    def set_pane_name(self, name):
+        self.pane_name = name
+
+    def set_pane_icon(self, icon):
+        self.pane_icon = icon
+
+    def set_section_image(self, image_id, surf):
+        self.app_details.set_section_image(image_id, surf)
+        return
+
+    def set_section_color(self, color):
+        self.app_details.set_section_color(color)
+        return
+
     def show_appview_spinner(self):
         """ display the spinner in the appview panel """
         self.action_bar.clear()

=== modified file 'softwarecenter/view/viewmanager.py'
--- softwarecenter/view/viewmanager.py	2010-11-18 18:39:41 +0000
+++ softwarecenter/view/viewmanager.py	2010-11-26 21:34:16 +0000
@@ -22,13 +22,40 @@
 
     def __init__(self, notebook_view):
         self.notebook_view = notebook_view
+        self._primary_order = []
+        self._secondary_order = []
+
         self.all_views = {}
-        self.view_to_pane = {}
-    def register(self, view_widget, view_id):
-        page_id = self.notebook_view.append_page(
-            view_widget, gtk.Label(view_id)) # label is for debugging only
-        self.all_views[view_id] = page_id
-        self.view_to_pane[view_id] = view_widget
+        self.primary_to_pane = {}
+        self.secondary_to_pane = {}
+
+    def register_primary(self, view_widget, view_id):
+        self._primary_order.append(view_id)
+        page_id = self.notebook_view.append_page(
+            view_widget, gtk.Label(view_id)) # label is for debugging only
+        self.all_views[view_id] = page_id
+        self.primary_to_pane[view_id] = view_widget
+
+    def register_secondary(self, view_widget, view_id):
+        self._secondary_order.append(view_id)
+        page_id = self.notebook_view.append_page(
+            view_widget, gtk.Label(view_id)) # label is for debugging only
+        self.all_views[view_id] = page_id
+        self.secondary_to_pane[view_id] = view_widget
+
+    def primary_views(self):
+        views = []
+        for view_id in self._primary_order:
+            vw = self.primary_to_pane[view_id]
+            views.append((view_id, vw))
+        return views
+
+    def secondary_views(self):
+        views = []
+        for view_id in self._secondary_order:
+            vw = self.secondary_to_pane[view_id]
+            views.append((view_id, vw))
+        return views
 
     def set_active_view(self, view_id):
         if not view_id == "view-page-separator-1":
@@ -45,7 +72,9 @@
 
     def get_notebook_page_from_view_id(self, view_id):
         return self.all_views[view_id]
-        
+
     def get_view_widget(self, view_id):
-        if not view_id == "view-page-separator-1":
-            return self.view_to_pane[view_id]
+        if self.primary_to_pane.has_key(view_id):
+            return self.primary_to_pane[view_id]
+        return self.secondary_to_pane[view_id]
+

=== modified file 'softwarecenter/view/viewswitcher.py'
--- softwarecenter/view/viewswitcher.py	2010-10-19 14:50:11 +0000
+++ softwarecenter/view/viewswitcher.py	2010-11-26 21:34:16 +0000
@@ -26,6 +26,7 @@
 import os
 import time
 import xapian
+import cairo
 
 import aptdaemon.client
 from gettext import gettext as _
@@ -37,323 +38,565 @@
 from softwarecenter.enums import *
 
 from widgets.animatedimage import CellRendererAnimatedImage, AnimatedImage
+from widgets.mkit import SPACING_SMALL, SPACING_MED, ShapeRoundedRectangle, floats_from_gdkcolor 
+
+
+class ViewItemCellRenderer(gtk.CellRendererText):
+
+    """ A cell renderer that displays text and an action count bubble that
+        displays if the item has an action occuring.
+    """
+
+    __gproperties__ = {
+        
+        'bubble_text': (str, 'Bubble text',
+                         'Text to be label inside row bubble',
+                         '', gobject.PARAM_READWRITE),
+        }
+
+    def __init__(self):
+        gtk.CellRendererText.__init__(self) 
+        self._rr = ShapeRoundedRectangle()
+        self._layout = None
+        return
+
+    def do_set_property(self, pspec, value):
+        setattr(self, pspec.name, value)
+
+    def do_get_property(self, pspec):
+        return getattr(self, pspec.name)
+
+    def do_render(self, window, widget, background_area, cell_area,
+                  expose_area, flags):
+
+        # important! ensures correct text rendering, esp. when using hicolor theme
+        if (flags & gtk.CELL_RENDERER_SELECTED) != 0:
+            # this follows the behaviour that gtk+ uses for states in treeviews
+            if widget.has_focus():
+                state = gtk.STATE_SELECTED
+            else:
+                state = gtk.STATE_ACTIVE
+        else:
+            state = gtk.STATE_NORMAL
+
+        text = self.get_property('bubble_text')
+        draw_bubble = text and text != '0'
+
+        if draw_bubble:
+
+            if not self._layout:
+                self._layout = widget.create_pango_layout('')
+
+            # setup layout and determine layout extents
+            color = widget.style.black.to_string()
+            self._layout.set_markup('<span color="%s"><small><b>%s</b></small></span>' % (color, text))
+            lw, lh = self._layout.get_pixel_extents()[1][2:]
+
+            w = max(16, lw+8)
+            h = min(cell_area.height-8, lh+8)
+
+            # shrink text area width to make room for the bubble
+            area = gtk.gdk.Rectangle(cell_area.x, cell_area.y,
+                                     cell_area.width-w-9,
+                                     cell_area.height)
+        else:
+            area = cell_area
+
+        # draw text
+        gtk.CellRendererText.do_render(self,
+                                       window,
+                                       widget,
+                                       background_area,
+                                       area,
+                                       expose_area,
+                                       state)
+
+        # draw bubble
+        if not draw_bubble: return
+
+
+        cr = window.cairo_create()
+
+        # draw action bubble background
+        x = max(3, cell_area.x + cell_area.width - w)
+        y = cell_area.y + (cell_area.height-h)/2
+
+        self._rr.layout(cr, x, y, x+w, y+h, radius=7)
+        cr.set_source_rgb(*floats_from_gdkcolor(widget.style.dark[state]))
+        cr.fill_preserve()
+
+        lin = cairo.LinearGradient(0, y, 0, y+h)
+        lin.add_color_stop_rgba(0.0, 0, 0, 0, 0.0)
+        lin.add_color_stop_rgba(1.0, 0, 0, 0, 0.25)
+        cr.set_source(lin)
+        cr.fill_preserve()
+
+        x, y = int(x+(w-lw)*0.5+0.5), int(y+(h-lh)*0.5+0.5),
+                                  
+
+        # bubble number shadow
+        widget.style.paint_layout(window,
+                                  gtk.STATE_NORMAL,
+                                  False,
+                                  cell_area,
+                                  widget,
+                                  None,
+                                  x, y+1,
+                                  self._layout)
+
+
+        # bubble number
+        color = widget.style.white.to_string()
+        self._layout.set_markup('<span color="%s"><small><b>%s</b></small></span>' % (color, text))
+
+        widget.style.paint_layout(window,
+                                  gtk.STATE_NORMAL,
+                                  False,
+                                  cell_area,
+                                  widget,
+                                  None,
+                                  x, y,
+                                  self._layout)
+
+        del cr
+        return
 
 LOG = logging.getLogger(__name__)
 
-class ViewSwitcher(gtk.TreeView):
-
-    __gsignals__ = {
-        "view-changed" : (gobject.SIGNAL_RUN_LAST,
-                          gobject.TYPE_NONE, 
-                          (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT),
-                         ),
-    }
-
-
-    def __init__(self, view_manager, datadir, db, cache, icons, store=None):
-        super(ViewSwitcher, self).__init__()
-        self.view_manager = view_manager
-        self.datadir = datadir
-        self.icons = icons
-        if not store:
-            store = ViewSwitcherList(view_manager, datadir, db, cache, icons)
-            # FIXME: this is just set here for app.py, make the
-            #        transactions-changed signal part of the view api
-            #        instead of the model
-            self.model = store
-            self.set_model(store)
+
+class ViewItem(gtk.TreeView):
+
+    """ A TreeView with convenience methods """
+
+    # columns
+    (COL_ICON,
+     COL_NAME,
+     COL_ACTION,
+     COL_CHANNEL,
+     COL_BUBBLE_TEXT) = range(5)
+
+    def __init__(self, root_name, root_icon, root_action_id):
         gtk.TreeView.__init__(self)
-        
+        self.set_headers_visible(False)
+        self.set_level_indentation(4)
+        self.set_enable_search(False)
+        #self.child_focus(gtk.DIR_RIGHT)
+
+        # must match columns above
+        self.store = gtk.TreeStore(AnimatedImage, 
+                                   str, 
+                                   str,
+                                   gobject.TYPE_PYOBJECT,
+                                   str)
+
+        self.set_model(self.store)
+
         tp = CellRendererAnimatedImage()
         column = gtk.TreeViewColumn("Icon")
         column.pack_start(tp, expand=False)
-        column.set_attributes(tp, image=store.COL_ICON)
-        tr = gtk.CellRendererText()
+        column.set_attributes(tp, image=self.COL_ICON)
+
+        tr = ViewItemCellRenderer()
         tr.set_property("ellipsize", pango.ELLIPSIZE_END)
         column.pack_start(tr, expand=True)
-        column.set_attributes(tr, markup=store.COL_NAME)
+        column.set_attributes(tr, markup=self.COL_NAME,
+                              bubble_text=self.COL_BUBBLE_TEXT)
+
         self.append_column(column)
-
+        self.column = column
+
+        # root name/icon/action_id
+        self.root_name = root_name
+        self.root_icon = root_icon
+        self.root_action_id = root_action_id
+
+
+        self.root_iter = self.store.append(None,
+                                           (root_icon, root_name,
+                                            root_action_id, None, 0))
+        return
+
+    def append_subitem(self, name, icon, action_id, channel=None, bubble_text=''):
+        """ Append a row to a primary view as specified by action_id.
+            A name and icon must be supplied.
+        """
+        self.store.append(self.root_iter,
+                          (icon, name, action_id, channel, bubble_text))
+        return
+
+    def select_root(self):
+        """ Selects root row and sets cursor """
+        root = self.store.get_iter_root()
+        sel = self.get_selection()
+        sel.select_iter(root)
+        self.set_cursor(0)
+        self.grab_focus()
+        return
+
+    def select_tail(self):
+        """ Selects final row and sets the cursor on it """
+        root = self.store.get_iter_root()
+        n_children = self.store.iter_n_children(root)
+        path = (0, n_children-1)
+
+        tail = self.store.get_iter(path)
+
+        sel = self.get_selection()
+        sel.select_iter(tail)
+        self.set_cursor(path)
+        self.grab_focus()
+        return
+
+    def is_expanded(self):
+        """ Returns True if the root node is expanded """
+        return self.row_expanded(0)
+
+    def try_expander_toggle(self, iter=None):
+        """ Expands, collapses or does nothing depending on the row """
+
+        it = iter or self.store.get_iter(0)
+        if self.is_expanded():
+            self.collapse_row(self.store.get_path(it))
+        else:
+            self.expand_row(self.store.get_path(it), True)
+        return
+
+    def expand(self, iter=None):
+        """ Expands a node if possible """
+        it = iter or self.store.get_iter(0)
+        self.expand_row(self.store.get_path(it), True)
+        return
+
+    def collapse(self, iter=None):
+        """ Collapses a node if possible """
+        it = iter or self.store.get_iter(0)
+        self.collapse_row(self.store.get_path(it))
+        return
+
+    def set_bubble_text(self, bubble_text, subitem=-1):
+        """ Sets the action count, if subitem is specified the action
+            count is set to the corresponding child of the parent view.
+        """
+        if subitem >= 0:
+            path = (0,subitem)
+        else:
+            path = 0
+
+        row = self.store[path]
+        self.store.set_value(row.iter, self.COL_BUBBLE_TEXT, str(bubble_text))
+        self.store.row_changed(path, self.store.get_iter(path))
+        return
+
+    def get_path(self):
+        return self.get_cursor()[0]
+
+
+class ViewReference:
+
+    """ Stores the item and path, everything we need to represent a row """
+
+    def __init__(self, item, path):
+        self.item = item
+        self.path = path
+        return
+
+    def __repr__(self):
+        return 'ViewRef: %s, path:%s' % (self.item.root_name, self.path)
+
+    def select(self):
+        item = self.item
+        path = self.path
+        sel = item.get_selection()
+        if sel:
+            sel.select_path(path)
+        if path:
+            item.set_cursor(path)
+            item.grab_focus()
+        return
+
+
+class ViewSwitcher(gtk.Viewport):
+
+    """
+    A container in which ViewItem's can be packed, enabling all the
+    spacing and padding capabilities a VBox offers.
+    """
+
+    ICON_SIZE = 24
+    ITEM_SPACING = 6
+
+    __gsignals__ = {
+        "view-changed" : (gobject.SIGNAL_RUN_LAST,
+                          gobject.TYPE_NONE, 
+                          (str, gobject.TYPE_PYOBJECT)),
+            }
+
+
+    def __init__(self, view_manager, datadir, db, cache, icons, store=None):
+        gtk.Viewport.__init__(self)
+        self.set_shadow_type(gtk.SHADOW_NONE)
+        self.alignment = gtk.Alignment(xscale=1.0, yscale=1.0)
+        self.add(self.alignment)
+        self.vbox = gtk.VBox(spacing=self.ITEM_SPACING)
+        self.alignment.add(self.vbox)
+        self.alignment.set_padding(self.ITEM_SPACING, 0,
+                                   0, 0)
+        self.show_all()
+
+        self.view_manager = view_manager
+        self._id_to_item = {}
+
+        self.datadir = datadir
+        self.icons = icons
+        self.db = db
+        self.cache = cache
+
+        self.backend = get_install_backend()
+        self.backend.connect("transactions-changed", self._on_transactions_changed)
+        self.backend.connect("transaction-finished", self._on_transaction_finished)
+        self.backend.connect("channels-changed", self._on_channels_changed)
+
+        self._block_set_cursor_signals = False
+
+        self._has_focus = [False, False, False, False]
+        self._active_ref = None
         # Remember the previously selected permanent view
-        self._permanent_views = PERMANENT_VIEWS
-        self._previous_permanent_view = None
+        self._last_permaview = None
 
         # set sensible atk name
         atk_desc = self.get_accessible()
         atk_desc.set_name(_("Software sources"))
-        
-        self.set_model(store)
-        self.set_headers_visible(False)
-        self.get_selection().set_select_function(self.on_treeview_selected)
-        self.set_level_indentation(4)
-        self.set_enable_search(False)
 
+        self.channel_manager = ChannelsManager(db, icons)
         self.selected_channel_name = None
         self.selected_channel_installed_only = False
-        
-        self.connect("row-expanded", self.on_treeview_row_expanded)
-        self.connect("row-collapsed", self.on_treeview_row_collapsed)
-        self.connect("cursor-changed", self.on_cursor_changed)
-        self.connect("key-release-event", self.on_key_release_event)
-
-        self.get_model().connect("channels-refreshed", self._on_channels_refreshed)
-        self.get_model().connect("row-deleted", self._on_row_deleted)
-        # channels changed
-        self.backend = get_install_backend()
-        self.backend.connect("channels-changed", self.on_channels_changed)
-        self._block_set_cursor_signals = False
-        
-    def on_channels_changed(self, backend, res):
-        LOG.debug("on_channels_changed %s" % res)
-        if not res:
-            return
-        # update channel list, but block signals so that the cursor
-        # does not jump around
-        self._block_set_cursor_signals = True
-        model = self.get_model()
-        if model:
-            model._update_channel_list()
-        self._block_set_cursor_signals = False
-
-    def on_treeview_row_expanded(self, widget, iter, path):
-        # do nothing on a node expansion
-        pass
-        
-    def on_treeview_row_collapsed(self, widget, iter, path):
-        # on a node collapse, select the node
-        self.set_cursor(path)
-    
-    def on_treeview_selected(self, path):
-        model = self.get_model()
-        iter_ = model.get_iter(path)
-        id_ = model.get_value(iter_, 2)
-        if id_ == VIEW_PAGE_SEPARATOR_1:
-            return False
-        return True
-        
-    def on_cursor_changed(self, widget):
+
+        self.alignment.connect('expose-event', self._on_vbox_expose)
+        return
+
+    def _on_realize(self, widget):
+        # check if there are any live transactions on startup """
+        self._update_pending_item(self.backend.pending_transactions)
+        # set the default startup view to the Available pane
+        self.set_view(VIEW_PAGE_AVAILABLE)
+        return
+
+    def _on_focus_in(self, item, event):
+        self._active_ref.select()
+        return
+
+    def _on_vbox_expose(self, widget, event):
+        children = self.vbox.get_children()
+        if children and isinstance(children[0], gtk.TreeView):
+            treeview = children[0]
+            treeview.style.paint_flat_box(widget.window,
+                                          widget.state,
+                                          gtk.SHADOW_NONE,
+                                          widget.allocation,
+                                          treeview,
+                                          'cell_even',
+                                          widget.allocation.x,
+                                          widget.allocation.y,
+                                          widget.allocation.width,
+                                          widget.allocation.height)
+        else:   # backup draw method
+            cr = widget.window.cairo_create()
+            cr.rectangle(event.area)
+            cr.clip()
+
+            cr.set_source_rgb(*floats_from_gdkcolor(self.style.base[self.state]))
+            cr.rectangle(widget.allocation)
+            cr.fill()
+        return True
+
+    def _on_item_keynav(self, item, event):
+        """ We handle keynav ourselves so we can skip through items when an
+            item extent is reached
+        """
+        kv = event.keyval
+
+        sel = item.get_selection()
+        model, siter = sel.get_selected()   # current selected iter
+
+        if not siter: return
+
+        if kv == gtk.keysyms.Tab or kv == gtk.keysyms.ISO_Left_Tab: # tab/shift-tab
+            return  # allow regular keynav handling
+        elif kv == gtk.keysyms.space or kv == gtk.keysyms.Return:
+            item.try_expander_toggle(siter)
+        elif kv == gtk.keysyms.Right:   # try expand only
+            item.expand(siter)
+        elif kv == gtk.keysyms.Left:    # try collapse only
+            item.collapse(siter)
+        elif kv == gtk.keysyms.Up:
+            self._keynav_up(item, model, sel, siter)
+        elif kv == gtk.keysyms.Down:
+            self._keynav_down(item, model, sel, siter)
+        return True
+
+    def _on_available_item_focus_in(self, item, event):
+        if item != self._active_ref.item:
+            sel = self._active_ref.item.get_selection()
+            sel.unselect_all()
+
+            sel = item.get_selection()
+            sel.select_path((0,))
+            item.set_cursor((0,))
+        return
+
+    def _on_cursor_changed(self, item):
         if self._block_set_cursor_signals:
             return
-        (path, column) = self.get_cursor()
-        if not path:
-            return
-        model = self.get_model()
-        if not model:
-            return
-        action = model[path][ViewSwitcherList.COL_ACTION]
-        channel = model[path][ViewSwitcherList.COL_CHANNEL]
-        if action in self._permanent_views:
-            self._previous_permanent_view = path
-        self.selected_channel_name = model[path][ViewSwitcherList.COL_NAME]
+
+        sel = item.get_selection()
+        # this handles the case where the initial expand or collapse
+        # of a node triggers a cursor change but does not update selection
+        if not sel.get_selected()[1]:
+            self._active_ref.select()
+            return
+
+        if self._active_ref and self._active_ref.item != item:
+            sel = self._active_ref.item.get_selection()
+            sel.unselect_all()
+
+
+        path = item.get_path()
+        view_ref = ViewReference(item, path)
+        self._active_ref = view_ref
+
+        model = item.get_model()
+        action = model[path][ViewItem.COL_ACTION]
+        channel = model[path][ViewItem.COL_CHANNEL]
+        self.selected_channel_name = model[path][ViewItem.COL_NAME]
+
+        if item.root_action_id in PERMANENT_VIEWS:
+            self._last_permaview = view_ref
+
         if channel:
             self.selected_channel_installed_only = channel.installed_only
 
-        view_page = action
-        self.emit("view-changed", view_page, channel)
-        
-    def on_key_release_event(self, widget, event):
-        # Get the toplevel node of the currently selected row
-        toplevel = self.get_toplevel_node(self.get_cursor())
-        if toplevel is None:
-            return
-        toplevel_path = (toplevel,)
-
-        # Expand the toplevel node if the right arrow key is clicked
-        if event.keyval == gtk.keysyms.Right:
-            if not self.row_expanded(toplevel_path):
-                self.expand_row(toplevel_path, False)
-        # Collapse the toplevel node if the left arrow key is clicked
-        elif event.keyval == gtk.keysyms.Left:
-            if self.row_expanded(toplevel_path):
-                self.collapse_row(toplevel_path)
+        gobject.idle_add(self._idle_emit_view_changed, action, channel)
+        return
+
+    #def _on_row_deleted(self, widget, deleted_path):
+        #(path, column) = widget.get_cursor()
+        #if path is None:
+            #LOG.debug("path from _on_row_deleted no longer available")
+            ## The view that was selected has been deleted, switch back to
+            ## the previously selected permanent view.
+            #if self._previous_permanent_view is not None:
+                #self.set_view_ref(self._last_permaview)
+
+    def _on_transactions_changed(self, backend, total_transactions):
+        self._update_pending_item(total_transactions)
+        return
+
+    def _on_transaction_finished(self, backend, result):
+        if result.success:
+            self._update_channel_list_installed_view()
+            self._restore_previous_selection()
+        return
+
+    def _on_treeview_row_expanded(self, item, iter, path):
+        return
+
+    def _on_treeview_row_collapsed(self, item, iter, path):
+        if self._active_ref and item == self._active_ref.item:
+            self._active_ref = ViewReference(item, path)
+            self._active_ref.select()
+        return
+
+    def _on_treeview_row_activated(self, item, path, col):
+        item.try_expander_toggle()
+        return
+
+    def _on_channels_changed(self, backend, res):
+        LOG.debug("on_channels_changed %s" % res)
+        self._block_set_cursor_signals = True
+        if res:
+            self.db.open()
+            self._update_channel_list()
+
+        self._block_set_cursor_signals = False
+        return
+
+    def _keynav_up(self, item, model, sel, siter):
+        niter = self._up_iter(model, siter)
+
+        # do a normal up down keynav within an item
+        if niter:
+            sel.select_iter(niter)
+            item.set_cursor(model.get_path(niter))
+            item.grab_focus()
+
+        # we have reached the end of the road within an item,
+        # so we need to unselect current item and jump to a next item
+        # and select the appropriate TreeView path
+        else:
+            next_item = self.item_prev(item)
+            if not next_item: return
+
+            sel.unselect_iter(siter)
+
+            if next_item.is_expanded():
+                next_item.select_tail()
+            else:
+                next_item.select_root()
+
+            self._active_ref = ViewReference(next_item,
+                                             next_item.get_path())
+        return
+
+    def _keynav_down(self, item, model, sel, siter):
+        niter = model.iter_next(siter)
+        # do a normal up down keynav within an item
+        if niter:
+            sel.select_iter(niter)
+            item.set_cursor(model.get_path(niter))
+            item.grab_focus()
+
+        # there is a child row we can jump to
+        elif model.iter_has_child(siter) and item.is_expanded():
+            niter = model.iter_nth_child(siter, 0)
+            sel.select_iter(niter)
+            item.set_cursor(model.get_path(niter))
+            item.grab_focus()
+
+        # we have reached the end of the road within an item,
+        # so we need to unselect current item and jump to a next item
+        # and select the appropriate TreeView path
+        else:
+            next_item = self.item_next(item)
+            if not next_item: return
+
+            sel.unselect_iter(siter)
+
+            next_item.select_root()
+            self._active_item = ViewReference(next_item,
+                                              next_item.get_path())
+        return
+
+    def _idle_emit_view_changed(self, action, channel):
+        self.emit("view-changed", action, channel)
         return False
-        
-    def get_view(self):
-        """return the current activated view number or None if no
-           view is activated (this can happen when a pending view 
-           disappeared). Views are:
-           
-           VIEW_PAGE_AVAILABLE
-           VIEW_PAGE_CHANNEL
-           VIEW_PAGE_INSTALLED
-           VIEW_PAGE_HISTORY
-           VIEW_PAGE_PENDING
-        """
-        (path, column) = self.get_cursor()
-        if not path:
-            return None
-        return path[0]
-    
-    def get_toplevel_node(self, cursor):
-        """Returns the toplevel node of a selected row"""
-        (path, column) = cursor
-        if not path:
-            return None
-        return path[0]
-
-    def set_view(self, view_page):
-        notebook_page_id = self.view_manager.get_notebook_page_from_view_id(view_page)
-        # FIXME: This isn't really the cleanest way to do this, but afaics it is the only way to achieve this with the current view_manager
-        if view_page == 'view-page-available':
-            self.set_cursor((notebook_page_id,))
-        else:
-            self.set_cursor((notebook_page_id - 1,))
-        self.emit("view-changed", view_page, None)
-
-    def on_motion_notify_event(self, widget, event):
-        #print "on_motion_notify_event: ", event
-        path = self.get_path_at_pos(int(event.x), int(event.y))
-        if path is None:
-            self.window.set_cursor(None)
-        else:
-            self.window.set_cursor(self.cursor_hand)
-            
-    def expand_available_node(self):
-        """ expand the available pane node in the viewswitcher pane """
-        model = self.get_model()
-        if model:
-            self.expand_row(model.get_path(model.available_iter), False)
-            
-    def is_available_node_expanded(self):
-        """ return True if the available pane node in the viewswitcher pane is expanded """
-        model = self.get_model()
-        expanded = False
-        if model:
-            expanded = self.row_expanded(model.get_path(model.available_iter))
-        return expanded
-        
-    def expand_installed_node(self):
-        """ expand the installed pane node in the viewswitcher pane """
-        model = self.get_model()
-        if model:
-            self.expand_row(model.get_path(model.installed_iter), False)
-            
-    def is_installed_node_expanded(self):
-        """ return True if the installed pane node in the viewswitcher pane is expanded """
-        model = self.get_model()
-        expanded = False
-        if model:
-            expanded = self.row_expanded(model.get_path(model.installed_iter))
-        return expanded
-        
-    def select_channel_node(self, channel_name, installed_only):
-        """ select the specified channel node """
-        model = self.get_model()
-        if model:
-            channel_iter_to_select = model.get_channel_iter_for_name(channel_name,
-                                                                     installed_only)
-            if channel_iter_to_select:
-                self.set_cursor(model.get_path(channel_iter_to_select))
-
-    def _on_channels_refreshed(self, model):
-        """
-        when channels are refreshed, the viewswitcher channel is unselected so
-        we need to reselect it
-        """
-        model = self.get_model()
-        if model:
-            channel_iter_to_select = model.get_channel_iter_for_name(
-                self.selected_channel_name,
-                self.selected_channel_installed_only)
-            if channel_iter_to_select:
-                self._block_set_cursor_signals = True
-                self.set_cursor(model.get_path(channel_iter_to_select))
-                self._block_set_cursor_signals = False
-
-    def _on_row_deleted(self, widget, deleted_path):
-        (path, column) = self.get_cursor()
-        if path is None:
-            LOG.debug("path from _on_row_deleted no longer available")
-            # The view that was selected has been deleted, switch back to
-            # the previously selected permanent view.
-            if self._previous_permanent_view is not None:
-                self.set_cursor(self._previous_permanent_view)
-
-class ViewSwitcherList(gtk.TreeStore):
-    
-    # columns
-    (COL_ICON,
-     COL_NAME,
-     COL_ACTION,
-     COL_CHANNEL,
-     ) = range(4)
-
-    ICON_SIZE = 24
-
-    ANIMATION_PATH = "/usr/share/icons/hicolor/24x24/status/softwarecenter-progress.png"
-
-    __gsignals__ = {'channels-refreshed':(gobject.SIGNAL_RUN_FIRST,
-                                          gobject.TYPE_NONE,
-                                          ())}
-
-
-    def __init__(self, view_manager, datadir, db, cache, icons):
-        gtk.TreeStore.__init__(self, 
-                               AnimatedImage, 
-                               str, 
-                               gobject.TYPE_PYOBJECT, 
-                               gobject.TYPE_PYOBJECT,
-                               ) # must match columns above
-        self.view_manager = view_manager
-        self.icons = icons
-        self.datadir = datadir
-        self.backend = get_install_backend()
-        self.backend.connect("transactions-changed", self.on_transactions_changed)
-        self.backend.connect("transaction-finished", self.on_transaction_finished)
-        self.db = db
-        self.cache = cache
-        self.distro = get_distro()
-        # pending transactions
-        self._pending = 0
-        # setup the normal stuff
-
-        # first, the availablepane items
-        available_icon = self._get_icon("softwarecenter")
-        self.available_iter = self.append(None, [available_icon, _("Get Software"), VIEW_PAGE_AVAILABLE, None])
-
-        # the installedpane items
-        icon = AnimatedImage(self.icons.load_icon("computer", self.ICON_SIZE, 0))
-        self.installed_iter = self.append(None, [icon, _("Installed Software"), VIEW_PAGE_INSTALLED, None])
-        
-        # the channelpane 
-        self.channel_manager = ChannelsManager(db, icons)
-        # do initial channel list update
-        self._update_channel_list()
-        
-        # the historypane item
-        icon = self._get_icon("clock")
-        history_iter = self.append(None, [icon, _("History"), VIEW_PAGE_HISTORY, None])
-        icon = AnimatedImage(None)
-        self.append(None, [icon, "<span size='1'> </span>", VIEW_PAGE_SEPARATOR_1, None])
-        
-        # the progress pane is build on demand
-
-        # emit a transactions-changed signal to ensure that we display any
-        # pending transactions
-        self.backend.emit("transactions-changed", self.backend.pending_transactions)
-
-    def on_transactions_changed(self, backend, total_transactions):
+
+    def _update_pending_item(self, total_transactions):
         LOG.debug("on_transactions_changed '%s'" % total_transactions)
         pending = len(total_transactions)
+        pending_item = self.get_item_by_id(VIEW_PAGE_PENDING)
         if pending > 0:
-            for row in self:
-                if row[self.COL_ACTION] == VIEW_PAGE_PENDING:
-                    row[self.COL_NAME] = _("In Progress (%i)") % pending
-                    break
-            else:
-                icon = AnimatedImage(self.ANIMATION_PATH)
-                icon.start()
-                self.append(None, [icon, _("In Progress (%i)") % pending, 
-                             VIEW_PAGE_PENDING, None])
+            pending_item.set_bubble_text(pending)
+            pending_item.show()
+            if not pending_item.root_icon.is_playing():
+                pending_item.root_icon.start() # start the icon animating
         else:
-            for (i, row) in enumerate(self):
-                if row[self.COL_ACTION] == VIEW_PAGE_PENDING:
-                    del self[(i,)]
-                    
-    def on_transaction_finished(self, backend, result):
-        if result.success:
-            self._update_channel_list_installed_view()
-            self.emit("channels-refreshed")
+            if self._active_ref and self._active_ref.item == pending_item:
+                self.set_view_ref(self._last_permaview)
+
+            pending_item.set_bubble_text(0)
+            pending_item.hide()
+            pending_item.root_icon.stop()  # stop the icon animating
+        return
 
     def get_channel_iter_for_name(self, channel_name, installed_only):
         """ get the liststore iterator for the given name, consider
@@ -361,48 +604,39 @@
         """ 
         LOG.debug("get_channel_iter_for_name %s %s" % (channel_name,
                                                        installed_only))
-        def _get_iter_for_channel_name(it):
+        def _get_iter_for_channel_name(it, item):
             """ internal helper """
             while it:
-                if self.get_value(it, self.COL_NAME) == channel_name:
+                if item.get_value(it, self.COL_NAME) == channel_name:
                     return it
-                it = self.iter_next(it)
+                it = item.iter_next(it)
             return None
 
         # check root iter first
-        channel_iter_for_name = _get_iter_for_channel_name(self.get_iter_root())
+        item = self.get_item_by_id(VIEW_PAGE_AVAILABLE)
+        channel_iter_for_name = _get_iter_for_channel_name(item.get_iter_root(), item)
         if channel_iter_for_name:
             LOG.debug("found '%s' on root level" % channel_name)
             return channel_iter_for_name
 
         # check children
         if installed_only:
-            parent_iter = self.installed_iter
+            item = self.get_item_by_id(VIEW_PAGE_INSTALLED)
+            parent_iter = item.root_iter
         else:
-            parent_iter = self.available_iter
-        LOG.debug("looking at path '%s'" % self.get_path(parent_iter))
-        child = self.iter_children(parent_iter)
+            parent_iter = item.root_iter
+
+        LOG.debug("looking at path '%s'" % self.get_path(parent_iter), item)
+        child = item.iter_children(parent_iter)
         channel_iter_for_name = _get_iter_for_channel_name(child)
         return channel_iter_for_name
-                    
-    def _get_icon(self, icon_name):
-        if self.icons.lookup_icon(icon_name, self.ICON_SIZE, 0):
-            icon = AnimatedImage(self.icons.load_icon(icon_name, self.ICON_SIZE, 0))
-        else:
-            # icon not present in theme, probably because running uninstalled
-            icon = AnimatedImage(self.icons.load_icon("gtk-missing-image", 
-                                                      self.ICON_SIZE, 0))
-        return icon
 
     def _update_channel_list(self):
         self._update_channel_list_available_view()
         self._update_channel_list_installed_view()
-        self.emit("channels-refreshed")
-        
-    # FIXME: this way of updating is really not ideal because it
-    #        will trigger set_cursor signals and that causes the
-    #        UI to behave funny if the user is in a channel view
-    #        and the backend sends a channels-changed signal
+        self._restore_previous_selection()
+        return
+
     def _update_channel_list_available_view(self):
         # check what needs to be cleared. we need to append first, kill
         # afterward because otherwise a row without children is collapsed
@@ -411,29 +645,34 @@
         # normally GtkTreeIters have a limited life-cycle and are no
         # longer valid after the model changed, fortunately with the
         # gtk.TreeStore (that we use) they are persisent
-        child = self.iter_children(self.available_iter)
+        a = self.get_item_by_id(VIEW_PAGE_AVAILABLE)
+        child = a.store.iter_children(a.root_iter)
         iters_to_kill = set()
         while child:
             iters_to_kill.add(child)
-            child = self.iter_next(child)
+            child = a.store.iter_next(child)
+
         # iterate the channels and add as subnodes of the available node
         for channel in self.channel_manager.channels:
-            self.append(self.available_iter, [
-                        channel.icon,
-                        channel.display_name,
-                        VIEW_PAGE_CHANNEL,
-                        channel])
+            a.append_subitem(channel.display_name,
+                             channel.icon,
+                             VIEW_PAGE_CHANNEL,
+                             channel)
+
         # delete the old ones
         for child in iters_to_kill:
-            self.remove(child)
+            a.store.remove(child)
+        return
     
     def _update_channel_list_installed_view(self):
         # see comments for _update_channel_list_available_view() method above
-        child = self.iter_children(self.installed_iter)
+        i = self.get_item_by_id(VIEW_PAGE_INSTALLED)
+        child = i.store.iter_children(i.root_iter)
         iters_to_kill = set()
         while child:
             iters_to_kill.add(child)
-            child = self.iter_next(child)
+            child = i.store.iter_next(child)
+
         # iterate the channels and add as subnodes of the installed node
         for channel in self.channel_manager.channels_installed_only:
             # check for no installed items for each channel and do not
@@ -453,15 +692,193 @@
                         self.cache[pkgname].is_installed):
                         add_channel_item = True
                         break
+
             if add_channel_item:
-                self.append(self.installed_iter, [
-                            channel.icon,
-                            channel.display_name,
-                            VIEW_PAGE_CHANNEL,
-                            channel])
+                i.append_subitem(channel.display_name,
+                                 channel.icon,
+                                 VIEW_PAGE_CHANNEL,
+                                 channel)
+
         # delete the old ones
         for child in iters_to_kill:
-            self.remove(child)
+            i.store.remove(child)
+        return
+
+    def _restore_previous_selection(self):
+        """
+        when channels are refreshed, the viewswitcher channel is unselected so
+        we need to reselect it
+        """
+        if not self._active_ref: return
+        ref = self._active_ref
+        self._active_ref = None
+        self.set_view_ref(ref)
+        return
+
+    def _get_icon(self, icon_name):
+        if self.icons.lookup_icon(icon_name, self.ICON_SIZE, 0):
+            path = self.icons.lookup_icon(icon_name, self.ICON_SIZE, 0).get_filename()
+            pb = gtk.gdk.pixbuf_new_from_file_at_size(path,
+                                                      self.ICON_SIZE,
+                                                      self.ICON_SIZE)
+            icon = AnimatedImage(pb)
+        else:
+            # icon not present in theme, probably because running uninstalled
+            icon = AnimatedImage(self.icons.load_icon("gtk-missing-image", 
+                                                      self.ICON_SIZE, 0))
+        return icon
+
+    def _up_iter(self, model, siter):
+        path = model.get_path(siter)
+        if path[-1]:    # not == 0
+            path = (0, path[-1]-1)
+            niter = model.get_iter(path)
+        elif len(path) > 1:
+            niter = model.get_iter((0,))
+        else:
+            niter = None
+        return niter
+
+    def _item_connect_signals(self, item):
+        item.connect('key-press-event', self._on_item_keynav)
+#        item.connect('focus-out-event', self._on_focus_out)
+        item.connect("cursor-changed", self._on_cursor_changed)
+        item.connect("row-expanded", self._on_treeview_row_expanded)
+        item.connect("row-collapsed", self._on_treeview_row_collapsed)
+        item.connect("row-activated", self._on_treeview_row_activated)
+
+        #item.get_model().connect("row-deleted", self._on_row_deleted)
+        return
+
+    def set_item_padding(self, view_id, padding):
+        item = self.get_item_by_id(view_id)
+        self.vbox.set_child_packing(item, False, False, padding, gtk.PACK_START)
+        return
+
+    def get_item_by_id(self, id):
+        return self._id_to_item[id]
+
+    def get_view(self):
+        """return the current activated view ViewReference"""
+        return self._active_ref
+
+    def set_view(self, view_id, path=(0,)):
+        item = self.get_item_by_id(view_id)
+        view_ref = ViewReference(item, path)
+
+        if self._active_ref and item == self._active_ref.item: return
+
+        # unselect prev active item
+        if self._active_ref:
+            sel = self._active_ref.item.get_selection()
+            sel.unselect_all()
+
+        view_ref.select()
+        self._active_ref = view_ref
+        self.emit("view-changed", item.root_action_id, None)
+        return
+
+    # new api
+    def set_view_ref(self, view_ref):
+        if self._active_ref and view_ref.item == self._active_ref.item: return
+
+        # unselect prev active item
+        if self._active_ref:
+            sel = self._active_ref.item.get_selection()
+            sel.unselect_all()
+
+        view_ref.select()
+        self._active_ref = view_ref
+        self.emit("view-changed", view_ref.item.root_action_id, None)
+        return
+
+    def build_primary_views(self):
+        """ pack viewmanager registered views into viewswitcher """
+
+        fallback_icon = self._get_icon("softwarecenter")
+        for view_id, view_widget in self.view_manager.primary_views():
+            display_name = view_widget.pane_name or view_id
+            display_icon = view_widget.pane_icon or fallback_icon
+            item = ViewItem(display_name,
+                            display_icon,
+                            view_id)
+
+            self._item_connect_signals(item)
+            self._id_to_item[view_id] = item
+            self.pack_start(item, False)
+
+        available = self.get_item_by_id(VIEW_PAGE_AVAILABLE)
+        available.set_bubble_text('20 New!')
+
+        self.set_focus_chain((available,))
+        available.connect('focus-in-event', self._on_focus_in)
+
+        # do initial channel list update
+        self._update_channel_list()
+
+        self.show_all()
+        self.connect('realize', self._on_realize)
+        return
+
+    def item_next(self, item):
+        items = self.vbox.get_children()
+        for i, it in enumerate(items):
+            if it.root_name == item.root_name:
+                break
+
+        if i+1 < len(items):
+            it = items[i+1]
+            if it.get_property('visible'):
+                return it
+        return None
+
+    def item_prev(self, item):
+        items = self.vbox.get_children()
+        for i, it in enumerate(items):
+            if it.root_name == item.root_name:
+                break
+
+        if i-1 >= 0:
+            it = items[i-1]
+            if it.get_property('visible'):
+                return it
+        return None
+
+    def pack_start(self, *args, **kwargs):
+        gtk.VBox.pack_start(self.vbox, *args, **kwargs)
+        return
+
+    def pack_end(self, *args, **kwargs):
+        gtk.VBox.pack_end(self.vbox, *args, **kwargs)
+        return
+
+    def expand_available_node(self):
+        """ expand the available pane node in the viewswitcher pane """
+        a = self.get_item_by_id(VIEW_PAGE_AVAILABLE)
+        a.expand_row((0,), True)
+        return
+
+    def is_available_node_expanded(self):
+        """ return True if the available pane node in the viewswitcher pane is expanded """
+        a = self.get_item_by_id(VIEW_PAGE_AVAILABLE)
+        return a.is_expanded()
+
+    def expand_installed_node(self):
+        """ expand the installed pane node in the viewswitcher pane """
+        i = self.get_item_by_id(VIEW_PAGE_INSTALLED)
+        i.expand_row((0,), True)
+        return
+
+    def is_installed_node_expanded(self):
+        """ return True if the installed pane node in the viewswitcher pane is expanded """
+        i = self.get_item_by_id(VIEW_PAGE_INSTALLED)
+        return i.is_expanded()
+
+    # treeview stubination
+    def set_cursor(self, *args, **kwargs):
+        logging.warn('ViewSwitcher.set_cursor: Please use set_view instead.')
+        return
+
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)

=== modified file 'softwarecenter/view/widgets/animatedimage.py'
--- softwarecenter/view/widgets/animatedimage.py	2010-08-26 13:44:44 +0000
+++ softwarecenter/view/widgets/animatedimage.py	2010-11-26 21:34:16 +0000
@@ -41,6 +41,7 @@
         """
         super(AnimatedImage, self).__init__()
         self._progressN = 0
+        self._run = False
         if icon is None:
             icon = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 1, 1)
             icon.fill(0)
@@ -75,7 +76,7 @@
             self.connect("show", self.start)
             self.connect("hide", self.stop)
         else:
-            raise IOError, "need a str, list or a pixbuf"
+            raise IOError, "need a str, list or a pixbuf, got:", icon
 
     def start(self, w=None):
         source_id = gobject.timeout_add(int(1000/self.FPS), 
@@ -98,6 +99,9 @@
         self.set_from_pixbuf(self.get_current_pixbuf())
         return self._run
 
+    def is_playing(self):
+        return self._run
+
 class CellRendererAnimatedImage(gtk.CellRendererPixbuf):
 
     __gproperties__  = { 

=== modified file 'softwarecenter/view/widgets/mkit.py'
--- softwarecenter/view/widgets/mkit.py	2010-10-03 05:17:08 +0000
+++ softwarecenter/view/widgets/mkit.py	2010-11-26 21:34:16 +0000
@@ -904,7 +904,6 @@
             widest_w = max(widest_w, btn.calc_width())
 
         # determine number of columns to display
-#        width -= 100    # fudge number
         n_columns = width / widest_w
         n_columns = (width - n_columns*self.column_hbox.get_spacing()) / widest_w
 
@@ -1152,6 +1151,8 @@
         else:
             col = self.style.dark[gtk.STATE_NORMAL].to_string()
 
+        text = gobject.markup_escape_text(self.label.get_text())
+
         if self._use_underline:
             self.label.set_markup('<span color="%s"><u>%s</u></span>' % (col, self._markup))
         else: