Add index and filter combo box to external help window

Change-Id: Icc815379220c55d9d7dc5d154278ba21ce2e9984
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index 6f5029a927f..bd4fc153cac 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -57,6 +57,7 @@ using namespace Help::Internal;
 IndexWindow::IndexWindow()
     : m_searchLineEdit(0)
     , m_indexWidget(0)
+    , m_isOpenInNewPageActionVisible(true)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
 
@@ -110,6 +111,11 @@ IndexWindow::~IndexWindow()
 {
 }
 
+void IndexWindow::setOpenInNewPageActionVisible(bool visible)
+{
+    m_isOpenInNewPageActionVisible = visible;
+}
+
 void IndexWindow::filterIndices(const QString &filter)
 {
     QModelIndex bestMatch;
@@ -154,13 +160,15 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e)
         if (idx.isValid()) {
             QMenu menu;
             QAction *curTab = menu.addAction(tr("Open Link"));
-            QAction *newTab = menu.addAction(tr("Open Link as New Page"));
+            QAction *newTab = 0;
+            if (m_isOpenInNewPageActionVisible)
+                newTab = menu.addAction(tr("Open Link as New Page"));
             menu.move(m_indexWidget->mapToGlobal(ctxtEvent->pos()));
 
             QAction *action = menu.exec();
             if (curTab == action)
                 open(idx);
-            else if (newTab == action)
+            else if (newTab && newTab == action)
                 open(idx, true/*newPage*/);
         }
     } else if (m_indexWidget && obj == m_indexWidget->viewport()