Merge pull request #601 from Project579/archive_conflicts_2

Archive conflicts Updating to Lastest Develop

1 files changed, 8 insertions, 0 deletions

diff --git a/src/modlistsortproxy.h b/src/modlistsortproxy.h
index b3c01fea..5fe8d9d6 100644
--- a/src/modlistsortproxy.h
+++ b/src/modlistsortproxy.h
@@ -60,6 +60,7 @@ public:
 

   virtual void setSourceModel(QAbstractItemModel *sourceModel) override;

 

+

   /**

    * @brief enable all mods visible under the current filter

    **/

@@ -94,6 +95,13 @@ public:
     return rowCount(parent) > 0;

   }

 

+  /**

+   * @brief sets whether a column is visible

+   * @param column the index of the column

+   * @param visible the visibility of the column

+   */

+  void setColumnVisible(int column, bool visible);

+

 public slots:

 

   void updateFilter(const QString &filter);