diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2019-05-20 16:11:10 -0400 |
|---|---|---|
| committer | isanae <14251494+isanae@users.noreply.github.com> | 2019-05-20 16:11:10 -0400 |
| commit | a2b1f6a3604d8a2e4bc47c2b91fb58e6d5b45af6 (patch) | |
| tree | c7c040fa8a82f40277607f3eb1e856b34126b144 | |
| parent | eb203e4c2a7ef8d7e9efe43b9e5df0c8b2253ea7 (diff) | |
added third tree with non-conflicting files
| -rw-r--r-- | src/modinfodialog.cpp | 11 | ||||
| -rw-r--r-- | src/modinfodialog.ui | 50 |
2 files changed, 49 insertions, 12 deletions
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp index 555b62db..3c68f4e8 100644 --- a/src/modinfodialog.cpp +++ b/src/modinfodialog.cpp @@ -501,6 +501,7 @@ void ModInfoDialog::refreshLists() ui->overwriteTree->clear(); ui->overwrittenTree->clear(); + ui->noconflictTree->clear(); if (m_Origin != nullptr) { std::vector<FileEntry::Ptr> files = m_Origin->getFiles(); @@ -535,7 +536,15 @@ void ModInfoDialog::refreshLists() } ui->overwriteTree->addTopLevelItem(item); ++numOverwrite; - } else {// otherwise don't display the file + } else {// otherwise, put the file in the nonconflict tree + QTreeWidgetItem *item = new QTreeWidgetItem(QStringList({relativeName})); + item->setData(0, Qt::UserRole, fileName); + if (archive) { + QFont font = item->font(0); + font.setItalic(true); + item->setFont(0, font); + } + ui->noconflictTree->addTopLevelItem(item); ++numNonConflicting; } } else { diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui index 39173a14..25fce40c 100644 --- a/src/modinfodialog.ui +++ b/src/modinfodialog.ui @@ -526,22 +526,50 @@ Most mods do not have optional esps, so chances are good you are looking at an e </widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_8" stretch="1,0">
+ <layout class="QVBoxLayout" name="verticalLayout_11">
<item>
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>Non-Conflicted files</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_15" stretch="1,0">
+ <item>
+ <widget class="QLabel" name="label_13">
+ <property name="text">
+ <string><html><head/><body><p>The following files have no conflicts</p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLCDNumber" name="noConflictCount">
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QLCDNumber" name="noConflictCount">
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
+ <widget class="QTreeWidget" name="noconflictTree">
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
</property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
+ <property name="textElideMode">
+ <enum>Qt::ElideLeft</enum>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="animated">
+ <bool>true</bool>
+ </property>
+ <property name="columnCount">
+ <number>1</number>
</property>
+ <column>
+ <property name="text">
+ <string>File</string>
+ </property>
+ </column>
</widget>
</item>
</layout>
|