Unite "core" and "widgets" folders.
--HG-- branch : feature
This commit is contained in:
parent
6132153338
commit
63d5001899
|
@ -1,7 +1,6 @@
|
||||||
# Suport subdirectories. Just better project code tree.
|
# Suport subdirectories. Just better project code tree.
|
||||||
include(dialogs/dialogs.pri)
|
include(dialogs/dialogs.pri)
|
||||||
include(tools/tools.pri)
|
include(tools/tools.pri)
|
||||||
include(widgets/widgets.pri)
|
|
||||||
include(xml/xml.pri)
|
include(xml/xml.pri)
|
||||||
include(undocommands/undocommands.pri)
|
include(undocommands/undocommands.pri)
|
||||||
include(visualization/visualization.pri)
|
include(visualization/visualization.pri)
|
||||||
|
|
|
@ -4,9 +4,15 @@
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
$$PWD/vapplication.h \
|
$$PWD/vapplication.h \
|
||||||
$$PWD/vsettings.h \
|
$$PWD/vsettings.h \
|
||||||
$$PWD/vformula.h
|
$$PWD/vformula.h \
|
||||||
|
$$PWD/vformulaproperty.h \
|
||||||
|
$$PWD/vformulapropertyeditor.h \
|
||||||
|
$$PWD/vtooloptionspropertybrowser.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
$$PWD/vapplication.cpp \
|
$$PWD/vapplication.cpp \
|
||||||
$$PWD/vsettings.cpp \
|
$$PWD/vsettings.cpp \
|
||||||
$$PWD/vformula.cpp
|
$$PWD/vformula.cpp \
|
||||||
|
$$PWD/vformulaproperty.cpp \
|
||||||
|
$$PWD/vformulapropertyeditor.cpp \
|
||||||
|
$$PWD/vtooloptionspropertybrowser.cpp
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include <QStackedWidget>
|
#include <QStackedWidget>
|
||||||
#include <QCloseEvent>
|
#include <QCloseEvent>
|
||||||
#include "../core/vapplication.h"
|
#include "../../core/vapplication.h"
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
ConfigDialog::ConfigDialog(QWidget *parent) :
|
ConfigDialog::ConfigDialog(QWidget *parent) :
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include "../../options.h"
|
#include "../../options.h"
|
||||||
#include "../core/vapplication.h"
|
#include "../../core/vapplication.h"
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogAboutApp::DialogAboutApp(QWidget *parent) :
|
DialogAboutApp::DialogAboutApp(QWidget *parent) :
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
#include "dialoglayoutprogress.h"
|
#include "dialoglayoutprogress.h"
|
||||||
#include "ui_dialoglayoutprogress.h"
|
#include "ui_dialoglayoutprogress.h"
|
||||||
#include "../options.h"
|
#include "../../options.h"
|
||||||
#include "../core/vapplication.h"
|
#include "../../core/vapplication.h"
|
||||||
|
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
#include "dialogmeasurements.h"
|
#include "dialogmeasurements.h"
|
||||||
#include "ui_dialogmeasurements.h"
|
#include "ui_dialogmeasurements.h"
|
||||||
#include "../core/vapplication.h"
|
#include "../../core/vapplication.h"
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogMeasurements::DialogMeasurements(QWidget *parent) :
|
DialogMeasurements::DialogMeasurements(QWidget *parent) :
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
#include "dialogpatternxmledit.h"
|
#include "dialogpatternxmledit.h"
|
||||||
#include "ui_dialogpatternxmledit.h"
|
#include "ui_dialogpatternxmledit.h"
|
||||||
#include "../core/vapplication.h"
|
#include "../../core/vapplication.h"
|
||||||
|
|
||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
#include "dialogsavelayout.h"
|
#include "dialogsavelayout.h"
|
||||||
#include "ui_dialogsavelayout.h"
|
#include "ui_dialogsavelayout.h"
|
||||||
#include "../options.h"
|
#include "../../options.h"
|
||||||
#include "../../core/vapplication.h"
|
#include "../../core/vapplication.h"
|
||||||
#include "../../core/vsettings.h"
|
#include "../../core/vsettings.h"
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include "../../libs/vgeometry/vpointf.h"
|
#include "../../libs/vgeometry/vpointf.h"
|
||||||
#include "../../libs/vpatterndb/vcontainer.h"
|
#include "../../libs/vpatterndb/vcontainer.h"
|
||||||
#include "../../tools/vabstracttool.h"
|
#include "../../tools/vabstracttool.h"
|
||||||
#include "../visualization/vistoolheight.h"
|
#include "../../visualization/vistoolheight.h"
|
||||||
#include "../../libs/vwidgets/vmaingraphicsscene.h"
|
#include "../../libs/vwidgets/vmaingraphicsscene.h"
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
#include "dialognormal.h"
|
#include "dialognormal.h"
|
||||||
#include "ui_dialognormal.h"
|
#include "ui_dialognormal.h"
|
||||||
#include "../visualization/vistoolnormal.h"
|
#include "../../visualization/vistoolnormal.h"
|
||||||
#include "../../../libs/vwidgets/vmaingraphicsscene.h"
|
#include "../../../libs/vwidgets/vmaingraphicsscene.h"
|
||||||
#include "../../tools/vabstracttool.h"
|
#include "../../tools/vabstracttool.h"
|
||||||
#include "dialogeditwrongformula.h"
|
#include "dialogeditwrongformula.h"
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
#include "../libs/vmisc/undoevent.h"
|
#include "../libs/vmisc/undoevent.h"
|
||||||
#include "core/vsettings.h"
|
#include "core/vsettings.h"
|
||||||
#include "undocommands/renamepp.h"
|
#include "undocommands/renamepp.h"
|
||||||
#include "vtooloptionspropertybrowser.h"
|
#include "core/vtooloptionspropertybrowser.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "../libs/ifc/xml/vpatternconverter.h"
|
#include "../libs/ifc/xml/vpatternconverter.h"
|
||||||
#include "../vmisc/logging.h"
|
#include "../vmisc/logging.h"
|
||||||
|
|
|
@ -27,13 +27,13 @@
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#include "mainwindowsnogui.h"
|
#include "mainwindowsnogui.h"
|
||||||
#include "../core/vapplication.h"
|
#include "core/vapplication.h"
|
||||||
#include "../libs/vpatterndb/vcontainer.h"
|
#include "../libs/vpatterndb/vcontainer.h"
|
||||||
#include "../libs/vobj/vobjpaintdevice.h"
|
#include "../libs/vobj/vobjpaintdevice.h"
|
||||||
#include "../dialogs/app/dialoglayoutsettings.h"
|
#include "dialogs/app/dialoglayoutsettings.h"
|
||||||
#include "../libs/vlayout/vlayoutgenerator.h"
|
#include "../libs/vlayout/vlayoutgenerator.h"
|
||||||
#include "../dialogs/app/dialoglayoutprogress.h"
|
#include "dialogs/app/dialoglayoutprogress.h"
|
||||||
#include "../dialogs/app/dialogsavelayout.h"
|
#include "dialogs/app/dialogsavelayout.h"
|
||||||
#include "../libs/vlayout/vposter.h"
|
#include "../libs/vlayout/vposter.h"
|
||||||
|
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
#include "vdrawtool.h"
|
#include "vdrawtool.h"
|
||||||
|
|
||||||
#include <qmuparsererror.h>
|
#include <qmuparsererror.h>
|
||||||
#include "../dialogs/tools/dialogeditwrongformula.h"
|
#include "../../dialogs/tools/dialogeditwrongformula.h"
|
||||||
#include "../dialogs/app/dialogundo.h"
|
#include "../../dialogs/app/dialogundo.h"
|
||||||
#include "../libs/vpatterndb/calculator.h"
|
#include "../libs/vpatterndb/calculator.h"
|
||||||
#include "../../undocommands/addtocalc.h"
|
#include "../../undocommands/addtocalc.h"
|
||||||
#include "../../undocommands/savetooloptions.h"
|
#include "../../undocommands/savetooloptions.h"
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include "../../libs/vpatterndb/calculator.h"
|
#include "../../libs/vpatterndb/calculator.h"
|
||||||
#include "../../dialogs/tools/dialogarc.h"
|
#include "../../dialogs/tools/dialogarc.h"
|
||||||
#include "../../libs/vgeometry/varc.h"
|
#include "../../libs/vgeometry/varc.h"
|
||||||
#include "../core/vformula.h"
|
#include "../../core/vformula.h"
|
||||||
#include "../../visualization/vistoolarc.h"
|
#include "../../visualization/vistoolarc.h"
|
||||||
|
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include "../../libs/vpatterndb/calculator.h"
|
#include "../../libs/vpatterndb/calculator.h"
|
||||||
#include "../../dialogs/tools/dialogarcwithlength.h"
|
#include "../../dialogs/tools/dialogarcwithlength.h"
|
||||||
#include "../../libs/vgeometry/varc.h"
|
#include "../../libs/vgeometry/varc.h"
|
||||||
#include "../core/vformula.h"
|
#include "../../core/vformula.h"
|
||||||
#include "../../visualization/vistoolarcwithlength.h"
|
#include "../../visualization/vistoolarcwithlength.h"
|
||||||
|
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include "../../dialogs/tools/dialogcurveintersectaxis.h"
|
#include "../../dialogs/tools/dialogcurveintersectaxis.h"
|
||||||
#include "../../dialogs/tools/dialogeditwrongformula.h"
|
#include "../../dialogs/tools/dialogeditwrongformula.h"
|
||||||
#include "../../libs/vgeometry/vpointf.h"
|
#include "../../libs/vgeometry/vpointf.h"
|
||||||
#include "./../visualization/vistoolcurveintersectaxis.h"
|
#include "../../visualization/vistoolcurveintersectaxis.h"
|
||||||
|
|
||||||
const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersectAxis");
|
const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersectAxis");
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include "../../dialogs/tools/dialogendline.h"
|
#include "../../dialogs/tools/dialogendline.h"
|
||||||
#include "../../dialogs/tools/dialogeditwrongformula.h"
|
#include "../../dialogs/tools/dialogeditwrongformula.h"
|
||||||
#include "../../libs/vgeometry/vpointf.h"
|
#include "../../libs/vgeometry/vpointf.h"
|
||||||
#include "./../visualization/vistoolendline.h"
|
#include "../../visualization/vistoolendline.h"
|
||||||
|
|
||||||
const QString VToolEndLine::ToolType = QStringLiteral("endLine");
|
const QString VToolEndLine::ToolType = QStringLiteral("endLine");
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include "../../dialogs/tools/dialoglineintersectaxis.h"
|
#include "../../dialogs/tools/dialoglineintersectaxis.h"
|
||||||
#include "../../dialogs/tools/dialogeditwrongformula.h"
|
#include "../../dialogs/tools/dialogeditwrongformula.h"
|
||||||
#include "../../libs/vgeometry/vpointf.h"
|
#include "../../libs/vgeometry/vpointf.h"
|
||||||
#include "./../visualization/vistoollineintersectaxis.h"
|
#include "../../visualization/vistoollineintersectaxis.h"
|
||||||
|
|
||||||
const QString VToolLineIntersectAxis::ToolType = QStringLiteral("lineIntersectAxis");
|
const QString VToolLineIntersectAxis::ToolType = QStringLiteral("lineIntersectAxis");
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#define VTOOLLINEPOINT_H
|
#define VTOOLLINEPOINT_H
|
||||||
|
|
||||||
#include "vtoolpoint.h"
|
#include "vtoolpoint.h"
|
||||||
#include "../core/vformula.h"
|
#include "../../core/vformula.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The VToolLinePoint class parent for all tools what create point with line.
|
* @brief The VToolLinePoint class parent for all tools what create point with line.
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "../../libs/vgeometry/vpointf.h"
|
#include "../../libs/vgeometry/vpointf.h"
|
||||||
#include "../../libs/vgeometry/varc.h"
|
#include "../../libs/vgeometry/varc.h"
|
||||||
#include "../../visualization/vistoolpointfromcircleandtangent.h"
|
#include "../../visualization/vistoolpointfromcircleandtangent.h"
|
||||||
#include "../core/vformula.h"
|
#include "../../core/vformula.h"
|
||||||
|
|
||||||
const QString VToolPointFromCircleAndTangent::ToolType = QStringLiteral("pointFromCircleAndTangent");
|
const QString VToolPointFromCircleAndTangent::ToolType = QStringLiteral("pointFromCircleAndTangent");
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "../../libs/vgeometry/vpointf.h"
|
#include "../../libs/vgeometry/vpointf.h"
|
||||||
#include "../../libs/vgeometry/varc.h"
|
#include "../../libs/vgeometry/varc.h"
|
||||||
#include "../../visualization/vistoolpointofintersectioncircles.h"
|
#include "../../visualization/vistoolpointofintersectioncircles.h"
|
||||||
#include "../core/vformula.h"
|
#include "../../core/vformula.h"
|
||||||
|
|
||||||
const QString VToolPointOfIntersectionCircles::ToolType = QStringLiteral("pointOfIntersectionCircles");
|
const QString VToolPointOfIntersectionCircles::ToolType = QStringLiteral("pointOfIntersectionCircles");
|
||||||
|
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
# ADD TO EACH PATH $$PWD VARIABLE!!!!!!
|
|
||||||
# This need for corect working file translations.pro
|
|
||||||
|
|
||||||
HEADERS += \
|
|
||||||
$$PWD/vtooloptionspropertybrowser.h \
|
|
||||||
$$PWD/vformulapropertyeditor.h \
|
|
||||||
$$PWD/vformulaproperty.h
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
$$PWD/vtooloptionspropertybrowser.cpp \
|
|
||||||
$$PWD/vformulapropertyeditor.cpp \
|
|
||||||
$$PWD/vformulaproperty.cpp
|
|
Loading…
Reference in New Issue
Block a user