Move application specific state to QSettings
This commit is contained in:
parent
73e0629ab4
commit
6f31e645ec
@ -202,33 +202,29 @@ int MainWindow::readState(QString path) {
|
|||||||
settings.beginGroup("MainWindow");
|
settings.beginGroup("MainWindow");
|
||||||
restoreGeometry(settings.value("geometry").toByteArray());
|
restoreGeometry(settings.value("geometry").toByteArray());
|
||||||
restoreState(settings.value("windowState").toByteArray());
|
restoreState(settings.value("windowState").toByteArray());
|
||||||
|
auto json = settings.value("json").toString();
|
||||||
|
err |= readJson(json, &m_state);
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
|
|
||||||
QString json;
|
|
||||||
QFile file(path);
|
|
||||||
err |= !file.open(QIODevice::ReadOnly);
|
|
||||||
json = QTextStream(&file).readAll();
|
|
||||||
file.close();
|
|
||||||
err |= readJson(json, &m_state);
|
|
||||||
err |= openProject(m_state.projectPath);
|
err |= openProject(m_state.projectPath);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
int MainWindow::writeState(QString path) {
|
int MainWindow::writeState(QString path) {
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
|
// generate JSON for application specific state info
|
||||||
|
QString json;
|
||||||
|
err |= writeJson(&json, &m_state);
|
||||||
|
|
||||||
QSettings settings("Drinking Tea", "nostalgia-studio");
|
QSettings settings("Drinking Tea", "nostalgia-studio");
|
||||||
settings.beginGroup("MainWindow");
|
settings.beginGroup("MainWindow");
|
||||||
settings.setValue("geometry", saveGeometry());
|
settings.setValue("geometry", saveGeometry());
|
||||||
settings.setValue("windowState", saveState());
|
settings.setValue("windowState", saveState());
|
||||||
|
settings.setValue("json", json);
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
|
|
||||||
QString json;
|
|
||||||
err |= writeJson(&json, &m_state);
|
|
||||||
QFile file(path);
|
|
||||||
err |= !file.open(QIODevice::WriteOnly);
|
|
||||||
QTextStream(&file) << json;
|
|
||||||
file.close();
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -365,7 +361,6 @@ void MainWindow::showImportWizard() {
|
|||||||
void MainWindow::refreshProjectExplorer(QString path) {
|
void MainWindow::refreshProjectExplorer(QString path) {
|
||||||
if (m_oxfsView) {
|
if (m_oxfsView) {
|
||||||
m_oxfsView->updateFile(path);
|
m_oxfsView->updateFile(path);
|
||||||
qInfo() << "asdf\n";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user