Mercurial > octave-dspies

comparison libgui/src/settings-dialog.cc @ 18976:dcb260e7a648

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 12:10:05 -0400
parents 479d1d3cb5c3 0be65bd7f369
children
comparison
equal deleted inserted replaced
18972:19cb2530c16b 18976:dcb260e7a648
204 settings->value ("editor/notebook_tab_width_max", 300).toInt ()); 204 settings->value ("editor/notebook_tab_width_max", 300).toInt ());
205 ui->editor_restoreSession->setChecked ( 205 ui->editor_restoreSession->setChecked (
206 settings->value ("editor/restoreSession", true).toBool ()); 206 settings->value ("editor/restoreSession", true).toBool ());
207 ui->editor_create_new_file->setChecked ( 207 ui->editor_create_new_file->setChecked (
208 settings->value ("editor/create_new_file",false).toBool ()); 208 settings->value ("editor/create_new_file",false).toBool ());
209 ui->editor_reload_changed_files->setChecked (
210 settings->value ("editor/always_reload_changed_files",false).toBool ());
209 211
210 // terminal 212 // terminal
211 ui->terminal_fontName->setCurrentFont (QFont ( 213 ui->terminal_fontName->setCurrentFont (QFont (
212 settings->value ("terminal/fontName","Courier New").toString ())); 214 settings->value ("terminal/fontName","Courier New").toString ()));
213 ui->terminal_fontSize->setValue ( 215 ui->terminal_fontSize->setValue (
647 ui->editor_notebook_tab_width_max->value ()); 649 ui->editor_notebook_tab_width_max->value ());
648 settings->setValue ("editor/restoreSession", 650 settings->setValue ("editor/restoreSession",
649 ui->editor_restoreSession->isChecked ()); 651 ui->editor_restoreSession->isChecked ());
650 settings->setValue ("editor/create_new_file", 652 settings->setValue ("editor/create_new_file",
651 ui->editor_create_new_file->isChecked ()); 653 ui->editor_create_new_file->isChecked ());
654 settings->setValue ("editor/always_reload_changed_files",
655 ui->editor_reload_changed_files->isChecked ());
652 settings->setValue ("terminal/fontSize", ui->terminal_fontSize->value ()); 656 settings->setValue ("terminal/fontSize", ui->terminal_fontSize->value ());
653 settings->setValue ("terminal/fontName", 657 settings->setValue ("terminal/fontName",
654 ui->terminal_fontName->currentFont ().family ()); 658 ui->terminal_fontName->currentFont ().family ());
655 659
656 settings->setValue ("filesdockwidget/showFileSize", 660 settings->setValue ("filesdockwidget/showFileSize",