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

Timestamp:

Jan 4, 2021 11:12:01 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Renaming UIHelpBrowserViewer

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/helpbrowser/UIHelpBrowserWidget.cpp (modified) (4 diffs)
• src/helpbrowser/UIHelpViewer.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserViewer.cpp ) (25 diffs)
• src/helpbrowser/UIHelpViewer.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserViewer.h ) (4 diffs)

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

@@ -813 +813 @@
         src/globals/VBoxUtils.h \
         src/helpbrowser/UIHelpBrowserDialog.h \
-        src/helpbrowser/UIHelpBrowserViewer.h \
+        src/helpbrowser/UIHelpViewer.h \
         src/helpbrowser/UIHelpBrowserWidget.h \
         src/logviewer/UIVMLogPage.h \
@@ -994 +994 @@
         src/globals/UIVirtualBoxEventHandler.cpp \
         src/globals/UIVirtualBoxClientEventHandler.cpp \
-        src/helpbrowser/UIHelpBrowserViewer.cpp \
+        src/helpbrowser/UIHelpViewer.cpp \
         src/helpbrowser/UIHelpBrowserWidget.cpp \
         src/logviewer/UIVMLogViewerFilterPanel.cpp \
@@ -1337 +1337 @@
         src/globals/UIVirtualBoxClientEventHandler.cpp \
         src/helpbrowser/UIHelpBrowserDialog.cpp \
-        src/helpbrowser/UIHelpBrowserViewer.cpp \
+        src/helpbrowser/UIHelpViewer.cpp \
         src/helpbrowser/UIHelpBrowserWidget.cpp \
         src/logviewer/UIVMLogPage.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -58 +58 @@
 #include "UIActionPool.h"
 #include "UIExtraDataManager.h"
-#include "UIHelpBrowserViewer.h"
+#include "UIHelpViewer.h"
 #include "UIHelpBrowserWidget.h"
 #include "UIIconPool.h"
@@ -250 +250 @@
     QIToolBar   *m_pToolBar;
     QComboBox   *m_pAddressBar;
-    UIHelpBrowserViewer *m_pContentViewer;
+    UIHelpViewer *m_pContentViewer;
     const QHelpEngine* m_pHelpEngine;
     QUrl m_homeUrl;
@@ -657 +657 @@
 void UIHelpBrowserTab::prepareWidgets(const QUrl &initialUrl)
 {
-    m_pContentViewer = new UIHelpBrowserViewer(m_pHelpEngine);
+    m_pContentViewer = new UIHelpViewer(m_pHelpEngine);
     AssertReturnVoid(m_pContentViewer);
     m_pMainLayout->setContentsMargins(0, 0, 0, 0);
@@ -664 +664 @@
     m_pMainLayout->addWidget(m_pContentViewer);
     m_pContentViewer->setOpenExternalLinks(false);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::sourceChanged,
+    connect(m_pContentViewer, &UIHelpViewer::sourceChanged,
         this, &UIHelpBrowserTab::sigSourceChanged);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::historyChanged,
+    connect(m_pContentViewer, &UIHelpViewer::historyChanged,
         this, &UIHelpBrowserTab::sltHandleHistoryChanged);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::anchorClicked,
+    connect(m_pContentViewer, &UIHelpViewer::anchorClicked,
         this, &UIHelpBrowserTab::sltAnchorClicked);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::sigOpenLinkInNewTab,
+    connect(m_pContentViewer, &UIHelpViewer::sigOpenLinkInNewTab,
         this, &UIHelpBrowserTab::sigOpenLinkInNewTab);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::sigCloseFindInPageWidget,
+    connect(m_pContentViewer, &UIHelpViewer::sigCloseFindInPageWidget,
             this, &UIHelpBrowserTab::sltCloseFindInPageWidget);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::sigFontPointSizeChanged,
+    connect(m_pContentViewer, &UIHelpViewer::sigFontPointSizeChanged,
             this, &UIHelpBrowserTab::sigFontPointSizeChanged);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::sigGoBackward,
+    connect(m_pContentViewer, &UIHelpViewer::sigGoBackward,
             this, &UIHelpBrowserTab::sltHandleBackwardAction);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::sigGoForward,
+    connect(m_pContentViewer, &UIHelpViewer::sigGoForward,
             this, &UIHelpBrowserTab::sltHandleForwardAction);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::sigGoHome,
+    connect(m_pContentViewer, &UIHelpViewer::sigGoHome,
             this, &UIHelpBrowserTab::sltHandleHomeAction);
-    connect(m_pContentViewer, &UIHelpBrowserViewer::sigAddBookmark,
+    connect(m_pContentViewer, &UIHelpViewer::sigAddBookmark,
             this, &UIHelpBrowserTab::sltHandleAddBookmarkAction);
-    connect(m_pContentViewer, static_cast<void(UIHelpBrowserViewer::*)(const QString&)>(&UIHelpBrowserViewer::highlighted),
+    connect(m_pContentViewer, static_cast<void(UIHelpViewer::*)(const QString&)>(&UIHelpViewer::highlighted),
             this, &UIHelpBrowserTab::sigLinkHighlighted);
 

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

@@ -58 +58 @@
 #include "UIActionPool.h"
 #include "UIExtraDataManager.h"
-#include "UIHelpBrowserViewer.h"
+#include "UIHelpViewer.h"
 #include "UIHelpBrowserWidget.h"
 #include "UIIconPool.h"
@@ -324 +324 @@
 
 /*********************************************************************************************************************************
-*   UIHelpBrowserViewer implementation.                                                                                          *
+*   UIHelpViewer implementation.                                                                                          *
 *********************************************************************************************************************************/
 
-UIHelpBrowserViewer::UIHelpBrowserViewer(const QHelpEngine *pHelpEngine, QWidget *pParent /* = 0 */)
+UIHelpViewer::UIHelpViewer(const QHelpEngine *pHelpEngine, QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QTextBrowser>(pParent)
     , m_pHelpEngine(pHelpEngine)
@@ -339 +339 @@
     setUndoRedoEnabled(true);
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigDragging,
-            this, &UIHelpBrowserViewer::sltHandleFindWidgetDrag);
+            this, &UIHelpViewer::sltHandleFindWidgetDrag);
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSearchTextChanged,
-            this, &UIHelpBrowserViewer::sltHandleFindInPageSearchTextChange);
+            this, &UIHelpViewer::sltHandleFindInPageSearchTextChange);
 
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSelectPreviousMatch,
-            this, &UIHelpBrowserViewer::sltSelectPreviousMatch);
+            this, &UIHelpViewer::sltSelectPreviousMatch);
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSelectNextMatch,
-            this, &UIHelpBrowserViewer::sltSelectNextMatch);
+            this, &UIHelpViewer::sltSelectNextMatch);
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigClose,
-            this, &UIHelpBrowserViewer::sigCloseFindInPageWidget);
+            this, &UIHelpViewer::sigCloseFindInPageWidget);
 
     m_pFindInPageWidget->setVisible(false);
@@ -354 +354 @@
 }
 
-QVariant UIHelpBrowserViewer::loadResource(int type, const QUrl &name)
+QVariant UIHelpViewer::loadResource(int type, const QUrl &name)
 {
     if (name.scheme() == "qthelp" && m_pHelpEngine)
@@ -362 +362 @@
 }
 
-void UIHelpBrowserViewer::emitHistoryChangedSignal()
+void UIHelpViewer::emitHistoryChangedSignal()
 {
     emit historyChanged();
@@ -368 +368 @@
 }
 
-void UIHelpBrowserViewer::setSource(const QUrl &url)
+void UIHelpViewer::setSource(const QUrl &url)
 {
     QTextBrowser::setSource(url);
@@ -383 +383 @@
 }
 
-void UIHelpBrowserViewer::toggleFindInPageWidget(bool fVisible)
+void UIHelpViewer::toggleFindInPageWidget(bool fVisible)
 {
     if (!m_pFindInPageWidget)
@@ -403 +403 @@
 }
 
-int UIHelpBrowserViewer::initialFontPointSize() const
+int UIHelpViewer::initialFontPointSize() const
 {
     return m_iInitialFontPointSize;
 }
 
-void UIHelpBrowserViewer::setFont(const QFont &font)
+void UIHelpViewer::setFont(const QFont &font)
 {
     QIWithRetranslateUI<QTextBrowser>::setFont(font);
@@ -420 +420 @@
 }
 
-void UIHelpBrowserViewer::contextMenuEvent(QContextMenuEvent *event)
+void UIHelpViewer::contextMenuEvent(QContextMenuEvent *event)
 {
     QMenu pMenu;
@@ -429 +429 @@
 
     connect(pNavigationActions, &UIContextMenuNavigationAction::sigGoBackward,
-            this, &UIHelpBrowserViewer::sigGoBackward);
+            this, &UIHelpViewer::sigGoBackward);
     connect(pNavigationActions, &UIContextMenuNavigationAction::sigGoForward,
-            this, &UIHelpBrowserViewer::sigGoForward);
+            this, &UIHelpViewer::sigGoForward);
     connect(pNavigationActions, &UIContextMenuNavigationAction::sigGoHome,
-            this, &UIHelpBrowserViewer::sigGoHome);
+            this, &UIHelpViewer::sigGoHome);
     connect(pNavigationActions, &UIContextMenuNavigationAction::sigAddBookmark,
-            this, &UIHelpBrowserViewer::sigAddBookmark);
+            this, &UIHelpViewer::sigAddBookmark);
 
     QAction *pOpenLinkAction = new QAction(UIHelpBrowserWidget::tr("Open Link"));
     connect(pOpenLinkAction, &QAction::triggered,
-            this, &UIHelpBrowserViewer::sltHandleOpenLink);
+            this, &UIHelpViewer::sltHandleOpenLink);
 
     QAction *pOpenInNewTabAction = new QAction(UIHelpBrowserWidget::tr("Open Link in New Tab"));
     connect(pOpenInNewTabAction, &QAction::triggered,
-            this, &UIHelpBrowserViewer::sltHandleOpenLinkInNewTab);
+            this, &UIHelpViewer::sltHandleOpenLinkInNewTab);
 
     QAction *pCopyLink = new QAction(UIHelpBrowserWidget::tr("Copy Link"));
     connect(pCopyLink, &QAction::triggered,
-            this, &UIHelpBrowserViewer::sltHandleCopyLink);
+            this, &UIHelpViewer::sltHandleCopyLink);
 
     pMenu.addAction(pNavigationActions);
@@ -471 +471 @@
 }
 
-void UIHelpBrowserViewer::resizeEvent(QResizeEvent *pEvent)
+void UIHelpViewer::resizeEvent(QResizeEvent *pEvent)
 {
     /* Make sure the widget stays inside the parent during parent resize: */
@@ -482 +482 @@
 }
 
-void UIHelpBrowserViewer::wheelEvent(QWheelEvent *pEvent)
+void UIHelpViewer::wheelEvent(QWheelEvent *pEvent)
 {
     int iPreviousSize = font().pointSize();
@@ -498 +498 @@
 }
 
-void UIHelpBrowserViewer::retranslateUi()
-{
-}
-
-void UIHelpBrowserViewer::moveFindWidgetIn(int iMargin)
+void UIHelpViewer::retranslateUi()
+{
+}
+
+void UIHelpViewer::moveFindWidgetIn(int iMargin)
 {
     if (!m_pFindInPageWidget)
@@ -521 +521 @@
 }
 
-bool UIHelpBrowserViewer::isRectInside(const QRect &rect, int iMargin) const
+bool UIHelpViewer::isRectInside(const QRect &rect, int iMargin) const
 {
     if (rect.left() < iMargin || rect.top() < iMargin)
@@ -530 +530 @@
 }
 
-void UIHelpBrowserViewer::findAllMatches(const QString &searchString)
+void UIHelpViewer::findAllMatches(const QString &searchString)
 {
     QTextDocument *pDocument = document();
@@ -552 +552 @@
 }
 
-void UIHelpBrowserViewer::highlightFinds(int iSearchTermLength)
+void UIHelpViewer::highlightFinds(int iSearchTermLength)
 {
     QTextDocument* pDocument = document();
@@ -576 +576 @@
 }
 
-void UIHelpBrowserViewer::selectMatch(int iMatchIndex, int iSearchStringLength)
+void UIHelpViewer::selectMatch(int iMatchIndex, int iSearchStringLength)
 {
     QTextCursor cursor = textCursor();
@@ -587 +587 @@
 }
 
-void UIHelpBrowserViewer::sltHandleOpenLinkInNewTab()
+void UIHelpViewer::sltHandleOpenLinkInNewTab()
 {
     QAction *pSender = qobject_cast<QAction*>(sender());
@@ -597 +597 @@
 }
 
-void UIHelpBrowserViewer::sltHandleOpenLink()
+void UIHelpViewer::sltHandleOpenLink()
 {
     QAction *pSender = qobject_cast<QAction*>(sender());
@@ -607 +607 @@
 }
 
-void UIHelpBrowserViewer::sltHandleCopyLink()
+void UIHelpViewer::sltHandleCopyLink()
 {
     QAction *pSender = qobject_cast<QAction*>(sender());
@@ -621 +621 @@
 }
 
-void UIHelpBrowserViewer::sltHandleFindWidgetDrag(const QPoint &delta)
+void UIHelpViewer::sltHandleFindWidgetDrag(const QPoint &delta)
 {
     if (!m_pFindInPageWidget)
@@ -635 +635 @@
 }
 
-void UIHelpBrowserViewer::sltHandleFindInPageSearchTextChange(const QString &strSearchText)
+void UIHelpViewer::sltHandleFindInPageSearchTextChange(const QString &strSearchText)
 {
     m_iSearchTermLength = strSearchText.length();
@@ -646 +646 @@
 }
 
-void UIHelpBrowserViewer::sltSelectPreviousMatch()
+void UIHelpViewer::sltSelectPreviousMatch()
 {
     m_iSelectedMatchIndex = m_iSelectedMatchIndex <= 0 ? m_matchedCursorPosition.size() - 1 : (m_iSelectedMatchIndex - 1);
@@ -654 +654 @@
 }
 
-void UIHelpBrowserViewer::sltSelectNextMatch()
+void UIHelpViewer::sltSelectNextMatch()
 {
     m_iSelectedMatchIndex = m_iSelectedMatchIndex >= m_matchedCursorPosition.size() - 1 ? 0 : (m_iSelectedMatchIndex + 1);
@@ -662 +662 @@
 }
 
-#include "UIHelpBrowserViewer.moc"
+#include "UIHelpViewer.moc"
 
 #endif /*#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))*/

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.h

@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_helpbrowser_UIHelpBrowserViewer_h
-#define FEQT_INCLUDED_SRC_helpbrowser_UIHelpBrowserViewer_h
+#ifndef FEQT_INCLUDED_SRC_helpbrowser_UIHelpViewer_h
+#define FEQT_INCLUDED_SRC_helpbrowser_UIHelpViewer_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -60 +60 @@
 
 #if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-class UIHelpBrowserViewer : public QIWithRetranslateUI<QTextBrowser>
+class UIHelpViewer : public QIWithRetranslateUI<QTextBrowser>
 {
     Q_OBJECT;
@@ -76 +76 @@
 public:
 
-    UIHelpBrowserViewer(const QHelpEngine *pHelpEngine, QWidget *pParent = 0);
+    UIHelpViewer(const QHelpEngine *pHelpEngine, QWidget *pParent = 0);
     virtual QVariant loadResource(int type, const QUrl &name) /* override */;
     void emitHistoryChangedSignal();
@@ -124 +124 @@
 
 #endif /* #if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) */
-#endif /* !FEQT_INCLUDED_SRC_helpbrowser_UIHelpBrowserViewer_h */
+#endif /* !FEQT_INCLUDED_SRC_helpbrowser_UIHelpViewer_h */