diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 3a6e4a349..555a35f7f 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -23,6 +23,8 @@ #include #include #include +#include "gui/settings/rsharesettings.h" +#include "util/misc.h" #include "GenCertDialog.h" #include #include @@ -416,7 +418,9 @@ void GenCertDialog::exportIdentity() void GenCertDialog::importIdentity() { - QString fname = QFileDialog::getOpenFileName(this,tr("Import profile"), "",tr("RetroShare profile files (*.asc);;All Files (*)")) ; + QString fname ; + if(!misc::getOpenFileName(this,RshareSettings::LASTDIR_CERT,tr("Import profile"), tr("RetroShare profile files (*.asc);;All files (*)"),fname)) + return ; if(fname.isNull()) return ; diff --git a/retroshare-gui/src/gui/PluginManagerWidget.cpp b/retroshare-gui/src/gui/PluginManagerWidget.cpp index eda4ec62c..4179dfd45 100644 --- a/retroshare-gui/src/gui/PluginManagerWidget.cpp +++ b/retroshare-gui/src/gui/PluginManagerWidget.cpp @@ -20,6 +20,7 @@ ****************************************************************/ #include "PluginManagerWidget.h" +#include "gui/settings/rsharesettings.h" #include #include @@ -160,14 +161,10 @@ PluginManagerWidget::registerNewPlugin(QString pluginName) void PluginManagerWidget::installPluginButtonClicked() { - QString fileName = QFileDialog::getOpenFileName(this, - tr("Open Plugin to install"), - "./", - tr("Plugins (*.so *.dll)")); + QString fileName = misc::getOpenFileName(this, RshareSettings::LASTDIR_PLUGIN, tr("Open Plugin to install"), "./", tr("Plugins (*.so *.dll)")); + if (!fileName.isNull()) - { emit installPluginRequested(fileName); - } } //============================================================================= diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp index afbcb4422..cb49de349 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp @@ -31,6 +31,8 @@ #include #endif +#include "gui/settings/rsharesettings.h" +#include "util/misc.h" #include "ConnectFriendWizard.h" #include "ui_ConnectFriendWizard.h" #include "gui/common/PeerDefs.h" @@ -1040,7 +1042,9 @@ void ConnectFriendWizard::saveCert() void ConnectFriendWizard::loadFriendCert() { - QString fileName = QFileDialog::getOpenFileName(this, tr("Select Certificate"), "", tr("RetroShare Certificate (*.rsc );;All Files (*)")); + QString fileName ; + if(!misc::getOpenFileName(this, RshareSettings::LASTDIR_CERT, tr("Select Certificate"), tr("RetroShare Certificate (*.rsc );;All Files (*)"),fileName)) + return ; if (!fileName.isNull()) { ui->friendFileNameEdit->setText(fileName); diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp index fb5e0f93d..e57602300 100644 --- a/retroshare-gui/src/gui/profile/ProfileManager.cpp +++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp @@ -24,7 +24,9 @@ #include #include #include "ProfileManager.h" +#include "util/misc.h" #include "gui/GenCertDialog.h" +#include "gui/settings/rsharesettings.h" #include "gui/common/RSTreeWidgetItem.h" #include @@ -145,7 +147,10 @@ void ProfileManager::exportIdentity() void ProfileManager::importIdentity() { - QString fname = QFileDialog::getOpenFileName(this,tr("Import Identity"), "",tr("RetroShare Identity files (*.asc)")) ; + QString fname ; + + if(!misc::getOpenFileName(this,RshareSettings::LASTDIR_CERT,tr("Import Identity"), tr("RetroShare Identity files (*.asc)"),fname)) + return ; if(fname.isNull()) return ; diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h index b6db98591..a7719c6d0 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.h +++ b/retroshare-gui/src/gui/settings/rsharesettings.h @@ -75,8 +75,9 @@ public: LASTDIR_IMAGES, LASTDIR_MESSAGES, LASTDIR_BLOGS, - LASTDIR_SOUNDS - }; + LASTDIR_SOUNDS, + LASTDIR_PLUGIN + }; enum enumToasterPosition {