Merge remote-tracking branch 'remotes/origin/archive_conflicts_2' into Develop

1 files changed, 3 insertions, 0 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index f2b9bc88..a8601bee 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -376,6 +376,8 @@ private:
 

   bool m_closing{ false };

 

+  bool m_showArchiveData{ true };

+

   std::vector<std::pair<QString, QHeaderView*>> m_PersistedGeometry;

 

   MOBase::DelayedFileWriter m_ArchiveListWriter;

@@ -620,6 +622,7 @@ private slots: // ui slots
   void on_btnRefreshDownloads_clicked();

   void on_categoriesList_customContextMenuRequested(const QPoint &pos);

   void on_conflictsCheckBox_toggled(bool checked);

+  void on_showArchiveDataCheckBox_toggled(bool checked);

   void on_dataTree_customContextMenuRequested(const QPoint &pos);

   void on_executablesListBox_currentIndexChanged(int index);

   void on_modList_customContextMenuRequested(const QPoint &pos);