Mercurial > octave
comparison libgui/src/settings-dialog.cc @ 31647:431f80aba37a
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 06 Dec 2022 15:37:43 -0500 |
parents | ad014fc78bd6 c6d54dd31a7e |
children | deb553ac2c54 |
comparison
equal
deleted
inserted
replaced
31645:bd9da634f00d | 31647:431f80aba37a |
---|---|
68 #include "octave-qtutils.h" | 68 #include "octave-qtutils.h" |
69 #include "settings-dialog.h" | 69 #include "settings-dialog.h" |
70 #include "variable-editor.h" | 70 #include "variable-editor.h" |
71 #include "workspace-model.h" | 71 #include "workspace-model.h" |
72 | 72 |
73 namespace octave | 73 OCTAVE_BEGIN_NAMESPACE(octave) |
74 { | |
75 | 74 |
76 settings_dialog::settings_dialog (QWidget *p, base_qobject& oct_qobj, | 75 settings_dialog::settings_dialog (QWidget *p, base_qobject& oct_qobj, |
77 const QString& desired_tab) | 76 const QString& desired_tab) |
78 : QDialog (p), Ui::settings_dialog (), m_octave_qobj (oct_qobj) | 77 : QDialog (p), Ui::settings_dialog (), m_octave_qobj (oct_qobj) |
79 { | 78 { |
306 m_rb_uncomment_strings[i]->setText (ed_comment_strings.at(i)); | 305 m_rb_uncomment_strings[i]->setText (ed_comment_strings.at(i)); |
307 m_rb_uncomment_strings[i]->setAutoExclusive (false); | 306 m_rb_uncomment_strings[i]->setAutoExclusive (false); |
308 m_rb_uncomment_strings[i]->setChecked ( 1 << i & selected_uncomment_string); | 307 m_rb_uncomment_strings[i]->setChecked ( 1 << i & selected_uncomment_string); |
309 layout_uncomment_strings->addWidget (m_rb_uncomment_strings[i]); | 308 layout_uncomment_strings->addWidget (m_rb_uncomment_strings[i]); |
310 } | 309 } |
311 | |
312 | 310 |
313 combo_eol_mode->setCurrentIndex (settings.value (ed_default_eol_mode).toInt ()); | 311 combo_eol_mode->setCurrentIndex (settings.value (ed_default_eol_mode).toInt ()); |
314 editor_auto_ind_checkbox->setChecked (settings.value (ed_auto_indent).toBool ()); | 312 editor_auto_ind_checkbox->setChecked (settings.value (ed_auto_indent).toBool ()); |
315 editor_tab_ind_checkbox->setChecked (settings.value (ed_tab_indents_line).toBool ()); | 313 editor_tab_ind_checkbox->setChecked (settings.value (ed_tab_indents_line).toBool ()); |
316 editor_bs_unind_checkbox->setChecked (settings.value (ed_backspace_unindents_line).toBool ()); | 314 editor_bs_unind_checkbox->setChecked (settings.value (ed_backspace_unindents_line).toBool ()); |
1614 | 1612 |
1615 settings.setValue (ve_color_mode.key, mode); | 1613 settings.setValue (ve_color_mode.key, mode); |
1616 | 1614 |
1617 settings.sync (); | 1615 settings.sync (); |
1618 } | 1616 } |
1619 } | 1617 |
1618 OCTAVE_END_NAMESPACE(octave) |