From db2c0f5d14d04f7564d42414020093b66cd72a83 Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Mon, 2 Aug 2021 13:26:01 +0200
Subject: [PATCH] mv SampleToolBox files to SampleDesigner folder; rn
appropriately
---
.../{widgetbox => SampleDesigner}/DesignerMimeData.cpp | 4 ++--
.../{widgetbox => SampleDesigner}/DesignerMimeData.h | 8 ++++----
GUI/Views/SampleDesigner/DesignerScene.cpp | 2 +-
GUI/Views/SampleDesigner/DesignerView.cpp | 2 +-
GUI/Views/SampleDesigner/MultiLayerView.cpp | 2 +-
GUI/Views/SampleDesigner/SampleToolBox.cpp | 4 ++--
.../SampleToolBoxGroupView.cpp | 4 ++--
.../SampleToolBoxGroupView.h | 8 ++++----
.../SampleToolBoxTreeWidget.cpp | 6 +++---
.../SampleToolBoxTreeWidget.h | 8 ++++----
GUI/Views/SampleView.cpp | 4 ++--
GUI/Views/SampleView.h | 4 ++--
12 files changed, 28 insertions(+), 28 deletions(-)
rename GUI/Views/{widgetbox => SampleDesigner}/DesignerMimeData.cpp (93%)
rename GUI/Views/{widgetbox => SampleDesigner}/DesignerMimeData.h (80%)
rename GUI/Views/{widgetbox => SampleDesigner}/SampleToolBoxGroupView.cpp (97%)
rename GUI/Views/{widgetbox => SampleDesigner}/SampleToolBoxGroupView.h (86%)
rename GUI/Views/{widgetbox => SampleDesigner}/SampleToolBoxTreeWidget.cpp (98%)
rename GUI/Views/{widgetbox => SampleDesigner}/SampleToolBoxTreeWidget.h (86%)
diff --git a/GUI/Views/widgetbox/DesignerMimeData.cpp b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
similarity index 93%
rename from GUI/Views/widgetbox/DesignerMimeData.cpp
rename to GUI/Views/SampleDesigner/DesignerMimeData.cpp
index c874e5fb988..f2fd444a90c 100644
--- a/GUI/Views/widgetbox/DesignerMimeData.cpp
+++ b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/widgetbox/DesignerMimeData.cpp
+//! @file GUI/Views/SampleDesigner/DesignerMimeData.cpp
//! @brief Implements class DesignerMimeData
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/widgetbox/DesignerMimeData.h"
+#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/CommonWidgets/DesignerHelper.h"
#include <QDrag>
#include <QPixmap>
diff --git a/GUI/Views/widgetbox/DesignerMimeData.h b/GUI/Views/SampleDesigner/DesignerMimeData.h
similarity index 80%
rename from GUI/Views/widgetbox/DesignerMimeData.h
rename to GUI/Views/SampleDesigner/DesignerMimeData.h
index 79718d718af..7339ecb9273 100644
--- a/GUI/Views/widgetbox/DesignerMimeData.h
+++ b/GUI/Views/SampleDesigner/DesignerMimeData.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/widgetbox/DesignerMimeData.h
+//! @file GUI/Views/SampleDesigner/DesignerMimeData.h
//! @brief Defines class DesignerMimeData
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_WIDGETBOX_DESIGNERMIMEDATA_H
-#define BORNAGAIN_GUI_VIEWS_WIDGETBOX_DESIGNERMIMEDATA_H
+#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
+#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
#include <QMimeData>
@@ -36,4 +36,4 @@ private:
QString m_className;
};
-#endif // BORNAGAIN_GUI_VIEWS_WIDGETBOX_DESIGNERMIMEDATA_H
+#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 91d9e3c640c..f3d963068f8 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -26,12 +26,12 @@
#include "GUI/Models/RotationItems.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Views/SampleDesigner/NodeEditor.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/Views/SampleDesigner/SampleViewAligner.h"
#include "GUI/Views/SampleDesigner/SampleViewFactory.h"
-#include "GUI/Views/widgetbox/DesignerMimeData.h"
#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
diff --git a/GUI/Views/SampleDesigner/DesignerView.cpp b/GUI/Views/SampleDesigner/DesignerView.cpp
index 94c414318fb..8509de23bd8 100644
--- a/GUI/Views/SampleDesigner/DesignerView.cpp
+++ b/GUI/Views/SampleDesigner/DesignerView.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "Base/Utils/Assert.h"
#include "GUI/Models/Error.h"
+#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
-#include "GUI/Views/widgetbox/DesignerMimeData.h"
#include <QDragEnterEvent>
#include <QGraphicsScene>
#include <QGraphicsView>
diff --git a/GUI/Views/SampleDesigner/MultiLayerView.cpp b/GUI/Views/SampleDesigner/MultiLayerView.cpp
index fe55e5f6810..7190175f7ef 100644
--- a/GUI/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/SessionGraphicsItem.h"
#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
-#include "GUI/Views/widgetbox/DesignerMimeData.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index f42a152edd9..8de6ffca71e 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleToolBox.h"
-#include "GUI/Views/widgetbox/DesignerMimeData.h"
-#include "GUI/Views/widgetbox/SampleToolBoxTreeWidget.h"
+#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
+#include "GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h"
#include <QApplication>
#include <QFocusEvent>
#include <QIcon>
diff --git a/GUI/Views/widgetbox/SampleToolBoxGroupView.cpp b/GUI/Views/SampleDesigner/SampleToolBoxGroupView.cpp
similarity index 97%
rename from GUI/Views/widgetbox/SampleToolBoxGroupView.cpp
rename to GUI/Views/SampleDesigner/SampleToolBoxGroupView.cpp
index 97dd75613a0..6bc899e8586 100644
--- a/GUI/Views/widgetbox/SampleToolBoxGroupView.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBoxGroupView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/widgetbox/SampleToolBoxGroupView.cpp
+//! @file GUI/Views/SampleDesigner/SampleToolBoxGroupView.cpp
//! @brief Implements class SampleToolBoxGroupView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/widgetbox/SampleToolBoxGroupView.h"
+#include "GUI/Views/SampleDesigner/SampleToolBoxGroupView.h"
#include <QIcon>
#include <QListView>
diff --git a/GUI/Views/widgetbox/SampleToolBoxGroupView.h b/GUI/Views/SampleDesigner/SampleToolBoxGroupView.h
similarity index 86%
rename from GUI/Views/widgetbox/SampleToolBoxGroupView.h
rename to GUI/Views/SampleDesigner/SampleToolBoxGroupView.h
index dc40451993c..e64401e1ad7 100644
--- a/GUI/Views/widgetbox/SampleToolBoxGroupView.h
+++ b/GUI/Views/SampleDesigner/SampleToolBoxGroupView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/widgetbox/SampleToolBoxGroupView.h
+//! @file GUI/Views/SampleDesigner/SampleToolBoxGroupView.h
//! @brief Defines class SampleToolBoxGroupView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXGROUPVIEW_H
-#define BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXGROUPVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
+#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
#include <QListView>
@@ -53,4 +53,4 @@ private:
SampleToolBoxGroupModel* m_model;
};
-#endif // BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXGROUPVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
diff --git a/GUI/Views/widgetbox/SampleToolBoxTreeWidget.cpp b/GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.cpp
similarity index 98%
rename from GUI/Views/widgetbox/SampleToolBoxTreeWidget.cpp
rename to GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.cpp
index f6c88144560..3ffcff6684f 100644
--- a/GUI/Views/widgetbox/SampleToolBoxTreeWidget.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/widgetbox/SampleToolBoxTreeWidget.cpp
+//! @file GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.cpp
//! @brief Implements class SampleToolBoxTreeWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/widgetbox/SampleToolBoxTreeWidget.h"
+#include "GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/widgetbox/SampleToolBoxGroupView.h"
+#include "GUI/Views/SampleDesigner/SampleToolBoxGroupView.h"
#include <QAction>
#include <QActionGroup>
diff --git a/GUI/Views/widgetbox/SampleToolBoxTreeWidget.h b/GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h
similarity index 86%
rename from GUI/Views/widgetbox/SampleToolBoxTreeWidget.h
rename to GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h
index 683a8771a6b..e20c2539e65 100644
--- a/GUI/Views/widgetbox/SampleToolBoxTreeWidget.h
+++ b/GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/widgetbox/SampleToolBoxTreeWidget.h
+//! @file GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h
//! @brief Defines class SampleToolBoxTreeWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXTREEWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXTREEWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
+#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
#include <QTreeWidget>
@@ -57,4 +57,4 @@ private:
bool m_iconMode;
};
-#endif // BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXTREEWIDGET_H
+#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
diff --git a/GUI/Views/SampleView.cpp b/GUI/Views/SampleView.cpp
index 4568e409f30..e26f0395fd9 100644
--- a/GUI/Views/SampleView.cpp
+++ b/GUI/Views/SampleView.cpp
@@ -63,14 +63,14 @@ void SampleView::fillViewMenu(QMenu* menu)
void SampleView::createSubWindows()
{
m_sampleDesigner = new SampleDesigner(this);
- m_widgetBox = new SampleToolBox(this);
+ m_toolBox = new SampleToolBox(this);
m_treeWidget = new SampleTreeWidget(this, models()->sampleModel());
m_propertyWidget = new SamplePropertyWidget(m_treeWidget->treeView()->selectionModel(), this);
m_scriptPanel = new ScriptPanel(this);
m_realSpacePanel = new RealSpacePanel(models()->sampleModel(),
m_treeWidget->treeView()->selectionModel(), this);
- m_docks->addWidget(WIDGET_BOX, m_widgetBox, Qt::LeftDockWidgetArea);
+ m_docks->addWidget(TOOLBOX, m_toolBox, Qt::LeftDockWidgetArea);
m_docks->addWidget(SAMPLE_TREE, m_treeWidget, Qt::RightDockWidgetArea);
m_docks->addWidget(PROPERTY_EDITOR, m_propertyWidget, Qt::RightDockWidgetArea);
m_docks->addWidget(INFO, m_scriptPanel, Qt::BottomDockWidgetArea);
diff --git a/GUI/Views/SampleView.h b/GUI/Views/SampleView.h
index c21dd574ba4..5bb86cd6745 100644
--- a/GUI/Views/SampleView.h
+++ b/GUI/Views/SampleView.h
@@ -32,7 +32,7 @@ class RealSpacePanel;
class SampleView : public QMainWindow {
Q_OBJECT
public:
- enum ESubWindows { WIDGET_BOX, SAMPLE_TREE, PROPERTY_EDITOR, INFO, REALSPACEPANEL };
+ enum ESubWindows { TOOLBOX, SAMPLE_TREE, PROPERTY_EDITOR, INFO, REALSPACEPANEL };
SampleView(MainWindow* mainWindow);
@@ -49,7 +49,7 @@ private:
SampleToolBar* m_toolBar = nullptr;
SampleDesigner* m_sampleDesigner = nullptr;
- SampleToolBox* m_widgetBox = nullptr;
+ SampleToolBox* m_toolBox = nullptr;
SampleTreeWidget* m_treeWidget = nullptr;
SamplePropertyWidget* m_propertyWidget = nullptr;
ScriptPanel* m_scriptPanel = nullptr;
--
GitLab