]> Shamusworld >> Repos - architektonas/blobdiff - architektonas.pro
Added preliminary circle-to-circle intersection code.
[architektonas] / architektonas.pro
index b7636d3f144c5da43c9abad14a140c474420772b..a82f9a045b1e2672035fec0a7097b982b1918007 100644 (file)
@@ -1,15 +1,17 @@
 #
 # Architektonas Qt project file
 #
-# by James L. Hammons
-# (C) 2010 Underground Software
+# by James Hammons
+# Copyright (C) 2015 Underground Software
 #
-# Parts are based on QCad Community Edition by Andrew Mustun
+# See the README and GPLv3 files for licensing and warranty information
 #
 
 CONFIG    += qt warn_on release debug
-RESOURCES += src/forms/res/architektonas.qrc
-LIBS      += -Ldxflib/lib -ldxf -Lfparser/lib -lfparser
+#CONFIG    += qt warn_on release
+RESOURCES += res/architektonas.qrc
+#LIBS      += -Ldxflib/lib -ldxf
+QT        += widgets
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
 OBJECTS_DIR = obj
@@ -17,622 +19,70 @@ MOC_DIR     = obj
 RCC_DIR     = obj
 UI_DIR      = obj
 
-INCLUDEPATH += \
-       fparser/include \
-       dxflib/include \
-       src/mainapp \
-       src/actions \
-       src/base \
-       src/widgets \
-       src/forms
-
-HEADERS = \
-       src/base/rs.h \
-       src/base/rs_actioninterface.h \
-       src/base/rs_arc.h \
-       src/base/rs_atomicentity.h \
-       src/base/rs_block.h \
-       src/base/rs_blocklist.h \
-       src/base/rs_blocklistlistener.h \
-       src/base/rs_circle.h \
-       src/base/rs_clipboard.h \
-       src/base/rs_color.h \
-       src/base/rs_commandevent.h \
-       src/base/rs_creation.h \
-       src/base/rs_constructionline.h \
-       src/base/rs_debug.h \
-       src/base/rs_dialogfactory.h \
-       src/base/rs_dialogfactoryinterface.h \
-       src/base/rs_dialogfactoryadapter.h \
-       src/base/rs_dimaligned.h \
-       src/base/rs_dimangular.h \
-       src/base/rs_dimdiametric.h \
-       src/base/rs_dimension.h \
-       src/base/rs_dimlinear.h \
-       src/base/rs_dimradial.h \
-       src/base/rs_document.h \
-       src/base/drawing.h \
-       src/base/rs_ellipse.h \
-       src/base/rs_entity.h \
-       src/base/rs_entitycontainer.h \
-       src/base/rs_eventhandler.h \
-       src/base/rs_fileio.h \
-       src/base/rs_filtercxf.h \
-       src/base/rs_filterdxf.h \
-       src/base/rs_filterdxf1.h \
-       src/base/rs_filterinterface.h \
-       src/base/rs_flags.h \
-       src/base/rs_font.h \
-       src/base/rs_fontchar.h \
-       src/base/rs_fontlist.h \
-       src/base/rs_grid.h \
-       src/base/rs_hatch.h \
-       src/base/rs_image.h \
-       src/base/rs_information.h \
-       src/base/rs_infoarea.h \
-       src/base/rs_insert.h \
-       src/base/rs_layer.h \
-       src/base/rs_layerlist.h \
-       src/base/rs_layerlistlistener.h \
-       src/base/rs_leader.h \
-       src/base/rs_line.h \
-       src/base/rs_linetypepattern.h \
-       src/base/rs_mainwindowinterface.h \
-       src/base/rs_math.h \
-       src/base/rs_modification.h \
-       src/base/paintintf.h \
-       src/base/rs_pattern.h \
-       src/base/rs_patternlist.h \
-       src/base/rs_pen.h \
-       src/base/rs_point.h \
-       src/base/rs_polyline.h \
-       src/base/rs_preview.h \
-       src/base/rs_previewactioninterface.h \
-       src/base/rs_python.h \
-       src/base/rs_python_wrappers.h \
-       src/base/rs_script.h \
-       src/base/rs_scriptlist.h \
-       src/base/rs_selection.h \
-       src/base/rs_simplepython.h \
-       src/base/rs_snapper.h \
-       src/base/rs_solid.h \
-       src/base/rs_spline.h \
-       src/base/rs_staticgraphicview.h \
-       src/base/rs_system.h \
-       src/base/rs_text.h \
-       src/base/rs_undo.h \
-       src/base/rs_undoable.h \
-       src/base/rs_undocycle.h \
-       src/base/rs_units.h \
-       src/base/rs_utility.h \
-       src/base/rs_variable.h \
-       src/base/rs_variabledict.h \
-       src/base/vector.h \
-       src/base/vectorsolutions.h
-
-SOURCES = \
-       src/base/rs_actioninterface.cpp \
-       src/base/rs_arc.cpp \
-       src/base/rs_atomicentity.cpp \
-       src/base/rs_block.cpp \
-       src/base/rs_blocklist.cpp \
-       src/base/rs_clipboard.cpp \
-       src/base/rs_circle.cpp \
-       src/base/rs_color.cpp \
-       src/base/rs_commandevent.cpp \
-       src/base/rs_constructionline.cpp \
-       src/base/rs_creation.cpp \
-       src/base/rs_debug.cpp \
-       src/base/rs_dialogfactory.cpp \
-       src/base/rs_dimaligned.cpp \
-       src/base/rs_dimangular.cpp \
-       src/base/rs_dimdiametric.cpp \
-       src/base/rs_dimension.cpp \
-       src/base/rs_dimlinear.cpp \
-       src/base/rs_dimradial.cpp \
-       src/base/rs_document.cpp \
-       src/base/drawing.cpp \
-       src/base/rs_ellipse.cpp \
-       src/base/rs_entity.cpp \
-       src/base/rs_entitycontainer.cpp \
-       src/base/rs_eventhandler.cpp \
-       src/base/rs_fileio.cpp \
-       src/base/rs_filtercxf.cpp \
-       src/base/rs_filterdxf.cpp \
-       src/base/rs_filterdxf1.cpp \
-       src/base/rs_filterinterface.cpp \
-       src/base/rs_font.cpp \
-       src/base/rs_fontlist.cpp \
-       src/base/rs_grid.cpp \
-       src/base/rs_hatch.cpp \
-       src/base/rs_image.cpp \
-       src/base/rs_information.cpp \
-       src/base/rs_infoarea.cpp \
-       src/base/rs_insert.cpp \
-       src/base/rs_layer.cpp \
-       src/base/rs_layerlist.cpp \
-       src/base/rs_leader.cpp \
-       src/base/rs_line.cpp \
-       src/base/rs_linetypepattern.cpp \
-       src/base/rs_math.cpp \
-       src/base/rs_modification.cpp \
-       src/base/paintintf.cpp \
-       src/base/rs_pattern.cpp \
-       src/base/rs_patternlist.cpp \
-       src/base/rs_point.cpp \
-       src/base/rs_polyline.cpp \
-       src/base/rs_preview.cpp \
-       src/base/rs_previewactioninterface.cpp \
-       src/base/rs_python.cpp \
-       src/base/rs_python_wrappers.cpp \
-       src/base/rs_script.cpp \
-       src/base/rs_scriptlist.cpp \
-       src/base/rs_selection.cpp \
-       src/base/rs_simplepython.cpp \
-       src/base/rs_snapper.cpp \
-       src/base/rs_solid.cpp \
-       src/base/rs_spline.cpp \
-       src/base/rs_staticgraphicview.cpp \
-       src/base/rs_system.cpp \
-       src/base/rs_text.cpp \
-       src/base/rs_undo.cpp \
-       src/base/rs_undoable.cpp \
-       src/base/rs_undocycle.cpp \
-       src/base/rs_units.cpp \
-       src/base/rs_utility.cpp \
-       src/base/rs_variable.cpp \
-       src/base/rs_variabledict.cpp \
-       src/base/vector.cpp \
-       src/base/vectorsolutions.cpp
+# Icon on Win32, Mac
+win32 { LIBS += res/architektonas-icon.o }
+macx  { ICON = architektonas-icon.icns }
 
-HEADERS += \
-       src/actions/rs_actionblocksadd.h \
-       src/actions/rs_actionblocksattributes.h \
-       src/actions/rs_actionblockscreate.h \
-       src/actions/rs_actionblocksedit.h \
-       src/actions/rs_actionblocksexplode.h \
-       src/actions/rs_actionblocksinsert.h \
-       src/actions/rs_actionblocksfreezeall.h \
-       src/actions/rs_actionblocksremove.h \
-       src/actions/rs_actionblockstoggleview.h \
-       src/actions/rs_actiondefault.h \
-       src/actions/rs_actiondimaligned.h \
-       src/actions/rs_actiondimangular.h \
-       src/actions/rs_actiondimdiametric.h \
-       src/actions/rs_actiondimension.h \
-       src/actions/rs_actiondimleader.h \
-       src/actions/rs_actiondimlinear.h \
-       src/actions/rs_actiondimradial.h \
-       src/actions/rs_actiondrawarc.h \
-       src/actions/rs_actiondrawarc3p.h \
-       src/actions/rs_actiondrawarctangential.h \
-       src/actions/rs_actiondrawcircle.h \
-       src/actions/rs_actiondrawcircle2p.h \
-       src/actions/rs_actiondrawcircle3p.h \
-       src/actions/rs_actiondrawcirclecr.h \
-       src/actions/rs_actiondrawellipseaxis.h \
-       src/actions/rs_actiondrawhatch.h \
-       src/actions/rs_actiondrawimage.h \
-       src/actions/rs_actiondrawline.h \
-       src/actions/rs_actiondrawlineangle.h \
-       src/actions/rs_actiondrawlinebisector.h \
-       src/actions/rs_actiondrawlinefree.h \
-       src/actions/rs_actiondrawlinehorvert.h \
-       src/actions/rs_actiondrawlineparallel.h \
-       src/actions/rs_actiondrawlineparallelthrough.h \
-       src/actions/rs_actiondrawlinepolygon.h \
-       src/actions/rs_actiondrawlinepolygon2.h \
-       src/actions/rs_actiondrawlinerectangle.h \
-       src/actions/rs_actiondrawlinerelangle.h \
-       src/actions/rs_actiondrawlinetangent1.h \
-       src/actions/rs_actiondrawlinetangent2.h \
-       src/actions/rs_actiondrawpoint.h \
-       src/actions/rs_actiondrawspline.h \
-       src/actions/rs_actiondrawtext.h \
-       src/actions/rs_actioneditcopy.h \
-       src/actions/rs_actioneditpaste.h \
-       src/actions/rs_actioneditundo.h \
-       src/actions/rs_actionfilenew.h \
-       src/actions/rs_actionfileopen.h \
-       src/actions/rs_actionfilesave.h \
-       src/actions/rs_actionfilesaveas.h \
-       src/actions/rs_actioninfoangle.h \
-       src/actions/rs_actioninfoarea.h \
-       src/actions/rs_actioninfoinside.h \
-       src/actions/rs_actioninfodist.h \
-       src/actions/rs_actioninfodist2.h \
-       src/actions/rs_actioninfototallength.h \
-       src/actions/rs_actionlayersadd.h \
-       src/actions/rs_actionlayersedit.h \
-       src/actions/rs_actionlayersfreezeall.h \
-       src/actions/rs_actionlayersremove.h \
-       src/actions/rs_actionlayerstogglelock.h \
-       src/actions/rs_actionlayerstoggleview.h \
-       src/actions/rs_actionlibraryinsert.h \
-       src/actions/rs_actionlockrelativezero.h \
-       src/actions/rs_actionmodifyattributes.h \
-       src/actions/rs_actionmodifybevel.h \
-       src/actions/rs_actionmodifycut.h \
-       src/actions/rs_actionmodifydelete.h \
-       src/actions/rs_actionmodifydeletefree.h \
-       src/actions/rs_actionmodifydeletequick.h \
-       src/actions/rs_actionmodifyentity.h \
-       src/actions/rs_actionmodifymirror.h \
-       src/actions/rs_actionmodifymove.h \
-       src/actions/rs_actionmodifymoverotate.h \
-       src/actions/rs_actionmodifyrotate.h \
-       src/actions/rs_actionmodifyrotate2.h \
-       src/actions/rs_actionmodifyround.h \
-       src/actions/rs_actionmodifyscale.h \
-       src/actions/rs_actionmodifystretch.h \
-       src/actions/rs_actionmodifytrim.h \
-       src/actions/rs_actionmodifytrimamount.h \
-       src/actions/rs_actionmodifyexplodetext.h \
-       src/actions/rs_actionoptionsdrawing.h \
-       src/actions/rs_actionprintpreview.h \
-       src/actions/rs_actionselect.h \
-       src/actions/rs_actionselectall.h \
-       src/actions/rs_actionselectbase.h \
-       src/actions/rs_actionselectcontour.h \
-       src/actions/rs_actionselectintersected.h \
-       src/actions/rs_actionselectinvert.h \
-       src/actions/rs_actionselectsingle.h \
-       src/actions/rs_actionselectwindow.h \
-       src/actions/rs_actionselectlayer.h \
-       src/actions/rs_actionsetrelativezero.h \
-       src/actions/rs_actionsetsnapmode.h \
-       src/actions/rs_actionsetsnaprestriction.h \
-       src/actions/rs_actionsnapintersectionmanual.h \
-       src/actions/rs_actiontoolregeneratedimensions.h \
-       src/actions/rs_actionzoomauto.h \
-       src/actions/rs_actionzoomautoy.h \
-       src/actions/rs_actionzoomin.h \
-       src/actions/rs_actionzoompan.h \
-       src/actions/rs_actionzoomprevious.h \
-       src/actions/rs_actionzoomredraw.h \
-       src/actions/rs_actionzoomscroll.h \
-       src/actions/rs_actionzoomwindow.h
-
-SOURCES += \
-       src/actions/rs_actionblocksadd.cpp \
-       src/actions/rs_actionblocksattributes.cpp \
-       src/actions/rs_actionblockscreate.cpp \
-       src/actions/rs_actionblocksedit.cpp \
-       src/actions/rs_actionblocksexplode.cpp \
-       src/actions/rs_actionblocksinsert.cpp \
-       src/actions/rs_actionblocksfreezeall.cpp \
-       src/actions/rs_actionblocksremove.cpp \
-       src/actions/rs_actionblockstoggleview.cpp \
-       src/actions/rs_actiondefault.cpp \
-       src/actions/rs_actiondimaligned.cpp \
-       src/actions/rs_actiondimangular.cpp \
-       src/actions/rs_actiondimdiametric.cpp \
-       src/actions/rs_actiondimension.cpp \
-       src/actions/rs_actiondimleader.cpp \
-       src/actions/rs_actiondimlinear.cpp \
-       src/actions/rs_actiondimradial.cpp \
-       src/actions/rs_actiondrawarc.cpp \
-       src/actions/rs_actiondrawarc3p.cpp \
-       src/actions/rs_actiondrawarctangential.cpp \
-       src/actions/rs_actiondrawcircle.cpp \
-       src/actions/rs_actiondrawcircle2p.cpp \
-       src/actions/rs_actiondrawcircle3p.cpp \
-       src/actions/rs_actiondrawcirclecr.cpp \
-       src/actions/rs_actiondrawellipseaxis.cpp \
-       src/actions/rs_actiondrawhatch.cpp \
-       src/actions/rs_actiondrawimage.cpp \
-       src/actions/rs_actiondrawline.cpp \
-       src/actions/rs_actiondrawlineangle.cpp \
-       src/actions/rs_actiondrawlinebisector.cpp \
-       src/actions/rs_actiondrawlinefree.cpp \
-       src/actions/rs_actiondrawlinehorvert.cpp \
-       src/actions/rs_actiondrawlineparallel.cpp \
-       src/actions/rs_actiondrawlineparallelthrough.cpp \
-       src/actions/rs_actiondrawlinepolygon.cpp \
-       src/actions/rs_actiondrawlinepolygon2.cpp \
-       src/actions/rs_actiondrawlinerectangle.cpp \
-       src/actions/rs_actiondrawlinerelangle.cpp \
-       src/actions/rs_actiondrawlinetangent1.cpp \
-       src/actions/rs_actiondrawlinetangent2.cpp \
-       src/actions/rs_actiondrawpoint.cpp \
-       src/actions/rs_actiondrawspline.cpp \
-       src/actions/rs_actiondrawtext.cpp \
-       src/actions/rs_actioneditcopy.cpp \
-       src/actions/rs_actioneditpaste.cpp \
-       src/actions/rs_actioneditundo.cpp \
-       src/actions/rs_actionfilenew.cpp \
-       src/actions/rs_actionfileopen.cpp \
-       src/actions/rs_actionfilesave.cpp \
-       src/actions/rs_actionfilesaveas.cpp \
-       src/actions/rs_actioninfoangle.cpp \
-       src/actions/rs_actioninfoarea.cpp \
-       src/actions/rs_actioninfoinside.cpp \
-       src/actions/rs_actioninfodist.cpp \
-       src/actions/rs_actioninfodist2.cpp \
-       src/actions/rs_actioninfototallength.cpp \
-       src/actions/rs_actionlayersadd.cpp \
-       src/actions/rs_actionlayersedit.cpp \
-       src/actions/rs_actionlayersfreezeall.cpp \
-       src/actions/rs_actionlayersremove.cpp \
-       src/actions/rs_actionlayerstogglelock.cpp \
-       src/actions/rs_actionlayerstoggleview.cpp \
-       src/actions/rs_actionlibraryinsert.cpp \
-       src/actions/rs_actionlockrelativezero.cpp \
-       src/actions/rs_actionmodifyattributes.cpp \
-       src/actions/rs_actionmodifybevel.cpp \
-       src/actions/rs_actionmodifycut.cpp \
-       src/actions/rs_actionmodifydelete.cpp \
-       src/actions/rs_actionmodifydeletefree.cpp \
-       src/actions/rs_actionmodifydeletequick.cpp \
-       src/actions/rs_actionmodifyentity.cpp \
-       src/actions/rs_actionmodifymirror.cpp \
-       src/actions/rs_actionmodifymove.cpp \
-       src/actions/rs_actionmodifymoverotate.cpp \
-       src/actions/rs_actionmodifyrotate.cpp \
-       src/actions/rs_actionmodifyrotate2.cpp \
-       src/actions/rs_actionmodifyround.cpp \
-       src/actions/rs_actionmodifyscale.cpp \
-       src/actions/rs_actionmodifystretch.cpp \
-       src/actions/rs_actionmodifytrim.cpp \
-       src/actions/rs_actionmodifytrimamount.cpp \
-       src/actions/rs_actionmodifyexplodetext.cpp \
-       src/actions/rs_actionoptionsdrawing.cpp \
-       src/actions/rs_actionprintpreview.cpp \
-       src/actions/rs_actionselect.cpp \
-       src/actions/rs_actionselectall.cpp \
-       src/actions/rs_actionselectbase.cpp \
-       src/actions/rs_actionselectcontour.cpp \
-       src/actions/rs_actionselectintersected.cpp \
-       src/actions/rs_actionselectinvert.cpp \
-       src/actions/rs_actionselectsingle.cpp \
-       src/actions/rs_actionselectwindow.cpp \
-       src/actions/rs_actionselectlayer.cpp \
-       src/actions/rs_actionsetrelativezero.cpp \
-       src/actions/rs_actionsetsnapmode.cpp \
-       src/actions/rs_actionsetsnaprestriction.cpp \
-       src/actions/rs_actionsnapintersectionmanual.cpp \
-       src/actions/rs_actiontoolregeneratedimensions.cpp \
-       src/actions/rs_actionzoomauto.cpp \
-       src/actions/rs_actionzoomautoy.cpp \
-       src/actions/rs_actionzoomin.cpp \
-       src/actions/rs_actionzoompan.cpp \
-       src/actions/rs_actionzoomprevious.cpp \
-       src/actions/rs_actionzoomredraw.cpp \
-       src/actions/rs_actionzoomscroll.cpp \
-       src/actions/rs_actionzoomwindow.cpp
+INCLUDEPATH += \
+       src
+#      fparser \
+#      dxflib/include \
+#      src/mainapp \
+#      src/actions \
+#      src/base \
+#      src/widgets \
+#      src/forms
 
-HEADERS += \
-       src/forms/arcoptions.h \
-       src/forms/arctangentialoptions.h \
-       src/forms/beveloptions.h \
-       src/forms/blockdialog.h \
-       src/forms/cadtoolbar.h \
-       src/forms/cadtoolbararcs.h \
-       src/forms/cadtoolbarcircles.h \
-       src/forms/cadtoolbardim.h \
-       src/forms/cadtoolbarellipses.h \
-       src/forms/cadtoolbarinfo.h \
-       src/forms/cadtoolbarlines.h \
-       src/forms/cadtoolbarmain.h \
-       src/forms/cadtoolbarmodify.h \
-       src/forms/cadtoolbarpoints.h \
-       src/forms/cadtoolbarpolylines.h \
-       src/forms/cadtoolbarselect.h \
-       src/forms/cadtoolbarsnap.h \
-       src/forms/cadtoolbarsplines.h \
-       src/forms/circleoptions.h \
-       src/forms/commandwidget.h \
-       src/forms/coordinatewidget.h \
-       src/forms/dimensionlabeleditor.h \
-       src/forms/dimlinearoptions.h \
-       src/forms/dimoptions.h \
-       src/forms/dlgarc.h \
-       src/forms/dlgattributes.h \
-       src/forms/dlgcircle.h \
-       src/forms/dlgdimension.h \
-       src/forms/dlgdimlinear.h \
-       src/forms/dlgellipse.h \
-       src/forms/dlghatch.h \
-       src/forms/dlgimageoptions.h \
-       src/forms/dlginitial.h \
-       src/forms/dlginsert.h \
-       src/forms/dlgline.h \
-       src/forms/dlgmirror.h \
-       src/forms/dlgmove.h \
-       src/forms/dlgmoverotate.h \
-       src/forms/dlgoptionsdrawing.h \
-       src/forms/dlgoptionsgeneral.h \
-       src/forms/dlgpoint.h \
-       src/forms/dlgrotate.h \
-       src/forms/dlgrotate2.h \
-       src/forms/dlgscale.h \
-       src/forms/dlgspline.h \
-       src/forms/dlgtext.h \
-       src/forms/exitdialog.h \
-       src/forms/imageoptions.h \
-       src/forms/insertoptions.h \
-       src/forms/libraryinsertoptions.h \
-       src/forms/layerdialog.h \
-       src/forms/librarywidget.h \
-       src/forms/lineangleoptions.h \
-       src/forms/linebisectoroptions.h \
-       src/forms/lineoptions.h \
-       src/forms/lineparalleloptions.h \
-       src/forms/lineparallelthroughoptions.h \
-       src/forms/linepolygon2options.h \
-       src/forms/linepolygonoptions.h \
-       src/forms/linerelangleoptions.h \
-       src/forms/mousewidget.h \
-       src/forms/moverotateoptions.h \
-       src/forms/printpreviewoptions.h \
-       src/forms/roundoptions.h \
-       src/forms/selectionwidget.h \
-       src/forms/snapdistoptions.h \
-       src/forms/splineoptions.h \
-       src/forms/textoptions.h \
-       src/forms/trimamountoptions.h \
-       src/forms/widgetpen.h \
-       src/widgets/qg_actionhandler.h \
-       src/widgets/qg_blockwidget.h \
-       src/widgets/qg_colorbox.h \
-       src/widgets/qg_commandedit.h \
-       src/widgets/qg_dialogfactory.h \
-       src/widgets/qg_filedialog.h \
-       src/widgets/qg_fontbox.h \
-       src/widgets/qg_graphicview.h \
-       src/widgets/qg_layerbox.h \
-       src/widgets/qg_layerwidget.h \
-       src/widgets/qg_linetypebox.h \
-       src/widgets/qg_listviewitem.h \
-       src/widgets/qg_mainwindowinterface.h \
-       src/widgets/qg_patternbox.h \
-       src/widgets/qg_pentoolbar.h \
-       src/widgets/recentfiles.h \
-       src/widgets/qg_scrollbar.h \
-       src/widgets/qg_widthbox.h
+DEPENDPATH = \
+       src
+#      fparser \
+#      dxflib/include \
+#      src/mainapp \
+#      src/actions \
+#      src/base \
+#      src/widgets \
+#      src/forms
 
-SOURCES += \
-       src/forms/arcoptions.cpp \
-       src/forms/arctangentialoptions.cpp \
-       src/forms/beveloptions.cpp \
-       src/forms/blockdialog.cpp \
-       src/forms/cadtoolbar.cpp \
-       src/forms/cadtoolbararcs.cpp \
-       src/forms/cadtoolbarcircles.cpp \
-       src/forms/cadtoolbardim.cpp \
-       src/forms/cadtoolbarellipses.cpp \
-       src/forms/cadtoolbarinfo.cpp \
-       src/forms/cadtoolbarlines.cpp \
-       src/forms/cadtoolbarmain.cpp \
-       src/forms/cadtoolbarmodify.cpp \
-       src/forms/cadtoolbarpoints.cpp \
-       src/forms/cadtoolbarpolylines.cpp \
-       src/forms/cadtoolbarselect.cpp \
-       src/forms/cadtoolbarsnap.cpp \
-       src/forms/cadtoolbarsplines.cpp \
-       src/forms/circleoptions.cpp \
-       src/forms/commandwidget.cpp \
-       src/forms/coordinatewidget.cpp \
-       src/forms/dimensionlabeleditor.cpp \
-       src/forms/dimlinearoptions.cpp \
-       src/forms/dimoptions.cpp \
-       src/forms/dlgarc.cpp \
-       src/forms/dlgattributes.cpp \
-       src/forms/dlgcircle.cpp \
-       src/forms/dlgdimension.cpp \
-       src/forms/dlgdimlinear.cpp \
-       src/forms/dlgellipse.cpp \
-       src/forms/dlghatch.cpp \
-       src/forms/dlgimageoptions.cpp \
-       src/forms/dlginitial.cpp \
-       src/forms/dlginsert.cpp \
-       src/forms/dlgline.cpp \
-       src/forms/dlgmirror.cpp \
-       src/forms/dlgmove.cpp \
-       src/forms/dlgmoverotate.cpp \
-       src/forms/dlgoptionsdrawing.cpp \
-       src/forms/dlgoptionsgeneral.cpp \
-       src/forms/dlgpoint.cpp \
-       src/forms/dlgrotate.cpp \
-       src/forms/dlgrotate2.cpp \
-       src/forms/dlgscale.cpp \
-       src/forms/dlgspline.cpp \
-       src/forms/dlgtext.cpp \
-       src/forms/exitdialog.cpp \
-       src/forms/imageoptions.cpp \
-       src/forms/insertoptions.cpp \
-       src/forms/libraryinsertoptions.cpp \
-       src/forms/layerdialog.cpp \
-       src/forms/librarywidget.cpp \
-       src/forms/lineangleoptions.cpp \
-       src/forms/linebisectoroptions.cpp \
-       src/forms/lineoptions.cpp \
-       src/forms/lineparalleloptions.cpp \
-       src/forms/lineparallelthroughoptions.cpp \
-       src/forms/linepolygon2options.cpp \
-       src/forms/linepolygonoptions.cpp \
-       src/forms/linerelangleoptions.cpp \
-       src/forms/mousewidget.cpp \
-       src/forms/moverotateoptions.cpp \
-       src/forms/printpreviewoptions.cpp \
-       src/forms/roundoptions.cpp \
-       src/forms/selectionwidget.cpp \
-       src/forms/snapdistoptions.cpp \
-       src/forms/splineoptions.cpp \
-       src/forms/textoptions.cpp \
-       src/forms/trimamountoptions.cpp \
-       src/forms/widgetpen.cpp \
-       src/widgets/qg_actionhandler.cpp \
-       src/widgets/qg_blockwidget.cpp \
-       src/widgets/qg_colorbox.cpp \
-       src/widgets/qg_commandedit.cpp \
-       src/widgets/qg_dialogfactory.cpp \
-       src/widgets/qg_filedialog.cpp \
-       src/widgets/qg_fontbox.cpp \
-       src/widgets/qg_graphicview.cpp \
-       src/widgets/qg_layerbox.cpp \
-       src/widgets/qg_layerwidget.cpp \
-       src/widgets/qg_linetypebox.cpp \
-       src/widgets/qg_listviewitem.cpp \
-       src/widgets/qg_patternbox.cpp \
-       src/widgets/qg_pentoolbar.cpp \
-       src/widgets/recentfiles.cpp \
-       src/widgets/qg_scrollbar.cpp \
-       src/widgets/qg_widthbox.cpp
+#HEADERS = \
+#      fparser/fparser.hh
 
-FORMS = \
-       src/forms/blockdialog.ui \
-       src/forms/commandwidget.ui \
-       src/forms/coordinatewidget.ui \
-       src/forms/dimensionlabeleditor.ui \
-       src/forms/dlgarc.ui \
-       src/forms/dlgattributes.ui \
-       src/forms/dlgcircle.ui \
-       src/forms/dlgdimension.ui \
-       src/forms/dlgdimlinear.ui \
-       src/forms/dlgellipse.ui \
-       src/forms/dlghatch.ui \
-       src/forms/dlgimageoptions.ui \
-       src/forms/dlginitial.ui \
-       src/forms/dlginsert.ui \
-       src/forms/dlgline.ui \
-       src/forms/dlgmirror.ui \
-       src/forms/dlgmove.ui \
-       src/forms/dlgmoverotate.ui \
-       src/forms/dlgoptionsdrawing.ui \
-       src/forms/dlgoptionsgeneral.ui \
-       src/forms/dlgpoint.ui \
-       src/forms/dlgrotate.ui \
-       src/forms/dlgrotate2.ui \
-       src/forms/dlgscale.ui \
-       src/forms/dlgspline.ui \
-       src/forms/dlgtext.ui \
-       src/forms/exitdialog.ui \
-       src/forms/imageoptions.ui \
-       src/forms/layerdialog.ui \
-       src/forms/librarywidget.ui \
-       src/forms/mousewidget.ui \
-       src/forms/printpreviewoptions.ui \
-       src/forms/selectionwidget.ui \
-       src/forms/textoptions.ui \
-       src/forms/widgetpen.ui
+HEADERS = \
+       src/about.h \
+       src/applicationwindow.h \
+       src/baseunittab.h \
+       src/blockitemwidget.h \
+       src/blockwidget.h \
+       src/drawingview.h \
+       src/fileio.h \
+       src/generaltab.h \
+       src/geometry.h \
+       src/global.h \
+       src/layerwidget.h \
+       src/layeritemwidget.h \
+       src/main.h \
+       src/mathconstants.h \
+       src/painter.h \
+       src/settingsdialog.h \
+       src/structs.h \
+       src/utils.h \
+       src/vector.h
 
-HEADERS += \
-       src/mainapp/applicationwindow.h \
-       src/mainapp/commands.h \
-       src/mainapp/createqtactions.h \
-       src/mainapp/qc_dialogfactory.h \
-       src/mainapp/graphicview.h \
-       src/mainapp/main.h \
-       src/mainapp/mdiwindow.h \
-       src/mainapp/settings.h
+SOURCES = \
+       src/about.cpp \
+       src/applicationwindow.cpp \
+       src/baseunittab.cpp \
+       src/blockitemwidget.cpp \
+       src/blockwidget.cpp \
+       src/drawingview.cpp \
+       src/fileio.cpp \
+       src/generaltab.cpp \
+       src/geometry.cpp \
+       src/global.cpp \
+       src/layerwidget.cpp \
+       src/layeritemwidget.cpp \
+       src/main.cpp \
+       src/painter.cpp \
+       src/settingsdialog.cpp \
+       src/utils.cpp \
+       src/vector.cpp
 
-SOURCES += \
-       src/mainapp/applicationwindow.cpp \
-       src/mainapp/commands.cpp \
-       src/mainapp/createqtactions.cpp \
-       src/mainapp/qc_dialogfactory.cpp \
-       src/mainapp/graphicview.cpp \
-       src/mainapp/main.cpp \
-       src/mainapp/mdiwindow.cpp \
-       src/mainapp/settings.cpp