Changeset 4324 in vbox

Timestamp:

Aug 23, 2007 7:01:31 PM (17 years ago)

Author:

vboxsync

Message:

Main: Improved serial port API (mostly spelling);
FE/Qt: Improved serial port UI (spelling and duplicate handling).

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (4 diffs)
• Frontends/VirtualBox/VBoxUI.pro (modified) (1 diff)
• Frontends/VirtualBox/include/VBoxGlobal.h (modified) (3 diffs)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (2 diffs)
• Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h (modified) (1 diff)
• Frontends/VirtualBox/ui/VBoxVMSerialPortSettings.ui (added)
• Frontends/VirtualBox/ui/VBoxVMSerialPortSettings.ui.h (added)
• Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui (modified) (7 diffs)
• Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (19 diffs)
• Main/ConsoleImpl.cpp (modified) (4 diffs)
• Main/ParallelPortImpl.cpp (modified) (6 diffs)
• Main/SerialPortImpl.cpp (modified) (7 diffs)
• Main/idl/VirtualBox.xidl (modified) (4 diffs)
• Main/include/ParallelPortImpl.h (modified) (3 diffs)
• Main/include/SerialPortImpl.h (modified) (4 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -1058 +1058 @@
             {
                 ULONG uIRQ, uIOBase;
-                SerialHostMode_T HostMode;
+                PortMode_T HostMode;
                 Bstr path;
                 BOOL fServer;
@@ -1072 +1072 @@
                 {
                     default:
-                    case SerialHostMode_Disconnected:
+                    case PortMode_DisconnectedPort:
                         RTPrintf(", disconnected\n");
                         break;
-                    case SerialHostMode_HostPipe:
+                    case PortMode_HostPipePort:
                         RTPrintf(", attached to pipe (%s) '%lS'\n",
                                 fServer ? "server" : "client", path.raw());
                         break;
-                    case SerialHostMode_HostDevice:
+                    case PortMode_HostDevicePort:
                         RTPrintf(", attached to device '%lS'\n", path.raw());
                         break;
@@ -4112 +4112 @@
                 if (strcmp(uarts_mode[n], "disconnected") == 0)
                 {
-                    CHECK_ERROR_RET(uart, COMSETTER(HostMode) (SerialHostMode_Disconnected), 1);
+                    CHECK_ERROR_RET(uart, COMSETTER(HostMode) (PortMode_DisconnectedPort), 1);
                 }
                 else
@@ -4118 +4118 @@
                     if (strcmp(uarts_mode[n], "server") == 0)
                     {
-                        CHECK_ERROR_RET(uart, COMSETTER(HostMode) (SerialHostMode_HostPipe), 1);
+                        CHECK_ERROR_RET(uart, COMSETTER(HostMode) (PortMode_HostPipePort), 1);
                         CHECK_ERROR_RET(uart, COMSETTER(Server) (TRUE), 1);
                     }
                     else if (strcmp(uarts_mode[n], "client") == 0)
                     {
-                        CHECK_ERROR_RET(uart, COMSETTER(HostMode) (SerialHostMode_HostPipe), 1);
+                        CHECK_ERROR_RET(uart, COMSETTER(HostMode) (PortMode_HostPipePort), 1);
                         CHECK_ERROR_RET(uart, COMSETTER(Server) (FALSE), 1);
                     }
                     else
                     {
-                        CHECK_ERROR_RET(uart, COMSETTER(HostMode) (SerialHostMode_HostDevice), 1);
+                        CHECK_ERROR_RET(uart, COMSETTER(HostMode) (PortMode_HostDevicePort), 1);
                     }
                     CHECK_ERROR_RET(uart, COMSETTER(Path) (Bstr(uarts_path[n])), 1);

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -22 +22 @@
 FORMS   = ui/VBoxDiskImageManagerDlg.ui \
         ui/VBoxVMNetworkSettings.ui \
+        ui/VBoxVMSerialPortSettings.ui \
         ui/VBoxUSBFilterSettings.ui \
         ui/VBoxSharedFoldersSettings.ui \

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

@@ -226 +226 @@
     }
 
-    QString toString (CEnums::SerialHostMode t) const
-    {
-        AssertMsg (!serialHostModeTypes [t].isNull(), ("No text for %d", t));
-        return serialHostModeTypes [t];
+    QString toString (CEnums::PortMode t) const
+    {
+        AssertMsg (!portModeTypes [t].isNull(), ("No text for %d", t));
+        return portModeTypes [t];
     }
 
@@ -260 +260 @@
     }
 
-    CEnums::SerialHostMode toSerialHostMode (const QString &s) const
+    CEnums::PortMode toPortMode (const QString &s) const
     {
         QStringVector::const_iterator it =
-            qFind (serialHostModeTypes.begin(), serialHostModeTypes.end(), s);
-        AssertMsg (it != serialHostModeTypes.end(), ("No value for {%s}", s.latin1()));
-        return CEnums::SerialHostMode (it - serialHostModeTypes.begin());
+            qFind (portModeTypes.begin(), portModeTypes.end(), s);
+        AssertMsg (it != portModeTypes.end(), ("No value for {%s}", s.latin1()));
+        return CEnums::PortMode (it - portModeTypes.begin());
     }
 
@@ -549 +549 @@
     QStringVector diskStorageTypes;
     QStringVector vrdpAuthTypes;
-    QStringVector serialHostModeTypes;
+    QStringVector portModeTypes;
     QStringVector usbFilterActionTypes;
     QStringVector diskControllerDevices;

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

@@ -576 +576 @@
     , diskStorageTypes (CEnums::HardDiskStorageType_COUNT)
     , vrdpAuthTypes (CEnums::VRDPAuthType_COUNT)
-    , serialHostModeTypes (CEnums::SerialHostMode_COUNT)
+    , portModeTypes (CEnums::PortMode_COUNT)
     , usbFilterActionTypes (CEnums::USBDeviceFilterAction_COUNT)
     , diskControllerDevices (3)
@@ -1864 +1864 @@
         tr ("Guest", "VRDPAuthType");
 
-    serialHostModeTypes [CEnums::Disconnected] =
-        tr ("Disconnected", "SerialHostMode");
-    serialHostModeTypes [CEnums::HostPipe] =
-        tr ("Host Pipe", "SerialHostMode");
-    serialHostModeTypes [CEnums::HostDevice] =
-        tr ("Host Device", "SerialHostMode");
+    portModeTypes [CEnums::DisconnectedPort] =
+        tr ("Disconnected", "PortMode");
+    portModeTypes [CEnums::HostPipePort] =
+        tr ("Host Pipe", "PortMode");
+    portModeTypes [CEnums::HostDevicePort] =
+        tr ("Host Device", "PortMode");
 
     usbFilterActionTypes [CEnums::USBDeviceFilterIgnore] =

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h

@@ -26 +26 @@
 *****************************************************************************/
 
-/**
- *  VBoxVMNetworkSettings class to use as network interface setup page.
- */
 void VBoxVMNetworkSettings::init()
 {

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui

@@ -270 +270 @@
         <item>
             <property name="text">
-                <string> Serial Port </string>
+                <string> Serial Ports </string>
             </property>
             <property name="text">
@@ -276 +276 @@
             </property>
             <property name="text">
-                <string>#serial</string>
+                <string>#serialPorts</string>
             </property>
             <property name="pixmap">
-                <pixmap>refresh_16px.png</pixmap>
+                <pixmap></pixmap>
             </property>
             <property name="pixmap">
@@ -2712 +2712 @@
                     <number>9</number>
                 </attribute>
+                <vbox>
+                    <property name="name">
+                        <cstring>unnamed</cstring>
+                    </property>
+                    <property name="margin">
+                        <number>0</number>
+                    </property>
+                    <widget class="QTabWidget">
+                        <property name="name">
+                            <cstring>tbwSerialPorts</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>1</hsizetype>
+                                <vsizetype>1</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                    </widget>
+                </vbox>
             </widget>
         </widget>
@@ -3055 +3076 @@
     <include location="local" impldecl="in declaration">VBoxGlobal.h</include>
     <include location="local" impldecl="in implementation">VBoxVMNetworkSettings.h</include>
+    <include location="local" impldecl="in implementation">VBoxVMSerialPortSettings.h</include>
     <include location="local" impldecl="in implementation">VBoxUSBFilterSettings.h</include>
     <include location="local" impldecl="in implementation">VBoxSharedFoldersSettings.h</include>
@@ -3066 +3088 @@
     <forward>class VBoxUSBMenu</forward>
     <forward>class VBoxSharedFoldersSettings</forward>
-    <forward>class VBoxVMSerialPortSettings</forward>
     <forward>class QIRichLabel</forward>
     <forward>class BootItemsList</forward>
@@ -3092 +3113 @@
     <variable access="private">bool mUSBFilterListModified;</variable>
     <variable access="private">VBoxSharedFoldersSettings *mSharedFolders;</variable>
-    <variable access="private">VBoxVMSerialPortSettings *mSerialPorts;</variable>
     <variable access="private">QString warningString;</variable>
     <variable access="private">VBoxMediaComboBox *cbHDA;</variable>
@@ -3116 +3136 @@
     <slot>showImageManagerISOFloppy()</slot>
     <slot>showVDImageManager( QUuid *id, VBoxMediaComboBox *le, QLabel *tx = NULL )</slot>
-    <slot>addNetworkAdapter( const CNetworkAdapter &amp; adapter )</slot>
+    <slot>addNetworkAdapter( const CNetworkAdapter &amp; )</slot>
+    <slot>addSerialPort( const CSerialPort &amp; )</slot>
     <slot>slRAM_valueChanged( int val )</slot>
     <slot>leRAM_textChanged( const QString &amp; text )</slot>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -470 +470 @@
 
 
-class VBoxVMSerialPortSettings : public QWidget
-{
-    Q_OBJECT
-
-public:
-
-    VBoxVMSerialPortSettings (QWidget *aParent)
-        : QWidget (aParent, "VBoxVMSerialPortSettings")
-        , mTabWidget (0)
-    {
-        /* Basic initialization */
-        mTabWidget = new QTabWidget (this, "mTabWidget");
-        mTabWidget->setMargin (11);
-        mTabWidget->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred);
-        QVBoxLayout *mainLayout = new QVBoxLayout (this);
-        mainLayout->addWidget (mTabWidget);
-        mainLayout->addItem (new QSpacerItem (0, 0, QSizePolicy::Preferred,
-                                                    QSizePolicy::Expanding));
-
-        /* Create a list of known COM interfaces configurations */
-        mConfigList << PortConfig (0x3f8, 4, 1);
-        mConfigList << PortConfig (0x2f8, 3, 2);
-        mConfigList << PortConfig (0x3e8, 4, 3);
-        mConfigList << PortConfig (0x2e8, 3, 4);
-    }
-
-    void getFromMachine (const CMachine &aMachine)
-    {
-        mMachine = aMachine;
-
-        ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetSerialPortCount();
-        for (ulong slot = 0; slot < count; ++ slot)
-        {
-            CSerialPort port = mMachine.GetSerialPort (slot);
-            addPage (port, slot);
-        }
-
-        /* Revalidate all pages */
-        portConfigUpdate();
-    }
-
-    void putBackToMachine()
-    {
-        for (int slot = 0; slot < mTabWidget->count(); ++ slot)
-        {
-            CSerialPort port = mMachine.GetSerialPort (slot);
-
-            port.SetEnabled (static_cast<QGroupBox*> (mTabWidget->page (slot))->isChecked());
-
-            PortConfig config = parsePortConfig (mPortList.at (slot)->currentText());
-            port.SetIOBase (config.io);
-            port.SetIRQ (config.irq);
-
-            port.SetHostMode (vboxGlobal().toSerialHostMode (mModeList.at (slot)->currentText()));
-
-            QCheckBox *chbIsServer = mIsServerList.at (slot);
-            port.SetServer (chbIsServer->isEnabled() ?
-                            chbIsServer->isChecked() : false);
-
-            QLineEdit *lePath = mPathList.at (slot);
-            port.SetPath (lePath->isEnabled() ?
-                          lePath->text() : QString::null);
-        }
-    }
-
-private slots:
-
-    void portConfigUpdate()
-    {
-        for (int index = 0; index < mTabWidget->count(); ++ index)
-        {
-            QComboBox *cbPortConfig = mPortList.at (index);
-            QString oldText = cbPortConfig->currentText();
-            QStringList newList = portConfigList (index);
-            cbPortConfig->clear();
-            cbPortConfig->insertStringList (newList);
-            cbPortConfig->setCurrentText (oldText);
-        }
-    }
-
-    void hostModeUpdate (int aIndex = -1)
-    {
-        if (aIndex == -1)
-            aIndex = mTabWidget->currentPageIndex();
-        QCheckBox *chbIsServer = mIsServerList.at (aIndex);
-        QLineEdit *lePath = mPathList.at (aIndex);
-        CEnums::SerialHostMode mode = vboxGlobal().toSerialHostMode (
-            mModeList.at (aIndex)->currentText());
-        chbIsServer->setEnabled (mode == CEnums::HostPipe);
-        lePath->setEnabled (mode != CEnums::Disconnected);
-    }
-
-private:
-
-    struct PortConfig
-    {
-        PortConfig ()
-            : io (0), irq (0), number (0) {}
-        PortConfig (ulong aIO, ulong aIRQ, ulong aNumber)
-            : io (aIO), irq (aIRQ), number (aNumber) {}
-
-        bool isNull() { return !io && !irq; }
-
-        bool operator== (const PortConfig &aCfg) const
-        {
-            return io  == aCfg.io && irq == aCfg.irq;
-        }
-
-        static QString format()
-        {
-            return QString ("I/O Port = 0x%1, IRQ = %2");
-        }
-        QString toString()
-        {
-            QString info = format().arg (QString::number (io, 16)).arg (irq);
-            if (number)
-                info += QString (" (COM%1)").arg (number);
-            return info;
-        }
-
-        ulong io;
-        ulong irq;
-        ulong number;
-    };
-    typedef QValueList<PortConfig> PortConfigs;
-
-    void addPage (const CSerialPort &aPort, ulong aSlot)
-    {
-        /* Create Serial Port page */
-        QGroupBox *gBox = new QGroupBox (tr ("&Enable Serial Port"));
-        gBox->setColumnLayout (0, Qt::Vertical);
-        gBox->layout()->setMargin (11);
-        gBox->layout()->setSpacing (6);
-        gBox->setCheckable (true);
-
-        QLabel *lbPort = new QLabel (tr ("Serial Port &Number"), gBox);
-        QComboBox *cbPort = new QComboBox (gBox);
-        lbPort->setBuddy (cbPort);
-        connect (cbPort, SIGNAL (activated (int)),
-                 this , SLOT (portConfigUpdate()));
-
-        QLabel *lbType = new QLabel (tr ("Serial Port Host &Mode"), gBox);
-        QComboBox *cbMode = new QComboBox (gBox);
-        lbType->setBuddy (cbMode);
-        cbMode->insertItem (vboxGlobal().toString (CEnums::Disconnected));
-        cbMode->insertItem (vboxGlobal().toString (CEnums::HostPipe));
-        cbMode->insertItem (vboxGlobal().toString (CEnums::HostDevice));
-        connect (cbMode, SIGNAL (activated (int)),
-                 this , SLOT (hostModeUpdate()));
-
-        QCheckBox *chbIsServer = new QCheckBox (tr ("Create Pipe &Automatically"), gBox);
-
-        QLabel *lbPath = new QLabel (tr ("Serial Port &Path"), gBox);
-        QLineEdit *lePath = new QLineEdit (gBox);
-        lbPath->setBuddy (lePath);
-
-        QGridLayout *pageLayout = new QGridLayout (gBox->layout());
-        pageLayout->setAlignment (Qt::AlignTop);
-        pageLayout->addWidget (lbPort, 0, 0);
-        pageLayout->addMultiCellWidget (cbPort, 0, 0, 1, 2);
-        pageLayout->addWidget (lbType, 1, 0);
-        pageLayout->addWidget (cbMode, 1, 1);
-        pageLayout->addWidget (chbIsServer, 1, 2);
-        pageLayout->addWidget (lbPath, 2, 0);
-        pageLayout->addMultiCellWidget (lePath, 2, 2, 1, 2);
-
-        /* Load machine information */
-        gBox->setChecked (aPort.GetEnabled());
-
-        PortConfig config (aPort.GetIOBase(), aPort.GetIRQ(), 0);
-        if (!mConfigList.contains (config))
-            mConfigList << config;
-        cbPort->insertStringList (portConfigList (mTabWidget->count()));
-        for (int id = 0; id < cbPort->count(); ++ id)
-            if (parsePortConfig (cbPort->text (id)) == config)
-                cbPort->setCurrentItem (id);
-
-        cbMode->setCurrentText (vboxGlobal().toString (aPort.GetHostMode()));
-
-        chbIsServer->setChecked (aPort.GetServer());
-
-        lePath->setText (aPort.GetPath());
-
-        /* Append newly createrd widget */
-        mTabWidget->addTab (gBox, tr ("Port &%1").arg (aSlot));
-        mPortList.append (cbPort);
-        mModeList.append (cbMode);
-        mIsServerList.append (chbIsServer);
-        mPathList.append (lePath);
-
-        /* Revalidate page */
-        hostModeUpdate (aSlot);
-    }
-
-    QStringList portConfigList (int aIndex)
-    {
-        QStringList list;
-        PortConfigs config = portConfigs (aIndex);
-        for (ulong id = 0; id < config.count(); ++ id)
-            list << config [id].toString();
-        return list;
-    }
-
-    PortConfigs portConfigs (int aIndex)
-    {
-        PortConfigs config (mConfigList);
-        if (aIndex == mTabWidget->count())
-            return config;
-
-        for (int index = 0; index < mTabWidget->count(); ++ index)
-        {
-            if (index != aIndex)
-            {
-                PortConfig used = parsePortConfig (mPortList.at (index)->currentText());
-                Assert (!used.isNull());
-                config.remove (used);
-            }
-        }
-        return config;
-    }
-
-    PortConfig parsePortConfig (const QString &aString)
-    {
-        QRegExp regExp (PortConfig::format().arg ("([0-9a-f]+)").arg ("(\\d+)"));
-        if (regExp.search (aString) != -1)
-            return PortConfig (regExp.cap (1).toULong(0, 16),
-                               regExp.cap (2).toULong(), 0);
-        Assert (0);
-        return PortConfig();
-    }
-
-    QTabWidget *mTabWidget;
-    PortConfigs mConfigList;
-
-    QPtrList<QComboBox> mPortList;
-    QPtrList<QComboBox> mModeList;
-    QPtrList<QCheckBox> mIsServerList;
-    QPtrList<QLineEdit> mPathList;
-
-    CMachine mMachine;
-};
-
-
 void VBoxVMSettingsDlg::init()
 {
@@ -957 +714 @@
     QToolTip::add (pbHostRemove, tr ("Remove"));
 
+    /* Serial Port Page */
+
     /* USB Page */
 
@@ -1021 +780 @@
     mSharedFolders->setDialogType (VBoxSharedFoldersSettings::MachineType);
     pageFoldersLayout->addWidget (mSharedFolders);
-
-    /* Serial Port Page */
-
-    QVBoxLayout* pageSerialLayout = new QVBoxLayout (pageSerial, 0, 0);
-    mSerialPorts = new VBoxVMSerialPortSettings (pageSerial);
-    pageSerialLayout->addWidget (mSerialPorts);
 
     /*
@@ -1549 +1302 @@
     Q_UNUSED (wval);
 
+    /* reset the warning text; interested parties will set it during
+     * validation */
+    setWarning (QString::null);
+
     /* detect the overall validity */
     bool newValid = true;
@@ -1567 +1324 @@
         valid = newValid;
         buttonOk->setEnabled (valid);
-        if (valid)
-            setWarning(0);
-        warningLabel->setHidden(valid);
-        warningPixmap->setHidden(valid);
-    }
-}
-
-
-void VBoxVMSettingsDlg::revalidate( QIWidgetValidator *wval )
+        warningLabel->setHidden (valid);
+        warningPixmap->setHidden (valid);
+    }
+}
+
+
+void VBoxVMSettingsDlg::revalidate (QIWidgetValidator *wval)
 {
     /* do individual validations for pages */
@@ -1581 +1336 @@
     bool valid = wval->isOtherValid();
 
+    QString warningText;
+    QString pageTitle = ::path (listView->currentItem());
+
     if (pg == pageHDD)
     {
@@ -1593 +1351 @@
             {
                 valid = false;
-                setWarning (tr ("Primary Master hard disk is not selected."));
+                warningText = tr ("Primary Master hard disk is not selected");
             }
             else uuids << uuidHDA;
@@ -1603 +1361 @@
             {
                 valid = false;
-                setWarning (tr ("Primary Slave hard disk is not selected."));
+                warningText = tr ("Primary Slave hard disk is not selected");
             }
             else
@@ -1616 +1374 @@
                     uuids << uuidHDB;
                 else
-                    setWarning (tr ("Primary Slave hard disk is already attached "
-                                    "to a different slot."));
+                    warningText = tr ("Primary Slave hard disk is already attached "
+                                      "to a different slot");
             }
         }
@@ -1626 +1384 @@
             {
                 valid = false;
-                setWarning (tr ("Secondary Slave hard disk is not selected."));
+                warningText = tr ("Secondary Slave hard disk is not selected");
             }
             else
@@ -1639 +1397 @@
                     uuids << uuidHDB;
                 else
-                    setWarning (tr ("Secondary Slave hard disk is already attached "
-                                    "to a different slot."));
+                    warningText = tr ("Secondary Slave hard disk is already attached "
+                                      "to a different slot");
             }
         }
@@ -1667 +1425 @@
 
         if (!valid)
-            setWarning (tr ("CD/DVD image file is not selected."));
+            warningText = tr ("CD/DVD image file is not selected");
     }
     else if (pg == pageFloppy)
@@ -1684 +1442 @@
 
         if (!valid)
-            setWarning (tr ("Floppy image file is not selected."));
+            warningText = tr ("Floppy image file is not selected");
     }
     else if (pg == pageNetwork)
     {
+        QWidget *tab = NULL;
+        for (int index = 0; index < tbwNetwork->count(); ++ index)
+        {
+            QWidget *tab = tbwNetwork->page (index);
+            VBoxVMNetworkSettings *page =
+                static_cast <VBoxVMNetworkSettings *> (tab);
+            valid = page->isPageValid (mInterfaceList);
+            if (!valid) break;
+        }
+        if (!valid)
+        {
+            Assert (tab);
+            warningText = tr ("Incorrect host network interface is selected");
+            pageTitle += ": " + tbwNetwork->tabLabel (tab);
+        }
+    }
+    else if (pg == pageSerial)
+    {
+        QValueList <QString> ports;
+        QValueList <QString> paths;
+
         int index = 0;
-        for (; index < tbwNetwork->count(); ++index)
-        {
-            QWidget *tab = tbwNetwork->page (index);
-            VBoxVMNetworkSettings *set = static_cast<VBoxVMNetworkSettings*> (tab);
-            valid = set->isPageValid (mInterfaceList);
-            if (!valid) break;
-        }
-        if (!valid)
-            setWarning (tr ("Incorrect host network interface is selected "
-                            "for Adapter %1.").arg (index));
+        for (; index < tbwSerialPorts->count(); ++ index)
+        {
+            QWidget *tab = tbwSerialPorts->page (index);
+            VBoxVMSerialPortSettings *page =
+                static_cast <VBoxVMSerialPortSettings *> (tab);
+
+            /* skip disabled ports */
+            if (!page->mSerialPortBox->isChecked())
+                continue;
+            /* check the predefined port number unicity */
+            if (!page->isUserDefined())
+            {
+                QString port = page->mPortNumCombo->currentText();
+                valid = !ports.contains (port);
+                if (!valid)
+                {
+                    warningText = tr ("Duplicate port number is selected ");
+                    pageTitle += ": " + tbwSerialPorts->tabLabel (tab);
+                    break;
+                }
+                ports << port;
+            }
+            /* check the port path unicity */
+            CEnums::PortMode mode =
+                vboxGlobal().toPortMode (page->mHostModeCombo->currentText());
+            if (mode != CEnums::DisconnectedPort)
+            {
+                QString path = page->mPortPathLine->text();
+                valid = !paths.contains (path);
+                if (!valid)
+                {
+                    warningText = tr ("Duplicate port path is entered ");
+                    pageTitle += ": " + tbwSerialPorts->tabLabel (tab);
+                    break;
+                }
+                paths << path;
+            }
+        }
     }
     else if (pg == pageVRDP)
@@ -1707 +1514 @@
                     (leVRDPPort->text().isEmpty() || leVRDPTimeout->text().isEmpty()));
             if (!valid && leVRDPPort->text().isEmpty())
-                setWarning (tr ("VRDP Port is not set."));
+                warningText = tr ("VRDP Port is not set ");
             if (!valid && leVRDPTimeout->text().isEmpty())
-                setWarning (tr ("VRDP Timeout is not set."));
+                warningText = tr ("VRDP Timeout is not set ");
         }
         else
             valid = true;
     }
+
+    if (!valid)
+        setWarning (tr ("%1 on the <b>%2</b> page.")
+                    .arg (warningText, pageTitle));
 
     wval->setOtherValid (valid);
@@ -1980 +1791 @@
     }
 
+    /* serial ports */
+    {
+        ulong count = vbox.GetSystemProperties().GetSerialPortCount();
+        for (ulong slot = 0; slot < count; ++ slot)
+        {
+            CSerialPort port = machine.GetSerialPort (slot);
+            addSerialPort (port);
+        }
+    }
+
     /* USB */
     {
@@ -2049 +1870 @@
     {
         mSharedFolders->getFromMachine (machine);
-    }
-
-    /* serial ports */
-    {
-        mSerialPorts->getFromMachine (machine);
     }
 
@@ -2254 +2070 @@
     }
 
+    /* serial ports */
+    {
+        for (int index = 0; index < tbwSerialPorts->count(); index++)
+        {
+            VBoxVMSerialPortSettings *page =
+                (VBoxVMSerialPortSettings *) tbwSerialPorts->page (index);
+            Assert (page);
+            page->putBackToPort();
+        }
+    }
+
     /* usb */
     {
@@ -2316 +2143 @@
     }
 
-    /* serial ports */
-    {
-        mSerialPorts->putBackToMachine();
-    }
-
     return COMResult();
 }
@@ -2400 +2222 @@
 
 #endif
+}
+
+void VBoxVMSettingsDlg::addSerialPort (const CSerialPort &aPort)
+{
+    VBoxVMSerialPortSettings *page = new VBoxVMSerialPortSettings();
+    page->getFromPort (aPort);
+    tbwSerialPorts->addTab (page, QString (tr ("Port %1", "serial ports"))
+                                               .arg (aPort.GetSlot()));
+
+    /* fix the tab order so that main dialog's buttons are always the last */
+    setTabOrder (page->mPortPathLine, buttonHelp);
+    setTabOrder (buttonHelp, buttonOk);
+    setTabOrder (buttonOk, buttonCancel);
+
+    /* setup validation */
+    QIWidgetValidator *wval = new QIWidgetValidator (pageSerial, this);
+    connect (page->mSerialPortBox, SIGNAL (toggled (bool)),
+             wval, SLOT (revalidate()));
+    connect (page->mIRQLine, SIGNAL (textChanged (const QString &)),
+             wval, SLOT (revalidate()));
+    connect (page->mIOPortLine, SIGNAL (textChanged (const QString &)),
+             wval, SLOT (revalidate()));
+    connect (page->mHostModeCombo, SIGNAL (activated (const QString &)),
+             wval, SLOT (revalidate()));
+    connect (wval, SIGNAL (validityChanged (const QIWidgetValidator *)),
+             this, SLOT (enableOk (const QIWidgetValidator *)));
+    connect (wval, SIGNAL (isValidRequested (QIWidgetValidator *)),
+             this, SLOT (revalidate (QIWidgetValidator *)));
+
+    wval->revalidate();
 }
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5925 +5925 @@
 
         ULONG uIRQ, uIOBase;
-        SerialHostMode_T HostMode;
+        PortMode_T HostMode;
         Bstr  path;
         BOOL  fServer;
@@ -5935 +5935 @@
         rc = CFGMR3InsertInteger(pCfg,   "IRQ", uIRQ);                              RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,   "IOBase", uIOBase);                        RC_CHECK();
-        if (HostMode != SerialHostMode_Disconnected)
+        if (HostMode != PortMode_DisconnectedPort)
         {
             rc = CFGMR3InsertNode(pInst,     "LUN#0", &pLunL0);                     RC_CHECK();
-            if (HostMode == SerialHostMode_HostPipe)
+            if (HostMode == PortMode_HostPipePort)
             {
                 rc = CFGMR3InsertString(pLunL0,  "Driver", "Char");                 RC_CHECK();
@@ -5947 +5947 @@
                 rc = CFGMR3InsertInteger(pLunL2, "IsServer", fServer);              RC_CHECK();
             }
-            else if (HostMode == SerialHostMode_HostDevice)
+            else if (HostMode == PortMode_HostDevicePort)
             {
                 rc = CFGMR3InsertString(pLunL0,  "Driver", "Host Serial");          RC_CHECK();
@@ -5980 +5980 @@
         hrc = parallelPort->COMGETTER(IRQ)(&uIRQ);                                  H();
         hrc = parallelPort->COMGETTER(IOBase)(&uIOBase);                            H();
-        hrc = parallelPort->COMGETTER(DevicePath)(DevicePath.asOutParam());         H();
+        hrc = parallelPort->COMGETTER(Path)(DevicePath.asOutParam());               H();
         rc = CFGMR3InsertInteger(pCfg,   "IRQ", uIRQ);                              RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,   "IOBase", uIOBase);                        RC_CHECK();

trunk/src/VBox/Main/ParallelPortImpl.cpp

@@ -262 +262 @@
     uint32_t uIRQ;
     CFGLDRQueryUInt32 (portNode, "IRQ", &uIRQ);
-    /* device path (required) */
-    Bstr DevicePath;
-    CFGLDRQueryBSTR   (portNode, "DevicePath", DevicePath.asOutParam());
+    /* device path */
+    Bstr path;
+    CFGLDRQueryBSTR   (portNode, "path", path.asOutParam());
 
     mData->mEnabled = fEnabled;
@@ -270 +270 @@
     mData->mIOBase  = uIOBase;
     mData->mIRQ     = uIRQ;
-    mData->mDevicePath = DevicePath;
+    mData->mPath    = path;
 
     return S_OK;
@@ -292 +292 @@
     CFGLDRSetUInt32 (portNode, "IOBase",  mData->mIOBase);
     CFGLDRSetUInt32 (portNode, "IRQ",     mData->mIRQ);
-    CFGLDRSetBSTR   (portNode, "DevicePath", mData->mDevicePath);
+    CFGLDRSetBSTR   (portNode, "path",    mData->mPath);
 
     return S_OK;
@@ -451 +451 @@
 }
 
-STDMETHODIMP ParallelPort::COMGETTER(DevicePath) (BSTR *aDevicePath)
-{
-    if (!aDevicePath)
+STDMETHODIMP ParallelPort::COMGETTER(Path) (BSTR *aPath)
+{
+    if (!aPath)
         return E_POINTER;
 
@@ -461 +461 @@
     AutoReaderLock alock (this);
 
-    mData->mDevicePath.cloneTo (aDevicePath);
-
-    return S_OK;
-}
-
-STDMETHODIMP ParallelPort::COMSETTER(DevicePath) (INPTR BSTR aDevicePath)
-{
-    if (!aDevicePath || *aDevicePath == 0)
+    mData->mPath.cloneTo (aPath);
+
+    return S_OK;
+}
+
+STDMETHODIMP ParallelPort::COMSETTER(Path) (INPTR BSTR aPath)
+{
+    if (!aPath || *aPath == 0)
         return E_INVALIDARG;
 
@@ -480 +480 @@
     AutoLock alock (this);
 
-    if (mData->mDevicePath != aDevicePath)
+    if (mData->mPath != aPath)
     {
         mData.backup();
-        mData->mDevicePath = aDevicePath;
+        mData->mPath = aPath;
 
         /* leave the lock before informing callbacks */

trunk/src/VBox/Main/SerialPortImpl.cpp

@@ -256 +256 @@
     bool fEnabled = false;
     CFGLDRQueryBool (portNode, "enabled", &fEnabled);
-    Bstr mode;
     uint32_t uIOBase;
     /* I/O base (required) */
@@ -264 +263 @@
     CFGLDRQueryUInt32 (portNode, "IRQ", &uIRQ);
     /* host mode (required) */
-    CFGLDRQueryBSTR (portNode, "HostMode", mode.asOutParam());
+    Bstr mode;
+    CFGLDRQueryBSTR (portNode, "hostMode", mode.asOutParam());
     if (mode == L"HostPipe")
-        mData->mHostMode = SerialHostMode_HostPipe;
+        mData->mHostMode = PortMode_HostPipePort;
     else if (mode == L"HostDevice")
-        mData->mHostMode = SerialHostMode_HostDevice;
+        mData->mHostMode = PortMode_HostDevicePort;
     else
-        mData->mHostMode = SerialHostMode_Disconnected;
-    /* name of the pipe (required) */
+        mData->mHostMode = PortMode_DisconnectedPort;
+    /* pipe/device path */
     Bstr path;
     int rc = CFGLDRQueryBSTR(portNode, "path", path.asOutParam());
-    /* backward compatibility */
-    if (rc == VERR_CFG_NO_VALUE)
-        CFGLDRQueryBSTR(portNode, "pipe", path.asOutParam());
+    /* server mode */
     bool fServer = true;
-    CFGLDRQueryBool   (portNode, "server", &fServer);
+    CFGLDRQueryBool (portNode, "server", &fServer);
 
     mData->mEnabled  = fEnabled;
@@ -307 +305 @@
     {
         default:
-        case SerialHostMode_Disconnected:
+        case PortMode_DisconnectedPort:
             mode = "Disconnected";
             break;
-        case SerialHostMode_HostPipe:
+        case PortMode_HostPipePort:
             mode = "HostPipe";
             break;
-        case SerialHostMode_HostDevice:
+        case PortMode_HostDevicePort:
             mode = "HostDevice";
             break;
@@ -319 +317 @@
     CFGLDRSetUInt32 (portNode, "slot",    mData->mSlot);
     CFGLDRSetBool   (portNode, "enabled", !!mData->mEnabled);
-    if (mData->mEnabled)
-    {
-        CFGLDRSetUInt32 (portNode, "IOBase",  mData->mIOBase);
-        CFGLDRSetUInt32 (portNode, "IRQ",     mData->mIRQ);
-        CFGLDRSetString (portNode, "HostMode", mode);
-        if (mData->mHostMode != SerialHostMode_Disconnected)
-        {
-            CFGLDRSetBSTR   (portNode, "path",    mData->mPath);
-            if (mData->mHostMode == SerialHostMode_HostPipe)
-                CFGLDRSetBool   (portNode, "server",  !!mData->mServer);
-        }
+    CFGLDRSetUInt32 (portNode, "IOBase",  mData->mIOBase);
+    CFGLDRSetUInt32 (portNode, "IRQ",     mData->mIRQ);
+    CFGLDRSetString (portNode, "hostMode", mode);
+    if (mData->mHostMode != PortMode_DisconnectedPort)
+    {
+        CFGLDRSetBSTR (portNode, "path",    mData->mPath);
+        if (mData->mHostMode == PortMode_HostPipePort)
+            CFGLDRSetBool (portNode, "server",  !!mData->mServer);
     }
 
@@ -380 +375 @@
 }
 
-STDMETHODIMP SerialPort::COMGETTER(HostMode) (SerialHostMode_T *aHostMode)
+STDMETHODIMP SerialPort::COMGETTER(HostMode) (PortMode_T *aHostMode)
 {
     if (!aHostMode)
@@ -395 +390 @@
 }
 
-STDMETHODIMP SerialPort::COMSETTER(HostMode) (SerialHostMode_T aHostMode)
+STDMETHODIMP SerialPort::COMSETTER(HostMode) (PortMode_T aHostMode)
 {
     AutoCaller autoCaller (this);
@@ -413 +408 @@
         mData.backup();
         mData->mHostMode = aHostMode;
-        if (aHostMode == SerialHostMode_Disconnected)
+        if (aHostMode == PortMode_DisconnectedPort)
         {
             mData->mPath   = "";

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7088 +7088 @@
 
   <enum
-     name="SerialHostMode"
-     uuid="5ac6ae50-30d4-4c89-8f9c-35b4500a5b9f"
+     name="PortMode"
+     uuid="b266f43c-2e93-46b3-812b-c20e600e867b"
      >
-    <const name="Disconnected"        value="0"/>
-    <const name="HostPipe"            value="1"/>
-    <const name="HostDevice"          value="2"/>
+    <const name="DisconnectedPort"        value="0"/>
+    <const name="HostPipePort"            value="1"/>
+    <const name="HostDevicePort"          value="2"/>
   </enum>
 
   <interface
      name="ISerialPort" extends="$unknown"
-     uuid="a5ab0989-0ca9-4d5e-b565-f7739b92bb0c"
+     uuid="937f6970-5103-4745-b78e-d28dcf1479a8"
      wsmap="managed"
      >
@@ -7112 +7112 @@
     <attribute name="enabled" type="boolean">
       <desc>
-        Flag whether the serial port is enabled. If it is disabled,
-        the serial port will not be reported to the guest.
+        Flag whether the serial port is enabled. If disabled,
+        the serial port will not be reported to the guest OS.
       </desc>
     </attribute>
 
     <attribute name="IOBase" type="unsigned long">
-      <desc>Gets the I/O base of the serial port.</desc>
+      <desc>I/O base of the serial port.</desc>
     </attribute>
 
     <attribute name="IRQ" type="unsigned long">
-      <desc>Gets the IRQ of the serial port.</desc>
-    </attribute>
-
-    <attribute name="HostMode" type="SerialHostMode">
+      <desc>IRQ of the serial port.</desc>
+    </attribute>
+
+    <attribute name="hostMode" type="PortMode">
       <desc>How is this port connected to the host.</desc>
     </attribute>
 
     <attribute name="server" type="boolean">
-      <desc>Flag whether this serial port acts as a server or a client.</desc>
+      <desc>
+        Flag whether this serial port acts as a server (creates a new pipe on
+        the host) or as a client (uses the existing pipe). This attribute is
+        used only when #hostMode is PortMode::HostPipe.
+      </desc>
     </attribute>
 
     <attribute name="path" type="wstring">
-      <desc>Flag whether this serial port acts as a server or a client.</desc>
+      <desc>
+        Path to the serial port's pipe on the host when #hostMode is
+        PortMode::HostPipe, or the host serial device name when #hostMode is
+        PortMode::HostDevice.
+      </desc>
     </attribute>
 
@@ -7146 +7154 @@
   <interface
      name="IParallelPort" extends="$unknown"
-     uuid="6d7f2385-8ce3-4342-a042-61fa1882354b"
+     uuid="0c925f06-dd10-4b77-8de8-294d738c3214"
      wsmap="managed"
      >
@@ -7160 +7168 @@
     <attribute name="enabled" type="boolean">
       <desc>
-        Flag whether the parallel port is enabled. If it is disabled,
-        the parallel port will not be reported to the guest.
+        Flag whether the parallel port is enabled. If disabled,
+        the parallel port will not be reported to the guest OS.
       </desc>
     </attribute>
 
     <attribute name="IOBase" type="unsigned long">
-      <desc>Gets the I/O base of the parallel port.</desc>
+      <desc>I/O base of the parallel port.</desc>
     </attribute>
 
     <attribute name="IRQ" type="unsigned long">
-      <desc>Gets the IRQ of the parallel port.</desc>
-    </attribute>
-
-    <attribute name="DevicePath" type="wstring">
-      <desc>Gets the of the device path connected to the parallel port.</desc>
+      <desc>IRQ of the parallel port.</desc>
+    </attribute>
+
+    <attribute name="path" type="wstring">
+      <desc>Host parallel device name.</desc>
     </attribute>
 

trunk/src/VBox/Main/include/ParallelPortImpl.h

@@ -48 +48 @@
                     mEnabled == that.mEnabled &&
                     mIRQ == that.mIRQ &&
-                    mIOBase == that.mIOBase);
+                    mIOBase == that.mIOBase &&
+                    mPath == that.mPath);
         }
 
@@ -55 +56 @@
         ULONG mIRQ;
         ULONG mIOBase;
-        Bstr  mDevicePath;
+        Bstr  mPath;
     };
 
@@ -90 +91 @@
     STDMETHOD(COMGETTER(IOBase))  (ULONG     *aIOBase);
     STDMETHOD(COMSETTER(IOBase))  (ULONG      aIOBase);
-    STDMETHOD(COMGETTER(DevicePath))    (BSTR      *aDevicePath);
-    STDMETHOD(COMSETTER(DevicePath))    (INPTR BSTR aDevicePath);
+    STDMETHOD(COMGETTER(Path))    (BSTR      *aPath);
+    STDMETHOD(COMSETTER(Path))    (INPTR BSTR aPath);
 
     // public methods only for internal purposes

trunk/src/VBox/Main/include/SerialPortImpl.h

@@ -40 +40 @@
             , mIRQ (4)
             , mIOBase (0x3f8)
-            , mHostMode (SerialHostMode_Disconnected)
+            , mHostMode (PortMode_DisconnectedPort)
             , mServer (FALSE)
         {}
@@ -49 +49 @@
                    (mSlot     == that.mSlot     &&
                     mEnabled  == that.mEnabled  &&
+                    mIRQ      == that.mIRQ      &&
+                    mIOBase   == that.mIOBase   &&
                     mHostMode == that.mHostMode &&
-                    mIRQ      == that.mIRQ      &&
-                    mIOBase   == that.mIOBase);
+                    mPath     == that.mPath     &&
+                    mServer   == that.mServer);
         }
 
@@ -58 +60 @@
         ULONG mIRQ;
         ULONG mIOBase;
-        SerialHostMode_T mHostMode;
+        PortMode_T mHostMode;
         Bstr  mPath;
         BOOL  mServer;
@@ -91 +93 @@
     STDMETHOD(COMGETTER(Enabled))  (BOOL      *aEnabled);
     STDMETHOD(COMSETTER(Enabled))  (BOOL       aEnabled);
-    STDMETHOD(COMGETTER(HostMode)) (SerialHostMode_T *aHostMode);
-    STDMETHOD(COMSETTER(HostMode)) (SerialHostMode_T  aHostMode);
+    STDMETHOD(COMGETTER(HostMode)) (PortMode_T *aHostMode);
+    STDMETHOD(COMSETTER(HostMode)) (PortMode_T  aHostMode);
     STDMETHOD(COMGETTER(IRQ))      (ULONG     *aIRQ);
     STDMETHOD(COMSETTER(IRQ))      (ULONG      aIRQ);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -172 +172 @@
 </xsd:simpleType>
 
-<xsd:simpleType name="TUartHostModeType">
+<xsd:simpleType name="TPortMode">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="Disconnected"/>
@@ -529 +529 @@
   </xsd:attribute>
   <xsd:attribute name="enabled" type="xsd:boolean" use="required"/>
-  <xsd:attribute name="IRQ" type="xsd:unsignedInt" default="4"/>
-  <xsd:attribute name="IOBase" type="xsd:unsignedInt" default="1016"/>
-  <xsd:attribute name="HostMode" type="TUartHostModeType" default="Disconnected"/>
-  <xsd:attribute name="pipe" type="xsd:string"/>
-  <xsd:attribute name="path" type="xsd:string"/>
-  <xsd:attribute name="server" type="xsd:boolean"/>
+  <xsd:attribute name="IRQ" type="xsd:unsignedInt" use="required"/>
+  <xsd:attribute name="IOBase" type="xsd:unsignedInt" use="required"/>
+  <xsd:attribute name="hostMode" type="TPortMode" use="required"/>
+  <xsd:attribute name="path" type="TLocalFile"/>
+  <xsd:attribute name="server" type="xsd:boolean" default="false"/>
 </xsd:complexType>
 
@@ -560 +559 @@
   </xsd:attribute>
   <xsd:attribute name="enabled" type="xsd:boolean" use="required"/>
-  <xsd:attribute name="IRQ" type="xsd:unsignedInt" default="4"/>
-  <xsd:attribute name="IOBase" type="xsd:unsignedInt" default="888"/>
-  <xsd:attribute name="DevicePath" type="TLocalFile"/>
+  <xsd:attribute name="IRQ" type="xsd:unsignedInt" use="required"/>
+  <xsd:attribute name="IOBase" type="xsd:unsignedInt" use="required"/>
+  <xsd:attribute name="path" type="TLocalFile"/>
 </xsd:complexType>