Changeset 40146 in vbox

Timestamp:

Feb 16, 2012 11:11:26 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76297

Message:

FE/Qt: 6073: Switch VirtualBox wizards into new QIRichTextLabel: Custom aspect ratio for wizards with scalable but non-wrapable content.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIWizard.cpp (modified) (2 diffs)
• extensions/QIWizard.h (modified) (1 diff)
• wizards/exportappliance/UIExportApplianceWzd.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

@@ -63 +63 @@
 }
 
-void QIWizard::resizeToGoldenRatio()
+void QIWizard::resizeToGoldenRatio(double dRatio)
 {
     /* Use some small (!) initial QIRichTextLabel width: */
@@ -96 +96 @@
     iCurrentWizardWidth += iWatermarkWidth;
 #endif /* !Q_WS_MAC */
-    int iGoldenRatioWidth = (int)qSqrt((float)1.6 * iCurrentWizardWidth * iCurrentWizardHeight);
+    int iGoldenRatioWidth = (int)qSqrt(dRatio * iCurrentWizardWidth * iCurrentWizardHeight);
     int iProposedLabelWidth = iGoldenRatioWidth - iMarginsLength;
 #ifndef Q_WS_MAC

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

@@ -49 +49 @@
 
     /* Adjusting stuff: */
-    void resizeToGoldenRatio();
+    void resizeToGoldenRatio(double dRatio = 1.6);
 
     /* Design stuff: */

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

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

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

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

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

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

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

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