Browse Source

Enabled modality for appropriate dialogs

Make sure it is impossible to open more than one torrent addition from URL dialog
adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
cc3a6350a5
  1. 6
      src/GUI.cpp
  2. 2
      src/GUI.h
  3. 1
      src/console_imp.h
  4. 1
      src/createtorrent_imp.cpp
  5. 1
      src/downloadfromurldlg.h
  6. 2
      src/options_imp.cpp

6
src/GUI.cpp

@ -227,6 +227,8 @@ GUI::~GUI() { @@ -227,6 +227,8 @@ GUI::~GUI() {
delete aboutDlg;
if(options)
delete options;
if(downloadFromURLDialog)
delete downloadFromURLDialog;
if(rssWidget)
delete rssWidget;
delete searchEngine;
@ -960,7 +962,9 @@ void GUI::on_actionOptions_triggered() { @@ -960,7 +962,9 @@ void GUI::on_actionOptions_triggered() {
// Display an input dialog to prompt user for
// an url
void GUI::on_actionDownload_from_URL_triggered() {
downloadFromURL *downloadFromURLDialog = new downloadFromURL(this);
if(!downloadFromURLDialog) {
downloadFromURLDialog = new downloadFromURL(this);
connect(downloadFromURLDialog, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), this, SLOT(downloadFromURLList(const QStringList&)));
}
}

2
src/GUI.h

@ -58,6 +58,7 @@ class StatusBar; @@ -58,6 +58,7 @@ class StatusBar;
class consoleDlg;
class about;
class createtorrent;
class downloadFromURL;
class GUI : public QMainWindow, private Ui::MainWindow{
Q_OBJECT
@ -139,6 +140,7 @@ private: @@ -139,6 +140,7 @@ private:
QPointer<consoleDlg> console;
QPointer<about> aboutDlg;
QPointer<createtorrent> createTorrentDlg;
QPointer<downloadFromURL> downloadFromURLDialog;
QPointer<QSystemTrayIcon> systrayIcon;
QPointer<QTimer> systrayCreator;
QMenu *myTrayIconMenu;

1
src/console_imp.h

@ -46,6 +46,7 @@ class consoleDlg : public QDialog, private Ui_ConsoleDlg{ @@ -46,6 +46,7 @@ class consoleDlg : public QDialog, private Ui_ConsoleDlg{
consoleDlg(QWidget *parent, Bittorrent* _BTSession) : QDialog(parent) {
setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
setModal(true);
BTSession = _BTSession;
textConsole->setHtml(BTSession->getConsoleMessages().join("<br>"));
textBannedPeers->setHtml(BTSession->getPeerBanMessages().join("<br>"));

1
src/createtorrent_imp.cpp

@ -65,6 +65,7 @@ bool file_filter(boost::filesystem::path const& filename) @@ -65,6 +65,7 @@ bool file_filter(boost::filesystem::path const& filename)
createtorrent::createtorrent(QWidget *parent): QDialog(parent){
setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
setModal(true);
creatorThread = new torrentCreatorThread(this);
connect(creatorThread, SIGNAL(creationSuccess(QString, const char*)), this, SLOT(handleCreationSuccess(QString, const char*)));
connect(creatorThread, SIGNAL(creationFailure(QString)), this, SLOT(handleCreationFailure(QString)));

1
src/downloadfromurldlg.h

@ -47,6 +47,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{ @@ -47,6 +47,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
icon_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/url.png")));
setModal(true);
show();
// Paste clipboard if there is an URL in it
QString clip_txt = qApp->clipboard()->text();

2
src/options_imp.cpp

@ -52,6 +52,8 @@ @@ -52,6 +52,8 @@
options_imp::options_imp(QWidget *parent):QDialog(parent){
qDebug("-> Constructing Options");
setAttribute(Qt::WA_DeleteOnClose);
setModal(true);
QString savePath;
setupUi(this);
// Get apply button in button box

Loading…
Cancel
Save