Merge

1 files changed, 16 insertions, 12 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 199047b1..feaedef8 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -62,6 +62,7 @@ namespace Ui {
     class MainWindow;

 }

 

+class LockedDialog;

 class QToolButton;

 class ModListSortProxy;

 class ModListGroupCategoriesProxy;

@@ -80,9 +81,13 @@ public:
                       QWidget *parent = 0);

   ~MainWindow();

 

-  void storeSettings(QSettings &settings);

+  void storeSettings(QSettings &settings) override;

   void readSettings();

 

+  virtual void lock() override;

+  virtual void unlock() override;

+  virtual bool unlockClicked() override;

+

   bool addProfile();

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

   void refreshDataTree();

@@ -93,9 +98,6 @@ public:
   void setModListSorting(int index);

   void setESPListSorting(int index);

 

-  bool setCurrentProfile(int index);

-  bool setCurrentProfile(const QString &name);

-

   void createFirstProfile();

 

   bool saveArchiveList();

@@ -107,9 +109,7 @@ public:
 

   void createStdoutPipe(HANDLE *stdOutRead, HANDLE *stdOutWrite);

   std::string readFromPipe(HANDLE stdOutRead);

-  void processLOOTOut(const std::string &lootOut, std::string &reportURL, std::string &errorMessages, QProgressDialog &dialog);

-

-  bool waitForProcessOrJob(HANDLE processHandle, LPDWORD exitCode = NULL);

+  void processLOOTOut(const std::string &lootOut, std::string &errorMessages, QProgressDialog &dialog);

 

   void updateModInDirectoryStructure(unsigned int index, ModInfo::Ptr modInfo);

 

@@ -118,10 +118,12 @@ public:
   void installTranslator(const QString &name);

 

   virtual void disconnectPlugins();

-  void unloadPlugins();

 

   void displayModInformation(ModInfo::Ptr modInfo, unsigned int index, int tab);

 

+  virtual bool closeWindow();

+  virtual void setWindowEnabled(bool enabled);

+

 public slots:

 

   void displayColumnSelection(const QPoint &pos);

@@ -170,7 +172,7 @@ private:
   void updateTo(QTreeWidgetItem *subTree, const std::wstring &directorySoFar, const MOShared::DirectoryEntry &directoryEntry, bool conflictsOnly);

   bool refreshProfiles(bool selectProfile = true);

   void refreshExecutablesList();

-  void installMod();

+  void installMod(QString fileName = "");

 

   QList<MOBase::IOrganizer::FileInfo> findFileInfos(const QString &path, const std::function<bool (const MOBase::IOrganizer::FileInfo &)> &filter) const;

 

@@ -267,6 +269,8 @@ private:
   QProgressBar *m_RefreshProgress;

   bool m_Refreshing;

 

+  QStringList m_DefaultArchives;

+

   QAbstractItemModel *m_ModListGroupingProxy;

   ModListSortProxy *m_ModListSortProxy;

 

@@ -314,6 +318,8 @@ private:
 

   bool m_DidUpdateMasterList;

 

+  LockedDialog *m_LockDialog { nullptr };

+

 private slots:

 

   void showMessage(const QString &message);

@@ -424,7 +430,7 @@ private slots:
 

   void startExeAction();

 

-  void checkBSAList(const QStringList &defaultArchives);

+  void checkBSAList();

 

   void updateProblemsButton();

 

@@ -452,8 +458,6 @@ private slots:
    */

   void allowListResize();

 

-  void downloadSpeed(const QString &serverName, int bytesPerSecond);

-

   void toolBar_customContextMenuRequested(const QPoint &point);

   void removeFromToolbar();

   void overwriteClosed(int);