summaryrefslogtreecommitdiffstats
path: root/tools/assistant/tools/assistant/mainwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/assistant/tools/assistant/mainwindow.cpp')
-rw-r--r--tools/assistant/tools/assistant/mainwindow.cpp340
1 files changed, 158 insertions, 182 deletions
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index 0f246bead0..6e224135bc 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -86,9 +86,9 @@ QT_BEGIN_NAMESPACE
MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
: QMainWindow(parent)
+ , m_filterCombo(0)
, m_toolBarMenu(0)
, m_cmdLine(cmdLine)
- , m_searchWidget(0)
, m_progressWidget(0)
, m_qtDocInstaller(0)
, m_connectedInitSignals(false)
@@ -125,20 +125,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
connect(searchEngine, SIGNAL(indexingStarted()), this, SLOT(indexingStarted()));
connect(searchEngine, SIGNAL(indexingFinished()), this, SLOT(indexingFinished()));
-#ifdef QT_CLUCENE_SUPPORT
m_centralWidget->createSearchWidget(searchEngine);
-#else
- QDockWidget *dock = new QDockWidget(tr("Search"), this);
- dock->setObjectName(QLatin1String("SearchWindow"));
- m_searchWidget = new SearchWidget(searchEngine, this);
- dock->setWidget(m_searchWidget);
- addDockWidget(Qt::LeftDockWidgetArea, dock);
-
- connect(m_searchWidget, SIGNAL(requestShowLink(const QUrl&)),
- m_centralWidget, SLOT(setSource(const QUrl&)));
- connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(const QUrl&)),
- m_centralWidget, SLOT(setSourceInNewTab(const QUrl&)));
-#endif
QString defWindowTitle = tr("Qt Assistant");
setWindowTitle(defWindowTitle);
@@ -186,9 +173,11 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
m_helpEngine->setCustomValue(QLatin1String("useAppFont"), false);
m_helpEngine->setCustomValue(QLatin1String("useBrowserFont"), false);
m_helpEngine->setCustomValue(QLatin1String("appFont"), qApp->font());
- m_helpEngine->setCustomValue(QLatin1String("appWritingSystem"), QFontDatabase::Latin);
+ m_helpEngine->setCustomValue(QLatin1String("appWritingSystem"),
+ QFontDatabase::Latin);
m_helpEngine->setCustomValue(QLatin1String("browserFont"), qApp->font());
- m_helpEngine->setCustomValue(QLatin1String("browserWritingSystem"), QFontDatabase::Latin);
+ m_helpEngine->setCustomValue(QLatin1String("browserWritingSystem"),
+ QFontDatabase::Latin);
} else {
updateApplicationFont();
}
@@ -226,6 +215,20 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
else if (m_cmdLine->bookmarks() == CmdLineParser::Activate)
showBookmarks();
+ if (!m_cmdLine->currentFilter().isEmpty()) {
+ const QString &curFilter = m_cmdLine->currentFilter();
+ m_helpEngine->setCurrentFilter(curFilter);
+ if (m_filterCombo) {
+ int idx = m_filterCombo->findText(curFilter);
+ if (idx >= 0) {
+ bool blocked = m_filterCombo->signalsBlocked();
+ m_filterCombo->blockSignals(true);
+ m_filterCombo->setCurrentIndex(idx);
+ m_filterCombo->blockSignals(blocked);
+ }
+ }
+ }
+
if (usesDefaultCollection())
QTimer::singleShot(0, this, SLOT(lookForNewQtDocumentation()));
else
@@ -302,6 +305,7 @@ bool MainWindow::initHelpDB()
hc.addCustomFilter(tr("Unfiltered"), QStringList());
hc.setCustomValue(unfiltered, 1);
}
+
m_helpEngine->blockSignals(true);
m_helpEngine->setCurrentFilter(tr("Unfiltered"));
m_helpEngine->blockSignals(false);
@@ -316,10 +320,10 @@ bool MainWindow::initHelpDB()
void MainWindow::lookForNewQtDocumentation()
{
m_qtDocInstaller = new QtDocInstaller(m_helpEngine->collectionFile());
- connect(m_qtDocInstaller, SIGNAL(errorMessage(const QString&)),
- this, SLOT(displayInstallationError(const QString&)));
- connect(m_qtDocInstaller, SIGNAL(docsInstalled(bool)),
- this, SLOT(qtDocumentationInstalled(bool)));
+ connect(m_qtDocInstaller, SIGNAL(errorMessage(QString)), this,
+ SLOT(displayInstallationError(QString)));
+ connect(m_qtDocInstaller, SIGNAL(docsInstalled(bool)), this,
+ SLOT(qtDocumentationInstalled(bool)));
QString versionKey = QString(QLatin1String("qtVersion%1$$$qt")).
arg(QLatin1String(QT_VERSION_STR));
@@ -351,8 +355,8 @@ void MainWindow::checkInitState()
if (!m_connectedInitSignals) {
connect(m_helpEngine->contentModel(), SIGNAL(contentsCreated()),
this, SLOT(checkInitState()));
- connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()),
- this, SLOT(checkInitState()));
+ connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()), this,
+ SLOT(checkInitState()));
m_connectedInitSignals = true;
}
} else {
@@ -377,118 +381,107 @@ void MainWindow::insertLastPages()
void MainWindow::setupActions()
{
- QString system = QLatin1String("win");
+ QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
#ifdef Q_OS_MAC
- system = QLatin1String("mac");
setUnifiedTitleAndToolBarOnMac(true);
+ resourcePath.append(QLatin1String("mac"));
+#else
+ resourcePath.append(QLatin1String("win"));
#endif
QMenu *menu = menuBar()->addMenu(tr("&File"));
- m_pageSetupAction = menu->addAction(tr("Page Set&up..."), m_centralWidget, SLOT(pageSetup()));
- m_printPreviewAction = menu->addAction(tr("Print Preview..."), m_centralWidget, SLOT(printPreview()));
+ m_pageSetupAction = menu->addAction(tr("Page Set&up..."), m_centralWidget,
+ SLOT(pageSetup()));
+ m_printPreviewAction = menu->addAction(tr("Print Preview..."), m_centralWidget,
+ SLOT(printPreview()));
+
m_printAction = menu->addAction(tr("&Print..."), m_centralWidget, SLOT(print()));
- m_printAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/print.png").arg(system)));
- m_printAction->setShortcut(tr("CTRL+P"));
+ m_printAction->setIcon(QIcon(resourcePath + QLatin1String("/print.png")));
+ m_printAction->setShortcut(QKeySequence::Print);
menu->addSeparator();
m_newTabAction = menu->addAction(tr("New &Tab"), m_centralWidget, SLOT(newTab()));
- m_newTabAction->setShortcut(tr("CTRL+T"));
- m_closeTabAction = menu->addAction(tr("&Close Tab"), m_centralWidget, SLOT(closeTab()));
- m_closeTabAction->setShortcut(tr("CTRL+W"));
+ m_newTabAction->setShortcut(QKeySequence::AddTab);
+
+ m_closeTabAction = menu->addAction(tr("&Close Tab"), m_centralWidget,
+ SLOT(closeTab()));
+ m_closeTabAction->setShortcuts(QKeySequence::Close);
QAction *tmp = menu->addAction(tr("&Quit"), this, SLOT(close()));
tmp->setShortcut(tr("CTRL+Q"));
tmp->setMenuRole(QAction::QuitRole);
menu = menuBar()->addMenu(tr("&Edit"));
- m_copyAction = menu->addAction(tr("&Copy selected Text"),
- m_centralWidget, SLOT(copySelection()));
- m_copyAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/editcopy.png").arg(system)));
- m_copyAction->setShortcut(tr("Ctrl+C"));
+ m_copyAction = menu->addAction(tr("&Copy selected Text"), m_centralWidget,
+ SLOT(copySelection()));
+ m_copyAction->setIcon(QIcon(resourcePath + QLatin1String("/editcopy.png")));
+ m_copyAction->setShortcuts(QKeySequence::Copy);
m_copyAction->setEnabled(false);
- m_findAction = menu->addAction(tr("&Find in Text..."),
- m_centralWidget, SLOT(showTextSearch()));
- m_findAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/find.png").arg(system)));
- m_findAction->setShortcut(tr("Ctrl+F"));
- m_findAction->setShortcut(QKeySequence::Find);
+ m_findAction = menu->addAction(tr("&Find in Text..."), m_centralWidget,
+ SLOT(showTextSearch()));
+ m_findAction->setIcon(QIcon(resourcePath + QLatin1String("/find.png")));
+ m_findAction->setShortcuts(QKeySequence::Find);
- QAction *findNextAction = menu->addAction(tr("Find &Next"),
- m_centralWidget, SLOT(findNext()));
- findNextAction->setShortcuts(QList<QKeySequence>() << QKeySequence(tr("F3"))
- << QKeySequence(tr("CTRL+G")));
+ QAction *findNextAction = menu->addAction(tr("Find &Next"), m_centralWidget,
+ SLOT(findNext()));
+ findNextAction->setShortcuts(QKeySequence::FindNext);
QAction *findPreviousAction = menu->addAction(tr("Find &Previous"),
m_centralWidget, SLOT(findPrevious()));
- findPreviousAction->setShortcuts(QList<QKeySequence>() <<
- QKeySequence(tr("Shift+F3")) << QKeySequence(tr("CTRL+SHIFT+G")));
+ findPreviousAction->setShortcuts(QKeySequence::FindPrevious);
menu->addSeparator();
tmp = menu->addAction(tr("Preferences..."), this, SLOT(showPreferences()));
tmp->setMenuRole(QAction::PreferencesRole);
m_viewMenu = menuBar()->addMenu(tr("&View"));
- m_zoomInAction = m_viewMenu->addAction(tr("Zoom &in"),
- m_centralWidget, SLOT(zoomIn()));
- m_zoomInAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/zoomin.png").arg(system)));
- m_zoomInAction->setShortcut(tr("Ctrl++"));
-
- m_zoomOutAction = m_viewMenu->addAction(tr("Zoom &out"),
- m_centralWidget, SLOT(zoomOut()));
- m_zoomOutAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/zoomout.png").arg(system)));
- m_zoomOutAction->setShortcut(tr("Ctrl+-"));
-
- m_resetZoomAction = m_viewMenu->addAction(tr("Normal &Size"),
- m_centralWidget, SLOT(resetZoom()));
- m_resetZoomAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/resetzoom.png").arg(system)));
+ m_zoomInAction = m_viewMenu->addAction(tr("Zoom &in"), m_centralWidget,
+ SLOT(zoomIn()));
+ m_zoomInAction->setIcon(QIcon(resourcePath + QLatin1String("/zoomin.png")));
+ m_zoomInAction->setShortcut(QKeySequence::ZoomIn);
+
+ m_zoomOutAction = m_viewMenu->addAction(tr("Zoom &out"), m_centralWidget,
+ SLOT(zoomOut()));
+ m_zoomOutAction->setIcon(QIcon(resourcePath + QLatin1String("/zoomout.png")));
+ m_zoomOutAction->setShortcut(QKeySequence::ZoomOut);
+
+ m_resetZoomAction = m_viewMenu->addAction(tr("Normal &Size"), m_centralWidget,
+ SLOT(resetZoom()));
+ m_resetZoomAction->setIcon(QIcon(resourcePath + QLatin1String("/resetzoom.png")));
m_resetZoomAction->setShortcut(tr("Ctrl+0"));
m_viewMenu->addSeparator();
- m_viewMenu->addAction(tr("Contents"), this,
- SLOT(showContents()), QKeySequence(tr("ALT+C")));
- m_viewMenu->addAction(tr("Index"), this,
- SLOT(showIndex()), QKeySequence(tr("ALT+I")));
- m_viewMenu->addAction(tr("Bookmarks"), this,
- SLOT(showBookmarks()), QKeySequence(tr("ALT+O")));
- m_viewMenu->addAction(tr("Search"), this,
- SLOT(showSearch()), QKeySequence(tr("ALT+S")));
+ m_viewMenu->addAction(tr("Contents"), this, SLOT(showContents()),
+ QKeySequence(tr("ALT+C")));
+ m_viewMenu->addAction(tr("Index"), this, SLOT(showIndex()),
+ QKeySequence(tr("ALT+I")));
+ m_viewMenu->addAction(tr("Bookmarks"), this, SLOT(showBookmarks()),
+ QKeySequence(tr("ALT+O")));
+ m_viewMenu->addAction(tr("Search"), this, SLOT(showSearch()),
+ QKeySequence(tr("ALT+S")));
menu = menuBar()->addMenu(tr("&Go"));
- m_homeAction = menu->addAction(tr("&Home"),
- m_centralWidget, SLOT(home()));
+ m_homeAction = menu->addAction(tr("&Home"), m_centralWidget, SLOT(home()));
m_homeAction->setShortcut(tr("Ctrl+Home"));
- m_homeAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/home.png").arg(system)));
+ m_homeAction->setIcon(QIcon(resourcePath + QLatin1String("/home.png")));
- m_backAction = menu->addAction(tr("&Back"),
- m_centralWidget, SLOT(backward()));
+ m_backAction = menu->addAction(tr("&Back"), m_centralWidget, SLOT(backward()));
m_backAction->setEnabled(false);
- m_backAction->setShortcuts(QList<QKeySequence>()
- << QKeySequence(Qt::CTRL|Qt::Key_Left) << QKeySequence::Back);
- m_backAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/previous.png").arg(system)));
+ m_backAction->setShortcuts(QKeySequence::Back);
+ m_backAction->setIcon(QIcon(resourcePath + QLatin1String("/previous.png")));
- m_nextAction = menu->addAction(tr("&Forward"),
- m_centralWidget, SLOT(forward()));
+ m_nextAction = menu->addAction(tr("&Forward"), m_centralWidget, SLOT(forward()));
m_nextAction->setEnabled(false);
- m_nextAction->setShortcuts(QList<QKeySequence>()
- << QKeySequence(Qt::CTRL|Qt::Key_Right) << QKeySequence::Forward);
- m_nextAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/next.png").arg(system)));
+ m_nextAction->setShortcuts(QKeySequence::Forward);
+ m_nextAction->setIcon(QIcon(resourcePath + QLatin1String("/next.png")));
- m_syncAction = menu->addAction(tr("Sync with Table of Contents"),
- this, SLOT(syncContents()));
- m_syncAction->setIcon(QIcon(
- QString::fromUtf8(":/trolltech/assistant/images/%1/synctoc.png").arg(system)));
+ m_syncAction = menu->addAction(tr("Sync with Table of Contents"), this,
+ SLOT(syncContents()));
+ m_syncAction->setIcon(QIcon(resourcePath + QLatin1String("/synctoc.png")));
menu->addSeparator();
@@ -496,8 +489,7 @@ void MainWindow::setupActions()
tmp->setShortcuts(QList<QKeySequence>() << QKeySequence(tr("Ctrl+Alt+Right"))
<< QKeySequence(Qt::CTRL + Qt::Key_PageDown));
- tmp = menu->addAction(tr("Previous Page"),
- m_centralWidget, SLOT(previousPage()));
+ tmp = menu->addAction(tr("Previous Page"), m_centralWidget, SLOT(previousPage()));
tmp->setShortcuts(QList<QKeySequence>() << QKeySequence(tr("Ctrl+Alt+Left"))
<< QKeySequence(Qt::CTRL + Qt::Key_PageUp));
@@ -525,53 +517,52 @@ void MainWindow::setupActions()
navigationBar->addAction(m_resetZoomAction);
QList<QAction*> actionList;
- actionList << m_backAction << m_nextAction << m_homeAction;
- actionList << sep << m_zoomInAction << m_zoomOutAction;
- actionList << sep2 << m_copyAction << m_printAction << m_findAction;
+ actionList << m_backAction << m_nextAction << m_homeAction << sep
+ << m_zoomInAction << m_zoomOutAction << sep2 << m_copyAction
+ << m_printAction << m_findAction;
m_centralWidget->setGlobalActions(actionList);
#if defined(Q_WS_MAC)
QMenu *windowMenu = new QMenu(tr("&Window"), this);
menuBar()->insertMenu(menu->menuAction(), windowMenu);
- windowMenu->addAction(tr("Minimize"), this,
- SLOT(showMinimized()), QKeySequence(tr("Ctrl+M")));
- windowMenu->addAction(tr("Zoom"), this,
- SLOT(showMaximized()));
+ windowMenu->addAction(tr("Zoom"), this, SLOT(showMaximized()));
+ windowMenu->addAction(tr("Minimize"), this, SLOT(showMinimized()),
+ QKeySequence(tr("Ctrl+M")));
#endif
// content viewer connections
- connect(m_centralWidget, SIGNAL(copyAvailable(bool)),
- this, SLOT(copyAvailable(bool)));
- connect(m_centralWidget, SIGNAL(currentViewerChanged()),
- this, SLOT(updateNavigationItems()));
- connect(m_centralWidget, SIGNAL(forwardAvailable(bool)),
- this, SLOT(updateNavigationItems()));
- connect(m_centralWidget, SIGNAL(backwardAvailable(bool)),
- this, SLOT(updateNavigationItems()));
- connect(m_centralWidget, SIGNAL(highlighted(const QString&)),
- statusBar(), SLOT(showMessage(const QString&)));
- connect(m_centralWidget, SIGNAL(addNewBookmark(const QString&,
- const QString&)), this, SLOT(addNewBookmark(const QString&, const QString&)));
+ connect(m_centralWidget, SIGNAL(copyAvailable(bool)), this,
+ SLOT(copyAvailable(bool)));
+ connect(m_centralWidget, SIGNAL(currentViewerChanged()), this,
+ SLOT(updateNavigationItems()));
+ connect(m_centralWidget, SIGNAL(forwardAvailable(bool)), this,
+ SLOT(updateNavigationItems()));
+ connect(m_centralWidget, SIGNAL(backwardAvailable(bool)), this,
+ SLOT(updateNavigationItems()));
+ connect(m_centralWidget, SIGNAL(highlighted(QString)), statusBar(),
+ SLOT(showMessage(QString)));
+ connect(m_centralWidget, SIGNAL(addNewBookmark(QString, QString)), this,
+ SLOT(addNewBookmark(QString, QString)));
// bookmarks
- connect(m_bookmarkWidget, SIGNAL(requestShowLink(const QUrl&)),
- m_centralWidget, SLOT(setSource(const QUrl&)));
- connect(m_bookmarkWidget, SIGNAL(escapePressed()),
- this, SLOT(activateCurrentCentralWidgetTab()));
+ connect(m_bookmarkWidget, SIGNAL(requestShowLink(QUrl)), m_centralWidget,
+ SLOT(setSource(QUrl)));
+ connect(m_bookmarkWidget, SIGNAL(escapePressed()), this,
+ SLOT(activateCurrentCentralWidgetTab()));
// index window
- connect(m_indexWindow, SIGNAL(linkActivated(const QUrl&)),
- m_centralWidget, SLOT(setSource(const QUrl&)));
- connect(m_indexWindow, SIGNAL(linksActivated(const QMap<QString, QUrl>&, const QString&)),
- this, SLOT(showTopicChooser(const QMap<QString, QUrl>&, const QString&)));
- connect(m_indexWindow, SIGNAL(escapePressed()),
- this, SLOT(activateCurrentCentralWidgetTab()));
+ connect(m_indexWindow, SIGNAL(linkActivated(QUrl)), m_centralWidget,
+ SLOT(setSource(QUrl)));
+ connect(m_indexWindow, SIGNAL(linksActivated(QMap<QString, QUrl>, QString)),
+ this, SLOT(showTopicChooser(QMap<QString, QUrl>, QString)));
+ connect(m_indexWindow, SIGNAL(escapePressed()), this,
+ SLOT(activateCurrentCentralWidgetTab()));
// content window
- connect(m_contentWindow, SIGNAL(linkActivated(const QUrl&)),
- m_centralWidget, SLOT(setSource(const QUrl&)));
- connect(m_contentWindow, SIGNAL(escapePressed()),
- this, SLOT(activateCurrentCentralWidgetTab()));
+ connect(m_contentWindow, SIGNAL(linkActivated(QUrl)), m_centralWidget,
+ SLOT(setSource(QUrl)));
+ connect(m_contentWindow, SIGNAL(escapePressed()), this,
+ SLOT(activateCurrentCentralWidgetTab()));
#if defined(QT_NO_PRINTER)
m_pageSetupAction->setVisible(false);
@@ -601,17 +592,19 @@ void MainWindow::setupFilterToolbar()
QToolBar *filterToolBar = addToolBar(tr("Filter Toolbar"));
filterToolBar->setObjectName(QLatin1String("FilterToolBar"));
- filterToolBar->addWidget(new QLabel(tr("Filtered by:").append(QLatin1String(" ")), this));
+ filterToolBar->addWidget(new QLabel(tr("Filtered by:").append(QLatin1Char(' ')),
+ this));
filterToolBar->addWidget(m_filterCombo);
- if (m_helpEngine->customValue(QLatin1String("HideFilterFunctionality"), true).toBool())
+ const QLatin1String hideFilter("HideFilterFunctionality");
+ if (m_helpEngine->customValue(hideFilter, true).toBool())
filterToolBar->hide();
toolBarMenu()->addAction(filterToolBar->toggleViewAction());
- connect(m_helpEngine, SIGNAL(setupFinished()),
- this, SLOT(setupFilterCombo()));
- connect(m_filterCombo, SIGNAL(activated(const QString&)),
- this, SLOT(filterDocumentation(const QString&)));
+ connect(m_helpEngine, SIGNAL(setupFinished()), this,
+ SLOT(setupFilterCombo()));
+ connect(m_filterCombo, SIGNAL(activated(QString)), this,
+ SLOT(filterDocumentation(QString)));
setupFilterCombo();
}
@@ -626,7 +619,8 @@ void MainWindow::setupAddressToolbar()
addressToolBar->setObjectName(QLatin1String("AddressToolBar"));
insertToolBarBreak(addressToolBar);
- addressToolBar->addWidget(new QLabel(tr("Address:").append(QLatin1String(" ")), this));
+ addressToolBar->addWidget(new QLabel(tr("Address:").append(QLatin1String(" ")),
+ this));
addressToolBar->addWidget(m_addressLineEdit);
if (m_helpEngine->customValue(QLatin1String("HideAddressBar"), true).toBool())
@@ -634,12 +628,12 @@ void MainWindow::setupAddressToolbar()
toolBarMenu()->addAction(addressToolBar->toggleViewAction());
// address lineedit
- connect(m_addressLineEdit, SIGNAL(returnPressed()),
- this, SLOT(gotoAddress()));
- connect(m_centralWidget, SIGNAL(currentViewerChanged()),
- this, SLOT(showNewAddress()));
- connect(m_centralWidget, SIGNAL(sourceChanged(const QUrl&)),
- this, SLOT(showNewAddress(const QUrl&)));
+ connect(m_addressLineEdit, SIGNAL(returnPressed()), this,
+ SLOT(gotoAddress()));
+ connect(m_centralWidget, SIGNAL(currentViewerChanged()), this,
+ SLOT(showNewAddress()));
+ connect(m_centralWidget, SIGNAL(sourceChanged(QUrl)), this,
+ SLOT(showNewAddress(QUrl)));
}
void MainWindow::updateAboutMenuText()
@@ -684,7 +678,8 @@ void MainWindow::showNewAddress(const QUrl &url)
void MainWindow::addBookmark()
{
- addNewBookmark(m_centralWidget->currentTitle(), m_centralWidget->currentSource().toString());
+ addNewBookmark(m_centralWidget->currentTitle(),
+ m_centralWidget->currentSource().toString());
}
void MainWindow::gotoAddress()
@@ -719,10 +714,10 @@ void MainWindow::showPreferences()
{
PreferencesDialog dia(m_helpEngine, this);
- connect(&dia, SIGNAL(updateApplicationFont()),
- this, SLOT(updateApplicationFont()));
- connect(&dia, SIGNAL(updateBrowserFont()),
- m_centralWidget, SLOT(updateBrowserFont()));
+ connect(&dia, SIGNAL(updateApplicationFont()), this,
+ SLOT(updateApplicationFont()));
+ connect(&dia, SIGNAL(updateBrowserFont()), m_centralWidget,
+ SLOT(updateBrowserFont()));
dia.showDialog();
}
@@ -784,7 +779,8 @@ void MainWindow::showAboutDialog()
if (!contents.isEmpty()) {
iconArray = m_helpEngine->customValue(QLatin1String("AboutIcon"),
QByteArray()).toByteArray();
- QByteArray resources = m_helpEngine->customValue(QLatin1String("AboutImages"),
+ QByteArray resources =
+ m_helpEngine->customValue(QLatin1String("AboutImages"),
QByteArray()).toByteArray();
QPixmap pix;
pix.loadFromData(iconArray);
@@ -793,36 +789,25 @@ void MainWindow::showAboutDialog()
aboutDia.setPixmap(pix);
aboutDia.setWindowTitle(aboutDia.documentTitle());
} else {
-#if QT_EDITION == QT_EDITION_OPENSOURCE
- QString edition = tr("Open Source Edition");
- QString info = tr("This version of Qt Assistant is part of the Qt Open Source Edition, for use "
- "in the development of Open Source applications. "
- "Qt is a comprehensive C++ framework for cross-platform application "
- "development.");
- QString moreInfo = tr("You need a commercial Qt license for development of proprietary (closed "
- "source) applications. Please see <a href=\"http://qtsoftware.com/company/about/businessmodel"
- "\">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing.");
-#else
+ // TODO: Remove these variables for 4.6.0. Must keep this way for 4.5.x due to string freeze.
QString edition;
QString info;
- QString moreInfo(tr("This program is licensed to you under the terms of the "
- "Qt Commercial License Agreement. For details, see the file LICENSE "
- "that came with this software distribution."));
+ QString moreInfo;
-#endif
QByteArray resources;
aboutDia.setText(QString::fromLatin1("<center>"
"<h3>%1</h3>"
"<p>Version %2 %3</p></center>"
"<p>%4</p>"
"<p>%5</p>"
- "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
- "<p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
+ "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)"
+ ".</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
" INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
" PARTICULAR PURPOSE.<p/>")
.arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR))
.arg(edition).arg(info).arg(moreInfo), resources);
- aboutDia.setPixmap(QString::fromLatin1(":/trolltech/assistant/images/assistant-128.png"));
+ QLatin1String path(":/trolltech/assistant/images/assistant-128.png");
+ aboutDia.setPixmap(QString(path));
}
if (aboutDia.windowTitle().isEmpty())
aboutDia.setWindowTitle(tr("About %1").arg(windowTitle()));
@@ -886,19 +871,12 @@ void MainWindow::activateCurrentCentralWidgetTab()
void MainWindow::showSearch()
{
- if (m_searchWidget)
- activateDockWidget(m_searchWidget);
- else
- m_centralWidget->activateSearch();
+ m_centralWidget->activateSearch();
}
void MainWindow::hideSearch()
{
- if (m_searchWidget) {
- m_searchWidget->parentWidget()->parentWidget()->hide();
- } else {
- m_centralWidget->removeSearchWidget();
- }
+ m_centralWidget->removeSearchWidget();
}
void MainWindow::updateApplicationFont()
@@ -967,27 +945,25 @@ QWidget* MainWindow::setupBookmarkWidget()
{
m_bookmarkManager = new BookmarkManager(m_helpEngine);
m_bookmarkWidget = new BookmarkWidget(m_bookmarkManager, this);
- connect(m_bookmarkWidget, SIGNAL(addBookmark()),
- this, SLOT(addBookmark()));
+ connect(m_bookmarkWidget, SIGNAL(addBookmark()), this, SLOT(addBookmark()));
return m_bookmarkWidget;
}
QString MainWindow::collectionFileDirectory(bool createDir, const QString &cacheDir)
{
- QString collectionPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+ QString collectionPath =
+ QDesktopServices::storageLocation(QDesktopServices::DataLocation);
if (collectionPath.isEmpty()) {
if (cacheDir.isEmpty())
collectionPath = QDir::homePath() + QDir::separator()
+ QLatin1String(".assistant");
else
- collectionPath = QDir::homePath() + QLatin1String("/.")
- + cacheDir;
+ collectionPath = QDir::homePath() + QLatin1String("/.") + cacheDir;
} else {
if (cacheDir.isEmpty())
collectionPath = collectionPath + QLatin1String("/Trolltech/Assistant");
else
- collectionPath = collectionPath + QDir::separator()
- + cacheDir;
+ collectionPath = collectionPath + QDir::separator() + cacheDir;
}
collectionPath = QDir::cleanPath(collectionPath);
if (createDir) {
@@ -1001,8 +977,8 @@ QString MainWindow::collectionFileDirectory(bool createDir, const QString &cache
QString MainWindow::defaultHelpCollectionFileName()
{
return collectionFileDirectory() + QDir::separator() +
- QString(QLatin1String("qthelpcollection_%1.qhc")).
- arg(QLatin1String(QT_VERSION_STR));
+ QString(QLatin1String("qthelpcollection_%1.qhc")).
+ arg(QLatin1String(QT_VERSION_STR));
}
QT_END_NAMESPACE
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 03:19:01 +0000