summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mainwindow.cpp73
-rw-r--r--src/mainwindow.h9
-rw-r--r--src/settings.cpp40
-rw-r--r--src/settings.h12
4 files changed, 79 insertions, 55 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d4673701..95aa0b38 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -368,18 +368,24 @@ MainWindow::MainWindow(Settings &settings
initDownloadView();
- bool pluginListAdjusted = registerWidgetState(
- ui->espList->objectName(), ui->espList->header(), "plugin_list_state");
+ bool pluginListAdjusted = false;
+ if (auto v=m_OrganizerCore.settings().geometry().getPluginListHeader()) {
+ ui->espList->header()->restoreState(*v);
+ pluginListAdjusted = true;
+ }
- registerWidgetState(ui->dataTree->objectName(), ui->dataTree->header());
+ if (auto v=m_OrganizerCore.settings().geometry().getDataTreeHeader()) {
+ ui->dataTree->header()->restoreState(*v);
+ }
- registerWidgetState(
- ui->downloadView->objectName(), ui->downloadView->header());
+ if (auto v=m_OrganizerCore.settings().geometry().getDownloadViewHeader()) {
+ ui->downloadView->header()->restoreState(*v);
+ }
ui->splitter->setStretchFactor(0, 3);
ui->splitter->setStretchFactor(1, 2);
- resizeLists(modListAdjusted, pluginListAdjusted);
+ resizeLists(pluginListAdjusted);
QMenu *linkMenu = new QMenu(this);
m_LinkToolbar = linkMenu->addAction(QIcon(":/MO/gui/link"), tr("Toolbar and Menu"), this, SLOT(linkToolbar()));
@@ -581,10 +587,9 @@ void MainWindow::setupModList()
ui->modList->header()->installEventFilter(m_OrganizerCore.modList());
- const bool modListAdjusted = registerWidgetState(
- ui->modList->objectName(), ui->modList->header(), "mod_list_state");
+ if (auto v=m_OrganizerCore.settings().geometry().getModListHeader()) {
+ ui->modList->header()->restoreState(*v);
- if (modListAdjusted) {
// hack: force the resize-signal to be triggered because restoreState doesn't seem to do that
for (int column = 0; column <= ModList::COL_LASTCOLUMN; ++column) {
int sectionSize = ui->modList->header()->sectionSize(column);
@@ -598,6 +603,13 @@ void MainWindow::setupModList()
ui->modList->header()->setSectionHidden(ModList::COL_GAME, true);
ui->modList->header()->setSectionHidden(ModList::COL_INSTALLTIME, true);
ui->modList->header()->setSectionHidden(ModList::COL_NOTES, true);
+
+ // resize mod list to fit content
+ for (int i = 0; i < ui->modList->header()->count(); ++i) {
+ ui->modList->header()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
+ }
+
+ ui->modList->header()->setSectionResizeMode(ModList::COL_NAME, QHeaderView::Stretch);
}
// prevent the name-column from being hidden
@@ -720,16 +732,8 @@ void MainWindow::disconnectPlugins()
}
-void MainWindow::resizeLists(bool modListCustom, bool pluginListCustom)
+void MainWindow::resizeLists(bool pluginListCustom)
{
- if (!modListCustom) {
- // resize mod list to fit content
- for (int i = 0; i < ui->modList->header()->count(); ++i) {
- ui->modList->header()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
- }
- ui->modList->header()->setSectionResizeMode(ModList::COL_NAME, QHeaderView::Stretch);
- }
-
// ensure the columns aren't so small you can't see them any more
for (int i = 0; i < ui->modList->header()->count(); ++i) {
if (ui->modList->header()->sectionSize(i) < 10) {
@@ -2391,10 +2395,10 @@ void MainWindow::storeSettings(Settings& s) {
settings.setValue("browser_geometry", m_IntegratedBrowser.saveGeometry());
settings.setValue("filters_visible", ui->displayCategoriesBtn->isChecked());
- for (const std::pair<QString, QHeaderView*> kv : m_PersistedGeometry) {
- QString key = QString("geometry/") + kv.first;
- settings.setValue(key, kv.second->saveState());
- }
+ s.geometry().setPluginListHeader(ui->espList->header()->saveState());
+ s.geometry().setDataTreeHeader(ui->dataTree->header()->saveState());
+ s.geometry().setDownloadViewHeader(ui->downloadView->header()->saveState());
+ s.geometry().setModListHeader(ui->modList->header()->saveState());
DockFixer::save(this, s);
}
@@ -6892,31 +6896,6 @@ void MainWindow::dropLocalFile(const QUrl &url, const QString &outputDir, bool m
}
}
-bool MainWindow::registerWidgetState(const QString &name, QHeaderView *view, const char *oldSettingName) {
- // register the view so it's geometry gets saved at exit
- m_PersistedGeometry.push_back(std::make_pair(name, view));
-
- // also, restore the geometry if it was saved before
- QSettings &settings = m_OrganizerCore.settings().directInterface();
-
- QString key = QString("geometry/%1").arg(name);
- QByteArray data;
-
- if ((oldSettingName != nullptr) && settings.contains(oldSettingName)) {
- data = settings.value(oldSettingName).toByteArray();
- settings.remove(oldSettingName);
- } else if (settings.contains(key)) {
- data = settings.value(key).toByteArray();
- }
-
- if (!data.isEmpty()) {
- view->restoreState(data);
- return true;
- } else {
- return false;
- }
-}
-
void MainWindow::dropEvent(QDropEvent *event)
{
Qt::DropAction action = event->proposedAction();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 5ddb9bef..46f04784 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -316,8 +316,6 @@ private:
void dropLocalFile(const QUrl &url, const QString &outputDir, bool move);
- bool registerWidgetState(const QString &name, QHeaderView *view, const char *oldSettingName = nullptr);
-
void sendSelectedModsToPriority(int newPriority);
void sendSelectedPluginsToPriority(int newPriority);
@@ -405,8 +403,6 @@ private:
bool m_showArchiveData{ true };
- std::vector<std::pair<QString, QHeaderView*>> m_PersistedGeometry;
-
MOBase::DelayedFileWriter m_ArchiveListWriter;
QAction* m_LinkToolbar;
@@ -604,10 +600,7 @@ private slots:
void expandModList(const QModelIndex &index);
- /**
- * @brief resize columns in mod list and plugin list to content
- */
- void resizeLists(bool modListCustom, bool pluginListCustom);
+ void resizeLists(bool pluginListCustom);
/**
* @brief allow columns in mod list and plugin list to be resized
diff --git a/src/settings.cpp b/src/settings.cpp
index da3b42a0..d9440aa4 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -957,6 +957,46 @@ void GeometrySettings::setCategoriesDialog(const QByteArray& v)
m_Settings.setValue("geometry/CategoriesDialog", v);
}
+std::optional<QByteArray> GeometrySettings::getPluginListHeader() const
+{
+ return getOptional<QByteArray>(m_Settings, "geometry/espList");
+}
+
+void GeometrySettings::setPluginListHeader(const QByteArray& v) const
+{
+ m_Settings.setValue("geometry/espList", v);
+}
+
+std::optional<QByteArray> GeometrySettings::getDataTreeHeader() const
+{
+ return getOptional<QByteArray>(m_Settings, "geometry/dataTree");
+}
+
+void GeometrySettings::setDataTreeHeader(const QByteArray& v) const
+{
+ m_Settings.setValue("geometry/dataTree", v);
+}
+
+std::optional<QByteArray> GeometrySettings::getDownloadViewHeader() const
+{
+ return getOptional<QByteArray>(m_Settings, "geometry/downloadView");
+}
+
+void GeometrySettings::setDownloadViewHeader(const QByteArray& v) const
+{
+ m_Settings.setValue("geometry/downloadView", v);
+}
+
+std::optional<QByteArray> GeometrySettings::getModListHeader() const
+{
+ return getOptional<QByteArray>(m_Settings, "geometry/modList");
+}
+
+void GeometrySettings::setModListHeader(const QByteArray& v) const
+{
+ m_Settings.setValue("geometry/modList", v);
+}
+
std::optional<int> GeometrySettings::getMainWindowMonitor() const
{
return getOptional<int>(m_Settings, "window_monitor");
diff --git a/src/settings.h b/src/settings.h
index 217c8db6..110cfa76 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -70,6 +70,18 @@ public:
std::optional<QByteArray> getCategoriesDialog() const;
void setCategoriesDialog(const QByteArray& v);
+ std::optional<QByteArray> getPluginListHeader() const;
+ void setPluginListHeader(const QByteArray& v) const;
+
+ std::optional<QByteArray> getDataTreeHeader() const;
+ void setDataTreeHeader(const QByteArray& v) const;
+
+ std::optional<QByteArray> getDownloadViewHeader() const;
+ void setDownloadViewHeader(const QByteArray& v) const;
+
+ std::optional<QByteArray> getModListHeader() const;
+ void setModListHeader(const QByteArray& v) const;
+
std::optional<int> getMainWindowMonitor() const;
void setDockSize(const QString& name, int size);
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-22 07:03:50 +0000