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

Timestamp:

Aug 24, 2007 3:08:48 PM (18 years ago)

Author:

vboxsync

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

23901

Message:

FE/Qt: Added COM port details report; synchronized settings category order in Details, Settings and Console menus.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMSerialPortSettings.ui.h (modified) (5 diffs)
• VBoxVMSettingsDlg.ui (modified) (7 diffs)

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

@@ -27 +27 @@
 
 
-static const struct PortConfig
-{
-    const char *name;
-    const ulong IRQ;
-    const ulong IOBase;
-}
-kKnownPorts[] = 
-{
-    { "COM1", 4, 0x3F8 },
-    { "COM2", 3, 0x2F8 },
-    { "COM3", 4, 0x3E8 },
-    { "COM4", 3, 0x2E8 },
-    /* must not contain an element with IRQ=0 and IOBase=0 used to cause
-     * portNumbers2Name() to return the "User-defined" string. */
-};
-
-static const PortConfig *findByPortNumbers (ulong aIRQ, ulong aIOBase)
-{
-    for (size_t i = 0; i < ELEMENTS (kKnownPorts); ++ i)
-        if (kKnownPorts [i].IRQ == aIRQ &&
-            kKnownPorts [i].IOBase == aIOBase)
-            return &kKnownPorts [i];
-    return NULL;
-}
-
-static const PortConfig *findByPortName (const char *aName)
-{
-    for (size_t i = 0; i < ELEMENTS (kKnownPorts); ++ i)
-        if (strcmp (kKnownPorts [i].name, aName) == 0)
-            return &kKnownPorts [i];
-    return NULL;
-}
-
-static QString portNumbers2Name (ulong aIRQ, ulong aIOBase)
-{
-    const PortConfig *config = findByPortNumbers (aIRQ, aIOBase);
-    if (config)
-        return config->name;
-
-    return VBoxVMSerialPortSettings::tr ("User-defined");
-}
-
-
 void VBoxVMSerialPortSettings::init()
 {
@@ -91 +48 @@
     /* set initial values */
 
-    for (size_t i = 0; i < ELEMENTS (kKnownPorts); ++ i)
-        mPortNumCombo->insertItem (kKnownPorts [i].name);
-    mPortNumCombo->insertItem (portNumbers2Name (0, 0));
+    mPortNumCombo->insertStringList (vboxGlobal().COMPortNames());
+    mPortNumCombo->insertItem (vboxGlobal().toCOMPortName (0, 0));
 
     mHostModeCombo->insertItem (vboxGlobal().toString (CEnums::DisconnectedPort));
@@ -108 +64 @@
     ulong IRQ = mPort.GetIRQ();
     ulong IOBase = mPort.GetIOBase();
-    mPortNumCombo->setCurrentText (portNumbers2Name (IRQ, IOBase));
+    mPortNumCombo->setCurrentText (vboxGlobal().toCOMPortName (IRQ, IOBase));
     mIRQLine->setText (QString::number (IRQ));
     mIOPortLine->setText ("0x" + QString::number (IOBase, 16).upper());
@@ -134 +90 @@
 bool VBoxVMSerialPortSettings::isUserDefined()
 {
-    return findByPortName (mPortNumCombo->currentText().utf8().data()) == NULL;
+    ulong a, b;
+    return !vboxGlobal().toCOMPortNumbers (mPortNumCombo->currentText(), a, b);
 }
 
@@ -148 +105 @@
 void VBoxVMSerialPortSettings::mPortNumCombo_activated (const QString &aText)
 {
-    const PortConfig *config = findByPortName (aText.utf8().data());
-    mIRQLine->setEnabled (config == NULL);
-    mIOPortLine->setEnabled (config == NULL);
-    if (config != NULL)
+    ulong IRQ, IOBase;
+    bool std = vboxGlobal().toCOMPortNumbers (aText, IRQ, IOBase);
+
+    mIRQLine->setEnabled (!std);
+    mIOPortLine->setEnabled (!std);
+    if (std)
     {
-        mIRQLine->setText (QString::number (config->IRQ));
-        mIOPortLine->setText ("0x" + QString::number (config->IOBase, 16).upper());
+        mIRQLine->setText (QString::number (IRQ));
+        mIOPortLine->setText ("0x" + QString::number (IOBase, 16).upper());
     }
 }

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

@@ -213 +213 @@
             </property>
             <property name="text">
-                <string>6</string>
+                <string>7</string>
             </property>
             <property name="text">
@@ -233 +233 @@
             </property>
             <property name="text">
-                <string>7</string>
+                <string>9</string>
             </property>
             <property name="text">
@@ -273 +273 @@
             </property>
             <property name="text">
-                <string>9</string>
+                <string>6</string>
             </property>
             <property name="text">
@@ -279 +279 @@
             </property>
             <property name="pixmap">
-                <pixmap></pixmap>
+                <pixmap>machine_16px.png</pixmap>
             </property>
             <property name="pixmap">
@@ -2247 +2247 @@
                 </property>
                 <attribute name="id">
-                    <number>6</number>
+                    <number>7</number>
                 </attribute>
                 <vbox>
@@ -2488 +2488 @@
                 </property>
                 <attribute name="id">
-                    <number>7</number>
+                    <number>9</number>
                 </attribute>
                 <vbox>
@@ -2710 +2710 @@
                 </property>
                 <attribute name="id">
-                    <number>9</number>
+                    <number>6</number>
                 </attribute>
                 <vbox>