Index: src/sdk/cbeditor.cpp
===================================================================
--- src/sdk/cbeditor.cpp    (revision 3463)
+++ src/sdk/cbeditor.cpp    (working copy)
@@ -1480,22 +1480,28 @@
 bool cbEditor::DoFoldLine(int line, int fold)
 {
     int level = m_pControl->GetFoldLevel(line);
+    ConfigManager* mgr = Manager::Get()->GetConfigManager(_T("editor"));
     if ((level & wxSCI_FOLDLEVELHEADERFLAG) &&
             (wxSCI_FOLDLEVELBASE == (level & wxSCI_FOLDLEVELNUMBERMASK))) //Check for top fold headers
     {
-        bool expand = false;
-        int maxLine = m_pControl->GetLastChild(line, -1);
-        if (fold == 2) // toggle
-            expand = !m_pControl->GetFoldExpanded(line);
-        else
-            expand = fold == 0;
-        m_pControl->SetFoldExpanded(line, expand);
-        if (maxLine > line)
+        if (mgr->ReadInt(_T("/folding/fold_all_options"), 0) == 0 ||
+            mgr->ReadInt(_T("/folding/fold_all_options"), 0) == 2 ||
+            fold != 1)
         {
-            if (expand)
-                m_pControl->ShowLines(line + 1, maxLine);
+            bool expand = false;
+            int maxLine = m_pControl->GetLastChild(line, -1);
+            if (fold == 2) // toggle
+                expand = !m_pControl->GetFoldExpanded(line);
             else
-                m_pControl->HideLines(line + 1, maxLine);
+                expand = fold == 0;
+            m_pControl->SetFoldExpanded(line, expand);
+            if (maxLine > line)
+            {
+                if (expand)
+                    m_pControl->ShowLines(line + 1, maxLine);
+                else
+                    m_pControl->HideLines(line + 1, maxLine);
+            }
         }
         return true;
     }
@@ -1505,19 +1511,28 @@
     if ((level & wxSCI_FOLDLEVELHEADERFLAG) &&
             (wxSCI_FOLDLEVELBASE < (level & wxSCI_FOLDLEVELNUMBERMASK))) //Check for sub fold headers
     {
-        bool expand = false;
-        int maxLine = m_pControl->GetLastChild(line, -1);
-        if (fold == 2) // toggle
-            expand = !m_pControl->GetFoldExpanded(line);
-        else
-            expand = fold == 0;
-        m_pControl->SetFoldExpanded(line, expand);
-        if (maxLine > line)
+        if (mgr->ReadInt(_T("/folding/fold_all_options"), 0) == 1 ||
+            mgr->ReadInt(_T("/folding/fold_all_options"), 0) == 2 ||
+            fold != 1)
         {
-            if (expand)
-                m_pControl->ShowLines(line + 1, maxLine);
-            else
-                m_pControl->HideLines(line + 1, maxLine);
+            int thisLevel = (level & wxSCI_FOLDLEVELNUMBERMASK);
+            if (thisLevel <= (mgr->ReadInt(_T("/folding/fold_sub_depth"), 0) + wxSCI_FOLDLEVELBASE) || fold != 1)
+            {
+                bool expand = false;
+                int maxLine = m_pControl->GetLastChild(line, -1);
+                if (fold == 2) // toggle
+                    expand = !m_pControl->GetFoldExpanded(line);
+                else
+                    expand = fold == 0;
+                m_pControl->SetFoldExpanded(line, expand);
+                if (maxLine > line)
+                {
+                    if (expand)
+                        m_pControl->ShowLines(line + 1, maxLine);
+                    else
+                        m_pControl->HideLines(line + 1, maxLine);
+                }
+            }
         }
         return true;
     }
Index: src/sdk/editorconfigurationdlg.cpp
===================================================================
--- src/sdk/editorconfigurationdlg.cpp    (revision 3463)
+++ src/sdk/editorconfigurationdlg.cpp    (working copy)
@@ -156,6 +156,8 @@
        XRCCTRL(*this, "chkFoldPreprocessor", wxCheckBox)->SetValue(cfg->ReadBool(_T("/folding/fold_preprocessor"), false));
        XRCCTRL(*this, "chkFoldComments", wxCheckBox)->SetValue(cfg->ReadBool(_T("/folding/fold_comments"), true));
        XRCCTRL(*this, "chkFoldXml", wxCheckBox)->SetValue(cfg->ReadBool(_T("/folding/fold_xml"), true));
+       XRCCTRL(*this, "spnSubLevelDepth", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/folding/fold_sub_depth"), 1));
+    XRCCTRL(*this, "rbFoldAllOptions", wxRadioBox)->SetSelection(cfg->ReadInt(_T("/folding/fold_all_options"), 0));
 
     //gutter
     wxColour gutterColour = cfg->ReadColour(_T("/gutter/colour"), *wxLIGHT_GREY);
@@ -871,6 +873,8 @@
         cfg->Write(_T("/folding/fold_preprocessor"),     XRCCTRL(*this, "chkFoldPreprocessor", wxCheckBox)->GetValue());
         cfg->Write(_T("/folding/fold_comments"),         XRCCTRL(*this, "chkFoldComments", wxCheckBox)->GetValue());
         cfg->Write(_T("/folding/fold_xml"),             XRCCTRL(*this, "chkFoldXml", wxCheckBox)->GetValue());
+        cfg->Write(_T("/folding/fold_sub_depth"),         XRCCTRL(*this, "spnSubLevelDepth", wxSpinCtrl)->GetValue());
+        cfg->Write(_T("/folding/fold_all_options"),    XRCCTRL(*this, "rbFoldAllOptions", wxRadioBox)->GetSelection());
 
         //eol
         cfg
download for full patch...