diff --git a/spritz/gfx/button-group.png b/spritz/gfx/button-group.png deleted file mode 100644 index e83e1be8c..000000000 Binary files a/spritz/gfx/button-group.png and /dev/null differ diff --git a/spritz/src/packages.py b/spritz/src/packages.py index c2bc092f1..f64926dd7 100644 --- a/spritz/src/packages.py +++ b/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 diff --git a/spritz/src/spritz.glade b/spritz/src/spritz.glade index e3de9ba65..a3aa20baf 100644 --- a/spritz/src/spritz.glade +++ b/spritz/src/spritz.glade @@ -1555,120 +1555,6 @@ False - - - True - 6 - 6 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - - - True - - - True - - - True - - - True - True - 145 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - - - - - - False - True - - - - - True - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - - - True - - - True - True - True - True - - - - - - - - - - - - - True - True - - - - - - - - - - - - - - - - - 3 - False - - - - - True - 3 - - - tab - 3 - False - - True @@ -1858,18 +1744,17 @@ - 4 - False + 3 - + True - 4 + 3 tab - 4 + 3 False @@ -2151,17 +2036,17 @@ - 5 + 4 - + True - 5 + 4 tab - 5 + 4 False @@ -2561,18 +2446,17 @@ - 6 + 5 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 7 + 5 tab - 6 + 5 False @@ -4946,18 +4830,18 @@ Install+Removal - 7 + 6 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8 + 6 tab - 7 + 6 False @@ -5082,14 +4966,56 @@ Install+Removal 3 2 - + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 150 + + + 1 + 2 + 2 + 3 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 150 + + + 1 + 2 + 1 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 150 + + + 1 + 2 + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 10 - Your Full Name + What you were doing + 2 + 3 GTK_FILL @@ -5108,59 +5034,17 @@ Install+Removal - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 10 - What you were doing + Your Full Name - 2 - 3 GTK_FILL - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 150 - - - 1 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 150 - - - 1 - 2 - 1 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 150 - - - 1 - 2 - 2 - 3 - - 3 @@ -5621,6 +5505,177 @@ Install+Removal 4 10 3 + + + True + True + + + 3 + 4 + 4 + 5 + + + + + + True + 0 + Secure Services Port + + + 2 + 3 + 4 + 5 + GTK_FILL + + + + + + True + 0 + Services Port + + + 4 + 5 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 4 + 5 + + + + + + True + bz2 +gz + + + 3 + 4 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + 0 + Compression + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + + True + 0 + Identifier + + + GTK_FILL + + + + + + True + 0 + Description + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Mirrors + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + URI + + + 3 + 4 + GTK_FILL + + + + + + True + True + + + 1 + 4 + + + + + + True + True + + + 1 + 4 + 1 + 2 + + + + + + True + True + + + 1 + 2 + 3 + 4 + + + 120 @@ -5758,177 +5813,6 @@ Install+Removal GTK_FILL - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - True - - - 1 - 4 - 1 - 2 - - - - - - True - True - - - 1 - 4 - - - - - - True - 0 - URI - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - Mirrors - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - Description - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Identifier - - - GTK_FILL - - - - - - True - 0 - Compression - - - 2 - 3 - 3 - 4 - GTK_FILL - - - - - - True - bz2 -gz - - - 3 - 4 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - True - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - Services Port - - - 4 - 5 - GTK_FILL - - - - - - True - 0 - Secure Services Port - - - 2 - 3 - 4 - 5 - GTK_FILL - - - - - - True - True - - - 3 - 4 - 4 - 5 - - - @@ -6611,7 +6495,91 @@ gz 5 4 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 12 + 13 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Creation date + True + + + 12 + 13 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 11 + 12 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Install Size + True + + + 11 + 12 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 10 + 11 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Package Size + True + + + 10 + 11 + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 @@ -6622,234 +6590,21 @@ gz 1 2 - 1 - 2 + 9 + 10 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Website + MD5 Signature True - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Location - True - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Version - True - - - 2 - 3 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 2 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Slot - True - - - 3 - 4 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 3 - 4 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Kernel Tag - True - - - 4 - 5 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 4 - 5 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Revision - True - - - 5 - 6 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 5 - 6 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Branch - True - - - 6 - 7 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 6 - 7 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Entropy API - True - - - 7 - 8 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 7 - 8 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Download Path - True - - - 8 - 9 + 9 + 10 @@ -6870,20 +6625,233 @@ gz - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - MD5 Signature + Download Path True - 9 - 10 + 8 + 9 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 7 + 8 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Entropy API + True + + + 7 + 8 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 6 + 7 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Branch + True + + + 6 + 7 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 5 + 6 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Revision + True + + + 5 + 6 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 4 + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Kernel Tag + True + + + 4 + 5 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 3 + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Slot + True + + + 3 + 4 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Version + True + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Location + True + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Website + True + + + 1 + 2 + GTK_FILL + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 @@ -6894,92 +6862,8 @@ gz 1 2 - 9 - 10 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Package Size - True - - - 10 - 11 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 10 - 11 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Install Size - True - - - 11 - 12 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 11 - 12 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Creation date - True - - - 12 - 13 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - - - 1 - 2 - 12 - 13 + 1 + 2 @@ -7011,129 +6895,6 @@ gz 5 2 15 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - True - - - 1 - 2 - 2 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - CXXFLAGS - True - - - 2 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - True - - - 1 - 2 - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - CFLAGS - True - - - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - True - - - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - CHOST - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Masked - True - - - 3 - 4 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - True - True - - - 1 - 2 - 3 - 4 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - ChangeLog - True - - - 4 - 5 - - True @@ -7177,6 +6938,129 @@ gz 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + ChangeLog + True + + + 4 + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + True + + + 1 + 2 + 3 + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Masked + True + + + 3 + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + CHOST + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + True + + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + CFLAGS + True + + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + True + + + 1 + 2 + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + CXXFLAGS + True + + + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + True + True + + + 1 + 2 + 2 + 3 + + @@ -8623,15 +8507,23 @@ Please read them carefully and <b>make your choice</b>. 2 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 + 0 + Announced + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Revised True - 1 - 2 1 2 @@ -8649,27 +8541,19 @@ Please read them carefully and <b>make your choice</b>. - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Revised + 1 True + 1 + 2 1 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Announced - True - - @@ -8975,108 +8859,28 @@ Please read them carefully and <b>make your choice</b>. 2 3 - + True 0 - Title - - - - - True - 0 - this is the title + this is the size True 1 2 + 5 + 6 - + True 0 - Description + Size - 1 - 2 - - - - - True - 0 - this is the description - True - - - 1 - 2 - 1 - 2 - - - - - True - 0 - Author - - - 2 - 3 - - - - - True - 0 - this is the author - True - - - 1 - 2 - 2 - 3 - - - - - True - 0 - Date - - - 3 - 4 - - - - - True - 0 - this it the date - True - - - 1 - 2 - 3 - 4 - - - - - True - 0 - Keywords - - - 4 - 5 + 5 + 6 @@ -9094,30 +8898,110 @@ Please read them carefully and <b>make your choice</b>. - + True 0 - Size + Keywords - 5 - 6 + 4 + 5 - + True 0 - this is the size + this it the date True 1 2 - 5 - 6 + 3 + 4 + + + True + 0 + Date + + + 3 + 4 + + + + + True + 0 + this is the author + True + + + 1 + 2 + 2 + 3 + + + + + True + 0 + Author + + + 2 + 3 + + + + + True + 0 + this is the description + True + + + 1 + 2 + 1 + 2 + + + + + True + 0 + Description + + + 1 + 2 + + + + + True + 0 + this is the title + True + + + 1 + 2 + + + + + True + 0 + Title + + 3 @@ -9349,56 +9233,26 @@ Please read them carefully and <b>make your choice</b>. 2 3 - + True - 0 - Title - - - - - True - 0 - Description - - - 1 - 2 - - - - - True - True - 256 + 1 2 + 3 + 4 - - True - True - 500 - - - 1 - 2 - 1 - 2 - - - - + True 0 - Keywords (space separated) + Document type - 2 - 3 + 3 + 4 @@ -9415,28 +9269,58 @@ Please read them carefully and <b>make your choice</b>. - + True 0 - Document type + Keywords (space separated) - 3 - 4 + 2 + 3 - + True - + True + 500 1 2 - 3 - 4 + 1 + 2 + + + True + True + 256 + + + 1 + 2 + + + + + True + 0 + Description + + + 1 + 2 + + + + + True + 0 + Title + + 3 @@ -11248,85 +11132,16 @@ Please read them carefully and <b>make your choice</b>. - + True True - False + localhost 1 2 - 3 - 4 - - - True - True - root - - - 1 - 2 - 2 - 3 - - - - - True - 0 - Password - - - 3 - 4 - - - - - True - 0 - Username - - - 2 - 3 - - - - - True - True - 1027 1 65535 1 10 0 - 1 - - - 1 - 2 - 1 - 2 - - - - - True - 0 - Port - - - 1 - 2 - - - - - True - 0 - Hostname - - True @@ -11345,14 +11160,83 @@ Please read them carefully and <b>make your choice</b>. - + + True + 0 + Hostname + + + + + True + 0 + Port + + + 1 + 2 + + + + True True - localhost + 1027 1 65535 1 10 0 + 1 1 2 + 1 + 2 + + + + + True + 0 + Username + + + 2 + 3 + + + + + True + 0 + Password + + + 3 + 4 + + + + + True + True + root + + + 1 + 2 + 2 + 3 + + + + + True + True + False + + + 1 + 2 + 3 + 4 @@ -11536,261 +11420,19 @@ Please read them carefully and <b>make your choice</b>. 2 15 - + True 0 - Queue Id - - - - - True - 0 - Command name - - - 1 - 2 - - - - - True - 0 - Command description - - - 2 - 3 - - - - - True - 0 - Process result + True + PANGO_WRAP_CHAR + 1 + 2 11 12 - - - True - 0 - Remote stdout file - - - 10 - 11 - - - - - True - 0 - Errored at - - - 9 - 10 - - - - - True - 0 - Completed at - - - 8 - 9 - - - - - True - 0 - Processing at - - - 7 - 8 - - - - - True - 0 - Queued at - - - 6 - 7 - - - - - True - 0 - User / Group - - - 5 - 6 - - - - - True - 0 - Command arguments - - - 3 - 4 - - - - - True - 0 - Call - - - 4 - 5 - - - - - True - 0 - True - - - 1 - 2 - - - - - True - 0 - True - - - 1 - 2 - 1 - 2 - - - - - True - 0 - True - - - 1 - 2 - 2 - 3 - - - - - True - 0 - True - - - 1 - 2 - 3 - 4 - - - - - True - 0 - True - - - 1 - 2 - 4 - 5 - - - - - True - 0 - True - - - 1 - 2 - 5 - 6 - - - - - True - 0 - True - - - 1 - 2 - 6 - 7 - - - - - True - 0 - True - - - 1 - 2 - 7 - 8 - - - - - True - 0 - True - - - 1 - 2 - 8 - 9 - - - - - True - 0 - True - - - 1 - 2 - 9 - 10 - - True @@ -11805,19 +11447,261 @@ Please read them carefully and <b>make your choice</b>. - + True 0 True - PANGO_WRAP_CHAR 1 2 + 9 + 10 + + + + + True + 0 + True + + + 1 + 2 + 8 + 9 + + + + + True + 0 + True + + + 1 + 2 + 7 + 8 + + + + + True + 0 + True + + + 1 + 2 + 6 + 7 + + + + + True + 0 + True + + + 1 + 2 + 5 + 6 + + + + + True + 0 + True + + + 1 + 2 + 4 + 5 + + + + + True + 0 + True + + + 1 + 2 + 3 + 4 + + + + + True + 0 + True + + + 1 + 2 + 2 + 3 + + + + + True + 0 + True + + + 1 + 2 + 1 + 2 + + + + + True + 0 + True + + + 1 + 2 + + + + + True + 0 + Call + + + 4 + 5 + + + + + True + 0 + Command arguments + + + 3 + 4 + + + + + True + 0 + User / Group + + + 5 + 6 + + + + + True + 0 + Queued at + + + 6 + 7 + + + + + True + 0 + Processing at + + + 7 + 8 + + + + + True + 0 + Completed at + + + 8 + 9 + + + + + True + 0 + Errored at + + + 9 + 10 + + + + + True + 0 + Remote stdout file + + + 10 + 11 + + + + + True + 0 + Process result + + 11 12 + + + True + 0 + Command description + + + 2 + 3 + + + + + True + 0 + Command name + + + 1 + 2 + + + + + True + 0 + Queue Id + + @@ -11873,69 +11757,18 @@ Please read them carefully and <b>make your choice</b>. 2 8 - + True 0 - Pinboard Id - - - - - True - 0 - Date - - - 1 - 2 - - - - - True - 0 - Done - - - 2 - 3 - - - - - True - 0 - Note + True + 1 + 2 3 4 - - - True - 0 - True - - - 1 - 2 - - - - - True - 0 - True - - - 1 - 2 - 1 - 2 - - True @@ -11950,7 +11783,7 @@ Please read them carefully and <b>make your choice</b>. - + True 0 True @@ -11958,10 +11791,61 @@ Please read them carefully and <b>make your choice</b>. 1 2 + 1 + 2 + + + + + True + 0 + True + + + 1 + 2 + + + + + True + 0 + Note + + 3 4 + + + True + 0 + Done + + + 2 + 3 + + + + + True + 0 + Date + + + 1 + 2 + + + + + True + 0 + Pinboard Id + + False @@ -12055,83 +11939,6 @@ Please read them carefully and <b>make your choice</b>. 4 2 3 - - - True - 0 - Notice board Id - - - - - True - 0 - Date - - - 1 - 2 - - - - - True - 0 - Title - - - 2 - 3 - - - - - True - 0 - Link - - - 3 - 4 - - - - - True - 0 - True - - - 1 - 2 - - - - - True - 0 - True - - - 1 - 2 - 1 - 2 - - - - - True - 0 - True - - - 1 - 2 - 2 - 3 - - True @@ -12150,6 +11957,83 @@ Please read them carefully and <b>make your choice</b>. 4 + + + True + 0 + True + + + 1 + 2 + 2 + 3 + + + + + True + 0 + True + + + 1 + 2 + 1 + 2 + + + + + True + 0 + True + + + 1 + 2 + + + + + True + 0 + Link + + + 3 + 4 + + + + + True + 0 + Title + + + 2 + 3 + + + + + True + 0 + Date + + + 1 + 2 + + + + + True + 0 + Notice board Id + + False diff --git a/spritz/src/spritz.py b/spritz/src/spritz.py index 067bcee7c..b9e861a0d 100644 --- a/spritz/src/spritz.py +++ b/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() diff --git a/spritz/src/spritz_setup.py b/spritz/src/spritz_setup.py index e5d2774f7..1c83a89ca 100644 --- a/spritz/src/spritz_setup.py +++ b/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 diff --git a/spritz/src/views.py b/spritz/src/views.py index 1df061769..8768b9788 100644 --- a/spritz/src/views.py +++ b/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