Changeset 4354 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (3 diffs)
• src/VBoxGlobal.cpp (modified) (5 diffs)
• ui/VBoxVMSerialPortSettings.ui.h (modified) (5 diffs)
• ui/VBoxVMSettingsDlg.ui (modified) (7 diffs)

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

@@ -341 +341 @@
         return USBDeviceStates [aState];
     }
+
+    QStringList COMPortNames() const;
+    QString toCOMPortName (ulong aIRQ, ulong aIOBase) const;
+    bool toCOMPortNumbers (const QString &aName, ulong &aIRQ, ulong &aIOBase) const;
 
     QPixmap snapshotIcon (bool online) const
@@ -557 +561 @@
     QStringVector USBDeviceStates;
 
+    QString mUserDefinedCOMPortName;
+
     mutable bool detailReportTemplatesReady;
 

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

@@ -323 +323 @@
     devicesMenu->insertSeparator();
 
+    devicesMenu->insertItem (VBoxGlobal::iconSet ("nw_16px.png", "nw_disabled_16px.png"),
+        QString::null, devicesNetworkMenu, devicesNetworkMenuId);
+    devicesMenu->insertSeparator();
+
     devicesMenu->insertItem (VBoxGlobal::iconSet ("usb_16px.png", "usb_disabled_16px.png"),
         QString::null, devicesUSBMenu, devicesUSBMenuId);
@@ -330 +334 @@
     devicesSFMenuSeparatorId = devicesMenu->insertSeparator();
     devicesSFDialogAction->addTo (devicesSFMenu);
-
-    devicesMenu->insertItem (VBoxGlobal::iconSet ("nw_16px.png", "nw_disabled_16px.png"),
-        QString::null, devicesNetworkMenu, devicesNetworkMenuId);
-    devicesMenu->insertSeparator();
 
     devicesSwitchVrdpAction->addTo (devicesMenu);
@@ -2859 +2859 @@
         machine_state = state;
 
-        updateAppearanceOf (Caption | FloppyStuff | DVDStuff |
+        updateAppearanceOf (Caption | FloppyStuff | DVDStuff | NetworkStuff |
                             USBStuff | VRDPStuff | PauseAction |
                             DisableMouseIntegrAction);

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

@@ -823 +823 @@
             list += deviceTypes [i];
     return list;
+}
+
+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
+     * toCOMPortName() to return the "User-defined" string for these values. */
+};
+
+/** 
+ *  Returns the list of the standard COM port names (i.e. "COMx").
+ */
+QStringList VBoxGlobal::COMPortNames() const
+{
+    QStringList list;
+    for (size_t i = 0; i < ELEMENTS (kKnownPorts); ++ i)
+        list << kKnownPorts [i].name;
+
+    return list;
+}
+
+/** 
+ *  Returns the name of the standard COM port corresponding to the given
+ *  parameters, or "User-defined" (which is also returned when both
+ *  @a aIRQ and @a aIOBase are 0).
+ */
+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;
+}
+
+/** 
+ *  Returns port parameters corresponding to the given standard COM name.
+ *  Returns @c true on success, or @c false if the given port name is not one
+ *  of the standard names (i.e. "COMx").
+ */
+bool VBoxGlobal::toCOMPortNumbers (const QString &aName, ulong &aIRQ,
+                                   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;
+            return true;
+        }
+
+    return false;
 }
 
@@ -1305 +1367 @@
                       item); /* items */
         }
+        /* serial ports */
+        {
+            item = QString::null;
+            ulong count = vbox.GetSystemProperties().GetSerialPortCount();
+            int rows = 2; /* including section header and footer */
+            for (ulong slot = 0; slot < count; slot ++)
+            {
+                CSerialPort port = m.GetSerialPort (slot);
+                if (port.GetEnabled())
+                {
+                    CEnums::PortMode mode = port.GetHostMode();
+                    QString data =
+                        toCOMPortName (port.GetIRQ(), port.GetIOBase()) + ", ";
+                    if (mode == CEnums::HostPipePort ||
+                        mode == CEnums::HostDevicePort)
+                        data += QString ("%1 (<nobr>%1</nobr>)")
+                            .arg (vboxGlobal().toString (mode))
+                            .arg (QDir::convertSeparators (port.GetPath()));
+                    else  
+                        data += toString (mode);
+
+                    item += QString (sSectionItemTpl)
+                        .arg (tr ("Port %1", "details report (serial ports)")
+                              .arg (port.GetSlot()))
+                        .arg (data);
+                    ++ rows;
+                }
+            }
+            if (item.isNull())
+            {
+                item = QString (sSectionItemTpl)
+                    .arg (tr ("Disabled", "details report (serial ports)"), "");
+                ++ rows;
+            }
+
+            detailsReport += sectionTpl
+                .arg (rows) /* rows */
+                .arg ("machine_16px.png", /* icon */
+                      "#serialPorts", /* link */
+                      tr ("Serial Ports", "details report"), /* title */
+                      item); /* items */
+        }
         /* USB */
         {
@@ -1334 +1438 @@
                     .arg ("usb_16px.png", /* icon */
                           "#usb", /* link */
-                          tr ("USB Controller", "details report"), /* title */
-                          item); /* items */
-            }
-        }
-        /* VRDP */
-        {
-            CVRDPServer srv = m.GetVRDPServer();
-            if (!srv.isNull())
-            {
-                /* the VRDP server may be unavailable (i.e. in VirtualBox OSE) */
-
-                if (srv.GetEnabled())
-                    item = QString (sSectionItemTpl)
-                        .arg (tr ("VRDP Server Port", "details report (VRDP)"),
-                              tr ("%1", "details report (VRDP)")
-                                  .arg (srv.GetPort()));
-                else
-                    item = QString (sSectionItemTpl)
-                        .arg (tr ("Disabled", "details report (VRDP)"), "");
-
-                detailsReport += sectionTpl
-                    .arg (2 + 1) /* rows */
-                    .arg ("vrdp_16px.png", /* icon */
-                          "#vrdp", /* link */
-                          tr ("Remote Display", "details report"), /* title */
+                          tr ("USB", "details report"), /* title */
                           item); /* items */
             }
@@ -1382 +1462 @@
                       tr ("Shared Folders", "details report"), /* title */
                       item); /* items */
+        }
+        /* VRDP */
+        {
+            CVRDPServer srv = m.GetVRDPServer();
+            if (!srv.isNull())
+            {
+                /* the VRDP server may be unavailable (i.e. in VirtualBox OSE) */
+
+                if (srv.GetEnabled())
+                    item = QString (sSectionItemTpl)
+                        .arg (tr ("VRDP Server Port", "details report (VRDP)"),
+                              tr ("%1", "details report (VRDP)")
+                                  .arg (srv.GetPort()));
+                else
+                    item = QString (sSectionItemTpl)
+                        .arg (tr ("Disabled", "details report (VRDP)"), "");
+
+                detailsReport += sectionTpl
+                    .arg (2 + 1) /* rows */
+                    .arg ("vrdp_16px.png", /* icon */
+                          "#vrdp", /* link */
+                          tr ("Remote Display", "details report"), /* title */
+                          item); /* items */
+            }
         }
     }
@@ -1925 +2029 @@
         tr ("Captured", "USBDeviceState");
 
+    mUserDefinedCOMPortName = tr ("User-defined", "serial port");
+
     detailReportTemplatesReady = false;
 

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>