Mercurial > octave-nkf

comparison libgui/src/settings-dialog.cc @ 18489:6eae8ba32e62 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
provide a long line marker in the editor * settings-dialog.ui: checkbox (enable) and spinbox (at column) for long line marker settings * settings-dialog.cc (constructor): insert line marker settings from file into the settings dialog; (write_changes_settings): write line marker settings from dialog into the file * file-editor-tab.cc (notice_settings): read line marker settings from file
author Torsten <ttl@justmail.de>
date Tue, 18 Feb 2014 21:38:51 +0100
parents 3df71e1d3b24
children 6e81b59d657c
comparison
equal deleted inserted replaced
18486:ca65b05b9a8a 18489:6eae8ba32e62
140 _editor_current_line_color->setEnabled (false); 140 _editor_current_line_color->setEnabled (false);
141 connect (ui->editor_highlightCurrentLine, SIGNAL (toggled (bool)), 141 connect (ui->editor_highlightCurrentLine, SIGNAL (toggled (bool)),
142 _editor_current_line_color, SLOT (setEnabled (bool))); 142 _editor_current_line_color, SLOT (setEnabled (bool)));
143 ui->editor_highlightCurrentLine->setChecked ( 143 ui->editor_highlightCurrentLine->setChecked (
144 settings->value ("editor/highlightCurrentLine",true).toBool () ); 144 settings->value ("editor/highlightCurrentLine",true).toBool () );
145 ui->editor_long_line_marker->setChecked (
146 settings->value ("editor/long_line_marker",true).toBool ());
147 ui->editor_long_line_column->setValue (
148 settings->value ("editor/long_line_column",80).toInt ());
145 149
146 ui->editor_codeCompletion->setChecked ( 150 ui->editor_codeCompletion->setChecked (
147 settings->value ("editor/codeCompletion", true).toBool () ); 151 settings->value ("editor/codeCompletion", true).toBool () );
148 ui->editor_spinbox_ac_threshold->setValue ( 152 ui->editor_spinbox_ac_threshold->setValue (
149 settings->value ("editor/codeCompletion_threshold",2).toInt ()); 153 settings->value ("editor/codeCompletion_threshold",2).toInt ());
179 settings->value ("editor/notebook_tab_width_max", 300).toInt ()); 183 settings->value ("editor/notebook_tab_width_max", 300).toInt ());
180 ui->editor_restoreSession->setChecked ( 184 ui->editor_restoreSession->setChecked (
181 settings->value ("editor/restoreSession", true).toBool ()); 185 settings->value ("editor/restoreSession", true).toBool ());
182 ui->editor_create_new_file->setChecked ( 186 ui->editor_create_new_file->setChecked (
183 settings->value ("editor/create_new_file",false).toBool ()); 187 settings->value ("editor/create_new_file",false).toBool ());
188
189 // terminal
184 ui->terminal_fontName->setCurrentFont (QFont ( 190 ui->terminal_fontName->setCurrentFont (QFont (
185 settings->value ("terminal/fontName","Courier New").toString ()) ); 191 settings->value ("terminal/fontName","Courier New").toString ()) );
186 ui->terminal_fontSize->setValue ( 192 ui->terminal_fontSize->setValue (
187 settings->value ("terminal/fontSize", 10).toInt ()); 193 settings->value ("terminal/fontSize", 10).toInt ());
188 194
540 ui->editor_showLineNumbers->isChecked ()); 546 ui->editor_showLineNumbers->isChecked ());
541 settings->setValue ("editor/highlightCurrentLine", 547 settings->setValue ("editor/highlightCurrentLine",
542 ui->editor_highlightCurrentLine->isChecked ()); 548 ui->editor_highlightCurrentLine->isChecked ());
543 settings->setValue ("editor/highlight_current_line_color", 549 settings->setValue ("editor/highlight_current_line_color",
544 _editor_current_line_color->color ()); 550 _editor_current_line_color->color ());
551 settings->setValue ("editor/long_line_marker",
552 ui->editor_long_line_marker->isChecked ());
553 settings->setValue ("editor/long_line_column",
554 ui->editor_long_line_column->value ());
545 settings->setValue ("editor/codeCompletion", 555 settings->setValue ("editor/codeCompletion",
546 ui->editor_codeCompletion->isChecked ()); 556 ui->editor_codeCompletion->isChecked ());
547 settings->setValue ("editor/codeCompletion_threshold", 557 settings->setValue ("editor/codeCompletion_threshold",
548 ui->editor_spinbox_ac_threshold->value ()); 558 ui->editor_spinbox_ac_threshold->value ());
549 settings->setValue ("editor/codeCompletion_keywords", 559 settings->setValue ("editor/codeCompletion_keywords",