diff options
| -rw-r--r-- | src/bookmarks/bookmarksmanager.cpp | 4 | ||||
| -rw-r--r-- | src/history/historypanel.cpp | 4 | ||||
| -rw-r--r-- | src/newtabpage.cpp | 2 | ||||
| -rw-r--r-- | src/rekonq.kcfg | 4 | ||||
| -rw-r--r-- | src/settings/settings_appearance.ui | 9 | ||||
| -rw-r--r-- | src/urlbar/urlresolver.cpp | 2 | ||||
| -rw-r--r-- | src/webview.cpp | 2 |
7 files changed, 17 insertions, 10 deletions
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index 503e1df8..c06375b5 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -100,7 +100,9 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bookmark) if (urlList.length() > 8) { if ( !(KMessageBox::warningContinueCancel( Application::instance()->mainWindow(), - i18n("You are about to open %1 tabs.\nAre you sure?", + i18ncp("%1=Number of tabs. Value is always >=8", + "You are about to open %1 tabs.\nAre you sure?", + "You are about to open %1 tabs.\nAre you sure?", QString::number( urlList.length() )) ) == KMessageBox::Continue) ) diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp index 65c9de81..28284e0a 100644 --- a/src/history/historypanel.cpp +++ b/src/history/historypanel.cpp @@ -172,7 +172,9 @@ void HistoryPanel::openAll() if (allChild.length() > 8) { if (!(KMessageBox::warningContinueCancel(this, - i18n("You are about to open %1 tabs.\nAre you sure?", + i18ncp("%1=Number of tabs. Value is always >=8", + "You are about to open %1 tabs.\nAre you sure?", + "You are about to open %1 tabs.\nAre you sure?", QString::number(allChild.length()))) == KMessageBox::Continue) ) return; diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index b3b9cf65..015e655b 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -582,7 +582,7 @@ void NewTabPage::downloadsPage() div.appendInside("<em>" + date + "</em>"); div.appendInside("<br/>"); - div.appendInside(item.srcUrlString); + div.appendInside("<a href=" + item.srcUrlString + ">" + item.srcUrlString + "</a>"); div.appendInside("<br/>"); div.appendInside(markup("a")); diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg index 07c079a5..5800121b 100644 --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -69,8 +69,8 @@ <entry name="searchEngine" type="Int"> <default>0</default> </entry> - <entry name="disableAutoScroll" type="Bool"> - <default>false</default> + <entry name="autoScroll" type="Bool"> + <default>true</default> </entry> </group> diff --git a/src/settings/settings_appearance.ui b/src/settings/settings_appearance.ui index 92d15cc6..e0da6970 100644 --- a/src/settings/settings_appearance.ui +++ b/src/settings/settings_appearance.ui @@ -186,12 +186,15 @@ </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QCheckBox" name="kcfg_disableAutoScroll"> + <widget class="QCheckBox" name="kcfg_autoScroll"> <property name="toolTip"> - <string>Disable automatic scrolling on middle click in a web page</string> + <string>Toggle automatic scrolling on middle click in a web page</string> </property> <property name="text"> - <string>Disable auto scrolling</string> + <string>Auto-scroll on middle-click</string> + </property> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp index 07b40bac..494c8145 100644 --- a/src/urlbar/urlresolver.cpp +++ b/src/urlbar/urlresolver.cpp @@ -74,7 +74,7 @@ UrlResolver::UrlResolver(const QString &typedUrl) { kDebug() << "browse regexp empty. Setting value.."; - QString protocol = "^(http://|https://|file://|ftp://)"; + QString protocol = "^(http://|https://|file://|ftp://|man:|info:)"; QString local = "^/"; diff --git a/src/webview.cpp b/src/webview.cpp index 878a7403..a26cf63f 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -316,7 +316,7 @@ void WebView::mousePressEvent(QMouseEvent *event) } QWebHitTestResult result = page()->mainFrame()->hitTestContent(event->pos()); - _canEnableAutoScroll = !ReKonfig::disableAutoScroll() && !result.isContentEditable() && result.linkUrl().isEmpty(); + _canEnableAutoScroll = ReKonfig::autoScroll() && !result.isContentEditable() && result.linkUrl().isEmpty(); switch (event->button()) { |