diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp index 369bb4f3d..6a47ecc77 100644 --- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp @@ -27,6 +27,8 @@ #include "util/TokenQueue.h" +#include "gui/settings/rsharesettings.h" + #include PostedCreatePostDialog::PostedCreatePostDialog(TokenQueue* tokenQ, RsPosted *posted, const RsGxsGroupId& grpId, QWidget *parent): @@ -35,7 +37,7 @@ PostedCreatePostDialog::PostedCreatePostDialog(TokenQueue* tokenQ, RsPosted *pos ui(new Ui::PostedCreatePostDialog) { ui->setupUi(this); - + Settings->loadWidgetInformation(this); connect(ui->submitButton, SIGNAL(clicked()), this, SLOT(createPost())); connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(close())); @@ -50,6 +52,7 @@ PostedCreatePostDialog::PostedCreatePostDialog(TokenQueue* tokenQ, RsPosted *pos PostedCreatePostDialog::~PostedCreatePostDialog() { + Settings->saveWidgetInformation(this); delete ui; } diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index e33ad13ec..dd18b4d16 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -83,7 +83,7 @@ ConfCertDialog::ConfCertDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidge { /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - + Settings->loadWidgetInformation(this); ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo64.png")); //ui.headerFrame->setHeaderText(tr("Friend node details")); @@ -105,6 +105,7 @@ ConfCertDialog::ConfCertDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidge ConfCertDialog::~ConfCertDialog() { + Settings->saveWidgetInformation(this); QMap::iterator it = instances_ssl.find(peerId); if (it != instances_ssl.end()) instances_ssl.erase(it); diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp index e878a22ec..a9e67585b 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp @@ -65,7 +65,7 @@ PGPKeyDialog::PGPKeyDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidget *p { /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - + Settings->loadWidgetInformation(this); // if(id.isNull()) // ui._useOldFormat_CB->setChecked(true) ; // else @@ -100,6 +100,7 @@ PGPKeyDialog::PGPKeyDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidget *p PGPKeyDialog::~PGPKeyDialog() { + Settings->saveWidgetInformation(this); QMap::iterator it = instances_pgp.find(pgpId); if (it != instances_pgp.end()) instances_pgp.erase(it); diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 7757a7a15..378151d78 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -34,6 +34,8 @@ #include #include +#include + #include // Control of Publish Signatures. @@ -66,7 +68,7 @@ GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, uint32_t enableFl { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - + mInternalTokenQueue = NULL; init(); @@ -87,6 +89,7 @@ GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *t GxsGroupDialog::~GxsGroupDialog() { + Settings->saveWidgetInformation(this); if (mInternalTokenQueue) { delete(mInternalTokenQueue); } @@ -134,6 +137,7 @@ void GxsGroupDialog::init() ui.personal_required->setChecked(true) ; // this is always true initMode(); + Settings->loadWidgetInformation(this); } QIcon GxsGroupDialog::serviceWindowIcon() diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp index f21fd8660..af19f7f29 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp @@ -50,7 +50,7 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId { /* Invoke the Qt Designer generated object setup routine */ setupUi(this); - + Settings->loadWidgetInformation(this); mChannelQueue = new TokenQueue(rsGxsChannels->getTokenService(), this); headerFrame->setHeaderImage(QPixmap(":/images/channels.png")); @@ -95,6 +95,7 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId CreateGxsChannelMsg::~CreateGxsChannelMsg() { + Settings->saveWidgetInformation(this); #ifdef CHANNELS_FRAME_CATCHER delete fCatcher; #endif diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui index 180a79672..3f4cd7d4b 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui @@ -60,7 +60,7 @@ false - 1 + 0 diff --git a/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp b/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp index 597cf6320..d9c74bf45 100644 --- a/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp +++ b/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp @@ -95,10 +95,12 @@ StatisticsWindow::StatisticsWindow(QWidget *parent) : { ui->setupUi(this); + Settings->loadWidgetInformation(this); + initStackedPage(); connect(ui->stackPages, SIGNAL(currentChanged(int)), this, SLOT(setNewPage(int))); ui->stackPages->setCurrentIndex(0); - + int toolSize = Settings->getToolButtonSize(); ui->toolBar->setToolButtonStyle(Settings->getToolButtonStyle()); ui->toolBar->setIconSize(QSize(toolSize,toolSize)); @@ -110,6 +112,11 @@ StatisticsWindow::~StatisticsWindow() mInstance = NULL; } +void StatisticsWindow::closeEvent (QCloseEvent * /*event*/) +{ + Settings->saveWidgetInformation(this); +} + void StatisticsWindow::changeEvent(QEvent *e) { QMainWindow::changeEvent(e); diff --git a/retroshare-gui/src/gui/statistics/StatisticsWindow.h b/retroshare-gui/src/gui/statistics/StatisticsWindow.h index 3541a6cc6..a491792a8 100644 --- a/retroshare-gui/src/gui/statistics/StatisticsWindow.h +++ b/retroshare-gui/src/gui/statistics/StatisticsWindow.h @@ -65,7 +65,8 @@ public slots: protected: void changeEvent(QEvent *e); - + void closeEvent (QCloseEvent * event); + private: void initStackedPage();