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

Timestamp:

Oct 19, 2020 8:20:16 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding the dialo menu

Location:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser

Files:

• UIHelpBrowserWidget.cpp (modified) (10 diffs)
• UIHelpBrowserWidget.h (modified) (2 diffs)

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

@@ -109 +109 @@
     , m_pHelpEngine(0)
 #endif
-    , m_pTextBrowser(0)
+    , m_pContentViewer(0)
     , m_pSplitter(0)
-{
-    /* Prepare VM Log-Viewer: */
+    , m_pMenu(0)
+{
     prepare();
 }
@@ -124 +124 @@
 QMenu *UIHelpBrowserWidget::menu() const
 {
-    return 0;//m_pActionPool->action(UIActionIndex_M_LogWindow)->menu();
+    return m_pMenu;
 }
 
@@ -139 +139 @@
     prepareActions();
     prepareWidgets();
-
-
+    prepareMenuAndMenuActions();
     retranslateUi();
 }
@@ -168 +167 @@
     m_pTabWidget->addTab(m_pHelpEngine->indexWidget(), tr("Index"));
 
-    m_pTextBrowser = new UIHelpBrowserViewer(m_pHelpEngine);
-    AssertReturnVoid(m_pTextBrowser);
-    m_pSplitter->addWidget(m_pTextBrowser);
+    m_pContentViewer = new UIHelpBrowserViewer(m_pHelpEngine);
+    AssertReturnVoid(m_pContentViewer);
+    m_pSplitter->addWidget(m_pContentViewer);
 
     m_pSplitter->setStretchFactor(0, 1);
@@ -180 +179 @@
 
     connect(m_pHelpEngine->contentWidget(), &QHelpContentWidget::linkActivated,
-            m_pTextBrowser, &UIHelpBrowserViewer::setSource);
+            m_pContentViewer, &UIHelpBrowserViewer::setSource);
     connect(m_pHelpEngine->contentWidget(), &QHelpContentWidget::clicked,
             this, &UIHelpBrowserWidget::sltHandleContentWidgetItemClicked);
@@ -186 +185 @@
 
     connect(m_pHelpEngine->indexWidget(), &QHelpIndexWidget::linkActivated,
-            m_pTextBrowser, &UIHelpBrowserViewer::setSource);
+            m_pContentViewer, &UIHelpBrowserViewer::setSource);
 
     if (QFile(m_strHelpFilePath).exists() && m_pHelpEngine)
@@ -219 +218 @@
 }
 
+void UIHelpBrowserWidget::prepareMenuAndMenuActions()
+{
+    m_pMenu = new QMenu(tr("View"), this);
+    AssertReturnVoid(m_pMenu);
+    m_pMenu->addAction(tr("View"));
+}
+
 void UIHelpBrowserWidget::loadOptions()
 {
@@ -272 +278 @@
 {
 #ifdef RT_OS_LINUX
-    AssertReturnVoid(m_pTextBrowser && m_pHelpEngine);
+    AssertReturnVoid(m_pContentViewer && m_pHelpEngine);
     QList<QUrl> files = m_pHelpEngine->files(m_pHelpEngine->namespaceName(m_strHelpFilePath), QStringList());
     if (!files.empty())
-        m_pTextBrowser->setSource(files[0]);
+        m_pContentViewer->setSource(files[0]);
     /** @todo show some kind of error maybe. */
 #endif
@@ -283 +289 @@
 {
 #ifdef RT_OS_LINUX
-    AssertReturnVoid(m_pTextBrowser && m_pHelpEngine && m_pHelpEngine->contentWidget());
+    AssertReturnVoid(m_pContentViewer && m_pHelpEngine && m_pHelpEngine->contentWidget());
     QHelpContentModel *pContentModel =
         qobject_cast<QHelpContentModel*>(m_pHelpEngine->contentWidget()->model());
@@ -292 +298 @@
         return;
     const QUrl &url = pItem->url();
-    m_pTextBrowser->setSource(url);
+    m_pContentViewer->setSource(url);
+#else
+    Q_UNUSED(index);
 #endif
 }

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

@@ -93 +93 @@
     void prepareWidgets();
     void prepareToolBar();
+    void prepareMenuAndMenuActions();
     void loadOptions();
 
@@ -131 +132 @@
     QHelpEngine  *m_pHelpEngine;
 #endif
-    UIHelpBrowserViewer *m_pTextBrowser;
+    UIHelpBrowserViewer *m_pContentViewer;
     QSplitter           *m_pSplitter;
+    QMenu               *m_pMenu;
 };