]> Shamusworld >> Repos - architektonas/blobdiff - architektonas.pro
Refactored CAD tool bars to use predefined actions.
[architektonas] / architektonas.pro
index b14716495622f9cd9a08788f7eaaa703590a7e3e..9cb30c5b26930abec9153f87220a78f335bc3707 100644 (file)
@@ -27,23 +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_application.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 \
@@ -51,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 \
@@ -84,42 +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_coordinateevent.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 \
@@ -127,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 \
@@ -135,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 \
@@ -164,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 \
@@ -406,6 +402,9 @@ SOURCES += \
        src/actions/rs_actionzoomwindow.cpp
 
 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 \
@@ -421,23 +420,57 @@ HEADERS += \
        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 \
@@ -454,12 +487,14 @@ 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
 
 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 \
@@ -475,23 +510,57 @@ SOURCES += \
        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 \
@@ -507,80 +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_arcoptions.ui \
-#      ui/qg_arctangentialoptions.ui \
-#      ui/qg_beveloptions.ui \
-#      ui/qg_circleoptions.ui \
-#      ui/qg_dimensionlabeleditor.ui \
-#      ui/qg_dimlinearoptions.ui \
-#      ui/qg_dimoptions.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 \
-#      ui/qg_splineoptions.ui \
-#      ui/qg_textoptions.ui \
-#      ui/qg_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 \
@@ -588,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