Changeset 47013 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 5, 2013 4:09:25 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-pane: Encapsulation cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPopupPane.cpp (modified) (7 diffs)
• UIPopupPane.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp

@@ -154 +154 @@
                         iTextPaneHeight);
     m_pTextPane->layoutContent();
-    /* Button-box: */
+
+    /* Button-pane: */
     m_pButtonPane->move(m_iLayoutMargin + iTextPaneWidth + m_iLayoutSpacing,
                         m_iLayoutMargin);
@@ -163 +164 @@
 void UIPopupPane::sltButtonClicked(int iButtonID)
 {
+    /* Complete popup with corresponding code: */
     done(iButtonID & AlertButtonMask);
 }
@@ -168 +170 @@
 void UIPopupPane::prepare()
 {
-    /* Install 'hover' animation for 'opacity' property: */
-    UIAnimation::installPropertyAnimation(this, "opacity", "defaultOpacity", "hoveredOpacity",
-                                          SIGNAL(sigHoverEnter()), SIGNAL(sigHoverLeave()));
     /* Prepare content: */
     prepareContent();
+    /* Prepare animation: */
+    prepareAnimation();
 }
 
@@ -179 +180 @@
     /* Prepare this: */
     installEventFilter(this);
+
     /* Create message-label: */
     m_pTextPane = new UIPopupPaneTextPane(this);
     {
         /* Prepare label: */
-        connect(m_pTextPane, SIGNAL(sigSizeHintChanged()),
-                this, SIGNAL(sigSizeHintChanged()));
+        connect(m_pTextPane, SIGNAL(sigSizeHintChanged()), this, SIGNAL(sigSizeHintChanged()));
         m_pTextPane->installEventFilter(this);
         m_pTextPane->setText(m_strMessage);
         m_pTextPane->setProposeAutoConfirmation(m_fProposeAutoConfirmation);
     }
+
     /* Create button-box: */
     m_pButtonPane = new UIPopupPaneButtonPane(this);
     {
         /* Prepare button-box: */
-        connect(m_pButtonPane, SIGNAL(sigButtonClicked(int)),
-                this, SLOT(sltButtonClicked(int)));
+        connect(m_pButtonPane, SIGNAL(sigButtonClicked(int)), this, SLOT(sltButtonClicked(int)));
         m_pButtonPane->installEventFilter(this);
         m_pButtonPane->setButtons(m_buttonDescriptions);
@@ -205 +206 @@
     setFocusProxy(m_pButtonPane);
     m_pTextPane->setFocusProxy(m_pButtonPane);
+}
+
+void UIPopupPane::prepareAnimation()
+{
+    /* Install 'hover' animation for 'opacity' property: */
+    UIAnimation::installPropertyAnimation(this, "opacity", "defaultOpacity", "hoveredOpacity",
+                                          SIGNAL(sigHoverEnter()), SIGNAL(sigHoverLeave()));
 }
 
@@ -275 +283 @@
     painter.setRenderHint(QPainter::Antialiasing);
 
-    /* Configure painter clipping: */
+    /* Configure clipping: */
+    configureClipping(rect, painter);
+
+    /* Paint background: */
+    paintBackground(rect, painter);
+}
+
+void UIPopupPane::configureClipping(const QRect &rect, QPainter &painter)
+{
+    /* Configure clipping: */
     QPainterPath path;
     int iDiameter = 6;
@@ -289 +306 @@
     path.closeSubpath();
     painter.setClipPath(path);
-
-    /* Fill with background: */
+}
+
+void UIPopupPane::paintBackground(const QRect &rect, QPainter &painter)
+{
+    /* Paint background: */
     QColor currentColor(palette().color(QPalette::Window));
     QColor newColor1(currentColor.red(), currentColor.green(), currentColor.blue(), opacity());

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.h

@@ -28 +28 @@
 class UIPopupPaneButtonPane;
 
-/* Popup-pane prototype class: */
+/* Popup-pane prototype: */
 class UIPopupPane : public QWidget
 {
@@ -84 +84 @@
     void prepare();
     void prepareContent();
+    void prepareAnimation();
 
     /* Handler: Event-filter stuff: */
@@ -90 +91 @@
     /* Handler: Event stuff: */
     void paintEvent(QPaintEvent *pEvent);
+
+    /* Helpers: Paint stuff: */
+    void configureClipping(const QRect &rect, QPainter &painter);
+    void paintBackground(const QRect &rect, QPainter &painter);
 
     /* Helper: Complete stuff: */