From c4d9c51e49259e860d5f2d08d5bfcd6bbd68909a Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Tue, 5 Jan 2010 20:31:20 +0000
Subject: [PATCH] - Never display a horizontal scrollbar in status filters list

---
 src/transferlistfilterswidget.h |  1 +
 src/ui/mainwindow.ui            | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/transferlistfilterswidget.h b/src/transferlistfilterswidget.h
index 079f5d7ed..08739939b 100644
--- a/src/transferlistfilterswidget.h
+++ b/src/transferlistfilterswidget.h
@@ -141,6 +141,7 @@ public:
     setLayout(vLayout);
     // Limit status filters list height
     statusFilters->setFixedHeight(100);
+    statusFilters->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setContentsMargins(0,0,0,0);
     vLayout->setSpacing(2);
     // Add status filters
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index 2d44a140a..d7b9fc37e 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -29,7 +29,7 @@
      <x>0</x>
      <y>0</y>
      <width>914</width>
-     <height>27</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_Edit">
@@ -225,7 +225,7 @@
   </action>
   <action name="actionDecreasePriority">
    <property name="icon">
-    <iconset>
+    <iconset resource="../icons.qrc">
      <normaloff>:/Icons/skin/decrease.png</normaloff>:/Icons/skin/decrease.png</iconset>
    </property>
    <property name="text">
@@ -237,7 +237,7 @@
   </action>
   <action name="actionIncreasePriority">
    <property name="icon">
-    <iconset>
+    <iconset resource="../icons.qrc">
      <normaloff>:/Icons/skin/increase.png</normaloff>:/Icons/skin/increase.png</iconset>
    </property>
    <property name="text">
@@ -249,7 +249,7 @@
   </action>
   <action name="actionShow_console">
    <property name="icon">
-    <iconset>
+    <iconset resource="../icons.qrc">
      <normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
    </property>
    <property name="text">
@@ -261,7 +261,7 @@
   </action>
  </widget>
  <resources>
-  <include location="icons.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>