Mercurial > octave-dspies
diff gui/src/settings-dialog.cc @ 15164:bc801a44bb1f
follow Octave pattern for resource_manager singleton
* resource-manager.h, resource-manager.cc: Don't expose pointer to
instance. Use static forwarding functions to access instance and
perform actions.
* files-dockwidget.cc, file-editor-tab.cc, lexer-octave-gui.cc,
main-window.cc, octave-gui.cc, settings-dialog.cc, workspace-view.cc:
Use resource_manager::METHOD instead of
resource_manager::instance()->METHOD.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 13 Aug 2012 12:16:26 -0400 |
| parents | 141b0b108292 |
| children |
line wrap: on
line diff
--- a/gui/src/settings-dialog.cc Mon Aug 13 10:32:19 2012 -0400 +++ b/gui/src/settings-dialog.cc Mon Aug 13 12:16:26 2012 -0400 @@ -25,7 +25,10 @@ { ui->setupUi (this); - QSettings *settings = resource_manager::instance ()->get_settings (); + QSettings *settings = resource_manager::get_settings (); + + // FIXME -- what should happen if settings is 0? + ui->useCustomFileEditor->setChecked (settings->value ("useCustomFileEditor").toBool ()); ui->customFileEditor->setText (settings->value ("customFileEditor").toString ()); ui->editor_showLineNumbers->setChecked (settings->value ("editor/showLineNumbers",true).toBool () ); @@ -77,7 +80,10 @@ settings_dialog::~settings_dialog () { - QSettings *settings = resource_manager::instance ()->get_settings (); + QSettings *settings = resource_manager::get_settings (); + + // FIXME -- what should happen if settings is 0? + settings->setValue ("useCustomFileEditor", ui->useCustomFileEditor->isChecked ()); settings->setValue ("customFileEditor", ui->customFileEditor->text ()); settings->setValue ("editor/showLineNumbers", ui->editor_showLineNumbers->isChecked ());