From f85478a5b40ba609a0b36a2095e2b7fd3588857f Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 26 Nov 2019 10:00:37 -0500
Subject: fix sort in overwrite, remember settings remove useless header in
 archives list

---
 src/overwriteinfodialog.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/overwriteinfodialog.cpp')

diff --git a/src/overwriteinfodialog.cpp b/src/overwriteinfodialog.cpp
index 078bcfc9..b2f2f1f9 100644
--- a/src/overwriteinfodialog.cpp
+++ b/src/overwriteinfodialog.cpp
@@ -85,6 +85,7 @@ OverwriteInfoDialog::OverwriteInfoDialog(ModInfo::Ptr modInfo, QWidget *parent)
   ui->filesView->setModel(m_FileSystemModel);
   ui->filesView->setRootIndex(m_FileSystemModel->index(modInfo->absolutePath()));
   ui->filesView->setColumnWidth(0, 250);
+  ui->filesView->sortByColumn(0, Qt::AscendingOrder);
 
   m_DeleteAction = new QAction(tr("&Delete"), ui->filesView);
   m_RenameAction = new QAction(tr("&Rename"), ui->filesView);
@@ -106,13 +107,21 @@ OverwriteInfoDialog::~OverwriteInfoDialog()
 
 void OverwriteInfoDialog::showEvent(QShowEvent* e)
 {
-  Settings::instance().geometry().restoreGeometry(this);
+  const auto& s = Settings::instance();
+
+  s.geometry().restoreGeometry(this);
+  s.geometry().restoreState(ui->filesView->header());
+
   QDialog::showEvent(e);
 }
 
 void OverwriteInfoDialog::done(int r)
 {
-  Settings::instance().geometry().saveGeometry(this);
+  auto& s = Settings::instance();
+
+  s.geometry().saveGeometry(this);
+  s.geometry().saveState(ui->filesView->header());
+
   QDialog::done(r);
 }
 
-- 
cgit v1.3.1


From a5bd29f1117ec56632138640d508afad0232e5ed Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 27 Nov 2019 11:25:53 -0500
Subject: only default sort file trees if no setting was saved

---
 src/modinfodialogfiletree.cpp | 5 +++--
 src/overwriteinfodialog.cpp   | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/overwriteinfodialog.cpp')

diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index ca007c1c..79ed4cba 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -21,7 +21,6 @@ FileTreeTab::FileTreeTab(ModInfoDialogTabContext cx)
   m_fs->setReadOnly(false);
   ui->filetree->setModel(m_fs);
   ui->filetree->setColumnWidth(0, 300);
-  ui->filetree->sortByColumn(0, Qt::AscendingOrder);
 
   m_actions.newFolder = new QAction(tr("&New Folder"), ui->filetree);
   m_actions.open = new QAction(tr("&Open/Execute"), ui->filetree);
@@ -63,7 +62,9 @@ void FileTreeTab::saveState(Settings& s)
 
 void FileTreeTab::restoreState(const Settings& s)
 {
-  s.geometry().restoreState(ui->filetree->header());
+  if (!s.geometry().restoreState(ui->filetree->header())) {
+    ui->filetree->sortByColumn(0, Qt::AscendingOrder);
+  }
 }
 
 void FileTreeTab::update()
diff --git a/src/overwriteinfodialog.cpp b/src/overwriteinfodialog.cpp
index b2f2f1f9..ab726fb3 100644
--- a/src/overwriteinfodialog.cpp
+++ b/src/overwriteinfodialog.cpp
@@ -85,7 +85,6 @@ OverwriteInfoDialog::OverwriteInfoDialog(ModInfo::Ptr modInfo, QWidget *parent)
   ui->filesView->setModel(m_FileSystemModel);
   ui->filesView->setRootIndex(m_FileSystemModel->index(modInfo->absolutePath()));
   ui->filesView->setColumnWidth(0, 250);
-  ui->filesView->sortByColumn(0, Qt::AscendingOrder);
 
   m_DeleteAction = new QAction(tr("&Delete"), ui->filesView);
   m_RenameAction = new QAction(tr("&Rename"), ui->filesView);
@@ -110,7 +109,10 @@ void OverwriteInfoDialog::showEvent(QShowEvent* e)
   const auto& s = Settings::instance();
 
   s.geometry().restoreGeometry(this);
-  s.geometry().restoreState(ui->filesView->header());
+
+  if (!s.geometry().restoreState(ui->filesView->header())) {
+    ui->filesView->sortByColumn(0, Qt::AscendingOrder);
+  }
 
   QDialog::showEvent(e);
 }
-- 
cgit v1.3.1