Change in project structure.

--HG--
branch : feature

src/dialogs/app/dialoghistory.cpp

@@ -28,13 +28,13 @@
 
 #include "dialoghistory.h"
 #include "ui_dialoghistory.h"
-#include "../geometry/varc.h"
+#include "../../geometry/varc.h"
-#include "../geometry/vspline.h"
+#include "../../geometry/vspline.h"
-#include "../geometry/vsplinepath.h"
+#include "../../geometry/vsplinepath.h"
-#include "../tools/vabstracttool.h"
+#include "../../tools/vabstracttool.h"
-#include "../tools/drawTools/vtoolcutspline.h"
+#include "../../tools/drawTools/vtoolcutspline.h"
-#include "../tools/drawTools/vtoolcutsplinepath.h"
+#include "../../tools/drawTools/vtoolcutsplinepath.h"
-#include "../tools/drawTools/vtoolcutarc.h"
+#include "../../tools/drawTools/vtoolcutarc.h"
 #include <QDebug>
 #include <QPushButton>
 

src/dialogs/app/dialoghistory.h

@@ -29,8 +29,8 @@
 #ifndef DIALOGHISTORY_H
 #define DIALOGHISTORY_H
 
-#include "dialogtool.h"
+#include "../tools/dialogtool.h"
-#include "../xml/vdomdocument.h"
+#include "../../xml/vdomdocument.h"
 
 namespace Ui
 {

src/dialogs/app/dialogincrements.cpp

@@ -28,9 +28,9 @@
 
 #include "dialogincrements.h"
 #include "ui_dialogincrements.h"
-#include "../widgets/doubledelegate.h"
+#include "../../widgets/doubledelegate.h"
-#include "../widgets/textdelegate.h"
+#include "../../widgets/textdelegate.h"
-#include "../exception/vexception.h"
+#include "../../exception/vexception.h"
 
 #include <QPushButton>
 

src/dialogs/app/dialogincrements.h

@@ -29,8 +29,8 @@
 #ifndef DIALOGINCREMENTS_H
 #define DIALOGINCREMENTS_H
 
-#include "dialogtool.h"
+#include "../tools/dialogtool.h"
-#include "../xml/vdomdocument.h"
+#include "../../xml/vdomdocument.h"
 
 namespace Ui
 {

src/dialogs/app/dialogpatternproperties.h

@@ -30,7 +30,7 @@
 #define DIALOGPATTERNPROPERTIES_H
 
 #include <QDialog>
-#include "../xml/vdomdocument.h"
+#include "../../xml/vdomdocument.h"
 
 namespace Ui {
 class DialogPatternProperties;

src/dialogs/app/pages.cpp

@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "pages.h"
-#include "../options.h"
+#include "../../options.h"
 
 ConfigurationPage::ConfigurationPage(QWidget *parent):
     QWidget(parent), autoSaveCheck(0), autoTime(0), langCombo(0), osOptionCheck(0), langChanged(false)

src/dialogs/dialogs.h

@@ -29,29 +29,30 @@
 #ifndef DIALOGS_H
 #define DIALOGS_H
 
-#include "dialogalongline.h"
+#include "tools/dialogalongline.h"
-#include "dialogarc.h"
+#include "tools/dialogarc.h"
-#include "dialogbisector.h"
+#include "tools/dialogbisector.h"
-#include "dialogdetail.h"
+#include "tools/dialogdetail.h"
-#include "dialogendline.h"
+#include "tools/dialogendline.h"
-#include "dialoghistory.h"
+#include "tools/dialogline.h"
-#include "dialogincrements.h"
+#include "tools/dialoglineintersect.h"
-#include "dialogline.h"
+#include "tools/dialognormal.h"
-#include "dialoglineintersect.h"
+#include "tools/dialogpointofcontact.h"
-#include "dialognormal.h"
+#include "tools/dialogshoulderpoint.h"
-#include "dialogpointofcontact.h"
+#include "tools/dialogsinglepoint.h"
-#include "dialogshoulderpoint.h"
+#include "tools/dialogspline.h"
-#include "dialogsinglepoint.h"
+#include "tools/dialogsplinepath.h"
-#include "dialogspline.h"
+#include "tools/dialogheight.h"
-#include "dialogsplinepath.h"
+#include "tools/dialogcutarc.h"
-#include "dialogheight.h"
+#include "tools/dialogcutspline.h"
-#include "dialogcutarc.h"
+#include "tools/dialogcutsplinepath.h"
-#include "dialogcutspline.h"
+#include "tools/dialoguniondetails.h"
-#include "dialogcutsplinepath.h"
+#include "tools/dialogtriangle.h"
-#include "dialoguniondetails.h"
+#include "tools/dialogpointofintersection.h"
-#include "dialogtriangle.h"
+
-#include "dialogpointofintersection.h"
+#include "app/dialoghistory.h"
-#include "configdialog.h"
+#include "app/dialogincrements.h"
-#include "dialogpatternproperties.h"
+#include "app/configdialog.h"
+#include "app/dialogpatternproperties.h"
 
 #endif // DIALOGS_H

src/dialogs/dialogs.pri

@@ -1,87 +1,87 @@
 HEADERS += \
-    src/dialogs/dialogtriangle.h \
-    src/dialogs/dialogtool.h \
-    src/dialogs/dialogsplinepath.h \
-    src/dialogs/dialogspline.h \
-    src/dialogs/dialogsinglepoint.h \
-    src/dialogs/dialogshoulderpoint.h \
     src/dialogs/dialogs.h \
-    src/dialogs/dialogpointofintersection.h \
+    src/dialogs/tools/dialogtriangle.h \
-    src/dialogs/dialogpointofcontact.h \
+    src/dialogs/tools/dialogtool.h \
-    src/dialogs/dialognormal.h \
+    src/dialogs/tools/dialogsplinepath.h \
-    src/dialogs/dialoglineintersect.h \
+    src/dialogs/tools/dialogspline.h \
-    src/dialogs/dialogline.h \
+    src/dialogs/tools/dialogsinglepoint.h \
-    src/dialogs/dialogincrements.h \
+    src/dialogs/tools/dialogshoulderpoint.h \
-    src/dialogs/dialoghistory.h \
+    src/dialogs/tools/dialogpointofintersection.h \
-    src/dialogs/dialogheight.h \
+    src/dialogs/tools/dialogpointofcontact.h \
-    src/dialogs/dialogendline.h \
+    src/dialogs/tools/dialognormal.h \
-    src/dialogs/dialogdetail.h \
+    src/dialogs/tools/dialoglineintersect.h \
-    src/dialogs/dialogbisector.h \
+    src/dialogs/tools/dialogline.h \
-    src/dialogs/dialogarc.h \
+    src/dialogs/tools/dialogheight.h \
-    src/dialogs/dialogalongline.h \
+    src/dialogs/tools/dialogendline.h \
-    src/dialogs/dialogcutspline.h \
+    src/dialogs/tools/dialogdetail.h \
-    src/dialogs/dialogcutsplinepath.h \
+    src/dialogs/tools/dialogbisector.h \
-    src/dialogs/dialoguniondetails.h \
+    src/dialogs/tools/dialogarc.h \
-    src/dialogs/dialogcutarc.h \
+    src/dialogs/tools/dialogalongline.h \
-    src/dialogs/configdialog.h \
+    src/dialogs/tools/dialogcutspline.h \
-    src/dialogs/pages.h \
+    src/dialogs/tools/dialogcutsplinepath.h \
-    src/dialogs/dialogpatternproperties.h \
+    src/dialogs/tools/dialoguniondetails.h \
-    src/dialogs/dialogmeasurements.h \
+    src/dialogs/tools/dialogcutarc.h \
-    src/dialogs/dialogstandardmeasurements.h
+    src/dialogs/app/dialogincrements.h \
+    src/dialogs/app/dialoghistory.h \
+    src/dialogs/app/configdialog.h \
+    src/dialogs/app/pages.h \
+    src/dialogs/app/dialogpatternproperties.h \
+    src/dialogs/app/dialogmeasurements.h \
+    src/dialogs/app/dialogstandardmeasurements.h
 
 SOURCES += \
-    src/dialogs/dialogtriangle.cpp \
+    src/dialogs/tools/dialogtriangle.cpp \
-    src/dialogs/dialogtool.cpp \
+    src/dialogs/tools/dialogtool.cpp \
-    src/dialogs/dialogsplinepath.cpp \
+    src/dialogs/tools/dialogsplinepath.cpp \
-    src/dialogs/dialogspline.cpp \
+    src/dialogs/tools/dialogspline.cpp \
-    src/dialogs/dialogsinglepoint.cpp \
+    src/dialogs/tools/dialogsinglepoint.cpp \
-    src/dialogs/dialogshoulderpoint.cpp \
+    src/dialogs/tools/dialogshoulderpoint.cpp \
-    src/dialogs/dialogpointofintersection.cpp \
+    src/dialogs/tools/dialogpointofintersection.cpp \
-    src/dialogs/dialogpointofcontact.cpp \
+    src/dialogs/tools/dialogpointofcontact.cpp \
-    src/dialogs/dialognormal.cpp \
+    src/dialogs/tools/dialognormal.cpp \
-    src/dialogs/dialoglineintersect.cpp \
+    src/dialogs/tools/dialoglineintersect.cpp \
-    src/dialogs/dialogline.cpp \
+    src/dialogs/tools/dialogline.cpp \
-    src/dialogs/dialogincrements.cpp \
+    src/dialogs/tools/dialogheight.cpp \
-    src/dialogs/dialoghistory.cpp \
+    src/dialogs/tools/dialogendline.cpp \
-    src/dialogs/dialogheight.cpp \
+    src/dialogs/tools/dialogdetail.cpp \
-    src/dialogs/dialogendline.cpp \
+    src/dialogs/tools/dialogbisector.cpp \
-    src/dialogs/dialogdetail.cpp \
+    src/dialogs/tools/dialogarc.cpp \
-    src/dialogs/dialogbisector.cpp \
+    src/dialogs/tools/dialogalongline.cpp \
-    src/dialogs/dialogarc.cpp \
+    src/dialogs/tools/dialogcutspline.cpp \
-    src/dialogs/dialogalongline.cpp \
+    src/dialogs/tools/dialogcutsplinepath.cpp \
-    src/dialogs/dialogcutspline.cpp \
+    src/dialogs/tools/dialoguniondetails.cpp \
-    src/dialogs/dialogcutsplinepath.cpp \
+    src/dialogs/tools/dialogcutarc.cpp \
-    src/dialogs/dialoguniondetails.cpp \
+    src/dialogs/app/dialogincrements.cpp \
-    src/dialogs/dialogcutarc.cpp \
+    src/dialogs/app/dialoghistory.cpp \
-    src/dialogs/configdialog.cpp \
+    src/dialogs/app/configdialog.cpp \
-    src/dialogs/pages.cpp \
+    src/dialogs/app/pages.cpp \
-    src/dialogs/dialogpatternproperties.cpp \
+    src/dialogs/app/dialogpatternproperties.cpp \
-    src/dialogs/dialogmeasurements.cpp \
+    src/dialogs/app/dialogmeasurements.cpp \
-    src/dialogs/dialogstandardmeasurements.cpp
+    src/dialogs/app/dialogstandardmeasurements.cpp
 
 FORMS += \
-    src/dialogs/dialogtriangle.ui \
+    src/dialogs/tools/dialogtriangle.ui \
-    src/dialogs/dialogsplinepath.ui \
+    src/dialogs/tools/dialogsplinepath.ui \
-    src/dialogs/dialogspline.ui \
+    src/dialogs/tools/dialogspline.ui \
-    src/dialogs/dialogsinglepoint.ui \
+    src/dialogs/tools/dialogsinglepoint.ui \
-    src/dialogs/dialogshoulderpoint.ui \
+    src/dialogs/tools/dialogshoulderpoint.ui \
-    src/dialogs/dialogpointofintersection.ui \
+    src/dialogs/tools/dialogpointofintersection.ui \
-    src/dialogs/dialogpointofcontact.ui \
+    src/dialogs/tools/dialogpointofcontact.ui \
-    src/dialogs/dialognormal.ui \
+    src/dialogs/tools/dialognormal.ui \
-    src/dialogs/dialoglineintersect.ui \
+    src/dialogs/tools/dialoglineintersect.ui \
-    src/dialogs/dialogline.ui \
+    src/dialogs/tools/dialogline.ui \
-    src/dialogs/dialogincrements.ui \
+    src/dialogs/tools/dialogheight.ui \
-    src/dialogs/dialoghistory.ui \
+    src/dialogs/tools/dialogendline.ui \
-    src/dialogs/dialogheight.ui \
+    src/dialogs/tools/dialogdetail.ui \
-    src/dialogs/dialogendline.ui \
+    src/dialogs/tools/dialogbisector.ui \
-    src/dialogs/dialogdetail.ui \
+    src/dialogs/tools/dialogarc.ui \
-    src/dialogs/dialogbisector.ui \
+    src/dialogs/tools/dialogalongline.ui \
-    src/dialogs/dialogarc.ui \
+    src/dialogs/tools/dialogcutspline.ui \
-    src/dialogs/dialogalongline.ui \
+    src/dialogs/tools/dialogcutsplinepath.ui \
-    src/dialogs/dialogcutspline.ui \
+    src/dialogs/tools/dialoguniondetails.ui \
-    src/dialogs/dialogcutsplinepath.ui \
+    src/dialogs/tools/dialogcutarc.ui \
-    src/dialogs/dialoguniondetails.ui \
+    src/dialogs/app/dialogincrements.ui \
-    src/dialogs/dialogcutarc.ui \
+    src/dialogs/app/dialoghistory.ui \
-    src/dialogs/dialogpatternproperties.ui \
+    src/dialogs/app/dialogpatternproperties.ui \
-    src/dialogs/dialogmeasurements.ui \
+    src/dialogs/app/dialogmeasurements.ui \
-    src/dialogs/dialogstandardmeasurements.ui
+    src/dialogs/app/dialogstandardmeasurements.ui

src/dialogs/tools/dialogsplinepath.cpp

@@ -28,7 +28,7 @@
 
 #include "dialogsplinepath.h"
 #include "ui_dialogsplinepath.h"
-#include "../geometry/vsplinepoint.h"
+#include "../../geometry/vsplinepoint.h"
 
 #include <QPushButton>
 

src/dialogs/tools/dialogsplinepath.h

@@ -30,7 +30,7 @@
 #define DIALOGSPLINEPATH_H
 
 #include "dialogtool.h"
-#include "../geometry/vsplinepath.h"
+#include "../../geometry/vsplinepath.h"
 
 namespace Ui
 {

src/dialogs/tools/dialogtool.cpp

@@ -27,9 +27,9 @@
  *************************************************************************/
 
 #include "dialogtool.h"
-#include "../container/calculator.h"
+#include "../../container/calculator.h"
-#include "../geometry/vgobject.h"
+#include "../../geometry/vgobject.h"
-#include "../tools/vabstracttool.h"
+#include "../../tools/vabstracttool.h"
 
 #include <QtWidgets>
 

src/dialogs/tools/dialogtool.h

@@ -35,7 +35,7 @@
 #include <QLabel>
 #include <QListWidgetItem>
 #include <QRadioButton>
-#include "../container/vcontainer.h"
+#include "../../container/vcontainer.h"
 
 namespace ComboMode
 {

src/tools/drawTools/vdrawtool.h

@@ -33,7 +33,7 @@
 
 #include <QMenu>
 #include <QGraphicsSceneContextMenuEvent>
-#include "../../dialogs/dialogtool.h"
+#include "../../dialogs/tools/dialogtool.h"
 
 /**
  * @brief The VDrawTool abstract class for all draw tool.

src/tools/drawTools/vtoolalongline.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolalongline.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogalongline.h"
+#include "../../dialogs/tools/dialogalongline.h"
 
 const QString VToolAlongLine::ToolType = QStringLiteral("alongLine");
 

src/tools/drawTools/vtoolarc.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolarc.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogarc.h"
+#include "../../dialogs/tools/dialogarc.h"
 
 const QString VToolArc::TagName = QStringLiteral("arc");
 const QString VToolArc::ToolType = QStringLiteral("simple");

src/tools/drawTools/vtoolbisector.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolbisector.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogbisector.h"
+#include "../../dialogs/tools/dialogbisector.h"
 
 const QString VToolBisector::ToolType = QStringLiteral("bisector");
 

src/tools/drawTools/vtoolcutarc.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolcutarc.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogcutarc.h"
+#include "../../dialogs/tools/dialogcutarc.h"
 
 const QString VToolCutArc::ToolType = QStringLiteral("cutArc");
 const QString VToolCutArc::AttrArc = QStringLiteral("arc");

src/tools/drawTools/vtoolcutspline.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolcutspline.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogcutspline.h"
+#include "../../dialogs/tools/dialogcutspline.h"
 
 const QString VToolCutSpline::ToolType = QStringLiteral("cutSpline");
 const QString VToolCutSpline::AttrSpline = QStringLiteral("spline");

src/tools/drawTools/vtoolcutsplinepath.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolcutsplinepath.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogcutsplinepath.h"
+#include "../../dialogs/tools/dialogcutsplinepath.h"
 
 const QString VToolCutSplinePath::ToolType = QStringLiteral("cutSplinePath");
 const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath");

src/tools/drawTools/vtoolendline.cpp

@@ -29,7 +29,7 @@
 #include "vtoolendline.h"
 #include "../../widgets/vmaingraphicsscene.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogendline.h"
+#include "../../dialogs/tools/dialogendline.h"
 
 const QString VToolEndLine::ToolType = QStringLiteral("endLine");
 

src/tools/drawTools/vtoolheight.cpp

@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "vtoolheight.h"
-#include "../../dialogs/dialogheight.h"
+#include "../../dialogs/tools/dialogheight.h"
 
 const QString VToolHeight::ToolType = QStringLiteral("height");
 

src/tools/drawTools/vtoolline.cpp

@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "vtoolline.h"
-#include "../../dialogs/dialogline.h"
+#include "../../dialogs/tools/dialogline.h"
 
 const QString VToolLine::TagName = QStringLiteral("line");
 

src/tools/drawTools/vtoolline.h

@@ -31,7 +31,7 @@
 
 #include "vdrawtool.h"
 #include <QGraphicsLineItem>
-#include "../../dialogs/dialogline.h"
+#include "../../dialogs/tools/dialogline.h"
 
 /**
  * @brief The VToolLine class tool for creation line.

src/tools/drawTools/vtoollineintersect.cpp

@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "vtoollineintersect.h"
-#include "../../dialogs/dialoglineintersect.h"
+#include "../../dialogs/tools/dialoglineintersect.h"
 
 const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect");
 

src/tools/drawTools/vtoolnormal.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolnormal.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialognormal.h"
+#include "../../dialogs/tools/dialognormal.h"
 
 const QString VToolNormal::ToolType = QStringLiteral("normal");
 

src/tools/drawTools/vtoolpointofcontact.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolpointofcontact.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogpointofcontact.h"
+#include "../../dialogs/tools/dialogpointofcontact.h"
 
 const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact");
 

src/tools/drawTools/vtoolpointofintersection.cpp

@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "vtoolpointofintersection.h"
-#include "../../dialogs/dialogpointofintersection.h"
+#include "../../dialogs/tools/dialogpointofintersection.h"
 
 const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection");
 

src/tools/drawTools/vtoolshoulderpoint.cpp

@@ -28,7 +28,7 @@
 
 #include "vtoolshoulderpoint.h"
 #include "../../container/calculator.h"
-#include "../../dialogs/dialogshoulderpoint.h"
+#include "../../dialogs/tools/dialogshoulderpoint.h"
 
 const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder");
 

src/tools/drawTools/vtoolsinglepoint.cpp

@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "vtoolsinglepoint.h"
-#include "../../dialogs/dialogsinglepoint.h"
+#include "../../dialogs/tools/dialogsinglepoint.h"
 
 const QString VToolSinglePoint::ToolType = QStringLiteral("single");