From 1e99fb68c13b9c322cea0650cd0d25a8ad7e8577 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 25 Apr 2014 11:58:33 +0300 Subject: [PATCH] Change project structure for support libs. --HG-- branch : feature --- Valentina.pro | 218 +--------------- dist/copyright_template.txt | 27 ++ src/app/app.pri | 234 ++++++++++++++++++ src/app/app.pro | 234 ++++++++++++++++++ src/{ => app}/container/calculator.cpp | 0 src/{ => app}/container/calculator.h | 0 src/app/container/container.pri | 11 + src/{ => app}/container/vcontainer.cpp | 0 src/{ => app}/container/vcontainer.h | 0 src/{ => app}/container/vincrement.cpp | 0 src/{ => app}/container/vincrement.h | 0 src/{ => app}/container/vmeasurement.cpp | 0 src/{ => app}/container/vmeasurement.h | 0 src/{ => app}/dialogs/app/configdialog.cpp | 0 src/{ => app}/dialogs/app/configdialog.h | 0 src/{ => app}/dialogs/app/dialoghistory.cpp | 0 src/{ => app}/dialogs/app/dialoghistory.h | 0 src/{ => app}/dialogs/app/dialoghistory.ui | 0 .../dialogs/app/dialogincrements.cpp | 0 src/{ => app}/dialogs/app/dialogincrements.h | 0 src/{ => app}/dialogs/app/dialogincrements.ui | 0 .../app/dialogindividualmeasurements.cpp | 0 .../app/dialogindividualmeasurements.h | 0 .../app/dialogindividualmeasurements.ui | 0 .../dialogs/app/dialogmeasurements.cpp | 0 .../dialogs/app/dialogmeasurements.h | 0 .../dialogs/app/dialogmeasurements.ui | 0 .../dialogs/app/dialogpatternproperties.cpp | 0 .../dialogs/app/dialogpatternproperties.h | 0 .../dialogs/app/dialogpatternproperties.ui | 0 .../app/dialogstandardmeasurements.cpp | 0 .../dialogs/app/dialogstandardmeasurements.h | 0 .../dialogs/app/dialogstandardmeasurements.ui | 0 src/{ => app}/dialogs/app/pages.cpp | 0 src/{ => app}/dialogs/app/pages.h | 0 src/{ => app}/dialogs/dialogs.h | 0 src/app/dialogs/dialogs.pri | 90 +++++++ .../dialogs/tools/dialogalongline.cpp | 0 src/{ => app}/dialogs/tools/dialogalongline.h | 0 .../dialogs/tools/dialogalongline.ui | 0 src/{ => app}/dialogs/tools/dialogarc.cpp | 0 src/{ => app}/dialogs/tools/dialogarc.h | 0 src/{ => app}/dialogs/tools/dialogarc.ui | 0 .../dialogs/tools/dialogbisector.cpp | 0 src/{ => app}/dialogs/tools/dialogbisector.h | 0 src/{ => app}/dialogs/tools/dialogbisector.ui | 0 src/{ => app}/dialogs/tools/dialogcutarc.cpp | 0 src/{ => app}/dialogs/tools/dialogcutarc.h | 0 src/{ => app}/dialogs/tools/dialogcutarc.ui | 0 .../dialogs/tools/dialogcutspline.cpp | 0 src/{ => app}/dialogs/tools/dialogcutspline.h | 0 .../dialogs/tools/dialogcutspline.ui | 0 .../dialogs/tools/dialogcutsplinepath.cpp | 0 .../dialogs/tools/dialogcutsplinepath.h | 0 .../dialogs/tools/dialogcutsplinepath.ui | 0 src/{ => app}/dialogs/tools/dialogdetail.cpp | 0 src/{ => app}/dialogs/tools/dialogdetail.h | 0 src/{ => app}/dialogs/tools/dialogdetail.ui | 0 src/{ => app}/dialogs/tools/dialogendline.cpp | 0 src/{ => app}/dialogs/tools/dialogendline.h | 0 src/{ => app}/dialogs/tools/dialogendline.ui | 0 src/{ => app}/dialogs/tools/dialogheight.cpp | 0 src/{ => app}/dialogs/tools/dialogheight.h | 0 src/{ => app}/dialogs/tools/dialogheight.ui | 0 src/{ => app}/dialogs/tools/dialogline.cpp | 0 src/{ => app}/dialogs/tools/dialogline.h | 0 src/{ => app}/dialogs/tools/dialogline.ui | 0 .../dialogs/tools/dialoglineintersect.cpp | 0 .../dialogs/tools/dialoglineintersect.h | 0 .../dialogs/tools/dialoglineintersect.ui | 0 src/{ => app}/dialogs/tools/dialognormal.cpp | 0 src/{ => app}/dialogs/tools/dialognormal.h | 0 src/{ => app}/dialogs/tools/dialognormal.ui | 0 .../dialogs/tools/dialogpointofcontact.cpp | 0 .../dialogs/tools/dialogpointofcontact.h | 0 .../dialogs/tools/dialogpointofcontact.ui | 0 .../tools/dialogpointofintersection.cpp | 0 .../dialogs/tools/dialogpointofintersection.h | 0 .../tools/dialogpointofintersection.ui | 0 .../dialogs/tools/dialogshoulderpoint.cpp | 0 .../dialogs/tools/dialogshoulderpoint.h | 0 .../dialogs/tools/dialogshoulderpoint.ui | 0 .../dialogs/tools/dialogsinglepoint.cpp | 0 .../dialogs/tools/dialogsinglepoint.h | 0 .../dialogs/tools/dialogsinglepoint.ui | 0 src/{ => app}/dialogs/tools/dialogspline.cpp | 0 src/{ => app}/dialogs/tools/dialogspline.h | 0 src/{ => app}/dialogs/tools/dialogspline.ui | 0 .../dialogs/tools/dialogsplinepath.cpp | 0 .../dialogs/tools/dialogsplinepath.h | 0 .../dialogs/tools/dialogsplinepath.ui | 0 src/{ => app}/dialogs/tools/dialogtool.cpp | 0 src/{ => app}/dialogs/tools/dialogtool.h | 0 .../dialogs/tools/dialogtriangle.cpp | 0 src/{ => app}/dialogs/tools/dialogtriangle.h | 0 src/{ => app}/dialogs/tools/dialogtriangle.ui | 0 .../dialogs/tools/dialoguniondetails.cpp | 0 .../dialogs/tools/dialoguniondetails.h | 0 .../dialogs/tools/dialoguniondetails.ui | 0 src/app/exception/exception.pri | 15 ++ src/{ => app}/exception/vexception.cpp | 0 src/{ => app}/exception/vexception.h | 0 src/{ => app}/exception/vexceptionbadid.cpp | 0 src/{ => app}/exception/vexceptionbadid.h | 0 .../exception/vexceptionconversionerror.cpp | 0 .../exception/vexceptionconversionerror.h | 0 .../exception/vexceptionemptyparameter.cpp | 0 .../exception/vexceptionemptyparameter.h | 0 .../exception/vexceptionobjecterror.cpp | 0 .../exception/vexceptionobjecterror.h | 0 src/{ => app}/exception/vexceptionwrongid.cpp | 0 src/{ => app}/exception/vexceptionwrongid.h | 0 src/app/geometry/geometry.pri | 21 ++ src/{ => app}/geometry/varc.cpp | 0 src/{ => app}/geometry/varc.h | 0 src/{ => app}/geometry/vdetail.cpp | 0 src/{ => app}/geometry/vdetail.h | 0 src/{ => app}/geometry/vequidistant.cpp | 0 src/{ => app}/geometry/vequidistant.h | 0 src/{ => app}/geometry/vgobject.cpp | 0 src/{ => app}/geometry/vgobject.h | 0 src/{ => app}/geometry/vnodedetail.cpp | 0 src/{ => app}/geometry/vnodedetail.h | 0 src/{ => app}/geometry/vpointf.cpp | 0 src/{ => app}/geometry/vpointf.h | 0 src/{ => app}/geometry/vspline.cpp | 0 src/{ => app}/geometry/vspline.h | 0 src/{ => app}/geometry/vsplinepath.cpp | 0 src/{ => app}/geometry/vsplinepath.h | 0 src/{ => app}/geometry/vsplinepoint.cpp | 0 src/{ => app}/geometry/vsplinepoint.h | 0 src/{ => app}/main.cpp | 0 src/{ => app}/mainwindow.cpp | 0 src/{ => app}/mainwindow.h | 0 src/{ => app}/mainwindow.ui | 0 src/{ => app}/options.h | 0 {share => src/app/share}/resources/cursor.qrc | 0 .../resources/cursor/alongline_cursor.png | Bin .../share}/resources/cursor/arc_cursor.png | Bin .../resources/cursor/arc_cut_cursor.png | Bin .../resources/cursor/bisector_cursor.png | Bin .../resources/cursor/endline_cursor.png | Bin .../share}/resources/cursor/height_cursor.png | Bin .../resources/cursor/intersect_cursor.png | Bin .../share}/resources/cursor/line_cursor.png | Bin .../resources/cursor/new_detail_cursor.png | Bin .../share}/resources/cursor/normal_cursor.png | Bin .../resources/cursor/pointcontact_cursor.png | Bin .../cursor/pointofintersect_cursor.png | Bin .../resources/cursor/shoulder_cursor.png | Bin .../share}/resources/cursor/spline_cursor.png | Bin .../cursor/spline_cut_point_cursor.png | Bin .../resources/cursor/splinepath_cursor.png | Bin .../cursor/splinepath_cut_point_cursor.png | Bin .../resources/cursor/triangle_cursor.png | Bin .../share}/resources/cursor/union_cursor.png | Bin {share => src/app/share}/resources/icon.qrc | 0 .../share}/resources/icon/16x16/mirror.png | Bin .../share}/resources/icon/24x24/arrowDown.png | Bin .../share}/resources/icon/24x24/arrowLeft.png | Bin .../resources/icon/24x24/arrowLeftDown.png | Bin .../resources/icon/24x24/arrowLeftUp.png | Bin .../resources/icon/24x24/arrowRight.png | Bin .../resources/icon/24x24/arrowRightDown.png | Bin .../resources/icon/24x24/arrowRightUp.png | Bin .../share}/resources/icon/24x24/arrowUp.png | Bin .../app/share}/resources/icon/24x24/equal.png | Bin .../share}/resources/icon/24x24/putHere.png | Bin .../resources/icon/24x24/putHereLeft.png | Bin .../resources/icon/32x32/along_line.png | Bin .../app/share}/resources/icon/32x32/arc.png | Bin .../share}/resources/icon/32x32/arc_cut.png | Bin .../resources/icon/32x32/arrow_cursor.png | Bin .../share}/resources/icon/32x32/bisector.png | Bin .../app/share}/resources/icon/32x32/draw.png | Bin .../share}/resources/icon/32x32/height.png | Bin .../share}/resources/icon/32x32/history.png | Bin .../share}/resources/icon/32x32/intersect.png | Bin .../share}/resources/icon/32x32/kontur.png | Bin .../share}/resources/icon/32x32/layout.png | Bin .../app/share}/resources/icon/32x32/line.png | Bin .../resources/icon/32x32/new_detail.png | Bin .../share}/resources/icon/32x32/new_draw.png | Bin .../share}/resources/icon/32x32/normal.png | Bin .../resources/icon/32x32/option_draw.png | Bin .../resources/icon/32x32/point_of_contact.png | Bin .../icon/32x32/point_of_intersection.png | Bin .../share}/resources/icon/32x32/put_after.png | Bin .../share}/resources/icon/32x32/segment.png | Bin .../share}/resources/icon/32x32/shoulder.png | Bin .../share}/resources/icon/32x32/spline.png | Bin .../resources/icon/32x32/splinePath.png | Bin .../icon/32x32/splinePath_cut_point.png | Bin .../resources/icon/32x32/spline_cut_point.png | Bin .../app/share}/resources/icon/32x32/table.png | Bin .../share}/resources/icon/32x32/triangle.png | Bin .../app/share}/resources/icon/32x32/union.png | Bin .../share}/resources/icon/64x64/icon64x64.ico | Bin .../share}/resources/icon/64x64/icon64x64.png | Bin .../app/share}/resources/icon/Graduation.png | Bin .../app/share}/resources/icon/config.png | Bin .../app/share}/resources/icon/flags/cs.png | Bin .../app/share}/resources/icon/flags/de.png | Bin .../app/share}/resources/icon/flags/en.png | Bin .../app/share}/resources/icon/flags/fr.png | Bin .../app/share}/resources/icon/flags/he_IL.png | Bin .../app/share}/resources/icon/flags/ru.png | Bin .../app/share}/resources/icon/flags/uk.png | Bin .../app/share}/resources/icon/individual.png | Bin .../app/share}/resources/icon/logo.svg | 0 .../share}/resources/icon/pattern_config.png | Bin .../16x16/actions/document-new.png | Bin .../16x16/actions/document-open.png | Bin .../16x16/actions/document-save-as.png | Bin .../16x16/actions/document-save.png | Bin .../win.icon.theme/16x16/actions/go-next.png | Bin .../win.icon.theme/16x16/actions/list-add.png | Bin .../16x16/actions/list-remove.png | Bin .../16x16/actions/object-rotate-left.png | Bin .../16x16/actions/process-stop.png | Bin .../win.icon.theme/16x16/actions/zoom-in.png | Bin .../win.icon.theme/16x16/actions/zoom-out.png | Bin .../24x24/actions/document-new.png | Bin .../24x24/actions/document-open.png | Bin .../24x24/actions/document-save-as.png | Bin .../24x24/actions/document-save.png | Bin .../win.icon.theme/24x24/actions/go-next.png | Bin .../win.icon.theme/24x24/actions/list-add.png | Bin .../24x24/actions/list-remove.png | Bin .../24x24/actions/object-rotate-left.png | Bin .../24x24/actions/process-stop.png | Bin .../win.icon.theme/24x24/actions/zoom-in.png | Bin .../win.icon.theme/24x24/actions/zoom-out.png | Bin .../32x32/actions/document-new.png | Bin .../32x32/actions/document-open.png | Bin .../32x32/actions/document-save-as.png | Bin .../32x32/actions/document-save.png | Bin .../win.icon.theme/32x32/actions/go-next.png | Bin .../win.icon.theme/32x32/actions/list-add.png | Bin .../32x32/actions/list-remove.png | Bin .../32x32/actions/object-rotate-left.png | Bin .../32x32/actions/process-stop.png | Bin .../win.icon.theme/32x32/actions/zoom-in.png | Bin .../win.icon.theme/32x32/actions/zoom-out.png | Bin .../icons/win.icon.theme/index.theme | 0 {share => src/app/share}/resources/schema.qrc | 0 .../schema/individual_measurements.xsd | 0 .../app/share}/resources/schema/pattern.xsd | 0 .../schema/standard_measurements.xsd | 0 {share => src/app/share}/resources/theme.qrc | 0 .../app/share}/resources/valentina.rc | 0 .../tables/individual/indivindual_ru.vit | 0 .../share}/tables/standard/GOST_man_ru.vst | 0 .../app/share}/translations/valentina.ts | 0 .../app/share}/translations/valentina_cs.ts | 0 .../app/share}/translations/valentina_de.ts | 0 .../app/share}/translations/valentina_fr.ts | 0 .../share}/translations/valentina_he_IL.ts | 0 .../app/share}/translations/valentina_ru.ts | 0 .../app/share}/translations/valentina_uk.ts | 0 src/{ => app}/stable.cpp | 0 src/{ => app}/stable.h | 0 src/{ => app}/tablewindow.cpp | 0 src/{ => app}/tablewindow.h | 0 src/{ => app}/tablewindow.ui | 0 src/{ => app}/tools/drawTools/drawtools.h | 0 .../tools/drawTools/vabstractspline.cpp | 0 .../tools/drawTools/vabstractspline.h | 0 src/{ => app}/tools/drawTools/vdrawtool.cpp | 0 src/{ => app}/tools/drawTools/vdrawtool.h | 0 .../tools/drawTools/vtoolalongline.cpp | 0 .../tools/drawTools/vtoolalongline.h | 0 src/{ => app}/tools/drawTools/vtoolarc.cpp | 0 src/{ => app}/tools/drawTools/vtoolarc.h | 0 .../tools/drawTools/vtoolbisector.cpp | 0 src/{ => app}/tools/drawTools/vtoolbisector.h | 0 src/{ => app}/tools/drawTools/vtoolcutarc.cpp | 0 src/{ => app}/tools/drawTools/vtoolcutarc.h | 0 .../tools/drawTools/vtoolcutspline.cpp | 0 .../tools/drawTools/vtoolcutspline.h | 0 .../tools/drawTools/vtoolcutsplinepath.cpp | 0 .../tools/drawTools/vtoolcutsplinepath.h | 0 .../tools/drawTools/vtoolendline.cpp | 0 src/{ => app}/tools/drawTools/vtoolendline.h | 0 src/{ => app}/tools/drawTools/vtoolheight.cpp | 0 src/{ => app}/tools/drawTools/vtoolheight.h | 0 src/{ => app}/tools/drawTools/vtoolline.cpp | 0 src/{ => app}/tools/drawTools/vtoolline.h | 0 .../tools/drawTools/vtoollineintersect.cpp | 0 .../tools/drawTools/vtoollineintersect.h | 0 .../tools/drawTools/vtoollinepoint.cpp | 0 .../tools/drawTools/vtoollinepoint.h | 0 src/{ => app}/tools/drawTools/vtoolnormal.cpp | 0 src/{ => app}/tools/drawTools/vtoolnormal.h | 0 src/{ => app}/tools/drawTools/vtoolpoint.cpp | 0 src/{ => app}/tools/drawTools/vtoolpoint.h | 0 .../tools/drawTools/vtoolpointofcontact.cpp | 0 .../tools/drawTools/vtoolpointofcontact.h | 0 .../drawTools/vtoolpointofintersection.cpp | 0 .../drawTools/vtoolpointofintersection.h | 0 .../tools/drawTools/vtoolshoulderpoint.cpp | 0 .../tools/drawTools/vtoolshoulderpoint.h | 0 .../tools/drawTools/vtoolsinglepoint.cpp | 0 .../tools/drawTools/vtoolsinglepoint.h | 0 src/{ => app}/tools/drawTools/vtoolspline.cpp | 0 src/{ => app}/tools/drawTools/vtoolspline.h | 0 .../tools/drawTools/vtoolsplinepath.cpp | 0 .../tools/drawTools/vtoolsplinepath.h | 0 .../tools/drawTools/vtooltriangle.cpp | 0 src/{ => app}/tools/drawTools/vtooltriangle.h | 0 src/{ => app}/tools/nodeDetails/nodedetails.h | 0 .../tools/nodeDetails/vabstractnode.cpp | 0 .../tools/nodeDetails/vabstractnode.h | 0 src/{ => app}/tools/nodeDetails/vnodearc.cpp | 0 src/{ => app}/tools/nodeDetails/vnodearc.h | 0 .../tools/nodeDetails/vnodepoint.cpp | 0 src/{ => app}/tools/nodeDetails/vnodepoint.h | 0 .../tools/nodeDetails/vnodespline.cpp | 0 src/{ => app}/tools/nodeDetails/vnodespline.h | 0 .../tools/nodeDetails/vnodesplinepath.cpp | 0 .../tools/nodeDetails/vnodesplinepath.h | 0 src/{ => app}/tools/tools.h | 0 src/app/tools/tools.pri | 68 +++++ src/{ => app}/tools/vabstracttool.cpp | 0 src/{ => app}/tools/vabstracttool.h | 0 src/{ => app}/tools/vdatatool.cpp | 0 src/{ => app}/tools/vdatatool.h | 0 src/{ => app}/tools/vtooldetail.cpp | 0 src/{ => app}/tools/vtooldetail.h | 0 src/{ => app}/tools/vtooluniondetails.cpp | 0 src/{ => app}/tools/vtooluniondetails.h | 0 src/{ => app}/version.cpp | 0 src/{ => app}/version.h | 0 src/{ => app}/widgets/doubledelegate.cpp | 0 src/{ => app}/widgets/doubledelegate.h | 0 src/{ => app}/widgets/textdelegate.cpp | 0 src/{ => app}/widgets/textdelegate.h | 0 src/{ => app}/widgets/vapplication.cpp | 0 src/{ => app}/widgets/vapplication.h | 0 src/{ => app}/widgets/vcontrolpointspline.cpp | 0 src/{ => app}/widgets/vcontrolpointspline.h | 0 .../widgets/vgraphicssimpletextitem.cpp | 0 .../widgets/vgraphicssimpletextitem.h | 0 src/{ => app}/widgets/vitem.cpp | 0 src/{ => app}/widgets/vitem.h | 0 src/{ => app}/widgets/vmaingraphicsscene.cpp | 0 src/{ => app}/widgets/vmaingraphicsscene.h | 0 src/{ => app}/widgets/vmaingraphicsview.cpp | 0 src/{ => app}/widgets/vmaingraphicsview.h | 0 src/{ => app}/widgets/vsimplearc.cpp | 0 src/{ => app}/widgets/vsimplearc.h | 0 src/{ => app}/widgets/vsimplespline.cpp | 0 src/{ => app}/widgets/vsimplespline.h | 0 src/{ => app}/widgets/vsimplesplinepath.cpp | 0 src/{ => app}/widgets/vsimplesplinepath.h | 0 src/{ => app}/widgets/vtablegraphicsview.cpp | 0 src/{ => app}/widgets/vtablegraphicsview.h | 0 src/app/widgets/widgets.pri | 27 ++ src/{ => app}/xml/vdomdocument.cpp | 0 src/{ => app}/xml/vdomdocument.h | 0 src/{ => app}/xml/vindividualmeasurements.cpp | 0 src/{ => app}/xml/vindividualmeasurements.h | 0 src/{ => app}/xml/vpattern.cpp | 0 src/{ => app}/xml/vpattern.h | 0 src/{ => app}/xml/vstandardmeasurements.cpp | 0 src/{ => app}/xml/vstandardmeasurements.h | 0 src/{ => app}/xml/vtoolrecord.cpp | 0 src/{ => app}/xml/vtoolrecord.h | 0 src/app/xml/xml.pri | 13 + src/container/container.pri | 11 - src/dialogs/dialogs.pri | 90 ------- src/exception/exception.pri | 15 -- src/geometry/geometry.pri | 21 -- src/src.pri | 14 -- src/src.pro | 50 ++++ src/tools/tools.pri | 68 ----- src/widgets/widgets.pri | 27 -- src/xml/xml.pri | 13 - 378 files changed, 792 insertions(+), 475 deletions(-) create mode 100644 dist/copyright_template.txt create mode 100644 src/app/app.pri create mode 100644 src/app/app.pro rename src/{ => app}/container/calculator.cpp (100%) rename src/{ => app}/container/calculator.h (100%) create mode 100644 src/app/container/container.pri rename src/{ => app}/container/vcontainer.cpp (100%) rename src/{ => app}/container/vcontainer.h (100%) rename src/{ => app}/container/vincrement.cpp (100%) rename src/{ => app}/container/vincrement.h (100%) rename src/{ => app}/container/vmeasurement.cpp (100%) rename src/{ => app}/container/vmeasurement.h (100%) rename src/{ => app}/dialogs/app/configdialog.cpp (100%) rename src/{ => app}/dialogs/app/configdialog.h (100%) rename src/{ => app}/dialogs/app/dialoghistory.cpp (100%) rename src/{ => app}/dialogs/app/dialoghistory.h (100%) rename src/{ => app}/dialogs/app/dialoghistory.ui (100%) rename src/{ => app}/dialogs/app/dialogincrements.cpp (100%) rename src/{ => app}/dialogs/app/dialogincrements.h (100%) rename src/{ => app}/dialogs/app/dialogincrements.ui (100%) rename src/{ => app}/dialogs/app/dialogindividualmeasurements.cpp (100%) rename src/{ => app}/dialogs/app/dialogindividualmeasurements.h (100%) rename src/{ => app}/dialogs/app/dialogindividualmeasurements.ui (100%) rename src/{ => app}/dialogs/app/dialogmeasurements.cpp (100%) rename src/{ => app}/dialogs/app/dialogmeasurements.h (100%) rename src/{ => app}/dialogs/app/dialogmeasurements.ui (100%) rename src/{ => app}/dialogs/app/dialogpatternproperties.cpp (100%) rename src/{ => app}/dialogs/app/dialogpatternproperties.h (100%) rename src/{ => app}/dialogs/app/dialogpatternproperties.ui (100%) rename src/{ => app}/dialogs/app/dialogstandardmeasurements.cpp (100%) rename src/{ => app}/dialogs/app/dialogstandardmeasurements.h (100%) rename src/{ => app}/dialogs/app/dialogstandardmeasurements.ui (100%) rename src/{ => app}/dialogs/app/pages.cpp (100%) rename src/{ => app}/dialogs/app/pages.h (100%) rename src/{ => app}/dialogs/dialogs.h (100%) create mode 100644 src/app/dialogs/dialogs.pri rename src/{ => app}/dialogs/tools/dialogalongline.cpp (100%) rename src/{ => app}/dialogs/tools/dialogalongline.h (100%) rename src/{ => app}/dialogs/tools/dialogalongline.ui (100%) rename src/{ => app}/dialogs/tools/dialogarc.cpp (100%) rename src/{ => app}/dialogs/tools/dialogarc.h (100%) rename src/{ => app}/dialogs/tools/dialogarc.ui (100%) rename src/{ => app}/dialogs/tools/dialogbisector.cpp (100%) rename src/{ => app}/dialogs/tools/dialogbisector.h (100%) rename src/{ => app}/dialogs/tools/dialogbisector.ui (100%) rename src/{ => app}/dialogs/tools/dialogcutarc.cpp (100%) rename src/{ => app}/dialogs/tools/dialogcutarc.h (100%) rename src/{ => app}/dialogs/tools/dialogcutarc.ui (100%) rename src/{ => app}/dialogs/tools/dialogcutspline.cpp (100%) rename src/{ => app}/dialogs/tools/dialogcutspline.h (100%) rename src/{ => app}/dialogs/tools/dialogcutspline.ui (100%) rename src/{ => app}/dialogs/tools/dialogcutsplinepath.cpp (100%) rename src/{ => app}/dialogs/tools/dialogcutsplinepath.h (100%) rename src/{ => app}/dialogs/tools/dialogcutsplinepath.ui (100%) rename src/{ => app}/dialogs/tools/dialogdetail.cpp (100%) rename src/{ => app}/dialogs/tools/dialogdetail.h (100%) rename src/{ => app}/dialogs/tools/dialogdetail.ui (100%) rename src/{ => app}/dialogs/tools/dialogendline.cpp (100%) rename src/{ => app}/dialogs/tools/dialogendline.h (100%) rename src/{ => app}/dialogs/tools/dialogendline.ui (100%) rename src/{ => app}/dialogs/tools/dialogheight.cpp (100%) rename src/{ => app}/dialogs/tools/dialogheight.h (100%) rename src/{ => app}/dialogs/tools/dialogheight.ui (100%) rename src/{ => app}/dialogs/tools/dialogline.cpp (100%) rename src/{ => app}/dialogs/tools/dialogline.h (100%) rename src/{ => app}/dialogs/tools/dialogline.ui (100%) rename src/{ => app}/dialogs/tools/dialoglineintersect.cpp (100%) rename src/{ => app}/dialogs/tools/dialoglineintersect.h (100%) rename src/{ => app}/dialogs/tools/dialoglineintersect.ui (100%) rename src/{ => app}/dialogs/tools/dialognormal.cpp (100%) rename src/{ => app}/dialogs/tools/dialognormal.h (100%) rename src/{ => app}/dialogs/tools/dialognormal.ui (100%) rename src/{ => app}/dialogs/tools/dialogpointofcontact.cpp (100%) rename src/{ => app}/dialogs/tools/dialogpointofcontact.h (100%) rename src/{ => app}/dialogs/tools/dialogpointofcontact.ui (100%) rename src/{ => app}/dialogs/tools/dialogpointofintersection.cpp (100%) rename src/{ => app}/dialogs/tools/dialogpointofintersection.h (100%) rename src/{ => app}/dialogs/tools/dialogpointofintersection.ui (100%) rename src/{ => app}/dialogs/tools/dialogshoulderpoint.cpp (100%) rename src/{ => app}/dialogs/tools/dialogshoulderpoint.h (100%) rename src/{ => app}/dialogs/tools/dialogshoulderpoint.ui (100%) rename src/{ => app}/dialogs/tools/dialogsinglepoint.cpp (100%) rename src/{ => app}/dialogs/tools/dialogsinglepoint.h (100%) rename src/{ => app}/dialogs/tools/dialogsinglepoint.ui (100%) rename src/{ => app}/dialogs/tools/dialogspline.cpp (100%) rename src/{ => app}/dialogs/tools/dialogspline.h (100%) rename src/{ => app}/dialogs/tools/dialogspline.ui (100%) rename src/{ => app}/dialogs/tools/dialogsplinepath.cpp (100%) rename src/{ => app}/dialogs/tools/dialogsplinepath.h (100%) rename src/{ => app}/dialogs/tools/dialogsplinepath.ui (100%) rename src/{ => app}/dialogs/tools/dialogtool.cpp (100%) rename src/{ => app}/dialogs/tools/dialogtool.h (100%) rename src/{ => app}/dialogs/tools/dialogtriangle.cpp (100%) rename src/{ => app}/dialogs/tools/dialogtriangle.h (100%) rename src/{ => app}/dialogs/tools/dialogtriangle.ui (100%) rename src/{ => app}/dialogs/tools/dialoguniondetails.cpp (100%) rename src/{ => app}/dialogs/tools/dialoguniondetails.h (100%) rename src/{ => app}/dialogs/tools/dialoguniondetails.ui (100%) create mode 100644 src/app/exception/exception.pri rename src/{ => app}/exception/vexception.cpp (100%) rename src/{ => app}/exception/vexception.h (100%) rename src/{ => app}/exception/vexceptionbadid.cpp (100%) rename src/{ => app}/exception/vexceptionbadid.h (100%) rename src/{ => app}/exception/vexceptionconversionerror.cpp (100%) rename src/{ => app}/exception/vexceptionconversionerror.h (100%) rename src/{ => app}/exception/vexceptionemptyparameter.cpp (100%) rename src/{ => app}/exception/vexceptionemptyparameter.h (100%) rename src/{ => app}/exception/vexceptionobjecterror.cpp (100%) rename src/{ => app}/exception/vexceptionobjecterror.h (100%) rename src/{ => app}/exception/vexceptionwrongid.cpp (100%) rename src/{ => app}/exception/vexceptionwrongid.h (100%) create mode 100644 src/app/geometry/geometry.pri rename src/{ => app}/geometry/varc.cpp (100%) rename src/{ => app}/geometry/varc.h (100%) rename src/{ => app}/geometry/vdetail.cpp (100%) rename src/{ => app}/geometry/vdetail.h (100%) rename src/{ => app}/geometry/vequidistant.cpp (100%) rename src/{ => app}/geometry/vequidistant.h (100%) rename src/{ => app}/geometry/vgobject.cpp (100%) rename src/{ => app}/geometry/vgobject.h (100%) rename src/{ => app}/geometry/vnodedetail.cpp (100%) rename src/{ => app}/geometry/vnodedetail.h (100%) rename src/{ => app}/geometry/vpointf.cpp (100%) rename src/{ => app}/geometry/vpointf.h (100%) rename src/{ => app}/geometry/vspline.cpp (100%) rename src/{ => app}/geometry/vspline.h (100%) rename src/{ => app}/geometry/vsplinepath.cpp (100%) rename src/{ => app}/geometry/vsplinepath.h (100%) rename src/{ => app}/geometry/vsplinepoint.cpp (100%) rename src/{ => app}/geometry/vsplinepoint.h (100%) rename src/{ => app}/main.cpp (100%) rename src/{ => app}/mainwindow.cpp (100%) rename src/{ => app}/mainwindow.h (100%) rename src/{ => app}/mainwindow.ui (100%) rename src/{ => app}/options.h (100%) rename {share => src/app/share}/resources/cursor.qrc (100%) rename {share => src/app/share}/resources/cursor/alongline_cursor.png (100%) rename {share => src/app/share}/resources/cursor/arc_cursor.png (100%) rename {share => src/app/share}/resources/cursor/arc_cut_cursor.png (100%) rename {share => src/app/share}/resources/cursor/bisector_cursor.png (100%) rename {share => src/app/share}/resources/cursor/endline_cursor.png (100%) rename {share => src/app/share}/resources/cursor/height_cursor.png (100%) rename {share => src/app/share}/resources/cursor/intersect_cursor.png (100%) rename {share => src/app/share}/resources/cursor/line_cursor.png (100%) rename {share => src/app/share}/resources/cursor/new_detail_cursor.png (100%) rename {share => src/app/share}/resources/cursor/normal_cursor.png (100%) rename {share => src/app/share}/resources/cursor/pointcontact_cursor.png (100%) rename {share => src/app/share}/resources/cursor/pointofintersect_cursor.png (100%) rename {share => src/app/share}/resources/cursor/shoulder_cursor.png (100%) rename {share => src/app/share}/resources/cursor/spline_cursor.png (100%) rename {share => src/app/share}/resources/cursor/spline_cut_point_cursor.png (100%) rename {share => src/app/share}/resources/cursor/splinepath_cursor.png (100%) rename {share => src/app/share}/resources/cursor/splinepath_cut_point_cursor.png (100%) rename {share => src/app/share}/resources/cursor/triangle_cursor.png (100%) rename {share => src/app/share}/resources/cursor/union_cursor.png (100%) rename {share => src/app/share}/resources/icon.qrc (100%) rename {share => src/app/share}/resources/icon/16x16/mirror.png (100%) rename {share => src/app/share}/resources/icon/24x24/arrowDown.png (100%) rename {share => src/app/share}/resources/icon/24x24/arrowLeft.png (100%) rename {share => src/app/share}/resources/icon/24x24/arrowLeftDown.png (100%) rename {share => src/app/share}/resources/icon/24x24/arrowLeftUp.png (100%) rename {share => src/app/share}/resources/icon/24x24/arrowRight.png (100%) rename {share => src/app/share}/resources/icon/24x24/arrowRightDown.png (100%) rename {share => src/app/share}/resources/icon/24x24/arrowRightUp.png (100%) rename {share => src/app/share}/resources/icon/24x24/arrowUp.png (100%) rename {share => src/app/share}/resources/icon/24x24/equal.png (100%) rename {share => src/app/share}/resources/icon/24x24/putHere.png (100%) rename {share => src/app/share}/resources/icon/24x24/putHereLeft.png (100%) rename {share => src/app/share}/resources/icon/32x32/along_line.png (100%) rename {share => src/app/share}/resources/icon/32x32/arc.png (100%) rename {share => src/app/share}/resources/icon/32x32/arc_cut.png (100%) rename {share => src/app/share}/resources/icon/32x32/arrow_cursor.png (100%) rename {share => src/app/share}/resources/icon/32x32/bisector.png (100%) rename {share => src/app/share}/resources/icon/32x32/draw.png (100%) rename {share => src/app/share}/resources/icon/32x32/height.png (100%) rename {share => src/app/share}/resources/icon/32x32/history.png (100%) rename {share => src/app/share}/resources/icon/32x32/intersect.png (100%) rename {share => src/app/share}/resources/icon/32x32/kontur.png (100%) rename {share => src/app/share}/resources/icon/32x32/layout.png (100%) rename {share => src/app/share}/resources/icon/32x32/line.png (100%) rename {share => src/app/share}/resources/icon/32x32/new_detail.png (100%) rename {share => src/app/share}/resources/icon/32x32/new_draw.png (100%) rename {share => src/app/share}/resources/icon/32x32/normal.png (100%) rename {share => src/app/share}/resources/icon/32x32/option_draw.png (100%) rename {share => src/app/share}/resources/icon/32x32/point_of_contact.png (100%) rename {share => src/app/share}/resources/icon/32x32/point_of_intersection.png (100%) rename {share => src/app/share}/resources/icon/32x32/put_after.png (100%) rename {share => src/app/share}/resources/icon/32x32/segment.png (100%) rename {share => src/app/share}/resources/icon/32x32/shoulder.png (100%) rename {share => src/app/share}/resources/icon/32x32/spline.png (100%) rename {share => src/app/share}/resources/icon/32x32/splinePath.png (100%) rename {share => src/app/share}/resources/icon/32x32/splinePath_cut_point.png (100%) rename {share => src/app/share}/resources/icon/32x32/spline_cut_point.png (100%) rename {share => src/app/share}/resources/icon/32x32/table.png (100%) rename {share => src/app/share}/resources/icon/32x32/triangle.png (100%) rename {share => src/app/share}/resources/icon/32x32/union.png (100%) rename {share => src/app/share}/resources/icon/64x64/icon64x64.ico (100%) rename {share => src/app/share}/resources/icon/64x64/icon64x64.png (100%) rename {share => src/app/share}/resources/icon/Graduation.png (100%) rename {share => src/app/share}/resources/icon/config.png (100%) rename {share => src/app/share}/resources/icon/flags/cs.png (100%) rename {share => src/app/share}/resources/icon/flags/de.png (100%) rename {share => src/app/share}/resources/icon/flags/en.png (100%) rename {share => src/app/share}/resources/icon/flags/fr.png (100%) rename {share => src/app/share}/resources/icon/flags/he_IL.png (100%) rename {share => src/app/share}/resources/icon/flags/ru.png (100%) rename {share => src/app/share}/resources/icon/flags/uk.png (100%) rename {share => src/app/share}/resources/icon/individual.png (100%) rename {share => src/app/share}/resources/icon/logo.svg (100%) rename {share => src/app/share}/resources/icon/pattern_config.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/document-new.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/document-open.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/document-save-as.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/document-save.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/go-next.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/list-add.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/list-remove.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/process-stop.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/zoom-in.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/16x16/actions/zoom-out.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/document-new.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/document-open.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/document-save-as.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/document-save.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/go-next.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/list-add.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/list-remove.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/process-stop.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/zoom-in.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/24x24/actions/zoom-out.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/document-new.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/document-open.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/document-save-as.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/document-save.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/go-next.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/list-add.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/list-remove.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/process-stop.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/zoom-in.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/32x32/actions/zoom-out.png (100%) rename {share => src/app/share}/resources/icons/win.icon.theme/index.theme (100%) rename {share => src/app/share}/resources/schema.qrc (100%) rename {share => src/app/share}/resources/schema/individual_measurements.xsd (100%) rename {share => src/app/share}/resources/schema/pattern.xsd (100%) rename {share => src/app/share}/resources/schema/standard_measurements.xsd (100%) rename {share => src/app/share}/resources/theme.qrc (100%) rename {share => src/app/share}/resources/valentina.rc (100%) rename {share => src/app/share}/tables/individual/indivindual_ru.vit (100%) rename {share => src/app/share}/tables/standard/GOST_man_ru.vst (100%) rename {share => src/app/share}/translations/valentina.ts (100%) rename {share => src/app/share}/translations/valentina_cs.ts (100%) rename {share => src/app/share}/translations/valentina_de.ts (100%) rename {share => src/app/share}/translations/valentina_fr.ts (100%) rename {share => src/app/share}/translations/valentina_he_IL.ts (100%) rename {share => src/app/share}/translations/valentina_ru.ts (100%) rename {share => src/app/share}/translations/valentina_uk.ts (100%) rename src/{ => app}/stable.cpp (100%) rename src/{ => app}/stable.h (100%) rename src/{ => app}/tablewindow.cpp (100%) rename src/{ => app}/tablewindow.h (100%) rename src/{ => app}/tablewindow.ui (100%) rename src/{ => app}/tools/drawTools/drawtools.h (100%) rename src/{ => app}/tools/drawTools/vabstractspline.cpp (100%) rename src/{ => app}/tools/drawTools/vabstractspline.h (100%) rename src/{ => app}/tools/drawTools/vdrawtool.cpp (100%) rename src/{ => app}/tools/drawTools/vdrawtool.h (100%) rename src/{ => app}/tools/drawTools/vtoolalongline.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolalongline.h (100%) rename src/{ => app}/tools/drawTools/vtoolarc.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolarc.h (100%) rename src/{ => app}/tools/drawTools/vtoolbisector.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolbisector.h (100%) rename src/{ => app}/tools/drawTools/vtoolcutarc.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolcutarc.h (100%) rename src/{ => app}/tools/drawTools/vtoolcutspline.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolcutspline.h (100%) rename src/{ => app}/tools/drawTools/vtoolcutsplinepath.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolcutsplinepath.h (100%) rename src/{ => app}/tools/drawTools/vtoolendline.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolendline.h (100%) rename src/{ => app}/tools/drawTools/vtoolheight.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolheight.h (100%) rename src/{ => app}/tools/drawTools/vtoolline.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolline.h (100%) rename src/{ => app}/tools/drawTools/vtoollineintersect.cpp (100%) rename src/{ => app}/tools/drawTools/vtoollineintersect.h (100%) rename src/{ => app}/tools/drawTools/vtoollinepoint.cpp (100%) rename src/{ => app}/tools/drawTools/vtoollinepoint.h (100%) rename src/{ => app}/tools/drawTools/vtoolnormal.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolnormal.h (100%) rename src/{ => app}/tools/drawTools/vtoolpoint.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolpoint.h (100%) rename src/{ => app}/tools/drawTools/vtoolpointofcontact.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolpointofcontact.h (100%) rename src/{ => app}/tools/drawTools/vtoolpointofintersection.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolpointofintersection.h (100%) rename src/{ => app}/tools/drawTools/vtoolshoulderpoint.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolshoulderpoint.h (100%) rename src/{ => app}/tools/drawTools/vtoolsinglepoint.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolsinglepoint.h (100%) rename src/{ => app}/tools/drawTools/vtoolspline.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolspline.h (100%) rename src/{ => app}/tools/drawTools/vtoolsplinepath.cpp (100%) rename src/{ => app}/tools/drawTools/vtoolsplinepath.h (100%) rename src/{ => app}/tools/drawTools/vtooltriangle.cpp (100%) rename src/{ => app}/tools/drawTools/vtooltriangle.h (100%) rename src/{ => app}/tools/nodeDetails/nodedetails.h (100%) rename src/{ => app}/tools/nodeDetails/vabstractnode.cpp (100%) rename src/{ => app}/tools/nodeDetails/vabstractnode.h (100%) rename src/{ => app}/tools/nodeDetails/vnodearc.cpp (100%) rename src/{ => app}/tools/nodeDetails/vnodearc.h (100%) rename src/{ => app}/tools/nodeDetails/vnodepoint.cpp (100%) rename src/{ => app}/tools/nodeDetails/vnodepoint.h (100%) rename src/{ => app}/tools/nodeDetails/vnodespline.cpp (100%) rename src/{ => app}/tools/nodeDetails/vnodespline.h (100%) rename src/{ => app}/tools/nodeDetails/vnodesplinepath.cpp (100%) rename src/{ => app}/tools/nodeDetails/vnodesplinepath.h (100%) rename src/{ => app}/tools/tools.h (100%) create mode 100644 src/app/tools/tools.pri rename src/{ => app}/tools/vabstracttool.cpp (100%) rename src/{ => app}/tools/vabstracttool.h (100%) rename src/{ => app}/tools/vdatatool.cpp (100%) rename src/{ => app}/tools/vdatatool.h (100%) rename src/{ => app}/tools/vtooldetail.cpp (100%) rename src/{ => app}/tools/vtooldetail.h (100%) rename src/{ => app}/tools/vtooluniondetails.cpp (100%) rename src/{ => app}/tools/vtooluniondetails.h (100%) rename src/{ => app}/version.cpp (100%) rename src/{ => app}/version.h (100%) rename src/{ => app}/widgets/doubledelegate.cpp (100%) rename src/{ => app}/widgets/doubledelegate.h (100%) rename src/{ => app}/widgets/textdelegate.cpp (100%) rename src/{ => app}/widgets/textdelegate.h (100%) rename src/{ => app}/widgets/vapplication.cpp (100%) rename src/{ => app}/widgets/vapplication.h (100%) rename src/{ => app}/widgets/vcontrolpointspline.cpp (100%) rename src/{ => app}/widgets/vcontrolpointspline.h (100%) rename src/{ => app}/widgets/vgraphicssimpletextitem.cpp (100%) rename src/{ => app}/widgets/vgraphicssimpletextitem.h (100%) rename src/{ => app}/widgets/vitem.cpp (100%) rename src/{ => app}/widgets/vitem.h (100%) rename src/{ => app}/widgets/vmaingraphicsscene.cpp (100%) rename src/{ => app}/widgets/vmaingraphicsscene.h (100%) rename src/{ => app}/widgets/vmaingraphicsview.cpp (100%) rename src/{ => app}/widgets/vmaingraphicsview.h (100%) rename src/{ => app}/widgets/vsimplearc.cpp (100%) rename src/{ => app}/widgets/vsimplearc.h (100%) rename src/{ => app}/widgets/vsimplespline.cpp (100%) rename src/{ => app}/widgets/vsimplespline.h (100%) rename src/{ => app}/widgets/vsimplesplinepath.cpp (100%) rename src/{ => app}/widgets/vsimplesplinepath.h (100%) rename src/{ => app}/widgets/vtablegraphicsview.cpp (100%) rename src/{ => app}/widgets/vtablegraphicsview.h (100%) create mode 100644 src/app/widgets/widgets.pri rename src/{ => app}/xml/vdomdocument.cpp (100%) rename src/{ => app}/xml/vdomdocument.h (100%) rename src/{ => app}/xml/vindividualmeasurements.cpp (100%) rename src/{ => app}/xml/vindividualmeasurements.h (100%) rename src/{ => app}/xml/vpattern.cpp (100%) rename src/{ => app}/xml/vpattern.h (100%) rename src/{ => app}/xml/vstandardmeasurements.cpp (100%) rename src/{ => app}/xml/vstandardmeasurements.h (100%) rename src/{ => app}/xml/vtoolrecord.cpp (100%) rename src/{ => app}/xml/vtoolrecord.h (100%) create mode 100644 src/app/xml/xml.pri delete mode 100644 src/container/container.pri delete mode 100644 src/dialogs/dialogs.pri delete mode 100644 src/exception/exception.pri delete mode 100644 src/geometry/geometry.pri delete mode 100644 src/src.pri create mode 100644 src/src.pro delete mode 100644 src/tools/tools.pri delete mode 100644 src/widgets/widgets.pri delete mode 100644 src/xml/xml.pri diff --git a/Valentina.pro b/Valentina.pro index a3d4f4742..65d926226 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -1,216 +1,2 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-06-18T12:36:43 -# -#------------------------------------------------- - -# Use out-of-source builds (shadow builds) - -QT += core gui widgets xml svg printsupport xmlpatterns - -TEMPLATE = app - -TARGET = valentina - -CONFIG -= debug_and_release debug_and_release_target -CONFIG += c++11 - -#DEFINES += ... - -# directory for executable file -DESTDIR = bin - -# files created moc -MOC_DIR = moc - -# objecs files -OBJECTS_DIR = obj - -# files created rcc -RCC_DIR = rcc - -# files created uic -UI_DIR = uic - -include(src/src.pri) -include(src/container/container.pri) -include(src/dialogs/dialogs.pri) -include(src/exception/exception.pri) -include(src/geometry/geometry.pri) -include(src/tools/tools.pri) -include(src/widgets/widgets.pri) -include(src/xml/xml.pri) - -RESOURCES += \ - share/resources/icon.qrc \ - share/resources/cursor.qrc \ - share/resources/theme.qrc \ - share/resources/schema.qrc - -OTHER_FILES += share/resources/valentina.rc \ - share/resources/icon/64x64/icon64x64.ico - -TRANSLATIONS += share/translations/valentina.ts \ - share/translations/valentina_ru.ts \ - share/translations/valentina_uk.ts \ - share/translations/valentina_de.ts \ - share/translations/valentina_cs.ts \ - share/translations/valentina_he_IL.ts \ - share/translations/valentina_fr.ts - -unix { -QMAKE_CXX = ccache g++ -} - -CONFIG += precompile_header -# Precompiled headers (PCH) -PRECOMPILED_HEADER = src/stable.h -win32-msvc* { - PRECOMPILED_SOURCE = src/stable.cpp -} - -CONFIG(debug, debug|release){ - # Debug - unix { - *-g++{ - QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ - -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ - -isystem "/usr/include/qt5/QtCore" -isystem "$${UI_DIR}" -isystem "$${MOC_DIR}" \ - -isystem "$${RCC_DIR}" \ - -O0 -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \ - -Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self -Wstack-protector \ - -Wunreachable-code -Wcast-align -Wcast-qual -Wdisabled-optimization -Wfloat-equal \ - -Wformat=2 -Wimport \ - -Winvalid-pch -Wunsafe-loop-optimizations -Wlong-long -Wmissing-format-attribute \ - -Wmissing-include-dirs -Wpacked -Wredundant-decls -Winline \ - -Wswitch-default -Wswitch-enum -Wuninitialized -Wvariadic-macros \ - -Wlogical-op -Wnoexcept -Wmissing-noreturn -Wpointer-arith\ - -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wno-unused -gdwarf-3 - -ftrapv - } - } else { - *-g++{#Don't use additional GCC keys on Windows system. - QMAKE_CXXFLAGS += -O0 -Wall -Wextra -pedantic - } - } -}else{ - # Release - *-g++{ - QMAKE_CXXFLAGS += -O2 - } - - DEFINES += QT_NO_DEBUG_OUTPUT -} - -message(Qt version: $$[QT_VERSION]) -message(Qt is installed in $$[QT_INSTALL_PREFIX]) -message(Qt resources can be found in the following locations:) -message(Documentation: $$[QT_INSTALL_DOCS]) -message(Header files: $$[QT_INSTALL_HEADERS]) -message(Libraries: $$[QT_INSTALL_LIBS]) -message(Binary files (executables): $$[QT_INSTALL_BINS]) -message(Plugins: $$[QT_INSTALL_PLUGINS]) -message(Data files: $$[QT_INSTALL_DATA]) -message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) -message(Settings: $$[QT_INSTALL_SETTINGS]) -message(Examples: $$[QT_INSTALL_EXAMPLES]) - -win32:RC_FILE = share/resources/valentina.rc - -# Remove generated files at cleaning -QMAKE_DISTCLEAN += $${DESTDIR}/* \ - $${OBJECTS_DIR}/* \ - $${UI_DIR}/* \ - $${MOC_DIR}/* \ - $${RCC_DIR}/* \ - $$PWD/share/translations/valentina_*.qm - -INSTALL_TRANSLATIONS += share/translations/valentina_ru.qm \ - share/translations/valentina_uk.qm \ - share/translations/valentina_de.qm \ - share/translations/valentina_cs.qm \ - share/translations/valentina_he_IL.qm \ - share/translations/valentina_fr.qm - -INSTALL_STANDARD_MEASHUREMENTS += share/tables/standard/GOST_man_ru.vst - -INSTALL_INDIVIDUAL_MEASHUREMENTS += share/tables/individual/indivindual_ru.vit - -unix { -#VARIABLES -isEmpty(PREFIX) { - PREFIX = /usr -} -BINDIR = $$PREFIX/bin -DATADIR =$$PREFIX/share -DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" -#MAKE INSTALL -target.path = $$BINDIR -desktop.path = $$DATADIR/applications/ -desktop.files += dist/$${TARGET}.desktop -pixmaps.path = $$DATADIR/pixmaps/ -pixmaps.files += dist/$${TARGET}.png -translations.path = $$DATADIR/$${TARGET}/translations/ -translations.files = $$INSTALL_TRANSLATIONS -standard.path = $$DATADIR/$${TARGET}/tables/standard/ -standard.files = $$INSTALL_STANDARD_MEASHUREMENTS -individual.path = $$DATADIR/$${TARGET}/tables/individual/ -individual.files = $$INSTALL_INDIVIDUAL_MEASHUREMENTS -INSTALLS += target \ - desktop \ - pixmaps \ - translations \ - standard \ - individual -} - -!isEmpty(TRANSLATIONS): { - for(_translation_name, TRANSLATIONS) { - _translation_name_qm = $$section(_translation_name,".", 0, 0).qm - - system($$shell_path($$[QT_INSTALL_BINS]/lrelease) $$shell_path($$PWD/$$_translation_name) -qm $$shell_path($$PWD/$$_translation_name_qm)) - } -} - -# Copies the given files to the destination directory -defineTest(copyToDestdir) { - files = $$1 - DDIR = $$2 - mkpath($$DDIR) - - for(FILE, files) { - - # Replace slashes in paths with backslashes for Windows - win32{ - FILE ~= s,/,\\,g - DDIR ~= s,/,\\,g - } - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) - } - - export(QMAKE_POST_LINK) -} - -for(DIR, INSTALL_TRANSLATIONS) { - #add these absolute paths to a variable which - #ends up as 'mkcommands = path1 path2 path3 ...' - tr_path += $$PWD/$$DIR -} - -copyToDestdir($$tr_path, $$shell_path($$OUT_PWD/$$DESTDIR/translations)) - -for(DIR, INSTALL_STANDARD_MEASHUREMENTS) { - #add these absolute paths to a variable which - #ends up as 'mkcommands = path1 path2 path3 ...' - st_path += $$PWD/$$DIR -} - -copyToDestdir($$st_path, $$shell_path($$OUT_PWD/$$DESTDIR/tables/standard)) - -for(DIR, INSTALL_INDIVIDUAL_MEASHUREMENTS) { - #add these absolute paths to a variable which - #ends up as 'mkcommands = path1 path2 path3 ...' - ind_path += $$PWD/$$DIR -} - -copyToDestdir($$ind_path, $$shell_path($$OUT_PWD/$$DESTDIR/tables/individual)) +TEMPLATE = subdirs +SUBDIRS = src diff --git a/dist/copyright_template.txt b/dist/copyright_template.txt new file mode 100644 index 000000000..9339f95da --- /dev/null +++ b/dist/copyright_template.txt @@ -0,0 +1,27 @@ +/************************************************************************ + ** + ** @file %FILENAME% + ** @author Roman Telezhinsky + ** @date %DAY% %MONTH%, %YEAR% + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ diff --git a/src/app/app.pri b/src/app/app.pri new file mode 100644 index 000000000..dedc86004 --- /dev/null +++ b/src/app/app.pri @@ -0,0 +1,234 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2013-06-18T12:36:43 +# +#------------------------------------------------- + +# Use out-of-source builds (shadow builds) + +QT += core gui widgets xml svg printsupport xmlpatterns + +TEMPLATE = app + +TARGET = valentina + +CONFIG -= debug_and_release debug_and_release_target +CONFIG += c++11 + +#DEFINES += ... + +# directory for executable file +DESTDIR = bin + +# files created moc +MOC_DIR = moc + +# objecs files +OBJECTS_DIR = obj + +# files created rcc +RCC_DIR = rcc + +# files created uic +UI_DIR = uic + +include(src/app/container/container.pri) +include(src/app/dialogs/dialogs.pri) +include(src/app/exception/exception.pri) +include(src/app/geometry/geometry.pri) +include(src/app/tools/tools.pri) +include(src/app/widgets/widgets.pri) +include(src/app/xml/xml.pri) + +SOURCES += \ + src/app/main.cpp \ + src/app/mainwindow.cpp \ + src/app/tablewindow.cpp \ + src/app/stable.cpp \ + src/app/version.cpp + +HEADERS += \ + src/app/mainwindow.h \ + src/app/options.h \ + src/app/tablewindow.h \ + src/app/stable.h \ + src/app/version.h + +FORMS += \ + src/app/mainwindow.ui \ + src/app/tablewindow.ui + +RESOURCES += \ + share/resources/icon.qrc \ + share/resources/cursor.qrc \ + share/resources/theme.qrc \ + share/resources/schema.qrc + +OTHER_FILES += share/resources/valentina.rc \ + share/resources/icon/64x64/icon64x64.ico + +TRANSLATIONS += share/translations/valentina.ts \ + share/translations/valentina_ru.ts \ + share/translations/valentina_uk.ts \ + share/translations/valentina_de.ts \ + share/translations/valentina_cs.ts \ + share/translations/valentina_he_IL.ts \ + share/translations/valentina_fr.ts + +unix { +QMAKE_CXX = ccache g++ +} + +CONFIG += precompile_header +# Precompiled headers (PCH) +PRECOMPILED_HEADER = src/stable.h +win32-msvc* { + PRECOMPILED_SOURCE = src/stable.cpp +} + +CONFIG(debug, debug|release){ + # Debug + unix { + *-g++{ + QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ + -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ + -isystem "/usr/include/qt5/QtCore" -isystem "$${UI_DIR}" -isystem "$${MOC_DIR}" \ + -isystem "$${RCC_DIR}" \ + -O0 -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \ + -Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self -Wstack-protector \ + -Wunreachable-code -Wcast-align -Wcast-qual -Wdisabled-optimization -Wfloat-equal \ + -Wformat=2 -Wimport \ + -Winvalid-pch -Wunsafe-loop-optimizations -Wlong-long -Wmissing-format-attribute \ + -Wmissing-include-dirs -Wpacked -Wredundant-decls -Winline \ + -Wswitch-default -Wswitch-enum -Wuninitialized -Wvariadic-macros \ + -Wlogical-op -Wnoexcept -Wmissing-noreturn -Wpointer-arith\ + -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wno-unused -gdwarf-3 + -ftrapv + } + } else { + *-g++{#Don't use additional GCC keys on Windows system. + QMAKE_CXXFLAGS += -O0 -Wall -Wextra -pedantic + } + } +}else{ + # Release + *-g++{ + QMAKE_CXXFLAGS += -O2 + } + + DEFINES += QT_NO_DEBUG_OUTPUT +} + +message(Qt version: $$[QT_VERSION]) +message(Qt is installed in $$[QT_INSTALL_PREFIX]) +message(Qt resources can be found in the following locations:) +message(Documentation: $$[QT_INSTALL_DOCS]) +message(Header files: $$[QT_INSTALL_HEADERS]) +message(Libraries: $$[QT_INSTALL_LIBS]) +message(Binary files (executables): $$[QT_INSTALL_BINS]) +message(Plugins: $$[QT_INSTALL_PLUGINS]) +message(Data files: $$[QT_INSTALL_DATA]) +message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) +message(Settings: $$[QT_INSTALL_SETTINGS]) +message(Examples: $$[QT_INSTALL_EXAMPLES]) + +win32:RC_FILE = share/resources/valentina.rc + +# Remove generated files at cleaning +QMAKE_DISTCLEAN += $${DESTDIR}/* \ + $${OBJECTS_DIR}/* \ + $${UI_DIR}/* \ + $${MOC_DIR}/* \ + $${RCC_DIR}/* \ + $$PWD/share/translations/valentina_*.qm + +INSTALL_TRANSLATIONS += share/translations/valentina_ru.qm \ + share/translations/valentina_uk.qm \ + share/translations/valentina_de.qm \ + share/translations/valentina_cs.qm \ + share/translations/valentina_he_IL.qm \ + share/translations/valentina_fr.qm + +INSTALL_STANDARD_MEASHUREMENTS += share/tables/standard/GOST_man_ru.vst + +INSTALL_INDIVIDUAL_MEASHUREMENTS += share/tables/individual/indivindual_ru.vit + +unix { +#VARIABLES +isEmpty(PREFIX) { + PREFIX = /usr +} +BINDIR = $$PREFIX/bin +DATADIR =$$PREFIX/share +DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" +#MAKE INSTALL +target.path = $$BINDIR +desktop.path = $$DATADIR/applications/ +desktop.files += dist/$${TARGET}.desktop +pixmaps.path = $$DATADIR/pixmaps/ +pixmaps.files += dist/$${TARGET}.png +translations.path = $$DATADIR/$${TARGET}/translations/ +translations.files = $$INSTALL_TRANSLATIONS +standard.path = $$DATADIR/$${TARGET}/tables/standard/ +standard.files = $$INSTALL_STANDARD_MEASHUREMENTS +individual.path = $$DATADIR/$${TARGET}/tables/individual/ +individual.files = $$INSTALL_INDIVIDUAL_MEASHUREMENTS +INSTALLS += target \ + desktop \ + pixmaps \ + translations \ + standard \ + individual +} + +!isEmpty(TRANSLATIONS): { + for(_translation_name, TRANSLATIONS) { + _translation_name_qm = $$section(_translation_name,".", 0, 0).qm + + system($$shell_path($$[QT_INSTALL_BINS]/lrelease) $$shell_path($$PWD/$$_translation_name) -qm $$shell_path($$PWD/$$_translation_name_qm)) + } +} + +# Copies the given files to the destination directory +defineTest(copyToDestdir) { + files = $$1 + DDIR = $$2 + mkpath($$DDIR) + + for(FILE, files) { + + # Replace slashes in paths with backslashes for Windows + win32{ + FILE ~= s,/,\\,g + DDIR ~= s,/,\\,g + } + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) + } + + export(QMAKE_POST_LINK) +} + +for(DIR, INSTALL_TRANSLATIONS) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + tr_path += $$PWD/$$DIR +} + +copyToDestdir($$tr_path, $$shell_path($$OUT_PWD/$$DESTDIR/translations)) + +for(DIR, INSTALL_STANDARD_MEASHUREMENTS) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + st_path += $$PWD/$$DIR +} + +copyToDestdir($$st_path, $$shell_path($$OUT_PWD/$$DESTDIR/tables/standard)) + +for(DIR, INSTALL_INDIVIDUAL_MEASHUREMENTS) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + ind_path += $$PWD/$$DIR +} + +copyToDestdir($$ind_path, $$shell_path($$OUT_PWD/$$DESTDIR/tables/individual)) + diff --git a/src/app/app.pro b/src/app/app.pro new file mode 100644 index 000000000..f691e6641 --- /dev/null +++ b/src/app/app.pro @@ -0,0 +1,234 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2013-06-18T12:36:43 +# +#------------------------------------------------- + +# Use out-of-source builds (shadow builds) + +QT += core gui widgets xml svg printsupport xmlpatterns + +TEMPLATE = app + +TARGET = valentina + +CONFIG -= debug_and_release debug_and_release_target +CONFIG += c++11 + +#DEFINES += ... + +# directory for executable file +DESTDIR = bin + +# files created moc +MOC_DIR = moc + +# objecs files +OBJECTS_DIR = obj + +# files created rcc +RCC_DIR = rcc + +# files created uic +UI_DIR = uic + +include(container/container.pri) +include(dialogs/dialogs.pri) +include(exception/exception.pri) +include(geometry/geometry.pri) +include(tools/tools.pri) +include(widgets/widgets.pri) +include(xml/xml.pri) + +SOURCES += \ + main.cpp \ + mainwindow.cpp \ + tablewindow.cpp \ + stable.cpp \ + version.cpp + +HEADERS += \ + mainwindow.h \ + options.h \ + tablewindow.h \ + stable.h \ + version.h + +FORMS += \ + mainwindow.ui \ + tablewindow.ui + +RESOURCES += \ + share/resources/icon.qrc \ + share/resources/cursor.qrc \ + share/resources/theme.qrc \ + share/resources/schema.qrc + +OTHER_FILES += share/resources/valentina.rc \ + share/resources/icon/64x64/icon64x64.ico + +TRANSLATIONS += share/translations/valentina.ts \ + share/translations/valentina_ru.ts \ + share/translations/valentina_uk.ts \ + share/translations/valentina_de.ts \ + share/translations/valentina_cs.ts \ + share/translations/valentina_he_IL.ts \ + share/translations/valentina_fr.ts + +unix { +QMAKE_CXX = ccache g++ +} + +CONFIG += precompile_header +# Precompiled headers (PCH) +PRECOMPILED_HEADER = stable.h +win32-msvc* { + PRECOMPILED_SOURCE = stable.cpp +} + +CONFIG(debug, debug|release){ + # Debug + unix { + *-g++{ + QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ + -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ + -isystem "/usr/include/qt5/QtCore" -isystem "$${UI_DIR}" -isystem "$${MOC_DIR}" \ + -isystem "$${RCC_DIR}" \ + -O0 -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \ + -Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self -Wstack-protector \ + -Wunreachable-code -Wcast-align -Wcast-qual -Wdisabled-optimization -Wfloat-equal \ + -Wformat=2 -Wimport \ + -Winvalid-pch -Wunsafe-loop-optimizations -Wlong-long -Wmissing-format-attribute \ + -Wmissing-include-dirs -Wpacked -Wredundant-decls -Winline \ + -Wswitch-default -Wswitch-enum -Wuninitialized -Wvariadic-macros \ + -Wlogical-op -Wnoexcept -Wmissing-noreturn -Wpointer-arith\ + -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wno-unused -gdwarf-3 + -ftrapv + } + } else { + *-g++{#Don't use additional GCC keys on Windows system. + QMAKE_CXXFLAGS += -O0 -Wall -Wextra -pedantic + } + } +}else{ + # Release + *-g++{ + QMAKE_CXXFLAGS += -O2 + } + + DEFINES += QT_NO_DEBUG_OUTPUT +} + +message(Qt version: $$[QT_VERSION]) +message(Qt is installed in $$[QT_INSTALL_PREFIX]) +message(Qt resources can be found in the following locations:) +message(Documentation: $$[QT_INSTALL_DOCS]) +message(Header files: $$[QT_INSTALL_HEADERS]) +message(Libraries: $$[QT_INSTALL_LIBS]) +message(Binary files (executables): $$[QT_INSTALL_BINS]) +message(Plugins: $$[QT_INSTALL_PLUGINS]) +message(Data files: $$[QT_INSTALL_DATA]) +message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) +message(Settings: $$[QT_INSTALL_SETTINGS]) +message(Examples: $$[QT_INSTALL_EXAMPLES]) + +win32:RC_FILE = share/resources/valentina.rc + +# Remove generated files at cleaning +QMAKE_DISTCLEAN += $${DESTDIR}/* \ + $${OBJECTS_DIR}/* \ + $${UI_DIR}/* \ + $${MOC_DIR}/* \ + $${RCC_DIR}/* \ + $$PWD/share/translations/valentina_*.qm + +INSTALL_TRANSLATIONS += share/translations/valentina_ru.qm \ + share/translations/valentina_uk.qm \ + share/translations/valentina_de.qm \ + share/translations/valentina_cs.qm \ + share/translations/valentina_he_IL.qm \ + share/translations/valentina_fr.qm + +INSTALL_STANDARD_MEASHUREMENTS += share/tables/standard/GOST_man_ru.vst + +INSTALL_INDIVIDUAL_MEASHUREMENTS += share/tables/individual/indivindual_ru.vit + +unix { +#VARIABLES +isEmpty(PREFIX) { + PREFIX = /usr +} +BINDIR = $$PREFIX/bin +DATADIR =$$PREFIX/share +DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" +#MAKE INSTALL +target.path = $$BINDIR +desktop.path = $$DATADIR/applications/ +desktop.files += dist/$${TARGET}.desktop +pixmaps.path = $$DATADIR/pixmaps/ +pixmaps.files += dist/$${TARGET}.png +translations.path = $$DATADIR/$${TARGET}/translations/ +translations.files = $$INSTALL_TRANSLATIONS +standard.path = $$DATADIR/$${TARGET}/tables/standard/ +standard.files = $$INSTALL_STANDARD_MEASHUREMENTS +individual.path = $$DATADIR/$${TARGET}/tables/individual/ +individual.files = $$INSTALL_INDIVIDUAL_MEASHUREMENTS +INSTALLS += target \ + desktop \ + pixmaps \ + translations \ + standard \ + individual +} + +!isEmpty(TRANSLATIONS): { + for(_translation_name, TRANSLATIONS) { + _translation_name_qm = $$section(_translation_name,".", 0, 0).qm + + system($$shell_path($$[QT_INSTALL_BINS]/lrelease) $$shell_path($$PWD/$$_translation_name) -qm $$shell_path($$PWD/$$_translation_name_qm)) + } +} + +# Copies the given files to the destination directory +defineTest(copyToDestdir) { + files = $$1 + DDIR = $$2 + mkpath($$DDIR) + + for(FILE, files) { + + # Replace slashes in paths with backslashes for Windows + win32{ + FILE ~= s,/,\\,g + DDIR ~= s,/,\\,g + } + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) + } + + export(QMAKE_POST_LINK) +} + +for(DIR, INSTALL_TRANSLATIONS) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + tr_path += $$PWD/$$DIR +} + +copyToDestdir($$tr_path, $$shell_path($$OUT_PWD/$$DESTDIR/translations)) + +for(DIR, INSTALL_STANDARD_MEASHUREMENTS) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + st_path += $$PWD/$$DIR +} + +copyToDestdir($$st_path, $$shell_path($$OUT_PWD/$$DESTDIR/tables/standard)) + +for(DIR, INSTALL_INDIVIDUAL_MEASHUREMENTS) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + ind_path += $$PWD/$$DIR +} + +copyToDestdir($$ind_path, $$shell_path($$OUT_PWD/$$DESTDIR/tables/individual)) + diff --git a/src/container/calculator.cpp b/src/app/container/calculator.cpp similarity index 100% rename from src/container/calculator.cpp rename to src/app/container/calculator.cpp diff --git a/src/container/calculator.h b/src/app/container/calculator.h similarity index 100% rename from src/container/calculator.h rename to src/app/container/calculator.h diff --git a/src/app/container/container.pri b/src/app/container/container.pri new file mode 100644 index 000000000..ffbefb2cf --- /dev/null +++ b/src/app/container/container.pri @@ -0,0 +1,11 @@ +SOURCES += \ + container/vcontainer.cpp \ + container/calculator.cpp \ + container/vmeasurement.cpp \ + container/vincrement.cpp + +HEADERS += \ + container/vcontainer.h \ + container/calculator.h \ + container/vmeasurement.h \ + container/vincrement.h diff --git a/src/container/vcontainer.cpp b/src/app/container/vcontainer.cpp similarity index 100% rename from src/container/vcontainer.cpp rename to src/app/container/vcontainer.cpp diff --git a/src/container/vcontainer.h b/src/app/container/vcontainer.h similarity index 100% rename from src/container/vcontainer.h rename to src/app/container/vcontainer.h diff --git a/src/container/vincrement.cpp b/src/app/container/vincrement.cpp similarity index 100% rename from src/container/vincrement.cpp rename to src/app/container/vincrement.cpp diff --git a/src/container/vincrement.h b/src/app/container/vincrement.h similarity index 100% rename from src/container/vincrement.h rename to src/app/container/vincrement.h diff --git a/src/container/vmeasurement.cpp b/src/app/container/vmeasurement.cpp similarity index 100% rename from src/container/vmeasurement.cpp rename to src/app/container/vmeasurement.cpp diff --git a/src/container/vmeasurement.h b/src/app/container/vmeasurement.h similarity index 100% rename from src/container/vmeasurement.h rename to src/app/container/vmeasurement.h diff --git a/src/dialogs/app/configdialog.cpp b/src/app/dialogs/app/configdialog.cpp similarity index 100% rename from src/dialogs/app/configdialog.cpp rename to src/app/dialogs/app/configdialog.cpp diff --git a/src/dialogs/app/configdialog.h b/src/app/dialogs/app/configdialog.h similarity index 100% rename from src/dialogs/app/configdialog.h rename to src/app/dialogs/app/configdialog.h diff --git a/src/dialogs/app/dialoghistory.cpp b/src/app/dialogs/app/dialoghistory.cpp similarity index 100% rename from src/dialogs/app/dialoghistory.cpp rename to src/app/dialogs/app/dialoghistory.cpp diff --git a/src/dialogs/app/dialoghistory.h b/src/app/dialogs/app/dialoghistory.h similarity index 100% rename from src/dialogs/app/dialoghistory.h rename to src/app/dialogs/app/dialoghistory.h diff --git a/src/dialogs/app/dialoghistory.ui b/src/app/dialogs/app/dialoghistory.ui similarity index 100% rename from src/dialogs/app/dialoghistory.ui rename to src/app/dialogs/app/dialoghistory.ui diff --git a/src/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp similarity index 100% rename from src/dialogs/app/dialogincrements.cpp rename to src/app/dialogs/app/dialogincrements.cpp diff --git a/src/dialogs/app/dialogincrements.h b/src/app/dialogs/app/dialogincrements.h similarity index 100% rename from src/dialogs/app/dialogincrements.h rename to src/app/dialogs/app/dialogincrements.h diff --git a/src/dialogs/app/dialogincrements.ui b/src/app/dialogs/app/dialogincrements.ui similarity index 100% rename from src/dialogs/app/dialogincrements.ui rename to src/app/dialogs/app/dialogincrements.ui diff --git a/src/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp similarity index 100% rename from src/dialogs/app/dialogindividualmeasurements.cpp rename to src/app/dialogs/app/dialogindividualmeasurements.cpp diff --git a/src/dialogs/app/dialogindividualmeasurements.h b/src/app/dialogs/app/dialogindividualmeasurements.h similarity index 100% rename from src/dialogs/app/dialogindividualmeasurements.h rename to src/app/dialogs/app/dialogindividualmeasurements.h diff --git a/src/dialogs/app/dialogindividualmeasurements.ui b/src/app/dialogs/app/dialogindividualmeasurements.ui similarity index 100% rename from src/dialogs/app/dialogindividualmeasurements.ui rename to src/app/dialogs/app/dialogindividualmeasurements.ui diff --git a/src/dialogs/app/dialogmeasurements.cpp b/src/app/dialogs/app/dialogmeasurements.cpp similarity index 100% rename from src/dialogs/app/dialogmeasurements.cpp rename to src/app/dialogs/app/dialogmeasurements.cpp diff --git a/src/dialogs/app/dialogmeasurements.h b/src/app/dialogs/app/dialogmeasurements.h similarity index 100% rename from src/dialogs/app/dialogmeasurements.h rename to src/app/dialogs/app/dialogmeasurements.h diff --git a/src/dialogs/app/dialogmeasurements.ui b/src/app/dialogs/app/dialogmeasurements.ui similarity index 100% rename from src/dialogs/app/dialogmeasurements.ui rename to src/app/dialogs/app/dialogmeasurements.ui diff --git a/src/dialogs/app/dialogpatternproperties.cpp b/src/app/dialogs/app/dialogpatternproperties.cpp similarity index 100% rename from src/dialogs/app/dialogpatternproperties.cpp rename to src/app/dialogs/app/dialogpatternproperties.cpp diff --git a/src/dialogs/app/dialogpatternproperties.h b/src/app/dialogs/app/dialogpatternproperties.h similarity index 100% rename from src/dialogs/app/dialogpatternproperties.h rename to src/app/dialogs/app/dialogpatternproperties.h diff --git a/src/dialogs/app/dialogpatternproperties.ui b/src/app/dialogs/app/dialogpatternproperties.ui similarity index 100% rename from src/dialogs/app/dialogpatternproperties.ui rename to src/app/dialogs/app/dialogpatternproperties.ui diff --git a/src/dialogs/app/dialogstandardmeasurements.cpp b/src/app/dialogs/app/dialogstandardmeasurements.cpp similarity index 100% rename from src/dialogs/app/dialogstandardmeasurements.cpp rename to src/app/dialogs/app/dialogstandardmeasurements.cpp diff --git a/src/dialogs/app/dialogstandardmeasurements.h b/src/app/dialogs/app/dialogstandardmeasurements.h similarity index 100% rename from src/dialogs/app/dialogstandardmeasurements.h rename to src/app/dialogs/app/dialogstandardmeasurements.h diff --git a/src/dialogs/app/dialogstandardmeasurements.ui b/src/app/dialogs/app/dialogstandardmeasurements.ui similarity index 100% rename from src/dialogs/app/dialogstandardmeasurements.ui rename to src/app/dialogs/app/dialogstandardmeasurements.ui diff --git a/src/dialogs/app/pages.cpp b/src/app/dialogs/app/pages.cpp similarity index 100% rename from src/dialogs/app/pages.cpp rename to src/app/dialogs/app/pages.cpp diff --git a/src/dialogs/app/pages.h b/src/app/dialogs/app/pages.h similarity index 100% rename from src/dialogs/app/pages.h rename to src/app/dialogs/app/pages.h diff --git a/src/dialogs/dialogs.h b/src/app/dialogs/dialogs.h similarity index 100% rename from src/dialogs/dialogs.h rename to src/app/dialogs/dialogs.h diff --git a/src/app/dialogs/dialogs.pri b/src/app/dialogs/dialogs.pri new file mode 100644 index 000000000..7cb2470bf --- /dev/null +++ b/src/app/dialogs/dialogs.pri @@ -0,0 +1,90 @@ +HEADERS += \ + dialogs/dialogs.h \ + dialogs/tools/dialogtriangle.h \ + dialogs/tools/dialogtool.h \ + dialogs/tools/dialogsplinepath.h \ + dialogs/tools/dialogspline.h \ + dialogs/tools/dialogsinglepoint.h \ + dialogs/tools/dialogshoulderpoint.h \ + dialogs/tools/dialogpointofintersection.h \ + dialogs/tools/dialogpointofcontact.h \ + dialogs/tools/dialognormal.h \ + dialogs/tools/dialoglineintersect.h \ + dialogs/tools/dialogline.h \ + dialogs/tools/dialogheight.h \ + dialogs/tools/dialogendline.h \ + dialogs/tools/dialogdetail.h \ + dialogs/tools/dialogbisector.h \ + dialogs/tools/dialogarc.h \ + dialogs/tools/dialogalongline.h \ + dialogs/tools/dialogcutspline.h \ + dialogs/tools/dialogcutsplinepath.h \ + dialogs/tools/dialoguniondetails.h \ + dialogs/tools/dialogcutarc.h \ + dialogs/app/dialogincrements.h \ + dialogs/app/dialoghistory.h \ + dialogs/app/configdialog.h \ + dialogs/app/pages.h \ + dialogs/app/dialogpatternproperties.h \ + dialogs/app/dialogmeasurements.h \ + dialogs/app/dialogstandardmeasurements.h \ + dialogs/app/dialogindividualmeasurements.h + +SOURCES += \ + dialogs/tools/dialogtriangle.cpp \ + dialogs/tools/dialogtool.cpp \ + dialogs/tools/dialogsplinepath.cpp \ + dialogs/tools/dialogspline.cpp \ + dialogs/tools/dialogsinglepoint.cpp \ + dialogs/tools/dialogshoulderpoint.cpp \ + dialogs/tools/dialogpointofintersection.cpp \ + dialogs/tools/dialogpointofcontact.cpp \ + dialogs/tools/dialognormal.cpp \ + dialogs/tools/dialoglineintersect.cpp \ + dialogs/tools/dialogline.cpp \ + dialogs/tools/dialogheight.cpp \ + dialogs/tools/dialogendline.cpp \ + dialogs/tools/dialogdetail.cpp \ + dialogs/tools/dialogbisector.cpp \ + dialogs/tools/dialogarc.cpp \ + dialogs/tools/dialogalongline.cpp \ + dialogs/tools/dialogcutspline.cpp \ + dialogs/tools/dialogcutsplinepath.cpp \ + dialogs/tools/dialoguniondetails.cpp \ + dialogs/tools/dialogcutarc.cpp \ + dialogs/app/dialogincrements.cpp \ + dialogs/app/dialoghistory.cpp \ + dialogs/app/configdialog.cpp \ + dialogs/app/pages.cpp \ + dialogs/app/dialogpatternproperties.cpp \ + dialogs/app/dialogmeasurements.cpp \ + dialogs/app/dialogstandardmeasurements.cpp \ + dialogs/app/dialogindividualmeasurements.cpp + +FORMS += \ + dialogs/tools/dialogtriangle.ui \ + dialogs/tools/dialogsplinepath.ui \ + dialogs/tools/dialogspline.ui \ + dialogs/tools/dialogsinglepoint.ui \ + dialogs/tools/dialogshoulderpoint.ui \ + dialogs/tools/dialogpointofintersection.ui \ + dialogs/tools/dialogpointofcontact.ui \ + dialogs/tools/dialognormal.ui \ + dialogs/tools/dialoglineintersect.ui \ + dialogs/tools/dialogline.ui \ + dialogs/tools/dialogheight.ui \ + dialogs/tools/dialogendline.ui \ + dialogs/tools/dialogdetail.ui \ + dialogs/tools/dialogbisector.ui \ + dialogs/tools/dialogarc.ui \ + dialogs/tools/dialogalongline.ui \ + dialogs/tools/dialogcutspline.ui \ + dialogs/tools/dialogcutsplinepath.ui \ + dialogs/tools/dialoguniondetails.ui \ + dialogs/tools/dialogcutarc.ui \ + dialogs/app/dialogincrements.ui \ + dialogs/app/dialoghistory.ui \ + dialogs/app/dialogpatternproperties.ui \ + dialogs/app/dialogmeasurements.ui \ + dialogs/app/dialogstandardmeasurements.ui \ + dialogs/app/dialogindividualmeasurements.ui diff --git a/src/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp similarity index 100% rename from src/dialogs/tools/dialogalongline.cpp rename to src/app/dialogs/tools/dialogalongline.cpp diff --git a/src/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h similarity index 100% rename from src/dialogs/tools/dialogalongline.h rename to src/app/dialogs/tools/dialogalongline.h diff --git a/src/dialogs/tools/dialogalongline.ui b/src/app/dialogs/tools/dialogalongline.ui similarity index 100% rename from src/dialogs/tools/dialogalongline.ui rename to src/app/dialogs/tools/dialogalongline.ui diff --git a/src/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp similarity index 100% rename from src/dialogs/tools/dialogarc.cpp rename to src/app/dialogs/tools/dialogarc.cpp diff --git a/src/dialogs/tools/dialogarc.h b/src/app/dialogs/tools/dialogarc.h similarity index 100% rename from src/dialogs/tools/dialogarc.h rename to src/app/dialogs/tools/dialogarc.h diff --git a/src/dialogs/tools/dialogarc.ui b/src/app/dialogs/tools/dialogarc.ui similarity index 100% rename from src/dialogs/tools/dialogarc.ui rename to src/app/dialogs/tools/dialogarc.ui diff --git a/src/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp similarity index 100% rename from src/dialogs/tools/dialogbisector.cpp rename to src/app/dialogs/tools/dialogbisector.cpp diff --git a/src/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h similarity index 100% rename from src/dialogs/tools/dialogbisector.h rename to src/app/dialogs/tools/dialogbisector.h diff --git a/src/dialogs/tools/dialogbisector.ui b/src/app/dialogs/tools/dialogbisector.ui similarity index 100% rename from src/dialogs/tools/dialogbisector.ui rename to src/app/dialogs/tools/dialogbisector.ui diff --git a/src/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp similarity index 100% rename from src/dialogs/tools/dialogcutarc.cpp rename to src/app/dialogs/tools/dialogcutarc.cpp diff --git a/src/dialogs/tools/dialogcutarc.h b/src/app/dialogs/tools/dialogcutarc.h similarity index 100% rename from src/dialogs/tools/dialogcutarc.h rename to src/app/dialogs/tools/dialogcutarc.h diff --git a/src/dialogs/tools/dialogcutarc.ui b/src/app/dialogs/tools/dialogcutarc.ui similarity index 100% rename from src/dialogs/tools/dialogcutarc.ui rename to src/app/dialogs/tools/dialogcutarc.ui diff --git a/src/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp similarity index 100% rename from src/dialogs/tools/dialogcutspline.cpp rename to src/app/dialogs/tools/dialogcutspline.cpp diff --git a/src/dialogs/tools/dialogcutspline.h b/src/app/dialogs/tools/dialogcutspline.h similarity index 100% rename from src/dialogs/tools/dialogcutspline.h rename to src/app/dialogs/tools/dialogcutspline.h diff --git a/src/dialogs/tools/dialogcutspline.ui b/src/app/dialogs/tools/dialogcutspline.ui similarity index 100% rename from src/dialogs/tools/dialogcutspline.ui rename to src/app/dialogs/tools/dialogcutspline.ui diff --git a/src/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp similarity index 100% rename from src/dialogs/tools/dialogcutsplinepath.cpp rename to src/app/dialogs/tools/dialogcutsplinepath.cpp diff --git a/src/dialogs/tools/dialogcutsplinepath.h b/src/app/dialogs/tools/dialogcutsplinepath.h similarity index 100% rename from src/dialogs/tools/dialogcutsplinepath.h rename to src/app/dialogs/tools/dialogcutsplinepath.h diff --git a/src/dialogs/tools/dialogcutsplinepath.ui b/src/app/dialogs/tools/dialogcutsplinepath.ui similarity index 100% rename from src/dialogs/tools/dialogcutsplinepath.ui rename to src/app/dialogs/tools/dialogcutsplinepath.ui diff --git a/src/dialogs/tools/dialogdetail.cpp b/src/app/dialogs/tools/dialogdetail.cpp similarity index 100% rename from src/dialogs/tools/dialogdetail.cpp rename to src/app/dialogs/tools/dialogdetail.cpp diff --git a/src/dialogs/tools/dialogdetail.h b/src/app/dialogs/tools/dialogdetail.h similarity index 100% rename from src/dialogs/tools/dialogdetail.h rename to src/app/dialogs/tools/dialogdetail.h diff --git a/src/dialogs/tools/dialogdetail.ui b/src/app/dialogs/tools/dialogdetail.ui similarity index 100% rename from src/dialogs/tools/dialogdetail.ui rename to src/app/dialogs/tools/dialogdetail.ui diff --git a/src/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp similarity index 100% rename from src/dialogs/tools/dialogendline.cpp rename to src/app/dialogs/tools/dialogendline.cpp diff --git a/src/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h similarity index 100% rename from src/dialogs/tools/dialogendline.h rename to src/app/dialogs/tools/dialogendline.h diff --git a/src/dialogs/tools/dialogendline.ui b/src/app/dialogs/tools/dialogendline.ui similarity index 100% rename from src/dialogs/tools/dialogendline.ui rename to src/app/dialogs/tools/dialogendline.ui diff --git a/src/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp similarity index 100% rename from src/dialogs/tools/dialogheight.cpp rename to src/app/dialogs/tools/dialogheight.cpp diff --git a/src/dialogs/tools/dialogheight.h b/src/app/dialogs/tools/dialogheight.h similarity index 100% rename from src/dialogs/tools/dialogheight.h rename to src/app/dialogs/tools/dialogheight.h diff --git a/src/dialogs/tools/dialogheight.ui b/src/app/dialogs/tools/dialogheight.ui similarity index 100% rename from src/dialogs/tools/dialogheight.ui rename to src/app/dialogs/tools/dialogheight.ui diff --git a/src/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp similarity index 100% rename from src/dialogs/tools/dialogline.cpp rename to src/app/dialogs/tools/dialogline.cpp diff --git a/src/dialogs/tools/dialogline.h b/src/app/dialogs/tools/dialogline.h similarity index 100% rename from src/dialogs/tools/dialogline.h rename to src/app/dialogs/tools/dialogline.h diff --git a/src/dialogs/tools/dialogline.ui b/src/app/dialogs/tools/dialogline.ui similarity index 100% rename from src/dialogs/tools/dialogline.ui rename to src/app/dialogs/tools/dialogline.ui diff --git a/src/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp similarity index 100% rename from src/dialogs/tools/dialoglineintersect.cpp rename to src/app/dialogs/tools/dialoglineintersect.cpp diff --git a/src/dialogs/tools/dialoglineintersect.h b/src/app/dialogs/tools/dialoglineintersect.h similarity index 100% rename from src/dialogs/tools/dialoglineintersect.h rename to src/app/dialogs/tools/dialoglineintersect.h diff --git a/src/dialogs/tools/dialoglineintersect.ui b/src/app/dialogs/tools/dialoglineintersect.ui similarity index 100% rename from src/dialogs/tools/dialoglineintersect.ui rename to src/app/dialogs/tools/dialoglineintersect.ui diff --git a/src/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp similarity index 100% rename from src/dialogs/tools/dialognormal.cpp rename to src/app/dialogs/tools/dialognormal.cpp diff --git a/src/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h similarity index 100% rename from src/dialogs/tools/dialognormal.h rename to src/app/dialogs/tools/dialognormal.h diff --git a/src/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui similarity index 100% rename from src/dialogs/tools/dialognormal.ui rename to src/app/dialogs/tools/dialognormal.ui diff --git a/src/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp similarity index 100% rename from src/dialogs/tools/dialogpointofcontact.cpp rename to src/app/dialogs/tools/dialogpointofcontact.cpp diff --git a/src/dialogs/tools/dialogpointofcontact.h b/src/app/dialogs/tools/dialogpointofcontact.h similarity index 100% rename from src/dialogs/tools/dialogpointofcontact.h rename to src/app/dialogs/tools/dialogpointofcontact.h diff --git a/src/dialogs/tools/dialogpointofcontact.ui b/src/app/dialogs/tools/dialogpointofcontact.ui similarity index 100% rename from src/dialogs/tools/dialogpointofcontact.ui rename to src/app/dialogs/tools/dialogpointofcontact.ui diff --git a/src/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp similarity index 100% rename from src/dialogs/tools/dialogpointofintersection.cpp rename to src/app/dialogs/tools/dialogpointofintersection.cpp diff --git a/src/dialogs/tools/dialogpointofintersection.h b/src/app/dialogs/tools/dialogpointofintersection.h similarity index 100% rename from src/dialogs/tools/dialogpointofintersection.h rename to src/app/dialogs/tools/dialogpointofintersection.h diff --git a/src/dialogs/tools/dialogpointofintersection.ui b/src/app/dialogs/tools/dialogpointofintersection.ui similarity index 100% rename from src/dialogs/tools/dialogpointofintersection.ui rename to src/app/dialogs/tools/dialogpointofintersection.ui diff --git a/src/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp similarity index 100% rename from src/dialogs/tools/dialogshoulderpoint.cpp rename to src/app/dialogs/tools/dialogshoulderpoint.cpp diff --git a/src/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h similarity index 100% rename from src/dialogs/tools/dialogshoulderpoint.h rename to src/app/dialogs/tools/dialogshoulderpoint.h diff --git a/src/dialogs/tools/dialogshoulderpoint.ui b/src/app/dialogs/tools/dialogshoulderpoint.ui similarity index 100% rename from src/dialogs/tools/dialogshoulderpoint.ui rename to src/app/dialogs/tools/dialogshoulderpoint.ui diff --git a/src/dialogs/tools/dialogsinglepoint.cpp b/src/app/dialogs/tools/dialogsinglepoint.cpp similarity index 100% rename from src/dialogs/tools/dialogsinglepoint.cpp rename to src/app/dialogs/tools/dialogsinglepoint.cpp diff --git a/src/dialogs/tools/dialogsinglepoint.h b/src/app/dialogs/tools/dialogsinglepoint.h similarity index 100% rename from src/dialogs/tools/dialogsinglepoint.h rename to src/app/dialogs/tools/dialogsinglepoint.h diff --git a/src/dialogs/tools/dialogsinglepoint.ui b/src/app/dialogs/tools/dialogsinglepoint.ui similarity index 100% rename from src/dialogs/tools/dialogsinglepoint.ui rename to src/app/dialogs/tools/dialogsinglepoint.ui diff --git a/src/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp similarity index 100% rename from src/dialogs/tools/dialogspline.cpp rename to src/app/dialogs/tools/dialogspline.cpp diff --git a/src/dialogs/tools/dialogspline.h b/src/app/dialogs/tools/dialogspline.h similarity index 100% rename from src/dialogs/tools/dialogspline.h rename to src/app/dialogs/tools/dialogspline.h diff --git a/src/dialogs/tools/dialogspline.ui b/src/app/dialogs/tools/dialogspline.ui similarity index 100% rename from src/dialogs/tools/dialogspline.ui rename to src/app/dialogs/tools/dialogspline.ui diff --git a/src/dialogs/tools/dialogsplinepath.cpp b/src/app/dialogs/tools/dialogsplinepath.cpp similarity index 100% rename from src/dialogs/tools/dialogsplinepath.cpp rename to src/app/dialogs/tools/dialogsplinepath.cpp diff --git a/src/dialogs/tools/dialogsplinepath.h b/src/app/dialogs/tools/dialogsplinepath.h similarity index 100% rename from src/dialogs/tools/dialogsplinepath.h rename to src/app/dialogs/tools/dialogsplinepath.h diff --git a/src/dialogs/tools/dialogsplinepath.ui b/src/app/dialogs/tools/dialogsplinepath.ui similarity index 100% rename from src/dialogs/tools/dialogsplinepath.ui rename to src/app/dialogs/tools/dialogsplinepath.ui diff --git a/src/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp similarity index 100% rename from src/dialogs/tools/dialogtool.cpp rename to src/app/dialogs/tools/dialogtool.cpp diff --git a/src/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h similarity index 100% rename from src/dialogs/tools/dialogtool.h rename to src/app/dialogs/tools/dialogtool.h diff --git a/src/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp similarity index 100% rename from src/dialogs/tools/dialogtriangle.cpp rename to src/app/dialogs/tools/dialogtriangle.cpp diff --git a/src/dialogs/tools/dialogtriangle.h b/src/app/dialogs/tools/dialogtriangle.h similarity index 100% rename from src/dialogs/tools/dialogtriangle.h rename to src/app/dialogs/tools/dialogtriangle.h diff --git a/src/dialogs/tools/dialogtriangle.ui b/src/app/dialogs/tools/dialogtriangle.ui similarity index 100% rename from src/dialogs/tools/dialogtriangle.ui rename to src/app/dialogs/tools/dialogtriangle.ui diff --git a/src/dialogs/tools/dialoguniondetails.cpp b/src/app/dialogs/tools/dialoguniondetails.cpp similarity index 100% rename from src/dialogs/tools/dialoguniondetails.cpp rename to src/app/dialogs/tools/dialoguniondetails.cpp diff --git a/src/dialogs/tools/dialoguniondetails.h b/src/app/dialogs/tools/dialoguniondetails.h similarity index 100% rename from src/dialogs/tools/dialoguniondetails.h rename to src/app/dialogs/tools/dialoguniondetails.h diff --git a/src/dialogs/tools/dialoguniondetails.ui b/src/app/dialogs/tools/dialoguniondetails.ui similarity index 100% rename from src/dialogs/tools/dialoguniondetails.ui rename to src/app/dialogs/tools/dialoguniondetails.ui diff --git a/src/app/exception/exception.pri b/src/app/exception/exception.pri new file mode 100644 index 000000000..d78a7f862 --- /dev/null +++ b/src/app/exception/exception.pri @@ -0,0 +1,15 @@ +HEADERS += \ + exception/vexceptionobjecterror.h \ + exception/vexceptionemptyparameter.h \ + exception/vexceptionconversionerror.h \ + exception/vexceptionbadid.h \ + exception/vexception.h \ + exception/vexceptionwrongid.h + +SOURCES += \ + exception/vexceptionobjecterror.cpp \ + exception/vexceptionemptyparameter.cpp \ + exception/vexceptionconversionerror.cpp \ + exception/vexceptionbadid.cpp \ + exception/vexception.cpp \ + exception/vexceptionwrongid.cpp diff --git a/src/exception/vexception.cpp b/src/app/exception/vexception.cpp similarity index 100% rename from src/exception/vexception.cpp rename to src/app/exception/vexception.cpp diff --git a/src/exception/vexception.h b/src/app/exception/vexception.h similarity index 100% rename from src/exception/vexception.h rename to src/app/exception/vexception.h diff --git a/src/exception/vexceptionbadid.cpp b/src/app/exception/vexceptionbadid.cpp similarity index 100% rename from src/exception/vexceptionbadid.cpp rename to src/app/exception/vexceptionbadid.cpp diff --git a/src/exception/vexceptionbadid.h b/src/app/exception/vexceptionbadid.h similarity index 100% rename from src/exception/vexceptionbadid.h rename to src/app/exception/vexceptionbadid.h diff --git a/src/exception/vexceptionconversionerror.cpp b/src/app/exception/vexceptionconversionerror.cpp similarity index 100% rename from src/exception/vexceptionconversionerror.cpp rename to src/app/exception/vexceptionconversionerror.cpp diff --git a/src/exception/vexceptionconversionerror.h b/src/app/exception/vexceptionconversionerror.h similarity index 100% rename from src/exception/vexceptionconversionerror.h rename to src/app/exception/vexceptionconversionerror.h diff --git a/src/exception/vexceptionemptyparameter.cpp b/src/app/exception/vexceptionemptyparameter.cpp similarity index 100% rename from src/exception/vexceptionemptyparameter.cpp rename to src/app/exception/vexceptionemptyparameter.cpp diff --git a/src/exception/vexceptionemptyparameter.h b/src/app/exception/vexceptionemptyparameter.h similarity index 100% rename from src/exception/vexceptionemptyparameter.h rename to src/app/exception/vexceptionemptyparameter.h diff --git a/src/exception/vexceptionobjecterror.cpp b/src/app/exception/vexceptionobjecterror.cpp similarity index 100% rename from src/exception/vexceptionobjecterror.cpp rename to src/app/exception/vexceptionobjecterror.cpp diff --git a/src/exception/vexceptionobjecterror.h b/src/app/exception/vexceptionobjecterror.h similarity index 100% rename from src/exception/vexceptionobjecterror.h rename to src/app/exception/vexceptionobjecterror.h diff --git a/src/exception/vexceptionwrongid.cpp b/src/app/exception/vexceptionwrongid.cpp similarity index 100% rename from src/exception/vexceptionwrongid.cpp rename to src/app/exception/vexceptionwrongid.cpp diff --git a/src/exception/vexceptionwrongid.h b/src/app/exception/vexceptionwrongid.h similarity index 100% rename from src/exception/vexceptionwrongid.h rename to src/app/exception/vexceptionwrongid.h diff --git a/src/app/geometry/geometry.pri b/src/app/geometry/geometry.pri new file mode 100644 index 000000000..a56d4f80e --- /dev/null +++ b/src/app/geometry/geometry.pri @@ -0,0 +1,21 @@ +HEADERS += \ + geometry/vsplinepoint.h \ + geometry/vsplinepath.h \ + geometry/vspline.h \ + geometry/vnodedetail.h \ + geometry/vdetail.h \ + geometry/varc.h \ + geometry/vgobject.h \ + geometry/vpointf.h \ + geometry/vequidistant.h + +SOURCES += \ + geometry/vsplinepoint.cpp \ + geometry/vsplinepath.cpp \ + geometry/vspline.cpp \ + geometry/vnodedetail.cpp \ + geometry/vdetail.cpp \ + geometry/varc.cpp \ + geometry/vgobject.cpp \ + geometry/vpointf.cpp \ + geometry/vequidistant.cpp diff --git a/src/geometry/varc.cpp b/src/app/geometry/varc.cpp similarity index 100% rename from src/geometry/varc.cpp rename to src/app/geometry/varc.cpp diff --git a/src/geometry/varc.h b/src/app/geometry/varc.h similarity index 100% rename from src/geometry/varc.h rename to src/app/geometry/varc.h diff --git a/src/geometry/vdetail.cpp b/src/app/geometry/vdetail.cpp similarity index 100% rename from src/geometry/vdetail.cpp rename to src/app/geometry/vdetail.cpp diff --git a/src/geometry/vdetail.h b/src/app/geometry/vdetail.h similarity index 100% rename from src/geometry/vdetail.h rename to src/app/geometry/vdetail.h diff --git a/src/geometry/vequidistant.cpp b/src/app/geometry/vequidistant.cpp similarity index 100% rename from src/geometry/vequidistant.cpp rename to src/app/geometry/vequidistant.cpp diff --git a/src/geometry/vequidistant.h b/src/app/geometry/vequidistant.h similarity index 100% rename from src/geometry/vequidistant.h rename to src/app/geometry/vequidistant.h diff --git a/src/geometry/vgobject.cpp b/src/app/geometry/vgobject.cpp similarity index 100% rename from src/geometry/vgobject.cpp rename to src/app/geometry/vgobject.cpp diff --git a/src/geometry/vgobject.h b/src/app/geometry/vgobject.h similarity index 100% rename from src/geometry/vgobject.h rename to src/app/geometry/vgobject.h diff --git a/src/geometry/vnodedetail.cpp b/src/app/geometry/vnodedetail.cpp similarity index 100% rename from src/geometry/vnodedetail.cpp rename to src/app/geometry/vnodedetail.cpp diff --git a/src/geometry/vnodedetail.h b/src/app/geometry/vnodedetail.h similarity index 100% rename from src/geometry/vnodedetail.h rename to src/app/geometry/vnodedetail.h diff --git a/src/geometry/vpointf.cpp b/src/app/geometry/vpointf.cpp similarity index 100% rename from src/geometry/vpointf.cpp rename to src/app/geometry/vpointf.cpp diff --git a/src/geometry/vpointf.h b/src/app/geometry/vpointf.h similarity index 100% rename from src/geometry/vpointf.h rename to src/app/geometry/vpointf.h diff --git a/src/geometry/vspline.cpp b/src/app/geometry/vspline.cpp similarity index 100% rename from src/geometry/vspline.cpp rename to src/app/geometry/vspline.cpp diff --git a/src/geometry/vspline.h b/src/app/geometry/vspline.h similarity index 100% rename from src/geometry/vspline.h rename to src/app/geometry/vspline.h diff --git a/src/geometry/vsplinepath.cpp b/src/app/geometry/vsplinepath.cpp similarity index 100% rename from src/geometry/vsplinepath.cpp rename to src/app/geometry/vsplinepath.cpp diff --git a/src/geometry/vsplinepath.h b/src/app/geometry/vsplinepath.h similarity index 100% rename from src/geometry/vsplinepath.h rename to src/app/geometry/vsplinepath.h diff --git a/src/geometry/vsplinepoint.cpp b/src/app/geometry/vsplinepoint.cpp similarity index 100% rename from src/geometry/vsplinepoint.cpp rename to src/app/geometry/vsplinepoint.cpp diff --git a/src/geometry/vsplinepoint.h b/src/app/geometry/vsplinepoint.h similarity index 100% rename from src/geometry/vsplinepoint.h rename to src/app/geometry/vsplinepoint.h diff --git a/src/main.cpp b/src/app/main.cpp similarity index 100% rename from src/main.cpp rename to src/app/main.cpp diff --git a/src/mainwindow.cpp b/src/app/mainwindow.cpp similarity index 100% rename from src/mainwindow.cpp rename to src/app/mainwindow.cpp diff --git a/src/mainwindow.h b/src/app/mainwindow.h similarity index 100% rename from src/mainwindow.h rename to src/app/mainwindow.h diff --git a/src/mainwindow.ui b/src/app/mainwindow.ui similarity index 100% rename from src/mainwindow.ui rename to src/app/mainwindow.ui diff --git a/src/options.h b/src/app/options.h similarity index 100% rename from src/options.h rename to src/app/options.h diff --git a/share/resources/cursor.qrc b/src/app/share/resources/cursor.qrc similarity index 100% rename from share/resources/cursor.qrc rename to src/app/share/resources/cursor.qrc diff --git a/share/resources/cursor/alongline_cursor.png b/src/app/share/resources/cursor/alongline_cursor.png similarity index 100% rename from share/resources/cursor/alongline_cursor.png rename to src/app/share/resources/cursor/alongline_cursor.png diff --git a/share/resources/cursor/arc_cursor.png b/src/app/share/resources/cursor/arc_cursor.png similarity index 100% rename from share/resources/cursor/arc_cursor.png rename to src/app/share/resources/cursor/arc_cursor.png diff --git a/share/resources/cursor/arc_cut_cursor.png b/src/app/share/resources/cursor/arc_cut_cursor.png similarity index 100% rename from share/resources/cursor/arc_cut_cursor.png rename to src/app/share/resources/cursor/arc_cut_cursor.png diff --git a/share/resources/cursor/bisector_cursor.png b/src/app/share/resources/cursor/bisector_cursor.png similarity index 100% rename from share/resources/cursor/bisector_cursor.png rename to src/app/share/resources/cursor/bisector_cursor.png diff --git a/share/resources/cursor/endline_cursor.png b/src/app/share/resources/cursor/endline_cursor.png similarity index 100% rename from share/resources/cursor/endline_cursor.png rename to src/app/share/resources/cursor/endline_cursor.png diff --git a/share/resources/cursor/height_cursor.png b/src/app/share/resources/cursor/height_cursor.png similarity index 100% rename from share/resources/cursor/height_cursor.png rename to src/app/share/resources/cursor/height_cursor.png diff --git a/share/resources/cursor/intersect_cursor.png b/src/app/share/resources/cursor/intersect_cursor.png similarity index 100% rename from share/resources/cursor/intersect_cursor.png rename to src/app/share/resources/cursor/intersect_cursor.png diff --git a/share/resources/cursor/line_cursor.png b/src/app/share/resources/cursor/line_cursor.png similarity index 100% rename from share/resources/cursor/line_cursor.png rename to src/app/share/resources/cursor/line_cursor.png diff --git a/share/resources/cursor/new_detail_cursor.png b/src/app/share/resources/cursor/new_detail_cursor.png similarity index 100% rename from share/resources/cursor/new_detail_cursor.png rename to src/app/share/resources/cursor/new_detail_cursor.png diff --git a/share/resources/cursor/normal_cursor.png b/src/app/share/resources/cursor/normal_cursor.png similarity index 100% rename from share/resources/cursor/normal_cursor.png rename to src/app/share/resources/cursor/normal_cursor.png diff --git a/share/resources/cursor/pointcontact_cursor.png b/src/app/share/resources/cursor/pointcontact_cursor.png similarity index 100% rename from share/resources/cursor/pointcontact_cursor.png rename to src/app/share/resources/cursor/pointcontact_cursor.png diff --git a/share/resources/cursor/pointofintersect_cursor.png b/src/app/share/resources/cursor/pointofintersect_cursor.png similarity index 100% rename from share/resources/cursor/pointofintersect_cursor.png rename to src/app/share/resources/cursor/pointofintersect_cursor.png diff --git a/share/resources/cursor/shoulder_cursor.png b/src/app/share/resources/cursor/shoulder_cursor.png similarity index 100% rename from share/resources/cursor/shoulder_cursor.png rename to src/app/share/resources/cursor/shoulder_cursor.png diff --git a/share/resources/cursor/spline_cursor.png b/src/app/share/resources/cursor/spline_cursor.png similarity index 100% rename from share/resources/cursor/spline_cursor.png rename to src/app/share/resources/cursor/spline_cursor.png diff --git a/share/resources/cursor/spline_cut_point_cursor.png b/src/app/share/resources/cursor/spline_cut_point_cursor.png similarity index 100% rename from share/resources/cursor/spline_cut_point_cursor.png rename to src/app/share/resources/cursor/spline_cut_point_cursor.png diff --git a/share/resources/cursor/splinepath_cursor.png b/src/app/share/resources/cursor/splinepath_cursor.png similarity index 100% rename from share/resources/cursor/splinepath_cursor.png rename to src/app/share/resources/cursor/splinepath_cursor.png diff --git a/share/resources/cursor/splinepath_cut_point_cursor.png b/src/app/share/resources/cursor/splinepath_cut_point_cursor.png similarity index 100% rename from share/resources/cursor/splinepath_cut_point_cursor.png rename to src/app/share/resources/cursor/splinepath_cut_point_cursor.png diff --git a/share/resources/cursor/triangle_cursor.png b/src/app/share/resources/cursor/triangle_cursor.png similarity index 100% rename from share/resources/cursor/triangle_cursor.png rename to src/app/share/resources/cursor/triangle_cursor.png diff --git a/share/resources/cursor/union_cursor.png b/src/app/share/resources/cursor/union_cursor.png similarity index 100% rename from share/resources/cursor/union_cursor.png rename to src/app/share/resources/cursor/union_cursor.png diff --git a/share/resources/icon.qrc b/src/app/share/resources/icon.qrc similarity index 100% rename from share/resources/icon.qrc rename to src/app/share/resources/icon.qrc diff --git a/share/resources/icon/16x16/mirror.png b/src/app/share/resources/icon/16x16/mirror.png similarity index 100% rename from share/resources/icon/16x16/mirror.png rename to src/app/share/resources/icon/16x16/mirror.png diff --git a/share/resources/icon/24x24/arrowDown.png b/src/app/share/resources/icon/24x24/arrowDown.png similarity index 100% rename from share/resources/icon/24x24/arrowDown.png rename to src/app/share/resources/icon/24x24/arrowDown.png diff --git a/share/resources/icon/24x24/arrowLeft.png b/src/app/share/resources/icon/24x24/arrowLeft.png similarity index 100% rename from share/resources/icon/24x24/arrowLeft.png rename to src/app/share/resources/icon/24x24/arrowLeft.png diff --git a/share/resources/icon/24x24/arrowLeftDown.png b/src/app/share/resources/icon/24x24/arrowLeftDown.png similarity index 100% rename from share/resources/icon/24x24/arrowLeftDown.png rename to src/app/share/resources/icon/24x24/arrowLeftDown.png diff --git a/share/resources/icon/24x24/arrowLeftUp.png b/src/app/share/resources/icon/24x24/arrowLeftUp.png similarity index 100% rename from share/resources/icon/24x24/arrowLeftUp.png rename to src/app/share/resources/icon/24x24/arrowLeftUp.png diff --git a/share/resources/icon/24x24/arrowRight.png b/src/app/share/resources/icon/24x24/arrowRight.png similarity index 100% rename from share/resources/icon/24x24/arrowRight.png rename to src/app/share/resources/icon/24x24/arrowRight.png diff --git a/share/resources/icon/24x24/arrowRightDown.png b/src/app/share/resources/icon/24x24/arrowRightDown.png similarity index 100% rename from share/resources/icon/24x24/arrowRightDown.png rename to src/app/share/resources/icon/24x24/arrowRightDown.png diff --git a/share/resources/icon/24x24/arrowRightUp.png b/src/app/share/resources/icon/24x24/arrowRightUp.png similarity index 100% rename from share/resources/icon/24x24/arrowRightUp.png rename to src/app/share/resources/icon/24x24/arrowRightUp.png diff --git a/share/resources/icon/24x24/arrowUp.png b/src/app/share/resources/icon/24x24/arrowUp.png similarity index 100% rename from share/resources/icon/24x24/arrowUp.png rename to src/app/share/resources/icon/24x24/arrowUp.png diff --git a/share/resources/icon/24x24/equal.png b/src/app/share/resources/icon/24x24/equal.png similarity index 100% rename from share/resources/icon/24x24/equal.png rename to src/app/share/resources/icon/24x24/equal.png diff --git a/share/resources/icon/24x24/putHere.png b/src/app/share/resources/icon/24x24/putHere.png similarity index 100% rename from share/resources/icon/24x24/putHere.png rename to src/app/share/resources/icon/24x24/putHere.png diff --git a/share/resources/icon/24x24/putHereLeft.png b/src/app/share/resources/icon/24x24/putHereLeft.png similarity index 100% rename from share/resources/icon/24x24/putHereLeft.png rename to src/app/share/resources/icon/24x24/putHereLeft.png diff --git a/share/resources/icon/32x32/along_line.png b/src/app/share/resources/icon/32x32/along_line.png similarity index 100% rename from share/resources/icon/32x32/along_line.png rename to src/app/share/resources/icon/32x32/along_line.png diff --git a/share/resources/icon/32x32/arc.png b/src/app/share/resources/icon/32x32/arc.png similarity index 100% rename from share/resources/icon/32x32/arc.png rename to src/app/share/resources/icon/32x32/arc.png diff --git a/share/resources/icon/32x32/arc_cut.png b/src/app/share/resources/icon/32x32/arc_cut.png similarity index 100% rename from share/resources/icon/32x32/arc_cut.png rename to src/app/share/resources/icon/32x32/arc_cut.png diff --git a/share/resources/icon/32x32/arrow_cursor.png b/src/app/share/resources/icon/32x32/arrow_cursor.png similarity index 100% rename from share/resources/icon/32x32/arrow_cursor.png rename to src/app/share/resources/icon/32x32/arrow_cursor.png diff --git a/share/resources/icon/32x32/bisector.png b/src/app/share/resources/icon/32x32/bisector.png similarity index 100% rename from share/resources/icon/32x32/bisector.png rename to src/app/share/resources/icon/32x32/bisector.png diff --git a/share/resources/icon/32x32/draw.png b/src/app/share/resources/icon/32x32/draw.png similarity index 100% rename from share/resources/icon/32x32/draw.png rename to src/app/share/resources/icon/32x32/draw.png diff --git a/share/resources/icon/32x32/height.png b/src/app/share/resources/icon/32x32/height.png similarity index 100% rename from share/resources/icon/32x32/height.png rename to src/app/share/resources/icon/32x32/height.png diff --git a/share/resources/icon/32x32/history.png b/src/app/share/resources/icon/32x32/history.png similarity index 100% rename from share/resources/icon/32x32/history.png rename to src/app/share/resources/icon/32x32/history.png diff --git a/share/resources/icon/32x32/intersect.png b/src/app/share/resources/icon/32x32/intersect.png similarity index 100% rename from share/resources/icon/32x32/intersect.png rename to src/app/share/resources/icon/32x32/intersect.png diff --git a/share/resources/icon/32x32/kontur.png b/src/app/share/resources/icon/32x32/kontur.png similarity index 100% rename from share/resources/icon/32x32/kontur.png rename to src/app/share/resources/icon/32x32/kontur.png diff --git a/share/resources/icon/32x32/layout.png b/src/app/share/resources/icon/32x32/layout.png similarity index 100% rename from share/resources/icon/32x32/layout.png rename to src/app/share/resources/icon/32x32/layout.png diff --git a/share/resources/icon/32x32/line.png b/src/app/share/resources/icon/32x32/line.png similarity index 100% rename from share/resources/icon/32x32/line.png rename to src/app/share/resources/icon/32x32/line.png diff --git a/share/resources/icon/32x32/new_detail.png b/src/app/share/resources/icon/32x32/new_detail.png similarity index 100% rename from share/resources/icon/32x32/new_detail.png rename to src/app/share/resources/icon/32x32/new_detail.png diff --git a/share/resources/icon/32x32/new_draw.png b/src/app/share/resources/icon/32x32/new_draw.png similarity index 100% rename from share/resources/icon/32x32/new_draw.png rename to src/app/share/resources/icon/32x32/new_draw.png diff --git a/share/resources/icon/32x32/normal.png b/src/app/share/resources/icon/32x32/normal.png similarity index 100% rename from share/resources/icon/32x32/normal.png rename to src/app/share/resources/icon/32x32/normal.png diff --git a/share/resources/icon/32x32/option_draw.png b/src/app/share/resources/icon/32x32/option_draw.png similarity index 100% rename from share/resources/icon/32x32/option_draw.png rename to src/app/share/resources/icon/32x32/option_draw.png diff --git a/share/resources/icon/32x32/point_of_contact.png b/src/app/share/resources/icon/32x32/point_of_contact.png similarity index 100% rename from share/resources/icon/32x32/point_of_contact.png rename to src/app/share/resources/icon/32x32/point_of_contact.png diff --git a/share/resources/icon/32x32/point_of_intersection.png b/src/app/share/resources/icon/32x32/point_of_intersection.png similarity index 100% rename from share/resources/icon/32x32/point_of_intersection.png rename to src/app/share/resources/icon/32x32/point_of_intersection.png diff --git a/share/resources/icon/32x32/put_after.png b/src/app/share/resources/icon/32x32/put_after.png similarity index 100% rename from share/resources/icon/32x32/put_after.png rename to src/app/share/resources/icon/32x32/put_after.png diff --git a/share/resources/icon/32x32/segment.png b/src/app/share/resources/icon/32x32/segment.png similarity index 100% rename from share/resources/icon/32x32/segment.png rename to src/app/share/resources/icon/32x32/segment.png diff --git a/share/resources/icon/32x32/shoulder.png b/src/app/share/resources/icon/32x32/shoulder.png similarity index 100% rename from share/resources/icon/32x32/shoulder.png rename to src/app/share/resources/icon/32x32/shoulder.png diff --git a/share/resources/icon/32x32/spline.png b/src/app/share/resources/icon/32x32/spline.png similarity index 100% rename from share/resources/icon/32x32/spline.png rename to src/app/share/resources/icon/32x32/spline.png diff --git a/share/resources/icon/32x32/splinePath.png b/src/app/share/resources/icon/32x32/splinePath.png similarity index 100% rename from share/resources/icon/32x32/splinePath.png rename to src/app/share/resources/icon/32x32/splinePath.png diff --git a/share/resources/icon/32x32/splinePath_cut_point.png b/src/app/share/resources/icon/32x32/splinePath_cut_point.png similarity index 100% rename from share/resources/icon/32x32/splinePath_cut_point.png rename to src/app/share/resources/icon/32x32/splinePath_cut_point.png diff --git a/share/resources/icon/32x32/spline_cut_point.png b/src/app/share/resources/icon/32x32/spline_cut_point.png similarity index 100% rename from share/resources/icon/32x32/spline_cut_point.png rename to src/app/share/resources/icon/32x32/spline_cut_point.png diff --git a/share/resources/icon/32x32/table.png b/src/app/share/resources/icon/32x32/table.png similarity index 100% rename from share/resources/icon/32x32/table.png rename to src/app/share/resources/icon/32x32/table.png diff --git a/share/resources/icon/32x32/triangle.png b/src/app/share/resources/icon/32x32/triangle.png similarity index 100% rename from share/resources/icon/32x32/triangle.png rename to src/app/share/resources/icon/32x32/triangle.png diff --git a/share/resources/icon/32x32/union.png b/src/app/share/resources/icon/32x32/union.png similarity index 100% rename from share/resources/icon/32x32/union.png rename to src/app/share/resources/icon/32x32/union.png diff --git a/share/resources/icon/64x64/icon64x64.ico b/src/app/share/resources/icon/64x64/icon64x64.ico similarity index 100% rename from share/resources/icon/64x64/icon64x64.ico rename to src/app/share/resources/icon/64x64/icon64x64.ico diff --git a/share/resources/icon/64x64/icon64x64.png b/src/app/share/resources/icon/64x64/icon64x64.png similarity index 100% rename from share/resources/icon/64x64/icon64x64.png rename to src/app/share/resources/icon/64x64/icon64x64.png diff --git a/share/resources/icon/Graduation.png b/src/app/share/resources/icon/Graduation.png similarity index 100% rename from share/resources/icon/Graduation.png rename to src/app/share/resources/icon/Graduation.png diff --git a/share/resources/icon/config.png b/src/app/share/resources/icon/config.png similarity index 100% rename from share/resources/icon/config.png rename to src/app/share/resources/icon/config.png diff --git a/share/resources/icon/flags/cs.png b/src/app/share/resources/icon/flags/cs.png similarity index 100% rename from share/resources/icon/flags/cs.png rename to src/app/share/resources/icon/flags/cs.png diff --git a/share/resources/icon/flags/de.png b/src/app/share/resources/icon/flags/de.png similarity index 100% rename from share/resources/icon/flags/de.png rename to src/app/share/resources/icon/flags/de.png diff --git a/share/resources/icon/flags/en.png b/src/app/share/resources/icon/flags/en.png similarity index 100% rename from share/resources/icon/flags/en.png rename to src/app/share/resources/icon/flags/en.png diff --git a/share/resources/icon/flags/fr.png b/src/app/share/resources/icon/flags/fr.png similarity index 100% rename from share/resources/icon/flags/fr.png rename to src/app/share/resources/icon/flags/fr.png diff --git a/share/resources/icon/flags/he_IL.png b/src/app/share/resources/icon/flags/he_IL.png similarity index 100% rename from share/resources/icon/flags/he_IL.png rename to src/app/share/resources/icon/flags/he_IL.png diff --git a/share/resources/icon/flags/ru.png b/src/app/share/resources/icon/flags/ru.png similarity index 100% rename from share/resources/icon/flags/ru.png rename to src/app/share/resources/icon/flags/ru.png diff --git a/share/resources/icon/flags/uk.png b/src/app/share/resources/icon/flags/uk.png similarity index 100% rename from share/resources/icon/flags/uk.png rename to src/app/share/resources/icon/flags/uk.png diff --git a/share/resources/icon/individual.png b/src/app/share/resources/icon/individual.png similarity index 100% rename from share/resources/icon/individual.png rename to src/app/share/resources/icon/individual.png diff --git a/share/resources/icon/logo.svg b/src/app/share/resources/icon/logo.svg similarity index 100% rename from share/resources/icon/logo.svg rename to src/app/share/resources/icon/logo.svg diff --git a/share/resources/icon/pattern_config.png b/src/app/share/resources/icon/pattern_config.png similarity index 100% rename from share/resources/icon/pattern_config.png rename to src/app/share/resources/icon/pattern_config.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/document-new.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-new.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/document-new.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/document-new.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/document-open.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-open.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/document-open.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/document-open.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/document-save.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-save.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/document-save.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/document-save.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/go-next.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/go-next.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/go-next.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/go-next.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/list-add.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/list-add.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/list-add.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/list-add.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/list-remove.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/process-stop.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png diff --git a/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png similarity index 100% rename from share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/document-new.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-new.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/document-new.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/document-new.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/document-open.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-open.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/document-open.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/document-open.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/document-save.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-save.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/document-save.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/document-save.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/go-next.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/go-next.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/list-add.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/list-add.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/list-add.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/list-add.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/list-remove.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/list-remove.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/list-remove.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/list-remove.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/process-stop.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/zoom-in.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-in.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/zoom-in.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-in.png diff --git a/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png similarity index 100% rename from share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png rename to src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/document-new.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-new.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/document-new.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/document-new.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/document-open.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-open.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/document-open.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/document-open.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/document-save.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-save.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/document-save.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/document-save.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/go-next.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-next.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/go-next.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/go-next.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/list-add.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/list-add.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/list-add.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/list-add.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/list-remove.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/list-remove.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/list-remove.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/list-remove.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/process-stop.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png diff --git a/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png similarity index 100% rename from share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png rename to src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png diff --git a/share/resources/icons/win.icon.theme/index.theme b/src/app/share/resources/icons/win.icon.theme/index.theme similarity index 100% rename from share/resources/icons/win.icon.theme/index.theme rename to src/app/share/resources/icons/win.icon.theme/index.theme diff --git a/share/resources/schema.qrc b/src/app/share/resources/schema.qrc similarity index 100% rename from share/resources/schema.qrc rename to src/app/share/resources/schema.qrc diff --git a/share/resources/schema/individual_measurements.xsd b/src/app/share/resources/schema/individual_measurements.xsd similarity index 100% rename from share/resources/schema/individual_measurements.xsd rename to src/app/share/resources/schema/individual_measurements.xsd diff --git a/share/resources/schema/pattern.xsd b/src/app/share/resources/schema/pattern.xsd similarity index 100% rename from share/resources/schema/pattern.xsd rename to src/app/share/resources/schema/pattern.xsd diff --git a/share/resources/schema/standard_measurements.xsd b/src/app/share/resources/schema/standard_measurements.xsd similarity index 100% rename from share/resources/schema/standard_measurements.xsd rename to src/app/share/resources/schema/standard_measurements.xsd diff --git a/share/resources/theme.qrc b/src/app/share/resources/theme.qrc similarity index 100% rename from share/resources/theme.qrc rename to src/app/share/resources/theme.qrc diff --git a/share/resources/valentina.rc b/src/app/share/resources/valentina.rc similarity index 100% rename from share/resources/valentina.rc rename to src/app/share/resources/valentina.rc diff --git a/share/tables/individual/indivindual_ru.vit b/src/app/share/tables/individual/indivindual_ru.vit similarity index 100% rename from share/tables/individual/indivindual_ru.vit rename to src/app/share/tables/individual/indivindual_ru.vit diff --git a/share/tables/standard/GOST_man_ru.vst b/src/app/share/tables/standard/GOST_man_ru.vst similarity index 100% rename from share/tables/standard/GOST_man_ru.vst rename to src/app/share/tables/standard/GOST_man_ru.vst diff --git a/share/translations/valentina.ts b/src/app/share/translations/valentina.ts similarity index 100% rename from share/translations/valentina.ts rename to src/app/share/translations/valentina.ts diff --git a/share/translations/valentina_cs.ts b/src/app/share/translations/valentina_cs.ts similarity index 100% rename from share/translations/valentina_cs.ts rename to src/app/share/translations/valentina_cs.ts diff --git a/share/translations/valentina_de.ts b/src/app/share/translations/valentina_de.ts similarity index 100% rename from share/translations/valentina_de.ts rename to src/app/share/translations/valentina_de.ts diff --git a/share/translations/valentina_fr.ts b/src/app/share/translations/valentina_fr.ts similarity index 100% rename from share/translations/valentina_fr.ts rename to src/app/share/translations/valentina_fr.ts diff --git a/share/translations/valentina_he_IL.ts b/src/app/share/translations/valentina_he_IL.ts similarity index 100% rename from share/translations/valentina_he_IL.ts rename to src/app/share/translations/valentina_he_IL.ts diff --git a/share/translations/valentina_ru.ts b/src/app/share/translations/valentina_ru.ts similarity index 100% rename from share/translations/valentina_ru.ts rename to src/app/share/translations/valentina_ru.ts diff --git a/share/translations/valentina_uk.ts b/src/app/share/translations/valentina_uk.ts similarity index 100% rename from share/translations/valentina_uk.ts rename to src/app/share/translations/valentina_uk.ts diff --git a/src/stable.cpp b/src/app/stable.cpp similarity index 100% rename from src/stable.cpp rename to src/app/stable.cpp diff --git a/src/stable.h b/src/app/stable.h similarity index 100% rename from src/stable.h rename to src/app/stable.h diff --git a/src/tablewindow.cpp b/src/app/tablewindow.cpp similarity index 100% rename from src/tablewindow.cpp rename to src/app/tablewindow.cpp diff --git a/src/tablewindow.h b/src/app/tablewindow.h similarity index 100% rename from src/tablewindow.h rename to src/app/tablewindow.h diff --git a/src/tablewindow.ui b/src/app/tablewindow.ui similarity index 100% rename from src/tablewindow.ui rename to src/app/tablewindow.ui diff --git a/src/tools/drawTools/drawtools.h b/src/app/tools/drawTools/drawtools.h similarity index 100% rename from src/tools/drawTools/drawtools.h rename to src/app/tools/drawTools/drawtools.h diff --git a/src/tools/drawTools/vabstractspline.cpp b/src/app/tools/drawTools/vabstractspline.cpp similarity index 100% rename from src/tools/drawTools/vabstractspline.cpp rename to src/app/tools/drawTools/vabstractspline.cpp diff --git a/src/tools/drawTools/vabstractspline.h b/src/app/tools/drawTools/vabstractspline.h similarity index 100% rename from src/tools/drawTools/vabstractspline.h rename to src/app/tools/drawTools/vabstractspline.h diff --git a/src/tools/drawTools/vdrawtool.cpp b/src/app/tools/drawTools/vdrawtool.cpp similarity index 100% rename from src/tools/drawTools/vdrawtool.cpp rename to src/app/tools/drawTools/vdrawtool.cpp diff --git a/src/tools/drawTools/vdrawtool.h b/src/app/tools/drawTools/vdrawtool.h similarity index 100% rename from src/tools/drawTools/vdrawtool.h rename to src/app/tools/drawTools/vdrawtool.h diff --git a/src/tools/drawTools/vtoolalongline.cpp b/src/app/tools/drawTools/vtoolalongline.cpp similarity index 100% rename from src/tools/drawTools/vtoolalongline.cpp rename to src/app/tools/drawTools/vtoolalongline.cpp diff --git a/src/tools/drawTools/vtoolalongline.h b/src/app/tools/drawTools/vtoolalongline.h similarity index 100% rename from src/tools/drawTools/vtoolalongline.h rename to src/app/tools/drawTools/vtoolalongline.h diff --git a/src/tools/drawTools/vtoolarc.cpp b/src/app/tools/drawTools/vtoolarc.cpp similarity index 100% rename from src/tools/drawTools/vtoolarc.cpp rename to src/app/tools/drawTools/vtoolarc.cpp diff --git a/src/tools/drawTools/vtoolarc.h b/src/app/tools/drawTools/vtoolarc.h similarity index 100% rename from src/tools/drawTools/vtoolarc.h rename to src/app/tools/drawTools/vtoolarc.h diff --git a/src/tools/drawTools/vtoolbisector.cpp b/src/app/tools/drawTools/vtoolbisector.cpp similarity index 100% rename from src/tools/drawTools/vtoolbisector.cpp rename to src/app/tools/drawTools/vtoolbisector.cpp diff --git a/src/tools/drawTools/vtoolbisector.h b/src/app/tools/drawTools/vtoolbisector.h similarity index 100% rename from src/tools/drawTools/vtoolbisector.h rename to src/app/tools/drawTools/vtoolbisector.h diff --git a/src/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp similarity index 100% rename from src/tools/drawTools/vtoolcutarc.cpp rename to src/app/tools/drawTools/vtoolcutarc.cpp diff --git a/src/tools/drawTools/vtoolcutarc.h b/src/app/tools/drawTools/vtoolcutarc.h similarity index 100% rename from src/tools/drawTools/vtoolcutarc.h rename to src/app/tools/drawTools/vtoolcutarc.h diff --git a/src/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp similarity index 100% rename from src/tools/drawTools/vtoolcutspline.cpp rename to src/app/tools/drawTools/vtoolcutspline.cpp diff --git a/src/tools/drawTools/vtoolcutspline.h b/src/app/tools/drawTools/vtoolcutspline.h similarity index 100% rename from src/tools/drawTools/vtoolcutspline.h rename to src/app/tools/drawTools/vtoolcutspline.h diff --git a/src/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp similarity index 100% rename from src/tools/drawTools/vtoolcutsplinepath.cpp rename to src/app/tools/drawTools/vtoolcutsplinepath.cpp diff --git a/src/tools/drawTools/vtoolcutsplinepath.h b/src/app/tools/drawTools/vtoolcutsplinepath.h similarity index 100% rename from src/tools/drawTools/vtoolcutsplinepath.h rename to src/app/tools/drawTools/vtoolcutsplinepath.h diff --git a/src/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp similarity index 100% rename from src/tools/drawTools/vtoolendline.cpp rename to src/app/tools/drawTools/vtoolendline.cpp diff --git a/src/tools/drawTools/vtoolendline.h b/src/app/tools/drawTools/vtoolendline.h similarity index 100% rename from src/tools/drawTools/vtoolendline.h rename to src/app/tools/drawTools/vtoolendline.h diff --git a/src/tools/drawTools/vtoolheight.cpp b/src/app/tools/drawTools/vtoolheight.cpp similarity index 100% rename from src/tools/drawTools/vtoolheight.cpp rename to src/app/tools/drawTools/vtoolheight.cpp diff --git a/src/tools/drawTools/vtoolheight.h b/src/app/tools/drawTools/vtoolheight.h similarity index 100% rename from src/tools/drawTools/vtoolheight.h rename to src/app/tools/drawTools/vtoolheight.h diff --git a/src/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp similarity index 100% rename from src/tools/drawTools/vtoolline.cpp rename to src/app/tools/drawTools/vtoolline.cpp diff --git a/src/tools/drawTools/vtoolline.h b/src/app/tools/drawTools/vtoolline.h similarity index 100% rename from src/tools/drawTools/vtoolline.h rename to src/app/tools/drawTools/vtoolline.h diff --git a/src/tools/drawTools/vtoollineintersect.cpp b/src/app/tools/drawTools/vtoollineintersect.cpp similarity index 100% rename from src/tools/drawTools/vtoollineintersect.cpp rename to src/app/tools/drawTools/vtoollineintersect.cpp diff --git a/src/tools/drawTools/vtoollineintersect.h b/src/app/tools/drawTools/vtoollineintersect.h similarity index 100% rename from src/tools/drawTools/vtoollineintersect.h rename to src/app/tools/drawTools/vtoollineintersect.h diff --git a/src/tools/drawTools/vtoollinepoint.cpp b/src/app/tools/drawTools/vtoollinepoint.cpp similarity index 100% rename from src/tools/drawTools/vtoollinepoint.cpp rename to src/app/tools/drawTools/vtoollinepoint.cpp diff --git a/src/tools/drawTools/vtoollinepoint.h b/src/app/tools/drawTools/vtoollinepoint.h similarity index 100% rename from src/tools/drawTools/vtoollinepoint.h rename to src/app/tools/drawTools/vtoollinepoint.h diff --git a/src/tools/drawTools/vtoolnormal.cpp b/src/app/tools/drawTools/vtoolnormal.cpp similarity index 100% rename from src/tools/drawTools/vtoolnormal.cpp rename to src/app/tools/drawTools/vtoolnormal.cpp diff --git a/src/tools/drawTools/vtoolnormal.h b/src/app/tools/drawTools/vtoolnormal.h similarity index 100% rename from src/tools/drawTools/vtoolnormal.h rename to src/app/tools/drawTools/vtoolnormal.h diff --git a/src/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp similarity index 100% rename from src/tools/drawTools/vtoolpoint.cpp rename to src/app/tools/drawTools/vtoolpoint.cpp diff --git a/src/tools/drawTools/vtoolpoint.h b/src/app/tools/drawTools/vtoolpoint.h similarity index 100% rename from src/tools/drawTools/vtoolpoint.h rename to src/app/tools/drawTools/vtoolpoint.h diff --git a/src/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp similarity index 100% rename from src/tools/drawTools/vtoolpointofcontact.cpp rename to src/app/tools/drawTools/vtoolpointofcontact.cpp diff --git a/src/tools/drawTools/vtoolpointofcontact.h b/src/app/tools/drawTools/vtoolpointofcontact.h similarity index 100% rename from src/tools/drawTools/vtoolpointofcontact.h rename to src/app/tools/drawTools/vtoolpointofcontact.h diff --git a/src/tools/drawTools/vtoolpointofintersection.cpp b/src/app/tools/drawTools/vtoolpointofintersection.cpp similarity index 100% rename from src/tools/drawTools/vtoolpointofintersection.cpp rename to src/app/tools/drawTools/vtoolpointofintersection.cpp diff --git a/src/tools/drawTools/vtoolpointofintersection.h b/src/app/tools/drawTools/vtoolpointofintersection.h similarity index 100% rename from src/tools/drawTools/vtoolpointofintersection.h rename to src/app/tools/drawTools/vtoolpointofintersection.h diff --git a/src/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp similarity index 100% rename from src/tools/drawTools/vtoolshoulderpoint.cpp rename to src/app/tools/drawTools/vtoolshoulderpoint.cpp diff --git a/src/tools/drawTools/vtoolshoulderpoint.h b/src/app/tools/drawTools/vtoolshoulderpoint.h similarity index 100% rename from src/tools/drawTools/vtoolshoulderpoint.h rename to src/app/tools/drawTools/vtoolshoulderpoint.h diff --git a/src/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp similarity index 100% rename from src/tools/drawTools/vtoolsinglepoint.cpp rename to src/app/tools/drawTools/vtoolsinglepoint.cpp diff --git a/src/tools/drawTools/vtoolsinglepoint.h b/src/app/tools/drawTools/vtoolsinglepoint.h similarity index 100% rename from src/tools/drawTools/vtoolsinglepoint.h rename to src/app/tools/drawTools/vtoolsinglepoint.h diff --git a/src/tools/drawTools/vtoolspline.cpp b/src/app/tools/drawTools/vtoolspline.cpp similarity index 100% rename from src/tools/drawTools/vtoolspline.cpp rename to src/app/tools/drawTools/vtoolspline.cpp diff --git a/src/tools/drawTools/vtoolspline.h b/src/app/tools/drawTools/vtoolspline.h similarity index 100% rename from src/tools/drawTools/vtoolspline.h rename to src/app/tools/drawTools/vtoolspline.h diff --git a/src/tools/drawTools/vtoolsplinepath.cpp b/src/app/tools/drawTools/vtoolsplinepath.cpp similarity index 100% rename from src/tools/drawTools/vtoolsplinepath.cpp rename to src/app/tools/drawTools/vtoolsplinepath.cpp diff --git a/src/tools/drawTools/vtoolsplinepath.h b/src/app/tools/drawTools/vtoolsplinepath.h similarity index 100% rename from src/tools/drawTools/vtoolsplinepath.h rename to src/app/tools/drawTools/vtoolsplinepath.h diff --git a/src/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp similarity index 100% rename from src/tools/drawTools/vtooltriangle.cpp rename to src/app/tools/drawTools/vtooltriangle.cpp diff --git a/src/tools/drawTools/vtooltriangle.h b/src/app/tools/drawTools/vtooltriangle.h similarity index 100% rename from src/tools/drawTools/vtooltriangle.h rename to src/app/tools/drawTools/vtooltriangle.h diff --git a/src/tools/nodeDetails/nodedetails.h b/src/app/tools/nodeDetails/nodedetails.h similarity index 100% rename from src/tools/nodeDetails/nodedetails.h rename to src/app/tools/nodeDetails/nodedetails.h diff --git a/src/tools/nodeDetails/vabstractnode.cpp b/src/app/tools/nodeDetails/vabstractnode.cpp similarity index 100% rename from src/tools/nodeDetails/vabstractnode.cpp rename to src/app/tools/nodeDetails/vabstractnode.cpp diff --git a/src/tools/nodeDetails/vabstractnode.h b/src/app/tools/nodeDetails/vabstractnode.h similarity index 100% rename from src/tools/nodeDetails/vabstractnode.h rename to src/app/tools/nodeDetails/vabstractnode.h diff --git a/src/tools/nodeDetails/vnodearc.cpp b/src/app/tools/nodeDetails/vnodearc.cpp similarity index 100% rename from src/tools/nodeDetails/vnodearc.cpp rename to src/app/tools/nodeDetails/vnodearc.cpp diff --git a/src/tools/nodeDetails/vnodearc.h b/src/app/tools/nodeDetails/vnodearc.h similarity index 100% rename from src/tools/nodeDetails/vnodearc.h rename to src/app/tools/nodeDetails/vnodearc.h diff --git a/src/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp similarity index 100% rename from src/tools/nodeDetails/vnodepoint.cpp rename to src/app/tools/nodeDetails/vnodepoint.cpp diff --git a/src/tools/nodeDetails/vnodepoint.h b/src/app/tools/nodeDetails/vnodepoint.h similarity index 100% rename from src/tools/nodeDetails/vnodepoint.h rename to src/app/tools/nodeDetails/vnodepoint.h diff --git a/src/tools/nodeDetails/vnodespline.cpp b/src/app/tools/nodeDetails/vnodespline.cpp similarity index 100% rename from src/tools/nodeDetails/vnodespline.cpp rename to src/app/tools/nodeDetails/vnodespline.cpp diff --git a/src/tools/nodeDetails/vnodespline.h b/src/app/tools/nodeDetails/vnodespline.h similarity index 100% rename from src/tools/nodeDetails/vnodespline.h rename to src/app/tools/nodeDetails/vnodespline.h diff --git a/src/tools/nodeDetails/vnodesplinepath.cpp b/src/app/tools/nodeDetails/vnodesplinepath.cpp similarity index 100% rename from src/tools/nodeDetails/vnodesplinepath.cpp rename to src/app/tools/nodeDetails/vnodesplinepath.cpp diff --git a/src/tools/nodeDetails/vnodesplinepath.h b/src/app/tools/nodeDetails/vnodesplinepath.h similarity index 100% rename from src/tools/nodeDetails/vnodesplinepath.h rename to src/app/tools/nodeDetails/vnodesplinepath.h diff --git a/src/tools/tools.h b/src/app/tools/tools.h similarity index 100% rename from src/tools/tools.h rename to src/app/tools/tools.h diff --git a/src/app/tools/tools.pri b/src/app/tools/tools.pri new file mode 100644 index 000000000..b9786ca3c --- /dev/null +++ b/src/app/tools/tools.pri @@ -0,0 +1,68 @@ +HEADERS += \ + tools/vtooldetail.h \ + tools/vdatatool.h \ + tools/vabstracttool.h \ + tools/tools.h \ + tools/drawTools/vtooltriangle.h \ + tools/drawTools/vtoolsplinepath.h \ + tools/drawTools/vtoolspline.h \ + tools/drawTools/vtoolsinglepoint.h \ + tools/drawTools/vtoolshoulderpoint.h \ + tools/drawTools/vtoolpointofintersection.h \ + tools/drawTools/vtoolpointofcontact.h \ + tools/drawTools/vtoolpoint.h \ + tools/drawTools/vtoolnormal.h \ + tools/drawTools/vtoollinepoint.h \ + tools/drawTools/vtoollineintersect.h \ + tools/drawTools/vtoolline.h \ + tools/drawTools/vtoolheight.h \ + tools/drawTools/vtoolendline.h \ + tools/drawTools/vtoolbisector.h \ + tools/drawTools/vtoolarc.h \ + tools/drawTools/vtoolalongline.h \ + tools/drawTools/vdrawtool.h \ + tools/drawTools/drawtools.h \ + tools/nodeDetails/vnodesplinepath.h \ + tools/nodeDetails/vnodespline.h \ + tools/nodeDetails/vnodepoint.h \ + tools/nodeDetails/vnodearc.h \ + tools/nodeDetails/vabstractnode.h \ + tools/nodeDetails/nodedetails.h \ + tools/drawTools/vtoolcutspline.h \ + tools/drawTools/vtoolcutsplinepath.h \ + tools/vtooluniondetails.h \ + tools/drawTools/vtoolcutarc.h \ + tools/drawTools/vabstractspline.h + +SOURCES += \ + tools/vtooldetail.cpp \ + tools/vdatatool.cpp \ + tools/vabstracttool.cpp \ + tools/drawTools/vtooltriangle.cpp \ + tools/drawTools/vtoolsplinepath.cpp \ + tools/drawTools/vtoolspline.cpp \ + tools/drawTools/vtoolsinglepoint.cpp \ + tools/drawTools/vtoolshoulderpoint.cpp \ + tools/drawTools/vtoolpointofintersection.cpp \ + tools/drawTools/vtoolpointofcontact.cpp \ + tools/drawTools/vtoolpoint.cpp \ + tools/drawTools/vtoolnormal.cpp \ + tools/drawTools/vtoollinepoint.cpp \ + tools/drawTools/vtoollineintersect.cpp \ + tools/drawTools/vtoolline.cpp \ + tools/drawTools/vtoolheight.cpp \ + tools/drawTools/vtoolendline.cpp \ + tools/drawTools/vtoolbisector.cpp \ + tools/drawTools/vtoolarc.cpp \ + tools/drawTools/vtoolalongline.cpp \ + tools/drawTools/vdrawtool.cpp \ + tools/nodeDetails/vnodesplinepath.cpp \ + tools/nodeDetails/vnodespline.cpp \ + tools/nodeDetails/vnodepoint.cpp \ + tools/nodeDetails/vnodearc.cpp \ + tools/nodeDetails/vabstractnode.cpp \ + tools/drawTools/vtoolcutspline.cpp \ + tools/drawTools/vtoolcutsplinepath.cpp \ + tools/vtooluniondetails.cpp \ + tools/drawTools/vtoolcutarc.cpp \ + tools/drawTools/vabstractspline.cpp diff --git a/src/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp similarity index 100% rename from src/tools/vabstracttool.cpp rename to src/app/tools/vabstracttool.cpp diff --git a/src/tools/vabstracttool.h b/src/app/tools/vabstracttool.h similarity index 100% rename from src/tools/vabstracttool.h rename to src/app/tools/vabstracttool.h diff --git a/src/tools/vdatatool.cpp b/src/app/tools/vdatatool.cpp similarity index 100% rename from src/tools/vdatatool.cpp rename to src/app/tools/vdatatool.cpp diff --git a/src/tools/vdatatool.h b/src/app/tools/vdatatool.h similarity index 100% rename from src/tools/vdatatool.h rename to src/app/tools/vdatatool.h diff --git a/src/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp similarity index 100% rename from src/tools/vtooldetail.cpp rename to src/app/tools/vtooldetail.cpp diff --git a/src/tools/vtooldetail.h b/src/app/tools/vtooldetail.h similarity index 100% rename from src/tools/vtooldetail.h rename to src/app/tools/vtooldetail.h diff --git a/src/tools/vtooluniondetails.cpp b/src/app/tools/vtooluniondetails.cpp similarity index 100% rename from src/tools/vtooluniondetails.cpp rename to src/app/tools/vtooluniondetails.cpp diff --git a/src/tools/vtooluniondetails.h b/src/app/tools/vtooluniondetails.h similarity index 100% rename from src/tools/vtooluniondetails.h rename to src/app/tools/vtooluniondetails.h diff --git a/src/version.cpp b/src/app/version.cpp similarity index 100% rename from src/version.cpp rename to src/app/version.cpp diff --git a/src/version.h b/src/app/version.h similarity index 100% rename from src/version.h rename to src/app/version.h diff --git a/src/widgets/doubledelegate.cpp b/src/app/widgets/doubledelegate.cpp similarity index 100% rename from src/widgets/doubledelegate.cpp rename to src/app/widgets/doubledelegate.cpp diff --git a/src/widgets/doubledelegate.h b/src/app/widgets/doubledelegate.h similarity index 100% rename from src/widgets/doubledelegate.h rename to src/app/widgets/doubledelegate.h diff --git a/src/widgets/textdelegate.cpp b/src/app/widgets/textdelegate.cpp similarity index 100% rename from src/widgets/textdelegate.cpp rename to src/app/widgets/textdelegate.cpp diff --git a/src/widgets/textdelegate.h b/src/app/widgets/textdelegate.h similarity index 100% rename from src/widgets/textdelegate.h rename to src/app/widgets/textdelegate.h diff --git a/src/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp similarity index 100% rename from src/widgets/vapplication.cpp rename to src/app/widgets/vapplication.cpp diff --git a/src/widgets/vapplication.h b/src/app/widgets/vapplication.h similarity index 100% rename from src/widgets/vapplication.h rename to src/app/widgets/vapplication.h diff --git a/src/widgets/vcontrolpointspline.cpp b/src/app/widgets/vcontrolpointspline.cpp similarity index 100% rename from src/widgets/vcontrolpointspline.cpp rename to src/app/widgets/vcontrolpointspline.cpp diff --git a/src/widgets/vcontrolpointspline.h b/src/app/widgets/vcontrolpointspline.h similarity index 100% rename from src/widgets/vcontrolpointspline.h rename to src/app/widgets/vcontrolpointspline.h diff --git a/src/widgets/vgraphicssimpletextitem.cpp b/src/app/widgets/vgraphicssimpletextitem.cpp similarity index 100% rename from src/widgets/vgraphicssimpletextitem.cpp rename to src/app/widgets/vgraphicssimpletextitem.cpp diff --git a/src/widgets/vgraphicssimpletextitem.h b/src/app/widgets/vgraphicssimpletextitem.h similarity index 100% rename from src/widgets/vgraphicssimpletextitem.h rename to src/app/widgets/vgraphicssimpletextitem.h diff --git a/src/widgets/vitem.cpp b/src/app/widgets/vitem.cpp similarity index 100% rename from src/widgets/vitem.cpp rename to src/app/widgets/vitem.cpp diff --git a/src/widgets/vitem.h b/src/app/widgets/vitem.h similarity index 100% rename from src/widgets/vitem.h rename to src/app/widgets/vitem.h diff --git a/src/widgets/vmaingraphicsscene.cpp b/src/app/widgets/vmaingraphicsscene.cpp similarity index 100% rename from src/widgets/vmaingraphicsscene.cpp rename to src/app/widgets/vmaingraphicsscene.cpp diff --git a/src/widgets/vmaingraphicsscene.h b/src/app/widgets/vmaingraphicsscene.h similarity index 100% rename from src/widgets/vmaingraphicsscene.h rename to src/app/widgets/vmaingraphicsscene.h diff --git a/src/widgets/vmaingraphicsview.cpp b/src/app/widgets/vmaingraphicsview.cpp similarity index 100% rename from src/widgets/vmaingraphicsview.cpp rename to src/app/widgets/vmaingraphicsview.cpp diff --git a/src/widgets/vmaingraphicsview.h b/src/app/widgets/vmaingraphicsview.h similarity index 100% rename from src/widgets/vmaingraphicsview.h rename to src/app/widgets/vmaingraphicsview.h diff --git a/src/widgets/vsimplearc.cpp b/src/app/widgets/vsimplearc.cpp similarity index 100% rename from src/widgets/vsimplearc.cpp rename to src/app/widgets/vsimplearc.cpp diff --git a/src/widgets/vsimplearc.h b/src/app/widgets/vsimplearc.h similarity index 100% rename from src/widgets/vsimplearc.h rename to src/app/widgets/vsimplearc.h diff --git a/src/widgets/vsimplespline.cpp b/src/app/widgets/vsimplespline.cpp similarity index 100% rename from src/widgets/vsimplespline.cpp rename to src/app/widgets/vsimplespline.cpp diff --git a/src/widgets/vsimplespline.h b/src/app/widgets/vsimplespline.h similarity index 100% rename from src/widgets/vsimplespline.h rename to src/app/widgets/vsimplespline.h diff --git a/src/widgets/vsimplesplinepath.cpp b/src/app/widgets/vsimplesplinepath.cpp similarity index 100% rename from src/widgets/vsimplesplinepath.cpp rename to src/app/widgets/vsimplesplinepath.cpp diff --git a/src/widgets/vsimplesplinepath.h b/src/app/widgets/vsimplesplinepath.h similarity index 100% rename from src/widgets/vsimplesplinepath.h rename to src/app/widgets/vsimplesplinepath.h diff --git a/src/widgets/vtablegraphicsview.cpp b/src/app/widgets/vtablegraphicsview.cpp similarity index 100% rename from src/widgets/vtablegraphicsview.cpp rename to src/app/widgets/vtablegraphicsview.cpp diff --git a/src/widgets/vtablegraphicsview.h b/src/app/widgets/vtablegraphicsview.h similarity index 100% rename from src/widgets/vtablegraphicsview.h rename to src/app/widgets/vtablegraphicsview.h diff --git a/src/app/widgets/widgets.pri b/src/app/widgets/widgets.pri new file mode 100644 index 000000000..e8e5343b5 --- /dev/null +++ b/src/app/widgets/widgets.pri @@ -0,0 +1,27 @@ +HEADERS += \ + widgets/vtablegraphicsview.h \ + widgets/vmaingraphicsview.h \ + widgets/vmaingraphicsscene.h \ + widgets/vitem.h \ + widgets/vgraphicssimpletextitem.h \ + widgets/vcontrolpointspline.h \ + widgets/vapplication.h \ + widgets/doubledelegate.h \ + widgets/vsimplespline.h \ + widgets/vsimplesplinepath.h \ + widgets/vsimplearc.h \ + widgets/textdelegate.h + +SOURCES += \ + widgets/vtablegraphicsview.cpp \ + widgets/vmaingraphicsview.cpp \ + widgets/vmaingraphicsscene.cpp \ + widgets/vitem.cpp \ + widgets/vgraphicssimpletextitem.cpp \ + widgets/vcontrolpointspline.cpp \ + widgets/vapplication.cpp \ + widgets/doubledelegate.cpp \ + widgets/vsimplespline.cpp \ + widgets/vsimplesplinepath.cpp \ + widgets/vsimplearc.cpp \ + widgets/textdelegate.cpp diff --git a/src/xml/vdomdocument.cpp b/src/app/xml/vdomdocument.cpp similarity index 100% rename from src/xml/vdomdocument.cpp rename to src/app/xml/vdomdocument.cpp diff --git a/src/xml/vdomdocument.h b/src/app/xml/vdomdocument.h similarity index 100% rename from src/xml/vdomdocument.h rename to src/app/xml/vdomdocument.h diff --git a/src/xml/vindividualmeasurements.cpp b/src/app/xml/vindividualmeasurements.cpp similarity index 100% rename from src/xml/vindividualmeasurements.cpp rename to src/app/xml/vindividualmeasurements.cpp diff --git a/src/xml/vindividualmeasurements.h b/src/app/xml/vindividualmeasurements.h similarity index 100% rename from src/xml/vindividualmeasurements.h rename to src/app/xml/vindividualmeasurements.h diff --git a/src/xml/vpattern.cpp b/src/app/xml/vpattern.cpp similarity index 100% rename from src/xml/vpattern.cpp rename to src/app/xml/vpattern.cpp diff --git a/src/xml/vpattern.h b/src/app/xml/vpattern.h similarity index 100% rename from src/xml/vpattern.h rename to src/app/xml/vpattern.h diff --git a/src/xml/vstandardmeasurements.cpp b/src/app/xml/vstandardmeasurements.cpp similarity index 100% rename from src/xml/vstandardmeasurements.cpp rename to src/app/xml/vstandardmeasurements.cpp diff --git a/src/xml/vstandardmeasurements.h b/src/app/xml/vstandardmeasurements.h similarity index 100% rename from src/xml/vstandardmeasurements.h rename to src/app/xml/vstandardmeasurements.h diff --git a/src/xml/vtoolrecord.cpp b/src/app/xml/vtoolrecord.cpp similarity index 100% rename from src/xml/vtoolrecord.cpp rename to src/app/xml/vtoolrecord.cpp diff --git a/src/xml/vtoolrecord.h b/src/app/xml/vtoolrecord.h similarity index 100% rename from src/xml/vtoolrecord.h rename to src/app/xml/vtoolrecord.h diff --git a/src/app/xml/xml.pri b/src/app/xml/xml.pri new file mode 100644 index 000000000..d9b56eea9 --- /dev/null +++ b/src/app/xml/xml.pri @@ -0,0 +1,13 @@ +HEADERS += \ + xml/vtoolrecord.h \ + xml/vdomdocument.h \ + xml/vpattern.h \ + xml/vstandardmeasurements.h \ + xml/vindividualmeasurements.h + +SOURCES += \ + xml/vtoolrecord.cpp \ + xml/vdomdocument.cpp \ + xml/vpattern.cpp \ + xml/vstandardmeasurements.cpp \ + xml/vindividualmeasurements.cpp diff --git a/src/container/container.pri b/src/container/container.pri deleted file mode 100644 index fcd3ba862..000000000 --- a/src/container/container.pri +++ /dev/null @@ -1,11 +0,0 @@ -SOURCES += \ - src/container/vcontainer.cpp \ - src/container/calculator.cpp \ - src/container/vmeasurement.cpp \ - src/container/vincrement.cpp - -HEADERS += \ - src/container/vcontainer.h \ - src/container/calculator.h \ - src/container/vmeasurement.h \ - src/container/vincrement.h diff --git a/src/dialogs/dialogs.pri b/src/dialogs/dialogs.pri deleted file mode 100644 index 99388667c..000000000 --- a/src/dialogs/dialogs.pri +++ /dev/null @@ -1,90 +0,0 @@ -HEADERS += \ - src/dialogs/dialogs.h \ - src/dialogs/tools/dialogtriangle.h \ - src/dialogs/tools/dialogtool.h \ - src/dialogs/tools/dialogsplinepath.h \ - src/dialogs/tools/dialogspline.h \ - src/dialogs/tools/dialogsinglepoint.h \ - src/dialogs/tools/dialogshoulderpoint.h \ - src/dialogs/tools/dialogpointofintersection.h \ - src/dialogs/tools/dialogpointofcontact.h \ - src/dialogs/tools/dialognormal.h \ - src/dialogs/tools/dialoglineintersect.h \ - src/dialogs/tools/dialogline.h \ - src/dialogs/tools/dialogheight.h \ - src/dialogs/tools/dialogendline.h \ - src/dialogs/tools/dialogdetail.h \ - src/dialogs/tools/dialogbisector.h \ - src/dialogs/tools/dialogarc.h \ - src/dialogs/tools/dialogalongline.h \ - src/dialogs/tools/dialogcutspline.h \ - src/dialogs/tools/dialogcutsplinepath.h \ - src/dialogs/tools/dialoguniondetails.h \ - src/dialogs/tools/dialogcutarc.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 \ - src/dialogs/app/dialogindividualmeasurements.h - -SOURCES += \ - src/dialogs/tools/dialogtriangle.cpp \ - src/dialogs/tools/dialogtool.cpp \ - src/dialogs/tools/dialogsplinepath.cpp \ - src/dialogs/tools/dialogspline.cpp \ - src/dialogs/tools/dialogsinglepoint.cpp \ - src/dialogs/tools/dialogshoulderpoint.cpp \ - src/dialogs/tools/dialogpointofintersection.cpp \ - src/dialogs/tools/dialogpointofcontact.cpp \ - src/dialogs/tools/dialognormal.cpp \ - src/dialogs/tools/dialoglineintersect.cpp \ - src/dialogs/tools/dialogline.cpp \ - src/dialogs/tools/dialogheight.cpp \ - src/dialogs/tools/dialogendline.cpp \ - src/dialogs/tools/dialogdetail.cpp \ - src/dialogs/tools/dialogbisector.cpp \ - src/dialogs/tools/dialogarc.cpp \ - src/dialogs/tools/dialogalongline.cpp \ - src/dialogs/tools/dialogcutspline.cpp \ - src/dialogs/tools/dialogcutsplinepath.cpp \ - src/dialogs/tools/dialoguniondetails.cpp \ - src/dialogs/tools/dialogcutarc.cpp \ - src/dialogs/app/dialogincrements.cpp \ - src/dialogs/app/dialoghistory.cpp \ - src/dialogs/app/configdialog.cpp \ - src/dialogs/app/pages.cpp \ - src/dialogs/app/dialogpatternproperties.cpp \ - src/dialogs/app/dialogmeasurements.cpp \ - src/dialogs/app/dialogstandardmeasurements.cpp \ - src/dialogs/app/dialogindividualmeasurements.cpp - -FORMS += \ - src/dialogs/tools/dialogtriangle.ui \ - src/dialogs/tools/dialogsplinepath.ui \ - src/dialogs/tools/dialogspline.ui \ - src/dialogs/tools/dialogsinglepoint.ui \ - src/dialogs/tools/dialogshoulderpoint.ui \ - src/dialogs/tools/dialogpointofintersection.ui \ - src/dialogs/tools/dialogpointofcontact.ui \ - src/dialogs/tools/dialognormal.ui \ - src/dialogs/tools/dialoglineintersect.ui \ - src/dialogs/tools/dialogline.ui \ - src/dialogs/tools/dialogheight.ui \ - src/dialogs/tools/dialogendline.ui \ - src/dialogs/tools/dialogdetail.ui \ - src/dialogs/tools/dialogbisector.ui \ - src/dialogs/tools/dialogarc.ui \ - src/dialogs/tools/dialogalongline.ui \ - src/dialogs/tools/dialogcutspline.ui \ - src/dialogs/tools/dialogcutsplinepath.ui \ - src/dialogs/tools/dialoguniondetails.ui \ - src/dialogs/tools/dialogcutarc.ui \ - src/dialogs/app/dialogincrements.ui \ - src/dialogs/app/dialoghistory.ui \ - src/dialogs/app/dialogpatternproperties.ui \ - src/dialogs/app/dialogmeasurements.ui \ - src/dialogs/app/dialogstandardmeasurements.ui \ - src/dialogs/app/dialogindividualmeasurements.ui diff --git a/src/exception/exception.pri b/src/exception/exception.pri deleted file mode 100644 index a743115fc..000000000 --- a/src/exception/exception.pri +++ /dev/null @@ -1,15 +0,0 @@ -HEADERS += \ - src/exception/vexceptionobjecterror.h \ - src/exception/vexceptionemptyparameter.h \ - src/exception/vexceptionconversionerror.h \ - src/exception/vexceptionbadid.h \ - src/exception/vexception.h \ - src/exception/vexceptionwrongid.h - -SOURCES += \ - src/exception/vexceptionobjecterror.cpp \ - src/exception/vexceptionemptyparameter.cpp \ - src/exception/vexceptionconversionerror.cpp \ - src/exception/vexceptionbadid.cpp \ - src/exception/vexception.cpp \ - src/exception/vexceptionwrongid.cpp diff --git a/src/geometry/geometry.pri b/src/geometry/geometry.pri deleted file mode 100644 index 40815e6cf..000000000 --- a/src/geometry/geometry.pri +++ /dev/null @@ -1,21 +0,0 @@ -HEADERS += \ - src/geometry/vsplinepoint.h \ - src/geometry/vsplinepath.h \ - src/geometry/vspline.h \ - src/geometry/vnodedetail.h \ - src/geometry/vdetail.h \ - src/geometry/varc.h \ - src/geometry/vgobject.h \ - src/geometry/vpointf.h \ - src/geometry/vequidistant.h - -SOURCES += \ - src/geometry/vsplinepoint.cpp \ - src/geometry/vsplinepath.cpp \ - src/geometry/vspline.cpp \ - src/geometry/vnodedetail.cpp \ - src/geometry/vdetail.cpp \ - src/geometry/varc.cpp \ - src/geometry/vgobject.cpp \ - src/geometry/vpointf.cpp \ - src/geometry/vequidistant.cpp diff --git a/src/src.pri b/src/src.pri deleted file mode 100644 index 31e8d0c14..000000000 --- a/src/src.pri +++ /dev/null @@ -1,14 +0,0 @@ -SOURCES += src/main.cpp \ - src/mainwindow.cpp \ - src/tablewindow.cpp \ - src/stable.cpp \ - src/version.cpp - -HEADERS += src/mainwindow.h \ - src/options.h \ - src/tablewindow.h \ - src/stable.h \ - src/version.h - -FORMS += src/mainwindow.ui \ - src/tablewindow.ui diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 000000000..7a8600add --- /dev/null +++ b/src/src.pro @@ -0,0 +1,50 @@ +TEMPLATE = subdirs +#SUBDIRS = sub_lib sub_tests sub_app +SUBDIRS = sub_app + +#sub_lib.subdir = lib +#sub_tests.file = tests/proj.pro +#sub_tests.depends = sub_lib +sub_app.subdir = app +sub_app.file = app/app.pro +#sub_app.depends = sub_lib + +#This makes it possible to use make -j 4 on your fancy quad-core system with a project that consists of several +#components that depend on each other. To simplify the process a bit, the following test function can be defined: + +# addSubdirs(subdirs,deps): Adds directories to the project that depend on +# other directories +defineTest(addSubdirs) { + for(subdirs, 1) { + entries = $$files($$subdirs) + for(entry, entries) { + name = $$replace(entry, [/\\\\], _) + SUBDIRS += $$name + eval ($${name}.subdir = $$entry) + for(dep, 2):eval ($${name}.depends += $$replace(dep, [/\\\\], _)) + export ($${name}.subdir) + export ($${name}.depends) + } + } + export (SUBDIRS) +} +#You can then use it like to define a project that has: + +#several contributed modules that should be compiled first +#addSubdirs (contrib/*) + +#a kernel lib for non-gui related stuff that depends on some contrib modules +#addSubdirs (src/lib/kernel, contrib/module1 contrib/module2) + +#a gui lib that depends on the kernel lib and some other contrib modules +#addSubdirs (src/lib/gui, src/lib/kernel contrib/module3 contrib/module4) + +#test benches for the kernel and gui libs +#addSubdirs (src/tests/kernel, src/lib/kernel) +#addSubdirs (src/tests/gui, src/lib/gui) + +#a main program that uses the gui and kernel libs +#addSubdirs (src/main, src/lib/gui src/lib/kernel) + +#several modules that only depend on the kernel lib +#addSubdirs (src/modules/*, src/lib/kernel) diff --git a/src/tools/tools.pri b/src/tools/tools.pri deleted file mode 100644 index 6e5924a6a..000000000 --- a/src/tools/tools.pri +++ /dev/null @@ -1,68 +0,0 @@ -HEADERS += \ - src/tools/vtooldetail.h \ - src/tools/vdatatool.h \ - src/tools/vabstracttool.h \ - src/tools/tools.h \ - src/tools/drawTools/vtooltriangle.h \ - src/tools/drawTools/vtoolsplinepath.h \ - src/tools/drawTools/vtoolspline.h \ - src/tools/drawTools/vtoolsinglepoint.h \ - src/tools/drawTools/vtoolshoulderpoint.h \ - src/tools/drawTools/vtoolpointofintersection.h \ - src/tools/drawTools/vtoolpointofcontact.h \ - src/tools/drawTools/vtoolpoint.h \ - src/tools/drawTools/vtoolnormal.h \ - src/tools/drawTools/vtoollinepoint.h \ - src/tools/drawTools/vtoollineintersect.h \ - src/tools/drawTools/vtoolline.h \ - src/tools/drawTools/vtoolheight.h \ - src/tools/drawTools/vtoolendline.h \ - src/tools/drawTools/vtoolbisector.h \ - src/tools/drawTools/vtoolarc.h \ - src/tools/drawTools/vtoolalongline.h \ - src/tools/drawTools/vdrawtool.h \ - src/tools/drawTools/drawtools.h \ - src/tools/nodeDetails/vnodesplinepath.h \ - src/tools/nodeDetails/vnodespline.h \ - src/tools/nodeDetails/vnodepoint.h \ - src/tools/nodeDetails/vnodearc.h \ - src/tools/nodeDetails/vabstractnode.h \ - src/tools/nodeDetails/nodedetails.h \ - src/tools/drawTools/vtoolcutspline.h \ - src/tools/drawTools/vtoolcutsplinepath.h \ - src/tools/vtooluniondetails.h \ - src/tools/drawTools/vtoolcutarc.h \ - src/tools/drawTools/vabstractspline.h - -SOURCES += \ - src/tools/vtooldetail.cpp \ - src/tools/vdatatool.cpp \ - src/tools/vabstracttool.cpp \ - src/tools/drawTools/vtooltriangle.cpp \ - src/tools/drawTools/vtoolsplinepath.cpp \ - src/tools/drawTools/vtoolspline.cpp \ - src/tools/drawTools/vtoolsinglepoint.cpp \ - src/tools/drawTools/vtoolshoulderpoint.cpp \ - src/tools/drawTools/vtoolpointofintersection.cpp \ - src/tools/drawTools/vtoolpointofcontact.cpp \ - src/tools/drawTools/vtoolpoint.cpp \ - src/tools/drawTools/vtoolnormal.cpp \ - src/tools/drawTools/vtoollinepoint.cpp \ - src/tools/drawTools/vtoollineintersect.cpp \ - src/tools/drawTools/vtoolline.cpp \ - src/tools/drawTools/vtoolheight.cpp \ - src/tools/drawTools/vtoolendline.cpp \ - src/tools/drawTools/vtoolbisector.cpp \ - src/tools/drawTools/vtoolarc.cpp \ - src/tools/drawTools/vtoolalongline.cpp \ - src/tools/drawTools/vdrawtool.cpp \ - src/tools/nodeDetails/vnodesplinepath.cpp \ - src/tools/nodeDetails/vnodespline.cpp \ - src/tools/nodeDetails/vnodepoint.cpp \ - src/tools/nodeDetails/vnodearc.cpp \ - src/tools/nodeDetails/vabstractnode.cpp \ - src/tools/drawTools/vtoolcutspline.cpp \ - src/tools/drawTools/vtoolcutsplinepath.cpp \ - src/tools/vtooluniondetails.cpp \ - src/tools/drawTools/vtoolcutarc.cpp \ - src/tools/drawTools/vabstractspline.cpp diff --git a/src/widgets/widgets.pri b/src/widgets/widgets.pri deleted file mode 100644 index afb5dceab..000000000 --- a/src/widgets/widgets.pri +++ /dev/null @@ -1,27 +0,0 @@ -HEADERS += \ - src/widgets/vtablegraphicsview.h \ - src/widgets/vmaingraphicsview.h \ - src/widgets/vmaingraphicsscene.h \ - src/widgets/vitem.h \ - src/widgets/vgraphicssimpletextitem.h \ - src/widgets/vcontrolpointspline.h \ - src/widgets/vapplication.h \ - src/widgets/doubledelegate.h \ - src/widgets/vsimplespline.h \ - src/widgets/vsimplesplinepath.h \ - src/widgets/vsimplearc.h \ - src/widgets/textdelegate.h - -SOURCES += \ - src/widgets/vtablegraphicsview.cpp \ - src/widgets/vmaingraphicsview.cpp \ - src/widgets/vmaingraphicsscene.cpp \ - src/widgets/vitem.cpp \ - src/widgets/vgraphicssimpletextitem.cpp \ - src/widgets/vcontrolpointspline.cpp \ - src/widgets/vapplication.cpp \ - src/widgets/doubledelegate.cpp \ - src/widgets/vsimplespline.cpp \ - src/widgets/vsimplesplinepath.cpp \ - src/widgets/vsimplearc.cpp \ - src/widgets/textdelegate.cpp diff --git a/src/xml/xml.pri b/src/xml/xml.pri deleted file mode 100644 index fd858fb2b..000000000 --- a/src/xml/xml.pri +++ /dev/null @@ -1,13 +0,0 @@ -HEADERS += \ - src/xml/vtoolrecord.h \ - src/xml/vdomdocument.h \ - src/xml/vpattern.h \ - src/xml/vstandardmeasurements.h \ - src/xml/vindividualmeasurements.h - -SOURCES += \ - src/xml/vtoolrecord.cpp \ - src/xml/vdomdocument.cpp \ - src/xml/vpattern.cpp \ - src/xml/vstandardmeasurements.cpp \ - src/xml/vindividualmeasurements.cpp