Remove the html formatting designer added for description labels and use simple tags instead.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17694 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 26 insertions, 68 deletions

diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui
index 158b5773ff..90018a3301 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/rbutil/rbutilqt/rbutilqtfrm.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>738</width>
+    <width>650</width>
     <height>550</height>
    </rect>
   </property>
@@ -159,11 +159,10 @@ p, li { white-space: pre-wrap; }
         <item row="0" column="1" >
          <widget class="QLabel" name="labelComplete" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Complete Installation&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This installs the bootloader, a current build and the extras package. This is the recommended method for new installations.&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Complete Installation&lt;/b>&lt;br/>This installs the bootloader, a current build and the extras package. This is the recommended method for new installations.</string>
+          </property>
+          <property name="textFormat" >
+           <enum>Qt::AutoText</enum>
           </property>
           <property name="wordWrap" >
            <bool>true</bool>
@@ -189,11 +188,7 @@ p, li { white-space: pre-wrap; }
         <item row="1" column="1" >
          <widget class="QLabel" name="labelSmall" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Small installation&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This installs bootloader and the current build of Rockbox. If you don't want the extras package, choose this option.&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Small installation&lt;/b>&lt;br/>This installs bootloader and the current build of Rockbox. If you don't want the extras package, choose this option.</string>
           </property>
           <property name="wordWrap" >
            <bool>true</bool>
@@ -258,11 +253,7 @@ p, li { white-space: pre-wrap; }
         <item row="0" column="1" >
          <widget class="QLabel" name="labelBootloader" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Install the bootloader&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Before Rockbox can be run on your audio player, you may have to install a bootloader. This is only necessary the first time Rockbox is installed.&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Install the bootloader&lt;/b>&lt;br/>Before Rockbox can be run on your audio player, you may have to install a bootloader. This is only necessary the first time Rockbox is installed.</string>
           </property>
           <property name="wordWrap" >
            <bool>true</bool>
@@ -291,10 +282,7 @@ p, li { white-space: pre-wrap; }
         <item row="1" column="1" >
          <widget class="QLabel" name="labelInstall" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Install Rockbox&lt;/span> on your audio player&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Install Rockbox&lt;/b> on your audio player</string>
           </property>
           <property name="alignment" >
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -362,11 +350,7 @@ p, li { white-space: pre-wrap; }
         <item row="0" column="1" >
          <widget class="QLabel" name="labelFonts" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Fonts Package&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The Fonts Package contains a couple of commonly used fonts. Installation is highly recommended.&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Fonts Package&lt;/b>&lt;br/>The Fonts Package contains a couple of commonly used fonts. Installation is highly recommended.</string>
           </property>
           <property name="wordWrap" >
            <bool>true</bool>
@@ -392,11 +376,7 @@ p, li { white-space: pre-wrap; }
         <item row="1" column="1" >
          <widget class="QLabel" name="labelThemes" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Install Themes&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Rockbox' look can be customized by themes. You can choose and install several officially distributed themes.&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Install Themes&lt;/b>&lt;br/>Rockbox' look can be customized by themes. You can choose and install several officially distributed themes.</string>
           </property>
           <property name="wordWrap" >
            <bool>true</bool>
@@ -422,11 +402,7 @@ p, li { white-space: pre-wrap; }
         <item row="2" column="1" >
          <widget class="QLabel" name="labelGames" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Install Game Files&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;">&lt;span style=" font-weight:400;">Doom needs a base wad file to run.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Install Game Files&lt;/b>&lt;br/>Doom needs a base wad file to run.</string>
           </property>
           <property name="openExternalLinks" >
            <bool>true</bool>
@@ -488,11 +464,7 @@ p, li { white-space: pre-wrap; }
         <item row="0" column="1" >
          <widget class="QLabel" name="labelVoice" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;span style=" font-weight:600;">Install Voice file&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Voice files are needed to make Rockbox speak the user interface. Speaking is enabled by default, so if you installed the voice file Rockbox will speak.&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Install Voice file&lt;/b>&lt;br/>Voice files are needed to make Rockbox speak the user interface. Speaking is enabled by default, so if you installed the voice file Rockbox will speak.</string>
           </property>
           <property name="wordWrap" >
            <bool>true</bool>
@@ -518,11 +490,7 @@ p, li { white-space: pre-wrap; }
         <item row="2" column="1" >
          <widget class="QLabel" name="labelTalk" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Create Talk Files&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;">&lt;span style=" font-weight:400;">Talkfiles are needed to let Rockbox speak File and Foldernames&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Create Talk Files&lt;/b>&lt;br/>Talkfiles are needed to let Rockbox speak File and Foldernames</string>
           </property>
          </widget>
         </item>
@@ -571,12 +539,11 @@ p, li { white-space: pre-wrap; }
         <item row="1" column="1" >
          <widget class="QLabel" name="labelCreateVoice" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">&lt;span style=" font-size:9pt; font-weight:600;">Create Voice file&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Voice files are needed to make Rockbox speak the  user interface. Speaking is enabled by default, so&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"> if you installed the voice file Rockbox will speak.&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Create Voice file&lt;/b>&lt;br/>Voice files are needed to make Rockbox speak the  user interface. Speaking is enabled by default, so
+ if you installed the voice file Rockbox will speak.</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>true</bool>
           </property>
          </widget>
         </item>
@@ -609,11 +576,7 @@ p, li { white-space: pre-wrap; }
         <item row="0" column="1" >
          <widget class="QLabel" name="labelRemoveBootloader" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Remove the bootloader&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">After removing the bootloader you won't be able to start Rockbox.&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Remove the bootloader&lt;/b>&lt;br/>After removing the bootloader you won't be able to start Rockbox.</string>
           </property>
           <property name="wordWrap" >
            <bool>true</bool>
@@ -639,11 +602,7 @@ p, li { white-space: pre-wrap; }
         <item row="1" column="1" >
          <widget class="QLabel" name="labelUninstall" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Uninstall Rockbox&lt;/span> from your audio player.&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This will leave the bootloader in place (you need to remove it manually).&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&lt;b>Uninstall Rockbox from your audio player.&lt;/b>&lt;br/>This will leave the bootloader in place (you need to remove it manually).</string>
           </property>
           <property name="alignment" >
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -797,11 +756,10 @@ p, li { white-space: pre-wrap; }
         <item row="0" column="0" >
          <widget class="QLabel" name="labelInfo" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Currently installed packages.&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Note&lt;/span>: if you manually installed packages this might not be correct!&lt;/p>&lt;/body>&lt;/html></string>
+           <string>Currently installed packages.&lt;br/>&lt;b>Note:&lt;/b> if you manually installed packages this might not be correct!</string>
+          </property>
+          <property name="textFormat" >
+           <enum>Qt::RichText</enum>
           </property>
           <property name="wordWrap" >
            <bool>true</bool>
@@ -828,8 +786,8 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>738</width>
-     <height>29</height>
+     <width>650</width>
+     <height>28</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File" >