儲存庫 vbox 的更動 18247

時間撮記:

2009-3-25 下午12:39:24 (16 年 以前)

作者:

vboxsync

訊息:

FE/Qt4: Global Settings => Language & Network pages re-layout to make lists looks similar (expanding policy).

位置:

trunk/src/VBox/Frontends/VirtualBox

檔案:

• src/VBoxGLSettingsLanguage.cpp (修改) (1 筆差異)
• src/VBoxGLSettingsNetwork.cpp (修改) (7 筆差異)
• ui/VBoxGLSettingsLanguage.ui (修改) (3 筆差異)
• ui/VBoxGLSettingsNetwork.ui (修改) (5 筆差異)

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

@@ -257 +257 @@
 
     /* Adjust selector list */
-    mTwLanguage->setFixedWidth (static_cast<QAbstractItemView*> (mTwLanguage)
+    mTwLanguage->setMinimumWidth (static_cast<QAbstractItemView*> (mTwLanguage)
         ->sizeHintForColumn (0) + 2 * mTwLanguage->frameWidth() +
         QApplication::style()->pixelMetric (QStyle::PM_ScrollBarExtent));

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

@@ -176 +176 @@
 {
     /* Update information label */
-    QString hdr ("<tr><td><b><nobr>%1:&nbsp;</nobr></b></td>"
+    QString hdr ("<tr><td><nobr>%1:&nbsp;</nobr></td>"
                  "<td><nobr>%2</nobr></td></tr>");
-    QString sub ("<tr><td><b><nobr>&nbsp;&nbsp;%1:&nbsp;</nobr></b></td>"
+    QString sub ("<tr><td><nobr>&nbsp;&nbsp;%1:&nbsp;</nobr></td>"
                  "<td><nobr>%2</nobr></td></tr>");
     QString data, tip, buffer;
@@ -184 +184 @@
     /* Host-only Interface information */
     buffer = hdr.arg (QTreeWidget::tr ("Host Interface"))
-                .arg (mDhcpClientEnabled ? QTreeWidget::tr ("automatically configured", "interface")
-                                         : QTreeWidget::tr ("manually configured", "interface"));
+                .arg (mDhcpClientEnabled ? QTreeWidget::tr ("Automatically configured", "interface")
+                                         : QTreeWidget::tr ("Manually configured", "interface"));
     data += buffer;
     tip += buffer;
@@ -192 +192 @@
     {
         buffer = sub.arg (QTreeWidget::tr ("IPv4 Address"))
-                    .arg (mInterfaceAddress.isEmpty() ? QTreeWidget::tr ("not set", "address")
+                    .arg (mInterfaceAddress.isEmpty() ? QTreeWidget::tr ("Not set", "address")
                                                       : mInterfaceAddress) +
                  sub.arg (QTreeWidget::tr ("IPv4 Mask"))
-                    .arg (mInterfaceMask.isEmpty() ? QTreeWidget::tr ("not set", "mask")
+                    .arg (mInterfaceMask.isEmpty() ? QTreeWidget::tr ("Not set", "mask")
                                                    : mInterfaceMask);
         tip += buffer;
@@ -202 +202 @@
         {
             buffer = sub.arg (QTreeWidget::tr ("IPv6 Address"))
-                        .arg (mInterfaceAddress6.isEmpty() ? QTreeWidget::tr ("not set", "address")
+                        .arg (mInterfaceAddress6.isEmpty() ? QTreeWidget::tr ("Not set", "address")
                                                            : mInterfaceAddress6) +
                      sub.arg (QTreeWidget::tr ("IPv6 Mask Length"))
-                        .arg (mInterfaceMaskLength6.isEmpty() ? QTreeWidget::tr ("not set", "length")
+                        .arg (mInterfaceMaskLength6.isEmpty() ? QTreeWidget::tr ("Not set", "length")
                                                               : mInterfaceMaskLength6);
             tip += buffer;
@@ -213 +213 @@
     /* DHCP Server information */
     buffer = hdr.arg (QTreeWidget::tr ("DHCP Server"))
-                .arg (mDhcpServerEnabled ? QTreeWidget::tr ("enabled", "server")
-                                         : QTreeWidget::tr ("disabled", "server"));
+                .arg (mDhcpServerEnabled ? QTreeWidget::tr ("Enabled", "server")
+                                         : QTreeWidget::tr ("Disabled", "server"));
     data += buffer;
     tip += buffer;
@@ -221 +221 @@
     {
         buffer = sub.arg (QTreeWidget::tr ("Address"))
-                    .arg (mDhcpServerAddress.isEmpty() ? QTreeWidget::tr ("not set", "address")
+                    .arg (mDhcpServerAddress.isEmpty() ? QTreeWidget::tr ("Not set", "address")
                                                        : mDhcpServerAddress) +
                  sub.arg (QTreeWidget::tr ("Mask"))
-                    .arg (mDhcpServerMask.isEmpty() ? QTreeWidget::tr ("not set", "mask")
+                    .arg (mDhcpServerMask.isEmpty() ? QTreeWidget::tr ("Not set", "mask")
                                                     : mDhcpServerMask) +
                  sub.arg (QTreeWidget::tr ("Lower Bound"))
-                    .arg (mDhcpLowerAddress.isEmpty() ? QTreeWidget::tr ("not set", "bound")
+                    .arg (mDhcpLowerAddress.isEmpty() ? QTreeWidget::tr ("Not set", "bound")
                                                       : mDhcpLowerAddress) +
                  sub.arg (QTreeWidget::tr ("Upper Bound"))
-                    .arg (mDhcpUpperAddress.isEmpty() ? QTreeWidget::tr ("not set", "bound")
+                    .arg (mDhcpUpperAddress.isEmpty() ? QTreeWidget::tr ("Not set", "bound")
                                                       : mDhcpUpperAddress);
         tip += buffer;
@@ -248 +248 @@
     mTwInterfaces->header()->hide();
     mTwInterfaces->setContextMenuPolicy (Qt::CustomContextMenu);
+
+    /* Setup data label */
+    mLbInfo->setMinimumHeight (fontMetrics().height() * 4);
 
     /* Prepare toolbar */

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

@@ -73 +73 @@
     <widget class="QITreeWidget" name="mTwLanguage" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
@@ -115 +115 @@
     <widget class="QLabel" name="mTxName" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+      <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
@@ -127 +127 @@
      </property>
     </widget>
-   </item>
-   <item row="3" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
    </item>
   </layout>

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

@@ -76 +76 @@
      </property>
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
@@ -84 +84 @@
       <size>
        <width>0</width>
-       <height>120</height>
-      </size>
-     </property>
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>120</height>
+       <height>150</height>
       </size>
      </property>
@@ -110 +104 @@
     </widget>
    </item>
-   <item row="2" column="3" rowspan="1" >
+   <item row="2" column="3" >
     <spacer>
      <property name="orientation" >
@@ -116 +110 @@
      </property>
      <property name="sizeType" >
-      <enum>QSizePolicy::Minimum</enum>
+      <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" >
@@ -129 +123 @@
     <widget class="QLabel" name="mLbInfo" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+      <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
        <horstretch>0</horstretch>
-       <verstretch>1</verstretch>
+       <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="alignment" >
-      <set>Qt::AlignLeft|Qt::AlignTop</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
      <property name="wordWrap" >