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

Timestamp:

Feb 24, 2012 11:54:42 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 6073: Switch VirtualBox wizards into new QIRichTextLabel: Windows cumulative patch.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIWizard.cpp (modified) (5 diffs)
• extensions/QIWizard.h (modified) (4 diffs)
• widgets/UIApplianceEditorWidget.ui (modified) (2 diffs)
• wizards/clonevm/UICloneVMWizard.cpp (modified) (1 diff)
• wizards/exportappliance/UIExportApplianceWzd.cpp (modified) (1 diff)
• wizards/firstrun/UIFirstRunWzd.cpp (modified) (1 diff)
• wizards/importappliance/UIImportApplianceWzd.cpp (modified) (1 diff)
• wizards/newhd/UINewHDWizard.cpp (modified) (1 diff)
• wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp

@@ -31 +31 @@
     : QIWithRetranslateUI<QWizard>(pParent)
 {
+#if 0 // This is VERY important change, have to discuss first!
+    /* Qt have a bug-o-feature which silently fallbacks complex-wizard-style
+     * to more simple in case it failed to initialize that complex-wizard-style.
+     * Further wizard's look-n-feel may partially corresponds to both:
+     * complex-wizard-style and falled-back-one, we have to be sure which we are using. */
+    setWizardStyle(wizardStyle());
+#endif
+
 #ifdef Q_WS_MAC
     /* I'm really not sure why there shouldn't be any default button on Mac OS
@@ -63 +71 @@
 }
 
-void QIWizard::resizeToGoldenRatio(double dRatio)
-{
+void QIWizard::resizeToGoldenRatio(UIWizardType wizardType)
+{
+    /* Get corresponding ratio: */
+    double dRatio = ratioForWizardType(wizardType);
+
     /* Use some small (!) initial QIRichTextLabel width: */
     int iInitialLabelWidth = 200;
@@ -120 +131 @@
 void QIWizard::assignWatermark(const QString &strWatermark)
 {
-    if (wizardStyle() != QWizard::AeroStyle)
+    if (wizardStyle() != QWizard::AeroStyle
+# ifdef Q_WS_WIN
+        /* There is a Qt bug about Windows7 do NOT match conditions for 'aero' wizard-style,
+         * so its silently fallbacks to 'modern' one without any notification,
+         * so QWizard::wizardStyle() returns QWizard::ModernStyle, while using aero, at least partially. */
+        && QSysInfo::windowsVersion() != QSysInfo::WV_WINDOWS7
+# endif /* Q_WS_WIN */
+        )
         m_strWatermarkName = strWatermark;
 }
@@ -129 +147 @@
 }
 #endif
+
+void QIWizard::showEvent(QShowEvent *pShowEvent)
+{
+    /* Resize to minimum possible size: */
+    resize(0, 0);
+
+    /* Call to base-class: */
+    QWizard::showEvent(pShowEvent);
+}
 
 void QIWizard::configurePage(QIWizardPage *pPage)
@@ -191 +218 @@
     /* Resize it to minimum size: */
     resize(QSize(0, 0));
+}
+
+double QIWizard::ratioForWizardType(UIWizardType wizardType)
+{
+    /* Default value: */
+    double dRatio = 1.6;
+
+#ifdef Q_WS_WIN
+    switch (wizardStyle())
+    {
+        case QWizard::ClassicStyle:
+        case QWizard::ModernStyle:
+            /* There is a Qt bug about Windows7 do NOT match conditions for 'aero' wizard-style,
+             * so its silently fallbacks to 'modern' one without any notification,
+             * so QWizard::wizardStyle() returns QWizard::ModernStyle, while using aero, at least partially. */
+            if (QSysInfo::windowsVersion() != QSysInfo::WV_WINDOWS7)
+            {
+                dRatio = 2;
+                break;
+            }
+        case QWizard::AeroStyle:
+            dRatio = 2.2;
+            break;
+        default:
+            break;
+    }
+#endif /* Q_WS_WIN */
+
+    switch (wizardType)
+    {
+        /* New VM wizard much wider than others, fixing: */
+        case UIWizardType_NewVM:
+            dRatio -= 0.5;
+            break;
+        /* New VD wizard much taller than others, fixing: */
+        case UIWizardType_NewVD:
+            dRatio += 0.3;
+            break;
+        default:
+            break;
+    }
+
+    /* Return final result: */
+    return dRatio;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.h

@@ -41 +41 @@
 protected:
 
+    /* Wizard type: */
+    enum UIWizardType
+    {
+        UIWizardType_NewVM,
+        UIWizardType_CloneVM,
+        UIWizardType_ExportAppliance,
+        UIWizardType_ImportAppliance,
+        UIWizardType_FirstRun,
+        UIWizardType_NewVD
+    };
+
     /* Page related methods: */
     int addPage(QIWizardPage *pPage);
@@ -49 +60 @@
 
     /* Adjusting stuff: */
-    void resizeToGoldenRatio(double dRatio = 1.6);
+    void resizeToGoldenRatio(UIWizardType wizardType);
 
     /* Design stuff: */
@@ -58 +69 @@
 #endif
 
+    /* Show event: */
+    void showEvent(QShowEvent *pShowEvent);
+
 private:
 
@@ -63 +77 @@
     void configurePage(QIWizardPage *pPage);
     void resizeAccordingLabelWidth(int iLabelWidth);
+    double ratioForWizardType(UIWizardType wizardType);
 #ifndef Q_WS_MAC
     int proposedWatermarkHeight();

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.ui

@@ -50 +50 @@
    <item>
     <widget class="QWidget" name="m_pWarningWidget" native="true">
+     <property name="visible">
+      <bool>false</bool>
+     </property>
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
@@ -72 +75 @@
          <size>
           <width>16777215</width>
-          <height>107</height>
+          <height>50</height>
          </size>
         </property>

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp

@@ -61 +61 @@
 
     /* Resize wizard to 'golden ratio': */
-    resizeToGoldenRatio();
+    resizeToGoldenRatio(UIWizardType_CloneVM);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

@@ -77 +77 @@
 
     /* Resize to 'golden ratio' */
-    resizeToGoldenRatio(1.8);
+    resizeToGoldenRatio(UIWizardType_ExportAppliance);
 
     /* Setup connections */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp

@@ -58 +58 @@
 
     /* Resize to 'golden ratio' */
-    resizeToGoldenRatio();
+    resizeToGoldenRatio(UIWizardType_FirstRun);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp

@@ -132 +132 @@
 
     /* Resize to 'golden ratio' */
-    resizeToGoldenRatio(1.8);
+    resizeToGoldenRatio(UIWizardType_ImportAppliance);
 
     /* Configure 'Restore Defaults' button */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.cpp

@@ -218 +218 @@
 
     /* Resize wizard to 'golden ratio': */
-    resizeToGoldenRatio(1.8);
+    resizeToGoldenRatio(UIWizardType_NewVD);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -163 +163 @@
 
     /* Resize to 'golden ratio' */
-    resizeToGoldenRatio(1.2);
+    resizeToGoldenRatio(UIWizardType_NewVM);
 }