From 45f0383ee2633fbd976c16b15bbf0210b2fcb5d5 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 4 Dec 2010 10:31:14 +0000 Subject: [PATCH] Several dimension saving fixes --- src/torrentadditiondlg.cpp | 9 ++++- src/torrentadditiondlg.h | 3 ++ src/torrentcreator/torrentcreatordlg.cpp | 22 +++++++++- src/torrentcreator/torrentcreatordlg.h | 51 ++++++++++++++---------- src/torrentimportdlg.cpp | 15 +++++-- src/torrentimportdlg.h | 3 ++ 6 files changed, 75 insertions(+), 28 deletions(-) diff --git a/src/torrentadditiondlg.cpp b/src/torrentadditiondlg.cpp index e0c542d3b..7bcee5dd1 100644 --- a/src/torrentadditiondlg.cpp +++ b/src/torrentadditiondlg.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -112,11 +113,17 @@ torrentAdditionDialog::torrentAdditionDialog(QWidget *parent) : } torrentAdditionDialog::~torrentAdditionDialog() { - saveSettings(); delete PropDelegate; delete PropListModel; } +void torrentAdditionDialog::closeEvent(QCloseEvent *event) +{ + qDebug() << Q_FUNC_INFO; + saveSettings(); + QDialog::closeEvent(event); +} + void torrentAdditionDialog::readSettings() { QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); restoreGeometry(settings.value("TorrentAdditionDlg/dimensions").toByteArray()); diff --git a/src/torrentadditiondlg.h b/src/torrentadditiondlg.h index a89ee9735..4c0941380 100644 --- a/src/torrentadditiondlg.h +++ b/src/torrentadditiondlg.h @@ -71,6 +71,9 @@ public slots: void updateSavePathCurrentText(); void resetComboLabelIndex(QString text); +protected: + void closeEvent(QCloseEvent *event); + private: QString fileName; QString hash; diff --git a/src/torrentcreator/torrentcreatordlg.cpp b/src/torrentcreator/torrentcreatordlg.cpp index 7ba144dfc..1a25d4b0e 100644 --- a/src/torrentcreator/torrentcreatordlg.cpp +++ b/src/torrentcreator/torrentcreatordlg.cpp @@ -51,6 +51,7 @@ TorrentCreatorDlg::TorrentCreatorDlg(QWidget *parent): QDialog(parent), creatorT loadTrackerList(); // Piece sizes m_piece_sizes << 32 << 64 << 128 << 256 << 512 << 1024 << 2048 << 4096; + loadSettings(); show(); } @@ -182,7 +183,7 @@ void TorrentCreatorDlg::on_cancelButton_clicked() { creatorThread->wait(); } // Close the dialog - reject(); + close(); } void TorrentCreatorDlg::updateProgressBar(int progress) { @@ -255,3 +256,22 @@ void TorrentCreatorDlg::loadTrackerList() QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); trackers_list->setPlainText(settings.value("CreateTorrent/TrackerList", "").toString()); } + +void TorrentCreatorDlg::saveSettings() +{ + QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); + settings.setValue("CreateTorrent/dimensions", saveGeometry()); +} + +void TorrentCreatorDlg::loadSettings() +{ + QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); + restoreGeometry(settings.value("CreateTorrent/dimensions").toByteArray()); +} + +void TorrentCreatorDlg::closeEvent(QCloseEvent *event) +{ + qDebug() << Q_FUNC_INFO; + saveSettings(); + QDialog::closeEvent(event); +} diff --git a/src/torrentcreator/torrentcreatordlg.h b/src/torrentcreator/torrentcreatordlg.h index 0b3b12a20..cda947d52 100644 --- a/src/torrentcreator/torrentcreatordlg.h +++ b/src/torrentcreator/torrentcreatordlg.h @@ -37,31 +37,38 @@ class TorrentCreatorThread; class TorrentCreatorDlg : public QDialog, private Ui::createTorrentDialog{ Q_OBJECT - - public: - TorrentCreatorDlg(QWidget *parent = 0); - ~TorrentCreatorDlg(); - int getPieceSize() const; - signals: - void torrent_to_seed(QString path); +public: + TorrentCreatorDlg(QWidget *parent = 0); + ~TorrentCreatorDlg(); + int getPieceSize() const; - public slots: - void updateProgressBar(int progress); - void on_cancelButton_clicked(); +signals: + void torrent_to_seed(QString path); - protected slots: - void on_createButton_clicked(); - void on_addFile_button_clicked(); - void on_addFolder_button_clicked(); - void handleCreationFailure(QString msg); - void handleCreationSuccess(QString path, QString branch_path); - void setInteractionEnabled(bool enabled); - void showProgressBar(bool show); - void on_checkAutoPieceSize_clicked(bool checked); - void updateOptimalPieceSize(); - void saveTrackerList(); - void loadTrackerList(); +public slots: + void updateProgressBar(int progress); + void on_cancelButton_clicked(); + +protected slots: + void on_createButton_clicked(); + void on_addFile_button_clicked(); + void on_addFolder_button_clicked(); + void handleCreationFailure(QString msg); + void handleCreationSuccess(QString path, QString branch_path); + void setInteractionEnabled(bool enabled); + void showProgressBar(bool show); + void on_checkAutoPieceSize_clicked(bool checked); + void updateOptimalPieceSize(); + void saveTrackerList(); + void loadTrackerList(); + +protected: + void closeEvent(QCloseEvent *event); + +private: + void saveSettings(); + void loadSettings(); private: TorrentCreatorThread *creatorThread; diff --git a/src/torrentimportdlg.cpp b/src/torrentimportdlg.cpp index 79dbcad2e..e7acaf5ef 100644 --- a/src/torrentimportdlg.cpp +++ b/src/torrentimportdlg.cpp @@ -30,6 +30,7 @@ #include #include +#include #include "torrentimportdlg.h" #include "ui_torrentimportdlg.h" @@ -54,7 +55,6 @@ TorrentImportDlg::TorrentImportDlg(QWidget *parent) : TorrentImportDlg::~TorrentImportDlg() { - saveSettings(); delete ui; } @@ -180,7 +180,7 @@ void TorrentImportDlg::on_browseContentBtn_clicked() void TorrentImportDlg::on_importBtn_clicked() { - accept(); + close(); } QString TorrentImportDlg::getTorrentPath() const @@ -283,11 +283,18 @@ bool TorrentImportDlg::skipFileChecking() const void TorrentImportDlg::loadSettings() { QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); - settings.setValue("TorrentImportDlg/dimensions", saveGeometry()); + restoreGeometry(settings.value("TorrentImportDlg/dimensions").toByteArray()); } void TorrentImportDlg::saveSettings() { QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); - restoreGeometry(settings.value("TorrentImportDlg/dimensions").toByteArray()); + settings.setValue("TorrentImportDlg/dimensions", saveGeometry()); +} + +void TorrentImportDlg::closeEvent(QCloseEvent *event) +{ + qDebug() << Q_FUNC_INFO; + saveSettings(); + QDialog::closeEvent(event); } diff --git a/src/torrentimportdlg.h b/src/torrentimportdlg.h index 94cae6a34..bc59f58de 100644 --- a/src/torrentimportdlg.h +++ b/src/torrentimportdlg.h @@ -69,6 +69,9 @@ private slots: void on_importBtn_clicked(); +protected: + void closeEvent(QCloseEvent *event); + private: void loadSettings(); void saveSettings();