Changeset 9889 in vbox

Timestamp:

Jun 23, 2008 6:28:49 PM (17 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Fixed VMSettings selector list changes during VBoxManage language change.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxVMSettingsDlg.h (modified) (1 diff)
• include/VBoxVMSettingsUSB.h (modified) (1 diff)
• src/VBoxGlobalSettingsDlg.cpp (modified) (1 diff)
• src/VBoxVMSettingsDlg.cpp (modified) (6 diffs)
• src/VBoxVMSettingsParallel.cpp (modified) (1 diff)
• src/VBoxVMSettingsUSB.cpp (modified) (2 diffs)
• src/VBoxVMSettingsVRDP.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsDlg.h

@@ -72 +72 @@
     QString dialogTitle() const;
 
+    void updateAvailability();
+
     /* Common */
     CMachine mMachine;

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsUSB.h

@@ -63 +63 @@
                        const QString &aPath);
 
+   ~VBoxVMSettingsUSB();
+
     void getFromHost();
     void putBackToHost();

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobalSettingsDlg.cpp

@@ -418 +418 @@
         /* Disable the USB controller category if the USB controller is
          * not available (i.e. in VirtualBox OSE) */
-        QList<QTreeWidgetItem*> items = mTwSelector->findItems (
-            "#usb", Qt::MatchExactly, listView_Link);
-        QTreeWidgetItem *usbItem = items.count() ? items [0] : 0;
+        QTreeWidgetItem *usbItem = findItem (mTwSelector, "#usb", listView_Link);
         Assert (usbItem);
         if (usbItem)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsDlg.cpp

@@ -120 +120 @@
     connect (&vboxGlobal(), SIGNAL (mediaEnumFinished (const VBoxMediaList &)),
              this, SLOT (onMediaEnumerationDone()));
-
-    /* Parallel Port Page (currently disabled) */
-    //QTreeWidgetItem *item = findItem (mTwSelector, "#parallelPorts", listView_Link);
-    //Assert (item);
-    //if (item) item->setHidden (true);
 
     /* Hide unnecessary columns and header */
@@ -181 +176 @@
     mMachine = aMachine;
 
+    updateAvailability();
+
     setWindowTitle (dialogTitle());
 
@@ -213 +210 @@
 
     /* Parallel Ports */
-    VBoxVMSettingsParallel::getFromMachine (aMachine, mPageParallel,
-                                            this, pagePath (mPageParallel));
+    if (mPageParallel->isEnabled())
+        VBoxVMSettingsParallel::getFromMachine (aMachine, mPageParallel,
+                                                this, pagePath (mPageParallel));
 
     /* USB */
-    VBoxVMSettingsUSB::getFrom (aMachine, mPageUSB,
-                                this, pagePath (mPageUSB));
+    if (mPageUSB->isEnabled())
+        VBoxVMSettingsUSB::getFrom (aMachine, mPageUSB,
+                                    this, pagePath (mPageUSB));
 
     /* Shared Folders */
@@ -224 +223 @@
 
     /* Vrdp */
-    VBoxVMSettingsVRDP::getFromMachine (aMachine, mPageVrdp,
-                                        this, pagePath (mPageVrdp));
+    if (mPageVrdp->isEnabled())
+        VBoxVMSettingsVRDP::getFromMachine (aMachine, mPageVrdp,
+                                            this, pagePath (mPageVrdp));
 
     /* Finally set the reset First Run Wizard flag to "false" to make sure
@@ -288 +288 @@
     /* Set the old index */
     mTwSelector->setCurrentItem (mTwSelector->topLevelItem (ci));
+
+    /* Update QTreeWidget with available items */
+    updateAvailability();
 
     /* Adjust selector list */
@@ -550 +553 @@
 }
 
+void VBoxVMSettingsDlg::updateAvailability()
+{
+    if (mMachine.isNull())
+        return;
+
+    /* Parallel Port Page (currently disabled) */
+    QTreeWidgetItem *parallelItem =
+        findItem (mTwSelector, "#parallelPorts", listView_Link);
+    Assert (parallelItem);
+    if (parallelItem)
+        parallelItem->setHidden (true);
+    mPageParallel->setEnabled (false);
+
+    /* USB Stuff */
+    CUSBController ctl = mMachine.GetUSBController();
+    /* Show an error message (if there is any).
+     * Note that we don't use the generic cannotLoadMachineSettings()
+     * call here because we want this message to be suppressable. */
+    if (!mMachine.isReallyOk())
+        vboxProblem().cannotAccessUSB (mMachine);
+    if (ctl.isNull())
+    {
+        /* Disable the USB controller category if the USB controller is
+         * not available (i.e. in VirtualBox OSE) */
+        QTreeWidgetItem *usbItem =
+            findItem (mTwSelector, "#usb", listView_Link);
+        Assert (usbItem);
+        if (usbItem)
+            usbItem->setHidden (true);
+        mPageUSB->setEnabled (false);
+    }
+
+    /* VRDP Stuff */
+    CVRDPServer vrdp = mMachine.GetVRDPServer();
+    if (vrdp.isNull())
+    {
+        /* Disable the VRDP category if VRDP is
+         * not available (i.e. in VirtualBox OSE) */
+        QTreeWidgetItem *vrdpItem =
+            findItem (mTwSelector, "#vrdp", listView_Link);
+        Assert (vrdpItem);
+        if (vrdpItem)
+            vrdpItem->setHidden (true);
+        mPageVrdp->setEnabled (false);
+        /* If mMachine has something to say, show the message */
+        vboxProblem().cannotLoadMachineSettings (mMachine, false /* strict */);
+    }
+}
+

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsParallel.cpp

@@ -108 +108 @@
 void VBoxVMSettingsParallel::putBackToMachine()
 {
-    for (int index = 0; index < mTabWidget->count(); ++ index)
-    {
-        VBoxVMSettingsParallel *page =
-            (VBoxVMSettingsParallel*) mTabWidget->widget (index);
-        Assert (page);
-        page->putBackToPort();
-    }
+    if (mTabWidget)
+        for (int index = 0; index < mTabWidget->count(); ++ index)
+        {
+            VBoxVMSettingsParallel *page =
+                (VBoxVMSettingsParallel*) mTabWidget->widget (index);
+            Assert (page);
+            page->putBackToPort();
+        }
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsUSB.cpp

@@ -66 +66 @@
                                  const QString &aPath)
 {
-    CUSBController ctl = aMachine.GetUSBController();
-
-    /* Show an error message (if there is any).
-     * Note that we don't use the generic cannotLoadMachineSettings()
-     * call here because we want this message to be suppressable. */
-    if (!aMachine.isReallyOk())
-        vboxProblem().cannotAccessUSB (aMachine);
-
-    if (ctl.isNull())
-    {
-        /* Disable the USB controller category if the USB controller is
-         * not available (i.e. in VirtualBox OSE) */
-        QList<QTreeWidgetItem*> items = aDlg->mTwSelector->findItems (
-            "#usb", Qt::MatchExactly, listView_Link);
-        QTreeWidgetItem *usbItem = items.count() ? items [0] : 0;
-        Assert (usbItem);
-        if (usbItem)
-            usbItem->setHidden (true);
-        return;
-    }
-
     mSettings = new VBoxVMSettingsUSB (aPage, MachineType, aDlg, aPath);
     QVBoxLayout *layout = new QVBoxLayout (aPage);
@@ -238 +217 @@
     /* Applying language settings */
     retranslateUi();
+}
+
+VBoxVMSettingsUSB::~VBoxVMSettingsUSB()
+{
+    mSettings = 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsVRDP.cpp

@@ -70 +70 @@
                                          const QString &aPath)
 {
-    CVRDPServer vrdp = aMachine.GetVRDPServer();
-
-    if (vrdp.isNull())
-    {
-        /* Disable the VRDP category if VRDP is
-         * not available (i.e. in VirtualBox OSE) */
-        QList<QTreeWidgetItem*> items = aDlg->mTwSelector->findItems (
-            "#vrdp", Qt::MatchExactly, listView_Link);
-        QTreeWidgetItem *vrdpItem = items.count() ? items [0] : 0;
-        Assert (vrdpItem);
-        if (vrdpItem)
-            vrdpItem->setHidden (true);
-        return;
-
-        /* If aMachine has something to say, show the message */
-        vboxProblem().cannotLoadMachineSettings (aMachine, false /* strict */);
-    }
-
     mSettings = new VBoxVMSettingsVRDP (aPage, aDlg, aPath);
     QVBoxLayout *layout = new QVBoxLayout (aPage);
@@ -104 +86 @@
 void VBoxVMSettingsVRDP::putBackToMachine()
 {
-    mSettings->putBackTo();
+    if (mSettings)
+        mSettings->putBackTo();
 }