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

Timestamp:

Aug 23, 2023 6:54:29 PM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10496, bugref:9072. Some renaming in logviewer pane container stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerPanel.cpp (modified) (20 diffs)
• UIVMLogViewerPanel.h (modified) (4 diffs)
• UIVMLogViewerWidget.cpp (modified) (4 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

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

@@ -45 +45 @@
 #endif
 
-UIVMLogViewerPanelNew::UIVMLogViewerPanelNew(QWidget *pParent, UIVMLogViewerWidget *pViewer)
+UIVMLogViewerPaneContainer::UIVMLogViewerPaneContainer(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     : UIPaneContainer(pParent)
     , m_pViewer(pViewer)
@@ -56 +56 @@
 }
 
-void UIVMLogViewerPanelNew::prepare()
+void UIVMLogViewerPaneContainer::prepare()
 {
     /* Search tab: */
@@ -63 +63 @@
 
     connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigHighlightingUpdated,
-            this, &UIVMLogViewerPanelNew::sigHighlightingUpdated);
+            this, &UIVMLogViewerPaneContainer::sigHighlightingUpdated);
     connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigSearchUpdated,
-            this, &UIVMLogViewerPanelNew::sigSearchUpdated);
+            this, &UIVMLogViewerPaneContainer::sigSearchUpdated);
 
     /* Filter tab: */
@@ -72 +72 @@
 
     connect(m_pFilterWidget, &UIVMLogViewerFilterWidget::sigFilterApplied,
-            this, &UIVMLogViewerPanelNew::sigFilterApplied);
+            this, &UIVMLogViewerPaneContainer::sigFilterApplied);
 
     /* Bookmark tab: */
@@ -79 +79 @@
 
     connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigDeleteBookmarkByIndex,
-            this, &UIVMLogViewerPanelNew::sigDeleteBookmarkByIndex);
+            this, &UIVMLogViewerPaneContainer::sigDeleteBookmarkByIndex);
     connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigDeleteAllBookmarks,
-            this, &UIVMLogViewerPanelNew::sigDeleteAllBookmarks);
+            this, &UIVMLogViewerPaneContainer::sigDeleteAllBookmarks);
     connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigBookmarkSelected,
-            this, &UIVMLogViewerPanelNew::sigBookmarkSelected);
+            this, &UIVMLogViewerPaneContainer::sigBookmarkSelected);
 
     /* Preferences tab: */
@@ -90 +90 @@
 
     connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigShowLineNumbers,
-            this, &UIVMLogViewerPanelNew::sigShowLineNumbers);
+            this, &UIVMLogViewerPaneContainer::sigShowLineNumbers);
     connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigWrapLines,
-            this, &UIVMLogViewerPanelNew::sigWrapLines);
+            this, &UIVMLogViewerPaneContainer::sigWrapLines);
     connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigChangeFontSizeInPoints,
-            this, &UIVMLogViewerPanelNew::sigChangeFontSizeInPoints);
+            this, &UIVMLogViewerPaneContainer::sigChangeFontSizeInPoints);
     connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigChangeFont,
-            this, &UIVMLogViewerPanelNew::sigChangeFont);
+            this, &UIVMLogViewerPaneContainer::sigChangeFont);
     connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigResetToDefaults,
-            this, &UIVMLogViewerPanelNew::sigResetToDefaults);
+            this, &UIVMLogViewerPaneContainer::sigResetToDefaults);
 
     retranslateUi();
 }
 
-void UIVMLogViewerPanelNew::refreshSearch()
+void UIVMLogViewerPaneContainer::refreshSearch()
 {
     if (m_pSearchWidget)
@@ -109 +109 @@
 }
 
-QVector<float> UIVMLogViewerPanelNew::matchLocationVector() const
+QVector<float> UIVMLogViewerPaneContainer::matchLocationVector() const
 {
     if (!m_pSearchWidget)
@@ -116 +116 @@
 }
 
-int UIVMLogViewerPanelNew::matchCount() const
+int UIVMLogViewerPaneContainer::matchCount() const
 {
     if (!m_pSearchWidget)
@@ -123 +123 @@
 }
 
-void UIVMLogViewerPanelNew::applyFilter()
+void UIVMLogViewerPaneContainer::applyFilter()
 {
     if (m_pFilterWidget)
@@ -129 +129 @@
 }
 
-void UIVMLogViewerPanelNew::updateBookmarkList(const QVector<UIVMLogBookmark>& bookmarkList)
+void UIVMLogViewerPaneContainer::updateBookmarkList(const QVector<UIVMLogBookmark>& bookmarkList)
 {
     if (m_pBookmarksWidget)
@@ -135 +135 @@
 }
 
-void UIVMLogViewerPanelNew::disableEnableBookmarking(bool flag)
+void UIVMLogViewerPaneContainer::disableEnableBookmarking(bool flag)
 {
     if (m_pBookmarksWidget)
@@ -141 +141 @@
 }
 
-void UIVMLogViewerPanelNew::setShowLineNumbers(bool bShowLineNumbers)
+void UIVMLogViewerPaneContainer::setShowLineNumbers(bool bShowLineNumbers)
 {
     if (m_pPreferencesWidget)
@@ -147 +147 @@
 }
 
-void UIVMLogViewerPanelNew::setWrapLines(bool bWrapLines)
+void UIVMLogViewerPaneContainer::setWrapLines(bool bWrapLines)
 {
     if (m_pPreferencesWidget)
@@ -153 +153 @@
 }
 
-void UIVMLogViewerPanelNew::setFontSizeInPoints(int fontSizeInPoints)
+void UIVMLogViewerPaneContainer::setFontSizeInPoints(int fontSizeInPoints)
 {
     if (m_pPreferencesWidget)
@@ -159 +159 @@
 }
 
-void UIVMLogViewerPanelNew::retranslateUi()
+void UIVMLogViewerPaneContainer::retranslateUi()
 {
     setTabText(Page_Search, "Find");
@@ -167 +167 @@
 }
 
-bool UIVMLogViewerPanelNew::eventFilter(QObject *pObject, QEvent *pEvent)
+bool UIVMLogViewerPaneContainer::eventFilter(QObject *pObject, QEvent *pEvent)
 {
     if (currentIndex() == static_cast<Page>(Page_Search))
@@ -182 +182 @@
 *********************************************************************************************************************************/
 
-UIVMLogViewerPanel::UIVMLogViewerPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
+UIVMLogViewerPane::UIVMLogViewerPane(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pViewer(pViewer)
@@ -188 +188 @@
 }
 
-void UIVMLogViewerPanel::retranslateUi()
-{
-}
-
-UIVMLogViewerWidget* UIVMLogViewerPanel::viewer()
+void UIVMLogViewerPane::retranslateUi()
+{
+}
+
+UIVMLogViewerWidget* UIVMLogViewerPane::viewer()
 {
     return m_pViewer;
 }
 
-const UIVMLogViewerWidget* UIVMLogViewerPanel::viewer() const
+const UIVMLogViewerWidget* UIVMLogViewerPane::viewer() const
 {
     return m_pViewer;
 }
 
-QTextDocument  *UIVMLogViewerPanel::textDocument()
+QTextDocument  *UIVMLogViewerPane::textDocument()
 {
     QPlainTextEdit *pEdit = textEdit();
@@ -210 +210 @@
 }
 
-QPlainTextEdit *UIVMLogViewerPanel::textEdit()
+QPlainTextEdit *UIVMLogViewerPane::textEdit()
 {
     if (!viewer())
@@ -220 +220 @@
 }
 
-const QString* UIVMLogViewerPanel::logString() const
+const QString* UIVMLogViewerPane::logString() const
 {
     if (!viewer())

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

@@ -45 +45 @@
 class UIVMLogViewerPreferencesWidget;
 
-class UIVMLogViewerPanelNew : public UIPaneContainer
+class UIVMLogViewerPaneContainer : public UIPaneContainer
 {
     Q_OBJECT;
@@ -66 +66 @@
 public:
 
-    UIVMLogViewerPanelNew(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    UIVMLogViewerPaneContainer(QWidget *pParent, UIVMLogViewerWidget *pViewer);
 
     /** @name Search page pass through functions
@@ -120 +120 @@
 
 /** UIDialonPanel extension acting as the base class for UIVMLogViewerXXXPanel widgets. */
-class UIVMLogViewerPanel : public QIWithRetranslateUI<QWidget>
+class UIVMLogViewerPane : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -126 +126 @@
 public:
 
-    UIVMLogViewerPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    UIVMLogViewerPane(QWidget *pParent, UIVMLogViewerWidget *pViewer);
 
 protected:

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

@@ -420 +420 @@
 
     if (m_pPanel && m_pPanel->isVisible() &&
-        m_pPanel->currentIndex() == static_cast<UIVMLogViewerPanelNew::Page>(UIVMLogViewerPanelNew::Page_Search))
+        m_pPanel->currentIndex() == static_cast<UIVMLogViewerPaneContainer::Page>(UIVMLogViewerPaneContainer::Page_Search))
         m_pPanel->refreshSearch();
 
@@ -743 +743 @@
     m_panelActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Preferences));
 
-    m_pActionPool->action(UIActionIndex_M_Log_T_Find)->setData((int)UIVMLogViewerPanelNew::Page_Search);
-    m_pActionPool->action(UIActionIndex_M_Log_T_Filter)->setData((int)UIVMLogViewerPanelNew::Page_Filter);
-    m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark)->setData((int)UIVMLogViewerPanelNew::Page_Bookmark);
-    m_pActionPool->action(UIActionIndex_M_Log_T_Preferences)->setData((int)UIVMLogViewerPanelNew::Page_Preferences);
+    m_pActionPool->action(UIActionIndex_M_Log_T_Find)->setData((int)UIVMLogViewerPaneContainer::Page_Search);
+    m_pActionPool->action(UIActionIndex_M_Log_T_Filter)->setData((int)UIVMLogViewerPaneContainer::Page_Filter);
+    m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark)->setData((int)UIVMLogViewerPaneContainer::Page_Bookmark);
+    m_pActionPool->action(UIActionIndex_M_Log_T_Preferences)->setData((int)UIVMLogViewerPaneContainer::Page_Preferences);
 
     /* Connect actions: */
@@ -791 +791 @@
     connect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltCurrentTabChanged);
 
-    m_pPanel = new UIVMLogViewerPanelNew(0, this);
+    m_pPanel = new UIVMLogViewerPaneContainer(0, this);
     AssertReturnVoid(m_pPanel);
     installEventFilter(m_pPanel);
@@ -799 +799 @@
     m_pPanel->setFontSizeInPoints(m_font.pointSize());
     m_pPanel->setVisible(false);
-    connect(m_pPanel, &UIVMLogViewerPanelNew::sigHighlightingUpdated,
+    connect(m_pPanel, &UIVMLogViewerPaneContainer::sigHighlightingUpdated,
             this, &UIVMLogViewerWidget::sltSearchResultHighLigting);
-    connect(m_pPanel, &UIVMLogViewerPanelNew::sigSearchUpdated,
+    connect(m_pPanel, &UIVMLogViewerPaneContainer::sigSearchUpdated,
             this, &UIVMLogViewerWidget::sltHandleSearchUpdated);
-    connect(m_pPanel, &UIVMLogViewerPanelNew::sigFilterApplied,
+    connect(m_pPanel, &UIVMLogViewerPaneContainer::sigFilterApplied,
             this, &UIVMLogViewerWidget::sltFilterApplied);
-    connect(m_pPanel, &UIVMLogViewerPanelNew::sigDeleteBookmarkByIndex,
+    connect(m_pPanel, &UIVMLogViewerPaneContainer::sigDeleteBookmarkByIndex,
             this, &UIVMLogViewerWidget::sltDeleteBookmarkByIndex);
-    connect(m_pPanel, &UIVMLogViewerPanelNew::sigDeleteAllBookmarks,
+    connect(m_pPanel, &UIVMLogViewerPaneContainer::sigDeleteAllBookmarks,
             this, &UIVMLogViewerWidget::sltDeleteAllBookmarks);
-    connect(m_pPanel, &UIVMLogViewerPanelNew::sigBookmarkSelected,
+    connect(m_pPanel, &UIVMLogViewerPaneContainer::sigBookmarkSelected,
             this, &UIVMLogViewerWidget::gotoBookmark);
-    connect(m_pPanel, &UIVMLogViewerPanelNew::sigHidden,
+    connect(m_pPanel, &UIVMLogViewerPaneContainer::sigHidden,
             this, &UIVMLogViewerWidget::sltPanelContainerHidden);
 

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

@@ -56 +56 @@
 class UIVMLogTab;
 class UIVMLogViewerBookmarksPanel;
-class UIVMLogViewerPanelNew;
+class UIVMLogViewerPaneContainer;
 class UIVMLogViewerFilterPanel;
 class UIVMLogViewerPanel;
@@ -251 +251 @@
     bool m_fCommitDataSignalReceived;
     QPointer<UIVMLogPage> m_pPreviousLogPage;
-    UIVMLogViewerPanelNew *m_pPanel;
+    UIVMLogViewerPaneContainer *m_pPanel;
     QSet<QAction*> m_panelActions;
     friend class UIVMLogViewerFilterWidget;