- support for grouping filters for mod list (incomplete)

- offering multiple options for mod names during installation
- support for renaming profiles
- updated installer plugins
- minor bugfixes

1 files changed, 169 insertions, 161 deletions

diff --git a/src/categories.h b/src/categories.h
index e6978259..47b15711 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -17,164 +17,172 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CATEGORIES_H

-#define CATEGORIES_H

-

-

-#include <QString>

-#include <vector>

-#include <map>

-

-

-/**

- * @brief Manage the available mod categories

- * @warning member functions of this class currently use a wild mix of ids and indexes to look up categories,

- *          optimized to where the request comes from. Therefore be very careful which of the two you have available

- **/

-class CategoryFactory {

-

-  friend class CategoriesDialog;

-

-public:

-

-  static const int CATEGORY_NONE = 0;

-

-  static const int CATEGORY_SPECIAL_FIRST = 10000;

-  static const int CATEGORY_SPECIAL_CHECKED = CATEGORY_SPECIAL_FIRST;

-  static const int CATEGORY_SPECIAL_UNCHECKED = 10001;

-  static const int CATEGORY_SPECIAL_UPDATEAVAILABLE = 10002;

-  static const int CATEGORY_SPECIAL_NOCATEGORY = 10003;

-  static const int CATEGORY_SPECIAL_CONFLICT = 10004;

-

-public:

-

-  /**

-   * @brief reset the list of categories

-   **/

-  void reset();

-

-  /**

-   * @brief save the categories to the categories.dat file

-   **/

-  void saveCategories();

-

-  /**

-   * @brief retrieve the number of available categories

-   *

-   * @return unsigned int number of categories

-   **/

-  unsigned numCategories() const { return m_Categories.size(); }

-

-  /**

-   * @brief get the id of the parent category

-   *

-   * @param index the index to look up

-   * @return int id of the parent category

-   **/

-  int getParentID(unsigned int index) const;

-

-  /**

-   * @brief determine if a category exists (by id)

-   *

-   * @param id the id to check for existance

-   * @return true if the category exists, false otherwise

-   **/

-  bool categoryExists(int id) const;

-

-  /**

-   * @brief test if a category is child of a second one

-   * @param id       the presumed child id

-   * @param parentID the parent id to test for

-   * @return true if id is a child of parentID

-   **/

-  bool isDecendantOf(int id, int parentID) const;

-

-  /**

-   * @brief test if the specified category has child categories

-   *

-   * @param index index of the category to look up

-   * @return bool true if the category has child categories

-   **/

-  bool hasChildren(unsigned int index) const;

-

-  /**

-   * @brief retrieve the name of a category

-   *

-   * @param index index of the category to look up

-   * @return QString name of the category

-   **/

-  QString getCategoryName(unsigned int index) const;

-

-  /**

-   * @brief look up the id of a category by its index

-   *

-   * @param index index of the category to look up

-   * @return int id of the category

-   **/

-  int getCategoryID(unsigned int index) const;

-

-  /**

-   * @brief look up the index of a category by its id

-   *

-   * @param id index of the category to look up

-   * @return unsigned int index of the category

-   **/

-  int getCategoryIndex(int ID) const;

-

-  /**

-   * @brief retrieve the index of a category by its nexus id

-   *

-   * @param nexusID nexus id of the category to look up

-   * @return unsigned int index of the category or 0 if no category matches

-   **/

-  unsigned int resolveNexusID(int nexusID) const;

-

-public:

-

- /**

-  * @brief retrieve a reference to the singleton instance

-  *

-  * @return the reference to the singleton

-  **/

- static CategoryFactory &instance();

-

-private:

-

-  struct Category {

-    Category(int sortValue, int id, const QString &name, const std::vector<int> &nexusIDs, int parentID)

-      : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false),

-        m_NexusIDs(nexusIDs), m_ParentID(parentID) {}

-    int m_SortValue;

-    int m_ID;

-    int m_ParentID;

-    bool m_HasChildren;

-    QString m_Name;

-    std::vector<int> m_NexusIDs;

-

-    friend bool operator<(const Category &LHS, const Category &RHS) {

-      return LHS.m_SortValue < RHS.m_SortValue;

-    }

-  };

-

-private:

-

-  CategoryFactory();

-

-  void loadDefaultCategories();

-

-  void addCategory(int id, const QString &name, const std::vector<int> &nexusID, int parentID);

-

-  void setParents();

-

-private:

-

-  static CategoryFactory *s_Instance;

-

-  std::vector<Category> m_Categories;

-  std::map<int, unsigned int> m_IDMap;

-  std::map<int, unsigned int> m_NexusMap;

-

-};

-

-

-#endif // CATEGORIES_H

+#ifndef CATEGORIES_H
+#define CATEGORIES_H
+
+
+#include <QString>
+#include <vector>
+#include <map>
+#include <functional>
+
+
+/**
+ * @brief Manage the available mod categories
+ * @warning member functions of this class currently use a wild mix of ids and indexes to look up categories,
+ *          optimized to where the request comes from. Therefore be very careful which of the two you have available
+ **/
+class CategoryFactory {
+
+  friend class CategoriesDialog;
+
+public:
+
+  static const int CATEGORY_NONE = 0;
+
+  static const int CATEGORY_SPECIAL_FIRST = 10000;
+  static const int CATEGORY_SPECIAL_CHECKED = CATEGORY_SPECIAL_FIRST;
+  static const int CATEGORY_SPECIAL_UNCHECKED = 10001;
+  static const int CATEGORY_SPECIAL_UPDATEAVAILABLE = 10002;
+  static const int CATEGORY_SPECIAL_NOCATEGORY = 10003;
+  static const int CATEGORY_SPECIAL_CONFLICT = 10004;
+
+public:
+
+  struct Category {
+    Category(int sortValue, int id, const QString &name, const std::vector<int> &nexusIDs, int parentID)
+      : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false),
+        m_NexusIDs(nexusIDs), m_ParentID(parentID) {}
+    int m_SortValue;
+    int m_ID;
+    int m_ParentID;
+    bool m_HasChildren;
+    QString m_Name;
+    std::vector<int> m_NexusIDs;
+
+    friend bool operator<(const Category &LHS, const Category &RHS) {
+      return LHS.m_SortValue < RHS.m_SortValue;
+    }
+  };
+
+public:
+
+  /**
+   * @brief reset the list of categories
+   **/
+  void reset();
+
+  /**
+   * @brief save the categories to the categories.dat file
+   **/
+  void saveCategories();
+
+  /**
+   * @brief retrieve the number of available categories
+   *
+   * @return unsigned int number of categories
+   **/
+  unsigned numCategories() const { return m_Categories.size(); }
+
+  /**
+   * @brief count all categories that match a specified filter
+   * @param filter the filter to test
+   * @return number of matching categories
+   */
+  unsigned int countCategories(std::tr1::function<bool (const Category &category)> filter);
+
+  /**
+   * @brief get the id of the parent category
+   *
+   * @param index the index to look up
+   * @return int id of the parent category
+   **/
+  int getParentID(unsigned int index) const;
+
+  /**
+   * @brief determine if a category exists (by id)
+   *
+   * @param id the id to check for existance
+   * @return true if the category exists, false otherwise
+   **/
+  bool categoryExists(int id) const;
+
+  /**
+   * @brief test if a category is child of a second one
+   * @param id       the presumed child id
+   * @param parentID the parent id to test for
+   * @return true if id is a child of parentID
+   **/
+  bool isDecendantOf(int id, int parentID) const;
+
+  /**
+   * @brief test if the specified category has child categories
+   *
+   * @param index index of the category to look up
+   * @return bool true if the category has child categories
+   **/
+  bool hasChildren(unsigned int index) const;
+
+  /**
+   * @brief retrieve the name of a category
+   *
+   * @param index index of the category to look up
+   * @return QString name of the category
+   **/
+  QString getCategoryName(unsigned int index) const;
+
+  /**
+   * @brief look up the id of a category by its index
+   *
+   * @param index index of the category to look up
+   * @return int id of the category
+   **/
+  int getCategoryID(unsigned int index) const;
+
+  /**
+   * @brief look up the index of a category by its id
+   *
+   * @param id index of the category to look up
+   * @return unsigned int index of the category
+   **/
+  int getCategoryIndex(int ID) const;
+
+  /**
+   * @brief retrieve the index of a category by its nexus id
+   *
+   * @param nexusID nexus id of the category to look up
+   * @return unsigned int index of the category or 0 if no category matches
+   **/
+  unsigned int resolveNexusID(int nexusID) const;
+
+public:
+
+ /**
+  * @brief retrieve a reference to the singleton instance
+  *
+  * @return the reference to the singleton
+  **/
+ static CategoryFactory &instance();
+
+private:
+
+  CategoryFactory();
+
+  void loadDefaultCategories();
+
+  void addCategory(int id, const QString &name, const std::vector<int> &nexusID, int parentID);
+
+  void setParents();
+
+private:
+
+  static CategoryFactory *s_Instance;
+
+  std::vector<Category> m_Categories;
+  std::map<int, unsigned int> m_IDMap;
+  std::map<int, unsigned int> m_NexusMap;
+
+};
+
+
+#endif // CATEGORIES_H