Changeset 18384 in vbox for trunk/src

Timestamp:

Mar 27, 2009 12:28:02 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: remove import dependency

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxApplianceEditorWgt.h (modified) (2 diffs)
• include/VBoxImportApplianceWgt.h (modified) (1 diff)
• src/VBoxApplianceEditorWgt.cpp (modified) (11 diffs)
• src/VBoxImportApplianceWgt.cpp (modified) (2 diffs)
• src/VBoxImportApplianceWzd.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxApplianceEditorWgt.h

@@ -245 +245 @@
     CAppliance* appliance() const { return mAppliance; }
 
+    static int minGuestRAM() { return mMinGuestRAM; }
+    static int maxGuestRAM() { return mMaxGuestRAM; }
+    static int minGuestCPUCount() { return mMinGuestCPUCount; }
+    static int maxGuestCPUCount() { return mMaxGuestCPUCount; }
+
 public slots:
     void restoreDefaults();
@@ -254 +259 @@
     CAppliance *mAppliance;
     VirtualSystemModel *mModel;
+
+private:
+    static void initSystemSettings();
+
+    /* Private member vars */
+    static int mMinGuestRAM;
+    static int mMaxGuestRAM;
+    static int mMinGuestCPUCount;
+    static int mMaxGuestCPUCount;
 };
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxImportApplianceWgt.h

@@ -39 +39 @@
 
     QList < QPair <QString, QString> > licenseAgreements() const;
-
-    static int minGuestRAM() { return mMinGuestRAM; }
-    static int maxGuestRAM() { return mMaxGuestRAM; }
-    static int minGuestCPUCount() { return mMinGuestCPUCount; }
-    static int maxGuestCPUCount() { return mMaxGuestCPUCount; }
-
-private:
-    static void initSystemSettings();
-
-    /* Private member vars */
-    static int mMinGuestRAM;
-    static int mMaxGuestRAM;
-    static int mMinGuestCPUCount;
-    static int mMaxGuestCPUCount;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxApplianceEditorWgt.cpp

@@ -23 +23 @@
 /* VBox includes */
 #include "VBoxApplianceEditorWgt.h"
-#include "VBoxImportApplianceWzd.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-#include "VBoxFilePathSelectorWidget.h"
 #include "VBoxOSTypeSelectorButton.h"
 #include "VBoxLineTextEdit.h"
@@ -100 +98 @@
     if (aColumn == DescriptionSection &&
         aRole == Qt::DisplayRole)
-        v = VBoxImportApplianceWgt::tr ("Virtual System %1").arg (mNumber + 1);
+        v = VBoxApplianceEditorWgt::tr ("Virtual System %1").arg (mNumber + 1);
     return v;
 }
@@ -180 +178 @@
                     switch (mType)
                     {
-                        case KVirtualSystemDescriptionType_Name: v = VBoxImportApplianceWgt::tr ("Name"); break;
-                        case KVirtualSystemDescriptionType_Product: v = VBoxImportApplianceWgt::tr ("Product"); break;
-                        case KVirtualSystemDescriptionType_ProductUrl: v = VBoxImportApplianceWgt::tr ("Product-URL"); break;
-                        case KVirtualSystemDescriptionType_Vendor: v = VBoxImportApplianceWgt::tr ("Vendor"); break;
-                        case KVirtualSystemDescriptionType_VendorUrl: v = VBoxImportApplianceWgt::tr ("Vendor-URL"); break;
-                        case KVirtualSystemDescriptionType_Version: v = VBoxImportApplianceWgt::tr ("Version"); break;
-                        case KVirtualSystemDescriptionType_Description: v = VBoxImportApplianceWgt::tr ("Description"); break;
-                        case KVirtualSystemDescriptionType_License: v = VBoxImportApplianceWgt::tr ("License"); break;
-                        case KVirtualSystemDescriptionType_OS: v = VBoxImportApplianceWgt::tr ("Guest OS Type"); break;
-                        case KVirtualSystemDescriptionType_CPU: v = VBoxImportApplianceWgt::tr ("CPU"); break;
-                        case KVirtualSystemDescriptionType_Memory: v = VBoxImportApplianceWgt::tr ("RAM"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerIDE: v = VBoxImportApplianceWgt::tr ("Hard Disk Controller IDE"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerSATA: v = VBoxImportApplianceWgt::tr ("Hard Disk Controller SATA"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerSCSI: v = VBoxImportApplianceWgt::tr ("Hard Disk Controller SCSI"); break;
-                        case KVirtualSystemDescriptionType_CDROM: v = VBoxImportApplianceWgt::tr ("DVD"); break;
-                        case KVirtualSystemDescriptionType_Floppy: v = VBoxImportApplianceWgt::tr ("Floppy"); break;
-                        case KVirtualSystemDescriptionType_NetworkAdapter: v = VBoxImportApplianceWgt::tr ("Network Adapter"); break;
-                        case KVirtualSystemDescriptionType_USBController: v = VBoxImportApplianceWgt::tr ("USB Controller"); break;
-                        case KVirtualSystemDescriptionType_SoundCard: v = VBoxImportApplianceWgt::tr ("Sound Card"); break;
-                        case KVirtualSystemDescriptionType_HardDiskImage: v = VBoxImportApplianceWgt::tr ("Virtual Disk Image"); break;
-                        default: v = VBoxImportApplianceWgt::tr ("Unknown Hardware Item"); break;
+                        case KVirtualSystemDescriptionType_Name: v = VBoxApplianceEditorWgt::tr ("Name"); break;
+                        case KVirtualSystemDescriptionType_Product: v = VBoxApplianceEditorWgt::tr ("Product"); break;
+                        case KVirtualSystemDescriptionType_ProductUrl: v = VBoxApplianceEditorWgt::tr ("Product-URL"); break;
+                        case KVirtualSystemDescriptionType_Vendor: v = VBoxApplianceEditorWgt::tr ("Vendor"); break;
+                        case KVirtualSystemDescriptionType_VendorUrl: v = VBoxApplianceEditorWgt::tr ("Vendor-URL"); break;
+                        case KVirtualSystemDescriptionType_Version: v = VBoxApplianceEditorWgt::tr ("Version"); break;
+                        case KVirtualSystemDescriptionType_Description: v = VBoxApplianceEditorWgt::tr ("Description"); break;
+                        case KVirtualSystemDescriptionType_License: v = VBoxApplianceEditorWgt::tr ("License"); break;
+                        case KVirtualSystemDescriptionType_OS: v = VBoxApplianceEditorWgt::tr ("Guest OS Type"); break;
+                        case KVirtualSystemDescriptionType_CPU: v = VBoxApplianceEditorWgt::tr ("CPU"); break;
+                        case KVirtualSystemDescriptionType_Memory: v = VBoxApplianceEditorWgt::tr ("RAM"); break;
+                        case KVirtualSystemDescriptionType_HardDiskControllerIDE: v = VBoxApplianceEditorWgt::tr ("Hard Disk Controller IDE"); break;
+                        case KVirtualSystemDescriptionType_HardDiskControllerSATA: v = VBoxApplianceEditorWgt::tr ("Hard Disk Controller SATA"); break;
+                        case KVirtualSystemDescriptionType_HardDiskControllerSCSI: v = VBoxApplianceEditorWgt::tr ("Hard Disk Controller SCSI"); break;
+                        case KVirtualSystemDescriptionType_CDROM: v = VBoxApplianceEditorWgt::tr ("DVD"); break;
+                        case KVirtualSystemDescriptionType_Floppy: v = VBoxApplianceEditorWgt::tr ("Floppy"); break;
+                        case KVirtualSystemDescriptionType_NetworkAdapter: v = VBoxApplianceEditorWgt::tr ("Network Adapter"); break;
+                        case KVirtualSystemDescriptionType_USBController: v = VBoxApplianceEditorWgt::tr ("USB Controller"); break;
+                        case KVirtualSystemDescriptionType_SoundCard: v = VBoxApplianceEditorWgt::tr ("Sound Card"); break;
+                        case KVirtualSystemDescriptionType_HardDiskImage: v = VBoxApplianceEditorWgt::tr ("Virtual Disk Image"); break;
+                        default: v = VBoxApplianceEditorWgt::tr ("Unknown Hardware Item"); break;
                     }
                 }
@@ -219 +217 @@
                             }
                         case KVirtualSystemDescriptionType_OS: v = vboxGlobal().vmGuestOSTypeDescription (mConfigValue); break;
-                        case KVirtualSystemDescriptionType_Memory: v = mConfigValue + " " + VBoxImportApplianceWgt::tr ("MB"); break;
+                        case KVirtualSystemDescriptionType_Memory: v = mConfigValue + " " + VBoxApplianceEditorWgt::tr ("MB"); break;
                         case KVirtualSystemDescriptionType_SoundCard: v = vboxGlobal().toString (static_cast<KAudioControllerType> (mConfigValue.toInt())); break;
                         case KVirtualSystemDescriptionType_NetworkAdapter: v = vboxGlobal().toString (static_cast<KNetworkAdapterType> (mConfigValue.toInt())); break;
@@ -232 +230 @@
                 {
                     if (!mOrigValue.isEmpty())
-                        v = VBoxImportApplianceWgt::tr ("<b>Original Value:</b> %1").arg (mOrigValue);
+                        v = VBoxApplianceEditorWgt::tr ("<b>Original Value:</b> %1").arg (mOrigValue);
                 }
                 break;
@@ -382 +380 @@
                 {
                     QSpinBox *e = new QSpinBox (aParent);
-                    e->setRange (VBoxImportApplianceWgt::minGuestCPUCount(), VBoxImportApplianceWgt::maxGuestCPUCount());
+                    e->setRange (VBoxApplianceEditorWgt::minGuestCPUCount(), VBoxApplianceEditorWgt::maxGuestCPUCount());
                     editor = e;
                     break;
@@ -389 +387 @@
                 {
                     QSpinBox *e = new QSpinBox (aParent);
-                    e->setRange (VBoxImportApplianceWgt::minGuestRAM(), VBoxImportApplianceWgt::maxGuestRAM());
-                    e->setSuffix (" " + VBoxImportApplianceWgt::tr ("MB"));
+                    e->setRange (VBoxApplianceEditorWgt::minGuestRAM(), VBoxApplianceEditorWgt::maxGuestRAM());
+                    e->setSuffix (" " + VBoxApplianceEditorWgt::tr ("MB"));
                     editor = e;
                     break;
@@ -777 +775 @@
     switch (aSection)
     {
-        case DescriptionSection: title = VBoxImportApplianceWgt::tr ("Description"); break;
-        case ConfigValueSection: title = VBoxImportApplianceWgt::tr ("Configuration"); break;
+        case DescriptionSection: title = VBoxApplianceEditorWgt::tr ("Description"); break;
+        case ConfigValueSection: title = VBoxApplianceEditorWgt::tr ("Configuration"); break;
     }
     return title;
@@ -960 +958 @@
 // VBoxApplianceEditorWgt
 
+int VBoxApplianceEditorWgt::mMinGuestRAM = -1;
+int VBoxApplianceEditorWgt::mMaxGuestRAM = -1;
+int VBoxApplianceEditorWgt::mMinGuestCPUCount = -1;
+int VBoxApplianceEditorWgt::mMaxGuestCPUCount = -1;
+
 VBoxApplianceEditorWgt::VBoxApplianceEditorWgt (QWidget *aParent /* = NULL */)
     : QIWithRetranslateUI<QWidget> (aParent)
@@ -965 +968 @@
     , mModel (NULL)
 {
+    /* Make sure all static content is properly initialized */
+    initSystemSettings();
+
     /* Apply UI decorations */
     Ui::VBoxApplianceEditorWgt::setupUi (this);
@@ -989 +995 @@
 }
 
-
+/* static */
+void VBoxApplianceEditorWgt::initSystemSettings()
+{
+    if (mMinGuestRAM == -1)
+    {
+        /* We need some global defaults from the current VirtualBox
+           installation */
+        CSystemProperties sp = vboxGlobal().virtualBox().GetSystemProperties();
+        mMinGuestRAM = sp.GetMinGuestRAM();
+        mMaxGuestRAM = sp.GetMaxGuestRAM();
+        mMinGuestCPUCount = sp.GetMinGuestCPUCount();
+        mMaxGuestCPUCount = sp.GetMaxGuestCPUCount();
+    }
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportApplianceWgt.cpp

@@ -42 +42 @@
 // VBoxImportApplianceWgt
 
-int VBoxImportApplianceWgt::mMinGuestRAM = -1;
-int VBoxImportApplianceWgt::mMaxGuestRAM = -1;
-int VBoxImportApplianceWgt::mMinGuestCPUCount = -1;
-int VBoxImportApplianceWgt::mMaxGuestCPUCount = -1;
-
 VBoxImportApplianceWgt::VBoxImportApplianceWgt (QWidget *aParent)
     : VBoxApplianceEditorWgt (aParent)
 {
-    /* Make sure all static content is properly initialized */
-    initSystemSettings();
 }
 
@@ -175 +168 @@
 }
 
-/* static */
-void VBoxImportApplianceWgt::initSystemSettings()
-{
-    if (mMinGuestRAM == -1)
-    {
-        /* We need some global defaults from the current VirtualBox
-           installation */
-        CSystemProperties sp = vboxGlobal().virtualBox().GetSystemProperties();
-        mMinGuestRAM = sp.GetMinGuestRAM();
-        mMaxGuestRAM = sp.GetMaxGuestRAM();
-        mMinGuestCPUCount = sp.GetMinGuestCPUCount();
-        mMaxGuestCPUCount = sp.GetMaxGuestCPUCount();
-    }
-}
-

trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportApplianceWzd.cpp

@@ -21 +21 @@
  */
 
+/* VBox includes */
 #include "VBoxImportApplianceWzd.h"
 #include "VBoxGlobal.h"
@@ -70 +71 @@
 
 void VBoxImportLicenseViewer::setContent (const QString &aName, const QString &aText)
-{ 
-    mName = aName; 
-    mText = aText; 
+{
+    mName = aName;
+    mText = aText;
     mCaption->setText (tr ("<b>To continue importing the Appliance you must agree to the terms of the software license agreement for the Virtual System \"%1\".</b><br /><br />Click <b>Agree</b> to continue or click <b>Disagree</b> to cancel the import.").arg (mName));
     mLicenseText->setText (mText);
@@ -93 +94 @@
     QPrinter printer;
     QPrintDialog pd (&printer, this);
-    if (pd.exec() == QDialog::Accepted) 
+    if (pd.exec() == QDialog::Accepted)
         mLicenseText->print (&printer);
 }
@@ -103 +104 @@
     {
         QFile file (fileName);
-        if (file.open(QFile::WriteOnly | QFile::Truncate)) 
+        if (file.open(QFile::WriteOnly | QFile::Truncate))
         {
             QTextStream out (&file);