From 3e6706a37146880c62f5425c894d24d1c9d20070 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 9 Mar 2015 15:34:53 +0800 Subject: [PATCH 1/2] Don't close downloadFromURL dialog when showing empty url warning --- src/gui/downloadfromurldlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/downloadfromurldlg.h b/src/gui/downloadfromurldlg.h index 736331637..6302bd641 100644 --- a/src/gui/downloadfromurldlg.h +++ b/src/gui/downloadfromurldlg.h @@ -80,7 +80,6 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{ public slots: void on_downloadButton_clicked() { - close(); QString urls = textUrls->toPlainText(); QStringList url_list = urls.split(QString::fromUtf8("\n")); QString url; @@ -97,6 +96,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{ QMessageBox::critical(0, tr("No URL entered"), tr("Please type at least one URL.")); return; } + close(); emit urlsReadyToBeDownloaded(url_list_cleaned); qDebug("Emitted urlsReadytobedownloaded signal"); } From bd8b8a8c8f49b8ae1038b93b4b587756d38fa50d Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 20 Jun 2015 20:36:35 +0800 Subject: [PATCH 2/2] Use warning message box instead of critical --- src/gui/downloadfromurldlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/downloadfromurldlg.h b/src/gui/downloadfromurldlg.h index 6302bd641..8d9e9b980 100644 --- a/src/gui/downloadfromurldlg.h +++ b/src/gui/downloadfromurldlg.h @@ -93,7 +93,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{ } } if (!url_list_cleaned.size()) { - QMessageBox::critical(0, tr("No URL entered"), tr("Please type at least one URL.")); + QMessageBox::warning(0, tr("No URL entered"), tr("Please type at least one URL.")); return; } close();