From 73047e3c842d02fe197617bf121b1548d8bfcafa Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Tue, 27 Oct 2015 12:30:54 +0800
Subject: [PATCH] Cleanup downloadfromurldlg, statsdialog

---
 src/gui/downloadfromurldlg.h  |  6 +++--
 src/gui/downloadfromurldlg.ui | 42 +++++++++++++----------------------
 src/gui/mainwindow.h          |  1 -
 src/gui/statsdialog.cpp       |  3 ++-
 src/gui/statsdialog.h         |  2 +-
 src/gui/statsdialog.ui        | 31 ++++++--------------------
 6 files changed, 30 insertions(+), 55 deletions(-)

diff --git a/src/gui/downloadfromurldlg.h b/src/gui/downloadfromurldlg.h
index eb2f87616..cd05aeb17 100644
--- a/src/gui/downloadfromurldlg.h
+++ b/src/gui/downloadfromurldlg.h
@@ -47,7 +47,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       setModal(true);
-      show();
+
       // Paste clipboard if there is an URL in it
       QString clip_txt = qApp->clipboard()->text();
       QStringList clip_txt_list = clip_txt.split(QString::fromUtf8("\n"));
@@ -71,6 +71,8 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
       }
       if (clip_txt_list_cleaned.size() > 0)
         textUrls->setText(clip_txt_list_cleaned.join("\n"));
+
+      show();
     }
 
     ~downloadFromURL() {}
@@ -93,7 +95,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
         }
       }
       if (!url_list_cleaned.size()) {
-        QMessageBox::warning(0, tr("No URL entered"), tr("Please type at least one URL."));
+        QMessageBox::warning(this, tr("No URL entered"), tr("Please type at least one URL."));
         return;
       }
       emit urlsReadyToBeDownloaded(url_list_cleaned);
diff --git a/src/gui/downloadfromurldlg.ui b/src/gui/downloadfromurldlg.ui
index aa1f763a6..a701e7f99 100644
--- a/src/gui/downloadfromurldlg.ui
+++ b/src/gui/downloadfromurldlg.ui
@@ -11,51 +11,41 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Download from urls</string>
+   <string>Download from URLs</string>
   </property>
   <layout class="QVBoxLayout">
    <item>
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QLabel" name="downloadURL_lbl">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Add torrent links</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QLabel" name="downloadURL_lbl">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Add torrent links</string>
+     </property>
+    </widget>
    </item>
    <item>
     <widget class="QTextEdit" name="textUrls">
-     <property name="acceptRichText">
-      <bool>false</bool>
-     </property>
      <property name="tabChangesFocus">
       <bool>true</bool>
      </property>
+     <property name="acceptRichText">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
    <item>
     <widget class="QLabel" name="label_infos">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>17</height>
-      </size>
-     </property>
      <property name="font">
       <font>
        <italic>true</italic>
       </font>
      </property>
      <property name="text">
-      <string>One per line (HTTP links, Magnet links and info-hashes are supported)</string>
+      <string>One link per line (HTTP links, Magnet links and info-hashes are supported)</string>
      </property>
     </widget>
    </item>
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 2c2ab35d8..c94f8be7d 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -52,7 +52,6 @@ class TransferListFiltersWidget;
 class PropertiesWidget;
 class StatusBar;
 class TorrentCreatorDlg;
-class downloadFromURL;
 class LineEdit;
 class ExecutionLog;
 class PowerManagement;
diff --git a/src/gui/statsdialog.cpp b/src/gui/statsdialog.cpp
index a42d44945..7a5dcb531 100644
--- a/src/gui/statsdialog.cpp
+++ b/src/gui/statsdialog.cpp
@@ -44,12 +44,13 @@ StatsDialog::StatsDialog(QWidget *parent)
 {
   ui->setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
-  connect(ui->buttonOK, SIGNAL(clicked()), SLOT(close()));
+  connect(ui->buttonBox, SIGNAL(accepted()), SLOT(close()));
   updateUI();
   t = new QTimer(this);
   t->setInterval(1500);
   connect(t, SIGNAL(timeout()), SLOT(updateUI()));
   t->start();
+
   show();
 }
 
diff --git a/src/gui/statsdialog.h b/src/gui/statsdialog.h
index af41a5999..46c41d8a8 100644
--- a/src/gui/statsdialog.h
+++ b/src/gui/statsdialog.h
@@ -42,7 +42,7 @@ class StatsDialog : public QDialog {
   Q_OBJECT
 
 public:
-  explicit StatsDialog(QWidget *parent = 0);
+  explicit StatsDialog(QWidget *parent);
   ~StatsDialog();
 
 private slots:
diff --git a/src/gui/statsdialog.ui b/src/gui/statsdialog.ui
index fa0d90d82..ef2ebbf08 100644
--- a/src/gui/statsdialog.ui
+++ b/src/gui/statsdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>273</width>
-    <height>395</height>
+    <width>286</width>
+    <height>401</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -223,28 +223,11 @@
     </spacer>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <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>
-      <widget class="QPushButton" name="buttonOK">
-       <property name="text">
-        <string>OK</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>