- fix ConfirmationDialog name spelling issue

- fix locale domain in views.py


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1337 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
(no author)
2008-02-29 17:47:09 +00:00
parent ac737d0fa6
commit 5bdeae0983
4 changed files with 12 additions and 9 deletions

View File

@@ -31,7 +31,7 @@ except:
from misc import const,cleanMarkupSting,SpritzConf,unicode2htmlentities
from i18n import _
class ConfimationDialog:
class ConfirmationDialog:
def __init__( self, parent, pkgs, top_text = None, bottom_text = None, bottom_data = None, sub_text = None, cancel = True, simpleList = False ):
self.xml = gtk.glade.XML( const.GLADE_FILE, 'confirmation',domain="spritz" )
@@ -145,6 +145,9 @@ class ConfimationDialog:
def destroy( self ):
return self.dialog.destroy()
class ConfimationDialog(ConfirmationDialog):
pass
class ErrorDialog:
def __init__( self, parent, title, text, longtext, modal ):
self.xml = gtk.glade.XML( const.GLADE_FILE, "errDialog",domain="spritz" )

View File

@@ -180,7 +180,7 @@ class SpritzQueue:
def showKeySlotErrorMessage(self, blocked):
confirmDialog = self.dialogs.ConfimationDialog( self.ui.main,
confirmDialog = self.dialogs.ConfirmationDialog( self.ui.main,
list(blocked),
top_text = _("Attention"),
sub_text = _("There are packages that can't be installed at the same time, thus are blocking your request:"),
@@ -235,7 +235,7 @@ class SpritzQueue:
def elaborateInstall(self, xlist, actions, deep_deps):
(runQueue, removalQueue, status) = self.Entropy.retrieveInstallQueue(xlist,False,deep_deps)
if status == -2: # dependencies not found
confirmDialog = self.dialogs.ConfimationDialog( self.ui.main,
confirmDialog = self.dialogs.ConfirmationDialog( self.ui.main,
runQueue,
top_text = _("Attention"),
sub_text = _("Some dependencies couldn't be found. It can either be because they are masked or because they aren't in any active repository."),
@@ -286,7 +286,7 @@ class SpritzQueue:
size = abs(size)
bottom_text = _("Freed disk space")
size = self.Entropy.entropyTools.bytesIntoHuman(size)
confirmDialog = self.dialogs.ConfimationDialog( self.ui.main,
confirmDialog = self.dialogs.ConfirmationDialog( self.ui.main,
install_todo+remove_todo,
top_text = _("These are the packages that would be installed/updated"),
bottom_text = bottom_text,
@@ -336,7 +336,7 @@ class SpritzQueue:
size = abs(size)
bottom_text = _("Needed space")
size = self.Entropy.entropyTools.bytesIntoHuman(size)
confirmDialog = self.dialogs.ConfimationDialog( self.ui.main,
confirmDialog = self.dialogs.ConfirmationDialog( self.ui.main,
todo,
top_text = _("These are the packages that would be removed"),
bottom_text = bottom_text,

View File

@@ -1240,7 +1240,7 @@ class SpritzApplication(SpritzController,SpritzGUI):
def get_confimation( self, task ):
self.progress.hide( False )
dlg = ConfimationDialog(self.ui.main, [], size )
dlg = ConfirmationDialog(self.ui.main, [], size )
rc = dlg.run()
dlg.destroy()
self.progress.show()

View File

@@ -120,7 +120,7 @@ class EntropyPackageView:
self.clearUpdates()
# installed packages right click menu
self.installed_menu_xml = gtk.glade.XML( const.GLADE_FILE, "packageInstalled",domain="yumex" )
self.installed_menu_xml = gtk.glade.XML( const.GLADE_FILE, "packageInstalled",domain="spritz" )
self.installed_menu = self.installed_menu_xml.get_widget( "packageInstalled" )
self.installed_menu_xml.signal_autoconnect(self)
@@ -138,7 +138,7 @@ class EntropyPackageView:
self.installed_undopurge.set_image(self.img_pkg_undopurge)
# updates right click menu
self.updates_menu_xml = gtk.glade.XML( const.GLADE_FILE, "packageUpdates",domain="yumex" )
self.updates_menu_xml = gtk.glade.XML( const.GLADE_FILE, "packageUpdates",domain="spritz" )
self.updates_menu = self.updates_menu_xml.get_widget( "packageUpdates" )
self.updates_menu_xml.signal_autoconnect(self)
self.updates_update = self.updates_menu_xml.get_widget( "update" )
@@ -147,7 +147,7 @@ class EntropyPackageView:
self.updates_undoupdate.set_image(self.img_pkg_downgrade)
# install right click menu
self.install_menu_xml = gtk.glade.XML( const.GLADE_FILE, "packageInstall",domain="yumex" )
self.install_menu_xml = gtk.glade.XML( const.GLADE_FILE, "packageInstall",domain="spritz" )
self.install_menu = self.install_menu_xml.get_widget( "packageInstall" )
self.install_menu_xml.signal_autoconnect(self)
self.install_install = self.install_menu_xml.get_widget( "install" )