From 8c07cc23012115dd1bca727e28d57bd4ca4642e2 Mon Sep 17 00:00:00 2001 From: lxnay Date: Sun, 1 Jun 2008 11:55:41 +0000 Subject: [PATCH] Entropy/Spritz: - complete the implementation of the Package Masking Interface git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2067 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- client/text_ui.py | 2 +- spritz/gfx/button-queue.png | Bin 2216 -> 1589 bytes spritz/gfx/sabayon.png | Bin 0 -> 3186 bytes spritz/src/entropyapi.py | 5 +- spritz/src/etpgui/packages.py | 7 + spritz/src/gui.py | 15 + spritz/src/spritz.glade | 1413 ++++++++++++++++----------------- spritz/src/views.py | 23 +- 8 files changed, 750 insertions(+), 715 deletions(-) create mode 100644 spritz/gfx/sabayon.png diff --git a/client/text_ui.py b/client/text_ui.py index 3d7549415..6832a5b5f 100644 --- a/client/text_ui.py +++ b/client/text_ui.py @@ -1017,7 +1017,7 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False, sys elif rc == "Yes" and human: doSelectiveRemoval = True elif rc == "No" and human: - rc = Equo.askQuestion(" %s") % (_("Would you like to skip this step then ?"),) + rc = Equo.askQuestion(" %s" % (_("Would you like to skip this step then ?"),)) if rc == "Yes": return 0,0 elif deps: diff --git a/spritz/gfx/button-queue.png b/spritz/gfx/button-queue.png index 470b5d46f41a2bc4510b47437055dd89d501e680..c26576ee8fcaab7c49014d9fa4b4d4c8f6a84b34 100644 GIT binary patch delta 1557 zcmV+w2I~2!5w#4EGk*o_Nklx~n8y}@fBP91BF!4(u0 z1yrdhMYU8RB~%Dmph5yjmV)|%`nYc(`iuw{fsi0VK`1S%nhMd#D5WycR?dUDget9X zYvbU>-iz0BIp_2NueD$s>{d};`jrQkSEwg9i_OCw~A7I#4K9eKN`D*f=Ajk0_QLJYOQDLP$j}mnR;NQ(ayC<8(Uxqa`~~2HCS`4*-P? z8-MuW#*KKMhhut%|;SU36u^~`DyZn64@tH6sJo#j!S!cdoUOb zeo(IS!i}hW3~>JZdENos)>aaU1VRWb%SH&r%w&$*y4T1)c|vbb4*;q48>p#mpfvU^ z@w(Rt226C_BOY(iq?A8jk^_}}(ACuifPWVZ5)OwkP4lV!b^swE5{>e(?<*4L&XG8G zj(d0RpbU$tg2S{UC^>=|$HOo!gb=k$>Ve8WxNzaZT;4DYOw+=$Y)s3>v;qkE+)x@= zriTzNMMqF{1SMDCde43mEcw4+*REX*e*7_( zG&Y8qm@Hx^brQ*1Ox?pR6&d{ZzlgnBkA{PiI*zcJ7#~%dru}iTCD1AzsC*N4?%WAL z`1WmXefcGpWf2O6sH&>MwrwKS)qfy0zRgUK8OSg-@t9aNfT4LPF@us0N(#RD=lvPi zb@RMSVO@JRYZ}riMt!MoJec zJWNAl;?V$w{M4OvI(>VgCD4F?rfI@)9Ank0RnIKJ;lqdV*Q^1cBqg7H`hO{VKKzhy zIEpWQY|B7lV33g%bHPuj zN;Ne#@&1lq((pzT`J&6jWD(abAiN?{l#s$j2+7c3hKKjR7GHev=U?BrapN;!1W*eB zXuzvLH4tF&Ce?vxDwTSB`+xTBzey&Wl50EGo3GToj*pG!7MYoz4@w-?9&qkvoppc2G*L4FPbsO{|R{7Fko%P(TF*aoFkHGonopUr0b`uqF; zbp87EzXId4kt@&sMF7i{4p=;O%$z+Jv*FE#TJ-7fQ~v>ZfG8EK&JO3^00000NkvXX Hu0mjfh1u~{ delta 2189 zcmV;82y*we45$&1Gk*wQNklWS z961Kvi(+?n;N+g86jt-@%eptyBq4C(bhK6OE0PH!ofs`{vpD z`T^xQWr!@=c+tc)fY6FaB}$C}Cc1lYJQ3ad)~;QGN7r#(#nz54n&!9R^#xFXJ5d~^ zFn`inR<$i46fEJy1(WT&40haJQWi|>7F2_=3n*=&}wfR9wh#jwhdeq3cL z*KHWj0rjubrw8#CvP|)f;q!U{xPNQuZ7i(GVI>AhrgIopp1y1)gHA0yr}{~!(^!_p z2Rrr?4ulvQN}v=S6FD#krNW4)D*z1N=^jV)A*EBxx^=pyvH9@fKI%$^&m(DU+x{}l zbDL&k8zUsm97Z}vDq~|>c}|=g!8A?M=`_)##q=_r^XEsfPG#Vuqi}B~TK7SyZFC~%AjRRzCQkfh_&lwno!MTA54V85qJ$gooXd4tD zuKT!%gatyn#vuB4^he94L8n?-16mzwd8pxd(VjK@g?N07pa)h*DcLk++QM_n?uctfi`0?$5K(;FwtiyFZjE#-q^9kAP2+?S6^@$T7 z9#{wV3oR`Rbfv7u-rf^3er;T9hSw$E%9Sgh*LD3DN+}P(y?^)Ki{I}j5{Uq?fB*jR z4n>N&T<$M>_wIceNCI)b4#2u~>vYpJ9|0Z&S|{y}C&al zpFf|To*tT-ntuoc0++P4ZJUD!53+OTPM&-2IW$ef=kw)DN=nkfV9?NYy>WPWxbiCj zjvP6XD;A4Ax~>Nd!!QzwM3ZG%4S;|9_U#-#e3;SEQMPT{cJ-J}Xw#-m`2BtYfj}l0 z44$v8t?jL-sOV8jB`)^60$~06_2%l;s~a>;yC1k^(tj=@BoYZysnk~v>^Kf0LVth% zq^Sz1QcAS|u|ObTUF?57N$3OW+S}WoDJdy=Kq+i`y%%^5gM8uYUuE1_~$q)<56? P0000+#;gFx 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 Y0bl)Nw-8BL_W%F@07*qoM6N<$g7!B4p#T5? literal 0 HcmV?d00001 diff --git a/spritz/src/entropyapi.py b/spritz/src/entropyapi.py index dffe1c3cf..0a22497a0 100644 --- a/spritz/src/entropyapi.py +++ b/spritz/src/entropyapi.py @@ -54,8 +54,8 @@ class QueueExecutor: # unmask packages for match in self.Spritz.etpbase.unmaskingPackages: - result = self.Entropy.unmask_match(obj.matched_atom) - if not result: + result = self.Entropy.unmask_match(match) + if not result or self.Entropy.is_match_masked(match): dbconn = self.Entropy.openRepositoryDatabase(match[1]) atom = dbconn.retrieveAtom(match[0]) okDialog( self.Spritz.ui.main, "%s: %s" % (_("Error enabling masked package"),atom) ) @@ -112,6 +112,7 @@ class QueueExecutor: Package.kill() del Package self.Entropy.cycleDone() + self.Spritz.ui.skipMirror.hide() # then removalQueue diff --git a/spritz/src/etpgui/packages.py b/spritz/src/etpgui/packages.py index 1c48746df..de706bcf7 100644 --- a/spritz/src/etpgui/packages.py +++ b/spritz/src/etpgui/packages.py @@ -74,6 +74,12 @@ class EntropyPackage: def getName(self): return self.dbconn.retrieveAtom(self.matched_atom[0]) + def isMasked(self): + idpackage, idmask = self.dbconn.idpackageValidator(self.matched_atom[0]) + if idpackage != -1: + return False + return True + def getNameDesc(self): t = cleanMarkupString('/'.join(self.getName().split("/")[1:])) if self.masked: @@ -307,6 +313,7 @@ class EntropyPackage: version = property(fget=getVer) release = property(fget=getRel) slot = property(fget=getSlot) + maskstat = property(fget=isMasked) keywords = property(fget=getKeywords) useflags = property(fget=getUseflags) homepage = property(fget=getHomepage) diff --git a/spritz/src/gui.py b/spritz/src/gui.py index 3af663a4e..139dda2d8 100644 --- a/spritz/src/gui.py +++ b/spritz/src/gui.py @@ -241,6 +241,9 @@ class SpritzGUI: self.setupPkgFilter() self.setupAdvisoriesFilter() + self.setupImages() + + def on_console_click(self, widget, event): self.console_menu.popup( None, None, None, event.button, event.time ) return True @@ -334,6 +337,18 @@ class SpritzGUI: self.ui.content.pack_start( button, False ) self.pageButtons[page] = button + def setupImages(self): + + # progressImage + iconpath = os.path.join(const.PIXMAPS_PATH,"sabayon.png") + if os.path.isfile(iconpath) and os.access(iconpath,os.R_OK): + try: + p = gtk.gdk.pixbuf_new_from_file( iconpath ) + self.ui.progressImage.set_from_pixbuf(p) + except gobject.GError: + pass + + def setPage( self, page ): self.activePage = page widget = self.pageButtons[page] diff --git a/spritz/src/spritz.glade b/spritz/src/spritz.glade index be8e1a707..3299805a5 100644 --- a/spritz/src/spritz.glade +++ b/spritz/src/spritz.glade @@ -976,41 +976,98 @@ True - + True + 10 + 6 - + + True + gtk-missing-image + 6 + + + False + False + 4 + + + + True - + True - 10 6 - + True - gtk-dialog-info - 6 + 0 + 0 + True False False - 4 - + True - + True - 6 + 0 + True + + + + + False + False + 1 + + + + + True + 0 + + + False + False + 2 + + + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + 0 + + + + True + 0 + 0 + + + True + 2 - + True - 0 - 0 - True + gtk-media-forward False @@ -1018,119 +1075,10 @@ - + True - - - True - 0 - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-media-forward - - - False - False - - - - - True - _Skip mirror - True - - - False - False - 1 - - - - - - - - - False - False - - - - - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-media-stop - - - False - False - - - - - True - _Abort queue - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - - - - False - False - 1 - - + _Skip mirror + True False @@ -1138,41 +1086,81 @@ 1 + + + + + + + False + False + + + + + True + 0 + + + + True + 0 + 0 + + + True + 2 - + True - 0 + gtk-media-stop False False - 2 + + + + + True + _Abort queue + True + + + False + False + 1 - - 1 - + + False + False + 1 + + + False + False + 2 + - - False - False - - + True + 6 - + True - 6 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 15 True @@ -1180,11 +1168,20 @@ - False - False 8 + + + True + 0.0099999997764800008 + + + + 9 + 1 + + @@ -1192,28 +1189,6 @@ 1 - - - True - 0.0099999997764800008 - - - - False - False - 9 - 2 - - - - - True - GTK_BUTTONBOX_END - - - 3 - - False @@ -2372,56 +2347,14 @@ 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 - What you were doing + Your Full Name - 2 - 3 GTK_FILL @@ -2440,17 +2373,59 @@ - + 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 + + + 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 @@ -2933,129 +2908,18 @@ 10 3 - + True - True + bz2 +gz 1 2 - 5 - 6 - - - - - - True - 0 - Repository Services Port - - - 5 - 6 - GTK_FILL - - - - - - True - 0 - Identifier - - - GTK_FILL - - - - - - True - 0 - Description - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Download mirrors - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - Database URL - - - 3 - 4 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - Database compression - - 4 5 GTK_FILL - + GTK_FILL @@ -3196,18 +3060,129 @@ - + True - bz2 -gz + 0 + Database compression + + + 4 + 5 + GTK_FILL + + + + + + True + True 1 2 - 4 - 5 + 3 + 4 + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + 1 + 2 + + + + + + True + 0 + Database URL + + + 3 + 4 GTK_FILL - GTK_FILL + + + + + + True + 0 + Download mirrors + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + Description + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Identifier + + + GTK_FILL + + + + + + True + 0 + Repository Services Port + + + 5 + 6 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 5 + 6 + @@ -3433,6 +3408,23 @@ gz + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Unmask this package + Enable + True + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-apply + + + + @@ -3676,7 +3668,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 @@ -3687,234 +3763,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 @@ -3935,20 +3798,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 @@ -3959,92 +4035,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 @@ -4077,7 +4069,7 @@ gz 2 15 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 @@ -4088,21 +4080,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 @@ -4122,20 +4150,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 @@ -4146,44 +4174,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 @@ -5373,23 +5365,15 @@ 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 - 0 - Announced - True - - - - - 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 @@ -5407,19 +5391,27 @@ 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 - 1 + 0 + Revised 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 + + @@ -5663,7 +5655,7 @@ 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 - Enable + _Enable True @@ -5696,7 +5688,8 @@ 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 - Enable all + Enable _all + True 1 diff --git a/spritz/src/views.py b/spritz/src/views.py index 5aec276aa..e9db6e18d 100644 --- a/spritz/src/views.py +++ b/spritz/src/views.py @@ -26,6 +26,7 @@ from entropyapi import EquoConnection from etpgui import * from entropyConstants import * from entropy_i18n import _,_LOCALE +from dialogs import MaskedPackagesDialog TOGGLE_WIDTH = 12 @@ -133,6 +134,7 @@ class EntropyPackageView: self.installed_undopurge = self.installed_menu_xml.get_widget( "undopurge" ) self.installed_remove = self.installed_menu_xml.get_widget( "remove" ) self.installed_undoremove = self.installed_menu_xml.get_widget( "undoremove" ) + self.installed_unmask = self.installed_menu_xml.get_widget( "unmask" ) self.installed_reinstall.set_image(self.img_pkg_reinstall) self.installed_undoreinstall.set_image(self.img_pkg_undoreinstall) self.installed_remove.set_image(self.img_pkg_remove) @@ -175,6 +177,7 @@ class EntropyPackageView: self.updates_update.hide() def reset_installed_packages_menu(self): + self.installed_unmask.hide() self.installed_undoremove.hide() self.installed_undoreinstall.hide() self.installed_undopurge.hide() @@ -187,6 +190,7 @@ class EntropyPackageView: self.installed_purge.show() def hide_installed_packages_menu(self): + self.installed_unmask.hide() self.installed_undoremove.hide() self.installed_undoreinstall.hide() self.installed_undopurge.hide() @@ -270,6 +274,10 @@ class EntropyPackageView: def run_installed_menu_stuff(self, obj): do_show = True self.reset_installed_packages_menu() + if obj.masked: + # still ? + if obj.maskstat: + self.installed_unmask.show() if obj.queued: self.hide_installed_packages_menu() if obj.queued == "r" and not obj.do_purge: @@ -307,6 +315,19 @@ class EntropyPackageView: self.loaded_reinstallable = to_obj break + def on_unmask_activate(self, widget): + busyCursor(self.main_window) + model, iter = self.loaded_widget.get_selection().get_selected() + obj = self.store.get_value( iter, 0 ) + + oldmask = self.etpbase.unmaskingPackages.copy() + mydialog = MaskedPackagesDialog(self.Equo, self.etpbase, self.ui.main, [obj]) + result = mydialog.run() + if result != -5: + self.etpbase.unmaskingPackages = oldmask.copy() + mydialog.destroy() + normalCursor(self.main_window) + def on_remove_activate(self, widget, do_purge = False): busyCursor(self.main_window) model, iter = self.loaded_widget.get_selection().get_selected() @@ -654,8 +675,6 @@ class EntropyQueueView: def setup_view( self ): - #column.set_fixed_width( size ) - model = gtk.TreeStore( gobject.TYPE_STRING ) self.view.set_model( model ) cell1 = gtk.CellRendererText()