diff --git a/src/qtgui/rclm_menus.cpp b/src/qtgui/rclm_menus.cpp index 65197f36..86621bd7 100644 --- a/src/qtgui/rclm_menus.cpp +++ b/src/qtgui/rclm_menus.cpp @@ -67,7 +67,9 @@ void RclMain::buildMenus() viewMenu->addSeparator(); viewMenu->addAction(toggleFullScreenAction); - + viewMenu->addAction(zoomInAction); + viewMenu->addAction(zoomOutAction); + toolsMenu->addAction(toolsDoc_HistoryAction); toolsMenu->addAction(toolsAdvanced_SearchAction); toolsMenu->addAction(toolsSpellAction); diff --git a/src/qtgui/rclmain.ui b/src/qtgui/rclmain.ui index 4467f254..48a1210b 100644 --- a/src/qtgui/rclmain.ui +++ b/src/qtgui/rclmain.ui @@ -65,7 +65,7 @@ 0 0 800 - 25 + 20 @@ -346,6 +346,28 @@ toggleFullScreenAction + + + Increase results text font size + + + Increase Font Size + + + zoomInAction + + + + + Decrease results text font size + + + Decrease Font Size + + + zoomOutAction + + true diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp index 65b8474f..9ae403f6 100644 --- a/src/qtgui/rclmain_w.cpp +++ b/src/qtgui/rclmain_w.cpp @@ -240,8 +240,12 @@ void RclMain::init() connect(enbSynAction, SIGNAL(toggled(bool)), this, SLOT(setSynEnabled(bool))); - connect(toggleFullScreenAction, SIGNAL(triggered()), - this, SLOT(toggleFullScreen())); + connect(toggleFullScreenAction, SIGNAL(triggered()), this, SLOT(toggleFullScreen())); + zoomInAction->setShortcut(QKeySequence::ZoomIn); + connect(zoomInAction, SIGNAL(triggered()), this, SLOT(zoomIn())); + zoomOutAction->setShortcut(QKeySequence::ZoomOut); + connect(zoomOutAction, SIGNAL(triggered()), this, SLOT(zoomOut())); + connect(actionShowQueryDetails, SIGNAL(triggered()), reslist, SLOT(showQueryDetails())); connect(periodictimer, SIGNAL(timeout()), @@ -288,8 +292,6 @@ void RclMain::init() connect(this, SIGNAL(resultsReady()), reslist, SLOT(readDocSource())); connect(this, SIGNAL(uiPrefsChanged()), reslist, SLOT(onUiPrefsChanged())); - connect(new QShortcut(QKeySequence::ZoomIn,this), SIGNAL (activated()), this, SLOT (zoomIn())); - connect(new QShortcut(QKeySequence::ZoomOut,this),SIGNAL (activated()), this, SLOT (zoomOut())); connect(reslist, SIGNAL(hasResults(int)), this, SLOT(resultCount(int))); diff --git a/src/qtgui/reslist.cpp b/src/qtgui/reslist.cpp index a3856350..0e38a074 100644 --- a/src/qtgui/reslist.cpp +++ b/src/qtgui/reslist.cpp @@ -438,19 +438,17 @@ void ResList::onUiPrefsChanged() void ResList::setFont() { #if defined(USING_WEBKIT) || defined(USING_WEBENGINE) -# ifndef SETFONT_WITH_HEADSTYLE +#ifndef SETFONT_WITH_HEADSTYLE if (prefs.reslistfontfamily != "") { // For some reason there is (12-2014) an offset of 3 between what // we request from webkit and what we get. - settings()->setFontSize(QWEBSETTINGS::DefaultFontSize, - prefs.reslistfontsize + 3); - settings()->setFontFamily(QWEBSETTINGS::StandardFont, - prefs.reslistfontfamily); + settings()->setFontSize(QWEBSETTINGS::DefaultFontSize, prefs.reslistfontsize + 3); + settings()->setFontFamily(QWEBSETTINGS::StandardFont, prefs.reslistfontfamily); } else { settings()->setFontSize(QWEBSETTINGS::DefaultFontSize, prefs.reslistfontsize + 3); settings()->resetFontFamily(QWEBSETTINGS::StandardFont); } -# endif +#endif #else if (prefs.reslistfontfamily != "") { QFont nfont(prefs.reslistfontfamily, prefs.reslistfontsize); diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp index c690fd22..4aee183a 100644 --- a/src/qtgui/restable.cpp +++ b/src/qtgui/restable.cpp @@ -811,10 +811,12 @@ void ResTable::onUiPrefsChanged() if (m_detail) { m_detail->setFont(); } - // Not sure that this is the right way, but something is needed to - // repaint with a possible new font. Toggling alternaterowcolors - // works too - tableView->update(tableView->indexAt(QPoint(0, 0))); + auto index = tableView->indexAt(QPoint(0, 0)); + // There may be a better way to force repainting all visible rows + // with the possibly new font, but this works... + tableView->setAlternatingRowColors(false); + tableView->setAlternatingRowColors(true); + makeRowVisible(index.row()); if (prefs.noResTableHeader) { tableView->horizontalHeader()->hide(); } else {