From f9e9d79a7d433b79a0beb5d11272a606f066affe Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 28 May 2019 12:43:57 -0400
Subject: moved all widgets in the conflict tab into a parent widget instead of
directly being in the tab, allows for future additions to the tab
---
src/modinfodialog.ui | 453 ++++++++++++++++++++++++++-------------------------
1 file changed, 234 insertions(+), 219 deletions(-)
(limited to 'src/modinfodialog.ui')
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 840c81ee..1fe431dd 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -400,243 +400,258 @@ Most mods do not have optional esps, so chances are good you are looking at an e
Conflicts
-
+
0
-
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- border: none;
-text-align: left;
-
-
- The following conflicted files are provided by this mod
-
-
-
- -
-
-
- QFrame::Sunken
-
-
- 1
-
-
- QLCDNumber::Flat
-
-
-
-
-
-
-
- -
-
-
- Qt::CustomContextMenu
-
-
- QAbstractItemView::ExtendedSelection
-
-
- Qt::ElideLeft
-
-
- true
-
-
- true
-
-
- true
-
-
- 2
+
+
+
+ 0
+ 100
+
-
- 365
-
-
- 200
-
-
-
- File
+
+
+ 0
-
-
-
- Overwritten Mods
+
+ 0
-
-
-
- -
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- border: none;
+
+ 0
+
+
+ 0
+
+
-
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none;
text-align: left;
-
+
+
+ The following conflicted files are provided by this mod
+
+
+
+ -
+
+
+ QFrame::Sunken
+
+
+ 1
+
+
+ QLCDNumber::Flat
+
+
+
+
+
+
+
+ -
+
+
+ Qt::CustomContextMenu
+
+
+ QAbstractItemView::ExtendedSelection
+
+
+ Qt::ElideLeft
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+ 2
+
+
+ 365
+
+
+ false
+
+
+ 200
+
+
- The following conflicted files are provided by other mods
-
-
-
- -
-
-
- QFrame::Sunken
+ File
-
- QLCDNumber::Flat
-
-
-
-
-
-
-
- -
-
-
- Qt::CustomContextMenu
-
-
- QAbstractItemView::ExtendedSelection
-
-
- Qt::ElideLeft
-
-
- true
-
-
- true
-
-
- true
-
-
- 2
-
-
- 365
-
-
- 200
-
-
-
- File
-
-
-
-
- Providing Mod
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
- 0
- 0
-
+
+
+
+ Overwritten Mods
-
- border: none;
+
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none;
text-align: left;
-
+
+
+ The following conflicted files are provided by other mods
+
+
+
+ -
+
+
+ QFrame::Sunken
+
+
+ QLCDNumber::Flat
+
+
+
+
+
+
+
+ -
+
+
+ Qt::CustomContextMenu
+
+
+ Qt::ElideLeft
+
+
+ true
+
+
+ true
+
+
+ 2
+
+
+ 365
+
+
+ 200
+
+
- The following files have no conflicts
+ File
-
-
- -
-
-
- QFrame::Sunken
+
+
+
+ Providing Mod
-
- QLCDNumber::Flat
+
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none;
+text-align: left;
+
+
+ The following files have no conflicts
+
+
+
+ -
+
+
+ QFrame::Sunken
+
+
+ QLCDNumber::Flat
+
+
+
+
+
+
+
+ -
+
+
+ Qt::CustomContextMenu
+
+
+ Qt::ElideLeft
+
+
+ true
+
+
+ true
+
+
+ 1
+
+
+
+ File
-
-
-
-
-
-
- -
-
-
- Qt::CustomContextMenu
-
-
- QAbstractItemView::ExtendedSelection
-
-
- Qt::ElideLeft
-
-
- true
-
-
- true
-
-
- true
-
-
- 1
-
-
-
- File
-
-
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 0
-
-
-
-
--
cgit v1.3.1