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

Timestamp:

Nov 24, 2020 10:06:52 AM (4 years ago)

Author:

vboxsync

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

141493

Message:

FE/Qt: bugref:9831. Adding close action to menu.

Location:

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

Files:

• UIHelpBrowserDialog.cpp (modified) (1 diff)
• UIHelpBrowserWidget.cpp (modified) (4 diffs)
• UIHelpBrowserWidget.h (modified) (2 diffs)

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

@@ -83 +83 @@
     setCentralWidget((m_pWidget));
 
+    connect(m_pWidget, &UIHelpBrowserWidget::sigCloseDialog,
+            this, &UIHelpBrowserDialog::close);
+
     const QList<QMenu*> menuList = m_pWidget->menus();
     foreach (QMenu *pMenu, menuList)

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

@@ -1794 +1794 @@
     , m_pBookmarksWidget(0)
     , m_pSearchContainerWidget(0)
-    , m_pPrintDialogAction(0)
+    , m_pPrintAction(0)
     , m_pShowHideSideBarAction(0)
     , m_pShowHideToolBarAction(0)
@@ -1875 +1875 @@
             this, &UIHelpBrowserWidget::sltHandleWidgetVisibilityToggle);
 
-    m_pPrintDialogAction = new QAction(this);
-    connect(m_pPrintDialogAction, &QAction::triggered,
+    m_pPrintAction = new QAction(this);
+    connect(m_pPrintAction, &QAction::triggered,
             this, &UIHelpBrowserWidget::sltShowPrintDialog);
+
+    m_pCloseDialogAction = new QAction(this);
+    connect(m_pCloseDialogAction, &QAction::triggered,
+            this, &UIHelpBrowserWidget::sigCloseDialog);
 
     m_pFontSizeLargerAction = new QAction(this);
@@ -2028 +2032 @@
     AssertReturnVoid(m_pFileMenu && m_pViewMenu && m_pTabsMenu);
 
-    if (m_pPrintDialogAction)
-        m_pFileMenu->addAction(m_pPrintDialogAction);
+    if (m_pPrintAction)
+        m_pFileMenu->addAction(m_pPrintAction);
+    if (m_pCloseDialogAction)
+        m_pFileMenu->addAction(m_pCloseDialogAction);
 
     if (m_pFontSizeLargerAction)
@@ -2161 +2167 @@
     if (m_pShowHideFontScaleWidget)
         m_pShowHideFontScaleWidget->setText(tr("Show Font Scale Widget"));
-    if (m_pPrintDialogAction)
-        m_pPrintDialogAction->setText(tr("Print..."));
+
+    if (m_pPrintAction)
+        m_pPrintAction->setText(tr("Print..."));
+    if (m_pCloseDialogAction)
+        m_pCloseDialogAction->setText(tr("Close"));
 
     if (m_pFontSizeLargerAction)

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

@@ -64 +64 @@
 signals:
 
-    void sigSetCloseButtonShortCut(QKeySequence);
+    void sigCloseDialog();
 
 public:
@@ -170 +170 @@
     UIBookmarksListContainer *m_pBookmarksWidget;
     QWidget             *m_pSearchContainerWidget;
-    QAction             *m_pPrintDialogAction;
+    QAction             *m_pPrintAction;
+    QAction             *m_pCloseDialogAction;
     QAction             *m_pShowHideSideBarAction;
     QAction             *m_pShowHideToolBarAction;