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

Timestamp:

Jan 23, 2019 9:26:31 AM (6 years ago)

Author:

vboxsync

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

128324

Message:

FE/Qt: bugref:9080: Move dialog panel base to globals

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/globals/UIDialogPanel.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorPanel.cpp ) (9 diffs)
• src/globals/UIDialogPanel.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorPanel.h ) (5 diffs)
• src/medium/viso/UIVisoConfigurationPanel.cpp (modified) (2 diffs)
• src/medium/viso/UIVisoConfigurationPanel.h (modified) (2 diffs)
• src/medium/viso/UIVisoCreator.cpp (modified) (4 diffs)
• src/medium/viso/UIVisoCreator.h (modified) (4 diffs)
• src/medium/viso/UIVisoCreatorOptionsPanel.cpp (modified) (1 diff)
• src/medium/viso/UIVisoCreatorOptionsPanel.h (modified) (1 diff)

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

@@ -805 +805 @@
         src/globals/UICustomFileSystemModel.h \
         src/globals/UIDesktopWidgetWatchdog.h \
+        src/globals/UIDialogPanel.h \
         src/globals/UIMainEventListener.h \
         src/globals/UIMessageCenter.h \
@@ -832 +833 @@
         src/medium/viso/UIVisoContentBrowser.h \
         src/medium/viso/UIVisoCreator.h \
-        src/medium/viso/UIVisoCreatorPanel.h \
         src/medium/viso/UIVisoConfigurationPanel.h \
         src/medium/viso/UIVisoCreatorOptionsPanel.h \
@@ -1266 +1266 @@
         src/globals/UIDefs.cpp \
         src/globals/UIDesktopWidgetWatchdog.cpp \
+        src/globals/UIDialogPanel.cpp \
         src/globals/UIErrorString.cpp \
         src/globals/UIIconPool.cpp \
@@ -1298 +1299 @@
         src/medium/viso/UIVisoContentBrowser.cpp \
         src/medium/viso/UIVisoCreator.cpp \
-        src/medium/viso/UIVisoCreatorPanel.cpp \
         src/medium/viso/UIVisoConfigurationPanel.cpp \
         src/medium/viso/UIVisoCreatorOptionsPanel.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.cpp

@@ -27 +27 @@
 #include "QIToolButton.h"
 #include "UIIconPool.h"
-#include "UIVisoCreatorPanel.h"
+#include "UIDialogPanel.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -33 +33 @@
 
 
-UIVisoCreatorPanel::UIVisoCreatorPanel(QWidget *pParent)
+UIDialogPanel::UIDialogPanel(QWidget *pParent)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pMainLayout(0)
@@ -41 +41 @@
 }
 
-void UIVisoCreatorPanel::setCloseButtonShortCut(QKeySequence shortCut)
+void UIDialogPanel::setCloseButtonShortCut(QKeySequence shortCut)
 {
     if (!m_pCloseButton)
@@ -48 +48 @@
 }
 
-QHBoxLayout* UIVisoCreatorPanel::mainLayout()
+QHBoxLayout* UIDialogPanel::mainLayout()
 {
     return m_pMainLayout;
 }
 
-void UIVisoCreatorPanel::prepare()
+void UIDialogPanel::prepare()
 {
     prepareWidgets();
@@ -60 +60 @@
 }
 
-void UIVisoCreatorPanel::prepareWidgets()
+void UIDialogPanel::prepareWidgets()
 {
     m_pMainLayout = new QHBoxLayout(this);
@@ -83 +83 @@
 }
 
-void UIVisoCreatorPanel::prepareConnections()
+void UIDialogPanel::prepareConnections()
 {
     if (m_pCloseButton)
-        connect(m_pCloseButton, &QIToolButton::clicked, this, &UIVisoCreatorPanel::hide);
+        connect(m_pCloseButton, &QIToolButton::clicked, this, &UIDialogPanel::hide);
 }
 
-void UIVisoCreatorPanel::retranslateUi()
+void UIDialogPanel::retranslateUi()
 {
     if (m_pCloseButton)
@@ -95 +95 @@
 }
 
-bool UIVisoCreatorPanel::eventFilter(QObject *pObject, QEvent *pEvent)
+bool UIDialogPanel::eventFilter(QObject *pObject, QEvent *pEvent)
 {
     Q_UNUSED(pObject);
@@ -103 +103 @@
 }
 
-void UIVisoCreatorPanel::showEvent(QShowEvent *pEvent)
+void UIDialogPanel::showEvent(QShowEvent *pEvent)
 {
     QWidget::showEvent(pEvent);
 }
 
-void UIVisoCreatorPanel::hideEvent(QHideEvent *pEvent)
+void UIDialogPanel::hideEvent(QHideEvent *pEvent)
 {
     /* Get focused widget: */
@@ -121 +121 @@
 }
 
-void UIVisoCreatorPanel::addVerticalSeparator()
+void UIDialogPanel::addVerticalSeparator()
 {
     QFrame *pSeparator = new QFrame();

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.h

@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_medium_viso_UIVisoCreatorPanel_h
-#define FEQT_INCLUDED_SRC_medium_viso_UIVisoCreatorPanel_h
+#ifndef FEQT_INCLUDED_SRC_globals_UIDialogPanel_h
+#define FEQT_INCLUDED_SRC_globals_UIDialogPanel_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -36 +36 @@
 
 /** QWidget extension acting as the base class for UIVMLogViewerXXXPanel widgets. */
-class UIVisoCreatorPanel : public QIWithRetranslateUI<QWidget>
+class UIDialogPanel : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -42 +42 @@
 public:
 
-    UIVisoCreatorPanel(QWidget *pParent);
+    UIDialogPanel(QWidget *pParent);
     void setCloseButtonShortCut(QKeySequence shortCut);
     virtual QString panelName() const = 0;
@@ -48 +48 @@
 signals:
 
-    void sigHidePanel(UIVisoCreatorPanel *pPanel);
+    void sigHidePanel(UIDialogPanel *pPanel);
 
 protected:
@@ -77 +77 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_medium_viso_UIVisoCreatorPanel_h */
+#endif /* !FEQT_INCLUDED_SRC_globals_UIDialogPanel_h */

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.cpp

@@ -35 +35 @@
 
 UIVisoConfigurationPanel::UIVisoConfigurationPanel(QWidget *pParent /* =0 */)
-    : UIVisoCreatorPanel(pParent)
+    : UIDialogPanel(pParent)
     , m_pVisoNameLabel(0)
     , m_pCustomOptionsLabel(0)
@@ -137 +137 @@
     }
     /* Call to base-class: */
-    return UIVisoCreatorPanel::eventFilter(pObject, pEvent);
+    return UIDialogPanel::eventFilter(pObject, pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.h

@@ -23 +23 @@
 
 /* GUI includes: */
-#include "UIVisoCreatorPanel.h"
+#include "UIDialogPanel.h"
 
 /* Forward declarations: */
@@ -35 +35 @@
 class UIVisoCreator;
 
-class UIVisoConfigurationPanel : public UIVisoCreatorPanel
+class UIVisoConfigurationPanel : public UIDialogPanel
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -113 +113 @@
     if (!pSenderAction)
         return;
-    UIVisoCreatorPanel* pPanel = 0;
+    UIDialogPanel* pPanel = 0;
     /* Look for the sender() within the m_panelActionMap's values: */
-    for (QMap<UIVisoCreatorPanel*, QAction*>::const_iterator iterator = m_panelActionMap.begin();
+    for (QMap<UIDialogPanel*, QAction*>::const_iterator iterator = m_panelActionMap.begin();
         iterator != m_panelActionMap.end(); ++iterator)
     {
@@ -153 +153 @@
 }
 
-void UIVisoCreator::sltHandleHidePanel(UIVisoCreatorPanel *pPanel)
+void UIVisoCreator::sltHandleHidePanel(UIDialogPanel *pPanel)
 {
     hidePanel(pPanel);
@@ -312 +312 @@
 
 
-void UIVisoCreator::hidePanel(UIVisoCreatorPanel* panel)
+void UIVisoCreator::hidePanel(UIDialogPanel* panel)
 {
     if (panel && panel->isVisible())
         panel->setVisible(false);
-    QMap<UIVisoCreatorPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
+    QMap<UIDialogPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
     if (iterator != m_panelActionMap.end())
     {
@@ -326 +326 @@
 }
 
-void UIVisoCreator::showPanel(UIVisoCreatorPanel* panel)
+void UIVisoCreator::showPanel(UIDialogPanel* panel)
 {
     if (panel && panel->isHidden())
         panel->setVisible(true);
-    QMap<UIVisoCreatorPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
+    QMap<UIDialogPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
     if (iterator != m_panelActionMap.end())
     {

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -41 +41 @@
 class QIDialogButtonBox;
 class UIActionPool;
+class UIDialogPanel;
 class UIToolBar;
 class UIVisoHostBrowser;
 class UIVisoContentBrowser;
 class UIVisoCreatorOptionsPanel;
-class UIVisoCreatorPanel;
 class UIVisoConfigurationPanel;
 
@@ -76 +76 @@
     void sltHandleCustomVisoOptionsChanged(const QStringList &customVisoOptions);
     void sltHandleShowHiddenObjectsChange(bool fShow);
-    void sltHandleHidePanel(UIVisoCreatorPanel *pPanel);
+    void sltHandleHidePanel(UIDialogPanel *pPanel);
 
 private:
@@ -101 +101 @@
     void setTableRootIndex(QModelIndex index = QModelIndex() );
     void setTreeCurrentIndex(QModelIndex index = QModelIndex() );
-    void hidePanel(UIVisoCreatorPanel *panel);
-    void showPanel(UIVisoCreatorPanel *panel);
+    void hidePanel(UIDialogPanel *panel);
+    void showPanel(UIDialogPanel *panel);
     /** Makes sure escape key is assigned to only a single widget. This is done by checking
         several things in the following order:
@@ -127 +127 @@
     UIVisoCreatorOptionsPanel *m_pCreatorOptionsPanel;
     UIVisoConfigurationPanel  *m_pConfigurationPanel;
-    QMap<UIVisoCreatorPanel*, QAction*> m_panelActionMap;
-    QList<UIVisoCreatorPanel*>          m_visiblePanelsList;
+    QMap<UIDialogPanel*, QAction*> m_panelActionMap;
+    QList<UIDialogPanel*>          m_visiblePanelsList;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorOptionsPanel.cpp

@@ -32 +32 @@
 
 UIVisoCreatorOptionsPanel::UIVisoCreatorOptionsPanel(QWidget *pParent /* =0 */)
-    : UIVisoCreatorPanel(pParent)
+    : UIDialogPanel(pParent)
     , m_pShowHiddenObjectsCheckBox(0)
     , m_pShowHiddenObjectsLabel(0)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorOptionsPanel.h

@@ -27 +27 @@
 
 /* GUI includes: */
-#include "UIVisoCreatorPanel.h"
+#include "UIDialogPanel.h"
 #include "QIWithRetranslateUI.h"
 
-class UIVisoCreatorOptionsPanel : public UIVisoCreatorPanel
+class UIVisoCreatorOptionsPanel : public UIDialogPanel
 {
     Q_OBJECT;