[PC-BSD Commits] r17438 - pcbsd/current/src-qt4/warden-gui

svn at pcbsd.org svn at pcbsd.org
Mon Jun 25 13:14:30 PDT 2012


Author: kris
Date: 2012-06-25 20:14:29 +0000 (Mon, 25 Jun 2012)
New Revision: 17438

Modified:
   pcbsd/current/src-qt4/warden-gui/qrc_warden.cpp
   pcbsd/current/src-qt4/warden-gui/wizardNewJail.cpp
   pcbsd/current/src-qt4/warden-gui/wizardNewJail.h
   pcbsd/current/src-qt4/warden-gui/wizardNewJail.ui
Log:

Add the initial linux GUI code for adding new jails



Modified: pcbsd/current/src-qt4/warden-gui/qrc_warden.cpp
===================================================================
--- pcbsd/current/src-qt4/warden-gui/qrc_warden.cpp	2012-06-25 19:57:20 UTC (rev 17437)
+++ pcbsd/current/src-qt4/warden-gui/qrc_warden.cpp	2012-06-25 20:14:29 UTC (rev 17438)
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Resource object code
 **
-** Created: Thu Jun 14 12:34:51 2012
-**      by: The Resource Compiler for Qt version 4.8.1
+** Created: Mon Jun 25 16:04:57 2012
+**      by: The Resource Compiler for Qt version 4.8.2
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
@@ -10,7 +10,7 @@
 #include <QtCore/qglobal.h>
 
 static const unsigned char qt_resource_data[] = {
-  // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/edit_remove.png
+  // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/edit_remove.png
   0x0,0x0,0x13,0x2b,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -320,7 +320,7 @@
   0xf1,0x78,0x3c,0x1e,0x8f,0xc7,0xe3,0xf1,0x78,0x3c,0x1e,0x8f,0xc7,0xe3,0xf1,0x78,
   0x3c,0x9e,0xff,0xb7,0xfe,0x7,0x35,0x86,0x28,0x8b,0xc7,0x68,0x50,0xff,0x0,0x0,
   0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/edit_add.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/edit_add.png
   0x0,0x0,0x29,0xc7,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -992,7 +992,7 @@
   0x26,0x18,0x1f,0xe4,0xf4,0x1,0x2b,0x76,0x46,0xc1,0xd1,0xfd,0xf7,0x9a,0x31,0x80,
   0xff,0x5,0xa3,0x84,0x58,0xcb,0x62,0x2b,0x97,0x3,0x0,0x0,0x0,0x0,0x49,0x45,
   0x4e,0x44,0xae,0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/warden.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/warden.png
   0x0,0x0,0x5e,0x8c,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -2508,7 +2508,7 @@
   0xe4,0xb3,0xbd,0xfe,0xe0,0xe2,0x1f,0x64,0x39,0xf5,0x8f,0xfb,0x25,0xfe,0xf4,0x8b,
   0xf8,0x1f,0xfb,0xfa,0xff,0x7,0x0,0x41,0x3e,0xe1,0xf7,0x5f,0x58,0xce,0x40,0x0,
   0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/utilities-terminal.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/utilities-terminal.png
   0x0,0x0,0x8,0x3e,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -2643,7 +2643,7 @@
   0xe,0xf9,0x66,0xb,0x50,0xd2,0x5f,0x4,0x2a,0x1b,0x5c,0xe6,0x99,0x5,0xf0,0xd2,
   0x42,0x14,0xf1,0x7f,0x1,0xbc,0xcc,0xf0,0x1f,0x17,0xc7,0x1c,0xda,0xf8,0xf0,0x89,
   0x69,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/stopped.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/stopped.png
   0x0,0x0,0x4,0x79,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -2718,7 +2718,7 @@
   0x7c,0x38,0xc9,0x94,0x9b,0x8,0x71,0xbd,0xbb,0x5a,0x58,0xe5,0xb2,0x5b,0xbc,0xd8,
   0xa6,0xcf,0xfe,0x1,0x4,0xa8,0xe5,0xf1,0xf0,0xc2,0xe8,0x8a,0x0,0x0,0x0,0x0,
   0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/folder.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/folder.png
   0x0,0x0,0x2,0x54,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -2759,7 +2759,7 @@
   0x8f,0x1,0x5c,0xd1,0xda,0x55,0x35,0x12,0xb9,0x41,0xdd,0x56,0xe6,0xd6,0x77,0x87,
   0xc0,0x9f,0x14,0xea,0xa4,0x56,0x9f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,
   0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/restoresnap.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/restoresnap.png
   0x0,0x0,0x8,0x86,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -2899,7 +2899,7 @@
   0xf9,0x44,0xe4,0xc3,0x28,0xe0,0xb8,0xdc,0x23,0xc3,0xdb,0x7e,0x39,0xfd,0x7f,0xea,
   0x3f,0xf3,0x33,0xcc,0xf5,0x2a,0xfc,0xfd,0xe4,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,
   0x44,0xae,0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/updateavail.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/updateavail.png
   0x0,0x0,0x5,0x4a,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -2987,7 +2987,7 @@
   0xbb,0x69,0x2,0x4d,0xef,0x81,0x11,0x10,0x56,0xc3,0xae,0x42,0x36,0xbf,0xf,0xee,
   0xf9,0xdf,0xf3,0xbf,0x0,0xdc,0x19,0x0,0xc3,0x9,0xc5,0x7a,0xd4,0x0,0x0,0x0,
   0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/running.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/running.png
   0x0,0x0,0x4,0x87,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -3063,7 +3063,7 @@
   0xc7,0xc0,0xc9,0xda,0x3,0xc,0xf4,0x2f,0xc,0xbf,0xff,0x32,0x50,0x2,0x0,0x2,
   0xc,0x0,0x19,0xaa,0x77,0x25,0x56,0xd4,0x83,0x78,0x0,0x0,0x0,0x0,0x49,0x45,
   0x4e,0x44,0xae,0x42,0x60,0x82,
-    // /usr/home/kris/source/pcbsd/current/src-qt4/warden-gui/cell.png
+    // /usr/home/kmoore/source/pcbsd/current/src-qt4/warden-gui/cell.png
   0x0,0x0,0x5b,0x4d,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,

Modified: pcbsd/current/src-qt4/warden-gui/wizardNewJail.cpp
===================================================================
--- pcbsd/current/src-qt4/warden-gui/wizardNewJail.cpp	2012-06-25 19:57:20 UTC (rev 17437)
+++ pcbsd/current/src-qt4/warden-gui/wizardNewJail.cpp	2012-06-25 20:14:29 UTC (rev 17438)
@@ -10,6 +10,7 @@
 ** destructor.
 *****************************************************************************/
 #include "wizardNewJail.h"
+#include <QFileDialog>
 
 
 void wizardNewJail::programInit()
@@ -19,6 +20,8 @@
     connect(lineRoot2, SIGNAL(textChanged ( const QString & )), this, SLOT(slotCheckComplete() ) );
     connect(lineIP, SIGNAL(textChanged ( const QString & )), this, SLOT(slotCheckComplete() ) );
     connect(lineHost, SIGNAL(textChanged ( const QString & )), this, SLOT(slotCheckComplete() ) );
+    connect(lineLinuxScript, SIGNAL(textChanged ( const QString & )), this, SLOT(slotCheckComplete() ) );
+    connect(pushLinuxScript, SIGNAL(clicked()), this, SLOT(slotSelectLinuxScript()) );
 }
 
 
@@ -51,6 +54,11 @@
          else
            button(QWizard::NextButton)->setEnabled(true);
          return true;
+     case Page_Linux:
+	  if ( lineLinuxScript->text().isEmpty() ) {
+            button(QWizard::NextButton)->setEnabled(false);
+	    return false;
+	  }
      default:
          button(QWizard::NextButton)->setEnabled(true);
          return true;
@@ -66,6 +74,19 @@
          if (radioPortsJail->isChecked())
            return Page_Opts;
        break;
+       case Page_Root:
+	 checkSystemSource->setHidden(false); 
+	 checkPortsTree->setHidden(false); 
+         if (radioLinuxJail->isChecked())
+           return Page_Linux;
+	 else
+           return Page_Opts;
+       break;
+       case Page_Linux:
+	   checkSystemSource->setHidden(true); 
+	   checkPortsTree->setHidden(true); 
+           return Page_Opts;
+       break;
        case Page_Opts:
          return -1;
        break;
@@ -81,3 +102,10 @@
    validatePage();
 }
 
+void wizardNewJail::slotSelectLinuxScript()
+{
+   lineLinuxScript->setText(QFileDialog::getOpenFileName(this,
+   tr("Select Script"), "/usr/local/share/warden/linux-installs", tr("Linux install files (*)")));
+}
+
+

Modified: pcbsd/current/src-qt4/warden-gui/wizardNewJail.h
===================================================================
--- pcbsd/current/src-qt4/warden-gui/wizardNewJail.h	2012-06-25 19:57:20 UTC (rev 17437)
+++ pcbsd/current/src-qt4/warden-gui/wizardNewJail.h	2012-06-25 20:14:29 UTC (rev 17438)
@@ -23,10 +23,11 @@
     virtual void accept();
     void slotClose();
     void slotCheckComplete();
+    void slotSelectLinuxScript();
 
 private:
     bool validatePage();
-    enum { Page_IP, Page_Type, Page_Root, Page_Opts };
+    enum { Page_IP, Page_Type, Page_Root, Page_Linux, Page_Opts };
 
 signals:
      void create(const QString &, const QString &, bool, const QString &,  bool, bool, bool);

Modified: pcbsd/current/src-qt4/warden-gui/wizardNewJail.ui
===================================================================
(Binary files differ)



More information about the Commits mailing list