Editors: Enhance smart backspace behavior

Adds a new smart backspace behavior option. Now it's also possible
to simply unindent (like a backtab). This is particularly useful
when the cursor is not inside an "indentation area" but the user
still wants to go backwards by indent levels when possible (for
example before a comment that appears after the code line). The
option also allows the user to reach a new indent level which has
not been seen so far in previous lines.

The original follows indentation user setting will be lost with this
patch, but we consider this ok for not very "significant" settings.

Change-Id: I49efb6b0309d9b7d7ff2a589413446bc16fb753c
Reviewed-on: http://codereview.qt.nokia.com/3105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h
index 26a1c6f7ec..885f4b2330 100644
--- a/src/plugins/texteditor/tabsettings.h
+++ b/src/plugins/texteditor/tabsettings.h
@@ -63,6 +63,13 @@ public:
         ContinuationAlignWithIndent = 2
     };
 
+    // This enum must match the indexes of smartBackspaceBehavior widget
+    enum SmartBackspaceBehavior {
+        BackspaceNeverIndents = 0,
+        BackspaceFollowsPreviousIndents = 1,
+        BackspaceUnindents = 2
+    };
+
     TabSettings();
 
     void toSettings(const QString &category, QSettings *s) const;
@@ -96,11 +103,11 @@ public:
     bool m_spacesForTabs;
     bool m_autoSpacesForTabs;
     bool m_autoIndent;
-    bool m_smartBackspace;
     int m_tabSize;
     int m_indentSize;
     TabKeyBehavior m_tabKeyBehavior;
     ContinuationAlignBehavior m_continuationAlignBehavior;
+    SmartBackspaceBehavior m_smartBackspaceBehavior;
 
     bool equals(const TabSettings &ts) const;
 };