diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-11-30 01:15:57 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-12-03 22:14:44 +0100 |
| commit | 178947c5e58a388660d101b8f354cdb3eae0cf02 (patch) | |
| tree | 8049f03cddac1006d713ff28560d754bbb447f4e /src/webtab | |
| parent | Move "custom CSS path" from Appearance to Advanced settings (diff) | |
| download | rekonq-178947c5e58a388660d101b8f354cdb3eae0cf02.tar.xz | |
Added option for global zoom settings :)
BUG: 307477
Diffstat (limited to 'src/webtab')
| -rw-r--r-- | src/webtab/webpage.cpp | 7 | ||||
| -rw-r--r-- | src/webtab/webtab.cpp | 18 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/webtab/webpage.cpp b/src/webtab/webpage.cpp index c488ee9b..e4ff22d5 100644 --- a/src/webtab/webpage.cpp +++ b/src/webtab/webpage.cpp @@ -579,14 +579,13 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) void WebPage::loadStarted() { // set zoom factor - QString val; KSharedConfig::Ptr config = KGlobal::config(); KConfigGroup group(config, "Zoom"); - val = group.readEntry(_loadingUrl.host(), QString("10")); + QString stringValue = group.readEntry(_loadingUrl.host(), QString::number(ReKonfig::defaultZoom())); - int value = val.toInt(); + int value = stringValue.toInt(); if (value != 10) - mainFrame()->setZoomFactor(QVariant(value).toReal() / 10); // Don't allox max +1 values + mainFrame()->setZoomFactor(value / 10.0); // Don't allox max +1 values } diff --git a/src/webtab/webtab.cpp b/src/webtab/webtab.cpp index 93d1b38c..eb887304 100644 --- a/src/webtab/webtab.cpp +++ b/src/webtab/webtab.cpp @@ -76,7 +76,7 @@ WebTab::WebTab(QWidget *parent, bool isPrivateBrowsing) , m_webView(0) , m_progress(0) , m_part(0) - , m_zoomFactor(10) + , m_zoomFactor(ReKonfig::defaultZoom()) , m_isPrivateBrowsing(isPrivateBrowsing) , m_isWebApp(false) , m_splitter(new QSplitter(this)) @@ -435,7 +435,7 @@ void WebTab::zoomIn() else m_zoomFactor++; - view()->setZoomFactor(QVariant(m_zoomFactor).toReal() / 10); + view()->setZoomFactor(m_zoomFactor / 10.0); setZoom(m_zoomFactor); } @@ -449,8 +449,12 @@ void WebTab::zoomOut() return; } - m_zoomFactor--; - view()->setZoomFactor(QVariant(m_zoomFactor).toReal() / 10); + if (m_zoomFactor > 20) + m_zoomFactor -= 5; + else + m_zoomFactor--; + + view()->setZoomFactor(m_zoomFactor / 10.0); setZoom(m_zoomFactor); } @@ -458,8 +462,8 @@ void WebTab::zoomOut() void WebTab::zoomDefault() { - m_zoomFactor = 10; - view()->setZoomFactor(QVariant(m_zoomFactor).toReal() / 10); + m_zoomFactor = ReKonfig::defaultZoom(); + view()->setZoomFactor(m_zoomFactor / 10.0); setZoom(m_zoomFactor); } @@ -475,7 +479,7 @@ void WebTab::setZoom(int zoomFactor) KConfigGroup group(config, "Zoom"); group.writeEntry(url().host(), m_zoomFactor); - if (m_zoomFactor == 10) + if (m_zoomFactor == ReKonfig::defaultZoom()) emit infoToShow(i18n("Default zoom: %1%", QString::number(m_zoomFactor * 10))); else emit infoToShow(i18n("Zooming: %1%", QString::number(m_zoomFactor * 10))); |