- Timestamp:
- Oct 29, 2020 12:16:42 PM (4 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser
- Files:
-
- 2 edited
-
UIHelpBrowserWidget.cpp (modified) (11 diffs)
-
UIHelpBrowserWidget.h (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp
r86747 r86757 26 26 #include <QtHelp/QHelpContentWidget> 27 27 #include <QtHelp/QHelpIndexWidget> 28 #include <QtHelp/QHelpSearchEngine> 29 #include <QtHelp/QHelpSearchQueryWidget> 30 #include <QtHelp/QHelpSearchResultWidget> 28 31 #endif 29 32 #include <QMenu> … … 57 60 HelpBrowserTabs_TOC = 0, 58 61 HelpBrowserTabs_Index, 62 HelpBrowserTabs_Search, 59 63 HelpBrowserTabs_Bookmarks, 60 64 HelpBrowserTabs_Max … … 149 153 , m_pIndexWidget(0) 150 154 , m_pContentModel(0) 155 , m_pHelpSearchEngine(0) 156 , m_pHelpSearchQueryWidget(0) 157 , m_pHelpSearchResultWidget(0) 151 158 , m_pBookmarksWidget(0) 159 , m_pSearchContainerWidget(0) 152 160 , m_pShowHideSideBarAction(0) 153 161 , m_pShowHideToolBarAction(0) … … 155 163 , m_pForwardAction(0) 156 164 , m_pBackwardAction(0) 165 , m_pAddBookmarkAction(0) 157 166 , m_fModelContentCreated(false) 158 167 { … … 188 197 prepareToolBar(); 189 198 prepareWidgets(); 199 prepareSearchWidgets(); 190 200 prepareMenu(); 191 201 retranslateUi(); … … 218 228 connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltHandleBackwardAction); 219 229 sltHandleBackwardAvailable(false); 230 231 m_pAddBookmarkAction = 232 new QAction(UIIconPool::iconSet(":/help_browser_add_bookmark.png"), QString(), this); 233 connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltHandleAddBookmarkAction); 220 234 } 221 235 … … 230 244 m_pBookmarksWidget = new QWidget(this); 231 245 m_pTabWidget = new QITabWidget; 232 AssertReturnVoid(m_pTabWidget && m_pHelpEngine && m_pBookmarksWidget); 233 //m_pTabWidget->setTabsClosable(true); 246 AssertReturnVoid(m_pTabWidget && 247 m_pHelpEngine && 248 m_pBookmarksWidget); 234 249 235 250 m_pContentWidget = m_pHelpEngine->contentWidget(); … … 279 294 #endif 280 295 } 281 #include <QPushButton> 296 297 void UIHelpBrowserWidget::prepareSearchWidgets() 298 { 299 #if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) 300 # if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) 301 302 AssertReturnVoid(m_pTabWidget && m_pHelpEngine); 303 304 m_pSearchContainerWidget = new QWidget; 305 m_pTabWidget->insertTab(HelpBrowserTabs_Search, m_pSearchContainerWidget, QString()); 306 307 m_pHelpSearchEngine = m_pHelpEngine->searchEngine(); 308 AssertReturnVoid(m_pHelpSearchEngine); 309 310 m_pHelpSearchQueryWidget = m_pHelpSearchEngine->queryWidget(); 311 m_pHelpSearchResultWidget = m_pHelpSearchEngine->resultWidget(); 312 AssertReturnVoid(m_pHelpSearchQueryWidget && m_pHelpSearchResultWidget); 313 314 QVBoxLayout *pSearchLayout = new QVBoxLayout(m_pSearchContainerWidget); 315 pSearchLayout->addWidget(m_pHelpSearchQueryWidget); 316 pSearchLayout->addWidget(m_pHelpSearchResultWidget); 317 318 319 connect(m_pHelpSearchQueryWidget, &QHelpSearchQueryWidget::search, 320 this, &UIHelpBrowserWidget::sltHandleSearchStart); 321 // connect(resultWidget, &QHelpSearchResultWidget::requestShowLink, 322 // this, &SearchWidget::requestShowLink); 323 324 // connect(searchEngine, &QHelpSearchEngine::searchingStarted, 325 // this, &SearchWidget::searchingStarted); 326 // connect(searchEngine, &QHelpSearchEngine::searchingFinished, 327 // this, &SearchWidget::searchingFinished); 328 329 330 331 332 // connect(m_pHelpSearchEngine, &QHelpSearchEngine::indexingStarted, 333 // this, &UIHelpBrowserWidget::sltHandleIndexingStarted); 334 // connect(m_pHelpSearchEngine, &QHelpSearchEngine::indexingFinished, 335 // this, &UIHelpBrowserWidget::sltHandleIndexingFinished); 336 337 //void searchingFinished(int searchResultCount) 338 339 340 connect(m_pHelpSearchEngine, &QHelpSearchEngine::searchingStarted, 341 this, &UIHelpBrowserWidget::sltHandleSearchingStarted); 342 343 m_pHelpSearchEngine->reindexDocumentation(); 344 # endif//if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) 345 #endif 346 } 347 282 348 void UIHelpBrowserWidget::prepareToolBar() 283 349 { … … 294 360 m_pToolBar->addAction(m_pForwardAction); 295 361 m_pToolBar->addAction(m_pHomeAction); 362 m_pToolBar->addAction(m_pAddBookmarkAction); 296 363 297 364 #ifdef VBOX_WS_MAC … … 380 447 m_pTabWidget->setTabText(HelpBrowserTabs_TOC, tr("Contents")); 381 448 m_pTabWidget->setTabText(HelpBrowserTabs_Index, tr("Index")); 449 m_pTabWidget->setTabText(HelpBrowserTabs_Search, tr("Search")); 382 450 m_pTabWidget->setTabText(HelpBrowserTabs_Bookmarks, tr("Bookmarks")); 383 451 } … … 619 687 } 620 688 689 void UIHelpBrowserWidget::sltHandleAddBookmarkAction() 690 { 691 } 692 693 void UIHelpBrowserWidget::sltHandleIndexingStarted() 694 { 695 printf("indexing started\n"); 696 } 697 698 void UIHelpBrowserWidget::sltHandleIndexingFinished() 699 { 700 printf("indexing finished\n"); 701 } 702 703 void UIHelpBrowserWidget::sltHandleSearchingStarted() 704 { 705 printf("search started\n"); 706 } 707 708 void UIHelpBrowserWidget::sltHandleSearchStart() 709 { 710 #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) 711 AssertReturnVoid(m_pHelpSearchEngine && m_pHelpSearchQueryWidget); 712 m_pHelpSearchEngine->search(m_pHelpSearchQueryWidget->searchInput()); 713 #endif 714 } 621 715 #include "UIHelpBrowserWidget.moc" -
trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.h
r86747 r86757 43 43 class QHelpContentWidget; 44 44 class QHelpIndexWidget; 45 class QHelpSearchEngine; 46 class QHelpSearchQueryWidget; 47 class QHelpSearchResultWidget; 45 48 class QPlainTextEdit; 46 49 class QSplitter; … … 93 96 void sltHandleHistoryChanged(); 94 97 void sltHandleAddressBarIndexChanged(int index); 98 void sltHandleAddBookmarkAction(); 99 void sltHandleIndexingStarted(); 100 void sltHandleIndexingFinished(); 101 void sltHandleSearchingStarted(); 102 void sltHandleSearchStart(); 95 103 96 104 private: … … 99 107 void prepareActions(); 100 108 void prepareWidgets(); 109 void prepareSearchWidgets(); 101 110 void prepareToolBar(); 102 111 void prepareMenu(); … … 149 158 QHelpIndexWidget *m_pIndexWidget; 150 159 QHelpContentModel *m_pContentModel; 160 QHelpSearchEngine *m_pHelpSearchEngine; 161 QHelpSearchQueryWidget *m_pHelpSearchQueryWidget; 162 QHelpSearchResultWidget *m_pHelpSearchResultWidget; 151 163 QWidget *m_pBookmarksWidget; 164 QWidget *m_pSearchContainerWidget; 152 165 QAction *m_pShowHideSideBarAction; 153 166 QAction *m_pShowHideToolBarAction; … … 155 168 QAction *m_pForwardAction; 156 169 QAction *m_pBackwardAction; 170 QAction *m_pAddBookmarkAction; 157 171 QString m_strPageNotFoundText; 158 172 /* This is set t true when handling QHelpContentModel::contentsCreated signal. */
Note:
See TracChangeset
for help on using the changeset viewer.

