X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=architektonas.pro;h=edea5ee62184d50c40be368896cf63305a98265f;hb=9590e4ed45fd4e05eccc16bd8e9d51596aea5a6d;hp=ad5706f75a478ff38fd452ead99bea9975b14579;hpb=1f0d096a7fc370ff02477f3860beae2669bf8903;p=architektonas

diff --git a/architektonas.pro b/architektonas.pro
index ad5706f..edea5ee 100644
--- a/architektonas.pro
+++ b/architektonas.pro
@@ -1,15 +1,16 @@
 #
 # Architektonas Qt project file
 #
-# by James L. Hammons
-# (C) 2010 Underground Software
+# by James Hammons
+# Copyright (C) 2011 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 debug
+CONFIG    += qt warn_on release
+RESOURCES += res/architektonas.qrc
+#LIBS      += -Ldxflib/lib -ldxf
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
 OBJECTS_DIR = obj
@@ -17,616 +18,99 @@ 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/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_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_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/paintinterface.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_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/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_flags.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/paintinterface.cpp \
-	src/base/rs_pattern.cpp \
-	src/base/rs_patternlist.cpp \
-	src/base/rs_pen.cpp \
-	src/base/rs_point.cpp \
-	src/base/rs_polyline.cpp \
-	src/base/rs_preview.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/actionblocksadd.h \
-	src/actions/actionblocksattributes.h \
-	src/actions/actionblockscreate.h \
-	src/actions/actionblocksedit.h \
-	src/actions/actionblocksexplode.h \
-	src/actions/actionblocksinsert.h \
-	src/actions/actionblocksfreezeall.h \
-	src/actions/actionblocksremove.h \
-	src/actions/actionblockstoggleview.h \
-	src/actions/actiondefault.h \
-	src/actions/actiondimaligned.h \
-	src/actions/actiondimangular.h \
-	src/actions/actiondimdiametric.h \
-	src/actions/actiondimension.h \
-	src/actions/actiondimleader.h \
-	src/actions/actiondimlinear.h \
-	src/actions/actiondimradial.h \
-	src/actions/actiondrawarc.h \
-	src/actions/actiondrawarc3p.h \
-	src/actions/actiondrawarctangential.h \
-	src/actions/actiondrawcircle.h \
-	src/actions/actiondrawcircle2p.h \
-	src/actions/actiondrawcircle3p.h \
-	src/actions/actiondrawcirclecr.h \
-	src/actions/actiondrawellipseaxis.h \
-	src/actions/actiondrawhatch.h \
-	src/actions/actiondrawimage.h \
-	src/actions/actiondrawline.h \
-	src/actions/actiondrawlineangle.h \
-	src/actions/actiondrawlinebisector.h \
-	src/actions/actiondrawlinefree.h \
-	src/actions/actiondrawlinehorvert.h \
-	src/actions/actiondrawlineparallel.h \
-	src/actions/actiondrawlineparallelthrough.h \
-	src/actions/actiondrawlinepolygon.h \
-	src/actions/actiondrawlinepolygon2.h \
-	src/actions/actiondrawlinerectangle.h \
-	src/actions/actiondrawlinerelangle.h \
-	src/actions/actiondrawlinetangent1.h \
-	src/actions/actiondrawlinetangent2.h \
-	src/actions/actiondrawpoint.h \
-	src/actions/actiondrawspline.h \
-	src/actions/actiondrawtext.h \
-	src/actions/actioneditcopy.h \
-	src/actions/actioneditpaste.h \
-	src/actions/actioneditundo.h \
-	src/actions/actionfilenew.h \
-	src/actions/actionfileopen.h \
-	src/actions/actionfilesave.h \
-	src/actions/actionfilesaveas.h \
-	src/actions/actioninfoangle.h \
-	src/actions/actioninfoarea.h \
-	src/actions/actioninfodist.h \
-	src/actions/actioninfodist2.h \
-	src/actions/actioninfoinside.h \
-	src/actions/actioninfototallength.h \
-	src/actions/actionlayersadd.h \
-	src/actions/actionlayersedit.h \
-	src/actions/actionlayersfreezeall.h \
-	src/actions/actionlayersremove.h \
-	src/actions/actionlayerstogglelock.h \
-	src/actions/actionlayerstoggleview.h \
-	src/actions/actionlibraryinsert.h \
-	src/actions/actionlockrelativezero.h \
-	src/actions/actionmodifyattributes.h \
-	src/actions/actionmodifybevel.h \
-	src/actions/actionmodifycut.h \
-	src/actions/actionmodifydelete.h \
-	src/actions/actionmodifydeletefree.h \
-	src/actions/actionmodifydeletequick.h \
-	src/actions/actionmodifyentity.h \
-	src/actions/actionmodifyexplodetext.h \
-	src/actions/actionmodifymirror.h \
-	src/actions/actionmodifymove.h \
-	src/actions/actionmodifymoverotate.h \
-	src/actions/actionmodifyrotate.h \
-	src/actions/actionmodifyrotate2.h \
-	src/actions/actionmodifyround.h \
-	src/actions/actionmodifyscale.h \
-	src/actions/actionmodifystretch.h \
-	src/actions/actionmodifytrim.h \
-	src/actions/actionmodifytrimamount.h \
-	src/actions/actionoptionsdrawing.h \
-	src/actions/actionprintpreview.h \
-	src/actions/actionselect.h \
-	src/actions/actionselectall.h \
-	src/actions/actionselectbase.h \
-	src/actions/actionselectcontour.h \
-	src/actions/actionselectintersected.h \
-	src/actions/actionselectinvert.h \
-	src/actions/actionselectlayer.h \
-	src/actions/actionselectsingle.h \
-	src/actions/actionselectwindow.h \
-	src/actions/actionsetrelativezero.h \
-	src/actions/actionsetsnapmode.h \
-	src/actions/actionsetsnaprestriction.h \
-	src/actions/actionsnapintersectionmanual.h \
-	src/actions/actionzoomauto.h \
-	src/actions/actionzoomautoy.h \
-	src/actions/actionzoomin.h \
-	src/actions/actionzoompan.h \
-	src/actions/actionzoomprevious.h \
-	src/actions/actionzoomredraw.h \
-	src/actions/actionzoomscroll.h \
-	src/actions/actionzoomwindow.h
-
-SOURCES += \
-	src/actions/actionblocksadd.cpp \
-	src/actions/actionblocksattributes.cpp \
-	src/actions/actionblockscreate.cpp \
-	src/actions/actionblocksedit.cpp \
-	src/actions/actionblocksexplode.cpp \
-	src/actions/actionblocksinsert.cpp \
-	src/actions/actionblocksfreezeall.cpp \
-	src/actions/actionblocksremove.cpp \
-	src/actions/actionblockstoggleview.cpp \
-	src/actions/actiondefault.cpp \
-	src/actions/actiondimaligned.cpp \
-	src/actions/actiondimangular.cpp \
-	src/actions/actiondimdiametric.cpp \
-	src/actions/actiondimension.cpp \
-	src/actions/actiondimleader.cpp \
-	src/actions/actiondimlinear.cpp \
-	src/actions/actiondimradial.cpp \
-	src/actions/actiondrawarc.cpp \
-	src/actions/actiondrawarc3p.cpp \
-	src/actions/actiondrawarctangential.cpp \
-	src/actions/actiondrawcircle.cpp \
-	src/actions/actiondrawcircle2p.cpp \
-	src/actions/actiondrawcircle3p.cpp \
-	src/actions/actiondrawcirclecr.cpp \
-	src/actions/actiondrawellipseaxis.cpp \
-	src/actions/actiondrawhatch.cpp \
-	src/actions/actiondrawimage.cpp \
-	src/actions/actiondrawline.cpp \
-	src/actions/actiondrawlineangle.cpp \
-	src/actions/actiondrawlinebisector.cpp \
-	src/actions/actiondrawlinefree.cpp \
-	src/actions/actiondrawlinehorvert.cpp \
-	src/actions/actiondrawlineparallel.cpp \
-	src/actions/actiondrawlineparallelthrough.cpp \
-	src/actions/actiondrawlinepolygon.cpp \
-	src/actions/actiondrawlinepolygon2.cpp \
-	src/actions/actiondrawlinerectangle.cpp \
-	src/actions/actiondrawlinerelangle.cpp \
-	src/actions/actiondrawlinetangent1.cpp \
-	src/actions/actiondrawlinetangent2.cpp \
-	src/actions/actiondrawpoint.cpp \
-	src/actions/actiondrawspline.cpp \
-	src/actions/actiondrawtext.cpp \
-	src/actions/actioneditcopy.cpp \
-	src/actions/actioneditpaste.cpp \
-	src/actions/actioneditundo.cpp \
-	src/actions/actionfilenew.cpp \
-	src/actions/actionfileopen.cpp \
-	src/actions/actionfilesave.cpp \
-	src/actions/actionfilesaveas.cpp \
-	src/actions/actioninfoangle.cpp \
-	src/actions/actioninfoarea.cpp \
-	src/actions/actioninfodist.cpp \
-	src/actions/actioninfodist2.cpp \
-	src/actions/actioninfoinside.cpp \
-	src/actions/actioninfototallength.cpp \
-	src/actions/actionlayersadd.cpp \
-	src/actions/actionlayersedit.cpp \
-	src/actions/actionlayersfreezeall.cpp \
-	src/actions/actionlayersremove.cpp \
-	src/actions/actionlayerstogglelock.cpp \
-	src/actions/actionlayerstoggleview.cpp \
-	src/actions/actionlibraryinsert.cpp \
-	src/actions/actionlockrelativezero.cpp \
-	src/actions/actionmodifyattributes.cpp \
-	src/actions/actionmodifybevel.cpp \
-	src/actions/actionmodifycut.cpp \
-	src/actions/actionmodifydelete.cpp \
-	src/actions/actionmodifydeletefree.cpp \
-	src/actions/actionmodifydeletequick.cpp \
-	src/actions/actionmodifyentity.cpp \
-	src/actions/actionmodifyexplodetext.cpp \
-	src/actions/actionmodifymirror.cpp \
-	src/actions/actionmodifymove.cpp \
-	src/actions/actionmodifymoverotate.cpp \
-	src/actions/actionmodifyrotate.cpp \
-	src/actions/actionmodifyrotate2.cpp \
-	src/actions/actionmodifyround.cpp \
-	src/actions/actionmodifyscale.cpp \
-	src/actions/actionmodifystretch.cpp \
-	src/actions/actionmodifytrim.cpp \
-	src/actions/actionmodifytrimamount.cpp \
-	src/actions/actionoptionsdrawing.cpp \
-	src/actions/actionprintpreview.cpp \
-	src/actions/actionselect.cpp \
-	src/actions/actionselectall.cpp \
-	src/actions/actionselectbase.cpp \
-	src/actions/actionselectcontour.cpp \
-	src/actions/actionselectintersected.cpp \
-	src/actions/actionselectinvert.cpp \
-	src/actions/actionselectlayer.cpp \
-	src/actions/actionselectsingle.cpp \
-	src/actions/actionselectwindow.cpp \
-	src/actions/actionsetrelativezero.cpp \
-	src/actions/actionsetsnapmode.cpp \
-	src/actions/actionsetsnaprestriction.cpp \
-	src/actions/actionsnapintersectionmanual.cpp \
-	src/actions/actionzoomauto.cpp \
-	src/actions/actionzoomautoy.cpp \
-	src/actions/actionzoomin.cpp \
-	src/actions/actionzoompan.cpp \
-	src/actions/actionzoomprevious.cpp \
-	src/actions/actionzoomredraw.cpp \
-	src/actions/actionzoomscroll.cpp \
-	src/actions/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/layerdialog.h \
-	src/forms/libraryinsertoptions.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/actionhandler.h \
-	src/widgets/blockwidget.h \
-	src/widgets/colorbox.h \
-	src/widgets/commandedit.h \
-	src/widgets/qg_dialogfactory.h \
-	src/widgets/filedialog.h \
-	src/widgets/fontbox.h \
-	src/widgets/qg_graphicview.h \
-	src/widgets/layerbox.h \
-	src/widgets/layerwidget.h \
-	src/widgets/linetypebox.h \
-	src/widgets/listviewitem.h \
-	src/widgets/qg_mainwindowinterface.h \
-	src/widgets/patternbox.h \
-	src/widgets/pentoolbar.h \
-	src/widgets/recentfiles.h \
-	src/widgets/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/layerdialog.cpp \
-	src/forms/libraryinsertoptions.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/actionhandler.cpp \
-	src/widgets/blockwidget.cpp \
-	src/widgets/colorbox.cpp \
-	src/widgets/commandedit.cpp \
-	src/widgets/qg_dialogfactory.cpp \
-	src/widgets/filedialog.cpp \
-	src/widgets/fontbox.cpp \
-	src/widgets/qg_graphicview.cpp \
-	src/widgets/layerbox.cpp \
-	src/widgets/layerwidget.cpp \
-	src/widgets/linetypebox.cpp \
-	src/widgets/listviewitem.cpp \
-	src/widgets/patternbox.cpp \
-	src/widgets/pentoolbar.cpp \
-	src/widgets/recentfiles.cpp \
-	src/widgets/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/action.h \
+	src/applicationwindow.h \
+	src/arc.h \
+	src/baseunittab.h \
+	src/blockitemwidget.h \
+	src/blockwidget.h \
+	src/circle.h \
+	src/connection.h \
+	src/container.h \
+	src/dimension.h \
+	src/drawingview.h \
+	src/drawarcaction.h \
+	src/drawcircleaction.h \
+	src/drawdimensionaction.h \
+	src/drawlineaction.h \
+	src/drawtextaction.h \
+	src/ellipse.h \
+	src/fileio.h \
+	src/generaltab.h \
+	src/geometry.h \
+	src/layerwidget.h \
+	src/layeritemwidget.h \
+	src/line.h \
+	src/main.h \
+	src/mirroraction.h \
+	src/mathconstants.h \
+	src/object.h \
+	src/painter.h \
+	src/rotateaction.h \
+	src/settingsdialog.h \
+	src/text.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/action.cpp \
+	src/applicationwindow.cpp \
+	src/arc.cpp \
+	src/baseunittab.cpp \
+	src/blockitemwidget.cpp \
+	src/blockwidget.cpp \
+	src/circle.cpp \
+	src/connection.cpp \
+	src/container.cpp \
+	src/dimension.cpp \
+	src/drawingview.cpp \
+	src/drawarcaction.cpp \
+	src/drawcircleaction.cpp \
+	src/drawdimensionaction.cpp \
+	src/drawlineaction.cpp \
+	src/drawtextaction.cpp \
+	src/ellipse.cpp \
+	src/fileio.cpp \
+	src/generaltab.cpp \
+	src/geometry.cpp \
+	src/layerwidget.cpp \
+	src/layeritemwidget.cpp \
+	src/line.cpp \
+	src/main.cpp \
+	src/mirroraction.cpp \
+	src/object.cpp \
+	src/painter.cpp \
+	src/rotateaction.cpp \
+	src/settingsdialog.cpp \
+	src/text.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