summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorAl <gabriel.cortesi@outlook.com>2019-05-21 11:23:08 +0200
committerGitHub <noreply@github.com>2019-05-21 11:23:08 +0200
commit0078fd12d0fb2de4fab6f9726b0c64cf5fa8da00 (patch)
tree4cd3e4b51b3ea43a866aa74c3e11bb9b5f0d30b0 /src/mainwindow.cpp
parentf966e7db9363230673ce5a85dd1ab53846f73521 (diff)
parent0088ee963b25495e6cce790005dcf1356a73e7b8 (diff)
Merge pull request #726 from isanae/Develop
adds a no-conflict list in the conflicts tab, makes all three lists collapsible
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9108464f..89cb9f56 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2983,7 +2983,7 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
dialog.openTab(tab);
}
- dialog.restoreTabState(m_OrganizerCore.settings().directInterface().value("mod_info_tabs").toByteArray());
+ dialog.restoreState(m_OrganizerCore.settings());
QSettings &settings = m_OrganizerCore.settings().directInterface();
QString key = QString("geometry/%1").arg(dialog.objectName());
if (settings.contains(key)) {
@@ -3001,7 +3001,7 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
}
dialog.exec();
- m_OrganizerCore.settings().directInterface().setValue("mod_info_tabs", dialog.saveTabState());
+ dialog.saveState(m_OrganizerCore.settings());
settings.setValue(key, dialog.saveGeometry());
modInfo->saveMeta();