[PC-BSD Commits] r164 - pcbsd/trunk/PCInstall

svn at pcbsd.org svn at pcbsd.org
Mon Apr 9 09:49:01 PDT 2007


Author: kris
Date: 2007-04-09 17:49:01 +0100 (Mon, 09 Apr 2007)
New Revision: 164

Added:
   pcbsd/trunk/PCInstall/background.png
   pcbsd/trunk/PCInstall/background.ui
   pcbsd/trunk/PCInstall/background.ui.h
Modified:
   pcbsd/trunk/PCInstall/PCInstall.pro
   pcbsd/trunk/PCInstall/main.cpp
   pcbsd/trunk/PCInstall/pcinstall.ui
   pcbsd/trunk/PCInstall/pcinstall.ui.h
Log:
Updated PCInstall to work without a WM

Modified: pcbsd/trunk/PCInstall/PCInstall.pro
===================================================================
--- pcbsd/trunk/PCInstall/PCInstall.pro	2007-04-09 15:58:08 UTC (rev 163)
+++ pcbsd/trunk/PCInstall/PCInstall.pro	2007-04-09 16:49:01 UTC (rev 164)
@@ -6,7 +6,8 @@
 SOURCES	+= main.cpp
 
 FORMS	= pcinstall.ui \
-	addpartitiondialog.ui
+	addpartitiondialog.ui \
+	background.ui
 
 IMAGES	= keyboard.png \
 	locale.png \

Added: pcbsd/trunk/PCInstall/background.png


Property changes on: pcbsd/trunk/PCInstall/background.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/PCInstall/background.ui

Added: pcbsd/trunk/PCInstall/background.ui.h

Modified: pcbsd/trunk/PCInstall/main.cpp
===================================================================
--- pcbsd/trunk/PCInstall/main.cpp	2007-04-09 15:58:08 UTC (rev 163)
+++ pcbsd/trunk/PCInstall/main.cpp	2007-04-09 16:49:01 UTC (rev 164)
@@ -1,13 +1,18 @@
 #include <qapplication.h>
 #include <qstylefactory.h>
 #include "pcinstall.h"
+#include "background.h"
 #include "global.h"
 
 int main( int argc, char ** argv )
 {
     
     QApplication a( argc, argv );
-    PCInstall w(0,0, FALSE, Qt::WStyle_Customize | Qt::WStyle_Dialog);
+    //QWidget background(0, "Background", Qt::WindowFullScreen);
+
+    background b(0,0, FALSE);
+
+    PCInstall w(&b, FALSE, Qt::WStyle_Customize | Qt::WStyle_Dialog);
     
     //QWidget *tmp = QApplication::desktop();
     w.setGeometry(64, 48, 896, 672);
@@ -16,6 +21,7 @@
     
     w.ProgramInit(); 
     w.setStyle(QStyleFactory::create( "Plastik" ));
+    b.showFullScreen();
     w.show();
     a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
    

Modified: pcbsd/trunk/PCInstall/pcinstall.ui
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui	2007-04-09 15:58:08 UTC (rev 163)
+++ pcbsd/trunk/PCInstall/pcinstall.ui	2007-04-09 16:49:01 UTC (rev 164)
@@ -8893,6 +8893,7 @@
 <slots>
     <slot>PageChangedSlot( const QString &amp; Page )</slot>
     <slot>ChangeLicAgreeSlot( bool clicked )</slot>
+    <slot>accept()</slot>
     <slot access="private">CheckAccountInfo()</slot>
     <slot access="private">passwordTextChanged( const QString &amp; Text )</slot>
     <slot>reject()</slot>

Modified: pcbsd/trunk/PCInstall/pcinstall.ui.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui.h	2007-04-09 15:58:08 UTC (rev 163)
+++ pcbsd/trunk/PCInstall/pcinstall.ui.h	2007-04-09 16:49:01 UTC (rev 164)
@@ -519,7 +519,7 @@
 {
     switch( QMessageBox::warning( this, tr("Exit Confirmation"), tr("Are you sure you want to quit? The system will be rebooted!"), tr("OK"), tr("Cancel"), 0, 0, 1 ) ) {
 	     case 0: // The user clicked the OK again button or pressed Enter
-		 done(1);
+		 exit(1);
 		 break;
 	     case 1: // The user clicked the Quit or pressed Escape
 		 break;
@@ -1375,7 +1375,7 @@
 		startMountCD();
 		 break;
 	     case 1: // The user clicked the Quit or pressed Escape
-		  done(1);
+		  exit(1);
 		 break;
 	     }
     }
@@ -1845,7 +1845,7 @@
     {
 	    QMessageBox::critical( 0, "Install Error!",
         tr("An error occured while extracting the system image! Please check the install CD, or try selecting 'Safe Mode' \nwhen the installation CD begins booting. The system will now reboot.") );
-	    done(1);
+	    exit(1);
      } else {
 	 setupUsersSlot();
      }
@@ -3215,3 +3215,10 @@
 	QMessageBox::warning( this, tr("PCBSD Installer"),  tr("Failed Starting SetKeyboard.sh"), tr("Retry"), tr("Quit"), 0, 0, 1 );
     }
 }
+
+void PCInstall::accept()
+{
+ exit(0);
+
+}
+



More information about the Commits mailing list