Changeset 55266 in vbox for trunk/src/VBox

Timestamp:

Apr 15, 2015 6:48:56 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: VM Settings dialog: Serial Ports page: Logic and NLS fixes for r99572.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsSerial.cpp (modified) (2 diffs)
• UIMachineSettingsSerial.ui (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp

@@ -115 +115 @@
     mLeIOPort->setText("0x" + QString::number(portData.m_uIOBase, 16).toUpper());
     mCbMode->setCurrentIndex(mCbMode->findText(gpConverter->toString(portData.m_hostMode)));
-    mCbPipe->setChecked(portData.m_fServer);
+    mCbPipe->setChecked(!portData.m_fServer);
     mLePath->setText(portData.m_strPath);
 
@@ -131 +131 @@
     portData.m_uIRQ = mLeIRQ->text().toULong(NULL, 0);
     portData.m_uIOBase = mLeIOPort->text().toULong (NULL, 0);
-    portData.m_fServer = mCbPipe->isChecked();
+    portData.m_fServer = !mCbPipe->isChecked();
     portData.m_hostMode = gpConverter->fromString<KPortMode>(mCbMode->currentText());
     portData.m_strPath = QDir::toNativeSeparators(mLePath->text());

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.ui

@@ -177 +177 @@
        <widget class="QCheckBox" name="mCbPipe" >
         <property name="whatsThis" >
-         <string>If checked, the pipe or socket specified in the &lt;b>Port Path&lt;/b> field will be created by the virtual machine when it starts. Otherwise, the virtual machine will assume that the pipe or socket exists and try to use it.</string>
+         <string>If checked, the virtual machine will assume that the pipe or socket specified in the &lt;b>Path/Address&lt;/b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</string>
         </property>
         <property name="text" >
@@ -200 +200 @@
        <widget class="QLineEdit" name="mLePath" >
         <property name="whatsThis" >
-         <string>In &lt;b>Host Pipe&lt;/b> mode: Holds the path to the serial port's pipe on the host, examples:
-"\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively. 
-In &lt;b>Host Device&lt;/b> mode: Holds the host serial device name; examples: "COM1" or "/dev/ttyS0".
-In &lt;b>Raw file&lt;/b> mode: file-path on the host system, where serial output will be dumped.
-In &lt;b>TCP&lt;/b> mode: Holds TCP "port" when in server mode, or "hostname:port" or when in client mode.
-</string>
+         <string>&lt;p>In &lt;b>Host Pipe&lt;/b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.&lt;/p>&lt;p>In &lt;b>Host Device&lt;/b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".&lt;/p>&lt;p>In &lt;b>Raw File&lt;/b> mode: Holds the file-path on the host system, where the serial output will be dumped.&lt;/p>&lt;p>In &lt;b>TCP&lt;/b> mode: Holds the TCP "port" when in server mode, or "hostname:port" when in client mode.</string>
         </property>
        </widget>