SVN commit 1246228 by mfuchs:
Stores and restores the size of the dialogs.
M +0 -4 conf/kget.kcfg
M +18 -0 core/basedialog.cpp
M +19 -0 core/basedialog.h
M +1 -1 ui/groupsettingsdialog.cpp
M +2 -1 ui/groupsettingsdialog.h
M +2 -1 ui/history/transferhistory.cpp
M +2 -2 ui/history/transferhistory.h
M +2 -1 ui/linkview/kget_linkview.cpp
M +2 -2 ui/linkview/kget_linkview.h
M +1 -1 ui/metalinkcreator/dragdlg.cpp
M +2 -3 ui/metalinkcreator/dragdlg.h
M +1 -1 ui/metalinkcreator/filedlg.cpp
M +2 -3 ui/metalinkcreator/filedlg.h
M +6 -2 ui/mirror/mirrorsettings.cpp
M +4 -3 ui/mirror/mirrorsettings.h
M +1 -1 ui/signaturedlg.cpp
M +2 -3 ui/signaturedlg.h
M +1 -8 ui/transfersettingsdialog.cpp
M +2 -3 ui/transfersettingsdialog.h
M +1 -8 ui/verificationdialog.cpp
M +2 -2 ui/verificationdialog.h
--- trunk/KDE/kdenetwork/kget/conf/kget.kcfg #1246227:1246228
@@ -186,10 +186,6 @@
-
-
-
-
--- trunk/KDE/kdenetwork/kget/core/basedialog.cpp #1246227:1246228
@@ -18,6 +18,7 @@
***************************************************************************/
#include "basedialog.h"
+#include "settings.h"
KGetBaseDialog::KGetBaseDialog(QWidget *parent, Qt::WFlags flags)
: KDialog(parent, flags)
@@ -32,3 +33,20 @@
KDialog::slotButtonClicked(button);
}
}
+
+KGetSaveSizeDialog::KGetSaveSizeDialog(const QByteArray &name, QWidget *parent, Qt::WFlags flags)
+ : KDialog(parent, flags),
+ m_name("Size" + name)
+{
+ const QSize size = KGlobal::config()->group("Geometry").readEntry(m_name.constData(), QSize());
+ if (size.isValid()) {
+ resize(size);
+ }
+}
+
+KGetSaveSizeDialog::~KGetSaveSizeDialog()
+{
+ const QString name = QString("Size_") + metaObject()->className();
+ KGlobal::config()->group("Geometry").writeEntry(m_name.constData(), size());
+}
+
--- trunk/KDE/kdenetwork/kget/core/basedialog.h #1246227:1246228
@@ -38,4 +38,23 @@
virtual void slotButtonClicked(int button);
};
+/**
+ * Subclass to make sure that the size of the dialog is
+ * automatically stored and restored
+ */
+class KGET_EXPORT KGetSaveSizeDialog : public KDialog
+{
+ Q_OBJECT
+
+ public:
+ /**
+ * Restores the dialog to the size saved for name
+ */
+ explicit KGetSaveSizeDialog(const QByteArray &name, QWidget *parent = 0, Qt::WFlags flags = 0);
+ virtual ~KGetSaveSizeDialog();
+
+ private:
+ QByteArray m_name;
+};
+
#endif
--- trunk/KDE/kdenetwork/kget/ui/groupsettingsdialog.cpp #1246227:1246228
@@ -19,7 +19,7 @@
#endif
GroupSettingsDialog::GroupSettingsDialog(QWidget *parent, TransferGroupHandler *group)
- : KDialog(parent),
+ : KGetSaveSizeDialog("GroupSettingsDialog", parent),
m_group(group)
{
setCaption(i18n("Group Settings for %1", group->name()));
--- trunk/KDE/kdenetwork/kget/ui/groupsettingsdialog.h #1246227:1246228
@@ -11,6 +11,7 @@
#define GROUPSETTINGSDIALOG_H
#include "ui_groupsettingsdialog.h"
+#include "../core/basedialog.h"
#include
@@ -22,7 +23,7 @@
class TransferGroupHandler;
-class GroupSettingsDialog : public KDialog
+class GroupSettingsDialog : public KGetSaveSizeDialog
{
Q_OBJECT
public:
--- trunk/KDE/kdenetwork/kget/ui/history/transferhistory.cpp #1246227:1246228
@@ -40,11 +40,12 @@
#include
TransferHistory::TransferHistory(QWidget *parent)
- : KDialog(parent),
+ : KGetSaveSizeDialog("TransferHistory", parent),
m_rangeType(TransferHistory::Date),
m_progressBar(new QProgressBar(this)),
m_iconModeEnabled(true)
{
+ setAttribute(Qt::WA_DeleteOnClose);
setCaption(i18n("Transfer History"));
setButtons(KDialog::Close);
//Setup Ui-Parts from Designer
--- trunk/KDE/kdenetwork/kget/ui/history/transferhistory.h #1246227:1246228
@@ -12,7 +12,7 @@
#define TRANSFERHISTORY_H
#include
-#include
+#include "../../core/basedialog.h"
#include "ui_transferhistory.h"
@@ -24,7 +24,7 @@
class TransferHistoryStore;
class TransferHistoryItem;
-class TransferHistory : public KDialog, Ui::TransferHistory
+class TransferHistory : public KGetSaveSizeDialog, Ui::TransferHistory
{
Q_OBJECT
--- trunk/KDE/kdenetwork/kget/ui/linkview/kget_linkview.cpp #1246227:1246228
@@ -33,8 +33,9 @@
#include
KGetLinkView::KGetLinkView(QWidget *parent)
- : KDialog(parent), m_linkImporter(0)
+ : KGetSaveSizeDialog("KGetLinkView", parent), m_linkImporter(0)
{
+ setAttribute(Qt::WA_DeleteOnClose);
setCaption(i18n("Import Links"));
if (parent) {
--- trunk/KDE/kdenetwork/kget/ui/linkview/kget_linkview.h #1246227:1246228
@@ -11,7 +11,7 @@
#ifndef KGET_LINKVIEW_H
#define KGET_LINKVIEW_H
-#include
+#include "../../core/basedialog.h"
#include
#include "ui_importlinkdialog.h"
@@ -21,7 +21,7 @@
class KGetSortFilterProxyModel;
-class KGetLinkView : public KDialog
+class KGetLinkView : public KGetSaveSizeDialog
{
Q_OBJECT
--- trunk/KDE/kdenetwork/kget/ui/metalinkcreator/dragdlg.cpp #1246227:1246228
@@ -27,7 +27,7 @@
#include
DragDlg::DragDlg(KGetMetalink::Resources *resources, KGetMetalink::CommonData *commonData, QSortFilterProxyModel *countrySort, QSortFilterProxyModel *languageSort, QWidget *parent)
- : KDialog(parent),
+ : KGetSaveSizeDialog("DragDlg", parent),
m_resources(resources),
m_commonData(commonData)
{
--- trunk/KDE/kdenetwork/kget/ui/metalinkcreator/dragdlg.h #1246227:1246228
@@ -20,8 +20,7 @@
#ifndef DRAGDLG_H
#define DRAGDLG_H
-#include
-
+#include "../../core/basedialog.h"
#include "ui_dragdlg.h"
#include "ui_commondata.h"
@@ -35,7 +34,7 @@
class Resources;
}
-class DragDlg : public KDialog
+class DragDlg : public KGetSaveSizeDialog
{
Q_OBJECT
--- trunk/KDE/kdenetwork/kget/ui/metalinkcreator/filedlg.cpp #1246227:1246228
@@ -31,7 +31,7 @@
#include
FileDlg::FileDlg(KGetMetalink::File *file, const QStringList ¤tFileNames, QSortFilterProxyModel *countrySort, QSortFilterProxyModel *languageSort, QWidget *parent, bool edit)
- : KDialog(parent),
+ : KGetSaveSizeDialog("FileDlg", parent),
m_file(file),
m_initialFileName(m_file->name),
m_currentFileNames(currentFileNames),
--- trunk/KDE/kdenetwork/kget/ui/metalinkcreator/filedlg.h #1246227:1246228
@@ -20,8 +20,7 @@
#ifndef FILEDLG_H
#define FILEDLG_H
-#include
-
+#include "../../core/basedialog.h"
#include "ui_filedlg.h"
#include "ui_urlwidget.h"
#include "ui_commondata.h"
@@ -35,7 +34,7 @@
class VerificationModel;
class UrlWidget;
-class FileDlg : public KDialog
+class FileDlg : public KGetSaveSizeDialog
{
Q_OBJECT
--- trunk/KDE/kdenetwork/kget/ui/mirror/mirrorsettings.cpp #1246227:1246228
@@ -119,7 +119,7 @@
}
MirrorSettings::MirrorSettings(QWidget *parent, TransferHandler *handler, const KUrl &file)
- : KDialog(parent),
+ : KGetSaveSizeDialog("MirrorSettings", parent),
m_transfer(handler),
m_file(file)
{
@@ -145,12 +145,16 @@
connect(ui.remove, SIGNAL(clicked()), this, SLOT(removeMirror()));
connect(this, SIGNAL(finished()), this, SLOT(save()));
- resize(700, 400);
setMainWidget(widget);
setCaption(i18n("Modify the used mirrors"));
setButtons(KDialog::Close);
}
+QSize MirrorSettings::sizeHint() const
+{
+ return QSize(700, 400);
+}
+
void MirrorSettings::updateButton()
{
ui.remove->setEnabled(ui.treeView->selectionModel()->hasSelection());
--- trunk/KDE/kdenetwork/kget/ui/mirror/mirrorsettings.h #1246227:1246228
@@ -21,9 +21,8 @@
#define MIRRORSETTINGS_H
#include "mirrormodel.h"
+#include "../../core/basedialog.h"
-#include
-
#include "ui_mirrorsettings.h"
#include "ui_mirroradddlg.h"
@@ -61,13 +60,15 @@
QSortFilterProxyModel *m_countryModel;
};
-class MirrorSettings : public KDialog
+class MirrorSettings : public KGetSaveSizeDialog
{
Q_OBJECT
public:
MirrorSettings(QWidget *parent, TransferHandler *handler, const KUrl &file);
+ virtual QSize sizeHint() const;
+
private slots:
void updateButton();
void addClicked();
--- trunk/KDE/kdenetwork/kget/ui/signaturedlg.cpp #1246227:1246228
@@ -37,7 +37,7 @@
const QStringList SignatureDlg::OWNERTRUST = QStringList() << i18nc("trust level", "Unknown") << i18nc("trust level", "Undefined") << i18nc("trust level", "Never") << i18nc("trust level", "Marginal") << i18nc("trust level", "Full") << i18nc("trust level", "Ultimate");
SignatureDlg::SignatureDlg(TransferHandler *transfer, const KUrl &dest, QWidget *parent, Qt::WFlags flags)
- : KDialog(parent, flags),
+ : KGetSaveSizeDialog("SignatureDlg", parent, flags),
m_signature(transfer->signature(dest)),
m_fileModel(transfer->fileModel())
{
--- trunk/KDE/kdenetwork/kget/ui/signaturedlg.h #1246227:1246228
@@ -20,15 +20,14 @@
#ifndef SIGNATUREDLG_H
#define SIGNATUREDLG_H
-#include
-
#include "ui_signaturedlg.h"
+#include "../core/basedialog.h"
class FileModel;
class Signature;
class TransferHandler;
-class SignatureDlg : public KDialog
+class SignatureDlg : public KGetSaveSizeDialog
{
Q_OBJECT
--- trunk/KDE/kdenetwork/kget/ui/transfersettingsdialog.cpp #1246227:1246228
@@ -24,7 +24,7 @@
#include
TransferSettingsDialog::TransferSettingsDialog(QWidget *parent, TransferHandler *transfer)
- : KDialog(parent),
+ : KGetSaveSizeDialog("TransferSettingsDialog", parent),
m_transfer(transfer),
m_model(m_transfer->fileModel()),
m_proxy(0)
@@ -61,11 +61,6 @@
}
}
- const QSize size = Settings::transferSettingsSize();
- if (size.isValid()) {
- resize(size);
- }
-
updateCapabilities();
connect(m_transfer, SIGNAL(capabilitiesChanged()), this, SLOT(updateCapabilities()));
@@ -83,8 +78,6 @@
if (m_model) {
Settings::setTransferSettingsHeaderState(ui.treeView->header()->saveState().toBase64());
}
- Settings::setTransferSettingsSize(size());
- Settings::self()->writeConfig();
}
QSize TransferSettingsDialog::sizeHint() const
--- trunk/KDE/kdenetwork/kget/ui/transfersettingsdialog.h #1246227:1246228
@@ -13,15 +13,14 @@
#define TRANSFERSETTINGSDIALOG_H
#include "ui_transfersettingsdialog.h"
+#include "../core/basedialog.h"
-#include
-
class FileModel;
class QSortFilterProxyModel;
class RenameFile;
class TransferHandler;
-class TransferSettingsDialog : public KDialog
+class TransferSettingsDialog : public KGetSaveSizeDialog
{
Q_OBJECT
public:
--- trunk/KDE/kdenetwork/kget/ui/verificationdialog.cpp #1246227:1246228
@@ -81,7 +81,7 @@
}
VerificationDialog::VerificationDialog(QWidget *parent, TransferHandler *transfer, const KUrl &file)
- : KDialog(parent),
+ : KGetSaveSizeDialog("VerificationDialog", parent),
m_transfer(transfer),
m_verifier(transfer->verifier(file)),
m_model(0),
@@ -131,11 +131,6 @@
setButtons(KDialog::Close);
- const QSize size = Settings::verificationSize();
- if (size.isValid()) {
- resize(size);
- }
-
connect(this, SIGNAL(finished()), this, SLOT(slotFinished()));
}
@@ -151,8 +146,6 @@
if (m_model) {
Settings::setVerificationHeaderState(ui.usedHashes->header()->saveState().toBase64());
}
- Settings::setVerificationSize(size());
- Settings::self()->writeConfig();
}
void VerificationDialog::fileFinished(const KUrl &file)
--- trunk/KDE/kdenetwork/kget/ui/verificationdialog.h #1246227:1246228
@@ -23,7 +23,7 @@
#include "ui_verificationdialog.h"
#include "ui_verificationadddlg.h"
-#include
+#include "../core/basedialog.h"
class FileModel;
class QSortFilterProxyModel;
@@ -50,7 +50,7 @@
QHash m_diggestLength;
};
-class VerificationDialog : public KDialog
+class VerificationDialog : public KGetSaveSizeDialog
{
Q_OBJECT