X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=architektonas.pro;h=9cb30c5b26930abec9153f87220a78f335bc3707;hb=f7188d32d0beaef31fc3475be05daea2f018ebec;hp=3eaaef6733a2d1acfc6b966d0f8a3249fe517e15;hpb=95a6dd28327cbd80f9221b1457e7edd4e7230169;p=architektonas diff --git a/architektonas.pro b/architektonas.pro index 3eaaef6..9cb30c5 100644 --- a/architektonas.pro +++ b/architektonas.pro @@ -27,22 +27,23 @@ 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_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_clipboard.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 \ @@ -50,29 +51,53 @@ HEADERS = \ 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/drawing.h \ + src/base/rs_grid.h \ src/base/rs_hatch.h \ - src/base/rs_insert.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 \ @@ -83,41 +108,10 @@ HEADERS = \ src/base/rs_variable.h \ src/base/rs_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 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 \ @@ -125,7 +119,11 @@ SOURCES = \ 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 \ @@ -133,25 +131,48 @@ SOURCES = \ 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/drawing.cpp \ + src/base/rs_grid.cpp \ src/base/rs_hatch.cpp \ - src/base/rs_insert.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 \ @@ -162,30 +183,7 @@ SOURCES = \ src/base/rs_variable.cpp \ src/base/rs_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 HEADERS += \ src/actions/rs_actionblocksadd.h \ @@ -425,16 +423,35 @@ 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/libraryinsertoptions.h \ src/forms/layerdialog.h \ src/forms/librarywidget.h \ src/forms/lineangleoptions.h \ @@ -470,8 +487,7 @@ HEADERS += \ 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/recentfiles.h \ src/widgets/qg_scrollbar.h \ src/widgets/qg_widthbox.h @@ -497,16 +513,35 @@ 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/libraryinsertoptions.cpp \ src/forms/layerdialog.cpp \ src/forms/librarywidget.cpp \ src/forms/lineangleoptions.cpp \ @@ -541,78 +576,42 @@ SOURCES += \ src/widgets/qg_listviewitem.cpp \ src/widgets/qg_patternbox.cpp \ src/widgets/qg_pentoolbar.cpp \ - src/widgets/qg_recentfiles.cpp \ + src/widgets/recentfiles.cpp \ src/widgets/qg_scrollbar.cpp \ src/widgets/qg_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 \ - -# src/forms/lineangleoptions.ui \ -# src/forms/linebisectoroptions.ui \ -# src/forms/lineparalleloptions.ui \ -# src/forms/lineparallelthroughoptions.ui \ -# src/forms/linepolygon2options.ui \ -# src/forms/linepolygonoptions.ui \ -# src/forms/linerelangleoptions.ui \ -# src/forms/moverotateoptions.ui \ -# src/forms/arcoptions.ui \ -# src/forms/arctangentialoptions.ui \ -# src/forms/dimlinearoptions.ui \ -# src/forms/dimoptions.ui \ -# src/forms/roundoptions.ui \ -# src/forms/snapdistoptions.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 \ @@ -620,21 +619,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