save last index file dir

Author: p0358

headers/layouts/loadindexdialog.hpp

@@ -15,7 +15,7 @@ class CLoadIndexDialog : public QDialog, public Ui::LoadIndexDialog
     Q_OBJECT
 
 public:
-    CLoadIndexDialog( CMainWindow* pParent = nullptr );
+    CLoadIndexDialog( CMainWindow* pParent, const QString& lastIndexDir = {} );
 
 private slots:
     void OnBrowseGameDir();
@@ -28,4 +28,5 @@ private slots:
 
 private:
     GameDataInfo m_DetectedGameInfo;
+    QString m_LastIndexDir;
 };

headers/layouts/mainwindow.hpp

@@ -123,6 +123,7 @@ private slots:
 
     QString m_LastOpenDir;
     QString m_LastExtractDir;
+    QString m_LastIndexDir;
 
     bool m_bShouldDecrypt;
     bool m_bShouldDecompress;

sources/layouts/loadindexdialog.cpp

@@ -5,8 +5,8 @@
 
 #include "mainwindow.hpp"
 
-CLoadIndexDialog::CLoadIndexDialog( CMainWindow* pParent /*= nullptr*/ )
-    : QDialog( pParent ), m_DetectedGameInfo()
+CLoadIndexDialog::CLoadIndexDialog( CMainWindow* pParent, const QString& lastIndexDir /*= {}*/ )
+    : QDialog( pParent ), m_LastIndexDir( lastIndexDir ), m_DetectedGameInfo()
 {
     this->setupUi( this );
 
@@ -22,22 +22,35 @@ CLoadIndexDialog::CLoadIndexDialog( CMainWindow* pParent /*= nullptr*/ )
 
     this->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
 
-    if ( QProcessEnvironment::systemEnvironment()
+    if ( this->m_LastIndexDir.isEmpty() == false
+        && fs::is_directory( this->m_LastIndexDir.toStdString() ) == true )
+    {
+        this->leGameDir->setText( this->m_LastIndexDir );
+    }
+    else if ( QProcessEnvironment::systemEnvironment()
         .contains( QStringLiteral( "FLATPAK_ID" ) ) )
     {
         // On Flatpak one cannot manually enter a path from host,
         // so by default block text entry (only in constructor, so that
         // if the user wipes the field contents later manually, they'll
         // still be able to input something manually from then on)
         this->leGameDir->setEnabled( false );
-        this->OnGameDirLineEdited( this->leGameDir->text() );
     }
+
+    this->OnGameDirLineEdited( this->leGameDir->text() );
 }
 
 void CLoadIndexDialog::OnBrowseGameDir()
 {
+    QString dir = QDir::homePath();
+    if ( this->m_LastIndexDir.isEmpty() == false
+        && fs::is_directory( this->m_LastIndexDir.toStdString() ) == true )
+    {
+        dir = this->m_LastIndexDir;
+    }
+
     QString szDirPath = QFileDialog::getExistingDirectory(
-        this, tr( "Select the game's directory" ), QDir::homePath() );
+        this, tr( "Select the game's directory" ), dir );
 
     if ( szDirPath.isEmpty() == true )
     {

sources/layouts/mainwindow.cpp

@@ -41,6 +41,7 @@ CMainWindow::CMainWindow( QWidget* pParent )
       m_ErrorBoxWidget( this->errorBox, this->errorBoxMsg, this->errorBoxBtn ),
       m_StatusWidget( this->lblStatus, this->pbStatus ),
       m_LastOpenDir( QDir::homePath() ), m_LastExtractDir( QDir::homePath() ),
+      m_LastIndexDir( QDir::homePath() ),
       m_bShouldDecrypt( true ), m_bShouldDecompress( true )
 {
     this->SetLoadedFilename();
@@ -96,6 +97,7 @@ void CMainWindow::OnIndexFileAccepted( GameDataInfo info )
 
     // FIXME: index entry is loaded as a package
     // this->AddToRecentFiles( info.GetGameDataPath() );
+    this->m_LastIndexDir = QString::fromStdString( info.GetGameDataPath().generic_string() );
     this->SetLoadedFilename( info.GetGameDataPath().generic_string() );
 }
 
@@ -537,6 +539,11 @@ void CMainWindow::ValidateLastDirs()
     {
         this->m_LastExtractDir = QDir::homePath();
     }
+
+    if ( fs::is_directory( this->m_LastIndexDir.toStdString() ) == false )
+    {
+        this->m_LastIndexDir = {};
+    }
 }
 
 void CMainWindow::LoadSettings()
@@ -571,6 +578,8 @@ void CMainWindow::LoadSettings()
         settings.value( QStringLiteral( "lastopendir" ) ).toString();
     this->m_LastExtractDir =
         settings.value( QStringLiteral( "lastextractdir" ) ).toString();
+    this->m_LastIndexDir =
+        settings.value( QStringLiteral( "lastindexdir" ) ).toString();
     settings.endGroup();
 
     this->PostLoadSettings();
@@ -610,6 +619,8 @@ void CMainWindow::SaveSettings()
     settings.setValue( QStringLiteral( "lastopendir" ), this->m_LastOpenDir );
     settings.setValue( QStringLiteral( "lastextractdir" ),
                        this->m_LastExtractDir );
+    settings.setValue( QStringLiteral( "lastindexdir" ),
+                       this->m_LastIndexDir );
     settings.endGroup();
 }
 
@@ -690,7 +701,7 @@ void CMainWindow::OnFileOpen()
 
 void CMainWindow::OnIndexFileOpen()
 {
-    CLoadIndexDialog( this ).exec();
+    CLoadIndexDialog( this, this->m_LastIndexDir ).exec();
 }
 
 void CMainWindow::OnRecentFileOpen()