1 files changed, 18 insertions, 23 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8e63a14f..06c51203 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -60,6 +60,7 @@ namespace MOShared { class DirectoryEntry; }
 #include <QStringList>

 #include <QTime>

 #include <QTimer>

+#include <QHeaderView>

 #include <QVariant>

 #include <Qt>

 

@@ -105,9 +106,9 @@ class MainWindow : public QMainWindow, public IUserInterface
 

   friend class OrganizerProxy;

 

-

 public:

-  explicit MainWindow(const QString &exeName, QSettings &initSettings,

+

+  explicit MainWindow(QSettings &initSettings,

                       OrganizerCore &organizerCore, PluginContainer &pluginContainer,

                       QWidget *parent = 0);

   ~MainWindow();

@@ -121,15 +122,12 @@ public:
   virtual void setProcessName(QString const &name) override;

 

   bool addProfile();

-  void updateBSAList(const QStringList &defaultArchives, const QStringList &activeArchives);

   void refreshDataTree();

   void refreshSaveList();

 

   void setModListSorting(int index);

   void setESPListSorting(int index);

 

-  void saveArchiveList();

-

   void registerPluginTool(MOBase::IPluginTool *tool);

   void registerModPage(MOBase::IPluginModPage *modPage);

 

@@ -152,9 +150,6 @@ public:
   virtual bool closeWindow();

   virtual void setWindowEnabled(bool enabled);

 

-  virtual MOBase::DelayedFileWriterBase &archivesWriter() override { return m_ArchiveListWriter; }

-

-  void updateWindowTitle(const QString &accountName, bool premium);

 public slots:

 

   void displayColumnSelection(const QPoint &pos);

@@ -168,7 +163,6 @@ public slots:
 

 signals:

 

-

   /**

    * @brief emitted after the information dialog has been closed

    */

@@ -191,8 +185,16 @@ protected:
   virtual void dragEnterEvent(QDragEnterEvent *event);

   virtual void dropEvent(QDropEvent *event);

 

+private slots:

+  void on_actionChange_Game_triggered();

+

+private slots:

+  void on_clickBlankButton_clicked();

+

 private:

 

+  void cleanup();

+

   void actionToToolButton(QAction *&sourceAction);

 

   void updateToolBar();

@@ -247,7 +249,7 @@ private:
 

   bool extractProgress(QProgressDialog &extractProgress, int percentage, std::string fileName);

 

-  int checkForProblems();

+  size_t checkForProblems();

 

   int getBinaryExecuteInfo(const QFileInfo &targetInfo, QFileInfo &binaryInfo, QString &arguments);

   QTreeWidgetItem *addFilterItem(QTreeWidgetItem *root, const QString &name, int categoryID, ModListSortProxy::FilterType type);

@@ -284,6 +286,8 @@ private:
 

   void dropLocalFile(const QUrl &url, const QString &outputDir, bool move);

 

+  bool registerWidgetState(const QString &name, QHeaderView *view, const char *oldSettingName = nullptr);

+

 private:

 

   static const char *PATTERN_BACKUP_GLOB;

@@ -298,8 +302,6 @@ private:
 

   MOBase::TutorialControl m_Tutorial;

 

-  QString m_ExeName;

-

   int m_OldProfileIndex;

 

   std::vector<QString> m_ModNameList; // the mod-list to go with the directory structure

@@ -346,14 +348,12 @@ private:
 

   std::vector<QTreeWidgetItem*> m_RemoveWidget;

 

-  QByteArray m_ArchiveListHash;

-

   bool m_DidUpdateMasterList;

 

   LockedDialog *m_LockDialog { nullptr };

   uint64_t m_LockCount { 0 };

 

-  MOBase::DelayedFileWriter m_ArchiveListWriter;

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

 

   enum class ShortcutType {

     Toolbar,

@@ -368,6 +368,8 @@ private:
 

 private slots:

 

+  void updateWindowTitle(const QString &accountName, bool premium);

+

   void showMessage(const QString &message);

   void showError(const QString &message);

 

@@ -380,6 +382,7 @@ private slots:
 

   // modlist context menu

   void installMod_clicked();

+  void createEmptyMod_clicked();

   void restoreBackup_clicked();

   void renameMod_clicked();

   void removeMod_clicked();

@@ -437,7 +440,6 @@ private slots:
   void addRemoveCategories_MenuHandler();

   void replaceCategories_MenuHandler();

 

-  void savePrimaryCategory();

   void addPrimaryCategoryCandidates();

 

   void modDetailsUpdated(bool success);

@@ -476,8 +478,6 @@ private slots:
 

   void startExeAction();

 

-  void checkBSAList();

-

   void updateProblemsButton();

 

   void saveModMetas();

@@ -531,8 +531,6 @@ private slots: // ui slots
   void on_actionUpdate_triggered();

   void on_actionEndorseMO_triggered();

 

-  void on_bsaList_customContextMenuRequested(const QPoint &pos);

-  void bsaList_itemMoved();

   void on_btnRefreshData_clicked();

   void on_categoriesList_customContextMenuRequested(const QPoint &pos);

   void on_conflictsCheckBox_toggled(bool checked);

@@ -551,7 +549,6 @@ private slots: // ui slots
   void on_categoriesList_itemSelectionChanged();

   void on_linkButton_pressed();

   void on_showHiddenBox_toggled(bool checked);

-  void on_bsaList_itemChanged(QTreeWidgetItem *item, int column);

   void on_bossButton_clicked();

 

   void on_saveButton_clicked();

@@ -561,8 +558,6 @@ private slots: // ui slots
   void on_actionCopy_Log_to_Clipboard_triggered();

   void on_categoriesAndBtn_toggled(bool checked);

   void on_categoriesOrBtn_toggled(bool checked);

-  void on_managedArchiveLabel_linkHovered(const QString &link);

-  void on_manageArchivesBox_toggled(bool checked);

 };