From f7fdf134681a35950edeb1054a1e095f7acec058 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Tue, 14 Feb 2012 21:02:52 +0100
Subject: Move manual tab contents to separate widget.

Create a new widget which holds the contents of the manual tab and its logic.
Unify its display / download code. Fixes FS#12587, which was caused by
duplicated code.

Change-Id: I5721d2a95ebeaf80481c1fd149eda22cf1328501
---
 rbutil/rbutilqt/rbutilqtfrm.ui | 102 +----------------------------------------
 1 file changed, 1 insertion(+), 101 deletions(-)

(limited to 'rbutil/rbutilqt/rbutilqtfrm.ui')

diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui
index 5233022061..ff8dda3d7d 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/rbutil/rbutilqt/rbutilqtfrm.ui
@@ -650,103 +650,6 @@
        <attribute name="toolTip">
         <string>View and download the manual</string>
        </attribute>
-       <layout class="QGridLayout">
-        <item row="0" column="0">
-         <widget class="QGroupBox" name="groupBox_2">
-          <property name="title">
-           <string>Read the manual</string>
-          </property>
-          <layout class="QGridLayout">
-           <item row="0" column="0">
-            <widget class="QLabel" name="labelPdfManual">
-             <property name="text">
-              <string>PDF manual</string>
-             </property>
-             <property name="openExternalLinks">
-              <bool>true</bool>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="labelHtmlManual">
-             <property name="text">
-              <string>HTML manual</string>
-             </property>
-             <property name="openExternalLinks">
-              <bool>true</bool>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QGroupBox" name="groupBox">
-          <property name="title">
-           <string>Download the manual</string>
-          </property>
-          <layout class="QGridLayout">
-           <item row="0" column="0">
-            <layout class="QVBoxLayout">
-             <item>
-              <widget class="QRadioButton" name="radioPdf">
-               <property name="text">
-                <string>&amp;PDF version</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioHtmlzip">
-               <property name="text">
-                <string>&amp;HTML version (zip file)</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="0" column="1">
-            <spacer>
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="0" column="2">
-            <widget class="QPushButton" name="buttonDownloadManual">
-             <property name="text">
-              <string>Down&amp;load</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
       </widget>
       <widget class="QWidget" name="info">
        <attribute name="title">
@@ -787,7 +690,7 @@
      <x>0</x>
      <y>0</y>
      <width>650</width>
-     <height>18</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -1064,9 +967,6 @@
   <tabstop>buttonGames</tabstop>
   <tabstop>buttonRemoveBootloader</tabstop>
   <tabstop>buttonRemoveRockbox</tabstop>
-  <tabstop>radioPdf</tabstop>
-  <tabstop>radioHtmlzip</tabstop>
-  <tabstop>buttonDownloadManual</tabstop>
   <tabstop>buttonChangeDevice</tabstop>
   <tabstop>buttonVoice</tabstop>
   <tabstop>buttonCreateVoice</tabstop>
-- 
cgit v1.2.3