Changeset 47189 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 16, 2013 1:33:00 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Global properties: Display page: Fixing MacOS X layout bug.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsDisplay.cpp (modified) (2 diffs)
• UIGlobalSettingsDisplay.h (modified) (2 diffs)
• UIGlobalSettingsDisplay.ui (modified) (9 diffs)
• UIGlobalSettingsGeneral.h (modified) (1 diff)
• UIGlobalSettingsInput.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -124 +124 @@
 }
 
-/* Navigation stuff: */
-void UIGlobalSettingsDisplay::setOrderAfter(QWidget* /* pWidget */)
+void UIGlobalSettingsDisplay::setOrderAfter(QWidget*)
 {
 }
 
-/* Translation stuff: */
 void UIGlobalSettingsDisplay::retranslateUi()
 {

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -56 +56 @@
     void saveFromCacheTo(QVariant &data);
 
-    /* Navigation stuff: */
+    /* Helper: Navigation stuff: */
     void setOrderAfter(QWidget *pWidget);
 
-    /* Translation stuff: */
+    /* Helper: Translation stuff: */
     void retranslateUi();
 
 protected slots:
 
-    /* Max resolution combo activation handler: */
+    /* Handler: Resolution-combo stuff: */
     void sltMaxResolutionComboActivated();
 
 private:
 
-    /* Populate combo-box: */
+    /* Helper: Resolution-combo stuff: */
     void populate();
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.ui

@@ -3 +3 @@
  VBox frontends: Qt4 GUI ("VirtualBox"):
 
- Copyright (C) 2012 Oracle Corporation
+ Copyright (C) 2012-2013 Oracle Corporation
 
  This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +15 @@
  <class>UIGlobalSettingsDisplay</class>
  <widget class="QWidget" name="UIGlobalSettingsDisplay">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>350</width>
-    <height>250</height>
-   </rect>
-  </property>
   <layout class="QGridLayout">
    <property name="margin">
@@ -28 +20 @@
    </property>
    <item row="0" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="1">
     <widget class="QLabel" name="m_pMaxResolutionLabel">
-     <property name="sizePolicy">
-      <sizepolicy vsizetype="Minimum" hsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="text">
       <string>Maximum Guest Screen &amp;Size:</string>
@@ -62 +32 @@
     </widget>
    </item>
-   <item row="0" column="2">
+   <item row="0" column="1">
     <widget class="QComboBox" name="m_pMaxResolutionCombo">
      <property name="sizePolicy">
-      <sizepolicy vsizetype="Minimum" hsizetype="MinimumExpanding">
+      <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding">
        <horstretch>1</horstretch>
        <verstretch>0</verstretch>
@@ -72 +42 @@
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="1" column="0">
     <widget class="QLabel" name="m_pResolutionWidthLabel">
-     <property name="sizePolicy">
-      <sizepolicy vsizetype="Minimum" hsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="text">
       <string>&amp;Width:</string>
@@ -91 +55 @@
     </widget>
    </item>
-   <item row="1" column="2">
+   <item row="1" column="1">
     <widget class="QSpinBox" name="m_pResolutionWidthSpin">
      <property name="sizePolicy">
@@ -104 +68 @@
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="0">
     <widget class="QLabel" name="m_pResolutionHeightLabel">
-     <property name="sizePolicy">
-      <sizepolicy vsizetype="Minimum" hsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="text">
       <string>&amp;Height:</string>
@@ -123 +81 @@
     </widget>
    </item>
-   <item row="2" column="2">
+   <item row="2" column="1">
     <widget class="QSpinBox" name="m_pResolutionHeightSpin">
      <property name="sizePolicy">
@@ -136 +94 @@
     </widget>
    </item>
-   <item row="3" column="1" colspan="2">
+   <item row="3" column="0" colspan="2">
     <spacer>
      <property name="orientation">

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h

@@ -61 +61 @@
     void saveFromCacheTo(QVariant &data);
 
-    /* Navigation stuff: */
+    /* Helper: Navigation stuff: */
     void setOrderAfter(QWidget *pWidget);
 
-    /* Translation stuff: */
+    /* Helper: Translation stuff: */
     void retranslateUi();
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h

@@ -139 +139 @@
     void saveFromCacheTo(QVariant &data);
 
-    /* Validation stuff: */
+    /* Helpers: Validation stuff: */
     void setValidator(QIWidgetValidator *pValidator);
     bool revalidate(QString &strWarning, QString &strTitle);
 
-    /* Navigation stuff: */
+    /* Helper: Navigation stuff: */
     void setOrderAfter(QWidget *pWidget);
 
-    /* Translation stuff: */
+    /* Helper: Translation stuff: */
     void retranslateUi();