Changeset 2392 in vbox for trunk

Timestamp:

Apr 27, 2007 11:19:45 AM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Naming/placing corrections.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (3 diffs)
• include/VBoxUtils.h (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (3 diffs)
• ui/VBoxNewHDWzd.ui (modified) (2 diffs)
• ui/VBoxNewHDWzd.ui.h (modified) (2 diffs)
• ui/VBoxNewVMWzd.ui (modified) (2 diffs)
• ui/VBoxNewVMWzd.ui.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -36 +36 @@
 #include <qpopupmenu.h>
 #include <qtooltip.h>
-#include <qtextedit.h>
 
 #include <qptrvector.h>
@@ -134 +133 @@
     const QUuid machineId;
     const QUuid snapshotId;
-};
-
-class VBoxTextView : public QTextEdit
-{
-Q_OBJECT
-
-public:
-
-    VBoxTextView (QWidget*);
-
-    QSize sizeHint() const;
-    QSize minimumSizeHint() const;
-
-public slots:
-
-    void setText (const QString &);
 };
 
@@ -406 +389 @@
     /* public static stuff */
 
-    static void fillPixmapBackGrd (QLabel *);
+    static void adoptLabelPixmap (QLabel *);
 
     static QString languageId();

trunk/src/VBox/Frontends/VirtualBox/include/VBoxUtils.h

@@ -27 +27 @@
 #include <qevent.h>
 #include <qlistview.h>
+#include <qtextedit.h>
 
 /**
@@ -167 +168 @@
 };
 
+
+/** 
+ *  Simple QTextEdit subclass to return its minimumSizeHint() as sizeHint()
+ *  for getting more compact layout.
+ */
+class QITextEdit : public QTextEdit
+{
+public:
+
+    QITextEdit (QWidget *aParent)
+        : QTextEdit (aParent) {}
+
+    QSize sizeHint() const
+    {
+        return minimumSizeHint();
+    }
+
+    QSize minimumSizeHint() const
+    {
+        /// @todo (r=dmik) this looks a bit meanignless. any comment?
+        int w = 0;
+        int h = heightForWidth (w);
+        return QSize (w, h);
+    }
+};
+
 #endif // __VBoxUtils_h__
 

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

@@ -472 +472 @@
 
 #endif /* Q_WS_WIN */
-
-VBoxTextView::VBoxTextView (QWidget *aParent)
-    : QTextEdit (aParent)
-{
-}
-
-QSize VBoxTextView::sizeHint() const
-{
-    return minimumSizeHint();
-}
-
-QSize VBoxTextView::minimumSizeHint() const
-{
-    int wid = 0;
-    int hei = heightForWidth (wid);
-    return QSize (wid, hei);
-}
-
-void VBoxTextView::setText (const QString &aText)
-{
-    QTextEdit::setText (aText);
-}
 
 // VBoxGlobal
@@ -1848 +1826 @@
 ////////////////////////////////////////////////////////////////////////////////
 
+/**
+ *  Sets the QLabel background and frame colors according tho the pixmap
+ *  contents. The bottom right pixel of the label pixmap defines the
+ *  background color of the label, the top right pixel defines the color of
+ *  the one-pixel frame around it. This function also sets the alignment of
+ *  the pixmap to AlignVTop (to correspond to the color choosing logic).
+ *
+ *  This method is useful to provide nice scaling of pixmal labels without
+ *  scaling pixmaps themselves. To see th eeffect, the size policy of the
+ *  label in the corresponding direction (vertical, for now) should be set to
+ *  something like MinimumExpanding.
+ *
+ *  @todo Parametrize corners to select pixels from and set the alignment
+ *  accordingly.
+ */
+/* static */
+void VBoxGlobal::adoptLabelPixmap (QLabel *aLabel)
+{
+    AssertReturnVoid (aLabel);
+
+    QPixmap *pix = aLabel->pixmap();
+    QImage img = pix->convertToImage();
+    QRgb rgbBack = img.pixel (img.width() - 1, img.height() - 1);
+    QRgb rgbFrame = img.pixel (img.width() - 1, 0);
+
+    aLabel->setAlignment (AlignTop);
+
+    aLabel->setPaletteBackgroundColor (QColor (rgbBack));
+    aLabel->setFrameShadow (QFrame::Plain);
+    aLabel->setFrameShape (QFrame::Box);
+    aLabel->setPaletteForegroundColor (QColor (rgbFrame));
+}
+
 extern const char *gVBoxLangSubDir = "/nls";
 extern const char *gVBoxLangFileBase = "VirtualBox_";
@@ -1874 +1885 @@
     QByteArray mData;
 };
-
-/**
- *  Fills the QLabel picture background with the color of last
- *  pixel in the pixmap.
- */
-/* static */
-void VBoxGlobal::fillPixmapBackGrd (QLabel *aLabel)
-{
-    QPixmap *pix = aLabel->pixmap();
-    QImage img = pix->convertToImage();
-    QRgb rgbPixel = img.pixel (img.width() - 1, img.height() - 1);
-    int cRed = qRed (rgbPixel);
-    int cGreen = qGreen (rgbPixel);
-    int cBlue = qBlue (rgbPixel);
-    aLabel->setBackgroundColor (QColor (cRed, cGreen, cBlue));
-    aLabel->setFrameShadow (QFrame::Plain);
-    aLabel->setFrameShape (QFrame::Box);
-    aLabel->setPaletteForegroundColor (QColor (89,121,150));
-}
 
 static VBoxTranslator *sTranslator = 0;

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

@@ -716 +716 @@
 </includes>
 <forwards>
-    <forward>class VBoxTextView</forward>
+    <forward>class QITextEdit</forward>
 </forwards>
 <variables>
@@ -724 +724 @@
     <variable access="private">Q_UINT64 maxVDISize;</variable>
     <variable access="private">Q_UINT64 currentSize;</variable>
-    <variable access="private">VBoxTextView *teSummary;</variable>
+    <variable access="private">QITextEdit *teSummary;</variable>
 </variables>
 <slots>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewHDWzd.ui.h

@@ -169 +169 @@
      * ---------------------------------------------------------------------- */
 
-    /* setup the pictures background color */
-    VBoxGlobal::fillPixmapBackGrd (pmWelcome);
-    VBoxGlobal::fillPixmapBackGrd (pmType);
-    VBoxGlobal::fillPixmapBackGrd (pmNameAndSize);
-    VBoxGlobal::fillPixmapBackGrd (pmSummary);
+    /* setup the label clolors for nice scaling */
+    VBoxGlobal::adoptLabelPixmap (pmWelcome);
+    VBoxGlobal::adoptLabelPixmap (pmType);
+    VBoxGlobal::adoptLabelPixmap (pmNameAndSize);
+    VBoxGlobal::adoptLabelPixmap (pmSummary);
 
     /* Image type page */
@@ -216 +216 @@
     /* Summary page */
 
-    teSummary = new VBoxTextView (pageSummary);
+    teSummary = new QITextEdit (pageSummary);
     teSummary->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum);
     teSummary->setFrameShape (QTextEdit::NoFrame);

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

@@ -1046 +1046 @@
 <forwards>
     <forward>class VBoxMediaComboBox</forward>
-    <forward>class VBoxTextView</forward>
+    <forward>class QITextEdit</forward>
 </forwards>
 <variables>
@@ -1056 +1056 @@
     <variable access="private">CMachine cmachine;</variable>
     <variable access="private">VBoxMediaComboBox *mediaCombo;</variable>
-    <variable access="private">VBoxTextView *teSummary;</variable>
+    <variable access="private">QITextEdit *teSummary;</variable>
 </variables>
 <slots>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewVMWzd.ui.h

@@ -71 +71 @@
      */
 
-    /* setup the pictures colors */
-    VBoxGlobal::fillPixmapBackGrd (pmWelcome);
-    VBoxGlobal::fillPixmapBackGrd (pmNameAndOS);
-    VBoxGlobal::fillPixmapBackGrd (pmMemory);
-    VBoxGlobal::fillPixmapBackGrd (pmHDD);
-    VBoxGlobal::fillPixmapBackGrd (pmSummary);
+    /* setup the label colors for nice scaling */
+    VBoxGlobal::adoptLabelPixmap (pmWelcome);
+    VBoxGlobal::adoptLabelPixmap (pmNameAndOS);
+    VBoxGlobal::adoptLabelPixmap (pmMemory);
+    VBoxGlobal::adoptLabelPixmap (pmHDD);
+    VBoxGlobal::adoptLabelPixmap (pmSummary);
 
     /* Name and OS page */
@@ -122 +122 @@
     /* Summary page */
 
-    teSummary = new VBoxTextView (pageSummary);
+    teSummary = new QITextEdit (pageSummary);
     teSummary->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum);
     teSummary->setFrameShape (QTextEdit::NoFrame);