From 2687fa8231cf4b4d9d9bc5bd90ca7c287f97ead2 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 28 May 2019 14:18:32 -0400
Subject: added new tabs in the conflict tab
---
src/modinfodialog.ui | 568 +++++++++++++++++++++++++++++++--------------------
1 file changed, 351 insertions(+), 217 deletions(-)
(limited to 'src')
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 1fe431dd..190f5b56 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -401,255 +401,384 @@ Most mods do not have optional esps, so chances are good you are looking at an e
Conflicts
-
- 0
-
-
-
-
-
- 0
- 100
-
+
+
+ 1
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
-
+
+
+ General
+
+
+
-
+
+
+
+ 0
+ 100
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
-
-
-
- 0
- 0
-
-
-
- border: none;
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none;
text-align: left;
+
+
+ The following conflicted files are provided by this mod
+
+
+
+ -
+
+
+ QFrame::Sunken
+
+
+ 1
+
+
+ QLCDNumber::Flat
+
+
+
+
+
+
+
+ -
+
+
+ Qt::CustomContextMenu
-
- The following conflicted files are provided by this mod
+
+ QAbstractItemView::ExtendedSelection
+
+ Qt::ElideLeft
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+ 2
+
+
+ 365
+
+
+ false
+
+
+ 200
+
+
+
+ File
+
+
+
+
+ Overwritten Mods
+
+
-
-
-
- QFrame::Sunken
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none;
+text-align: left;
+
+
+ The following conflicted files are provided by other mods
+
+
+
+ -
+
+
+ QFrame::Sunken
+
+
+ QLCDNumber::Flat
+
+
+
+
+
+
+
+ -
+
+
+ Qt::CustomContextMenu
-
- 1
+
+ Qt::ElideLeft
+
+
+ true
+
+
+ true
-
- QLCDNumber::Flat
+
+ 2
+
+ 365
+
+
+ 200
+
+
+
+ File
+
+
+
+
+ Providing Mod
+
+
-
-
-
-
- -
-
-
- Qt::CustomContextMenu
-
-
- QAbstractItemView::ExtendedSelection
-
-
- Qt::ElideLeft
-
-
- true
-
-
- true
-
-
- false
-
-
- 2
-
-
- 365
-
-
- false
-
-
- 200
-
-
-
- File
-
-
-
-
- Overwritten Mods
-
-
-
-
- -
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- border: none;
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none;
text-align: left;
+
+
+ The following files have no conflicts
+
+
+
+ -
+
+
+ QFrame::Sunken
+
+
+ QLCDNumber::Flat
+
+
+
+
+
+
+
+ -
+
+
+ Qt::CustomContextMenu
+
+
+ Qt::ElideLeft
-
- The following conflicted files are provided by other mods
+
+ true
+
+
+ true
+
+
+ 1
+
+
+ File
+
+
-
-
-
- QFrame::Sunken
+
+
+ Qt::Vertical
-
- QLCDNumber::Flat
+
+
+ 20
+ 0
+
-
+
-
-
-
- -
-
-
- Qt::CustomContextMenu
-
-
- Qt::ElideLeft
-
-
- true
-
-
- true
-
-
- 2
-
-
- 365
-
-
- 200
-
-
-
- File
-
-
-
-
- Providing Mod
-
-
-
-
- -
-
-
-
-
+
+
+
+
+
+
+ Advanced
+
+
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
-
-
-
- 0
- 0
-
-
-
- border: none;
-text-align: left;
-
-
- The following files have no conflicts
-
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 3
+
+
+ 243
+
+
+
+ Overwrites
+
+
+
+
+ File
+
+
+
+
+ Overwritten by
+
+
+
+
+
-
-
-
- QFrame::Sunken
-
-
- QLCDNumber::Flat
-
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Show files that have no conflicts
+
+
+
+ -
+
+
+
+ 20
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Filter
+
+
+
+
+
+
+
-
-
-
- -
-
-
- Qt::CustomContextMenu
-
-
- Qt::ElideLeft
-
-
- true
-
-
- true
-
-
- 1
-
-
-
- File
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 0
-
-
-
-
-
+
+
+
+
@@ -1052,6 +1181,11 @@ p, li { white-space: pre-wrap; }
QLineEdit
+
+ MOBase::LineEditClear
+ QLineEdit
+
+
--
cgit v1.3.1