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/mainwindow.cpp          |  1 +
 src/overwriteinfodialog.cpp | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 844456a6..79604c9a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -277,6 +277,7 @@ MainWindow::MainWindow(Settings &settings
   ui->espList->installEventFilter(m_OrganizerCore.pluginList());
 
   ui->bsaList->setLocalMoveOnly(true);
+  ui->bsaList->setHeaderHidden(true);
 
   initDownloadView();
 
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