Changeset 5837 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui

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/ui

Files:

• VBoxVMSerialPortSettings.ui (modified) (2 diffs)
• VBoxVMSerialPortSettings.ui.h (modified) (1 diff)
• VBoxVMSettingsDlg.ui (modified) (10 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (5 diffs)

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 )
 {