# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2016-09-02 14:41:06 # Node ID 663a37aabb7186ce551c153ab88282989c9f22dc # Parent 2903e12a8854f96b929192a4410c0147ea68609f added saveMWSettings diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -191,14 +191,14 @@ MainWindow::MainWindow(QWidget *parent) // load default settings QSettings settings("serialplot", "serialplot"); - loadSettings(&settings); + loadAllSettings(&settings); } MainWindow::~MainWindow() { // save settings QSettings settings("serialplot", "serialplot"); - saveSettings(&settings); + saveAllSettings(&settings); if (serialPort.isOpen()) { @@ -418,28 +418,34 @@ void MainWindow::messageHandler(QtMsgTyp } } -void MainWindow::saveSettings(QSettings* settings) +void MainWindow::saveAllSettings(QSettings* settings) +{ + saveMWSettings(settings); + portControl.saveSettings(settings); +} + +void MainWindow::loadAllSettings(QSettings* settings) +{ + loadMWSettings(settings); + portControl.loadSettings(settings); +} + +void MainWindow::saveMWSettings(QSettings* settings) { // save window geometry settings->beginGroup("MainWindow"); settings->setValue("size", size()); settings->setValue("pos", pos()); settings->endGroup(); - - // save port settings - portControl.saveSettings(settings); } -void MainWindow::loadSettings(QSettings* settings) +void MainWindow::loadMWSettings(QSettings* settings) { // load window geometry settings->beginGroup("MainWindow"); resize(settings->value("size", size()).toSize()); move(settings->value("pos", pos()).toPoint()); settings->endGroup(); - - // load port settings - portControl.loadSettings(settings); } void MainWindow::onSaveSettings() @@ -450,7 +456,7 @@ void MainWindow::onSaveSettings() if (!fileName.isNull()) // user canceled { QSettings settings(fileName, QSettings::IniFormat); - saveSettings(&settings); + saveAllSettings(&settings); } } @@ -462,6 +468,6 @@ void MainWindow::onLoadSettings() if (!fileName.isNull()) // user canceled { QSettings settings(fileName, QSettings::IniFormat); - loadSettings(&settings); + loadAllSettings(&settings); } } diff --git a/src/mainwindow.h b/src/mainwindow.h --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -81,10 +81,14 @@ private: PlotControlPanel plotControlPanel; bool isDemoRunning(); + /// Stores settings for all modules + void saveAllSettings(QSettings* settings); + /// Load settings for all modules + void loadAllSettings(QSettings* settings); /// Stores main window settings into a `QSettings` - void saveSettings(QSettings* settings); + void saveMWSettings(QSettings* settings); /// Loads main window settings from a `QSettings` - void loadSettings(QSettings* settings); + void loadMWSettings(QSettings* settings); private slots: void onPortToggled(bool open);