From 9f83c17db62b6908f9e6c48f625f7b7812b2a074 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 16 Jul 2021 10:51:16 +0200
Subject: [PATCH] mv tooltips to GUI/Views
---
GUI/CMakeLists.txt | 1 +
GUI/Views/CommonWidgets/InfoPanelToolBar.h | 2 +-
GUI/Views/CommonWidgets/ItemComboToolBar.h | 2 +-
GUI/Views/CommonWidgets/ItemSelectorWidget.cpp | 2 +-
GUI/{mainwindow => Views/CommonWidgets}/StyledToolBar.cpp | 4 ++--
GUI/{mainwindow => Views/CommonWidgets}/StyledToolBar.h | 8 ++++----
.../CommonWidgets}/tooltipdatabase.cpp | 6 +++---
GUI/{mainwindow => Views/CommonWidgets}/tooltipdatabase.h | 8 ++++----
GUI/{mainwindow => Views/CommonWidgets}/tooltips.xml | 0
GUI/Views/FitWidgets/FitActivityPanel.cpp | 2 +-
GUI/Views/FitWidgets/FitParameterWidget.cpp | 2 +-
GUI/Views/FitWidgets/FitSessionWidget.cpp | 2 +-
GUI/Views/FitWidgets/JobMessagePanel.cpp | 2 +-
GUI/Views/FitWidgets/JobRealTimeToolBar.h | 2 +-
GUI/Views/FitWidgets/JobRealTimeWidget.cpp | 2 +-
GUI/Views/FitWidgets/RunFitControlWidget.cpp | 2 +-
GUI/Views/ImportDataView.cpp | 2 +-
GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp | 2 +-
GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp | 2 +-
GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h | 2 +-
GUI/Views/JobWidgets/JobPropertiesWidget.cpp | 2 +-
GUI/Views/JobWidgets/JobSelectorToolBar.h | 2 +-
GUI/Views/JobWidgets/JobSelectorWidget.cpp | 2 +-
GUI/Views/JobWidgets/JobViewActivities.cpp | 2 +-
GUI/Views/MaskWidgets/MaskEditorToolBar.cpp | 2 +-
GUI/Views/MaterialEditor/MaterialEditorDialog.cpp | 2 +-
GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp | 2 +-
GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp | 2 +-
GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h | 2 +-
GUI/Views/SampleDesigner/LayerView.cpp | 2 +-
GUI/Views/SampleDesigner/SampleToolBar.h | 2 +-
GUI/Views/SimulationView.cpp | 2 +-
GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui | 2 +-
GUI/{mainwindow => Views/Tools}/mainwindow_constants.h | 8 ++++----
GUI/Views/widgetbox/widgetboxcategorylistview.cpp | 2 +-
GUI/gui.qrc | 2 +-
GUI/mainwindow/actionmanager.cpp | 2 +-
GUI/mainwindow/mainwindow.cpp | 4 ++--
GUI/mainwindow/projectmanager.cpp | 2 +-
39 files changed, 51 insertions(+), 50 deletions(-)
rename GUI/{mainwindow => Views/CommonWidgets}/StyledToolBar.cpp (93%)
rename GUI/{mainwindow => Views/CommonWidgets}/StyledToolBar.h (80%)
rename GUI/{mainwindow => Views/CommonWidgets}/tooltipdatabase.cpp (96%)
rename GUI/{mainwindow => Views/CommonWidgets}/tooltipdatabase.h (85%)
rename GUI/{mainwindow => Views/CommonWidgets}/tooltips.xml (100%)
rename GUI/{mainwindow => Views/Tools}/mainwindow_constants.h (90%)
diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index b3c69226510..0a48b013dc3 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -37,6 +37,7 @@ set(include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/Views/CommonWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/RealSpaceWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/SpecularDataWidgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/Tools
)
set(source_files)
diff --git a/GUI/Views/CommonWidgets/InfoPanelToolBar.h b/GUI/Views/CommonWidgets/InfoPanelToolBar.h
index f59f5a4be24..bca753304a5 100644
--- a/GUI/Views/CommonWidgets/InfoPanelToolBar.h
+++ b/GUI/Views/CommonWidgets/InfoPanelToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
class QAction;
diff --git a/GUI/Views/CommonWidgets/ItemComboToolBar.h b/GUI/Views/CommonWidgets/ItemComboToolBar.h
index 5912b31ae97..5d99cc91506 100644
--- a/GUI/Views/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/Views/CommonWidgets/ItemComboToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include <QList>
class QAction;
diff --git a/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
index c40f9b3368c..9d5ea274714 100644
--- a/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/Models/SessionDecorationModel.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/mainwindow/StyledToolBar.cpp b/GUI/Views/CommonWidgets/StyledToolBar.cpp
similarity index 93%
rename from GUI/mainwindow/StyledToolBar.cpp
rename to GUI/Views/CommonWidgets/StyledToolBar.cpp
index 0e6cae7fae2..f85239b0759 100644
--- a/GUI/mainwindow/StyledToolBar.cpp
+++ b/GUI/Views/CommonWidgets/StyledToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/StyledToolBar.cpp
+//! @file GUI/Views/CommonWidgets/StyledToolBar.cpp
//! @brief Implements class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include <QLabel>
#include <QStyle>
diff --git a/GUI/mainwindow/StyledToolBar.h b/GUI/Views/CommonWidgets/StyledToolBar.h
similarity index 80%
rename from GUI/mainwindow/StyledToolBar.h
rename to GUI/Views/CommonWidgets/StyledToolBar.h
index f721bbac5ac..69374bc093a 100644
--- a/GUI/mainwindow/StyledToolBar.h
+++ b/GUI/Views/CommonWidgets/StyledToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/StyledToolBar.h
+//! @file GUI/Views/CommonWidgets/StyledToolBar.h
//! @brief Defines class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_STYLEDTOOLBAR_H
-#define BORNAGAIN_GUI_MAINWINDOW_STYLEDTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
+#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
#include <QToolBar>
@@ -32,4 +32,4 @@ protected:
void contextMenuEvent(QContextMenuEvent*);
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_STYLEDTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
diff --git a/GUI/mainwindow/tooltipdatabase.cpp b/GUI/Views/CommonWidgets/tooltipdatabase.cpp
similarity index 96%
rename from GUI/mainwindow/tooltipdatabase.cpp
rename to GUI/Views/CommonWidgets/tooltipdatabase.cpp
index 9f594cf8aee..560ac207420 100644
--- a/GUI/mainwindow/tooltipdatabase.cpp
+++ b/GUI/Views/CommonWidgets/tooltipdatabase.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/tooltipdatabase.cpp
+//! @file GUI/Views/CommonWidgets/tooltipdatabase.cpp
//! @brief Implements class ToolTipDataBase
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/tooltipdatabase.h"
+#include "GUI/Views/CommonWidgets/tooltipdatabase.h"
#include "Base/Utils/Assert.h"
#include "GUI/Models/Error.h"
#include <QFile>
@@ -57,7 +57,7 @@ QString ToolTipDataBase::widgetboxToolTip(const QString& className)
void ToolTipDataBase::initDataBase()
{
- QFile file(":/mainwindow/tooltips.xml");
+ QFile file(":/Views/CommonWidgets/tooltips.xml");
if (!file.open(QIODevice::ReadOnly))
throw Error(file.errorString());
diff --git a/GUI/mainwindow/tooltipdatabase.h b/GUI/Views/CommonWidgets/tooltipdatabase.h
similarity index 85%
rename from GUI/mainwindow/tooltipdatabase.h
rename to GUI/Views/CommonWidgets/tooltipdatabase.h
index df104850fc5..9a78b772a11 100644
--- a/GUI/mainwindow/tooltipdatabase.h
+++ b/GUI/Views/CommonWidgets/tooltipdatabase.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/tooltipdatabase.h
+//! @file GUI/Views/CommonWidgets/tooltipdatabase.h
//! @brief Defines class ToolTipDataBase
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_TOOLTIPDATABASE_H
-#define BORNAGAIN_GUI_MAINWINDOW_TOOLTIPDATABASE_H
+#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TOOLTIPDATABASE_H
+#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TOOLTIPDATABASE_H
#include <QMap>
#include <QObject>
@@ -41,4 +41,4 @@ private:
static QMap<QString, QString> m_tagToToolTip;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_TOOLTIPDATABASE_H
+#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TOOLTIPDATABASE_H
diff --git a/GUI/mainwindow/tooltips.xml b/GUI/Views/CommonWidgets/tooltips.xml
similarity index 100%
rename from GUI/mainwindow/tooltips.xml
rename to GUI/Views/CommonWidgets/tooltips.xml
diff --git a/GUI/Views/FitWidgets/FitActivityPanel.cpp b/GUI/Views/FitWidgets/FitActivityPanel.cpp
index 4ceb7f0a91b..7a86ef7b8df 100644
--- a/GUI/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/Views/FitWidgets/FitActivityPanel.cpp
@@ -20,7 +20,7 @@
#include "GUI/Views/FitWidgets/JobMessagePanel.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index 7f413f7e18b..eeaba7c33fb 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -24,7 +24,7 @@
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
#include "GUI/Views/InfoWidgets/OverlayLabelController.h"
#include "GUI/Views/SessionModelDelegate.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QAction>
#include <QMenu>
diff --git a/GUI/Views/FitWidgets/FitSessionWidget.cpp b/GUI/Views/FitWidgets/FitSessionWidget.cpp
index aff293ab84a..ac922933336 100644
--- a/GUI/Views/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/Views/FitWidgets/FitSessionWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/FitWidgets/FitSessionController.h"
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/JobMessagePanel.cpp b/GUI/Views/FitWidgets/JobMessagePanel.cpp
index b91bcb38d89..c88b0c6e1b6 100644
--- a/GUI/Views/FitWidgets/JobMessagePanel.cpp
+++ b/GUI/Views/FitWidgets/JobMessagePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/JobMessagePanel.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QScrollBar>
#include <QStackedWidget>
#include <QTextEdit>
diff --git a/GUI/Views/FitWidgets/JobRealTimeToolBar.h b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
index b4badf4be49..14c93f65caa 100644
--- a/GUI/Views/FitWidgets/JobRealTimeToolBar.h
+++ b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
class QToolButton;
diff --git a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
index 5f1b9d4c75d..4235ff801c1 100644
--- a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
+++ b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModel.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QVBoxLayout>
namespace {
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
index 8776a9c0347..91a5efb4ea4 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Views/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/InfoWidgets/WarningSign.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
#include <QLabel>
diff --git a/GUI/Views/ImportDataView.cpp b/GUI/Views/ImportDataView.cpp
index 1a0855d1b5d..9a2548bebab 100644
--- a/GUI/Views/ImportDataView.cpp
+++ b/GUI/Views/ImportDataView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/RealDataModel.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 2843086b50b..c93b88e567d 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -23,7 +23,7 @@
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
#include "GUI/mainwindow/ProjectManagerStore.h"
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/mainwindow/projectmanager.h"
#include <QApplication>
diff --git a/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index 69fe82c4dfe..d1086cf642e 100644
--- a/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.h"
#include "GUI/Views/InstrumentWidgets/DetectorMaskDelegate.h"
#include "GUI/Views/MaskWidgets/MaskEditor.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QPushButton>
#include <QSettings>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h b/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h
index 9e39fd35af2..190d17e21c4 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h
+++ b/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWTOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWTOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include <QList>
class QAction;
diff --git a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
index 16dce05d415..12128c4991c 100644
--- a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Views/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QTabBar>
#include <QTabWidget>
#include <QTextEdit>
diff --git a/GUI/Views/JobWidgets/JobSelectorToolBar.h b/GUI/Views/JobWidgets/JobSelectorToolBar.h
index 5a3be274a27..39e1e3f703e 100644
--- a/GUI/Views/JobWidgets/JobSelectorToolBar.h
+++ b/GUI/Views/JobWidgets/JobSelectorToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBSELECTORTOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBSELECTORTOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
class QAction;
class QToolButton;
diff --git a/GUI/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
index 16a853fd4d9..c05358ac3a0 100644
--- a/GUI/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
#include "GUI/Views/JobWidgets/JobSelectorActions.h"
#include "GUI/Views/JobWidgets/JobSelectorToolBar.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QHBoxLayout>
#include <QSplitter>
diff --git a/GUI/Views/JobWidgets/JobViewActivities.cpp b/GUI/Views/JobWidgets/JobViewActivities.cpp
index c85303e907f..9328dfe78af 100644
--- a/GUI/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/Views/JobWidgets/JobViewActivities.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "GUI/Models/Error.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
namespace {
JobViewActivities::activity_map_t createActivityMap()
diff --git a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
index f2c2c1570b0..495ae418138 100644
--- a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/MaskWidgets/MaskEditorToolBar.h"
#include "Base/Utils/Assert.h"
#include "GUI/Views/MaskWidgets/MaskEditorActions.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QRadioButton>
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index e25d77bc66a..b1135d37135 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/MaterialModel.h"
#include "GUI/Views/CommonWidgets/StyleUtils.h"
#include "GUI/Views/MaterialEditor/MaterialEditor.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QAction>
#include <QPushButton>
#include <QSettings>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
index 26553225a50..ffaffc2605f 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/ProjectionsWidgets/ProjectionsToolBar.h"
#include "GUI/Views/ProjectionsWidgets/ProjectionsEditorActions.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QToolButton>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
index 1e0c21d275f..95248c40ffb 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QCheckBox>
#include <QToolButton>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
index 458b13007c5..5366c375679 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
class QToolButton;
class QCheckBox;
diff --git a/GUI/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
index b663809d494..e99e70c84c2 100644
--- a/GUI/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/Views/SampleDesigner/LayerView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Views/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
-#include "GUI/mainwindow/tooltipdatabase.h"
+#include "GUI/Views/CommonWidgets/tooltipdatabase.h"
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.h b/GUI/Views/SampleDesigner/SampleToolBar.h
index 9798e5cbafc..456b56e75ab 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/Views/SampleDesigner/SampleToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include <QTreeView>
class QAction;
diff --git a/GUI/Views/SimulationView.cpp b/GUI/Views/SimulationView.cpp
index e36df010a83..99878d33bc8 100644
--- a/GUI/Views/SimulationView.cpp
+++ b/GUI/Views/SimulationView.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/SimulationView.h"
#include "GUI/Views/SimulationWidgets/SimulationSetupWidget.h"
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include "GUI/mainwindow/mainwindow.h"
#include <QVBoxLayout>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
index a83fb4e0e80..6aba9cc6734 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
@@ -300,7 +300,7 @@
<customwidget>
<class>StyledToolBar</class>
<extends>QWidget</extends>
- <header>GUI/mainwindow/StyledToolBar.h</header>
+ <header>GUI/Views/CommonWidgets/StyledToolBar.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/GUI/mainwindow/mainwindow_constants.h b/GUI/Views/Tools/mainwindow_constants.h
similarity index 90%
rename from GUI/mainwindow/mainwindow_constants.h
rename to GUI/Views/Tools/mainwindow_constants.h
index 990e778a01a..72c1123dece 100644
--- a/GUI/mainwindow/mainwindow_constants.h
+++ b/GUI/Views/Tools/mainwindow_constants.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/mainwindow_constants.h
+//! @file GUI/Views/Tools/mainwindow_constants.h
//! @brief Defines namespace GUI::Constants
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
-#define BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
#include <QString>
@@ -65,4 +65,4 @@ const int styled_toolbar_height = 25;
} // namespace GUI::Constants
-#endif // BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
diff --git a/GUI/Views/widgetbox/widgetboxcategorylistview.cpp b/GUI/Views/widgetbox/widgetboxcategorylistview.cpp
index e8e55bacbf6..cde05b127c8 100644
--- a/GUI/Views/widgetbox/widgetboxcategorylistview.cpp
+++ b/GUI/Views/widgetbox/widgetboxcategorylistview.cpp
@@ -41,7 +41,7 @@
#include "GUI/Views/widgetbox/widgetboxcategorylistview.h"
#include "Base/Utils/Assert.h"
-#include "GUI/mainwindow/tooltipdatabase.h"
+#include "GUI/Views/CommonWidgets/tooltipdatabase.h"
#include <QtDesigner/QDesignerFormEditorInterface>
#include <QtDesigner/QDesignerWidgetDataBaseInterface>
diff --git a/GUI/gui.qrc b/GUI/gui.qrc
index f5d890803c8..367f8f52406 100644
--- a/GUI/gui.qrc
+++ b/GUI/gui.qrc
@@ -2,7 +2,7 @@
<qresource prefix="/">
<file>images/mode_script.png</file>
<file>images/reset.png</file>
- <file>mainwindow/tooltips.xml</file>
+ <file>Views/CommonWidgets/tooltips.xml</file>
<file>images/treeview-branch-closed.png</file>
<file>images/treeview-branch-end.png</file>
<file>images/treeview-branch-more.png</file>
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/mainwindow/actionmanager.cpp
index 5b2ec755c5d..a990d815179 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/mainwindow/actionmanager.cpp
@@ -20,7 +20,7 @@
#include "GUI/mainwindow/PyImportAssistant.h"
#include "GUI/mainwindow/aboutapplicationdialog.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/mainwindow/projectmanager.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/qstringutils.h"
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index 29dc3b11881..883e6ed4759 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -24,9 +24,9 @@
#include "GUI/Views/SimulationView.h"
#include "GUI/Views/WelcomeView.h"
#include "GUI/mainwindow/actionmanager.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/mainwindow/projectmanager.h"
-#include "GUI/mainwindow/tooltipdatabase.h"
+#include "GUI/Views/CommonWidgets/tooltipdatabase.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/hostosinfo.h"
#include <QAction>
diff --git a/GUI/mainwindow/projectmanager.cpp b/GUI/mainwindow/projectmanager.cpp
index 9a3d7cb0c53..eb9d6e069f0 100644
--- a/GUI/mainwindow/projectmanager.cpp
+++ b/GUI/mainwindow/projectmanager.cpp
@@ -23,7 +23,7 @@
#include "GUI/mainwindow/ProjectUtils.h"
#include "GUI/mainwindow/SaveService.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/mainwindow/newprojectdialog.h"
#include "GUI/mainwindow/projectdocument.h"
#include "GUI/utils/MessageService.h"
--
GitLab