diff options
| author | Al12rs <gabriel.cortesi@outlook.com> | 2018-08-02 13:12:31 -0500 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:16:39 -0600 |
| commit | b05f56c8084fc95590f8a79b9d8a7faf4e0b1844 (patch) | |
| tree | f10eaeaf3e236e73cba13c708712be05eebae290 /src | |
| parent | f9f70b224e25c2d5bff017fd08d32521d39d5b08 (diff) | |
Added red archive conflict icon and made the conflicts tab change font for files that come from an archive.
Diffstat (limited to 'src')
| -rw-r--r-- | src/modinfodialog.cpp | 15 | ||||
| -rw-r--r-- | src/modinfowithconflictinfo.cpp | 3 | ||||
| -rw-r--r-- | src/resources.qrc | 2 | ||||
| -rw-r--r-- | src/resources/red-archive-conflict-loser.png | bin | 0 -> 746 bytes |
4 files changed, 17 insertions, 3 deletions
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp index 204b539b..d1d8d82a 100644 --- a/src/modinfodialog.cpp +++ b/src/modinfodialog.cpp @@ -324,11 +324,18 @@ void ModInfoDialog::refreshLists() }
QStringList fields(relativeName.prepend("..."));
fields.append(ToQString(altString.str()));
- QTreeWidgetItem *item = new QTreeWidgetItem(fields);
+
+ QTreeWidgetItem *item = new QTreeWidgetItem(fields);
item->setData(0, Qt::UserRole, fileName);
item->setData(1, Qt::UserRole, ToQString(m_Directory->getOriginByID(alternatives.back().first).getName()));
item->setData(1, Qt::UserRole + 1, alternatives.back().first);
item->setData(1, Qt::UserRole + 2, archive);
+ if (archive) {
+ QFont font = item->font(0);
+ font.setItalic(true);
+ item->setFont(0, font);
+ item->setFont(1, font);
+ }
ui->overwriteTree->addTopLevelItem(item);
++numOverwrite;
} else {// otherwise don't display the file
@@ -342,6 +349,12 @@ void ModInfoDialog::refreshLists() item->setData(0, Qt::UserRole, fileName);
item->setData(1, Qt::UserRole, ToQString(realOrigin.getName()));
item->setData(1, Qt::UserRole + 2, archive);
+ if (archive) {
+ QFont font = item->font(0);
+ font.setItalic(true);
+ item->setFont(0, font);
+ item->setFont(1, font);
+ }
ui->overwrittenTree->addTopLevelItem(item);
++numOverwritten;
}
diff --git a/src/modinfowithconflictinfo.cpp b/src/modinfowithconflictinfo.cpp index 68b5b265..79896cc3 100644 --- a/src/modinfowithconflictinfo.cpp +++ b/src/modinfowithconflictinfo.cpp @@ -34,7 +34,8 @@ std::vector<ModInfo::EFlag> ModInfoWithConflictInfo::getFlags() const } switch (isLooseArchiveConflicted()) { case CONFLICT_MIXED: { - result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_MIXED); + result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE); + result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN); } break; case CONFLICT_OVERWRITE: { result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE); diff --git a/src/resources.qrc b/src/resources.qrc index 9e4c9192..5ed1780e 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -50,7 +50,7 @@ <file alias="emblem_conflict_redundant">resources/conflict-redundant.png</file> <file alias="archive_loose_conflict_mixed">resources/conflict-mixed-blue.png</file> <file alias="archive_loose_conflict_overwrite">resources/conflict-overwrite-blue.png</file> - <file alias="archive_loose_conflict_overwritten">resources/conflict-overwritten-blue.png</file> + <file alias="archive_loose_conflict_overwritten">resources/red-archive-conflict-loser.png</file> <file alias="emblem_notes">resources/accessories-text-editor.png</file> <file alias="version_date">resources/x-office-calendar.png</file> <file alias="warning_16">resources/dialog-warning_16.png</file> diff --git a/src/resources/red-archive-conflict-loser.png b/src/resources/red-archive-conflict-loser.png Binary files differnew file mode 100644 index 00000000..18284ee2 --- /dev/null +++ b/src/resources/red-archive-conflict-loser.png |
