Mercurial > octave-nkf
changeset 16679:cf939872811c
options for auto completion threshold, source and word replacement in settings
* settings-dialog.ui: new settings for auto completion threshold, source and
word replacement
* settings-dailog.cc(constructor): load values for new settings from file;
(write_changed_settings): store values of new settings to settings file
* file-editor-tab.cc(notice_settings): load values for auto completion
threshold, source and word replacement from settings
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Sat, 18 May 2013 16:13:53 +0200 |
| parents | 518dbe0ae857 |
| children | de79cdbbdf7c |
| files | libgui/src/m-editor/file-editor-tab.cc libgui/src/settings-dialog.cc libgui/src/settings-dialog.ui |
| diffstat | 3 files changed, 252 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc Sat May 18 15:17:03 2013 +0200 +++ b/libgui/src/m-editor/file-editor-tab.cc Sat May 18 16:13:53 2013 +0200 @@ -1093,8 +1093,30 @@ _edit_area->setCaretLineVisible (settings->value ("editor/highlightCurrentLine", true).toBool ()); - if (settings->value ("editor/codeCompletion", true).toBool ()) - _edit_area->setAutoCompletionThreshold (1); + if (settings->value ("editor/codeCompletion", true).toBool ()) // auto compl. + { + bool match_keywords = settings->value + ("editor/codeCompletion_keywords",true).toBool (); + bool match_document = settings->value + ("editor/codeCompletion_document",true).toBool (); + + QsciScintilla::AutoCompletionSource source = QsciScintilla::AcsNone; + if (match_keywords) + if (match_document) + source = QsciScintilla::AcsAll; + else + source = QsciScintilla::AcsAPIs; + else + if (match_document) + source = QsciScintilla::AcsDocument; + _edit_area->setAutoCompletionSource (source); + + _edit_area->setAutoCompletionReplaceWord + (settings->value ("editor/codeCompletion_replace",false).toBool ()); + + _edit_area->setAutoCompletionThreshold + (settings->value ("editor/codeCompletion_threshold",2).toInt ()); + } else _edit_area->setAutoCompletionThreshold (-1);
--- a/libgui/src/settings-dialog.cc Sat May 18 15:17:03 2013 +0200 +++ b/libgui/src/settings-dialog.cc Sat May 18 16:13:53 2013 +0200 @@ -93,6 +93,10 @@ ui->editor_showLineNumbers->setChecked (settings->value ("editor/showLineNumbers",true).toBool () ); ui->editor_highlightCurrentLine->setChecked (settings->value ("editor/highlightCurrentLine",true).toBool () ); ui->editor_codeCompletion->setChecked (settings->value ("editor/codeCompletion",true).toBool () ); + ui->editor_spinbox_ac_threshold->setValue (settings->value ("editor/codeCompletion_threshold",2).toInt ()); + ui->editor_checkbox_ac_keywords->setChecked (settings->value ("editor/codeCompletion_keywords",true).toBool ()); + ui->editor_checkbox_ac_document->setChecked (settings->value ("editor/codeCompletion_document",false).toBool ()); + ui->editor_checkbox_ac_replace->setChecked (settings->value ("editor/codeCompletion_replace",false).toBool ()); ui->editor_longWindowTitle->setChecked (settings->value ("editor/longWindowTitle",false).toBool ()); ui->editor_restoreSession->setChecked (settings->value ("editor/restoreSession",true).toBool ()); ui->terminal_fontName->setCurrentFont (QFont (settings->value ("terminal/fontName","Courier New").toString()) ); @@ -374,6 +378,10 @@ settings->setValue ("editor/showLineNumbers", ui->editor_showLineNumbers->isChecked ()); settings->setValue ("editor/highlightCurrentLine", ui->editor_highlightCurrentLine->isChecked ()); settings->setValue ("editor/codeCompletion", ui->editor_codeCompletion->isChecked ()); + settings->setValue ("editor/codeCompletion_threshold", ui->editor_spinbox_ac_threshold->value ()); + settings->setValue ("editor/codeCompletion_keywords", ui->editor_checkbox_ac_keywords->isChecked ()); + settings->setValue ("editor/codeCompletion_document", ui->editor_checkbox_ac_document->isChecked ()); + settings->setValue ("editor/codeCompletion_replace", ui->editor_checkbox_ac_replace->isChecked ()); settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked()); settings->setValue ("editor/restoreSession", ui->editor_restoreSession->isChecked ()); settings->setValue ("terminal/fontSize", ui->terminal_fontSize->value());
--- a/libgui/src/settings-dialog.ui Sat May 18 15:17:03 2013 +0200 +++ b/libgui/src/settings-dialog.ui Sat May 18 16:13:53 2013 +0200 @@ -32,7 +32,7 @@ <item> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>3</number> + <number>0</number> </property> <widget class="QWidget" name="tab_4"> <property name="enabled"> @@ -196,10 +196,7 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_6"> <item> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_4"/> - </item> + <layout class="QVBoxLayout" name="verticalLayout_9"> <item> <widget class="QCheckBox" name="editor_showLineNumbers"> <property name="enabled"> @@ -221,19 +218,6 @@ </widget> </item> <item> - <widget class="QCheckBox" name="editor_codeCompletion"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>Code completion</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> - </item> - <item> <widget class="QCheckBox" name="editor_longWindowTitle"> <property name="text"> <string>Show complete path in window title</string> @@ -247,6 +231,144 @@ </property> </widget> </item> + <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="2"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>6</number> + </property> + <item> + <widget class="QLabel" name="editor_label_ac_threshold"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Characters before list with suggestions is displayed</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="editor_spinbox_ac_threshold"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string/> + </property> + <property name="whatsThis"> + <string/> + </property> + <property name="suffix"> + <string/> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>6</number> + </property> + <property name="value"> + <number>2</number> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="1" column="2"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QCheckBox" name="editor_checkbox_ac_keywords"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Match keywords</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="editor_checkbox_ac_document"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Match words in document</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_8"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="0" column="0"> + <widget class="QCheckBox" name="editor_codeCompletion"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Code completion</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="2"> + <widget class="QCheckBox" name="editor_checkbox_ac_replace"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Replace the rest of the actual word by suggested word</string> + </property> + </widget> + </item> + </layout> + </item> </layout> </item> <item> @@ -918,5 +1040,85 @@ </hint> </hints> </connection> + <connection> + <sender>editor_codeCompletion</sender> + <signal>toggled(bool)</signal> + <receiver>editor_label_ac_threshold</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>83</x> + <y>223</y> + </hint> + <hint type="destinationlabel"> + <x>288</x> + <y>223</y> + </hint> + </hints> + </connection> + <connection> + <sender>editor_codeCompletion</sender> + <signal>toggled(bool)</signal> + <receiver>editor_spinbox_ac_threshold</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>83</x> + <y>223</y> + </hint> + <hint type="destinationlabel"> + <x>412</x> + <y>223</y> + </hint> + </hints> + </connection> + <connection> + <sender>editor_codeCompletion</sender> + <signal>toggled(bool)</signal> + <receiver>editor_checkbox_ac_keywords</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>83</x> + <y>170</y> + </hint> + <hint type="destinationlabel"> + <x>238</x> + <y>201</y> + </hint> + </hints> + </connection> + <connection> + <sender>editor_codeCompletion</sender> + <signal>toggled(bool)</signal> + <receiver>editor_checkbox_ac_document</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>83</x> + <y>170</y> + </hint> + <hint type="destinationlabel"> + <x>390</x> + <y>201</y> + </hint> + </hints> + </connection> + <connection> + <sender>editor_codeCompletion</sender> + <signal>toggled(bool)</signal> + <receiver>editor_checkbox_ac_replace</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>83</x> + <y>170</y> + </hint> + <hint type="destinationlabel"> + <x>427</x> + <y>229</y> + </hint> + </hints> + </connection> </connections> </ui>