From 00f8cbff05c3f548baba59b0cb525205cc1d80e3 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 20 May 2019 17:38:17 -0400
Subject: expandable sections in the conflict tab
---
src/modinfodialog.ui | 218 ++++++++++++++++++++++++++++++++++++---------------
1 file changed, 154 insertions(+), 64 deletions(-)
(limited to 'src/modinfodialog.ui')
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 25fce40c..0d96f621 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -400,28 +400,57 @@ Most mods do not have optional esps, so chances are good you are looking at an e
Conflicts
-
+
+
+ 0
+
-
-
+
-
-
-
- The following conflicted files are provided by this mod
-
-
-
- -
-
-
- QFrame::Sunken
-
-
- 1
-
-
- QLCDNumber::Flat
-
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none
+
+
+ The following conflicted files are provided by this mod
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ QFrame::Sunken
+
+
+ 1
+
+
+ QLCDNumber::Flat
+
+
+
+
@@ -470,23 +499,49 @@ Most mods do not have optional esps, so chances are good you are looking at an e
-
-
-
-
-
-
- The following conflicted files are provided by other mods
-
-
-
+
-
-
-
- QFrame::Sunken
-
-
- QLCDNumber::Flat
-
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none
+
+
+ The following conflicted files are provided by other mods
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ QFrame::Sunken
+
+
+ QLCDNumber::Flat
+
+
+
+
@@ -526,16 +581,38 @@ Most mods do not have optional esps, so chances are good you are looking at an e
-
-
+
-
-
+
-
-
+
+
+
+ 0
+ 0
+
+
+
+ border: none;
+
- <html><head/><body><p>The following files have no conflicts</p></body></html>
+ The following files have no conflicts
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
@@ -548,32 +625,45 @@ Most mods do not have optional esps, so chances are good you are looking at an e
- -
-
-
- Qt::CustomContextMenu
-
-
- Qt::ElideLeft
-
-
- true
-
-
- true
-
-
- 1
-
-
-
- File
-
-
-
-
+ -
+
+
+ Qt::CustomContextMenu
+
+
+ Qt::ElideLeft
+
+
+ true
+
+
+ true
+
+
+ 1
+
+
+
+ File
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
--
cgit v1.3.1