* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 23:05 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 1106ae3a621855152dccf6334495fbeb37bc3fad
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:38:29 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:38:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1106ae3a
Installing the Gentoo Base System welcome screen
---
dispatch.py | 5 +++--
gui.py | 1 +
installclass.py | 1 +
iw/welcome_gui.py | 6 ++++++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index d2e02a4..b7d3604 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -73,7 +73,7 @@ installSteps = [
("betanag", betaNagScreen, ),
# Preparing the Disks
- ("preparedisks", preparedisks, )
+ ("preparedisks", preparedisks, ),
("filtertype", ),
("filter", ),
("storageinit", storageInitialize, ),
@@ -94,10 +94,11 @@ installSteps = [
("enablefilesystems", turnOnFilesystems, ),
# Installing the Gentoo Installation Files
- ("installationfiles", installationfiles, )
+ ("installationfiles", installationfiles, ),
("makeconf", ),
# Installing the Gentoo Base System
+ ("basesystem", basesystem, ),
("mirrorselect", ),
("mirrorselect-sync", ),
("profile", ),
diff --git a/gui.py b/gui.py
index f7e726f..05e2b85 100755
--- a/gui.py
+++ b/gui.py
@@ -82,6 +82,7 @@ stepToClass = {
"makeconf" : ("makeconf_gui", "MakeconfWindow"),
# Installing the Gentoo Base System
+ "basesystem" : ("welcome_gui", "WelcomeWindow"),
"mirrorselect": ("mirrorselect_gui", "MirrorselectWindow"),
"mirrorselect-sync": ("mirrorselect-sync_gui", "MirrorselectSyncWindow"),
"profile": ("profile_gui", "ProfileWindow"),
diff --git a/installclass.py b/installclass.py
index ae88810..ef46eec 100644
--- a/installclass.py
+++ b/installclass.py
@@ -105,6 +105,7 @@ class BaseInstallClass(object):
"makeconf",
# Installing the Gentoo Base System
+ "basesystem",
"mirrorselect",
"mirrorselect-sync",
"profile",
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index c38681b..7b55b4b 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -61,6 +61,12 @@ class WelcomeWindow (InstallWindow):
_("Gentoo installs work through a stage3 archive. In \
this chapter the installer will help you choose the \
right compilation options for your machine. "), 5)
+
+ def basesystem(self, anaconda):
+ self.setWindow(_("Installing the Gentoo Installation Files"),
+ _("In this chapter you will set your Gentoo mirrors, \
+ select your profile and choose your the USE flags."),
+ 6)
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-21 20:33 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 20:33 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-21 14:12 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 83b06ea9b703000b66949e06d83f8fca8448d3bf
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 14:11:13 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 14:11:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=83b06ea9
iw/welcome_gui.py: Fix getting the widgets
---
gui.py | 2 +-
installclass.py | 2 +-
iw/welcome_gui.py | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gui.py b/gui.py
index b2a8b44..b588065 100755
--- a/gui.py
+++ b/gui.py
@@ -61,7 +61,7 @@ mainWindow = None
stepToClass = {
# Welcome
- "welcome" : ("welcome_gui", "WelcomeWindow"),
+ "welcomescreen" : ("welcome_gui", "WelcomeWindow"),
"language" : ("language_gui", "LanguageWindow"),
"keyboard" : ("kbd_gui", "KeyboardWindow"),
diff --git a/installclass.py b/installclass.py
index b3a6991..ec09bb5 100644
--- a/installclass.py
+++ b/installclass.py
@@ -81,7 +81,7 @@ class BaseInstallClass(object):
dispatch = anaconda.dispatch
dispatch.setStepList(
# Welcome
- "welcome",
+ "welcomescreen",
"language",
"keyboard",
"betanag",
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 62cf012..92f111d 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -29,7 +29,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class WelcomeWindow (InstallWindow):
windows = {
- "welcome" : (
+ "welcomescreen" : (
_("Welcome to the Gentoo installer!"),
_("This wizard will take you through installing Gentoo \
on your computer. We will follow the official Gentoo \
@@ -105,8 +105,8 @@ class WelcomeWindow (InstallWindow):
def setWindow(self, title, text, chapter, linktext):
(xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
- title_ = self.xml.get_widget("title")
- text_ = self.xml.get_widget("text")
+ title_ = xml.get_widget("title")
+ text_ = xml.get_widget("text")
title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
title_.set_attribute("label", _("Chapter %i: %s") % (chapter, title))
text_.set_attribute("text", text)
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 23:05 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 5b1fb60b2e846e68d1f8f3c753c85539f9dc2a08
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:58:14 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:58:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5b1fb60b
Configuring the Bootloader welcome screen
---
dispatch.py | 1 +
gui.py | 1 +
installclass.py | 1 +
iw/welcome_gui.py | 8 +++++++-
4 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index 3463346..eb1f1c3 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -119,6 +119,7 @@ installSteps = [
("systools", ),
# Configuring the Bootloader
+ ("bootloaderwelcome", bootloader, ),
("upgbootloader", ),
("bootloadersetup", bootloaderSetupChoices, ),
("bootloader", ),
diff --git a/gui.py b/gui.py
index e9d0286..c5171db 100755
--- a/gui.py
+++ b/gui.py
@@ -102,6 +102,7 @@ stepToClass = {
"systools" : ("systools_gui", "SystoolsWindow"),
# Configuring the Bootloader
+ "bootloaderwelcome": ("welcome_gui", "WelcomeWindow"),
"bootloader": ("bootloader_main_gui", "MainBootloaderWindow"),
"upgbootloader": ("upgrade_bootloader_gui", "UpgradeBootloaderWindow"),
diff --git a/installclass.py b/installclass.py
index a3e93f1..e779276 100644
--- a/installclass.py
+++ b/installclass.py
@@ -126,6 +126,7 @@ class BaseInstallClass(object):
"systools",
# Configuring the Bootloader
+ "bootloaderwelcome",
"bootloadersetup",
"bootloader",
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 2adb51e..b0cb77c 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -85,7 +85,13 @@ class WelcomeWindow (InstallWindow):
def systools(self, anaconda):
self.setWindow(_("Installing Necessary System Tools"),
- _("In this chapter we help you choose and install some important tools. "),
+ _("In this chapter we help you choose and install some important tools."),
9)
+
+ def bootloader(self, anaconda):
+ self.setWindow(_("Configuring the Bootloader"),
+ _("In this chapter you'll be able configure the GRUB \
+ bootloader."),
+ 10)
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 23:05 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 85e73f36faa73e619f2a5ef7b453f0332d353c55
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 23:05:16 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 23:05:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=85e73f36
Finalizing your Gentoo Installation welcome screen
---
dispatch.py | 1 +
gui.py | 1 +
installclass.py | 1 +
iw/welcome_gui.py | 9 +++++++++
4 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index eb1f1c3..fedd25b 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -125,6 +125,7 @@ installSteps = [
("bootloader", ),
# Finalizing your Gentoo Installation
+ ("finalizing", finalizing, ),
("useraccounts", ),
("xorg", ),
diff --git a/gui.py b/gui.py
index c5171db..6ec72da 100755
--- a/gui.py
+++ b/gui.py
@@ -107,6 +107,7 @@ stepToClass = {
"upgbootloader": ("upgrade_bootloader_gui", "UpgradeBootloaderWindow"),
# Finalizing your Gentoo Installation
+ "finalizing" : ("welcome_gui", "WelcomeWindow"),
"useraccounts" : ("user_gui", "AccountWindow"),
"xorg" : ("xorg_gui", "XorgWindow"),
diff --git a/installclass.py b/installclass.py
index e779276..b3a6991 100644
--- a/installclass.py
+++ b/installclass.py
@@ -131,6 +131,7 @@ class BaseInstallClass(object):
"bootloader",
# Finalizing your Gentoo Installation
+ "finalizing",
"useraccounts",
"xorg",
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index b0cb77c..b7576e8 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -93,5 +93,14 @@ class WelcomeWindow (InstallWindow):
_("In this chapter you'll be able configure the GRUB \
bootloader."),
10)
+
+ def finalizing(self, anaconda):
+ self.setWindow(_("Finalizing your Gentoo Installation"),
+ _("You're almost done. We'll just create a user for \
+ your system.\n\
+ You'll also be able to choose if you'd like the X \
+ Window System and a desktop environment installed on \
+ your new system. "),
+ 11)
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 23:05 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 68c93fa367e2a5d29d5a27d78caa9c5a8da881c6
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:54:39 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:54:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=68c93fa3
Installing Necessary System Tools welcome screen
---
dispatch.py | 1 +
gui.py | 1 +
installclass.py | 1 +
iw/welcome_gui.py | 7 ++++++-
4 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index ed08b2e..3463346 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -115,6 +115,7 @@ installSteps = [
("accounts", ),
# Installing Necessary System Tools
+ ("systoolswelcome", systools, ),
("systools", ),
# Configuring the Bootloader
diff --git a/gui.py b/gui.py
index ee8e109..e9d0286 100755
--- a/gui.py
+++ b/gui.py
@@ -98,6 +98,7 @@ stepToClass = {
"accounts" : ("account_gui", "AccountWindow"),
# Installing Necessary System Tools
+ "systoolswelcome" : ("welcome_gui", "WelcomeWindow"),
"systools" : ("systools_gui", "SystoolsWindow"),
# Configuring the Bootloader
diff --git a/installclass.py b/installclass.py
index 95cbfcf..a3e93f1 100644
--- a/installclass.py
+++ b/installclass.py
@@ -122,6 +122,7 @@ class BaseInstallClass(object):
"accounts",
# Installing Necessary System Tools
+ "systoolswelcome",
"systools",
# Configuring the Bootloader
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 397c686..2adb51e 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -76,11 +76,16 @@ class WelcomeWindow (InstallWindow):
installer will just copy the LiveDVD kernel to your \
new system."),
7)
-
+
def configuresystem(self, anaconda):
self.setWindow(_("Configuring your System"),
_("In this chapter you will only have to set your root \
password as the rest is figured out automatically ;-)"),
8)
+
+ def systools(self, anaconda):
+ self.setWindow(_("Installing Necessary System Tools"),
+ _("In this chapter we help you choose and install some important tools. "),
+ 9)
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 23:05 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 8fe2ebf084d7ac055217e78fe02d823c0adc6605
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:43:28 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:43:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8fe2ebf0
Configuring the Kernel welcome screen
---
dispatch.py | 1 +
gui.py | 1 +
iw/welcome_gui.py | 9 +++++++++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index b7d3604..d75a6c9 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -105,6 +105,7 @@ installSteps = [
("use", ),
# Configuring the Kernel
+ ("configurekernel", configurekernel),
("timezone", ),
("setuptime", setupTimezone, ),
diff --git a/gui.py b/gui.py
index 05e2b85..d32deb2 100755
--- a/gui.py
+++ b/gui.py
@@ -89,6 +89,7 @@ stepToClass = {
"use": ("use_gui", "UseWindow"),
# Configuring the Kernel
+ "configurekernel" : ("welcome_gui", "WelcomeWindow"),
"timezone" : ("timezone_gui", "TimezoneWindow"),
# Configuring your System
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 7b55b4b..8a311b7 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -67,6 +67,15 @@ class WelcomeWindow (InstallWindow):
_("In this chapter you will set your Gentoo mirrors, \
select your profile and choose your the USE flags."),
6)
+
+ def configurekernel(self, anaconda):
+ self.setWindow(_("Configuring the Kernel"),
+ _("The Linux kernel is the core of every distribution. \
+ This chapter explains how to configure your kernel. \
+ You will only have to set your timezone, as the \
+ installer will just copy the LiveDVD kernel to your \
+ new system."),
+ 7)
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 23:05 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 6062f735d8c609757640021bce168bcbf063a96b
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:47:24 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:47:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=6062f735
Configuring your System welcome screen
---
dispatch.py | 3 ++-
gui.py | 1 +
installclass.py | 2 ++
iw/welcome_gui.py | 7 ++++++-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index d75a6c9..ed08b2e 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -105,11 +105,12 @@ installSteps = [
("use", ),
# Configuring the Kernel
- ("configurekernel", configurekernel),
+ ("configurekernel", configurekernel, ),
("timezone", ),
("setuptime", setupTimezone, ),
# Configuring your System
+ ("configuresystem", configuresystem, ),
("network", ),
("accounts", ),
diff --git a/gui.py b/gui.py
index d32deb2..ee8e109 100755
--- a/gui.py
+++ b/gui.py
@@ -93,6 +93,7 @@ stepToClass = {
"timezone" : ("timezone_gui", "TimezoneWindow"),
# Configuring your System
+ "configuresystem" : ("welcome_gui", "WelcomeWindow"),
"network" : ("network_gui", "NetworkWindow"),
"accounts" : ("account_gui", "AccountWindow"),
diff --git a/installclass.py b/installclass.py
index ef46eec..95cbfcf 100644
--- a/installclass.py
+++ b/installclass.py
@@ -112,10 +112,12 @@ class BaseInstallClass(object):
"use",
# Configuring the Kernel
+ "configurekernel",
"timezone",
"setuptime",
# Configuring your System
+ "configuresystem",
"network",
"accounts",
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 8a311b7..397c686 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -76,6 +76,11 @@ class WelcomeWindow (InstallWindow):
installer will just copy the LiveDVD kernel to your \
new system."),
7)
-
+
+ def configuresystem(self, anaconda):
+ self.setWindow(_("Configuring your System"),
+ _("In this chapter you will only have to set your root \
+ password as the rest is figured out automatically ;-)"),
+ 8)
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 23:05 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 305f2b85355cf359ff850ee3f7167590ea6fec1a
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:35:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:35:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=305f2b85
Installing the Gentoo Installation Files welcome screen
---
dispatch.py | 1 +
gui.py | 1 +
installclass.py | 1 +
iw/welcome_gui.py | 6 ++++++
4 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index 6cd9744..d2e02a4 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -94,6 +94,7 @@ installSteps = [
("enablefilesystems", turnOnFilesystems, ),
# Installing the Gentoo Installation Files
+ ("installationfiles", installationfiles, )
("makeconf", ),
# Installing the Gentoo Base System
diff --git a/gui.py b/gui.py
index be3980a..f7e726f 100755
--- a/gui.py
+++ b/gui.py
@@ -78,6 +78,7 @@ stepToClass = {
"upgrademigratefs" : ("upgrade_migratefs_gui", "UpgradeMigrateFSWindow"),
# Installing the Gentoo Installation Files
+ "installationfiles" : ("makeconf_gui", "MakeconfWindow"),
"makeconf" : ("makeconf_gui", "MakeconfWindow"),
# Installing the Gentoo Base System
diff --git a/installclass.py b/installclass.py
index eb8802e..ae88810 100644
--- a/installclass.py
+++ b/installclass.py
@@ -101,6 +101,7 @@ class BaseInstallClass(object):
"enablefilesystems",
# Installing the Gentoo Installation Files
+ "installationfiles",
"makeconf",
# Installing the Gentoo Base System
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 2bf674a..c38681b 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -55,6 +55,12 @@ class WelcomeWindow (InstallWindow):
necessary partitions. The following screens will \
help you choose the right disk configuration for \
your system."), 4)
+
+ def installationfiles(self, anaconda):
+ self.setWindow(_("Installing the Gentoo Installation Files"),
+ _("Gentoo installs work through a stage3 archive. In \
+ this chapter the installer will help you choose the \
+ right compilation options for your machine. "), 5)
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 22:26 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 14a6323d1a1847d7526e9c0a5de147ecf613bcbc
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:26:04 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:26:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=14a6323d
Preparing the Disks welcome screen
---
dispatch.py | 3 ++-
gui.py | 1 +
installclass.py | 1 +
iw/welcome_gui.py | 19 +++++++++++++------
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index 6ccc6ac..6cd9744 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -67,12 +67,13 @@ log = logging.getLogger("anaconda")
# gets passed in when we call the function.
installSteps = [
# Welcome
- ("welcome", ),
+ ("welcome", welcome, ),
("language", ),
("keyboard", ),
("betanag", betaNagScreen, ),
# Preparing the Disks
+ ("preparedisks", preparedisks, )
("filtertype", ),
("filter", ),
("storageinit", storageInitialize, ),
diff --git a/gui.py b/gui.py
index 6436e4e..be3980a 100755
--- a/gui.py
+++ b/gui.py
@@ -66,6 +66,7 @@ stepToClass = {
"keyboard" : ("kbd_gui", "KeyboardWindow"),
# Preparing the Disks
+ "preparedisks" : ("welcome_gui", "WelcomeWindow"),
"filtertype" : ("filter_type", "FilterTypeWindow"),
"filter" : ("filter_gui", "FilterWindow"),
"zfcpconfig" : ("zfcp_gui", "ZFCPWindow"),
diff --git a/installclass.py b/installclass.py
index c1744e0..eb8802e 100644
--- a/installclass.py
+++ b/installclass.py
@@ -87,6 +87,7 @@ class BaseInstallClass(object):
"betanag",
# Preparing the Disks
+ "preparedisks",
"filtertype",
"filter",
"storageinit",
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index c0b519f..2bf674a 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -28,15 +28,15 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class WelcomeWindow (InstallWindow):
- def setWindow(self, title, text, linktext, linkurl):
+ def setWindow(self, title, text, chapter, linktext=None):
(xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
title_ = self.xml.get_widget("title")
text_ = self.xml.get_widget("text")
title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
- title_.set_attribute("label", title)
+ title_.set_attribute("label", _("Chapter %i: %s") % (chapter, title))
text_.set_attribute("text", text)
- def welcomeScreen(self, anaconda):
+ def welcome(self, anaconda):
self.setWindow(_("Welcome to the Gentoo installer!"),
_("This wizard will take you through installing Gentoo \
on your computer. We will follow the official Gentoo \
@@ -45,9 +45,16 @@ class WelcomeWindow (InstallWindow):
link in the top-right corner of the window.\n\n\
We'll start off asking you for the language and \
keyboard layout you'd like the installer and your \
- future system to use."),
- "Gentoo Handbook",
- "http://www.gentoo.org/doc/en/handbook/")
+ future system to use. We will then skip straight to \
+ Chapter 4 and continue with the installation."),
+ 0, "Gentoo Handbook")
+
+ def preparedisks(self, anaconda):
+ self.setWindow(_("Preparing the Disks"),
+ _("To be able to install Gentoo, you must create the \
+ necessary partitions. The following screens will \
+ help you choose the right disk configuration for \
+ your system."), 4)
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-20 22:09 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-20 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 7cea2129006adb121199a18454fbd0b199a2df41
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:09:07 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:09:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=7cea2129
Add a welcome screen
---
gui.py | 2 +-
iw/welcome_gui.py | 59 +++++++++++++++++++---------------------------------
2 files changed, 23 insertions(+), 38 deletions(-)
diff --git a/gui.py b/gui.py
index b8a4a22..6436e4e 100755
--- a/gui.py
+++ b/gui.py
@@ -61,9 +61,9 @@ mainWindow = None
stepToClass = {
# Welcome
+ "welcome" : ("welcome_gui", "WelcomeWindow"),
"language" : ("language_gui", "LanguageWindow"),
"keyboard" : ("kbd_gui", "KeyboardWindow"),
- "welcome" : ("welcome_gui", "WelcomeWindow"),
# Preparing the Disks
"filtertype" : ("filter_type", "FilterTypeWindow"),
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 06cfd98..c0b519f 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -27,42 +27,27 @@ import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
class WelcomeWindow (InstallWindow):
+
+ def setWindow(self, title, text, linktext, linkurl):
+ (xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
+ title_ = self.xml.get_widget("title")
+ text_ = self.xml.get_widget("text")
+ title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
+ title_.set_attribute("label", title)
+ text_.set_attribute("text", text)
- windowTitle = "" #N_("Welcome")
+ def welcomeScreen(self, anaconda):
+ self.setWindow(_("Welcome to the Gentoo installer!"),
+ _("This wizard will take you through installing Gentoo \
+ on your computer. We will follow the official Gentoo \
+ Handbook (with a few changes) and if at any point \
+ you'd like to consult the handbook, you'll find the \
+ link in the top-right corner of the window.\n\n\
+ We'll start off asking you for the language and \
+ keyboard layout you'd like the installer and your \
+ future system to use."),
+ "Gentoo Handbook",
+ "http://www.gentoo.org/doc/en/handbook/")
- def __init__ (self, ics):
- InstallWindow.__init__ (self, ics)
- ics.setGrabNext (1)
- self.anaconda = None
-
- # WelcomeWindow tag="wel"
- def getScreen (self, anaconda):
- self.anaconda = anaconda
- # this is a bit ugly... but scale the image if we're not at 800x600
- (w, h) = self.ics.cw.window.get_size()
- if w >= 800:
- height = None
- width = None
- else:
- width = 500
- height = 258
- pix = gui.readImageFromFile("splash.png", width, height, dither=False)
- box = gtk.EventBox ()
- box.add (pix)
- return box
-
- def getNext (self):
- if self.anaconda.requiresNetworkInstall():
- self.anaconda.intf.messageWindow(_("Network Install Required"),
- _("Your installation source is set to "
- "a network location, but no netork "
- "devices were found on your "
- "system. To avoid a network "
- "installation, boot with the full "
- "DVD, full CD set, or do not pass "
- "a repo= parameter that specifies "
- "a network source."),
- type="custom",
- custom_icon="error",
- custom_buttons=[_("E_xit Installer")])
- sys.exit(0)
+ def getNext(self):
+ return None
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-07 18:02 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 18:02 UTC (permalink / raw
To: gentoo-commits
commit: 8c5ea20841f3fbb5eba8502f8552ec50e495ec4c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 18:02:05 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 18:02:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8c5ea208
Store sync mirrors
---
anaconda | 1 +
iw/mirrorselect-sync_gui.py | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/anaconda b/anaconda
index 5ee3567..6c8fb37 100755
--- a/anaconda
+++ b/anaconda
@@ -489,6 +489,7 @@ class Anaconda(object):
self.mediaDevice = None
self.methodstr = None
self.mirrors = []
+ self.mirrors_sync = []
self._network = None
self._platform = None
self.profile = None
diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
index 15a6bb5..3fbb4cc 100644
--- a/iw/mirrorselect-sync_gui.py
+++ b/iw/mirrorselect-sync_gui.py
@@ -37,6 +37,9 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class MirrorselectSyncWindow(InstallWindow):
def getNext(self):
+ for button in self.buttons:
+ if button.get_property("active"):
+ self.anaconda.mirrors_sync.append(button.get_property("label"))
return None
def getScreen(self, anaconda):
@@ -69,5 +72,6 @@ class MirrorselectSyncWindow(InstallWindow):
self.table = self.xml.get_widget("mirrors_table")
ms.addMirrors(self.table, self.mirrors, mirrors_parsed)
+ self.buttons = ms.buttons
return self.align
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-07 18:00 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 32a6fb7597928675d521fb9813ac07c3ad1f288c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 17:59:53 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 17:59:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=32a6fb75
Store mirrors
---
anaconda | 1 +
iw/mirrorselect_gui.py | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/anaconda b/anaconda
index 8513062..5ee3567 100755
--- a/anaconda
+++ b/anaconda
@@ -488,6 +488,7 @@ class Anaconda(object):
self.makeconf_silent = None
self.mediaDevice = None
self.methodstr = None
+ self.mirrors = []
self._network = None
self._platform = None
self.profile = None
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 48129a7..cad5efb 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -37,6 +37,9 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class MirrorselectWindow(InstallWindow):
def getNext(self):
+ for button in self.buttons:
+ if button.get_property("active"):
+ self.anaconda.mirrors.append(button.get_property("label"))
return None
def getScreen(self, anaconda):
@@ -64,6 +67,7 @@ class MirrorselectWindow(InstallWindow):
self.table = self.xml.get_widget("mirrors_table")
+ self.buttons = []
self.addMirrors(self.table, self.mirrors, mirrors_parsed)
return self.align
@@ -95,6 +99,7 @@ class MirrorselectWindow(InstallWindow):
table.attach(cb, 0, 1, rows, rows+1, gtk.FILL)
table.attach(name, 1, 2, rows, rows+1)
table.attach(flags, 2, 3, rows, rows+1)
+ self.buttons.append(cb)
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-07 17:22 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 17:22 UTC (permalink / raw
To: gentoo-commits
commit: a014ba2de19b95f38c9f39261287f8988876cea3
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 17:22:29 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 17:22:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=a014ba2d
keep makeconf settings
---
anaconda | 6 ++++++
iw/makeconf_gui.py | 6 ++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/anaconda b/anaconda
index 586aa3a..8513062 100755
--- a/anaconda
+++ b/anaconda
@@ -480,6 +480,12 @@ class Anaconda(object):
self.fullScreen = False
self.keyboard = keyboard.Keyboard()
self.ksdata = None
+ self.makeconf_march = None
+ self.makeconf_opt = None
+ self.makeconf_pipe = None
+ self.makeconf_jobs = None
+ self.makeconf_load = None
+ self.makeconf_silent = None
self.mediaDevice = None
self.methodstr = None
self._network = None
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 59db8d3..56830c0 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -35,6 +35,12 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class MakeconfWindow(InstallWindow):
def getNext(self):
+ self.anaconda.makeconf_march = self.march
+ self.anaconda.makeconf_opt = self.opt
+ self.anaconda.makeconf_pipe = self.pipe
+ self.anaconda.makeconf_jobs = self.jobs
+ self.anaconda.makeconf_load = self.load
+ self.anaconda.makeconf_silent = self.silent
return None
def getScreen(self, anaconda):
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-04 22:24 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 22:24 UTC (permalink / raw
To: gentoo-commits
commit: 3176718c5ff9bea0d3c5e419f204781bb0610604
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 22:24:15 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 22:24:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3176718c
Enable actual profile selection
---
anaconda | 1 +
iw/profile_gui.py | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/anaconda b/anaconda
index f785ef7..586aa3a 100755
--- a/anaconda
+++ b/anaconda
@@ -484,6 +484,7 @@ class Anaconda(object):
self.methodstr = None
self._network = None
self._platform = None
+ self.profile = None
self.proxy = None
self.proxyUsername = None
self.proxyPassword = None
diff --git a/iw/profile_gui.py b/iw/profile_gui.py
index 79ed4a3..de3369e 100644
--- a/iw/profile_gui.py
+++ b/iw/profile_gui.py
@@ -36,6 +36,9 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class ProfileWindow(InstallWindow):
def getNext(self):
+ for button is self.buttons:
+ if button.get_property("active")
+ self.anaconda.profile = button.get_property("label")
return None
def getScreen(self, anaconda):
@@ -56,9 +59,14 @@ class ProfileWindow(InstallWindow):
box = self.xml.get_widget("profiles_box")
+ # This isn't on the page but is required to make a group dynamically.
+ dummy = gtk.RadioButton(label=profile)
+
for profile in profiles:
- cb = gtk.CheckButton(label=profile)
+ cb = gtk.RadioButton(dummy, label=profile)
box.pack_start(cb)
-
+
+ self.buttons = dummy.get_group()
+
return self.align
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-04 16:04 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 48a22c0559e39d4d0affed78130160a62d86d579
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 16:04:23 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 16:04:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=48a22c05
Yirst version of systools
---
dispatch.py | 2 +-
gui.py | 1 +
installclass.py | 1 +
iw/systools_gui.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index ff469d9..ec7a447 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -110,7 +110,7 @@ installSteps = [
("accounts", ),
# Installing Necessary System Tools
- # syslog and cron
+ ("systools", ),
# Configuring the Bootloader
("upgbootloader", ),
diff --git a/gui.py b/gui.py
index 0a5b161..6188182 100755
--- a/gui.py
+++ b/gui.py
@@ -93,6 +93,7 @@ stepToClass = {
"accounts" : ("account_gui", "AccountWindow"),
# Installing Necessary System Tools
+ "systools" : ("systools_gui", "SystoolsWindow"),
# Configuring the Bootloader
"bootloader": ("bootloader_main_gui", "MainBootloaderWindow"),
diff --git a/installclass.py b/installclass.py
index fe39e3a..6efe31b 100644
--- a/installclass.py
+++ b/installclass.py
@@ -117,6 +117,7 @@ class BaseInstallClass(object):
"accounts",
# Installing Necessary System Tools
+ "systools",
# Configuring the Bootloader
"bootloadersetup",
diff --git a/iw/systools_gui.py b/iw/systools_gui.py
new file mode 100644
index 0000000..f1e3773
--- /dev/null
+++ b/iw/systools_gui.py
@@ -0,0 +1,47 @@
+#
+# systools_gui.py: gui cron and system logger selection.
+#
+# Copyright (C) 2011 wiktor w brodlo
+# Copyright (C) 2011 Gentoo Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import string
+import gtk
+import gtk.glade
+import gtk.gdk
+import gobject
+import pango
+import sys
+import gui
+
+from iw_gui import *
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+class SystoolWindow(InstallWindow):
+ def getNext(self):
+ return None
+
+ def getScreen(self, anaconda):
+ self.anaconda = anaconda
+ self.intf = anaconda.intf
+
+ (self.xml, self.align) = gui.getGladeWidget("systool.glade", "systool_align")
+
+ return self.align
+
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-03 19:18 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 19:18 UTC (permalink / raw
To: gentoo-commits
commit: d098ced2c10103fac6e71bb7a2704326d785a51e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 19:18:40 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 19:18:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=d098ced2
mirrorselect-sync
---
dispatch.py | 2 +-
gui.py | 2 +-
installclass.py | 1 +
iw/mirrorselect-sync_gui.py | 70 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index 073dc2c..4ade775 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -97,7 +97,7 @@ installSteps = [
# Installing the Gentoo Base System
("mirrorselect", ),
- #("mirrorselect-sync", ),
+ ("mirrorselect-sync", ),
# profile
# use
diff --git a/gui.py b/gui.py
index addce82..41f127c 100755
--- a/gui.py
+++ b/gui.py
@@ -81,7 +81,7 @@ stepToClass = {
# Installing the Gentoo Base System
"mirrorselect": ("mirrorselect_gui", "MirrorselectWindow"),
- #("mirrorselect-sync", ),
+ "mirrorselect-sync": ("mirrorselect-sync_gui", "MirrorselectSyncWindow"),
# Configuring the Kernel
"timezone" : ("timezone_gui", "TimezoneWindow"),
diff --git a/installclass.py b/installclass.py
index 561ccdf..28104d8 100644
--- a/installclass.py
+++ b/installclass.py
@@ -104,6 +104,7 @@ class BaseInstallClass(object):
# Installing the Gentoo Base System
"mirrorselect",
+ "mirrorselect-sync",
# Configuring the Kernel
"timezone",
diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
new file mode 100644
index 0000000..17d84ec
--- /dev/null
+++ b/iw/mirrorselect-sync_gui.py
@@ -0,0 +1,70 @@
+#
+# mirrorselect-sync_gui.py: gui mirrorselect.
+#
+# Copyright (C) 2011 wiktor w brodlo
+# Copyright (C) 2011 Gentoo Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import string
+import gtk
+import gtk.glade
+import gtk.gdk
+import gobject
+import pango
+import sys
+import gui
+import os
+from mirrorselect_gui import MirrorselectWindow
+
+from iw_gui import *
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+class MirrorselectSyncWindow(InstallWindow):
+ def getNext(self):
+ return None
+
+ def getScreen(self, anaconda):
+ self.anaconda = anaconda
+ self.intf = anaconda.intf
+ ms = MirrorselectWindow()
+
+ (self.xml, self.align) = gui.getGladeWidget("mirrorselect.glade", "mirrorselect_align")
+
+ mirrorsf = None
+
+ while mirrorsf == None:
+ # Try downloading the mirrorlist
+ mirrorsf = ms.downloadMirrorlist()
+ # if failed,
+ if mirrorsf == None:
+ md = gtk.MessageDialog(buttons=gtk.BUTTONS_YES_NO)
+ md.set_property("title", _("Failed to download mirrorlist"))
+ md.set_property("text", _("Failed to download the mirror list. Would you like to try again?\nPressing 'No' will abort the installation."))
+ if md.run() == gtk.RESPONSE_NO:
+ md.destroy()
+ InstallControlWindow._doExit([])
+
+ mirrors_parsed = ms.parseMirrors(mirrorsf)
+ self.mirrors = ms.mirrorList(mirrors_parsed, "rsync")
+
+ self.table = self.xml.get_widget("mirrors_table")
+
+ ms.addMirrors(self.table, self.mirrors, mirrors_parsed)
+
+ return self.align
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-07-03 18:59 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 18:59 UTC (permalink / raw
To: gentoo-commits
commit: dabcdc8fbf8afce8421865501d46d437137cae02
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 18:52:33 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 18:52:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=dabcdc8f
re-enable makeconf
---
dispatch.py | 2 +-
gui.py | 2 +-
iw/makeconf_gui.py | 6 ------
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index a3dd360..073dc2c 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -93,7 +93,7 @@ installSteps = [
("enablefilesystems", turnOnFilesystems, ),
# Installing the Gentoo Installation Files
- #("makeconf", ),
+ ("makeconf", ),
# Installing the Gentoo Base System
("mirrorselect", ),
diff --git a/gui.py b/gui.py
index 343d55a..addce82 100755
--- a/gui.py
+++ b/gui.py
@@ -77,7 +77,7 @@ stepToClass = {
"upgrademigratefs" : ("upgrade_migratefs_gui", "UpgradeMigrateFSWindow"),
# Installing the Gentoo Installation Files
- #"makeconf" : ("makeconf_gui", "MakeconfWindow"),
+ "makeconf" : ("makeconf_gui", "MakeconfWindow"),
# Installing the Gentoo Base System
"mirrorselect": ("mirrorselect_gui", "MirrorselectWindow"),
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 9792021..59db8d3 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -35,12 +35,6 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class MakeconfWindow(InstallWindow):
def getNext(self):
- self.anaconda.makeconf.march = self.march.get_active_text()
- self.anaconda.makeconf.opt = self.opt.get_active_text()
- self.anaconda.makeconf.pipe = self.pipe.get_active()
- self.anaconda.makeconf.jobs = self.jobs.get_value_as_int()
- self.anaconda.makeconf.load = self.load.get_value_as_int()
- self.anaconda.makeconf.silent = self.silent.get_active()
return None
def getScreen(self, anaconda):
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/anaconda:master commit in: /, iw/
@ 2011-06-30 22:12 Wiktor W Brodlo
0 siblings, 0 replies; 19+ messages in thread
From: Wiktor W Brodlo @ 2011-06-30 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 5ec42e3b8e6de8e7935891fb9de800d7ec2c4b1b
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jun 30 22:12:36 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jun 30 22:12:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5ec42e3b
Enable make.conf configuration screen (no config written yet)
---
dispatch.py | 2 +-
iw/makeconf_gui.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index 9688c18..6726ea8 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -93,7 +93,7 @@ installSteps = [
("enablefilesystems", turnOnFilesystems, ),
# Installing the Gentoo Installation Files
- # make.conf
+ ("makeconf"),
# Installing the Gentoo Base System
# mirrorselect
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
new file mode 100644
index 0000000..6c1d3fd
--- /dev/null
+++ b/iw/makeconf_gui.py
@@ -0,0 +1,61 @@
+#
+# makeconf_gui.py: gui make.conf settings.
+#
+# Copyright (C) 2011 wiktor w brodlo
+# Copyright (C) 2011 Gentoo Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import string
+import gtk
+import gtk.glade
+import gtk.gdk
+import gobject
+import pango
+import sys
+
+from iw_gui import *
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+class MakeconfWindow(InstallWindow):
+ def getNext(self):
+ self.anaconda.makeconf.march = self.march.get_active_text()
+ self.anaconda.makeconf.opt = self.opt.get_active_text()
+ self.anaconda.makeconf.pipe = self.pipe.get_active()
+ self.anaconda.makeconf.jobs = self.jobs.get_value_as_int()
+ self.anaconda.makeconf.load = self.load.get_value_as_int()
+ self.anaconda.makeconf.silent = self.silent.get_active()
+ return None
+
+ def getScreen(self, anaconda):
+ self.anaconda = anaconda
+ self.intf = anaconda.intf
+
+ (self.xml, self.align) = gui.getGladeWidget("makeconf.glade", "makeconf_align")
+
+ self.march = self.xml.get_widget("march")
+ self.opt = self.xml.get_widget("opt")
+ self.pipe = self.xml.get_widget("pipe")
+ self.jobs = self.xml.get_widget("jobs")
+ self.load = self.xml.get_widget("load")
+ self.silent = self.xml.get_widget("silent")
+
+ # TODO: Get a list of arches available for this installation.
+
+ return self.align
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2011-07-21 20:33 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-20 23:05 [gentoo-commits] proj/anaconda:master commit in: /, iw/ Wiktor W Brodlo
-- strict thread matches above, loose matches on Subject: below --
2011-07-21 20:33 Wiktor W Brodlo
2011-07-21 14:12 Wiktor W Brodlo
2011-07-20 23:05 Wiktor W Brodlo
2011-07-20 23:05 Wiktor W Brodlo
2011-07-20 23:05 Wiktor W Brodlo
2011-07-20 23:05 Wiktor W Brodlo
2011-07-20 23:05 Wiktor W Brodlo
2011-07-20 23:05 Wiktor W Brodlo
2011-07-20 22:26 Wiktor W Brodlo
2011-07-20 22:09 Wiktor W Brodlo
2011-07-07 18:02 Wiktor W Brodlo
2011-07-07 18:00 Wiktor W Brodlo
2011-07-07 17:22 Wiktor W Brodlo
2011-07-04 22:24 Wiktor W Brodlo
2011-07-04 16:04 Wiktor W Brodlo
2011-07-03 19:18 Wiktor W Brodlo
2011-07-03 18:59 Wiktor W Brodlo
2011-06-30 22:12 Wiktor W Brodlo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox