From 0f83b1560cedb1a02b0717a0d34575e7d8d4fb40 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 4 Jun 2018 01:13:39 +0200
Subject: [PATCH] Ref T131, added a warning messages about conflicts using
 XSwiftBus

---
 .../components/installxswiftbuscomponent.ui   | 64 +++++++++++--------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/blackgui/components/installxswiftbuscomponent.ui b/src/blackgui/components/installxswiftbuscomponent.ui
index 0178acd12..0f6c7647e 100644
--- a/src/blackgui/components/installxswiftbuscomponent.ui
+++ b/src/blackgui/components/installxswiftbuscomponent.ui
@@ -67,14 +67,17 @@
       <string>Download and install XSwiftBus</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
+      <item row="1" column="0">
        <widget class="QLabel" name="lbl_XSwiftBusPluginDir">
         <property name="text">
          <string>Install directory:</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item row="3" column="1">
+       <widget class="QComboBox" name="cb_DownloadFile"/>
+      </item>
+      <item row="1" column="1">
        <widget class="QLineEdit" name="le_XSwiftBusPluginDir">
         <property name="placeholderText">
          <string>X-Plane/Resources/plugins</string>
@@ -82,40 +85,37 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QComboBox" name="cb_DownloadFile"/>
+       <widget class="QLineEdit" name="le_DownloadDir"/>
       </item>
-      <item row="2" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="lbl_Version">
         <property name="text">
          <string>Version:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="le_DownloadDir"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_DownloadDirectory">
-        <property name="text">
-         <string>Download directory:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
+      <item row="1" column="3">
        <widget class="QPushButton" name="pb_OpenInstallDir">
         <property name="text">
          <string>open</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
+      <item row="2" column="0">
+       <widget class="QLabel" name="lbl_DownloadDirectory">
+        <property name="text">
+         <string>Download directory:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
        <widget class="QPushButton" name="pb_OpenDownloadDir">
         <property name="text">
          <string>open</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" colspan="2">
+      <item row="3" column="2" colspan="2">
        <widget class="QPushButton" name="pb_Download">
         <property name="toolTip">
          <string>download and install</string>
@@ -126,6 +126,20 @@
        </widget>
       </item>
       <item row="1" column="2">
+       <widget class="QToolButton" name="tb_DialogInstallDir">
+        <property name="toolTip">
+         <string>change directory</string>
+        </property>
+        <property name="statusTip">
+         <string>change directory</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../blackmisc/blackmisc.qrc">
+          <normaloff>:/diagona/icons/diagona/icons/folder--pencil.png</normaloff>:/diagona/icons/diagona/icons/folder--pencil.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
        <widget class="QToolButton" name="tb_DialogDownloadDir">
         <property name="toolTip">
          <string>change directory</string>
@@ -139,17 +153,13 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QToolButton" name="tb_DialogInstallDir">
-        <property name="toolTip">
-         <string>change directory</string>
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="lbl_Warning">
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Warning: &lt;/span&gt;There might be conflicts with other XPlane plugins using the same libraries as &lt;span style=&quot; font-style:italic;&quot;&gt;swift&lt;/span&gt;, such as &lt;span style=&quot; font-style:italic;&quot;&gt;XSquawkBox&lt;/span&gt;. You have to disable those pluigns before you can use &lt;span style=&quot; font-style:italic;&quot;&gt;swift&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;XSwiftBus&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
-        <property name="statusTip">
-         <string>change directory</string>
-        </property>
-        <property name="icon">
-         <iconset resource="../../blackmisc/blackmisc.qrc">
-          <normaloff>:/diagona/icons/diagona/icons/folder--pencil.png</normaloff>:/diagona/icons/diagona/icons/folder--pencil.png</iconset>
+        <property name="wordWrap">
+         <bool>true</bool>
         </property>
        </widget>
       </item>