zealdocs/zeal
1
1
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2024-10-27 01:28:04 +03:00
Code Issues Projects Releases Wiki Activity

ui: Conditionally use Qt 5.6 features

Browse Source
This commit is contained in:
Oleg Shparber 2018-01-07 17:31:54 +02:00
parent 478791a2d8
commit a9307b4a1e
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libs/ui/mainwindow.cpp
View File

@ -251,15 +251,19 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) :
m_backMenu->clear();
QWebHistory *history = currentTab()->history();
QList<QWebHistoryItem> items = history->backItems(10);
// TODO: [Qt 5.6]
//for (auto it = items.crbegin(); it != items.crend(); ++it) {
#if QT_VERSION >= 0x050600
for (auto it = items.crbegin(); it != items.crend(); ++it) {
#else
for (auto it = items.cend() - 1; it >= items.cbegin(); --it) {
#endif
const QIcon icon = docsetIcon(docsetName(it->url()));
const QWebHistoryItem item = *it;
// TODO: [Qt 5.6]
// m_backMenu->addAction(icon, it->title(), [=](bool) { history->goToItem(item); });
#if QT_VERSION >= 0x050600
m_backMenu->addAction(icon, it->title(), [=](bool) { history->goToItem(item); });
#else
QAction *action = m_backMenu->addAction(icon, it->title());
connect(action, &QAction::triggered, [=](bool) { history->goToItem(item); });
#endif
}
});
ui->backButton->setDefaultAction(ui->actionBack);
@ -271,10 +275,12 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) :
QWebHistory *history = currentTab()->history();
for (const QWebHistoryItem &item: history->forwardItems(10)) {
const QIcon icon = docsetIcon(docsetName(item.url()));
// TODO: [Qt 5.6]
//m_forwardMenu->addAction(icon, item.title(), [=](bool) { history->goToItem(item); });
#if QT_VERSION >= 0x050600
m_forwardMenu->addAction(icon, item.title(), [=](bool) { history->goToItem(item); });
#else
QAction *action = m_forwardMenu->addAction(icon, item.title());
connect(action, &QAction::triggered, [=](bool) { history->goToItem(item); });
#endif
}
});
ui->forwardButton->setDefaultAction(ui->actionForward);
@ -727,10 +733,14 @@ void MainWindow::createTrayIcon()
});
QMenu *trayIconMenu = new QMenu(this);
// TODO: [Qt 5.6] Use addAction(text, receiver, method...).
#if QT_VERSION >= 0x050600
QAction *toggleAction = trayIconMenu->addAction(tr("Show Zeal"),
this, &MainWindow::toggleWindow);
#else
QAction *toggleAction = trayIconMenu->addAction(tr("Show Zeal"));
connect(toggleAction, &QAction::triggered, this, &MainWindow::toggleWindow);
#endif
connect(trayIconMenu, &QMenu::aboutToShow, this, [this, toggleAction]() {
toggleAction->setText(isVisible() ? tr("Minimize to Tray") : tr("Show Zeal"));
});