Merge pull request #586 from ModOrganizer2/Develop

Release 2.1.6

1 files changed, 39 insertions, 4 deletions

diff --git a/src/settings.h b/src/settings.h
index c49edfcb..912864e2 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -17,8 +17,8 @@ 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 WORKAROUNDS_H
-#define WORKAROUNDS_H
+#ifndef SETTINGS_H
+#define SETTINGS_H
 
 #include "loadmechanism.h"
 
@@ -29,6 +29,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QSettings>
 #include <QString>
 #include <QVariant>
+#include <QColor>
 
 #include <QtGlobal> //for uint
 
@@ -42,6 +43,7 @@ class QSpinBox;
 class QListWidget;
 class QWidget;
 class QLabel;
+class QPushButton;
 
 struct ServerInfo;
 
@@ -108,6 +110,11 @@ public:
   bool forceEnableCoreFiles() const;
 
   /**
+   * @return true if the GUI should be locked when running executables
+   */
+  bool lockGUI() const;
+
+  /**
    * @brief register download speed
    * @param url complete download url
    * @param bytesPerSecond download size in bytes per second
@@ -154,6 +161,11 @@ public:
   QString getCacheDirectory(bool resolve = true) const;
 
   /**
+   * retrieve the directory where the managed game is stored (with native separators)
+   **/
+  QString getManagedGameDirectory() const;
+
+  /**
    * retrieve the directory where profiles stored (with native separators)
    **/
   QString getProfileDirectory(bool resolve = true) const;
@@ -217,6 +229,16 @@ public:
   */
   int crashDumpsMax() const;
 
+  QColor modlistOverwrittenLooseColor() const;
+
+  QColor modlistOverwritingLooseColor() const;
+
+  QColor modlistContainsPluginColor() const;
+
+  QColor pluginListContainedColor() const;
+
+  QString executablesBlacklist() const;
+
   /**
    * @brief set the nexus login information
    *
@@ -343,10 +365,17 @@ public:
    */
   void registerAsNXMHandler(bool force);
 
+  /**
+   * @brief color the scrollbar of the mod list for custom separator colors?
+   * @return the state of the setting
+   */
+  bool colorSeparatorScrollbar() const;
+
 public slots:
 
   void managedGameChanged(MOBase::IPluginGame const *gamePlugin);
-
+public:
+  static QColor getIdealTextColor(const QColor&  rBackgroundColor);
 private:
 
   static QString obfuscate(const QString &password);
@@ -387,6 +416,11 @@ private:
     QCheckBox *m_compactBox;
     QCheckBox *m_showMetaBox;
     QCheckBox *m_usePrereleaseBox;
+    QPushButton *m_overwritingBtn;
+    QPushButton *m_overwrittenBtn;
+    QPushButton *m_containsBtn;
+    QPushButton *m_containedBtn;
+    QCheckBox *m_colorSeparatorsBox;
   };
 
   class PathsTab : public SettingsTab
@@ -479,6 +513,7 @@ private:
     QCheckBox *m_hideUncheckedBox;
     QCheckBox *m_forceEnableBox;
     QCheckBox *m_displayForeignBox;
+    QCheckBox *m_lockGUIBox;
   };
 
 private slots:
@@ -509,4 +544,4 @@ private:
 
 };
 
-#endif // WORKAROUNDS_H
+#endif // SETTINGS_H