SF.net SVN: morphix: [2379] trunk/morphixinstaller2

Revision: 2379
Author:   alextreme
Date:     2006-08-01 16:41:30 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2379&view=rev

Log Message:
-----------
  * no you're not

Modified Paths:
--------------
    trunk/morphixinstaller2/morphixinstaller.glade
    trunk/morphixinstaller2/morphixinstaller.py
Modified: trunk/morphixinstaller2/morphixinstaller.glade
===================================================================
--- trunk/morphixinstaller2/morphixinstaller.glade	2006-08-01 23:33:06 UTC (rev 2378)
+++ trunk/morphixinstaller2/morphixinstaller.glade	2006-08-01 23:41:30 UTC (rev 2379)
@@ -3414,7 +3414,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-11</property>
-	      <signal name="clicked" handler="gtk_widget_show" object="HelpDialog" last_modification_time="Mon, 17 Feb 2003 23:24:05 GMT"/>
+	      <signal name="clicked" handler="displayHelp" object="HelpDialog" last_modification_time="Tue, 01 Aug 2006 23:38:12 GMT"/>
 	    </widget>
 	  </child>
 
@@ -3430,7 +3430,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="gtk_main_quit" last_modification_time="Fri, 31 Jan 2003 23:30:33 GMT"/>
+	      <signal name="clicked" handler="miSignalQuit" last_modification_time="Tue, 01 Aug 2006 23:37:29 GMT"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -3673,13 +3673,13 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
-	      <signal name="clicked" handler="gtk_main_quit" last_modification_time="Sat, 01 Feb 2003 22:01:49 GMT"/>
+	      <signal name="clicked" handler="miSignalQuit" last_modification_time="Tue, 01 Aug 2006 23:40:28 GMT"/>
 	    </widget>
 	  </child>
 
 	  <child>
 	    <widget class="GtkButton" id="backbuttonErrorLabel">
-	      <property name="visible">True</property>
+	      <property name="sensitive">False</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-go-back</property>

Modified: trunk/morphixinstaller2/morphixinstaller.py
===================================================================
--- trunk/morphixinstaller2/morphixinstaller.py	2006-08-01 23:33:06 UTC (rev 2378)
+++ trunk/morphixinstaller2/morphixinstaller.py	2006-08-01 23:41:30 UTC (rev 2379)
@@ -182,6 +182,8 @@
 		self.hide(self.SelectRoot, "SelectRoot")
 		self.show(self.DoFilesystem,  "DoFilesystem")
 
+		# Show DoSwap screen here!
+
 		if (self.installer.makeSwap() == False):
 			self.miSignalError("Unable to make swap partition")
 
@@ -195,8 +197,11 @@
 		
 		if (self.installer.buildRoot() == False):
 			self.miSignalError("Unable to copy and setup filesystem")		
+			return
+
 		if (self.installer.setupInitrd() == False):
 			self.miSignalError("Unable to setup initrd")
+			return
 
 		self.hide(self.DoInstall,  "DoInstall")
 		self.show(self.EnterHost,  "EnterHost")
@@ -210,7 +215,8 @@
 			hostname = "MyBox"
 
 		if (self.installer.setupEtcFiles(hostname) == false):
-			miSignalError("Unable to set hostname, aborting")
+			self.miSignalError("Unable to set hostname, aborting")
+			return
 
 		self.hide(self.EnterHost,  "EnterHost")		
 		self.show(self.EnterRoot,  "EnterRoot")		
@@ -224,7 +230,8 @@
 			return
 	
 		if (self.installer.setRootPassword(entryRoot1.get_text()) == False):
-			miSignalError("Unable to set root password, aborting")
+			self.miSignalError("Unable to set root password, aborting")
+			return
 
 		self.hide(self.EnterRoot,  "EnterRoot")		
 		self.show(self.EnterUser,  "EnterUser")
@@ -240,6 +247,8 @@
 
 		if (self.installer.setupHomeDirectory(entryUser.get_text(), entryUserPass1.get_text()) == false):
 			miSignalError("Unable to set up user and home directory for user")
+			return
+
 		self.installer.execPostInstallScript(entryUser.get_text())
 		
 		self.hide(self.EnterUser,  "EnterUser")		
@@ -262,13 +271,16 @@
 
 		self.installer.setupGrub(mode)
 
-	def SignalError(self,error):
-		print("An error occurred:")
-		print(error) 
-		print("Aborting install. Please contact the developers with the above error message, the options selected and any system details.")
-		sys.exit()
+	def miSignalError(self,error):
+		err_str = "An error occurred:\n" + error + "\n" + "Aborting install. Please contact the developers with the above error message, the options selected and any system details."
+		print(err_str)
 
+		error = self.SelectBoot.get_widget("labelErrorLabel")
+		error.set_text(err_str)
+		self.show(self.ErrorLabel,  "ErrorLabel")
+
 	def miSignalQuit(self, widget):
+		print("Install exited normally")
 		sys.exit()
 
 	def displayHelp(self, widget):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV