Imrpoved mod already exist dialog when installing.

1 files changed, 48 insertions, 8 deletions

diff --git a/src/queryoverwritedialog.ui b/src/queryoverwritedialog.ui
index 2fc471bd..85778cf5 100644
--- a/src/queryoverwritedialog.ui
+++ b/src/queryoverwritedialog.ui
@@ -17,7 +17,16 @@
    <property name="spacing">

     <number>0</number>

    </property>

-   <property name="margin">

+   <property name="leftMargin">

+    <number>0</number>

+   </property>

+   <property name="topMargin">

+    <number>0</number>

+   </property>

+   <property name="rightMargin">

+    <number>0</number>

+   </property>

+   <property name="bottomMargin">

     <number>0</number>

    </property>

    <item>

@@ -28,7 +37,7 @@
      <property name="frameShadow">

       <enum>QFrame::Raised</enum>

      </property>

-     <layout class="QHBoxLayout" name="horizontalLayout_1" stretch="0,1">

+     <layout class="QHBoxLayout" name="horizontalLayout_1" stretch="0,0">

       <item>

        <widget class="QLabel" name="iconLabel">

         <property name="text">

@@ -40,12 +49,31 @@
        </widget>

       </item>

       <item>

-       <widget class="QLabel" name="label">

-        <property name="text">

-         <string>This mod seems to be installed already. Do you want to add files from this archive (overwriting existing ones) or do you want to completely replace the existing files (old files are deleted)? Alternatively you can install this mod under a different name.</string>

+       <widget class="QTextBrowser" name="textBrowser">

+        <property name="frameShape">

+         <enum>QFrame::NoFrame</enum>

+        </property>

+        <property name="frameShadow">

+         <enum>QFrame::Plain</enum>

+        </property>

+        <property name="verticalScrollBarPolicy">

+         <enum>Qt::ScrollBarAlwaysOff</enum>

         </property>

-        <property name="wordWrap">

-         <bool>true</bool>

+        <property name="horizontalScrollBarPolicy">

+         <enum>Qt::ScrollBarAlwaysOff</enum>

+        </property>

+        <property name="sizeAdjustPolicy">

+         <enum>QAbstractScrollArea::AdjustToContents</enum>

+        </property>

+        <property name="html">

+         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;

+p, li { white-space: pre-wrap; }

+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;

+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This mod seems to be installed already, what would you like to do?&lt;/p&gt;

+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Merge:&lt;/span&gt; Add files from this archive overwriting existing ones.&lt;/p&gt;

+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Replace:&lt;/span&gt; Completely replace the existing mod (old files are deleted).&lt;/p&gt;

+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Rename:&lt;/span&gt; Install this as a separate mod with a new name&lt;span style=&quot; font-style:italic;&quot;&gt; (recommended)&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

         </property>

        </widget>

       </item>

@@ -54,7 +82,16 @@
    </item>

    <item>

     <layout class="QHBoxLayout" name="horizontalLayout">

-     <property name="margin">

+     <property name="leftMargin">

+      <number>7</number>

+     </property>

+     <property name="topMargin">

+      <number>7</number>

+     </property>

+     <property name="rightMargin">

+      <number>7</number>

+     </property>

+     <property name="bottomMargin">

       <number>7</number>

      </property>

      <item>

@@ -83,6 +120,9 @@
        <property name="text">

         <string>Rename</string>

        </property>

+       <property name="default">

+        <bool>true</bool>

+       </property>

       </widget>

      </item>

      <item>