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

Timestamp:

Nov 10, 2020 8:48:40 AM (4 years ago)

Author:

vboxsync

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

141293

Message:

FE/Qt: bugref:9831. Adding print menu

Location:

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

Files:

• UIHelpBrowserDialog.cpp (modified) (1 diff)
• UIHelpBrowserWidget.cpp (modified) (11 diffs)
• UIHelpBrowserWidget.h (modified) (3 diffs)

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

@@ -87 +87 @@
         /* Configure widget: */
         setWidget(pWidget);
-        setWidgetMenu(pWidget->menu());
+        setWidgetMenus(pWidget->menus());
 #ifdef VBOX_WS_MAC
         setWidgetToolbar(pWidget->toolbar());

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

@@ -35 +35 @@
 #include <QMouseEvent>
 #include <QPixmap>
+#include <QtPrintSupport/QPrintDialog>
+#include <QtPrintSupport/QPrinter>
 #include <QPushButton>
 #include <QScrollBar>
@@ -252 +254 @@
     QString documentTitle() const;
     void setToolBarVisible(bool fVisible);
+    void printCurrent(QPrinter &printer);
 
 private slots:
@@ -314 +317 @@
     QStringList tabUrlList();
     void setToolBarVisible(bool fVisible);
+    void printCurrent(QPrinter &printer);
 
 private slots:
@@ -583 +587 @@
 }
 
+void UIHelpBrowserTab::printCurrent(QPrinter &printer)
+{
+    if (m_pContentViewer)
+    {
+        m_pContentViewer->print(&printer);
+    }
+}
+
 void UIHelpBrowserTab::prepare(const QUrl &initialUrl)
 {
@@ -1100 +1112 @@
         pTab->setToolBarVisible(fVisible);
     }
+}
+
+void UIHelpBrowserTabManager::printCurrent(QPrinter &printer)
+{
+    UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(currentWidget());
+    if (!pTab)
+        return;
+    return pTab->printCurrent(printer);
 }
 
@@ -1188 +1208 @@
     , m_pBookmarksWidget(0)
     , m_pSearchContainerWidget(0)
+    , m_pPrintDialogAction(0)
     , m_pShowHideSideBarAction(0)
     , m_pShowHideToolBarAction(0)
@@ -1203 +1224 @@
 }
 
-QMenu *UIHelpBrowserWidget::menu() const
-{
-    return m_pViewMenu;
+QList<QMenu*> UIHelpBrowserWidget::menus() const
+{
+    QList<QMenu*> menuList;
+    menuList
+        << m_pFileMenu
+        << m_pViewMenu;
+    return menuList;
 }
 
@@ -1233 +1258 @@
     m_pShowHideSideBarAction->setCheckable(true);
     m_pShowHideSideBarAction->setChecked(true);
-    connect(m_pShowHideSideBarAction, &QAction::toggled, this, &UIHelpBrowserWidget::sltHandleSideBarVisibility);
+    connect(m_pShowHideSideBarAction, &QAction::toggled,
+            this, &UIHelpBrowserWidget::sltHandleSideBarVisibility);
 
     m_pShowHideToolBarAction = new QAction(this);
     m_pShowHideToolBarAction->setCheckable(true);
     m_pShowHideToolBarAction->setChecked(true);
-    connect(m_pShowHideToolBarAction, &QAction::toggled, this, &UIHelpBrowserWidget::sltHandleToolBarVisibility);
-
-
+    connect(m_pShowHideToolBarAction, &QAction::toggled,
+            this, &UIHelpBrowserWidget::sltHandleToolBarVisibility);
+
+    m_pPrintDialogAction = new QAction(this);
+    connect(m_pPrintDialogAction, &QAction::triggered,
+            this, &UIHelpBrowserWidget::sltShowPrintDialog);
 }
 
@@ -1379 +1408 @@
     m_pViewMenu = new QMenu(tr("View"), this);
     AssertReturnVoid(m_pViewMenu);
-
-    m_pFileMenu->addAction("asd");
-    m_pViewMenu->addAction(m_pShowHideSideBarAction);
-    m_pViewMenu->addAction(m_pShowHideToolBarAction);
-
+    if (m_pPrintDialogAction)
+        m_pFileMenu->addAction(m_pPrintDialogAction);
+
+    if (m_pShowHideSideBarAction)
+        m_pViewMenu->addAction(m_pShowHideSideBarAction);
+    if (m_pShowHideToolBarAction)
+        m_pViewMenu->addAction(m_pShowHideToolBarAction);
 }
 
@@ -1490 +1521 @@
     if (m_pShowHideToolBarAction)
         m_pShowHideToolBarAction->setText(tr("Show/Hide Tool Bar"));
+    if (m_pPrintDialogAction)
+        m_pPrintDialogAction->setText(tr("Print..."));
 }
 
@@ -1524 +1557 @@
     if (m_pTabManager)
         m_pTabManager->setToolBarVisible(fToggled);
+}
+
+void UIHelpBrowserWidget::sltShowPrintDialog()
+{
+    if (!m_pTabManager)
+        return;
+    QPrinter printer;
+    QPrintDialog printDialog(&printer, this);
+    if (printDialog.exec() == QDialog::Accepted)
+    {
+        m_pTabManager->printCurrent(printer);
+        //   PrintWidget(this);
+    }
 }
 

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

@@ -71 +71 @@
     ~UIHelpBrowserWidget();
 
-    QMenu *menu() const;
+    QList<QMenu*> menus() const;
 
 #ifdef VBOX_WS_MAC
@@ -89 +89 @@
     void sltHandleSideBarVisibility(bool togggled);
     void sltHandleToolBarVisibility(bool togggled);
+    void sltShowPrintDialog();
     void sltHandleContentsCreated();
     void sltHandleIndexingStarted();
@@ -163 +164 @@
     UIBookmarksListContainer *m_pBookmarksWidget;
     QWidget             *m_pSearchContainerWidget;
+    QAction             *m_pPrintDialogAction;
     QAction             *m_pShowHideSideBarAction;
     QAction             *m_pShowHideToolBarAction;