[gentoo-commits] proj/anaconda:master commit in: /, iw/

["Wiktor W Brodlo" <wiktor@brodlo.net>]

commit:     7d7afc1b80596aca13268dd9c2967113e627c701
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 20:33:02 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 20:33:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=7d7afc1b

Control the main progress bar

---
 anaconda          |    1 +
 gui.py            |    1 +
 iw/welcome_gui.py |   11 +++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/anaconda b/anaconda
index fc87336..3beb128 100755
--- a/anaconda
+++ b/anaconda
@@ -486,6 +486,7 @@ class Anaconda(object):
         self.makeconf_jobs = None
         self.makeconf_load = None
         self.makeconf_silent = None
+        self.mainxml = None
         self.mediaDevice = None
         self.methodstr = None
         self.mirrors = []

diff --git a/gui.py b/gui.py
index b588065..34de804 100755
--- a/gui.py
+++ b/gui.py
@@ -1477,6 +1477,7 @@ class InstallControlWindow:
     def loadGlade(self):
         self.mainxml = gtk.glade.XML(findGladeFile("anaconda.glade"),
                                      domain="anaconda")
+        self.anaconda.mainxml = self.mainxml
 
     def setup_window (self, window_reload):
         self.setLtR()

diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 1d4eb0d..f9815f4 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -104,14 +104,21 @@ environment installed on your new system. "),
     def getScreen(self, anaconda):
         (step, _anaconda) = anaconda.dispatch.currentStep()
         (title, text, chapter, linktext) = self.windows[step]
-        return self.setWindow(title, text, chapter, linktext)             
+        return self.setWindow(anaconda, title, text, chapter, linktext)
     
-    def setWindow(self, title, text, chapter, linktext):
+    def setWindow(self, anaconda, title, text, chapter, linktext):
         (xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
         title_ = xml.get_widget("title")
         text_ = xml.get_widget("text")
         title_.set_markup("<span size=\"x-large\">%s</span>" % (_("Chapter %i: %s") % (chapter, title)))
         text_.set_text(text)
+        ip = anaconda.mainxml.get_widget("install_progress")
+        current_progress = ip.get_fraction()
+        step = 1/len(self.windows)
+        new_progress = current_progress + step()
+        if chapter == 0:
+            new_progress = 0
+        ip.set_fraction(new_progress)
         return align