Spritz: remove categories view tab, useless now

spritz/src/packages.py

@@ -32,9 +32,6 @@ class EntropyPackages:
         self.filterCallback = None
         self._packages = {}
         self.pkgCache = {}
-        self.currentCategory = None
-        self._categoryPackages = {}
-        self.categories = set()
         self.unmaskingPackages = set()
         self.selected_treeview_item = None
         self.selected_advisory_item = None
@@ -47,7 +44,6 @@ class EntropyPackages:
         self._packages.clear()
         self.selected_treeview_item = None
         self.selected_advisory_item = None
-        self._categoryPackages.clear()
         self.unmaskingPackages.clear()
 
     def clearPackagesSingle(self, mask):
@@ -55,7 +51,6 @@ class EntropyPackages:
             del self._packages[mask]
         self.selected_treeview_item = None
         self.selected_advisory_item = None
-        self._categoryPackages.clear()
         self.unmaskingPackages.clear()
 
     def clearCache(self):
@@ -71,32 +66,6 @@ class EntropyPackages:
             return
         self._packages[mask] = self._getPackages(mask)
 
-    def setCategoryPackages(self,pkgdict = {}):
-        self._categoryPackages = pkgdict
-
-    def getPackagesByCategory(self,cat=None):
-        if not cat: cat =  self.currentCategory
-        else: self.currentCategory = cat
-        if not self._categoryPackages.has_key(cat): self.populateCategory(cat)
-        return self._categoryPackages[cat]
-
-    def populateCategory(self, category):
-
-        self.getAllPackages()
-        catsdata = self.Entropy.list_repo_packages_in_category(category)
-        catsdata.extend([(x,0) for x in self.Entropy.list_installed_packages_in_category(category)])
-        pkgsdata = []
-        def mymf(pkgdata):
-            try:
-                yp, new = self.getPackageItem(pkgdata,True)
-            except RepositoryError:
-                return 0
-            return yp
-        self._categoryPackages[category] = [x for x in map(mymf,catsdata) if type(x) != int]
-
-    def populateCategories(self):
-        self.categories = self.Entropy.list_repo_categories()
-
     def getPackages(self,flt):
         if flt == 'all': return self.getAllPackages()
         else: return self.doFiltering(self.getRawPackages(flt))
@@ -416,9 +385,3 @@ class EntropyPackages:
 
         return matched_data
 
-    def getCategories(self):
-        catlist = []
-        for cat in self.categories:
-            catlist.append(cat)
-        catlist.sort()
-        return catlist

spritz/src/spritz.py

@@ -575,8 +575,6 @@ class SpritzApplicationEventsMixin:
             self.populateFilesUpdate()
         elif page == "glsa":
             self.populateAdvisories(None,'affected')
-        elif page == "group":
-            self.populateCategories()
         self.setNotebookPage(const.PAGES[page])
 
     def on_queueReviewAndInstall_clicked(self, widget):
@@ -798,15 +796,6 @@ class SpritzApplicationEventsMixin:
         self.on_search_clicked(None)
         self.ui.pkgClr.hide()
 
-    def on_comps_cursor_changed(self, widget):
-        self.setBusy()
-        """ Handle selection of row in Comps Category  view  """
-        ( model, iterator ) = widget.get_selection().get_selected()
-        if model != None and iterator != None:
-            myid = model.get_value( iterator, 0 )
-            self.populateCategoryPackages(myid)
-        self.unsetBusy()
-
     def on_FileQuit( self, widget ):
         self.show_wait_window()
         self.quit()
@@ -1188,11 +1177,6 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
         self.advisoriesView = EntropyAdvisoriesView(self.ui.advisoriesView,
             self.ui, self.etpbase)
         self.queue.connect_objects(self.Equo, self.etpbase, self.pkgView, self.ui)
-        #self.catView = SpritzCategoryView(self.ui.tvCategory)
-        self.catsView = CategoriesView(self.ui.tvComps,self.queueView)
-        self.catsView.etpbase = self.etpbase
-        self.catPackages = EntropyPackageView(self.ui.tvCatPackages,
-            self.queueView, self.ui, self.etpbase, self.ui.main, self)
         self.repoView = EntropyRepoView(self.ui.viewRepo, self.ui, self)
         self.repoMirrorsView = EntropyRepositoryMirrorsView(self.addrepo_ui.mirrorsView)
         # Left Side Toolbar
@@ -1293,7 +1277,6 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
         self.skipMirrorNow = False
         self.abortQueueNow = False
         self.doProgress = False
-        self.categoryOn = False
         self.isWorking = False
         self.lastPkgPB = "updates"
         self.Equo.connect_to_gui(self)
@@ -1412,8 +1395,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
 
     def setupPageButtons(self):
         # Setup Vertical Toolbar
-        self.createButton( _( "Packages" ), "button-packages.png", 'packages',True )
-        self.createButton( _( "Package Categories" ), "button-group.png", 'group')
+        self.createButton( _( "Packages" ), "button-packages.png", 'packages', True )
         self.createButton( _( "Security Advisories" ), "button-glsa.png", 'glsa' )
         self.createButton( _( "Repository Selection" ), "button-repo.png", 'repos' )
         self.createButton( _( "Configuration Files" ), "button-conf.png", 'filesconf' )
@@ -2294,16 +2276,6 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
         self.disable_ugc = False
         return state
 
-    def populateCategories(self):
-        self.setBusy()
-        self.etpbase.populateCategories()
-        self.catsView.populate(self.etpbase.getCategories())
-        self.unsetBusy()
-
-    def populateCategoryPackages(self, cat):
-        pkgs = self.etpbase.getPackagesByCategory(cat)
-        self.catPackages.populate(pkgs,self.ui.tvCatPackages)
-
     def uiLock(self, lock):
         self.ui.content.set_sensitive(not lock)
         self.ui.menubar.set_sensitive(not lock)
@@ -2423,8 +2395,6 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
         self.addrepo_ui.repodbEntry.set_text(repodata['plain_database'])
 
     def resetSpritzCacheStatus(self):
-        self.catPackages.clear()
-        self.catsView.clear()
         self.pkgView.clear()
         self.etpbase.clearPackages()
         self.etpbase.clearCache()

spritz/src/spritz_setup.py

@@ -68,29 +68,20 @@ class const:
     # ads
     plain_ad_pix = PIXMAPS_PATH+'/ad.png'
 
-    # package categories
-    PACKAGE_CATEGORIES = [
-        "None",
-        "Groups",
-        "RPM Groups",
-        "Age"]
-
     DAY_IN_SECONDS = 86400
     # Page -> Notebook page numbers
     PAGE_REPOS = 0
     PAGE_PKG = 1
     PAGE_OUTPUT = 2
-    PAGE_GROUP = 3
-    PAGE_QUEUE = 4
-    PAGE_FILESCONF = 5
-    PAGE_GLSA = 6
-    PAGE_PREFERENCES = 7
+    PAGE_QUEUE = 3
+    PAGE_FILESCONF = 4
+    PAGE_GLSA = 5
+    PAGE_PREFERENCES = 6
     PAGES = {
        'packages'  : PAGE_PKG,
        'repos'     : PAGE_REPOS,
        'output'    : PAGE_OUTPUT,
        'queue'     : PAGE_QUEUE,
-       'group'     : PAGE_GROUP,
        'filesconf' : PAGE_FILESCONF,
        'glsa'      : PAGE_GLSA,
        'preferences': PAGE_PREFERENCES

spritz/src/views.py

@@ -1651,41 +1651,6 @@ class EntropyAdvisoriesView:
         self.view.set_property('enable-search',True)
 
 
-class CategoriesView:
-
-    def __init__( self, treeview, qview):
-
-        self.view = treeview
-        self.model = self.setup_view()
-        self.queue = qview.queue
-        self.queueView = qview
-        self.etpbase = None # it will se set later
-        self.currentCategory = None
-        self.icon_theme = gtk.icon_theme_get_default()
-
-
-    def setup_view( self ):
-        """ Setup Group View  """
-        model = gtk.ListStore(gobject.TYPE_STRING)
-        self.view.set_model( model )
-
-        column = gtk.TreeViewColumn(None, None)
-        category = gtk.CellRendererText()
-        column.pack_start(category, False)
-        column.add_attribute(category, 'markup', 0)
-        self.view.append_column( column )
-        self.view.set_headers_visible(False)
-
-        return model
-
-    def populate(self,data):
-        self.model.clear()
-        for cat in data:
-            self.model.append([cat])
-
-    def clear(self):
-        self.model.clear()
-
 class EntropyRepoView:
     """ 
     This class controls the repo TreeView