diff --git a/spritz/src/misc.py b/spritz/src/misc.py index 9f6d4c6d9..577325ad0 100644 --- a/spritz/src/misc.py +++ b/spritz/src/misc.py @@ -24,7 +24,6 @@ class SpritzQueue: def __init__(self): self.packages = {} - self.groups = {} self.before = [] self.keyslotFilter = set() self._keyslotFilter = set() @@ -49,9 +48,6 @@ class SpritzQueue: self.packages['u'] = [] self.packages['r'] = [] self.packages['rr'] = [] - self.groups.clear() - self.groups['i'] = [] - self.groups['r'] = [] del self.before[:] self.keyslotFilter.clear() diff --git a/spritz/src/packages.py b/spritz/src/packages.py index 10a09ddff..d70e0c21e 100644 --- a/spritz/src/packages.py +++ b/spritz/src/packages.py @@ -38,6 +38,10 @@ class EntropyPackages: self.unmaskingPackages = set() self.selected_treeview_item = None self.selected_advisory_item = None + self.queue = None + + def connect_queue(self, queue): + self.queue = queue def clearPackages(self): self._packages.clear() @@ -167,6 +171,13 @@ class EntropyPackages: yp.color = SpritzConf.color_install yield yp + elif mask == "queued": + + for qkey in self.queue.packages: + for item in self.queue.packages[qkey]: + yield item + + elif mask == 'available': # Get the rest of the available packages. diff --git a/spritz/src/spritz.glade b/spritz/src/spritz.glade index 9241e7d97..d982071d6 100644 --- a/spritz/src/spritz.glade +++ b/spritz/src/spritz.glade @@ -550,7 +550,7 @@ True - 8 + 4 True @@ -734,23 +734,61 @@ 4 + + + 12 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + False + 5 + + + + + True + True + 0 + rbUpdates + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-missing-image + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Queued + True + + + 1 + + + + + + + False + False + 6 + + False False - - - 12 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - 1 - - True @@ -802,7 +840,6 @@ - True True 0 @@ -823,23 +860,11 @@ - - - True - 0.99000000953674316 - 1 - <small>Powered by User Generated Content</small> - True - - - 1 - - - 2 + 1 @@ -1019,6 +1044,50 @@ 1 + + + 10 + 10 + 4 + 4 + + + True + True + True + 0 + + + + True + + + True + gtk-apply + + + False + False + + + + + True + Review and Install + + + 1 + + + + + + + + + 2 + + False @@ -1560,7 +1629,7 @@ True - gtk-go-forward + gtk-cdrom False @@ -1570,7 +1639,7 @@ True - _Process Queue + _Commit Actions True @@ -2392,126 +2461,33 @@ 9 True - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Prevents files belonging to a package being overwritten by another - Disabled -Removal only -Install+Removal - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Collision protection - - - 1 - 2 - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - This is what they call "nice level" - 3 - 3 - 1 -19 19 1 10 0 - 1 - True - - - - 1 - 2 - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Process priority (nice) - - - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Entropy can keep a backup of your updated configuration files - Backup configuration files - 0 - True - - - - 2 - 2 - 3 - - - - - - 1 - 2 - 1 - 2 - - - - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Ignored protected files + Protected files and directories False - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2520,21 +2496,21 @@ Install+Removal - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_BUTTONBOX_SPREAD - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-new @@ -2547,15 +2523,16 @@ Install+Removal - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-edit @@ -2569,16 +2546,16 @@ Install+Removal - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-delete @@ -2604,10 +2581,6 @@ Install+Removal - - 1 - 2 - @@ -2737,33 +2710,33 @@ Install+Removal - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Protected files and directories + Ignored protected files False - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2772,21 +2745,21 @@ Install+Removal - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_BUTTONBOX_SPREAD - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-new @@ -2799,16 +2772,15 @@ Install+Removal - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-edit @@ -2822,16 +2794,16 @@ Install+Removal - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-delete @@ -2857,6 +2829,103 @@ Install+Removal + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 2 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Entropy can keep a backup of your updated configuration files + Backup configuration files + 0 + True + + + + 2 + 2 + 3 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Process priority (nice) + + + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + This is what they call "nice level" + 3 + 3 + 1 -19 19 1 10 0 + 1 + True + + + + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Collision protection + + + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Prevents files belonging to a package being overwritten by another + Disabled +Removal only +Install+Removal + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + 1 + 2 + 1 + 2 + @@ -2910,74 +2979,67 @@ Install+Removal 5 3 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + FTP Proxy + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + HTTP Proxy + + + 1 + 2 + GTK_FILL + + + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - type your password here - False + Example: http://proxy:1234 1 3 - 3 - 4 GTK_FILL - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - type your username here + Example: http://proxy:1234 1 3 - 2 - 3 + 1 + 2 GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Proxy Password + Download speed limit - 3 - 4 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Proxy Username - - - 2 - 3 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - kb/sec - - - 2 - 3 4 5 GTK_FILL @@ -3002,69 +3064,76 @@ Install+Removal - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Download speed limit + kb/sec + 2 + 3 4 5 GTK_FILL - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Proxy Username + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Proxy Password + + + 3 + 4 + GTK_FILL + + + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Example: http://proxy:1234 + type your username here 1 3 - 1 - 2 + 2 + 3 GTK_FILL - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Example: http://proxy:1234 + type your password here + False 1 3 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - HTTP Proxy - - - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - FTP Proxy - - + 3 + 4 GTK_FILL @@ -3730,14 +3799,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 @@ -3756,59 +3867,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 @@ -4289,6 +4358,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 @@ -4426,177 +4666,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 - - - @@ -5234,7 +5303,91 @@ gz 5 5 - + + 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 @@ -5245,234 +5398,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 @@ -5493,20 +5433,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 @@ -5517,92 +5670,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 @@ -5635,7 +5704,7 @@ gz 2 15 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 @@ -5646,21 +5715,57 @@ gz 1 2 - 2 - 3 + 3 + 4 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - CXXFLAGS + Masked True - 2 - 3 + 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 @@ -5680,20 +5785,20 @@ gz - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - CFLAGS + CXXFLAGS True - 1 - 2 + 2 + 3 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 @@ -5704,44 +5809,8 @@ gz 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 + 2 + 3 @@ -7167,15 +7236,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 @@ -7193,27 +7270,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 - - @@ -7519,108 +7588,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 @@ -7638,30 +7627,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 @@ -7893,56 +7962,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 @@ -7959,28 +7998,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 @@ -9795,85 +9864,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 10 - 1 - - - 1 - 2 - 1 - 2 - - - - - True - 0 - Port - - - 1 - 2 - - - - - True - 0 - Hostname - - True @@ -9892,14 +9892,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 10 + 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 @@ -10083,261 +10152,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 @@ -10352,19 +10179,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 + + @@ -10420,69 +10489,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 @@ -10497,7 +10515,7 @@ Please read them carefully and <b>make your choice</b>. - + True 0 True @@ -10505,10 +10523,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 @@ -10602,83 +10671,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 @@ -10697,6 +10689,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 b516516e8..9236552f8 100644 --- a/spritz/src/spritz.py +++ b/spritz/src/spritz.py @@ -284,6 +284,7 @@ class SpritzApplication(Controller): self.settings = SpritzConf() self.queue = SpritzQueue() + self.etpbase.connect_queue(self.queue) self.queueView = EntropyQueueView(self.ui.queueView,self.queue) self.pkgView = EntropyPackageView(self.ui.viewPkg, self.queueView, self.ui, self.etpbase, self.ui.main) self.filesView = EntropyFilesView(self.ui.filesView) @@ -409,6 +410,7 @@ class SpritzApplication(Controller): self.setupPkgRadio(self.ui.rbInstalled,"installed",_('Show Installed Packages')) self.setupPkgRadio(self.ui.rbMasked,"masked",_('Show Masked Packages')) self.setupPkgRadio(self.ui.rbPkgSets,"pkgsets",_('Show Package Sets')) + self.setupPkgRadio(self.ui.rbPkgQueued,"queued",_('Show Queued Packages')) def setupPkgRadio(self, widget, tag, tip): widget.connect('toggled',self.on_pkgFilter_toggled,tag) @@ -427,6 +429,8 @@ class SpritzApplication(Controller): pix = self.ui.rbMaskedImage elif tag == "pkgsets": pix = self.ui.rbPackageSetsImage + elif tag == "queued": + pix = self.ui.rbQueuedImage pix.set_from_pixbuf( p ) pix.show() except gobject.GError: @@ -1942,6 +1946,11 @@ class SpritzApplication(Controller): self.populateAdvisories(None,'affected') self.setNotebookPage(const.PAGES[page]) + def on_queueReviewAndInstall_clicked(self, widget): + rb = self.pageButtons["queue"] + rb.set_active(True) + self.on_PageButton_changed(widget, "queue") + def on_pkgFilter_toggled(self,rb,action): ''' Package Type Selection Handler''' if rb.get_active(): # Only act on select, not deselect. @@ -1952,12 +1961,18 @@ class SpritzApplication(Controller): self.ui.updatesButtonbox.show() else: self.ui.updatesButtonbox.hide() + if action == "masked": self.setupMaskedPackagesWarningBox() self.ui.maskedWarningBox.show() else: self.ui.maskedWarningBox.hide() + if action == "queued": + self.ui.queueReviewAndInstallBox.show() + else: + self.ui.queueReviewAndInstallBox.hide() + self.addPackages() rb.grab_remove() @@ -2156,6 +2171,7 @@ class SpritzApplication(Controller): flt.activate() lst = txt.split(' ') flt.setKeys(lst) + self.ui.pkgClr.show() else: flt.activate(False) action = self.lastPkgPB @@ -2166,6 +2182,7 @@ class SpritzApplication(Controller): ''' Search Clear button handler''' self.ui.pkgFilter.set_text("") self.on_search_clicked(None) + self.ui.pkgClr.hide() def on_comps_cursor_changed(self, widget): self.setBusy()