--- pyanaconda/gui.py | 48 ++++++++++++++++++++++---------------------- pyanaconda/installclass.py | 12 +++++----- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py index b95982c..d3cd347 100755 --- a/pyanaconda/gui.py +++ b/pyanaconda/gui.py @@ -67,7 +67,7 @@ stepToClass = { "language" : ("language_gui", "LanguageWindow"), "keyboard" : ("kbd_gui", "KeyboardWindow"), "filtertype" : ("filter_type", "FilterTypeWindow"), - "filter" : ("filter_gui", "FilterWindow"), + "filter" : ("filter_gui", "FilterWindow"), "zfcpconfig" : ("zfcp_gui", "ZFCPWindow"), "partition" : ("partition_gui", "PartitionWindow"), "parttype" : ("autopart_type", "PartitionTypeWindow"), @@ -80,7 +80,7 @@ stepToClass = { "network" : ("network_gui", "NetworkWindow"), "timezone" : ("timezone_gui", "TimezoneWindow"), "accounts" : ("account_gui", "AccountWindow"), - "tasksel": ("task_gui", "TaskWindow"), + "tasksel": ("task_gui", "TaskWindow"), "group-selection": ("package_gui", "GroupSelectionWindow"), "install" : ("progress_gui", "InstallProgressWindow"), "complete" : ("congrats_gui", "CongratulationWindow"), @@ -105,7 +105,7 @@ def copyScreenshots(): try: os.mkdir(destDir, 0750) except: - window = MessageWindow("Error Saving Screenshot", + window = MessageWindow("Error Saving Screenshot", _("An error occurred saving screenshots " "to disk."), type="warning") return @@ -123,7 +123,7 @@ def copyScreenshots(): if ext == ".png": shutil.copyfile(source_dir + '/' + f, destDir + '/' + fname) - window = MessageWindow(_("Screenshots Copied"), + window = MessageWindow(_("Screenshots Copied"), _("The screenshots have been saved in the " "directory:\n\n" "\t/root/anaconda-screenshots/\n\n" @@ -163,11 +163,11 @@ def takeScreenShot(): screenshot.save (screenshotDir + '/' + sname, "png") screenshotIndex += 1 - window = MessageWindow(_("Saving Screenshot"), + window = MessageWindow(_("Saving Screenshot"), _("A screenshot named '%s' has been saved.") % (sname,) , type="ok") except: - window = MessageWindow(_("Error Saving Screenshot"), + window = MessageWindow(_("Error Saving Screenshot"), _("An error occurred while saving " "the screenshot. If this occurred " "during package installation, you may need " @@ -179,8 +179,8 @@ def handlePrintScrnRelease (window, event): takeScreenShot() # # HACK to make treeview work -# - +# + def setupTreeViewFixupIdleHandler(view, store): id = {} id["id"] = gobject.idle_add(scrollToIdleHandler, (view, store, id)) @@ -193,11 +193,11 @@ def scrollToIdleHandler((view, store, iddict)): id = iddict["id"] except: return - + selection = view.get_selection() if not selection: return - + model, iter = selection.get_selected() if not iter: return @@ -260,7 +260,7 @@ def rootPopBusyCursor(): def getBusyCursorStatus(): global _busyCursor - + return _busyCursor class MnemonicLabel(gtk.Label): @@ -284,7 +284,7 @@ def titleBarMousePressCB(widget, event, data): data["button"] = event.button data["deltax"] = event.x_root - x data["deltay"] = event.y_root - y - + def titleBarMouseReleaseCB(widget, event, data): if data["state"] and event.button == data["button"]: data["state"] = 0 @@ -350,7 +350,7 @@ def getPixbuf(file): except RuntimeError, msg: log.error("unable to read %s: %s" %(file, msg)) pixbuf = None - + return pixbuf def readImageFromFile(file, dither = False, image = None): @@ -411,7 +411,7 @@ class WaitWindow: def refresh(self): processEvents() - + def pop(self): self.window.destroy() rootPopBusyCursor() @@ -935,7 +935,7 @@ class InstallInterface(InstallInterfaceBase): def suspend(self): pass - + def resume(self): pass @@ -1237,8 +1237,8 @@ class InstallControlWindow: gtk.widget_set_default_direction (gtk.TEXT_DIR_LTR) else: log.error("someone didn't translate the ltr bits right: %s" %(ltrrtl,)) - gtk.widget_set_default_direction (gtk.TEXT_DIR_LTR) - + gtk.widget_set_default_direction (gtk.TEXT_DIR_LTR) + def prevClicked (self, *args): try: self.currentWindow.getPrev () @@ -1444,7 +1444,7 @@ class InstallControlWindow: def connectSignals(self): sigs = { "on_nextButton_clicked": self.nextClicked, "on_rebootButton_clicked": self.nextClicked, - "on_closeButton_clicked": self._doExit, + "on_closeButton_clicked": self._doExit, "on_backButton_clicked": self.prevClicked, "on_debugButton_clicked": self.debugClicked, "on_mainWindow_key_release_event": self.keyRelease, @@ -1478,18 +1478,18 @@ class InstallControlWindow: # calling present() will focus the window in the winodw manager so # the mnemonics work without additional clicking self.window.present() - + def busyCursorPush(self): rootPushBusyCursor() - + def busyCursorPop(self): rootPopBusyCursor() - + def run (self): self.setup_theme() self.setup_window(False) gtk.main() - + class InstallControlState: def __init__ (self, cw): self.cw = cw @@ -1501,7 +1501,7 @@ class InstallControlState: def setTitle (self, title): self.title = title self.cw.update (self) - + def getTitle (self): return self.title @@ -1512,7 +1512,7 @@ class InstallControlState: def getPrevEnabled (self): return self.prevEnabled - + def setNextEnabled (self, value): if value == self.nextEnabled: return self.nextEnabled = value diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py index 8bc2e53..385757e 100644 --- a/pyanaconda/installclass.py +++ b/pyanaconda/installclass.py @@ -88,14 +88,14 @@ class BaseInstallClass(object): "autopartitionexecute", "partition", "storagedone", - "bootloadersetup", + "bootloadersetup", "bootloader", "network", "timezone", "accounts", "reposetup", "basepkgsel", - "tasksel", + "tasksel", "postselection", "reipl", "install", @@ -127,7 +127,7 @@ class BaseInstallClass(object): dispatch.skipStep("tasksel", skip = 1, permanent=1) dispatch.skipStep("group-selection", skip = 1, permanent=1) - # allow install classes to turn off the upgrade + # allow install classes to turn off the upgrade if not self.showUpgrade or not anaconda.backend.supportsUpgrades: dispatch.skipStep("findrootparts", skip = 1) @@ -136,7 +136,7 @@ class BaseInstallClass(object): if flags.cmdline.has_key("noupgrade"): dispatch.skipStep("findrootparts", skip = 1) - # upgrade will also always force looking for an upgrade. + # upgrade will also always force looking for an upgrade. if flags.cmdline.has_key("upgrade"): dispatch.skipStep("findrootparts", skip = 0) @@ -145,7 +145,7 @@ class BaseInstallClass(object): # modifies the uri from installmethod.getMethodUri() to take into # account any installclass specific things including multiple base - # repositories. takes a string or list of strings, returns a dict + # repositories. takes a string or list of strings, returns a dict # with string keys and list values {%repo: %uri_list} def getPackagePaths(self, uri): if not type(uri) == types.ListType: @@ -276,7 +276,7 @@ def availableClasses(showHidden=0): if obj.__dict__.has_key('arch'): if obj.arch != iutil.getArch(): obj.hidden = 1 - + if obj.hidden == 0 or showHidden == 1: list.append(((obj.name, obj, obj.pixmap), sortOrder)) except ImportError as e: -- 1.7.3.3 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list