diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2019-01-25 10:19:44 -0600 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2019-01-25 10:19:44 -0600 |
| commit | a68a027febe6e094218654a24d4b5f9bdc31391a (patch) | |
| tree | a259919f61020f9f74553c63d3a5e6f8b023f7b7 /src/settings.h | |
| parent | 63511cd390e1c1b7d6b28edcd691c1f72a81ca48 (diff) | |
| parent | 0ab87850c4cb405b93c592e455a9d052ec84f66f (diff) | |
Merge remote-tracking branch 'remotes/origin/archive_conflicts_2' into Develop
Diffstat (limited to 'src/settings.h')
| -rw-r--r-- | src/settings.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/settings.h b/src/settings.h index a47c255c..0286d4db 100644 --- a/src/settings.h +++ b/src/settings.h @@ -233,6 +233,10 @@ public: QColor modlistOverwritingLooseColor() const; + QColor modlistOverwrittenArchiveColor() const; + + QColor modlistOverwritingArchiveColor() const; + QColor modlistContainsPluginColor() const; QColor pluginListContainedColor() const; @@ -286,6 +290,11 @@ public: void setMotDHash(uint hash); /** + * @return true if the user wants to have archives being parsed to show conflicts and contents + */ + bool archiveParsing() const; + + /** * @return hash of the last displayed message of the day **/ uint getMotDHash() const; @@ -423,6 +432,8 @@ private: QCheckBox *m_usePrereleaseBox; QPushButton *m_overwritingBtn; QPushButton *m_overwrittenBtn; + QPushButton *m_overwritingArchiveBtn; + QPushButton *m_overwrittenArchiveBtn; QPushButton *m_containsBtn; QPushButton *m_containedBtn; QCheckBox *m_colorSeparatorsBox; @@ -520,6 +531,7 @@ private: QCheckBox *m_forceEnableBox; QCheckBox *m_displayForeignBox; QCheckBox *m_lockGUIBox; + QCheckBox *m_enableArchiveParsingBox; }; private slots: |