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

Timestamp:

Aug 23, 2023 11:53:29 AM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10496. Some renaming.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/globals/UIPaneContainer.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.cpp ) (10 diffs)
• src/globals/UIPaneContainer.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.h ) (4 diffs)
• src/guestctrl/UIFileManagerPanel.cpp (modified) (1 diff)
• src/guestctrl/UIFileManagerPanel.h (modified) (2 diffs)
• src/logviewer/UIVMLogViewerPanel.cpp (modified) (2 diffs)
• src/logviewer/UIVMLogViewerPanel.h (modified) (2 diffs)
• src/medium/viso/UIVisoCreator.cpp (modified) (3 diffs)

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

@@ -825 +825 @@
         src/globals/UICustomFileSystemModel.h \
         src/globals/UIDesktopWidgetWatchdog.h \
-        src/globals/UIDialogPanel.h \
         src/globals/UIMainEventListener.h \
         src/globals/UIMessageCenter.h \
         src/globals/UIModalWindowManager.h \
+        src/globals/UIPaneContainer.h \
         src/globals/UIPopupCenter.h \
         src/globals/UIProgressEventHandler.h \
@@ -1395 +1395 @@
         src/globals/UIDesktopWidgetWatchdog.cpp \
         src/globals/UIDetailsGenerator.cpp \
-        src/globals/UIDialogPanel.cpp \
         src/globals/UIErrorString.cpp \
         src/globals/UIExtension.cpp \
@@ -1405 +1404 @@
         src/globals/UIModalWindowManager.cpp \
         src/globals/UIMousePointerShapeData.cpp \
+        src/globals/UIPaneContainer.cpp \
         src/globals/UIPathOperations.cpp \
         src/globals/UIPopupCenter.cpp \

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

@@ -37 +37 @@
 #include "QIToolButton.h"
 #include "UIIconPool.h"
-#include "UIDialogPanel.h"
+#include "UIPaneContainer.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -45 +45 @@
 #include <iprt/assert.h>
 
-UIDialogPanelBase::UIDialogPanelBase(QWidget *pParent /* = 0 */)
+UIPaneContainer::UIPaneContainer(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pTabWidget(0)
@@ -54 +54 @@
 }
 
-void UIDialogPanelBase::retranslateUi()
+void UIPaneContainer::retranslateUi()
 {
     if (m_pCloseButton)
@@ -60 +60 @@
 }
 
-void UIDialogPanelBase::prepare()
+void UIPaneContainer::prepare()
 {
     QHBoxLayout *pLayout = new QHBoxLayout(this);
@@ -66 +66 @@
     pLayout->setContentsMargins(0, 0, 0, 0);
     m_pTabWidget = new QTabWidget();
-    connect(m_pTabWidget, &QTabWidget::currentChanged, this, &UIDialogPanelBase::sigCurrentTabChanged);
+    connect(m_pTabWidget, &QTabWidget::currentChanged, this, &UIPaneContainer::sigCurrentTabChanged);
     AssertReturnVoid(m_pTabWidget);
     pLayout->addWidget(m_pTabWidget);
@@ -73 +73 @@
     AssertReturnVoid(m_pCloseButton);
     m_pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
-    connect(m_pCloseButton, &QIToolButton::clicked, this, &UIDialogPanelBase::sltHide);
+    connect(m_pCloseButton, &QIToolButton::clicked, this, &UIPaneContainer::sltHide);
 
     m_pTabWidget->setCornerWidget(m_pCloseButton);
 }
 
-void UIDialogPanelBase::sltHide()
+void UIPaneContainer::sltHide()
 {
     hide();
@@ -84 +84 @@
 }
 
-void UIDialogPanelBase::insertTab(int iIndex, QWidget *pPage, const QString &strLabel /* = QString() */)
+void UIPaneContainer::insertTab(int iIndex, QWidget *pPage, const QString &strLabel /* = QString() */)
 {
     if (m_pTabWidget)
@@ -90 +90 @@
 }
 
-void UIDialogPanelBase::setTabText(int iIndex, const QString &strText)
+void UIPaneContainer::setTabText(int iIndex, const QString &strText)
 {
     if (!m_pTabWidget || iIndex < 0 || iIndex >= m_pTabWidget->count())
@@ -97 +97 @@
 }
 
-void UIDialogPanelBase::setCurrentIndex(int iIndex)
+void UIPaneContainer::setCurrentIndex(int iIndex)
 {
     if (!m_pTabWidget || iIndex >= m_pTabWidget->count() || iIndex < 0)
@@ -104 +104 @@
 }
 
-int UIDialogPanelBase::currentIndex() const
+int UIPaneContainer::currentIndex() const
 {
     if (!m_pTabWidget)

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

@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_globals_UIDialogPanel_h
-#define FEQT_INCLUDED_SRC_globals_UIDialogPanel_h
+#ifndef FEQT_INCLUDED_SRC_globals_UIPaneContainer_h
+#define FEQT_INCLUDED_SRC_globals_UIPaneContainer_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -44 +44 @@
 
 /** QWidget extension acting as the base class for all the dialog panels like file manager, logviewer etc. */
-class SHARED_LIBRARY_STUFF UIDialogPanelBase : public QIWithRetranslateUI<QWidget>
+class SHARED_LIBRARY_STUFF UIPaneContainer : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -55 +55 @@
 public:
 
-    UIDialogPanelBase(QWidget *pParent = 0);
+    UIPaneContainer(QWidget *pParent = 0);
     void setCurrentIndex(int iIndex);
     int currentIndex() const;
@@ -76 +76 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_globals_UIDialogPanel_h */
+#endif /* !FEQT_INCLUDED_SRC_globals_UIPaneContainer_h */

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.cpp

@@ -369 +369 @@
 
 UIFileManagerPanel::UIFileManagerPanel(QWidget *pParent, UIFileManagerOptions *pFileManagerOptions)
-    : UIDialogPanelBase(pParent)
+    : UIPaneContainer(pParent)
     , m_pListDirectoriesOnTopCheckBox(0)
     , m_pDeleteConfirmationCheckBox(0)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.h

@@ -37 +37 @@
 
 /* GUI includes: */
-#include "UIDialogPanel.h"
+#include "UIPaneContainer.h"
 #include "UIGuestControlDefs.h"
 #include "QIWithRetranslateUI.h"
@@ -53 +53 @@
 class QVBoxLayout;
 
-class UIFileManagerPanel : public UIDialogPanelBase
+class UIFileManagerPanel : public UIPaneContainer
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.cpp

@@ -46 +46 @@
 
 UIVMLogViewerPanelNew::UIVMLogViewerPanelNew(QWidget *pParent, UIVMLogViewerWidget *pViewer)
-    : UIDialogPanelBase(pParent)
+    : UIPaneContainer(pParent)
     , m_pViewer(pViewer)
     , m_pSearchWidget(0)
@@ -174 +174 @@
             return true;
     }
-    return UIDialogPanelBase::eventFilter(pObject, pEvent);
+    return UIPaneContainer::eventFilter(pObject, pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.h

@@ -33 +33 @@
 
 /* GUI includes: */
-#include "UIDialogPanel.h"
+#include "UIPaneContainer.h"
 #include "UIVMLogBookmark.h"
 
@@ -45 +45 @@
 class UIVMLogViewerPreferencesWidget;
 
-class UIVMLogViewerPanelNew : public UIDialogPanelBase
+class UIVMLogViewerPanelNew : public UIPaneContainer
 {
     Q_OBJECT;

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

@@ -48 +48 @@
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
-#include "UIDialogPanel.h"
+#include "UIPaneContainer.h"
 #include "UIModalWindowManager.h"
 #include "UIVisoHostBrowser.h"
@@ -65 +65 @@
 *********************************************************************************************************************************/
 
-class SHARED_LIBRARY_STUFF UIVisoSettingWidget : public UIDialogPanelBase
+class SHARED_LIBRARY_STUFF UIVisoSettingWidget : public UIPaneContainer
 {
     Q_OBJECT;
@@ -102 +102 @@
 
 UIVisoSettingWidget::UIVisoSettingWidget(QWidget *pParent)
-    : UIDialogPanelBase(pParent)
+    : UIPaneContainer(pParent)
     , m_pVisoNameLabel(0)
     , m_pCustomOptionsLabel(0)