Index: /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsSerial.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsSerial.cpp (revision 10698)
+++ /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsSerial.cpp (revision 10699)
@@ -41,8 +41,6 @@
/* Setup constraints */
- mLeIRQ->setMaximumWidth (mLeIRQ->fontMetrics().width ("888888"));
- mLeIRQ->setMinimumWidth (mLeIRQ->minimumWidth());
- mLeIOPort->setMaximumWidth (mLeIOPort->fontMetrics().width ("8888888"));
- mLeIOPort->setMinimumWidth (mLeIOPort->minimumWidth());
+ mLeIRQ->setFixedWidth (mLeIRQ->fontMetrics().width ("8888"));
+ mLeIOPort->setFixedWidth (mLeIOPort->fontMetrics().width ("8888888"));
/* Set initial values */
@@ -180,4 +178,5 @@
KPortMode mode = vboxGlobal().toPortMode (aText);
mCbPipe->setEnabled (mode == KPortMode_HostPipe);
+ mLbPath->setEnabled (mode != KPortMode_Disconnected);
mLePath->setEnabled (mode != KPortMode_Disconnected);
if (mValidator)
@@ -192,10 +191,7 @@
/* TabWidget creation */
mTabWidget = new QTabWidget (this);
- mTabWidget->setSizePolicy (QSizePolicy::Expanding,
- QSizePolicy::Fixed);
QVBoxLayout *layout = new QVBoxLayout (this);
layout->setContentsMargins (0, 5, 0, 5);
layout->addWidget (mTabWidget);
- layout->addStretch();
/* Applying language settings */
Index: /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsSerial.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsSerial.ui (revision 10698)
+++ /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsSerial.ui (revision 10699)
@@ -23,28 +23,60 @@
0
0
- 379
- 163
+ 357
+ 179
-
- -
-
+
+
-
+
When checked, enables the given serial port of the virtual machine.
-
+
&Enable Serial Port
-
+
true
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
+ -
+
+
+ 0
+
- 5
+ 0
+
+
+ 0
+
+
+ 0
-
- Port &Number
+ Port &Number:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -61,58 +93,70 @@
-
-
-
-
-
-
- &IRQ
-
-
- mLeIRQ
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Displays the IRQ number of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>255</tt>. Values greater than <tt>15</tt> may be used only if the <b>IO APIC</b> is enabled for this virtual machine.
-
-
-
-
+
+
+ &IRQ:
+
+
+ mLeIRQ
+
+
-
-
-
-
-
-
- I/O Po&rt
-
-
- mLbIOPort
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Displays the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.
-
-
-
-
+
+
+
+ 0
+ 0
+
+
+
+ Displays the IRQ number of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>255</tt>. Values greater than <tt>15</tt> may be used only if the <b>IO APIC</b> is enabled for this virtual machine.
+
+
-
+
+
+ I/O Po&rt:
+
+
+ mLbIOPort
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Displays the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.
+
+
+
+ -
+
+
+ Port &Mode:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ mCbMode
+
+
+
+ -
+
+
+ Controls the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.
+
+
+
+ -
@@ -121,5 +165,5 @@
- 0
+ 131
20
@@ -127,22 +171,5 @@
- -
-
-
- Port &Mode
-
-
- mCbMode
-
-
-
- -
-
-
- Controls the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.
-
-
-
- -
+
-
@@ -154,21 +181,11 @@
- -
-
-
- Qt::Horizontal
-
-
-
- 0
- 20
-
-
-
-
- -
+
-
- Port &Path
+ Port &Path:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -177,5 +194,5 @@
- -
+
-
@@ -183,24 +200,54 @@
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 0
-
-
-
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
-
+
+
+ mGbSerial
+ toggled(bool)
+ mSerialChild
+ setEnabled(bool)
+
+
+ 71
+ 20
+
+
+ 255
+ 125
+
+
+
+