mirror of
https://github.com/ModOrganizer2/modorganizer.git
synced 2026-07-27 13:58:24 -07:00
Merge pull request #1217 from Al12rs/conflicts_tab_labels
Improve modinfodialog conflicts tab labels and tooltips.
This commit is contained in:
+20
-2
@@ -550,12 +550,15 @@ Most mods do not have optional esps, so chances are good you are looking at an e
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Files that exist in other mods but are overwritten by this mod</string>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">border: none;
|
||||
text-align: left;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>The following conflicted files are provided by this mod</string>
|
||||
<string>Winning file conflicts:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -584,6 +587,9 @@ text-align: left;</string>
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::CustomContextMenu</enum>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Files that exist in other mods but are overwritten by this mod</string>
|
||||
</property>
|
||||
<property name="alternatingRowColors">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
@@ -613,12 +619,15 @@ text-align: left;</string>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Files that are unused because they are overwritten by other mods</string>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">border: none;
|
||||
text-align: left;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>The following conflicted files are provided by other mods</string>
|
||||
<string>Losing file conflicts:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -644,6 +653,9 @@ text-align: left;</string>
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::CustomContextMenu</enum>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Files that are unused because they are overwritten by other mods</string>
|
||||
</property>
|
||||
<property name="alternatingRowColors">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
@@ -673,6 +685,9 @@ text-align: left;</string>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Files that have no conflicts</string>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">border: none;
|
||||
text-align: left;</string>
|
||||
@@ -704,6 +719,9 @@ text-align: left;</string>
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::CustomContextMenu</enum>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Files that have no conflicts</string>
|
||||
</property>
|
||||
<property name="alternatingRowColors">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
|
||||
Reference in New Issue
Block a user