Mercurial > hg > octave-nkf

diff libgui/src/m-editor/file-editor-tab.cc @ 18898:f6f1f27026bb gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status bars and code folding a user preference (bug #42306) * settings-dialog.ui: new checkboxes for status bars (main window and editor) and code folding * settings-dialog.cc (constructor): init new checkboxes from settings, (write-changed-settings): write boxes check states into settings * file-editor-tab.cc (constructor): do not set code folding here, (notice-settings): set code folding and show/hide status bar depending on settings * main-window.cc (notice-settings): show/hide status bar depending on settings
author Torsten <ttl@justmail.de>
date Tue, 06 May 2014 20:38:50 +0200
parents 99e26cb0f87f
children 095fdef3d67c
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc
+++ b/libgui/src/m-editor/file-editor-tab.cc
@@ -129,10 +129,6 @@
   _edit_area->setMarginsBackgroundColor (QColor (232, 232, 220));
   _edit_area->setMarginType (2, QsciScintilla::TextMargin);
 
-  // code folding
-  _edit_area->setMarginType (3, QsciScintilla::SymbolMargin);
-  _edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3);
-
   // other features
   _edit_area->setBraceMatching (QsciScintilla::StrictBraceMatch);
   _edit_area->setAutoIndent (true);
@@ -1379,6 +1375,23 @@
 
   update_lexer ();
 
+  // code folding
+  if (settings->value ("editor/code_folding",true).toBool ())
+    {
+      _edit_area->setMarginType (3, QsciScintilla::SymbolMargin);
+      _edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3);
+    }
+  else
+    {
+      _edit_area->setFolding (QsciScintilla::NoFoldStyle, 3);
+    }
+
+  // status bar
+  if (settings->value ("editor/show_edit_status_bar",true).toBool ())
+    _status_bar->show ();
+  else
+    _status_bar->hide ();
+
   //highlight current line color
   QVariant default_var = QColor (240, 240, 240);
   QColor setting_color = settings->value ("editor/highlight_current_line_color",