Merge with branch1.0

1 files changed, 14 insertions, 7 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 552c1bf6..91c2b17d 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -96,6 +96,7 @@ public:
   virtual MOBase::IGameInfo &gameInfo() const;
   virtual QString profileName() const;
   virtual QString profilePath() const;
+  virtual QString downloadsPath() const;
   virtual MOBase::VersionInfo appVersion() const;
   virtual MOBase::IModInterface *getMod(const QString &name);
   virtual MOBase::IModInterface *createMod(const QString &name);
@@ -106,13 +107,13 @@ public:
   void addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu, ModInfo::Ptr info);
 
   void saveArchiveList();
+
 public slots:
 
   void displayColumnSelection(const QPoint &pos);
 
   void externalMessage(const QString &message);
   void modorder_changed();
-  void esplist_changed();
   void refresher_progress(int percent);
   void directory_refreshed();
 
@@ -173,7 +174,6 @@ private:
   void installMod(const QString &fileName);
   void installMod();
   bool modifyExecutablesDialog();
-  void modOpenNext();
   void displayModInformation(ModInfo::Ptr modInfo, unsigned int index, int tab);
   void displayModInformation(int row, int tab = 0);
   void testExtractBSA(int modIndex);
@@ -308,6 +308,7 @@ private slots:
   void removeMod_clicked();
   void reinstallMod_clicked();
   void endorse_clicked();
+  void dontendorse_clicked();
   void unendorse_clicked();
   void visitOnNexus_clicked();
   void openExplorer_clicked();
@@ -339,10 +340,6 @@ private slots:
 
   void removeOrigin(const QString &name);
 
-  void setPriorityMax();
-  void setPriorityManually();
-  void setPriorityMin();
-
   void procError(QProcess::ProcessError error);
   void procFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
@@ -380,6 +377,8 @@ private slots:
   void editCategories();
 
   void displayModInformation(const QString &modName, int tab);
+  void modOpenNext();
+  void modOpenPrev();
 
   void modRenamed(const QString &oldName, const QString &newName);
 
@@ -400,6 +399,15 @@ private slots:
   void startExeAction();
 
   void checkBSAList();
+  void updateStyle(const QString &style);
+
+  void modlistChanged(const QModelIndex &index, int role);
+
+  void savePluginList();
+
+  void modFilterActive(bool active);
+  void espFilterChanged(const QString &filter);
+  void downloadFilterChanged(const QString &filter);
 
 private slots: // ui slots
   // actions
@@ -415,7 +423,6 @@ private slots: // ui slots
   void on_bsaList_customContextMenuRequested(const QPoint &pos);
   void on_bsaList_itemChanged(QTreeWidgetItem *item, int column);
   void on_btnRefreshData_clicked();
-  void on_btnSave_clicked();
   void on_categoriesList_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
   void on_categoriesList_customContextMenuRequested(const QPoint &pos);
   void on_compactBox_toggled(bool checked);