diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2018-12-30 18:52:15 -0600 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-30 18:52:15 -0600 |
| commit | 580f45429fca07a4d3cd8daae83b6963ce5de54a (patch) | |
| tree | 812c66a8e9eb54d2a87ac7bc2b0383e278a781ca /src/modlist.cpp | |
| parent | e9fe45eb897e4e3db3e1a947dbbcbc28b53f6d52 (diff) | |
Fix conflict colors and make archive conflict colors configurable
Diffstat (limited to 'src/modlist.cpp')
| -rw-r--r-- | src/modlist.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/modlist.cpp b/src/modlist.cpp index 0b66a663..44ca6eaf 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -411,21 +411,26 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const bool archiveOverwritten = m_ArchiveOverwritten.find(modIndex) != m_ArchiveOverwritten.end();
bool archiveLooseOverwritten = m_ArchiveLooseOverwritten.find(modIndex) != m_ArchiveLooseOverwritten.end();
if (modInfo->getHighlight() & ModInfo::HIGHLIGHT_PLUGIN) {
+
return Settings::instance().modlistContainsPluginColor();
- } else if ((overwrite && (archiveOverwritten || archiveLooseOverwritten)) ||
- (overwritten && (archiveOverwrite || archiveLooseOverwrite)) ||
- (archiveOverwrite && (overwritten || archiveLooseOverwritten)) ||
- (archiveOverwritten && (overwrite || archiveLooseOverwrite)) ||
- (archiveLooseOverwrite && (overwritten || archiveOverwritten)) ||
- (archiveLooseOverwritten && (overwrite || archiveLooseOverwrite))
- ) {
+
+ } else if (overwritten || archiveLooseOverwritten) {
+
return Settings::instance().modlistOverwrittenLooseColor();
- }
- else if (overwrite || archiveOverwrite || archiveLooseOverwrite) {
+
+ } else if (overwrite || archiveLooseOverwrite) {
+
return Settings::instance().modlistOverwritingLooseColor();
- } else if (overwritten || archiveOverwritten || archiveLooseOverwritten) {
- return QColor(255, 0, 0, 64); //TODO: Make configurable
- } else if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR)
+
+ } else if (archiveOverwritten) {
+
+ return Settings::instance().modlistOverwrittenArchiveColor();
+
+ } else if (archiveOverwrite) {
+
+ return Settings::instance().modlistOverwritingArchiveColor();
+
+ } else if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR)
&& modInfo->getColor().isValid()
&& ((role != ViewMarkingScrollBar::DEFAULT_ROLE)
|| Settings::instance().colorSeparatorScrollbar())) {
|