diff --git a/sdrbase/settings/mainsettings.cpp b/sdrbase/settings/mainsettings.cpp
index 9627280be..cdcb28961 100644
--- a/sdrbase/settings/mainsettings.cpp
+++ b/sdrbase/settings/mainsettings.cpp
@@ -7,6 +7,7 @@
MainSettings::MainSettings() : m_audioDeviceManager(0)
{
resetToDefaults();
+ qInfo("MainSettings::MainSettings: settings file: format: %d location: %s", getFileFormat(), qPrintable(getFileLocation()));
}
MainSettings::~MainSettings()
@@ -22,6 +23,18 @@ MainSettings::~MainSettings()
}
}
+const QString& MainSettings::getFileLocation() const
+{
+ QSettings s;
+ return s.fileName();
+}
+
+int MainSettings::getFileFormat() const
+{
+ QSettings s;
+ return (int) s.format();
+}
+
void MainSettings::load()
{
QSettings s;
diff --git a/sdrbase/settings/mainsettings.h b/sdrbase/settings/mainsettings.h
index 3e9fbee2e..86d0fecd0 100644
--- a/sdrbase/settings/mainsettings.h
+++ b/sdrbase/settings/mainsettings.h
@@ -18,6 +18,8 @@ public:
void save() const;
void resetToDefaults();
+ const QString& getFileLocation() const;
+ int getFileFormat() const; //!< see QSettings::Format for the values
Preset* newPreset(const QString& group, const QString& description);
void deletePreset(const Preset* preset);
diff --git a/sdrgui/gui/aboutdialog.cpp b/sdrgui/gui/aboutdialog.cpp
index cb675e378..f34fbba6a 100644
--- a/sdrgui/gui/aboutdialog.cpp
+++ b/sdrgui/gui/aboutdialog.cpp
@@ -1,8 +1,9 @@
#include "gui/aboutdialog.h"
#include "ui_aboutdialog.h"
#include "dsp/dsptypes.h"
+#include "settings/mainsettings.h"
-AboutDialog::AboutDialog(const QString& apiHost, int apiPort, QWidget* parent) :
+AboutDialog::AboutDialog(const QString& apiHost, int apiPort, const MainSettings& mainSettings, QWidget* parent) :
QDialog(parent),
ui(new Ui::AboutDialog)
{
@@ -14,6 +15,7 @@ AboutDialog::AboutDialog(const QString& apiHost, int apiPort, QWidget* parent) :
QString apiUrl = QString("http://%1:%2/").arg(apiHost).arg(apiPort);
ui->restApiUrl->setText(QString("REST API documentation: %2").arg(apiUrl).arg(apiUrl));
ui->restApiUrl->setOpenExternalLinks(true);
+ ui->settingsFile->setText(QString("Settings: %1").arg(mainSettings.getFileLocation()));
}
AboutDialog::~AboutDialog()
diff --git a/sdrgui/gui/aboutdialog.h b/sdrgui/gui/aboutdialog.h
index acddff7d8..36eadf02d 100644
--- a/sdrgui/gui/aboutdialog.h
+++ b/sdrgui/gui/aboutdialog.h
@@ -5,6 +5,8 @@
#include "export.h"
+class MainSettings;
+
namespace Ui {
class AboutDialog;
}
@@ -13,7 +15,7 @@ class SDRGUI_API AboutDialog : public QDialog {
Q_OBJECT
public:
- explicit AboutDialog(const QString& apiHost, int apiPort, QWidget* parent = 0);
+ explicit AboutDialog(const QString& apiHost, int apiPort, const MainSettings& mainSettings, QWidget* parent = 0);
~AboutDialog();
private:
diff --git a/sdrgui/gui/aboutdialog.ui b/sdrgui/gui/aboutdialog.ui
index 87ae06603..94819bb7b 100644
--- a/sdrgui/gui/aboutdialog.ui
+++ b/sdrgui/gui/aboutdialog.ui
@@ -136,6 +136,17 @@
+ -
+
+
-
+
+
+ Here goes the settings file location
+
+
+
+
+
-
@@ -176,6 +187,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 8d82a199a..15af32e46 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -28,7 +28,6 @@
#include
#include
#include
-#include
#include
#include
@@ -100,14 +99,6 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
{
qDebug() << "MainWindow::MainWindow: start";
-#if QT_VERSION >= 0x050500
- QString path = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
- qInfo("MainWindow::MainWindow: settings path: %s", qPrintable(path));
-#else
- QString path = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
- qInfo("MainWindow::MainWindow: settings path: %s", qPrintable(path));
-#endif
-
m_instance = this;
m_settings.setAudioDeviceManager(m_dspEngine->getAudioDeviceManager());
@@ -1695,7 +1686,7 @@ void MainWindow::channelAddClicked(bool checked)
void MainWindow::on_action_About_triggered()
{
- AboutDialog dlg(m_apiHost, m_apiPort, this);
+ AboutDialog dlg(m_apiHost, m_apiPort, m_settings, this);
dlg.exec();
}
diff --git a/sdrsrv/maincore.cpp b/sdrsrv/maincore.cpp
index 4a03540fd..6ff00f977 100644
--- a/sdrsrv/maincore.cpp
+++ b/sdrsrv/maincore.cpp
@@ -21,7 +21,6 @@
#include
#include
#include
-#include
#include "dsp/dspengine.h"
#include "dsp/dspdevicesourceengine.h"
@@ -60,14 +59,6 @@ MainCore::MainCore(qtwebapp::LoggerWithFile *logger, const MainParser& parser, Q
{
qDebug() << "MainCore::MainCore: start";
-#if QT_VERSION >= 0x050500
- QString path = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
- qInfo("MainCore::MainCore: settings path: %s", qPrintable(path));
-#else
- QString path = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
- qInfo("MainCore::MainCore: settings path: %s", qPrintable(path));
-#endif
-
m_instance = this;
m_settings.setAudioDeviceManager(m_dspEngine->getAudioDeviceManager());