Changeset 67573 in vbox

Timestamp:

Jun 23, 2017 8:59:10 AM (8 years ago)

Author:

vboxsync

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

116327

Message:

FE/Qt: Extension: QIManagerDialog: Extend API with more subclass injections, add Reset/Save buttons.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIManagerDialog.cpp (modified) (7 diffs)
• extensions/QIManagerDialog.h (modified) (3 diffs)
• hostnetwork/UIHostNetworkManager.cpp (modified) (2 diffs)
• hostnetwork/UIHostNetworkManager.h (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (2 diffs)
• medium/UIMediumManager.h (modified) (1 diff)

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

@@ -32 +32 @@
 #  include "UIWindowMenuManager.h"
 # endif /* VBOX_WS_MAC */
-# include "UIMessageCenter.h"
 # include "VBoxGlobal.h"
 
@@ -69 +68 @@
     , m_pButtonBox(0)
 {
-}
-
-void QIManagerDialog::closeEvent(QCloseEvent *pEvent)
-{
-    /* Ignore the event itself: */
-    pEvent->ignore();
-    /* But tell the listener to close us: */
-    emit sigClose();
 }
 
@@ -100 +91 @@
     resize(proposedSize);
 
-    /* Prepare dialog: */
-    prepareDialog();
+    /* Configure: */
+    configure();
+
     /* Prepare central-widget: */
     prepareCentralWidget();
@@ -110 +102 @@
     prepareToolBar();
 #endif
+
+    /* Finalize: */
+    finalize();
 
     /* Center according requested widget: */
@@ -129 +124 @@
             centralWidget()->layout()->setSpacing(10);
 
-            /* Prepare widget: */
-            prepareWidget();
+            /* Configure central-widget: */
+            configureCentralWidget();
+
             /* Prepare button-box: */
             prepareButtonBox();
@@ -144 +140 @@
     {
         /* Configure button-box: */
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Close);
+        m_pButtonBox->setStandardButtons(QDialogButtonBox::Reset | QDialogButtonBox::Save |  QDialogButtonBox::Close);
         m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
-        connect(m_pButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
+        m_pButtonBox->button(QDialogButtonBox::Reset)->hide();
+        m_pButtonBox->button(QDialogButtonBox::Save)->hide();
+        m_pButtonBox->button(QDialogButtonBox::Reset)->setEnabled(false);
+        m_pButtonBox->button(QDialogButtonBox::Save)->setEnabled(false);
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &QIManagerDialog::sigClose);
+
+        /* Configure button-box: */
+        configureButtonBox();
 
         /* Add into layout: */
@@ -192 +194 @@
 }
 
+void QIManagerDialog::closeEvent(QCloseEvent *pEvent)
+{
+    /* Ignore the event itself: */
+    pEvent->ignore();
+    /* But tell the listener to close us: */
+    emit sigClose();
+}
+

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

@@ -80 +80 @@
     /** @name Prepare/cleanup cascade.
       * @{ */
-        /** Prepares dialog. */
-        virtual void prepareDialog() {}
-        /** Prepares widget. */
-        virtual void prepareWidget() {}
+        /** Prepares all.
+          * @note Normally you no need to reimplement it. */
+        void prepare();
+        /** Configures all.
+          * @note Injected into prepare(), reimplement to configure all there. */
+        virtual void configure() {}
+        /** Prepares central-widget.
+          * @note Injected into prepare(), normally you no need to reimplement it. */
+        void prepareCentralWidget();
+        /** Configures central-widget.
+          * @note Injected into prepareCentralWidget(), reimplement to configure central-widget there. */
+        virtual void configureCentralWidget() {}
+        /** Prepares button-box.
+          * @note Injected into prepareCentralWidget(), normally you no need to reimplement it. */
+        void prepareButtonBox();
+        /** Configures button-box.
+          * @note Injected into prepareButtonBox(), reimplement to configure button-box there. */
+        virtual void configureButtonBox() {}
+        /** Prepares menu-bar.
+          * @note Injected into prepare(), normally you no need to reimplement it. */
+        void prepareMenuBar();
+#ifdef VBOX_WS_MAC
+        /** Prepares toolbar.
+          * @note Injected into prepare(), normally you no need to reimplement it. */
+        void prepareToolBar();
+#endif
+        /** Performs final preparations.
+          * @note Injected into prepare(), reimplement to postprocess all there. */
+        virtual void finalize() {}
+
+        /** Cleanup menu-bar.
+          * @note Injected into cleanup(), normally you no need to reimplement it. */
+        void cleanupMenuBar();
+        /** Cleanups all.
+          * @note Normally you no need to reimplement it. */
+        void cleanup();
     /** @} */
 
@@ -96 +128 @@
         void setWidgetToolbar(UIToolBar *pWidgetToolbar) { m_pWidgetToolbar = pWidgetToolbar; }
 #endif
+
+        /** Returns the widget. */
+        virtual QWidget *widget() { return m_pWidget; }
+        /** Returns the button-box instance. */
+        QIDialogButtonBox *buttonBox() { return m_pButtonBox; }
     /** @} */
 
@@ -105 +142 @@
 
 private:
-
-    /** @name Prepare/cleanup cascade.
-      * @{ */
-        /** Prepares all. */
-        void prepare();
-        /** Prepares central-widget. */
-        void prepareCentralWidget();
-        /** Prepares button-box. */
-        void prepareButtonBox();
-        /** Prepares menu-bar. */
-        void prepareMenuBar();
-#ifdef VBOX_WS_MAC
-        /** Prepares toolbar. */
-        void prepareToolBar();
-#endif
-
-        /** Cleanup menu-bar. */
-        void cleanupMenuBar();
-        /** Cleanups all. */
-        void cleanup();
-    /** @} */
 
     /** @name General stuff.

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -1049 +1049 @@
 }
 
-void UIHostNetworkManager::prepareDialog()
+void UIHostNetworkManager::configure()
 {
     /* Apply window icons: */
     setWindowIcon(UIIconPool::iconSetFull(":/host_iface_manager_32px.png", ":/host_iface_manager_16px.png"));
-
-    /* Apply language settings: */
-    retranslateUi();
-}
-
-void UIHostNetworkManager::prepareWidget()
+}
+
+void UIHostNetworkManager::configureCentralWidget()
 {
     /* Create widget: */
@@ -1075 +1072 @@
 }
 
+void UIHostNetworkManager::finalize()
+{
+    /* Apply language settings: */
+    retranslateUi();
+}
+
+UIHostNetworkManagerWidget *UIHostNetworkManager::widget()
+{
+    return qobject_cast<UIHostNetworkManagerWidget*>(QIManagerDialog::widget());
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.h

@@ -197 +197 @@
     /** @name Prepare/cleanup cascade.
       * @{ */
-        /** Prepares dialog. */
-        void prepareDialog();
-        /** Prepares widget. */
-        void prepareWidget();
+        /** Configures all. */
+        virtual void configure() /* override */;
+        /** Configures central-widget. */
+        virtual void configureCentralWidget() /* override */;
+        /** Perform final preparations. */
+        virtual void finalize() /* override */;
+    /** @} */
+
+    /** @name Widget stuff.
+      * @{ */
+        /** Returns the widget. */
+        virtual UIHostNetworkManagerWidget *widget() /* override */;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -2299 +2299 @@
 }
 
-void UIMediumManager::prepareDialog()
+void UIMediumManager::configure()
 {
     /* Apply window icons: */
     setWindowIcon(UIIconPool::iconSetFull(":/diskimage_32px.png", ":/diskimage_16px.png"));
-
-    /* Apply language settings: */
-    retranslateUi();
-}
-
-void UIMediumManager::prepareWidget()
+}
+
+void UIMediumManager::configureCentralWidget()
 {
     /* Create widget: */
@@ -2325 +2322 @@
 }
 
+void UIMediumManager::finalize()
+{
+    /* Apply language settings: */
+    retranslateUi();
+}
+
+UIMediumManagerWidget *UIMediumManager::widget()
+{
+    return qobject_cast<UIMediumManagerWidget*>(QIManagerDialog::widget());
+}
+
 #include "UIMediumManager.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -357 +357 @@
     /** @name Prepare/cleanup cascade.
       * @{ */
-        /** Prepares dialog. */
-        void prepareDialog();
-        /** Prepares widget. */
-        void prepareWidget();
+        /** Configures all. */
+        virtual void configure() /* override */;
+        /** Configures central-widget. */
+        virtual void configureCentralWidget() /* override */;
+        /** Perform final preparations. */
+        virtual void finalize() /* override */;
+    /** @} */
+
+    /** @name Widget stuff.
+      * @{ */
+        /** Returns the widget. */
+        virtual UIMediumManagerWidget *widget() /* override */;
     /** @} */