Changeset 92270 in vbox for trunk/src

Timestamp:

Nov 8, 2021 2:46:28 PM (3 years ago)

Author:

vboxsync

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

148112

Message:

FE/Qt: bugref:10141 Some renaming

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• medium/viso/UIVisoConfigurationPanel.cpp (modified) (3 diffs)
• medium/viso/UIVisoConfigurationPanel.h (modified) (3 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (24 diffs)
• medium/viso/UIVisoCreator.h (modified) (2 diffs)

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

@@ -1752 +1752 @@
 
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
-    UIVisoCreator *pVisoCreator = new UIVisoCreator(pDialogParent, strMachineName);
+    UIVisoCreatorDialog *pVisoCreator = new UIVisoCreatorDialog(pDialogParent, strMachineName);
 
     if (!pVisoCreator)

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

@@ -28 +28 @@
 #include "UIVisoCreator.h"
 
-UIVisoConfigurationPanel::UIVisoConfigurationPanel(UIVisoCreator *pCreator, QWidget *pParent /* =0 */)
+UIVisoConfigurationPanel::UIVisoConfigurationPanel(QWidget *pParent /* =0 */)
     : UIDialogPanel(pParent)
-    , m_pCreator(pCreator)
     , m_pVisoNameLabel(0)
     , m_pCustomOptionsLabel(0)
@@ -72 +71 @@
         return;
 
-    /* Install creator's event-filter: */
-    m_pCreator->installEventFilter(this);
-
     /* Name edit and and label: */
     m_pVisoNameLabel = new QILabel(QApplication::translate("UIVisoCreator", "VISO Name:"));
@@ -112 +108 @@
     if (m_pDeleteButton)
         connect(m_pDeleteButton, &QIToolButton::clicked, this, &UIVisoConfigurationPanel::sltHandleDeleteCurrentCustomOption);
-}
-
-bool UIVisoConfigurationPanel::eventFilter(QObject *pObject, QEvent *pEvent)
-{
-    /* Handle only events sent to creator only: */
-    if (pObject != m_pCreator)
-        return UIDialogPanel::eventFilter(pObject, pEvent);
-
-    switch (pEvent->type())
-    {
-        case QEvent::KeyPress:
-        {
-            QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
-            if (pKeyEvent->key() == Qt::Key_Return && m_pCustomOptionsComboBox && m_pCustomOptionsComboBox->hasFocus())
-                addCustomVisoOption();
-            return true;
-            break;
-        }
-        default:
-        break;
-    }
-
-    /* Call to base-class: */
-    return UIDialogPanel::eventFilter(pObject, pEvent);
 }
 

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

@@ -42 +42 @@
 
 public:
-    UIVisoConfigurationPanel(UIVisoCreator *pCreator, QWidget *pParent = 0);
+    UIVisoConfigurationPanel(QWidget *pParent = 0);
     ~UIVisoConfigurationPanel();
     virtual QString panelName() const /* override */;
@@ -50 +50 @@
 protected:
 
-    bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
     void retranslateUi() /* override */;
 
@@ -65 +64 @@
     void emitCustomVisoOptions();
 
-    /** Holds the parent creator reference. */
-    UIVisoCreator *m_pCreator;
-
     QILabel      *m_pVisoNameLabel;
     QILabel      *m_pCustomOptionsLabel;

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

@@ -39 +39 @@
 #endif
 
-UIVisoCreator::UIVisoCreator(QWidget *pParent /* =0 */, const QString& strMachineName /* = QString() */)
+UIVisoCreatorDialog::UIVisoCreatorDialog(QWidget *pParent /* =0 */, const QString& strMachineName /* = QString() */)
     : QIWithRetranslateUI<QIMainDialog>(pParent)
     , m_pActionConfiguration(0)
@@ -69 +69 @@
 }
 
-QStringList UIVisoCreator::entryList() const
+QStringList UIVisoCreatorDialog::entryList() const
 {
     if (!m_pVisoBrowser)
@@ -76 +76 @@
 }
 
-const QString &UIVisoCreator::visoName() const
+const QString &UIVisoCreatorDialog::visoName() const
 {
     return m_visoOptions.m_strVisoName;
 }
 
-const QStringList &UIVisoCreator::customOptions() const
+const QStringList &UIVisoCreatorDialog::customOptions() const
 {
     return m_visoOptions.m_customOptions;
 }
 
-QString UIVisoCreator::currentPath() const
+QString UIVisoCreatorDialog::currentPath() const
 {
     if (!m_pHostBrowser)
@@ -93 +93 @@
 }
 
-void UIVisoCreator::setCurrentPath(const QString &strPath)
+void UIVisoCreatorDialog::setCurrentPath(const QString &strPath)
 {
     if (!m_pHostBrowser)
@@ -100 +100 @@
 }
 
-void UIVisoCreator::retranslateUi()
+void UIVisoCreatorDialog::retranslateUi()
 {
     if (!m_strMachineName.isEmpty())
@@ -153 +153 @@
 }
 
-void UIVisoCreator::sltHandleAddObjectsToViso(QStringList pathList)
+void UIVisoCreatorDialog::sltHandleAddObjectsToViso(QStringList pathList)
 {
     if (m_pVisoBrowser)
@@ -159 +159 @@
 }
 
-void UIVisoCreator::sltPanelActionToggled(bool fChecked)
+void UIVisoCreatorDialog::sltPanelActionToggled(bool fChecked)
 {
     QAction *pSenderAction = qobject_cast<QAction*>(sender());
@@ -180 +180 @@
 }
 
-void UIVisoCreator::sltHandleVisoNameChanged(const QString &strVisoName)
+void UIVisoCreatorDialog::sltHandleVisoNameChanged(const QString &strVisoName)
 {
     if (m_visoOptions.m_strVisoName == strVisoName)
@@ -189 +189 @@
 }
 
-void UIVisoCreator::sltHandleCustomVisoOptionsChanged(const QStringList &customVisoOptions)
+void UIVisoCreatorDialog::sltHandleCustomVisoOptionsChanged(const QStringList &customVisoOptions)
 {
     if (m_visoOptions.m_customOptions == customVisoOptions)
@@ -196 +196 @@
 }
 
-void UIVisoCreator::sltHandleShowHiddenObjectsChange(bool fShow)
+void UIVisoCreatorDialog::sltHandleShowHiddenObjectsChange(bool fShow)
 {
     if (m_browserOptions.m_fShowHiddenObjects == fShow)
@@ -204 +204 @@
 }
 
-void UIVisoCreator::sltHandleHidePanel(UIDialogPanel *pPanel)
+void UIVisoCreatorDialog::sltHandleHidePanel(UIDialogPanel *pPanel)
 {
     hidePanel(pPanel);
 }
 
-void UIVisoCreator::sltHandleBrowserTreeViewVisibilityChanged(bool fVisible)
+void UIVisoCreatorDialog::sltHandleBrowserTreeViewVisibilityChanged(bool fVisible)
 {
     Q_UNUSED(fVisible);
@@ -215 +215 @@
 }
 
-void UIVisoCreator::sltHandleHostBrowserTableSelectionChanged(bool fIsSelectionEmpty)
+void UIVisoCreatorDialog::sltHandleHostBrowserTableSelectionChanged(bool fIsSelectionEmpty)
 {
     if (m_pAddAction)
@@ -221 +221 @@
 }
 
-void UIVisoCreator::sltHandleContentBrowserTableSelectionChanged(bool fIsSelectionEmpty)
+void UIVisoCreatorDialog::sltHandleContentBrowserTableSelectionChanged(bool fIsSelectionEmpty)
 {
     if (m_pRemoveAction)
@@ -227 +227 @@
 }
 
-void UIVisoCreator::sltHandleShowContextMenu(const QWidget *pContextMenuRequester, const QPoint &point)
+void UIVisoCreatorDialog::sltHandleShowContextMenu(const QWidget *pContextMenuRequester, const QPoint &point)
 {
     if (!pContextMenuRequester)
@@ -248 +248 @@
 }
 
-void UIVisoCreator::prepareWidgets()
+void UIVisoCreatorDialog::prepareWidgets()
 {
     m_pCentralWidget = new QWidget;
@@ -342 +342 @@
 }
 
-void UIVisoCreator::prepareConnections()
+void UIVisoCreatorDialog::prepareConnections()
 {
     if (m_pHostBrowser)
     {
         connect(m_pHostBrowser, &UIVisoHostBrowser::sigAddObjectsToViso,
-                this, &UIVisoCreator::sltHandleAddObjectsToViso);
+                this, &UIVisoCreatorDialog::sltHandleAddObjectsToViso);
         connect(m_pHostBrowser, &UIVisoHostBrowser::sigTreeViewVisibilityChanged,
-                this, &UIVisoCreator::sltHandleBrowserTreeViewVisibilityChanged);
+                this, &UIVisoCreatorDialog::sltHandleBrowserTreeViewVisibilityChanged);
         connect(m_pHostBrowser, &UIVisoHostBrowser::sigTableSelectionChanged,
-                this, &UIVisoCreator::sltHandleHostBrowserTableSelectionChanged);
+                this, &UIVisoCreatorDialog::sltHandleHostBrowserTableSelectionChanged);
         connect(m_pHostBrowser, &UIVisoHostBrowser::sigCreateFileTableViewContextMenu,
-                this, &UIVisoCreator::sltHandleShowContextMenu);
+                this, &UIVisoCreatorDialog::sltHandleShowContextMenu);
     }
 
@@ -359 +359 @@
     {
         connect(m_pVisoBrowser, &UIVisoContentBrowser::sigTableSelectionChanged,
-                this, &UIVisoCreator::sltHandleContentBrowserTableSelectionChanged);
+                this, &UIVisoCreatorDialog::sltHandleContentBrowserTableSelectionChanged);
         connect(m_pVisoBrowser, &UIVisoContentBrowser::sigCreateFileTableViewContextMenu,
-                this, &UIVisoCreator::sltHandleShowContextMenu);
+                this, &UIVisoCreatorDialog::sltHandleShowContextMenu);
     }
 
     if (m_pButtonBox)
     {
-        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVisoCreator::close);
-        connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIVisoCreator::accept);
+        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVisoCreatorDialog::close);
+        connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIVisoCreatorDialog::accept);
     }
 
     if (m_pActionConfiguration)
-        connect(m_pActionConfiguration, &QAction::triggered, this, &UIVisoCreator::sltPanelActionToggled);
+        connect(m_pActionConfiguration, &QAction::triggered, this, &UIVisoCreatorDialog::sltPanelActionToggled);
     if (m_pActionOptions)
-        connect(m_pActionOptions, &QAction::triggered, this, &UIVisoCreator::sltPanelActionToggled);
+        connect(m_pActionOptions, &QAction::triggered, this, &UIVisoCreatorDialog::sltPanelActionToggled);
 
     if (m_pConfigurationPanel)
     {
         connect(m_pConfigurationPanel, &UIVisoConfigurationPanel::sigVisoNameChanged,
-                this, &UIVisoCreator::sltHandleVisoNameChanged);
+                this, &UIVisoCreatorDialog::sltHandleVisoNameChanged);
         connect(m_pConfigurationPanel, &UIVisoConfigurationPanel::sigCustomVisoOptionsChanged,
-                this, &UIVisoCreator::sltHandleCustomVisoOptionsChanged);
+                this, &UIVisoCreatorDialog::sltHandleCustomVisoOptionsChanged);
         connect(m_pConfigurationPanel, &UIVisoConfigurationPanel::sigHidePanel,
-                this, &UIVisoCreator::sltHandleHidePanel);
+                this, &UIVisoCreatorDialog::sltHandleHidePanel);
         m_panelActionMap.insert(m_pConfigurationPanel, m_pActionConfiguration);
     }
@@ -389 +389 @@
     {
         connect(m_pCreatorOptionsPanel, &UIVisoCreatorOptionsPanel::sigShowHiddenObjects,
-                this, &UIVisoCreator::sltHandleShowHiddenObjectsChange);
+                this, &UIVisoCreatorDialog::sltHandleShowHiddenObjectsChange);
         connect(m_pCreatorOptionsPanel, &UIVisoCreatorOptionsPanel::sigHidePanel,
-                this, &UIVisoCreator::sltHandleHidePanel);
+                this, &UIVisoCreatorDialog::sltHandleHidePanel);
         m_panelActionMap.insert(m_pCreatorOptionsPanel, m_pActionOptions);
     }
@@ -413 +413 @@
 }
 
-void UIVisoCreator::prepareActions()
+void UIVisoCreatorDialog::prepareActions()
 {
     m_pActionConfiguration = new QAction(this);
@@ -479 +479 @@
 }
 
-void UIVisoCreator::populateMenuMainToolbar()
+void UIVisoCreatorDialog::populateMenuMainToolbar()
 {
     if (!m_pMainMenu || !m_pToolBar)
@@ -496 +496 @@
 }
 
-void UIVisoCreator::hidePanel(UIDialogPanel* panel)
+void UIVisoCreatorDialog::hidePanel(UIDialogPanel* panel)
 {
     if (panel && panel->isVisible())
@@ -510 +510 @@
 }
 
-void UIVisoCreator::showPanel(UIDialogPanel* panel)
+void UIVisoCreatorDialog::showPanel(UIDialogPanel* panel)
 {
     if (panel && panel->isHidden())
@@ -525 +525 @@
 }
 
-void UIVisoCreator::manageEscapeShortCut()
+void UIVisoCreatorDialog::manageEscapeShortCut()
 {
     /* Take the escape key from m_pButtonBox and from the panels in case treeview(s) in
@@ -556 +556 @@
 }
 
-void UIVisoCreator::prepareVerticalToolBar()
+void UIVisoCreatorDialog::prepareVerticalToolBar()
 {
     m_pVerticalToolBar = new QIToolBar;

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

@@ -43 +43 @@
   * for VISO file system. It has the main menu, main toolbar, and a vertical toolbar and corresponding
   * actions. */
-class UIVisoCreator : public QIWithRetranslateUI<QIMainDialog>
+class UIVisoCreatorDialog : public QIWithRetranslateUI<QIMainDialog>
 {
     Q_OBJECT;
@@ -49 +49 @@
 public:
 
-    UIVisoCreator(QWidget *pParent = 0, const QString& strMachineName = QString());
+    UIVisoCreatorDialog(QWidget *pParent = 0, const QString& strMachineName = QString());
     /** Returns the content of the .viso file. Each element of the list corresponds to a line in the .viso file. */
     QStringList       entryList() const;