Changeset 5837 in vbox

Timestamp:

Nov 26, 2007 4:49:18 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

26295

Message:

2481: “Create parallel port UI”: implemented.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (2 diffs)
• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (8 diffs)
• ui/VBoxVMSerialPortSettings.ui (modified) (2 diffs)
• ui/VBoxVMSerialPortSettings.ui.h (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui (modified) (10 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (5 diffs)

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

@@ -8 +8 @@
 #
 #  Copyright (C) 2006-2007 innotek GmbH
-# 
+#
 #  This file is part of VirtualBox Open Source Edition (OSE), as
 #  available from http://www.virtualbox.org. This file is free software;
@@ -23 +23 @@
         ui/VBoxVMNetworkSettings.ui \
         ui/VBoxVMSerialPortSettings.ui \
+        ui/VBoxVMParallelPortSettings.ui \
         ui/VBoxUSBFilterSettings.ui \
         ui/VBoxSharedFoldersSettings.ui \

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

@@ -372 +372 @@
     QString toCOMPortName (ulong aIRQ, ulong aIOBase) const;
     bool toCOMPortNumbers (const QString &aName, ulong &aIRQ, ulong &aIOBase) const;
+
+    QStringList LPTPortNames() const;
+    QString toLPTPortName (ulong aIRQ, ulong aIOBase) const;
+    bool toLPTPortNumbers (const QString &aName, ulong &aIRQ, ulong &aIOBase) const;
 
     QPixmap snapshotIcon (bool online) const
@@ -605 +609 @@
     QStringVector USBDeviceStates;
 
-    QString mUserDefinedCOMPortName;
+    QString mUserDefinedPortName;
 
     mutable bool detailReportTemplatesReady;

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

@@ -957 +957 @@
 }
 
-static const struct PortConfig
+struct PortConfig
 {
     const char *name;
     const ulong IRQ;
     const ulong IOBase;
-}
-kKnownPorts[] =
+};
+
+static const PortConfig comKnownPorts[] =
 {
     { "COM1", 4, 0x3F8 },
@@ -973 +974 @@
 };
 
+static const PortConfig lptKnownPorts[] =
+{
+    { "LPT1", 7, 0x3BC },
+    { "LPT2", 5, 0x378 },
+    { "LPT3", 5, 0x278 },
+    /* must not contain an element with IRQ=0 and IOBase=0 used to cause
+     * toLPTPortName() to return the "User-defined" string for these values. */
+};
+
 /**
  *  Returns the list of the standard COM port names (i.e. "COMx").
@@ -979 +989 @@
 {
     QStringList list;
-    for (size_t i = 0; i < ELEMENTS (kKnownPorts); ++ i)
-        list << kKnownPorts [i].name;
+    for (size_t i = 0; i < ELEMENTS (comKnownPorts); ++ i)
+        list << comKnownPorts [i].name;
+
+    return list;
+}
+
+/**
+ *  Returns the list of the standard LPT port names (i.e. "LPTx").
+ */
+QStringList VBoxGlobal::LPTPortNames() const
+{
+    QStringList list;
+    for (size_t i = 0; i < ELEMENTS (lptKnownPorts); ++ i)
+        list << lptKnownPorts [i].name;
 
     return list;
@@ -992 +1014 @@
 QString VBoxGlobal::toCOMPortName (ulong aIRQ, ulong aIOBase) const
 {
-    for (size_t i = 0; i < ELEMENTS (kKnownPorts); ++ i)
-        if (kKnownPorts [i].IRQ == aIRQ &&
-            kKnownPorts [i].IOBase == aIOBase)
-            return kKnownPorts [i].name;
-
-    return mUserDefinedCOMPortName;
+    for (size_t i = 0; i < ELEMENTS (comKnownPorts); ++ i)
+        if (comKnownPorts [i].IRQ == aIRQ &&
+            comKnownPorts [i].IOBase == aIOBase)
+            return comKnownPorts [i].name;
+
+    return mUserDefinedPortName;
+}
+
+/**
+ *  Returns the name of the standard LPT port corresponding to the given
+ *  parameters, or "User-defined" (which is also returned when both
+ *  @a aIRQ and @a aIOBase are 0).
+ */
+QString VBoxGlobal::toLPTPortName (ulong aIRQ, ulong aIOBase) const
+{
+    for (size_t i = 0; i < ELEMENTS (lptKnownPorts); ++ i)
+        if (lptKnownPorts [i].IRQ == aIRQ &&
+            lptKnownPorts [i].IOBase == aIOBase)
+            return lptKnownPorts [i].name;
+
+    return mUserDefinedPortName;
 }
 
@@ -1008 +1045 @@
                                    ulong &aIOBase) const
 {
-    for (size_t i = 0; i < ELEMENTS (kKnownPorts); ++ i)
-        if (strcmp (kKnownPorts [i].name, aName.utf8().data()) == 0)
-        {
-            aIRQ = kKnownPorts [i].IRQ;
-            aIOBase = kKnownPorts [i].IOBase;
+    for (size_t i = 0; i < ELEMENTS (comKnownPorts); ++ i)
+        if (strcmp (comKnownPorts [i].name, aName.utf8().data()) == 0)
+        {
+            aIRQ = comKnownPorts [i].IRQ;
+            aIOBase = comKnownPorts [i].IOBase;
+            return true;
+        }
+
+    return false;
+}
+
+/**
+ *  Returns port parameters corresponding to the given standard LPT name.
+ *  Returns @c true on success, or @c false if the given port name is not one
+ *  of the standard names (i.e. "LPTx").
+ */
+bool VBoxGlobal::toLPTPortNumbers (const QString &aName, ulong &aIRQ,
+                                   ulong &aIOBase) const
+{
+    for (size_t i = 0; i < ELEMENTS (lptKnownPorts); ++ i)
+        if (strcmp (lptKnownPorts [i].name, aName.utf8().data()) == 0)
+        {
+            aIRQ = lptKnownPorts [i].IRQ;
+            aIOBase = lptKnownPorts [i].IOBase;
             return true;
         }
@@ -1514 +1570 @@
                     if (mode == CEnums::HostPipePort ||
                         mode == CEnums::HostDevicePort)
-                        data += QString ("%1 (<nobr>%1</nobr>)")
+                        data += QString ("%1 (<nobr>%2</nobr>)")
                             .arg (vboxGlobal().toString (mode))
                             .arg (QDir::convertSeparators (port.GetPath()));
@@ -1539 +1595 @@
                       "#serialPorts", /* link */
                       tr ("Serial Ports", "details report"), /* title */
+                      item); /* items */
+        }
+        /* parallel ports */
+        {
+            item = QString::null;
+            ulong count = mVBox.GetSystemProperties().GetParallelPortCount();
+            int rows = 2; /* including section header and footer */
+            for (ulong slot = 0; slot < count; slot ++)
+            {
+                CParallelPort port = m.GetParallelPort (slot);
+                if (port.GetEnabled())
+                {
+                    QString data =
+                        toLPTPortName (port.GetIRQ(), port.GetIOBase()) +
+                        QString (" (<nobr>%1</nobr>)")
+                        .arg (QDir::convertSeparators (port.GetPath()));
+
+                    item += QString (sSectionItemTpl)
+                        .arg (tr ("Port %1", "details report (parallel ports)")
+                              .arg (port.GetSlot()))
+                        .arg (data);
+                    ++ rows;
+                }
+            }
+            if (item.isNull())
+            {
+                item = QString (sSectionItemTpl)
+                    .arg (tr ("Disabled", "details report (parallel ports)"), "");
+                ++ rows;
+            }
+
+            detailsReport += sectionTpl
+                .arg (rows) /* rows */
+                .arg ("serial_port_16px.png", /* icon */
+                      "#parallelPorts", /* link */
+                      tr ("Parallel Ports", "details report"), /* title */
                       item); /* items */
         }
@@ -2121 +2213 @@
         tr ("Captured", "USBDeviceState");
 
-    mUserDefinedCOMPortName = tr ("User-defined", "serial port");
+    mUserDefinedPortName = tr ("User-defined", "serial port");
 
     detailReportTemplatesReady = false;

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

@@ -6 +6 @@
 
      Copyright (C) 2006-2007 innotek GmbH
-    
+
      This file is part of VirtualBox Open Source Edition (OSE), as
      available from http://www.virtualbox.org. This file is free software;
@@ -230 +230 @@
     <include location="global" impldecl="in implementation">qvalidator.h</include>
     <include location="local" impldecl="in implementation">VBoxGlobal.h</include>
-    <include location="local" impldecl="in implementation">VBoxProblemReporter.h</include>
     <include location="local" impldecl="in implementation">VBoxVMSerialPortSettings.ui.h</include>
 </includes>

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

@@ -83 +83 @@
     mPort.SetIOBase (mIOPortLine->text().toULong (NULL, 0));
 
-    CEnums::PortMode mode = vboxGlobal().toPortMode (mHostModeCombo->currentText());
-    mPort.SetHostMode (mode);
+    mPort.SetPath (QDir::convertSeparators (mPortPathLine->text()));
 
+    mPort.SetHostMode (vboxGlobal().toPortMode (mHostModeCombo->currentText()));
     mPort.SetServer (mServerCheck->isChecked());
-    mPort.SetPath (QDir::convertSeparators (mPortPathLine->text()));
 }
 

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

@@ -213 +213 @@
             </property>
             <property name="text">
-                <string>7</string>
+                <string>8</string>
             </property>
             <property name="text">
@@ -233 +233 @@
             </property>
             <property name="text">
-                <string>9</string>
+                <string>10</string>
             </property>
             <property name="text">
@@ -253 +253 @@
             </property>
             <property name="text">
-                <string>8</string>
+                <string>9</string>
             </property>
             <property name="text">
@@ -277 +277 @@
             <property name="text">
                 <string>#serialPorts</string>
+            </property>
+            <property name="pixmap">
+                <pixmap>serial_port_16px.png</pixmap>
+            </property>
+            <property name="pixmap">
+                <pixmap></pixmap>
+            </property>
+            <property name="pixmap">
+                <pixmap></pixmap>
+            </property>
+        </item>
+        <item>
+            <property name="text">
+                <string> Parallel Ports </string>
+            </property>
+            <property name="text">
+                <string>7</string>
+            </property>
+            <property name="text">
+                <string>#parallelPorts</string>
             </property>
             <property name="pixmap">
@@ -2276 +2296 @@
                 </property>
                 <attribute name="id">
-                    <number>7</number>
+                    <number>8</number>
                 </attribute>
                 <vbox>
@@ -2536 +2556 @@
                 </property>
                 <attribute name="id">
-                    <number>9</number>
+                    <number>10</number>
                 </attribute>
                 <vbox>
@@ -2750 +2770 @@
                 </property>
                 <attribute name="id">
-                    <number>8</number>
+                    <number>9</number>
                 </attribute>
             </widget>
@@ -2770 +2790 @@
                         <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 class="QWidget">
+                <property name="name">
+                    <cstring>pageParallel</cstring>
+                </property>
+                <attribute name="id">
+                    <number>7</number>
+                </attribute>
+                <vbox>
+                    <property name="name">
+                        <cstring>unnamed</cstring>
+                    </property>
+                    <property name="margin">
+                        <number>0</number>
+                    </property>
+                    <widget class="QTabWidget">
+                        <property name="name">
+                            <cstring>tbwParallelPorts</cstring>
                         </property>
                         <property name="sizePolicy">
@@ -3121 +3170 @@
     <include location="local" impldecl="in implementation">VBoxVMNetworkSettings.h</include>
     <include location="local" impldecl="in implementation">VBoxVMSerialPortSettings.h</include>
+    <include location="local" impldecl="in implementation">VBoxVMParallelPortSettings.h</include>
     <include location="local" impldecl="in implementation">VBoxUSBFilterSettings.h</include>
     <include location="local" impldecl="in implementation">VBoxSharedFoldersSettings.h</include>
@@ -3183 +3233 @@
     <slot>addNetworkAdapter( const CNetworkAdapter &amp; )</slot>
     <slot>addSerialPort( const CSerialPort &amp; )</slot>
+    <slot>addParallelPort( const CParallelPort &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

@@ -1505 +1505 @@
     else if (pg == pageSerial)
     {
+        valid = true;
         QValueList <QString> ports;
         QValueList <QString> paths;
@@ -1541 +1542 @@
                         tr ("Duplicate port path is entered ");
                     pageTitle += ": " + tbwSerialPorts->tabLabel (tab);
+                    break;
+                }
+                paths << path;
+            }
+        }
+    }
+    else if (pg == pageParallel)
+    {
+        valid = true;
+        QValueList <QString> ports;
+        QValueList <QString> paths;
+
+        int index = 0;
+        for (; index < tbwParallelPorts->count(); ++ index)
+        {
+            QWidget *tab = tbwParallelPorts->page (index);
+            VBoxVMParallelPortSettings *page =
+                static_cast <VBoxVMParallelPortSettings *> (tab);
+
+            /* check the predefined port number unicity */
+            if (page->mParallelPortBox->isChecked() && !page->isUserDefined())
+            {
+                QString port = page->mPortNumCombo->currentText();
+                valid = !ports.contains (port);
+                if (!valid)
+                {
+                    warningText = tr ("Duplicate port number is selected ");
+                    pageTitle += ": " + tbwParallelPorts->tabLabel (tab);
+                    break;
+                }
+                ports << port;
+            }
+            /* check the port path emptiness & unicity */
+            if (page->mParallelPortBox->isChecked())
+            {
+                QString path = page->mPortPathLine->text();
+                valid = !path.isEmpty() && !paths.contains (path);
+                if (!valid)
+                {
+                    warningText = path.isEmpty() ?
+                        tr ("Port path is not specified ") :
+                        tr ("Duplicate port path is entered ");
+                    pageTitle += ": " + tbwParallelPorts->tabLabel (tab);
                     break;
                 }
@@ -1830 +1874 @@
     }
 
+    /* parallel ports */
+    {
+        ulong count = vbox.GetSystemProperties().GetParallelPortCount();
+        for (ulong slot = 0; slot < count; ++ slot)
+        {
+            CParallelPort port = machine.GetParallelPort (slot);
+            addParallelPort (port);
+        }
+    }
+
     /* USB */
     {
@@ -2115 +2169 @@
             VBoxVMSerialPortSettings *page =
                 (VBoxVMSerialPortSettings *) tbwSerialPorts->page (index);
+            Assert (page);
+            page->putBackToPort();
+        }
+    }
+
+    /* parallel ports */
+    {
+        for (int index = 0; index < tbwParallelPorts->count(); index++)
+        {
+            VBoxVMParallelPortSettings *page =
+                (VBoxVMParallelPortSettings *) tbwParallelPorts->page (index);
             Assert (page);
             page->putBackToPort();
@@ -2306 +2371 @@
 }
 
+void VBoxVMSettingsDlg::addParallelPort (const CParallelPort &aPort)
+{
+    VBoxVMParallelPortSettings *page = new VBoxVMParallelPortSettings();
+    page->getFromPort (aPort);
+    QString pageTitle = QString (tr ("Port %1", "parallel ports"))
+                                 .arg (aPort.GetSlot());
+    tbwParallelPorts->addTab (page, pageTitle);
+
+    /* 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 (QString ("%1: %2")
+                               .arg (pagePath (pageParallel), pageTitle),
+                               pageParallel, this);
+    connect (page->mParallelPortBox, 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 (wval, SIGNAL (validityChanged (const QIWidgetValidator *)),
+             this, SLOT (enableOk (const QIWidgetValidator *)));
+    connect (wval, SIGNAL (isValidRequested (QIWidgetValidator *)),
+             this, SLOT (revalidate (QIWidgetValidator *)));
+
+    wval->revalidate();
+}
+
 void VBoxVMSettingsDlg::slRAM_valueChanged( int val )
 {