From fc42449d3a28adaeadd973684d1ea9080cdf5451 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Fri, 13 Aug 2010 13:38:29 +0000
Subject: [PATCH] Fix about dialog layout

---
 Changelog       |  1 +
 src/about_imp.h |  1 -
 src/ui/about.ui | 25 +++++++++++++++----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Changelog b/Changelog
index 42259b4c3..b0af41bda 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.3.1
     - BUGFIX: Fix compilation with gcc 4.5
+    - BUGFIX: Fix about dialog layout
 
 * Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
     - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)
diff --git a/src/about_imp.h b/src/about_imp.h
index b902a5cbb..e94130c94 100644
--- a/src/about_imp.h
+++ b/src/about_imp.h
@@ -47,7 +47,6 @@ class about : public QDialog, private Ui::AboutDlg{
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
       logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
-      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png")));
       //Title
       lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks
diff --git a/src/ui/about.ui b/src/ui/about.ui
index b4f997e69..c9e15c582 100644
--- a/src/ui/about.ui
+++ b/src/ui/about.ui
@@ -88,8 +88,18 @@
       <attribute name="title">
        <string>About</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="mascot_lbl">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="../icons.qrc">:/Icons/skin/mascot.png</pixmap>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
         <widget class="QLabel" name="lb_about">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -123,13 +133,6 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QLabel" name="mascot_lbl">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab3">
@@ -297,6 +300,8 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="../icons.qrc"/>
+ </resources>
  <connections/>
 </ui>