sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Entropy/Spritz:

Browse Source 
- fix typo in function name cleanMarkupSting => renamed to => cleanMarkupString
- handle progress bar updates correctly


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2019 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2008-05-28 10:45:45 +00:00
parent 2d6ba42d29
commit 3e55be2340
8 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spritz/src/dialogs.py
View File

@@ -25,7 +25,7 @@ try:
from iniparse.compat import ConfigParser,SafeConfigParser
except ImportError:
from ConfigParser import ConfigParser,SafeConfigParser
from spritz_setup import const, cleanMarkupSting, SpritzConf, unicode2htmlentities
from spritz_setup import const, cleanMarkupString, SpritzConf, unicode2htmlentities
from entropy_i18n import _
class PkgInfoMenu:
@@ -199,8 +199,8 @@ class PkgInfoMenu:
self.pkginfo_ui.vote4.set_from_file(heart_pixmap)
self.pkginfo_ui.vote5.set_from_file(heart_pixmap)
self.pkginfo_ui.labelAtom.set_markup("<b>%s</b>" % (cleanMarkupSting(pkg.name),))
self.pkginfo_ui.labelDescription.set_markup("<small>%s</small>" % (cleanMarkupSting(pkg.description),))
self.pkginfo_ui.labelAtom.set_markup("<b>%s</b>" % (cleanMarkupString(pkg.name),))
self.pkginfo_ui.labelDescription.set_markup("<small>%s</small>" % (cleanMarkupString(pkg.description),))
bold_items = [ self.pkginfo_ui.locationLabel,
self.pkginfo_ui.homepageLabel,
@@ -231,9 +231,9 @@ class PkgInfoMenu:
if repo == 0:
self.pkginfo_ui.location.set_markup("%s" % (_("From your Operating System"),))
else:
self.pkginfo_ui.location.set_markup("%s" % (cleanMarkupSting(self.entropyConstants.etpRepositories[repo]['description']),))
self.pkginfo_ui.location.set_markup("%s" % (cleanMarkupString(self.entropyConstants.etpRepositories[repo]['description']),))
self.pkginfo_ui.version.set_markup( "%s" % (cleanMarkupSting(pkg.onlyver),) )
self.pkginfo_ui.version.set_markup( "%s" % (cleanMarkupString(pkg.onlyver),) )
tag = pkg.tag
if not tag: tag = "None"
self.pkginfo_ui.tag.set_markup( "%s" % (tag,) )
@@ -241,7 +241,7 @@ class PkgInfoMenu:
self.pkginfo_ui.revision.set_markup( "%s" % (pkg.revision,) )
self.pkginfo_ui.branch.set_markup( "%s" % (pkg.release,) )
self.pkginfo_ui.eapi.set_markup( "%s" % (pkg.api,) )
self.pkginfo_ui.homepage.set_markup( "%s" % (cleanMarkupSting(pkg.homepage),) )
self.pkginfo_ui.homepage.set_markup( "%s" % (cleanMarkupString(pkg.homepage),) )
# license view
self.licenseModel.clear()
@@ -304,13 +304,13 @@ class PkgInfoMenu:
self.useflagsModel.clear()
self.useflagsView.set_model( self.useflagsModel )
for x in pkg.useflags:
self.useflagsModel.append([cleanMarkupSting(x)])
self.useflagsModel.append([cleanMarkupString(x)])
# eclasses view
self.eclassesModel.clear()
self.eclassesView.set_model( self.eclassesModel )
for x in pkg.eclasses:
self.eclassesModel.append([cleanMarkupSting(x)])
self.eclassesModel.append([cleanMarkupString(x)])
# dependencies view
self.dependenciesModel.clear()
@@ -318,23 +318,23 @@ class PkgInfoMenu:
deps = pkg.dependencies
conflicts = pkg.conflicts
for x in deps:
self.dependenciesModel.append(None,[cleanMarkupSting(x)])
self.dependenciesModel.append(None,[cleanMarkupString(x)])
for x in conflicts:
self.dependenciesModel.append(None,[cleanMarkupSting("!"+x)])
self.dependenciesModel.append(None,[cleanMarkupString("!"+x)])
# depends view
self.dependsModel.clear()
self.dependsView.set_model( self.dependsModel )
depends = pkg.dependsFmt
for x in depends:
self.dependsModel.append(None,[cleanMarkupSting(x)])
self.dependsModel.append(None,[cleanMarkupString(x)])
# needed view
self.neededModel.clear()
self.neededView.set_model( self.neededModel )
neededs = pkg.needed
for x in neededs:
self.neededModel.append(None,[cleanMarkupSting(x)])
self.neededModel.append(None,[cleanMarkupString(x)])
# content view
self.contentModel.clear()
@@ -485,7 +485,7 @@ class ConfirmationDialog:
level1 = model.append( None, [label] )
for pkg in reinstall:
desc = pkg.description[:desc_len].rstrip()+"..."
desc = cleanMarkupSting(desc)
desc = cleanMarkupString(desc)
if not desc.strip():
desc = _("No description")
mydesc = "\n<small><span foreground='#418C0F'>%s</span></small>" % (desc,)
@@ -496,7 +496,7 @@ class ConfirmationDialog:
level1 = model.append( None, [label] )
for pkg in install:
desc = pkg.description[:desc_len].rstrip()+"..."
desc = cleanMarkupSting(desc)
desc = cleanMarkupString(desc)
if not desc.strip():
desc = _("No description")
mydesc = "\n<small><span foreground='#418C0F'>%s</span></small>" % (desc,)
@@ -507,7 +507,7 @@ class ConfirmationDialog:
level1 = model.append( None, [label] )
for pkg in update:
desc = pkg.description[:desc_len].rstrip()+"..."
desc = cleanMarkupSting(desc)
desc = cleanMarkupString(desc)
if not desc.strip():
desc = _("No description")
mydesc = "\n<small><span foreground='#418C0F'>%s</span></small>" % (desc,)
@@ -518,7 +518,7 @@ class ConfirmationDialog:
level1 = model.append( None, [label] )
for pkg in remove:
desc = pkg.description[:desc_len].rstrip()+"..."
desc = cleanMarkupSting(desc)
desc = cleanMarkupString(desc)
if not desc.strip():
desc = _("No description")
mydesc = "\n<small><span foreground='#418C0F'>%s</span></small>" % (desc,)
@@ -753,7 +753,7 @@ def questionDialog(parent, msg, message_format = _("Hey!")):
type=gtk.MESSAGE_QUESTION,
buttons=gtk.BUTTONS_YES_NO, message_format = message_format)
dlg.set_title( _("Spritz Question") )
dlg.format_secondary_markup(cleanMarkupSting(msg))
dlg.format_secondary_markup(cleanMarkupString(msg))
rc = dlg.run()
dlg.destroy()
if rc == gtk.RESPONSE_YES:

2
spritz/src/entropyapi.py
View File

@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
from spritz_setup import const,cleanMarkupSting
from spritz_setup import const
from dialogs import questionDialog,LicenseDialog
# Entropy Imports

10
spritz/src/etpgui/packages.py
View File

@@ -19,7 +19,7 @@
from entropyConstants import *
from entropyapi import EquoConnection
from spritz_setup import cleanMarkupSting, SpritzConf
from spritz_setup import cleanMarkupString, SpritzConf
class DummyEntropyPackage:
@@ -73,8 +73,8 @@ class EntropyPackage:
return self.dbconn.retrieveAtom(self.matched_atom[0])
def getNameDesc(self):
t = cleanMarkupSting('/'.join(self.getName().split("/")[1:]))
desc = cleanMarkupSting(self.getDescription())
t = cleanMarkupString('/'.join(self.getName().split("/")[1:]))
desc = self.getDescription()
if len(desc) > 56:
desc = desc[:56].rstrip()+"..."
t += "\n<small><span foreground='#FF0000'>%s</span></small>" % (desc,)
@@ -202,7 +202,7 @@ class EntropyPackage:
return self.dbconn.retrieveKeySlot(self.matched_atom[0])
def getDescription(self):
return self.dbconn.retrieveDescription(self.matched_atom[0])
return cleanMarkupString(self.dbconn.retrieveDescription(self.matched_atom[0]))
def getDownSize(self):
return self.dbconn.retrieveSize(self.matched_atom[0])
@@ -237,7 +237,7 @@ class EntropyPackage:
def getAttr(self,attr):
x = None
if attr == "description":
x = cleanMarkupSting(self.dbconn.retrieveDescription(self.matched_atom[0]))
x = cleanMarkupString(self.dbconn.retrieveDescription(self.matched_atom[0]))
elif attr == "category":
x = self.dbconn.retrieveCategory(self.matched_atom[0])
elif attr == "license":

6
spritz/src/gui.py
View File

@@ -18,7 +18,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
from etpgui import *
from spritz_setup import SpritzConf, const, cleanMarkupSting
from spritz_setup import SpritzConf, const, cleanMarkupString
from misc import SpritzQueue
from views import *
from etpgui.widgets import SpritzConsole
@@ -97,7 +97,7 @@ class ProgressTotal:
return False
def setAbsProgress( self, now, prefix=None ):
if not now >= self.lastFrac and now < 1:
if (not now >= self.lastFrac) or (now >= 1.0) or (now < 0.0):
return
while gtk.events_pending(): # process gtk events
gtk.main_iteration()
@@ -185,7 +185,7 @@ class SpritzProgress:
self.ui.progressExtraLabel.set_text( "" )
def set_extraLabel( self, text ):
self.ui.progressExtraLabel.set_markup( "<span size=\"small\">%s</span>" % cleanMarkupSting(text) )
self.ui.progressExtraLabel.set_markup( "<span size=\"small\">%s</span>" % cleanMarkupString(text) )
self.lastFrac = -1

4
spritz/src/misc.py
View File

@@ -18,7 +18,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
from entropy_i18n import _
from spritz_setup import cleanMarkupSting, SpritzConf
from spritz_setup import cleanMarkupString, SpritzConf
class SpritzQueue:
@@ -120,7 +120,7 @@ class SpritzQueue:
if idpackage not in newdepends:
mystring = "<span foreground='#FF0000'>%s</span>\n<small><span foreground='#418C0F'>%s</span></small>" % (
self.Entropy.clientDbconn.retrieveAtom(idpackage),
cleanMarkupSting(self.Entropy.clientDbconn.retrieveDescription(idpackage)),
cleanMarkupString(self.Entropy.clientDbconn.retrieveDescription(idpackage)),
)
atoms.append(mystring)
atoms.sort()

10
spritz/src/spritz.py
View File

@@ -42,7 +42,7 @@ import thread
import exceptions
from etpgui.widgets import UI, Controller
from etpgui import *
from spritz_setup import fakeoutfile, fakeinfile, cleanMarkupSting
from spritz_setup import fakeoutfile, fakeinfile, cleanMarkupString
# spritz imports
import filters
@@ -702,22 +702,22 @@ class SpritzController(Controller):
if vul_atoms:
myparent = self.affectedModel.append(parent,[_('Vulnerables')])
for atom in vul_atoms:
self.affectedModel.append(myparent,[cleanMarkupSting(atom)])
self.affectedModel.append(myparent,[cleanMarkupString(atom)])
if unaff_atoms:
myparent = self.affectedModel.append(parent,[_('Unaffected')])
for atom in unaff_atoms:
self.affectedModel.append(myparent,[cleanMarkupSting(atom)])
self.affectedModel.append(myparent,[cleanMarkupString(atom)])
# bugs
self.bugsModel.clear()
self.bugsView.set_model( self.bugsModel )
for bug in data['bugs']:
self.bugsModel.append([cleanMarkupSting(bug)])
self.bugsModel.append([cleanMarkupString(bug)])
self.referencesModel.clear()
self.referencesView.set_model( self.referencesModel )
for reference in data['references']:
self.referencesModel.append([cleanMarkupSting(reference)])
self.referencesModel.append([cleanMarkupString(reference)])
# announcedTextLabel
self.advinfo_ui.announcedTextLabel.set_markup(data['announced'])

2
spritz/src/spritz_setup.py
View File

@@ -138,7 +138,7 @@ class SpritzConf:
dummy_empty = 0
dummy_category = 1
def cleanMarkupSting(msg):
def cleanMarkupString(msg):
import gobject
msg = str(msg) # make sure it is a string
msg = gobject.markup_escape_text(msg)

4
spritz/src/views.py
View File

@@ -19,7 +19,7 @@
import gtk
import gobject
from spritz_setup import const, cleanMarkupSting, SpritzConf
from spritz_setup import const, cleanMarkupString, SpritzConf
from etpgui.widgets import UI
from packages import DummyEntropyPackage
from entropyapi import EquoConnection
@@ -471,7 +471,7 @@ class EntropyPackageView:
cat_desc = cat_desc_data[_LOCALE]
elif cat_desc_data.has_key('en'):
cat_desc = cat_desc_data['en']
cat_text = "<b><big>%s</big></b>\n<small>%s</small>" % (category,cleanMarkupSting(cat_desc),)
cat_text = "<b><big>%s</big></b>\n<small>%s</small>" % (category,cleanMarkupString(cat_desc),)
mydummy = DummyEntropyPackage(
namedesc = cat_text,
dummy_type = SpritzConf.dummy_category,