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

Timestamp:

Aug 8, 2013 4:23:33 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings dialog: Warning pane cleanup/rework.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/UISettingsDialog.cpp (modified) (2 diffs)
• src/settings/UISettingsDialog.h (modified) (2 diffs)
• src/widgets/UIWarningPane.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.cpp ) (2 diffs)
• src/widgets/UIWarningPane.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.h ) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -387 +387 @@
         src/widgets/VBoxOSTypeSelectorButton.h \
         src/widgets/UINameAndSystemEditor.h \
-        src/widgets/VBoxWarningPane.h \
+    src/widgets/UIWarningPane.h \
         src/widgets/UIFilmContainer.h \
         src/widgets/graphics/UIGraphicsButton.h \
@@ -637 +637 @@
         src/widgets/VBoxOSTypeSelectorButton.cpp \
         src/widgets/UINameAndSystemEditor.cpp \
-        src/widgets/VBoxWarningPane.cpp \
+    src/widgets/UIWarningPane.cpp \
         src/widgets/UIFilmContainer.cpp \
         src/widgets/graphics/UIGraphicsButton.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -27 +27 @@
 /* Local includes */
 #include "UISettingsDialog.h"
-#include "VBoxWarningPane.h"
+#include "UIWarningPane.h"
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
@@ -63 +63 @@
     , m_fValid(true)
     , m_fSilent(true)
-    , m_pWarningPane(new VBoxWarningPane(this))
+    , m_pWarningPane(new UIWarningPane(this))
     /* Whats-this stuff: */
     , m_pWhatsThisTimer(new QTimer(this))

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -31 +31 @@
 class QStackedWidget;
 class QTimer;
-class VBoxWarningPane;
+class UIWarningPane;
 class VBoxSettingsSelector;
 class UISettingsPage;
@@ -143 +143 @@
     QString m_strErrorString;
     QString m_strWarningString;
-    VBoxWarningPane *m_pWarningPane;
+    UIWarningPane *m_pWarningPane;
 
     /* Whats-This stuff: */

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

@@ -3 +3 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxWarningPane class implementation
+ * UIWarningPane class implementation
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
  */
 
-/* Global includes */
+/* Qt includes: */
 #include <QHBoxLayout>
+#include <QLabel>
 
-/* Local includes */
-#include "VBoxWarningPane.h"
+/* GUI includes: */
+#include "UIWarningPane.h"
 
-VBoxWarningPane::VBoxWarningPane(QWidget *pParent)
+UIWarningPane::UIWarningPane(QWidget *pParent)
     : QWidget(pParent)
+    , m_pLabelIcon(0)
+    , m_pLabelText(0)
 {
-    QHBoxLayout *pLayout = new QHBoxLayout(this);
-    pLayout->setContentsMargins(0, 0, 0, 0);
-    pLayout->addWidget(&m_icon);
-    pLayout->addWidget(&m_label);
+    /* Prepare: */
+    prepare();
 }
 
-void VBoxWarningPane::setWarningPixmap(const QPixmap &imgPixmap)
+void UIWarningPane::setWarningPixmap(const QPixmap &pixmap)
 {
-    m_icon.setPixmap(imgPixmap);
+    m_pLabelIcon->setPixmap(pixmap);
 }
 
-void VBoxWarningPane::setWarningText(const QString &strText)
+void UIWarningPane::setWarningText(const QString &strText)
 {
-    m_label.setText(strText);
+    m_pLabelText->setText(strText);
 }
 
+void UIWarningPane::prepare()
+{
+    /* Prepare content: */
+    prepareContent();
+}
+
+void UIWarningPane::prepareContent()
+{
+    /* Create layout: */
+    QHBoxLayout *pLayout = new QHBoxLayout(this);
+    {
+        /* Configure layout: */
+        pLayout->setContentsMargins(0, 0, 0, 0);
+        /* Create icon label: */
+        m_pLabelIcon = new QLabel;
+        /* Create text label: */
+        m_pLabelText = new QLabel;
+        /* Add widgets into layout: */
+        pLayout->addWidget(m_pLabelIcon);
+        pLayout->addWidget(m_pLabelText);
+    }
+}
+

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

@@ -2 +2 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxWarningPane class declaration
+ * UIWarningPane class declaration
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
  */
 
-#ifndef __VBoxWarningPane_h__
-#define __VBoxWarningPane_h__
+#ifndef __UIWarningPane_h__
+#define __UIWarningPane_h__
 
 /* Global includes */
 #include <QWidget>
-#include <QLabel>
 
-class VBoxWarningPane: public QWidget
+/* Forward declarations: */
+class QLabel;
+
+/* Warning-pane prototype: */
+class UIWarningPane: public QWidget
 {
     Q_OBJECT;
@@ -30 +33 @@
 public:
 
-    VBoxWarningPane(QWidget *pParent = 0);
+    /* Constructor: */
+    UIWarningPane(QWidget *pParent = 0);
 
-    void setWarningPixmap(const QPixmap &imgPixmap);
+    /* API: Warning stuff: */
+    void setWarningPixmap(const QPixmap &pixmap);
     void setWarningText(const QString &strText);
 
 private:
 
-    QLabel m_icon;
-    QLabel m_label;
+    /* Helpers: Prepare stuff: */
+    void prepare();
+    void prepareContent();
+
+    /* Variables: Widgets: */
+    QLabel *m_pLabelIcon;
+    QLabel *m_pLabelText;
 };
 
-#endif // __VBoxWarningPane_h__
-
+#endif /* __UIWarningPane_h__ */