From 9e61f34efad508f85c0322cc321cccafd64b1104 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Thu, 11 Apr 2013 19:14:24 +0000
Subject: [PATCH] fixed crappy html garbage in crypto wizard, and fixed label
 width/alignment in settings dialog

---
 src/gui/res/SettingsDialogBase.ui | 6 ++++++
 src/gui/res/SetupWizardBase.ui    | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/gui/res/SettingsDialogBase.ui b/src/gui/res/SettingsDialogBase.ui
index b58bfbd0..f7936229 100644
--- a/src/gui/res/SettingsDialogBase.ui
+++ b/src/gui/res/SettingsDialogBase.ui
@@ -109,6 +109,12 @@
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="m_pLabel_23">
+        <property name="minimumSize">
+         <size>
+          <width>75</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
          <string>Pass&amp;word:</string>
         </property>
diff --git a/src/gui/res/SetupWizardBase.ui b/src/gui/res/SetupWizardBase.ui
index 928fcc39..5ab6dc07 100644
--- a/src/gui/res/SetupWizardBase.ui
+++ b/src/gui/res/SetupWizardBase.ui
@@ -293,11 +293,7 @@
        </size>
       </property>
       <property name="text">
-       <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;&lt;span style=&quot; font-size:8pt;&quot;&gt;A longer password will provide stronger encryption. It is a good idea to use 20 characters or more.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       <string>A longer password will provide stronger encryption. It is a good idea to use 20 characters or more.</string>
       </property>
       <property name="wordWrap">
        <bool>true</bool>