From 4743583e3852d616daf7a7ade480ac5d04295474 Mon Sep 17 00:00:00 2001
From: Johannes Troscher <fritz_van_tom@hotmail.com>
Date: Sun, 21 Aug 2011 18:15:06 +0200
Subject: Fix vi-like navigation shortcuts

This patch introduces a check on input/textarea elements to be sure
we are NOT stealing focus there.. ;)
It also introduces a check to let the feature being optional (just to
be completely sure... )

CCBUG: 238761
REVIEW: 102255
REVIEWED-BY: adjam,elproxy
---
 src/settings/settings_general.ui | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/settings')

diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index d0c31655..3f7c0675 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -194,6 +194,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_enableViShortcuts">
+        <property name="text">
+         <string>Enable Vi-like navigation shortcuts</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -213,16 +220,16 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
-- 
cgit v1.2.1