X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=architektonas.pro;h=b9b6b50c33e15a967f15646aeafefd348e6d78fd;hb=bfd926cd5fd98e95b8b172fabd5340c9b1957e01;hp=b1d87fbca01f0179479b53a3b14ea38c4fd8391a;hpb=0e80da8b560e09124c527f3544859e0c31157ce4;p=architektonas diff --git a/architektonas.pro b/architektonas.pro index b1d87fb..b9b6b50 100644 --- a/architektonas.pro +++ b/architektonas.pro @@ -2,14 +2,15 @@ # Architektonas Qt project file # # by James L. Hammons -# (C) 2010 Underground Software +# Copyright (C) 2010 Underground Software # # Parts are based on QCad Community Edition by Andrew Mustun +# See the README and GPLv2 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 +LIBS += -Ldxflib/lib -ldxf # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-) OBJECTS_DIR = obj @@ -18,7 +19,16 @@ RCC_DIR = obj UI_DIR = obj INCLUDEPATH += \ - fparser/include \ + fparser \ + dxflib/include \ + src/mainapp \ + src/actions \ + src/base \ + src/widgets \ + src/forms + +DEPENDPATH = \ + fparser \ dxflib/include \ src/mainapp \ src/actions \ @@ -27,381 +37,393 @@ INCLUDEPATH += \ src/forms HEADERS = \ - src/base/rs_actioninterface.h \ - src/base/rs_preview.h \ - src/base/rs_previewactioninterface.h \ - src/base/rs_snapper.h \ - src/base/rs_creation.h \ - src/base/rs_debug.h \ - src/base/rs.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_clipboard.h \ - src/base/rs_circle.h \ - src/base/rs_color.h \ - src/base/rs_constructionline.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/rs_ellipse.h \ - src/base/rs_entity.h \ - src/base/rs_entitycontainer.h \ - src/base/rs_flags.h \ - src/base/rs_font.h \ - src/base/rs_fontchar.h \ - src/base/rs_fontlist.h \ + fparser/fparser.hh + +HEADERS += \ + src/base/actioninterface.h \ + src/base/arc.h \ + src/base/atomicentity.h \ + src/base/block.h \ + src/base/blocklist.h \ + src/base/circle.h \ + src/base/clipboard.h \ + src/base/color.h \ + src/base/commandevent.h \ + src/base/creation.h \ + src/base/constructionline.h \ + src/base/debug.h \ + src/base/dialogfactory.h \ + src/base/dialogfactoryinterface.h \ + src/base/dialogfactoryadapter.h \ + src/base/dimaligned.h \ + src/base/dimangular.h \ + src/base/dimdiametric.h \ + src/base/dimension.h \ + src/base/dimlinear.h \ + src/base/dimradial.h \ + src/base/document.h \ src/base/drawing.h \ - src/base/rs_hatch.h \ - src/base/rs_insert.h \ - src/base/rs_image.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_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_solid.h \ - src/base/rs_spline.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/ellipse.h \ + src/base/entity.h \ + src/base/entitycontainer.h \ + src/base/enums.h \ + src/base/eventhandler.h \ + src/base/fileio.h \ + src/base/filtercxf.h \ + src/base/filterdxf.h \ + src/base/filterdxf1.h \ + src/base/filterinterface.h \ + src/base/flags.h \ + src/base/font.h \ + src/base/fontchar.h \ + src/base/fontlist.h \ + src/base/grid.h \ + src/base/hatch.h \ + src/base/image.h \ + src/base/information.h \ + src/base/infoarea.h \ + src/base/insert.h \ + src/base/layer.h \ + src/base/layerlist.h \ + src/base/leader.h \ + src/base/line.h \ + src/base/linetypepattern.h \ + src/base/mainwindowinterface.h \ + src/base/mathextra.h \ + src/base/modification.h \ + src/base/paintinterface.h \ + src/base/pattern.h \ + src/base/patternlist.h \ + src/base/pen.h \ + src/base/point.h \ + src/base/polyline.h \ + src/base/preview.h \ + src/base/script.h \ + src/base/scriptlist.h \ + src/base/selection.h \ + src/base/solid.h \ + src/base/spline.h \ + src/base/staticgraphicview.h \ + src/base/system.h \ + src/base/text.h \ + src/base/undo.h \ + src/base/undoable.h \ + src/base/undocycle.h \ + src/base/units.h \ + src/base/utility.h \ + src/base/variable.h \ + src/base/variabledict.h \ src/base/vector.h \ - src/base/vectorsolutions.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_commandevent.h \ - src/base/rs_dialogfactory.h \ - src/base/rs_dialogfactoryinterface.h \ - src/base/rs_dialogfactoryadapter.h \ - src/base/rs_eventhandler.h \ - src/base/rs_graphicview.h \ - src/base/rs_grid.h \ - src/base/rs_linetypepattern.h \ - src/base/rs_mainwindowinterface.h \ - src/base/rs_staticgraphicview.h \ - src/base/rs_information.h \ - src/base/rs_infoarea.h \ - src/base/rs_modification.h \ - src/base/rs_selection.h \ - src/base/rs_math.h \ - src/base/rs_python.h \ - src/base/rs_simplepython.h \ - src/base/rs_python_wrappers.h \ - src/base/rs_script.h \ - src/base/rs_scriptlist.h \ - src/base/paintintf.h + src/base/vectorsolutions.h + +# src/base/snapper.h \ +# SOURCES = \ - src/base/rs_actioninterface.cpp \ - src/base/rs_preview.cpp \ - src/base/rs_previewactioninterface.cpp \ - src/base/rs_snapper.cpp \ - src/base/rs_creation.cpp \ - src/base/rs_debug.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_constructionline.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/rs_ellipse.cpp \ - src/base/rs_entity.cpp \ - src/base/rs_entitycontainer.cpp \ - src/base/rs_font.cpp \ - src/base/rs_fontlist.cpp \ + fparser/fparser.cc \ + fparser/fpoptimizer.cc + +SOURCES += \ + src/base/actioninterface.cpp \ + src/base/arc.cpp \ + src/base/atomicentity.cpp \ + src/base/block.cpp \ + src/base/blocklist.cpp \ + src/base/clipboard.cpp \ + src/base/circle.cpp \ + src/base/color.cpp \ + src/base/commandevent.cpp \ + src/base/constructionline.cpp \ + src/base/creation.cpp \ + src/base/debug.cpp \ + src/base/dialogfactory.cpp \ + src/base/dimaligned.cpp \ + src/base/dimangular.cpp \ + src/base/dimdiametric.cpp \ + src/base/dimension.cpp \ + src/base/dimlinear.cpp \ + src/base/dimradial.cpp \ + src/base/document.cpp \ src/base/drawing.cpp \ - src/base/rs_hatch.cpp \ - src/base/rs_insert.cpp \ - src/base/rs_image.cpp \ - src/base/rs_layer.cpp \ - src/base/rs_layerlist.cpp \ - src/base/rs_leader.cpp \ - src/base/rs_line.cpp \ - src/base/rs_pattern.cpp \ - src/base/rs_patternlist.cpp \ - src/base/rs_point.cpp \ - src/base/rs_polyline.cpp \ - src/base/rs_solid.cpp \ - src/base/rs_spline.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/ellipse.cpp \ + src/base/entity.cpp \ + src/base/entitycontainer.cpp \ + src/base/enums.cpp \ + src/base/eventhandler.cpp \ + src/base/fileio.cpp \ + src/base/filtercxf.cpp \ + src/base/filterdxf.cpp \ + src/base/filterdxf1.cpp \ + src/base/filterinterface.cpp \ + src/base/flags.cpp \ + src/base/font.cpp \ + src/base/fontlist.cpp \ + src/base/grid.cpp \ + src/base/hatch.cpp \ + src/base/image.cpp \ + src/base/information.cpp \ + src/base/infoarea.cpp \ + src/base/insert.cpp \ + src/base/layer.cpp \ + src/base/layerlist.cpp \ + src/base/leader.cpp \ + src/base/line.cpp \ + src/base/linetypepattern.cpp \ + src/base/mathextra.cpp \ + src/base/modification.cpp \ + src/base/paintinterface.cpp \ + src/base/pattern.cpp \ + src/base/patternlist.cpp \ + src/base/pen.cpp \ + src/base/point.cpp \ + src/base/polyline.cpp \ + src/base/preview.cpp \ + src/base/script.cpp \ + src/base/scriptlist.cpp \ + src/base/selection.cpp \ + src/base/solid.cpp \ + src/base/spline.cpp \ + src/base/staticgraphicview.cpp \ + src/base/system.cpp \ + src/base/text.cpp \ + src/base/undo.cpp \ + src/base/undoable.cpp \ + src/base/undocycle.cpp \ + src/base/units.cpp \ + src/base/utility.cpp \ + src/base/variable.cpp \ + src/base/variabledict.cpp \ src/base/vector.cpp \ - src/base/vectorsolutions.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_commandevent.cpp \ - src/base/rs_dialogfactory.cpp \ - src/base/rs_eventhandler.cpp \ - src/base/rs_graphicview.cpp \ - src/base/rs_grid.cpp \ - src/base/rs_linetypepattern.cpp \ - src/base/rs_staticgraphicview.cpp \ - src/base/rs_information.cpp \ - src/base/rs_infoarea.cpp \ - src/base/rs_math.cpp \ - src/base/rs_modification.cpp \ - src/base/rs_selection.cpp \ - src/base/rs_python.cpp \ - src/base/rs_simplepython.cpp \ - src/base/rs_python_wrappers.cpp \ - src/base/rs_script.cpp \ - src/base/rs_scriptlist.cpp \ - src/base/paintintf.cpp + src/base/vectorsolutions.cpp + +# src/base/snapper.cpp \ +# 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 + 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/actiondrawpolyline.h \ + src/actions/actionpolylineadd.h \ + src/actions/actionpolylineappend.h \ + src/actions/actionpolylinedel.h \ + src/actions/actionpolylinedelbetween.h \ + src/actions/actionpolylinetrim.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/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 + 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/actiondrawpolyline.cpp \ + src/actions/actionpolylineadd.cpp \ + src/actions/actionpolylineappend.cpp \ + src/actions/actionpolylinedel.cpp \ + src/actions/actionpolylinedelbetween.cpp \ + src/actions/actionpolylinetrim.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 HEADERS += \ src/forms/arcoptions.h \ @@ -425,45 +447,72 @@ HEADERS += \ 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/polylineoptions.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/actionhandler.h \ + src/widgets/blockwidget.h \ + src/widgets/colorbox.h \ + src/widgets/commandedit.h \ src/widgets/qg_dialogfactory.h \ - src/widgets/qg_filedialog.h \ - src/widgets/qg_fontbox.h \ + src/widgets/filedialog.h \ + src/widgets/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/layerbox.h \ + src/widgets/layerwidget.h \ + src/widgets/linetypebox.h \ src/widgets/qg_mainwindowinterface.h \ - src/widgets/qg_patternbox.h \ - src/widgets/qg_pentoolbar.h \ - src/widgets/qg_qt2rs.h \ - src/widgets/qg_recentfiles.h \ - src/widgets/qg_scrollbar.h \ - src/widgets/qg_widthbox.h + src/widgets/patternbox.h \ + src/widgets/pentoolbar.h \ + src/widgets/recentfiles.h \ + src/widgets/widthbox.h SOURCES += \ src/forms/arcoptions.cpp \ @@ -487,112 +536,103 @@ SOURCES += \ 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/polylineoptions.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/actionhandler.cpp \ + src/widgets/blockwidget.cpp \ + src/widgets/colorbox.cpp \ + src/widgets/commandedit.cpp \ src/widgets/qg_dialogfactory.cpp \ - src/widgets/qg_filedialog.cpp \ - src/widgets/qg_fontbox.cpp \ + src/widgets/filedialog.cpp \ + src/widgets/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/qg_recentfiles.cpp \ - src/widgets/qg_scrollbar.cpp \ - src/widgets/qg_widthbox.cpp + src/widgets/layerbox.cpp \ + src/widgets/layerwidget.cpp \ + src/widgets/linetypebox.cpp \ + src/widgets/patternbox.cpp \ + src/widgets/pentoolbar.cpp \ + src/widgets/recentfiles.cpp \ + src/widgets/widthbox.cpp -#The following line was changed from FORMS to FORMS3 by qt3to4 -#FORMS3 = \ -# ui/qg_dimensionlabeleditor.ui \ -# ui/qg_dlghatch.ui \ -# ui/qg_dlginsert.ui \ -# ui/qg_dlgarc.ui \ -# ui/qg_dlgcircle.ui \ -# ui/qg_dlgdimension.ui \ -# ui/qg_dlgdimlinear.ui \ -# ui/qg_dlgline.ui \ -# ui/qg_dlgellipse.ui \ -# ui/qg_dlgmirror.ui \ -# ui/qg_dlgmove.ui \ -# ui/qg_dlgmoverotate.ui \ -# ui/qg_dlgpoint.ui \ -# ui/qg_dlgrotate.ui \ -# ui/qg_dlgrotate2.ui \ -# ui/qg_dlgscale.ui \ -# ui/qg_dlgspline.ui \ -# ui/qg_insertoptions.ui \ -# ui/qg_libraryinsertoptions.ui \ -# ui/qg_lineangleoptions.ui \ -# ui/qg_linebisectoroptions.ui \ -# ui/qg_lineparalleloptions.ui \ -# ui/qg_lineparallelthroughoptions.ui \ -# ui/qg_linepolygon2options.ui \ -# ui/qg_linepolygonoptions.ui \ -# ui/qg_linerelangleoptions.ui \ -# ui/qg_moverotateoptions.ui \ -# ui/qg_roundoptions.ui \ -# ui/qg_snapdistoptions.ui \ - -# src/forms/arcoptions.ui \ -# src/forms/arctangentialoptions.ui \ -# src/forms/dimlinearoptions.ui \ -# src/forms/dimoptions.ui \ -# src/forms/splineoptions.ui \ -# src/forms/trimamountoptions.ui -# FORMS = \ src/forms/blockdialog.ui \ - src/forms/cadtoolbar.ui \ - src/forms/cadtoolbararcs.ui \ - src/forms/cadtoolbarcircles.ui \ - src/forms/cadtoolbardim.ui \ - src/forms/cadtoolbarellipses.ui \ - src/forms/cadtoolbarinfo.ui \ - src/forms/cadtoolbarlines.ui \ - src/forms/cadtoolbarmain.ui \ - src/forms/cadtoolbarmodify.ui \ - src/forms/cadtoolbarpoints.ui \ - src/forms/cadtoolbarpolylines.ui \ - src/forms/cadtoolbarselect.ui \ - src/forms/cadtoolbarsnap.ui \ - src/forms/cadtoolbarsplines.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/lineoptions.ui \ src/forms/mousewidget.ui \ src/forms/printpreviewoptions.ui \ src/forms/selectionwidget.ui \ @@ -600,21 +640,21 @@ FORMS = \ src/forms/widgetpen.ui HEADERS += \ + src/mainapp/applicationwindow.h \ src/mainapp/commands.h \ src/mainapp/createqtactions.h \ - src/mainapp/qc_applicationwindow.h \ src/mainapp/qc_dialogfactory.h \ - src/mainapp/qc_graphicview.h \ - src/mainapp/qc_mdiwindow.h \ + src/mainapp/graphicview.h \ src/mainapp/main.h \ + src/mainapp/mdiwindow.h \ src/mainapp/settings.h SOURCES += \ + src/mainapp/applicationwindow.cpp \ src/mainapp/commands.cpp \ src/mainapp/createqtactions.cpp \ - src/mainapp/qc_applicationwindow.cpp \ src/mainapp/qc_dialogfactory.cpp \ - src/mainapp/qc_graphicview.cpp \ - src/mainapp/qc_mdiwindow.cpp \ + src/mainapp/graphicview.cpp \ src/mainapp/main.cpp \ + src/mainapp/mdiwindow.cpp \ src/mainapp/settings.cpp