diff gui/src/FileEditorMdiSubWindow.cpp @ 14307:be3e1a14a6de gui

Added an interface settings tab to the settings dialog. Made a few improvements on the editor. Wrote a small welcome text in the welcome wizard. Moved configuration file to ~/.config/octave-gui/settings. * FileEditorMdiSubWindow: Set sources for code completion to all, lowered completion threshold, changed colors. * SettingsDialog: Added interface tab with shortcut configuration table widget. * WelcomeWizard: Wrote a little text to appear at startup.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Wed, 01 Feb 2012 15:53:19 +0100
parents c3b62d211b80
children
line wrap: on
line diff
--- a/gui/src/FileEditorMdiSubWindow.cpp
+++ b/gui/src/FileEditorMdiSubWindow.cpp
@@ -428,20 +428,20 @@
   m_editor->setMarginType (3, QsciScintilla::SymbolMargin);
   m_editor->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3);
   // other features
-  if ( settings->value ("editor/highlightActualLine",true).toBool () )
+  if ( settings->value ("editor/highlightCurrentLine",true).toBool () )
     {
       m_editor->setCaretLineVisible(true);
-      m_editor->setCaretLineBackgroundColor(QColor(255,255,200));
+      m_editor->setCaretLineBackgroundColor(QColor(245,245,245));
     }
-  m_editor->setBraceMatching (QsciScintilla::SloppyBraceMatch);
+  m_editor->setBraceMatching (QsciScintilla::StrictBraceMatch);
   m_editor->setAutoIndent (true);
   m_editor->setIndentationWidth (2);
   m_editor->setIndentationsUseTabs (false);
   if ( settings->value ("editor/codeCompletion",true).toBool () )
     {
-      m_editor->autoCompleteFromAll();
-      m_editor->setAutoCompletionSource(QsciScintilla::AcsAPIs);
-      m_editor->setAutoCompletionThreshold (3);
+      m_editor->autoCompleteFromAll ();
+      m_editor->setAutoCompletionSource(QsciScintilla::AcsAll);
+      m_editor->setAutoCompletionThreshold (1);
     }
   m_editor->setUtf8 (true);
   m_longTitle = settings->value ("editor/longWindowTitle",true).toBool ();