diff --git a/App/main.cpp b/App/main.cpp
index e06df95170820c6e884a340d916390beaaedd361..f017b48da80c0e31982c0028fd27568d99f28948 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Path.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Tool/Globals.h"
#include "config_build.h"
@@ -69,7 +69,7 @@ int main(int argc, char* argv[])
app.setWindowIcon(QIcon(":/images/BornAgain.ico"));
#endif
- gApp = std::make_unique<ApplicationSettings>();
+ gApp = std::make_unique<AppConfig>();
gDoc = std::make_unique<ProjectDocument>();
MainWindow win;
diff --git a/GUI/View/Canvas/SavePlotAssistant.cpp b/GUI/View/Canvas/SavePlotAssistant.cpp
index 53f20d80aab6ea960e7d51b2d569295999e54140..2365e0215704573aec89e2b91d4cc2fcf91d68bf 100644
--- a/GUI/View/Canvas/SavePlotAssistant.cpp
+++ b/GUI/View/Canvas/SavePlotAssistant.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Canvas/SavePlotAssistant.h"
#include "Base/Util/Assert.h"
#include "Device/IO/IOFactory.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Plotter/ColorMap.h"
#include "GUI/View/Widget/FileDialog.h"
#include <QFile>
diff --git a/GUI/View/Layout/ApplicationSettings.cpp b/GUI/View/Layout/AppConfig.cpp
similarity index 84%
rename from GUI/View/Layout/ApplicationSettings.cpp
rename to GUI/View/Layout/AppConfig.cpp
index f24799d6147bd7cb0405a06ab5f3299f4ad8ee1e..4fd4b06157676614740e3dc025f3a9960b0401cc 100644
--- a/GUI/View/Layout/ApplicationSettings.cpp
+++ b/GUI/View/Layout/AppConfig.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/ApplicationSettings.cpp
-//! @brief Implements class ApplicationSettings.
+//! @file GUI/View/Layout/AppConfig.cpp
+//! @brief Implements class AppConfig.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include <QApplication>
#include <QDir>
#include <QFile>
@@ -20,7 +20,7 @@
#include <QStandardPaths>
#include <QStyle>
-BA_GUI_API_ std::unique_ptr<ApplicationSettings> gApp; //!< global pointer to _the_ instance
+BA_GUI_API_ std::unique_ptr<AppConfig> gApp; //!< global pointer to _the_ instance
namespace {
@@ -35,7 +35,7 @@ const QString S_LASTUSEDIMPORFILTER2D = "LastUsedImportFilter2D";
} // namespace
-ApplicationSettings::ApplicationSettings()
+AppConfig::AppConfig()
{
QFile base(":/styles/Base.stylesheet");
base.open(QFile::ReadOnly);
@@ -59,7 +59,7 @@ ApplicationSettings::ApplicationSettings()
loadSettings();
}
-bool ApplicationSettings::useNativeFileDialog() const
+bool AppConfig::useNativeFileDialog() const
{
#ifdef _WIN32
return true;
@@ -68,9 +68,9 @@ bool ApplicationSettings::useNativeFileDialog() const
#endif
}
-//! Reads settings of ApplicationSettings from global settings.
+//! Reads settings of AppConfig from global settings.
-void ApplicationSettings::loadSettings()
+void AppConfig::loadSettings()
{
QSettings s;
if (s.childGroups().contains(S_DIRS)) {
@@ -87,9 +87,9 @@ void ApplicationSettings::loadSettings()
}
}
-//! Saves settings of ApplicationSettings in global settings.
+//! Saves settings of AppConfig in global settings.
-void ApplicationSettings::saveSettings()
+void AppConfig::saveSettings()
{
QSettings s;
s.beginGroup(S_DIRS);
diff --git a/GUI/View/Layout/ApplicationSettings.h b/GUI/View/Layout/AppConfig.h
similarity index 73%
rename from GUI/View/Layout/ApplicationSettings.h
rename to GUI/View/Layout/AppConfig.h
index effb01d67b8314139617882d977fd965b5629f52..a5a930ea6e106b95cab08db4c7041413845ae665 100644
--- a/GUI/View/Layout/ApplicationSettings.h
+++ b/GUI/View/Layout/AppConfig.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/ApplicationSettings.h
-//! @brief Defines class ApplicationSettings.
+//! @file GUI/View/Layout/AppConfig.h
+//! @brief Defines class AppConfig.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,17 +12,17 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_APPLICATIONSETTINGS_H
-#define BORNAGAIN_GUI_VIEW_LAYOUT_APPLICATIONSETTINGS_H
+#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_APPCONFIG_H
+#define BORNAGAIN_GUI_VIEW_LAYOUT_APPCONFIG_H
#include "Wrap/WinDllMacros.h"
#include <QString>
//! Application-wide settings.
-class ApplicationSettings {
+class AppConfig {
public:
- ApplicationSettings();
+ AppConfig();
bool useNativeFileDialog() const;
@@ -40,6 +40,6 @@ private:
void loadSettings();
};
-BA_GUI_API_ extern std::unique_ptr<ApplicationSettings> gApp; //!< global pointer to _the_ instance
+BA_GUI_API_ extern std::unique_ptr<AppConfig> gApp; //!< global pointer to _the_ instance
-#endif // BORNAGAIN_GUI_VIEW_LAYOUT_APPLICATIONSETTINGS_H
+#endif // BORNAGAIN_GUI_VIEW_LAYOUT_APPCONFIG_H
diff --git a/GUI/View/Loader/ComponentRW.cpp b/GUI/View/Loader/ComponentRW.cpp
index e7759e9b112e20d359efb3c3310ef2a9c08a57ab..e2f4ea4517ec2c035221a14cd109fb3bd76f50b2 100644
--- a/GUI/View/Loader/ComponentRW.cpp
+++ b/GUI/View/Loader/ComponentRW.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Loader/ComponentRW.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentXML.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Widget/FileDialog.h"
#include <QMessageBox>
diff --git a/GUI/View/Loader/DataLoader.cpp b/GUI/View/Loader/DataLoader.cpp
index f654c9af336c19777675177a6f51e0838f412991..f4e8d613ada2d584ae457091729f49a8f862aa52 100644
--- a/GUI/View/Loader/DataLoader.cpp
+++ b/GUI/View/Loader/DataLoader.cpp
@@ -21,7 +21,7 @@
#include "GUI/Model/Files/DatafileItem.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/View/Info/MessageBox.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Loader/ImportDialogs.h"
#include <QFileDialog>
#include <QFileInfo>
diff --git a/GUI/View/Loader/ProjectionsSaver.cpp b/GUI/View/Loader/ProjectionsSaver.cpp
index eecd3dc37715f6022c46ccaff84ba9e5a4b387df..8fbe7363e7ec7c9fa76ed5f796ecb7980f1ab644 100644
--- a/GUI/View/Loader/ProjectionsSaver.cpp
+++ b/GUI/View/Loader/ProjectionsSaver.cpp
@@ -19,7 +19,7 @@
#include "GUI/Model/Data/Data2DItem.h"
#include "GUI/Model/Mask/MasksSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Widget/FileDialog.h"
#include <QFile>
#include <QString>
diff --git a/GUI/View/Loader/PythonScriptWidget.cpp b/GUI/View/Loader/PythonScriptWidget.cpp
index 6dfd4664ab29d9dd8e2f18bf3f77315de35c2c54..ff6f872004c168ef21b88bc5916a1bfbbf5eb16b 100644
--- a/GUI/View/Loader/PythonScriptWidget.cpp
+++ b/GUI/View/Loader/PythonScriptWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Support/Style/Style.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Info/PythonSyntaxHighlighter.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Widget/StyledToolbar.h"
#include "GUI/View/Widget/WidgetSettings.h"
#include "Sim/Export/ExportToPython.h"
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index f49d31a3ab8b9094bef60589da35097d3a39d331..0e0b41c7ca0706594dddf77918e90e8c5711707f 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -17,7 +17,7 @@
#include "Base/Util/SysUtil.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Path.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Layout/mainwindow_constants.h"
#include "GUI/View/Main/AboutDialog.h"
#include "GUI/View/Manager/ProjectManager.h"
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index bf90716bb74e0d6874d4d5035cba6aa1ab52b313..b5f2b2a2f30127afda6ec095201f3458b0392698 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Job/JobsSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Path.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Layout/mainwindow_constants.h"
#include "GUI/View/Main/ActionManager.h"
#include "GUI/View/Main/CentralWidget.h"
diff --git a/GUI/View/Manager/NewProjectDialog.cpp b/GUI/View/Manager/NewProjectDialog.cpp
index 0b81f27e2b63a330b5b55879844d73c2ae4f1a48..0dbd8eca22f8f811cb92843e16f6173110c829d6 100644
--- a/GUI/View/Manager/NewProjectDialog.cpp
+++ b/GUI/View/Manager/NewProjectDialog.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Manager/NewProjectDialog.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Project/ProjectUtil.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include <QFileDialog>
#include <QGroupBox>
#include <QPushButton>
diff --git a/GUI/View/Manager/ProjectManager.cpp b/GUI/View/Manager/ProjectManager.cpp
index 033a2f671eadebf567ae635db6dd3e5756816e56..418f92f95ff6065746fdcbbb8d13ff414f815380 100644
--- a/GUI/View/Manager/ProjectManager.cpp
+++ b/GUI/View/Manager/ProjectManager.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Project/ProjectUtil.h"
#include "GUI/View/Info/MessageBox.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Manager/NewProjectDialog.h"
#include "GUI/View/Tool/Globals.h"
#include <QApplication>
diff --git a/GUI/View/Manager/PyImportAssistant.cpp b/GUI/View/Manager/PyImportAssistant.cpp
index ec11ecc25a7a256c075913aa4af6b563e60279a9..2143a44edd0c7b6a39b10aba703209363058ab0e 100644
--- a/GUI/View/Manager/PyImportAssistant.cpp
+++ b/GUI/View/Manager/PyImportAssistant.cpp
@@ -26,7 +26,7 @@
#include "GUI/View/Info/ComboSelectorDialog.h"
#include "GUI/View/Info/DetailedMessageBox.h"
#include "GUI/View/Info/MessageBox.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Tool/Globals.h"
#include "PyCore/Embed/PyInterpreter.h" // listOfFunctions
#include "PyCore/Sample/ImportMultiLayer.h" // createMultiLayerFromPython
diff --git a/GUI/View/Realspace/RealspaceWidget.cpp b/GUI/View/Realspace/RealspaceWidget.cpp
index 1a6eb06058cd3592c83c5f7b5409fe63d2869480..5461c6a6f5eff4c03a06a58f8e55116d5b9b3ce2 100644
--- a/GUI/View/Realspace/RealspaceWidget.cpp
+++ b/GUI/View/Realspace/RealspaceWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/View/Info/CautionSign.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Realspace/RealspaceBuilder.h"
#include "GUI/View/Widget/FileDialog.h"
#include "Img3D/Model/Model.h"
diff --git a/GUI/View/Sample/SampleForm.cpp b/GUI/View/Sample/SampleForm.cpp
index 6dfe6e3de770e8fee681cfad9a06a995ed927992..dc8b853517cb0e9f010e86be111c12b75044f1e2 100644
--- a/GUI/View/Sample/SampleForm.cpp
+++ b/GUI/View/Sample/SampleForm.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Vec.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/SamplesSet.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Layout/LayoutUtil.h"
#include "GUI/View/Sample/CompoundForm.h"
#include "GUI/View/Sample/CoreAndShellForm.h"
diff --git a/GUI/View/Views/InstrumentView.cpp b/GUI/View/Views/InstrumentView.cpp
index 2979c881e92674871e2bccab3c681e5b1ea586c3..903337a8efe4d4e61591301d2168b90f43934114 100644
--- a/GUI/View/Views/InstrumentView.cpp
+++ b/GUI/View/Views/InstrumentView.cpp
@@ -21,7 +21,7 @@
#include "GUI/View/Instrument/OffspecInstrumentEditor.h"
#include "GUI/View/Instrument/Scatter2DInstrumentEditor.h"
#include "GUI/View/Instrument/SpecularInstrumentEditor.h"
-#include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Loader/ComponentRW.h"
#include "GUI/View/Modelview/SetView.h"
#include "GUI/View/Setup/FrameActions.h"