From 0b735b9d5d5329c649818a6ba131755ef5c64c07 Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <echidnaman@kubuntu.org>
Date: Wed, 26 May 2010 12:42:25 -0400
Subject: Change the autoscroll checkbox to control whether or not the auto
 scroll feature is enabled, rather than wether or not it is disabled. This
 solves a HIG issue, since checkboxes are always supposed to enable an option
 when checked, rather than to disable an option when checked:
 http://techbase.kde.org/Projects/Usability/HIG/Check_Box

---
 src/rekonq.kcfg                     | 4 ++--
 src/settings/settings_appearance.ui | 9 ++++++---
 src/webview.cpp                     | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

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/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())
     {
-- 
cgit v1.2.1