From c0520146e9a795cb31695956815e8f51ec502cc8 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Wed, 21 Jul 2010 14:03:04 +0000
Subject: [PATCH] Removed force_reannounce button from the main properties tab
 since the action is available from the trackers list now

---
 src/propertieswidget.cpp   |  6 ----
 src/propertieswidget.h     |  1 -
 src/ui/propertieswidget.ui | 56 +++++++++++---------------------------
 3 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/src/propertieswidget.cpp b/src/propertieswidget.cpp
index 8f456b81a..5a142f165 100644
--- a/src/propertieswidget.cpp
+++ b/src/propertieswidget.cpp
@@ -233,12 +233,6 @@ void PropertiesWidget::updateTorrentInfos(QTorrentHandle& _h) {
   }
 }
 
-void PropertiesWidget::on_reannounce_btn_clicked() {
-  if(h.is_valid()) {
-    h.force_reannounce();
-  }
-}
-
 void PropertiesWidget::loadTorrentInfos(QTorrentHandle &_h) {
   clear();
   h = _h;
diff --git a/src/propertieswidget.h b/src/propertieswidget.h
index 5825d5228..cbd334e8a 100644
--- a/src/propertieswidget.h
+++ b/src/propertieswidget.h
@@ -101,7 +101,6 @@ protected slots:
   void showPiecesAvailability(bool show);
   void updateSavePath(QTorrentHandle& h);
   void renameSelectedFile();
-  void on_reannounce_btn_clicked();
 
 public slots:
   void loadDynamicData();
diff --git a/src/ui/propertieswidget.ui b/src/ui/propertieswidget.ui
index 6e13f1bd0..ad39c4b19 100644
--- a/src/ui/propertieswidget.ui
+++ b/src/ui/propertieswidget.ui
@@ -54,8 +54,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>520</width>
-            <height>360</height>
+            <width>522</width>
+            <height>351</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -215,7 +215,7 @@
                 </property>
                </widget>
               </item>
-              <item row="0" column="5">
+              <item row="0" column="6">
                <widget class="QLabel" name="shareRatio">
                 <property name="text">
                  <string notr="true">1.0</string>
@@ -266,7 +266,7 @@
                 </property>
                </widget>
               </item>
-              <item row="1" column="5">
+              <item row="1" column="6">
                <widget class="QLabel" name="lbl_connections">
                 <property name="text">
                  <string notr="true">0</string>
@@ -317,42 +317,18 @@
                 </property>
                </widget>
               </item>
-              <item row="2" column="5">
-               <layout class="QHBoxLayout" name="horizontalLayout_3">
-                <item>
-                 <widget class="QLabel" name="reannounce_lbl">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string notr="true"/>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QToolButton" name="reannounce_btn">
-                  <property name="toolTip">
-                   <string>Force reannounce</string>
-                  </property>
-                  <property name="text">
-                   <string notr="true"/>
-                  </property>
-                  <property name="icon">
-                   <iconset resource="../icons.qrc">
-                    <normaloff>:/Icons/oxygen/run-build.png</normaloff>:/Icons/oxygen/run-build.png</iconset>
-                  </property>
-                  <property name="iconSize">
-                   <size>
-                    <width>12</width>
-                    <height>12</height>
-                   </size>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
+              <item row="2" column="6">
+               <widget class="QLabel" name="reannounce_lbl">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string notr="true"/>
+                </property>
+               </widget>
               </item>
              </layout>
             </widget>