diff --git a/.gitignore b/.gitignore index 0b47f45..90ad486 100644 --- a/.gitignore +++ b/.gitignore @@ -51,9 +51,6 @@ moc_*.cpp prototypes/gst/ qrc_*.cpp *.moc -src/*/mocs/ -src/*/objs/ -src/*/qrc/ # Folders not to be included html/ diff --git a/docs/Doxyfile b/Doxyfile similarity index 100% rename from docs/Doxyfile rename to Doxyfile diff --git a/scripts/build.sh b/build.sh similarity index 100% rename from scripts/build.sh rename to build.sh diff --git a/docs/index.dox b/index.dox similarity index 100% rename from docs/index.dox rename to index.dox diff --git a/docs/manual/manual_en.rst b/manual/manual_en.rst similarity index 100% rename from docs/manual/manual_en.rst rename to manual/manual_en.rst diff --git a/resources/interface.qrc b/resources/interface.qrc deleted file mode 100644 index 1bd5a4e..0000000 --- a/resources/interface.qrc +++ /dev/null @@ -1,51 +0,0 @@ - - - images/icons/newdoc_w.png - images/icons/open_w.png - images/icons/save_w.png - images/icons/save_w.png - images/icons/fullscreen_w.png - images/icons/nofullscreen_w.png - images/icons/ctrl2_w.png - images/icons/test_signal_w.png - images/icons/add_movie_w.png - images/icons/add_img_w.png - images/icons/add_paint_w.png - images/shapes/add_quad.png - images/shapes/add_triangle.png - images/shapes/add_circle.png - images/icons/play_w.png - images/icons/pause_w.png - images/icons/rewind_w.png - images/shapes/add_quad.png - images/shapes/add_triangle.png - images/shapes/add_circle.png - images/shapes/add_circle.png - images/logo/logomapmap.png - images/logo/logomapmap-light.png - images/logo/mapmap-logo.png - images/logo/splash.png - fonts/DroidSans.otf - fonts/DroidSans.otf - images/test-signal/test-signal.svg - images/icons/zoom_reset_w.png - images/icons/zoom_in_w.png - images/icons/zoom_out_w.png - images/icons/zoom_fit_w.png - images/icons/small/delete_w.png - images/icons/small/lock_w.png - images/icons/small/visible_w.png - images/icons/small/duplicate_w.png - images/icons/small/solo.png - qss/mapmap.qss - fonts/Hack-Regular.otf - images/menu/preferences.png - images/test-signal/pal-test-signal.svg - images/test-signal/examples/classic-test-card.png - images/test-signal/examples/pal-test-card.png - images/test-signal/examples/ntsc-test-card.png - images/checkbox/checkbox-unchecked.png - images/test-signal/ntsc-test-signal.svg - images/logo/mapmap-wide-with-border.svg - - diff --git a/scripts/run.sh b/run.sh similarity index 100% rename from scripts/run.sh rename to run.sh diff --git a/scripts/sh_build_doc.sh b/sh_build_doc.sh similarity index 100% rename from scripts/sh_build_doc.sh rename to sh_build_doc.sh diff --git a/scripts/sh_clean.sh b/sh_clean.sh similarity index 100% rename from scripts/sh_clean.sh rename to sh_clean.sh diff --git a/scripts/sh_make_tarball.sh b/sh_make_tarball.sh similarity index 100% rename from scripts/sh_make_tarball.sh rename to sh_make_tarball.sh diff --git a/scripts/sh_release.sh b/sh_release.sh similarity index 100% rename from scripts/sh_release.sh rename to sh_release.sh diff --git a/scripts/sh_show_libs.sh b/sh_show_libs.sh similarity index 100% rename from scripts/sh_show_libs.sh rename to sh_show_libs.sh diff --git a/src/MapMapProject.pro b/src/MapMapProject.pro new file mode 100644 index 0000000..e541165 --- /dev/null +++ b/src/MapMapProject.pro @@ -0,0 +1,9 @@ +TEMPLATE = subdirs + +SUBDIRS = mapmap tests + +# Adds the tarball target +tarball.target = mapmap-$${VERSION}.tar.gz +tarball.commands = git archive --format=tar.gz -9 --prefix=mapmap-$${VERSION}/ --output=mapmap-$${VERSION}.tar.gz HEAD +tarball.depends = .git +QMAKE_EXTRA_TARGETS += tarball diff --git a/src/app/app.pri b/src/app/app.pri deleted file mode 100644 index 40e6fb1..0000000 --- a/src/app/app.pri +++ /dev/null @@ -1,11 +0,0 @@ - -include(../src.pri) - -HEADERS += $$PWD/MainApplication.h - -SOURCES += $$PWD/MainApplication.cpp \ - $$PWD/main.cpp - -MOC_DIR = $$PWD/mocs -OBJECTS_DIR = $$PWD/objs -RCC_DIR = $$PWD/qrc diff --git a/src/control/control.pri b/src/control/control.pri deleted file mode 100644 index 80e6899..0000000 --- a/src/control/control.pri +++ /dev/null @@ -1,9 +0,0 @@ - -include(../src.pri) - -HEADERS += $$PWD/ConcurrentQueue.h \ - $$PWD/OscInterface.h \ - $$PWD/OscReceiver.h - -SOURCES += $$PWD/OscInterface.cpp \ - $$PWD/OscReceiver.cpp diff --git a/src/core/core.pri b/src/core/core.pri deleted file mode 100644 index a8df44f..0000000 --- a/src/core/core.pri +++ /dev/null @@ -1,39 +0,0 @@ - -include(../src.pri) - -HEADERS += $$PWD/Commands.h \ - $$PWD/Element.h \ - $$PWD/Mapping.h \ - $$PWD/MappingManager.h \ - $$PWD/Maths.h \ - $$PWD/MetaObjectRegistry.h \ - $$PWD/MM.h \ - $$PWD/Paint.h \ - $$PWD/ProjectLabels.h \ - $$PWD/ProjectReader.h \ - $$PWD/ProjectWriter.h \ - $$PWD/Serializable.h \ - $$PWD/UidAllocator.h \ - $$PWD/VideoImpl.h \ - $$PWD/VideoShmSrcImpl.h \ - $$PWD/VideoUriDecodeBinImpl.h \ - $$PWD/VideoV4l2SrcImpl.h \ - $$PWD/Util.h - -SOURCES += $$PWD/Commands.cpp \ - $$PWD/Element.cpp \ - $$PWD/Mapping.cpp \ - $$PWD/MappingManager.cpp \ - $$PWD/MetaObjectRegistry.cpp \ - $$PWD/MM.cpp \ - $$PWD/Paint.cpp \ - $$PWD/ProjectLabels.cpp \ - $$PWD/ProjectReader.cpp \ - $$PWD/ProjectWriter.cpp \ - $$PWD/Serializable.cpp \ - $$PWD/UidAllocator.cpp \ - $$PWD/VideoImpl.cpp \ - $$PWD/VideoShmSrcImpl.cpp \ - $$PWD/VideoUriDecodeBinImpl.cpp \ - $$PWD/VideoV4l2SrcImpl.cpp \ - $$PWD/Util.cpp diff --git a/src/gui/gui.pri b/src/gui/gui.pri deleted file mode 100644 index 742f1b8..0000000 --- a/src/gui/gui.pri +++ /dev/null @@ -1,36 +0,0 @@ - -include(../src.pri) - -include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri) -include(contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri) - -HEADERS += $$PWD/AboutDialog.h \ - $$PWD/ConsoleWindow.h \ - $$PWD/GuiForward.h \ - $$PWD/MainWindow.h \ - $$PWD/MapperGLCanvas.h \ - $$PWD/MapperGLCanvasToolbar.h \ - $$PWD/MappingGui.h \ - $$PWD/MappingItemDelegate.h \ - $$PWD/MappingListModel.h \ - $$PWD/OutputGLCanvas.h \ - $$PWD/OutputGLWindow.h \ - $$PWD/PaintGui.h \ - $$PWD/PreferenceDialog.h \ - $$PWD/ShapeControlPainter.h \ - $$PWD/ShapeGraphicsItem.h - -SOURCES += $$PWD/AboutDialog.cpp \ - $$PWD/ConsoleWindow.cpp \ - $$PWD/MainWindow.cpp \ - $$PWD/MapperGLCanvas.cpp \ - $$PWD/MapperGLCanvasToolbar.cpp \ - $$PWD/MappingGui.cpp \ - $$PWD/MappingItemDelegate.cpp \ - $$PWD/MappingListModel.cpp \ - $$PWD/OutputGLCanvas.cpp \ - $$PWD/OutputGLWindow.cpp \ - $$PWD/PaintGui.cpp \ - $$PWD/PreferenceDialog.cpp \ - $$PWD/ShapeControlPainter.cpp \ - $$PWD/ShapeGraphicsItem.cpp diff --git a/src/gui/AboutDialog.cpp b/src/mapmap/AboutDialog.cpp similarity index 100% rename from src/gui/AboutDialog.cpp rename to src/mapmap/AboutDialog.cpp diff --git a/src/gui/AboutDialog.h b/src/mapmap/AboutDialog.h similarity index 100% rename from src/gui/AboutDialog.h rename to src/mapmap/AboutDialog.h diff --git a/src/core/Commands.cpp b/src/mapmap/Commands.cpp similarity index 100% rename from src/core/Commands.cpp rename to src/mapmap/Commands.cpp diff --git a/src/core/Commands.h b/src/mapmap/Commands.h similarity index 100% rename from src/core/Commands.h rename to src/mapmap/Commands.h diff --git a/src/control/ConcurrentQueue.h b/src/mapmap/ConcurrentQueue.h similarity index 99% rename from src/control/ConcurrentQueue.h rename to src/mapmap/ConcurrentQueue.h index 84a0594..4d0a6e2 100644 --- a/src/control/ConcurrentQueue.h +++ b/src/mapmap/ConcurrentQueue.h @@ -31,6 +31,7 @@ #include #include #include +#include "MM.h" namespace mmp { diff --git a/src/gui/ConsoleWindow.cpp b/src/mapmap/ConsoleWindow.cpp similarity index 100% rename from src/gui/ConsoleWindow.cpp rename to src/mapmap/ConsoleWindow.cpp diff --git a/src/gui/ConsoleWindow.h b/src/mapmap/ConsoleWindow.h similarity index 100% rename from src/gui/ConsoleWindow.h rename to src/mapmap/ConsoleWindow.h diff --git a/src/core/Element.cpp b/src/mapmap/Element.cpp similarity index 100% rename from src/core/Element.cpp rename to src/mapmap/Element.cpp diff --git a/src/core/Element.h b/src/mapmap/Element.h similarity index 100% rename from src/core/Element.h rename to src/mapmap/Element.h diff --git a/src/shape/Ellipse.cpp b/src/mapmap/Ellipse.cpp similarity index 100% rename from src/shape/Ellipse.cpp rename to src/mapmap/Ellipse.cpp diff --git a/src/shape/Ellipse.h b/src/mapmap/Ellipse.h similarity index 100% rename from src/shape/Ellipse.h rename to src/mapmap/Ellipse.h diff --git a/src/gui/GuiForward.h b/src/mapmap/GuiForward.h similarity index 100% rename from src/gui/GuiForward.h rename to src/mapmap/GuiForward.h diff --git a/src/core/MM.cpp b/src/mapmap/MM.cpp similarity index 100% rename from src/core/MM.cpp rename to src/mapmap/MM.cpp diff --git a/src/core/MM.h b/src/mapmap/MM.h similarity index 100% rename from src/core/MM.h rename to src/mapmap/MM.h diff --git a/src/app/MainApplication.cpp b/src/mapmap/MainApplication.cpp similarity index 100% rename from src/app/MainApplication.cpp rename to src/mapmap/MainApplication.cpp diff --git a/src/app/MainApplication.h b/src/mapmap/MainApplication.h similarity index 100% rename from src/app/MainApplication.h rename to src/mapmap/MainApplication.h diff --git a/src/gui/MainWindow.cpp b/src/mapmap/MainWindow.cpp similarity index 100% rename from src/gui/MainWindow.cpp rename to src/mapmap/MainWindow.cpp diff --git a/src/gui/MainWindow.h b/src/mapmap/MainWindow.h similarity index 100% rename from src/gui/MainWindow.h rename to src/mapmap/MainWindow.h diff --git a/src/gui/MapperGLCanvas.cpp b/src/mapmap/MapperGLCanvas.cpp similarity index 100% rename from src/gui/MapperGLCanvas.cpp rename to src/mapmap/MapperGLCanvas.cpp diff --git a/src/gui/MapperGLCanvas.h b/src/mapmap/MapperGLCanvas.h similarity index 100% rename from src/gui/MapperGLCanvas.h rename to src/mapmap/MapperGLCanvas.h diff --git a/src/gui/MapperGLCanvasToolbar.cpp b/src/mapmap/MapperGLCanvasToolbar.cpp similarity index 100% rename from src/gui/MapperGLCanvasToolbar.cpp rename to src/mapmap/MapperGLCanvasToolbar.cpp diff --git a/src/gui/MapperGLCanvasToolbar.h b/src/mapmap/MapperGLCanvasToolbar.h similarity index 100% rename from src/gui/MapperGLCanvasToolbar.h rename to src/mapmap/MapperGLCanvasToolbar.h diff --git a/src/core/Mapping.cpp b/src/mapmap/Mapping.cpp similarity index 98% rename from src/core/Mapping.cpp rename to src/mapmap/Mapping.cpp index a57b57e..02e4583 100644 --- a/src/core/Mapping.cpp +++ b/src/mapmap/Mapping.cpp @@ -92,7 +92,7 @@ void Mapping::read(const QDomElement& obj) // Read paint. int paintId = obj.attribute("paintId").toInt(); -// setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId)); + setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId)); // Read output shape. _readShape(obj, true); diff --git a/src/core/Mapping.h b/src/mapmap/Mapping.h similarity index 100% rename from src/core/Mapping.h rename to src/mapmap/Mapping.h diff --git a/src/gui/MappingGui.cpp b/src/mapmap/MappingGui.cpp similarity index 100% rename from src/gui/MappingGui.cpp rename to src/mapmap/MappingGui.cpp diff --git a/src/gui/MappingGui.h b/src/mapmap/MappingGui.h similarity index 100% rename from src/gui/MappingGui.h rename to src/mapmap/MappingGui.h diff --git a/src/gui/MappingItemDelegate.cpp b/src/mapmap/MappingItemDelegate.cpp similarity index 100% rename from src/gui/MappingItemDelegate.cpp rename to src/mapmap/MappingItemDelegate.cpp diff --git a/src/gui/MappingItemDelegate.h b/src/mapmap/MappingItemDelegate.h similarity index 100% rename from src/gui/MappingItemDelegate.h rename to src/mapmap/MappingItemDelegate.h diff --git a/src/gui/MappingListModel.cpp b/src/mapmap/MappingListModel.cpp similarity index 100% rename from src/gui/MappingListModel.cpp rename to src/mapmap/MappingListModel.cpp diff --git a/src/gui/MappingListModel.h b/src/mapmap/MappingListModel.h similarity index 100% rename from src/gui/MappingListModel.h rename to src/mapmap/MappingListModel.h diff --git a/src/core/MappingManager.cpp b/src/mapmap/MappingManager.cpp similarity index 100% rename from src/core/MappingManager.cpp rename to src/mapmap/MappingManager.cpp diff --git a/src/core/MappingManager.h b/src/mapmap/MappingManager.h similarity index 100% rename from src/core/MappingManager.h rename to src/mapmap/MappingManager.h diff --git a/src/core/Maths.h b/src/mapmap/Maths.h similarity index 100% rename from src/core/Maths.h rename to src/mapmap/Maths.h diff --git a/src/shape/Mesh.cpp b/src/mapmap/Mesh.cpp similarity index 100% rename from src/shape/Mesh.cpp rename to src/mapmap/Mesh.cpp diff --git a/src/shape/Mesh.h b/src/mapmap/Mesh.h similarity index 100% rename from src/shape/Mesh.h rename to src/mapmap/Mesh.h diff --git a/src/core/MetaObjectRegistry.cpp b/src/mapmap/MetaObjectRegistry.cpp similarity index 100% rename from src/core/MetaObjectRegistry.cpp rename to src/mapmap/MetaObjectRegistry.cpp diff --git a/src/core/MetaObjectRegistry.h b/src/mapmap/MetaObjectRegistry.h similarity index 100% rename from src/core/MetaObjectRegistry.h rename to src/mapmap/MetaObjectRegistry.h diff --git a/src/control/OscInterface.cpp b/src/mapmap/OscInterface.cpp similarity index 100% rename from src/control/OscInterface.cpp rename to src/mapmap/OscInterface.cpp diff --git a/src/control/OscInterface.h b/src/mapmap/OscInterface.h similarity index 100% rename from src/control/OscInterface.h rename to src/mapmap/OscInterface.h diff --git a/src/control/OscReceiver.cpp b/src/mapmap/OscReceiver.cpp similarity index 100% rename from src/control/OscReceiver.cpp rename to src/mapmap/OscReceiver.cpp diff --git a/src/control/OscReceiver.h b/src/mapmap/OscReceiver.h similarity index 100% rename from src/control/OscReceiver.h rename to src/mapmap/OscReceiver.h diff --git a/src/gui/OutputGLCanvas.cpp b/src/mapmap/OutputGLCanvas.cpp similarity index 100% rename from src/gui/OutputGLCanvas.cpp rename to src/mapmap/OutputGLCanvas.cpp diff --git a/src/gui/OutputGLCanvas.h b/src/mapmap/OutputGLCanvas.h similarity index 100% rename from src/gui/OutputGLCanvas.h rename to src/mapmap/OutputGLCanvas.h diff --git a/src/gui/OutputGLWindow.cpp b/src/mapmap/OutputGLWindow.cpp similarity index 100% rename from src/gui/OutputGLWindow.cpp rename to src/mapmap/OutputGLWindow.cpp diff --git a/src/gui/OutputGLWindow.h b/src/mapmap/OutputGLWindow.h similarity index 100% rename from src/gui/OutputGLWindow.h rename to src/mapmap/OutputGLWindow.h diff --git a/src/core/Paint.cpp b/src/mapmap/Paint.cpp similarity index 100% rename from src/core/Paint.cpp rename to src/mapmap/Paint.cpp diff --git a/src/core/Paint.h b/src/mapmap/Paint.h similarity index 100% rename from src/core/Paint.h rename to src/mapmap/Paint.h diff --git a/src/gui/PaintGui.cpp b/src/mapmap/PaintGui.cpp similarity index 100% rename from src/gui/PaintGui.cpp rename to src/mapmap/PaintGui.cpp diff --git a/src/gui/PaintGui.h b/src/mapmap/PaintGui.h similarity index 100% rename from src/gui/PaintGui.h rename to src/mapmap/PaintGui.h diff --git a/src/shape/Polygon.cpp b/src/mapmap/Polygon.cpp similarity index 100% rename from src/shape/Polygon.cpp rename to src/mapmap/Polygon.cpp diff --git a/src/shape/Polygon.h b/src/mapmap/Polygon.h similarity index 100% rename from src/shape/Polygon.h rename to src/mapmap/Polygon.h diff --git a/src/gui/PreferenceDialog.cpp b/src/mapmap/PreferenceDialog.cpp similarity index 100% rename from src/gui/PreferenceDialog.cpp rename to src/mapmap/PreferenceDialog.cpp diff --git a/src/gui/PreferenceDialog.h b/src/mapmap/PreferenceDialog.h similarity index 100% rename from src/gui/PreferenceDialog.h rename to src/mapmap/PreferenceDialog.h diff --git a/src/core/ProjectLabels.cpp b/src/mapmap/ProjectLabels.cpp similarity index 100% rename from src/core/ProjectLabels.cpp rename to src/mapmap/ProjectLabels.cpp diff --git a/src/core/ProjectLabels.h b/src/mapmap/ProjectLabels.h similarity index 100% rename from src/core/ProjectLabels.h rename to src/mapmap/ProjectLabels.h diff --git a/src/core/ProjectReader.cpp b/src/mapmap/ProjectReader.cpp similarity index 100% rename from src/core/ProjectReader.cpp rename to src/mapmap/ProjectReader.cpp diff --git a/src/core/ProjectReader.h b/src/mapmap/ProjectReader.h similarity index 100% rename from src/core/ProjectReader.h rename to src/mapmap/ProjectReader.h diff --git a/src/core/ProjectWriter.cpp b/src/mapmap/ProjectWriter.cpp similarity index 100% rename from src/core/ProjectWriter.cpp rename to src/mapmap/ProjectWriter.cpp diff --git a/src/core/ProjectWriter.h b/src/mapmap/ProjectWriter.h similarity index 100% rename from src/core/ProjectWriter.h rename to src/mapmap/ProjectWriter.h diff --git a/src/shape/Quad.h b/src/mapmap/Quad.h similarity index 100% rename from src/shape/Quad.h rename to src/mapmap/Quad.h diff --git a/src/core/Serializable.cpp b/src/mapmap/Serializable.cpp similarity index 100% rename from src/core/Serializable.cpp rename to src/mapmap/Serializable.cpp diff --git a/src/core/Serializable.h b/src/mapmap/Serializable.h similarity index 100% rename from src/core/Serializable.h rename to src/mapmap/Serializable.h diff --git a/src/shape/Shape.cpp b/src/mapmap/Shape.cpp similarity index 100% rename from src/shape/Shape.cpp rename to src/mapmap/Shape.cpp diff --git a/src/shape/Shape.h b/src/mapmap/Shape.h similarity index 100% rename from src/shape/Shape.h rename to src/mapmap/Shape.h diff --git a/src/gui/ShapeControlPainter.cpp b/src/mapmap/ShapeControlPainter.cpp similarity index 100% rename from src/gui/ShapeControlPainter.cpp rename to src/mapmap/ShapeControlPainter.cpp diff --git a/src/gui/ShapeControlPainter.h b/src/mapmap/ShapeControlPainter.h similarity index 100% rename from src/gui/ShapeControlPainter.h rename to src/mapmap/ShapeControlPainter.h diff --git a/src/gui/ShapeGraphicsItem.cpp b/src/mapmap/ShapeGraphicsItem.cpp similarity index 100% rename from src/gui/ShapeGraphicsItem.cpp rename to src/mapmap/ShapeGraphicsItem.cpp diff --git a/src/gui/ShapeGraphicsItem.h b/src/mapmap/ShapeGraphicsItem.h similarity index 100% rename from src/gui/ShapeGraphicsItem.h rename to src/mapmap/ShapeGraphicsItem.h diff --git a/src/shape/Shapes.h b/src/mapmap/Shapes.h similarity index 100% rename from src/shape/Shapes.h rename to src/mapmap/Shapes.h diff --git a/src/shape/Triangle.h b/src/mapmap/Triangle.h similarity index 100% rename from src/shape/Triangle.h rename to src/mapmap/Triangle.h diff --git a/src/core/UidAllocator.cpp b/src/mapmap/UidAllocator.cpp similarity index 100% rename from src/core/UidAllocator.cpp rename to src/mapmap/UidAllocator.cpp diff --git a/src/core/UidAllocator.h b/src/mapmap/UidAllocator.h similarity index 100% rename from src/core/UidAllocator.h rename to src/mapmap/UidAllocator.h diff --git a/src/core/Util.cpp b/src/mapmap/Util.cpp similarity index 100% rename from src/core/Util.cpp rename to src/mapmap/Util.cpp diff --git a/src/core/Util.h b/src/mapmap/Util.h similarity index 100% rename from src/core/Util.h rename to src/mapmap/Util.h diff --git a/src/core/VideoImpl.cpp b/src/mapmap/VideoImpl.cpp similarity index 100% rename from src/core/VideoImpl.cpp rename to src/mapmap/VideoImpl.cpp diff --git a/src/core/VideoImpl.h b/src/mapmap/VideoImpl.h similarity index 100% rename from src/core/VideoImpl.h rename to src/mapmap/VideoImpl.h diff --git a/src/core/VideoShmSrcImpl.cpp b/src/mapmap/VideoShmSrcImpl.cpp similarity index 100% rename from src/core/VideoShmSrcImpl.cpp rename to src/mapmap/VideoShmSrcImpl.cpp diff --git a/src/core/VideoShmSrcImpl.h b/src/mapmap/VideoShmSrcImpl.h similarity index 100% rename from src/core/VideoShmSrcImpl.h rename to src/mapmap/VideoShmSrcImpl.h diff --git a/src/core/VideoUriDecodeBinImpl.cpp b/src/mapmap/VideoUriDecodeBinImpl.cpp similarity index 100% rename from src/core/VideoUriDecodeBinImpl.cpp rename to src/mapmap/VideoUriDecodeBinImpl.cpp diff --git a/src/core/VideoUriDecodeBinImpl.h b/src/mapmap/VideoUriDecodeBinImpl.h similarity index 100% rename from src/core/VideoUriDecodeBinImpl.h rename to src/mapmap/VideoUriDecodeBinImpl.h diff --git a/src/core/VideoV4l2SrcImpl.cpp b/src/mapmap/VideoV4l2SrcImpl.cpp similarity index 100% rename from src/core/VideoV4l2SrcImpl.cpp rename to src/mapmap/VideoV4l2SrcImpl.cpp diff --git a/src/core/VideoV4l2SrcImpl.h b/src/mapmap/VideoV4l2SrcImpl.h similarity index 100% rename from src/core/VideoV4l2SrcImpl.h rename to src/mapmap/VideoV4l2SrcImpl.h diff --git a/src/gui/contrib/qtpropertybrowser-extension/fileedit.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/fileedit.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/fileedit.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/fileedit.cpp diff --git a/src/gui/contrib/qtpropertybrowser-extension/fileedit.h b/src/mapmap/contrib/qtpropertybrowser-extension/fileedit.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/fileedit.h rename to src/mapmap/contrib/qtpropertybrowser-extension/fileedit.h diff --git a/src/gui/contrib/qtpropertybrowser-extension/fileeditfactory.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/fileeditfactory.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.cpp diff --git a/src/gui/contrib/qtpropertybrowser-extension/fileeditfactory.h b/src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/fileeditfactory.h rename to src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.h diff --git a/src/gui/contrib/qtpropertybrowser-extension/filepathmanager.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/filepathmanager.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.cpp diff --git a/src/gui/contrib/qtpropertybrowser-extension/filepathmanager.h b/src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/filepathmanager.h rename to src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.h diff --git a/src/gui/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri b/src/mapmap/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri rename to src/mapmap/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri diff --git a/src/gui/contrib/qtpropertybrowser-extension/variantfactory.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/variantfactory.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.cpp diff --git a/src/gui/contrib/qtpropertybrowser-extension/variantfactory.h b/src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/variantfactory.h rename to src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.h diff --git a/src/gui/contrib/qtpropertybrowser-extension/variantmanager.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/variantmanager.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.cpp diff --git a/src/gui/contrib/qtpropertybrowser-extension/variantmanager.h b/src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser-extension/variantmanager.h rename to src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.h diff --git a/src/gui/contrib/qtpropertybrowser/INSTALL.TXT b/src/mapmap/contrib/qtpropertybrowser/INSTALL.TXT similarity index 100% rename from src/gui/contrib/qtpropertybrowser/INSTALL.TXT rename to src/mapmap/contrib/qtpropertybrowser/INSTALL.TXT diff --git a/src/gui/contrib/qtpropertybrowser/README.TXT b/src/mapmap/contrib/qtpropertybrowser/README.TXT similarity index 100% rename from src/gui/contrib/qtpropertybrowser/README.TXT rename to src/mapmap/contrib/qtpropertybrowser/README.TXT diff --git a/src/gui/contrib/qtpropertybrowser/buildlib/buildlib.pro b/src/mapmap/contrib/qtpropertybrowser/buildlib/buildlib.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/buildlib/buildlib.pro rename to src/mapmap/contrib/qtpropertybrowser/buildlib/buildlib.pro diff --git a/src/gui/contrib/qtpropertybrowser/common.pri b/src/mapmap/contrib/qtpropertybrowser/common.pri similarity index 100% rename from src/gui/contrib/qtpropertybrowser/common.pri rename to src/mapmap/contrib/qtpropertybrowser/common.pri diff --git a/src/gui/contrib/qtpropertybrowser/configure b/src/mapmap/contrib/qtpropertybrowser/configure similarity index 100% rename from src/gui/contrib/qtpropertybrowser/configure rename to src/mapmap/contrib/qtpropertybrowser/configure diff --git a/src/gui/contrib/qtpropertybrowser/configure.bat b/src/mapmap/contrib/qtpropertybrowser/configure.bat similarity index 100% rename from src/gui/contrib/qtpropertybrowser/configure.bat rename to src/mapmap/contrib/qtpropertybrowser/configure.bat diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_typed.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_typed.png new file mode 100644 index 0000000..888cb6a Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_typed.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_variant.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_variant.png new file mode 100644 index 0000000..900ea8a Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_variant.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/decoration.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/decoration.png new file mode 100644 index 0000000..92db0fc Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/decoration.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/demo.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/demo.png new file mode 100644 index 0000000..767e77f Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/demo.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/extension.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/extension.png new file mode 100644 index 0000000..e3e508d Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/extension.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/object_controller.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/object_controller.png new file mode 100644 index 0000000..e490e6d Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/object_controller.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qt-logo.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qt-logo.png new file mode 100644 index 0000000..794162f Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/qt-logo.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png new file mode 100644 index 0000000..7890fdb Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png new file mode 100644 index 0000000..203c50f Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png new file mode 100644 index 0000000..0a939fc Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png new file mode 100644 index 0000000..1f0403a Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png new file mode 100644 index 0000000..154c10d Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/simple.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/simple.png new file mode 100644 index 0000000..56048d5 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/doc/images/simple.png differ diff --git a/src/gui/contrib/qtpropertybrowser/doc/index.qdoc b/src/mapmap/contrib/qtpropertybrowser/doc/index.qdoc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/doc/index.qdoc rename to src/mapmap/contrib/qtpropertybrowser/doc/index.qdoc diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h diff --git a/src/gui/contrib/qtpropertybrowser/examples/decoration/decoration.pro b/src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/decoration/decoration.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.pro diff --git a/src/gui/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc diff --git a/src/gui/contrib/qtpropertybrowser/examples/decoration/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/decoration/main.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/decoration/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/decoration/main.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/demo/demo.pro b/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/demo/demo.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.pro diff --git a/src/gui/contrib/qtpropertybrowser/examples/demo/demo.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qdoc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/demo/demo.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qdoc diff --git a/src/gui/contrib/qtpropertybrowser/examples/demo/demo.qrc b/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qrc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/demo/demo.qrc rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qrc diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/down.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/down.png new file mode 100644 index 0000000..29d1d44 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/down.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/left.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/left.png new file mode 100644 index 0000000..e58177f Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/left.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/right.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/right.png new file mode 100644 index 0000000..34b91f0 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/right.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/up.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/up.png new file mode 100644 index 0000000..e437312 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/up.png differ diff --git a/src/gui/contrib/qtpropertybrowser/examples/demo/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/demo/main.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/demo/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/main.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/examples.pro b/src/mapmap/contrib/qtpropertybrowser/examples/examples.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/examples.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/examples.pro diff --git a/src/gui/contrib/qtpropertybrowser/examples/extension/extension.pro b/src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/extension/extension.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.pro diff --git a/src/gui/contrib/qtpropertybrowser/examples/extension/extension.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.qdoc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/extension/extension.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.qdoc diff --git a/src/gui/contrib/qtpropertybrowser/examples/extension/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/extension/main.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/extension/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/extension/main.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/object_controller/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/main.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/object_controller/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/main.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro diff --git a/src/gui/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc diff --git a/src/gui/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h diff --git a/src/gui/contrib/qtpropertybrowser/examples/simple/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/simple/main.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/simple/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/simple/main.cpp diff --git a/src/gui/contrib/qtpropertybrowser/examples/simple/simple.pro b/src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/simple/simple.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.pro diff --git a/src/gui/contrib/qtpropertybrowser/examples/simple/simple.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.qdoc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/examples/simple/simple.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.qdoc diff --git a/src/gui/contrib/qtpropertybrowser/qtpropertybrowser.pro b/src/mapmap/contrib/qtpropertybrowser/qtpropertybrowser.pro similarity index 100% rename from src/gui/contrib/qtpropertybrowser/qtpropertybrowser.pro rename to src/mapmap/contrib/qtpropertybrowser/qtpropertybrowser.pro diff --git a/src/gui/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase b/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase rename to src/mapmap/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase diff --git a/src/gui/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser b/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser rename to src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser diff --git a/src/gui/contrib/qtpropertybrowser/src/QtAbstractPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtAbstractPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtBoolPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtBoolPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtBoolPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtBoolPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtBrowserItem b/src/mapmap/contrib/qtpropertybrowser/src/QtBrowserItem similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtBrowserItem rename to src/mapmap/contrib/qtpropertybrowser/src/QtBrowserItem diff --git a/src/gui/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser b/src/mapmap/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser rename to src/mapmap/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser diff --git a/src/gui/contrib/qtpropertybrowser/src/QtCharEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtCharEditorFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtCharEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtCharEditorFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtCharPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtCharPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtCharPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtCharPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtCheckBoxFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtCheckBoxFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtCheckBoxFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtCheckBoxFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtColorEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtColorEditorFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtColorEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtColorEditorFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtColorPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtColorPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtColorPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtColorPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtCursorEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtCursorEditorFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtCursorEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtCursorEditorFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtCursorPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtCursorPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtCursorPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtCursorPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtDateEditFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtDateEditFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtDateEditFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtDateEditFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtDatePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtDatePropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtDatePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtDatePropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtDateTimeEditFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtDateTimeEditFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtDateTimeEditFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtDateTimeEditFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtDateTimePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtDateTimePropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtDateTimePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtDateTimePropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtDoublePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtDoublePropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtDoublePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtDoublePropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtEnumEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtEnumEditorFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtEnumEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtEnumEditorFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtEnumPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtEnumPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtEnumPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtEnumPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtFlagPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtFlagPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtFlagPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtFlagPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtFontEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtFontEditorFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtFontEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtFontEditorFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtFontPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtFontPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtFontPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtFontPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser b/src/mapmap/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser rename to src/mapmap/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser diff --git a/src/gui/contrib/qtpropertybrowser/src/QtGroupPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtGroupPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtGroupPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtGroupPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtIntPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtIntPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtIntPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtIntPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtLineEditFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtLineEditFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtLineEditFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtLineEditFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtLocalePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtLocalePropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtLocalePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtLocalePropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtPointFPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtPointFPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtPointFPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtPointFPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtPointPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtPointPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtPointPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtPointPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtProperty b/src/mapmap/contrib/qtpropertybrowser/src/QtProperty similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtProperty rename to src/mapmap/contrib/qtpropertybrowser/src/QtProperty diff --git a/src/gui/contrib/qtpropertybrowser/src/QtRectFPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtRectFPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtRectFPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtRectFPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtRectPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtRectPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtRectPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtRectPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtScrollBarFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtScrollBarFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtScrollBarFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtScrollBarFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtSizeFPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtSizeFPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtSizeFPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtSizeFPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtSizePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtSizePropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtSizePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtSizePropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtSliderFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtSliderFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtSliderFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtSliderFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtSpinBoxFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtSpinBoxFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtSpinBoxFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtSpinBoxFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtStringPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtStringPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtStringPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtStringPropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtTimeEditFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtTimeEditFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtTimeEditFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtTimeEditFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtTimePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtTimePropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtTimePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtTimePropertyManager diff --git a/src/gui/contrib/qtpropertybrowser/src/QtTreePropertyBrowser b/src/mapmap/contrib/qtpropertybrowser/src/QtTreePropertyBrowser similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtTreePropertyBrowser rename to src/mapmap/contrib/qtpropertybrowser/src/QtTreePropertyBrowser diff --git a/src/gui/contrib/qtpropertybrowser/src/QtVariantEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtVariantEditorFactory similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtVariantEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtVariantEditorFactory diff --git a/src/gui/contrib/qtpropertybrowser/src/QtVariantProperty b/src/mapmap/contrib/qtpropertybrowser/src/QtVariantProperty similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtVariantProperty rename to src/mapmap/contrib/qtpropertybrowser/src/QtVariantProperty diff --git a/src/gui/contrib/qtpropertybrowser/src/QtVariantPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtVariantPropertyManager similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/QtVariantPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtVariantPropertyManager diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-arrow.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-arrow.png new file mode 100644 index 0000000..a69ef4e Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-arrow.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-busy.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-busy.png new file mode 100644 index 0000000..53717e4 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-busy.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-closedhand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-closedhand.png new file mode 100644 index 0000000..b78dd1d Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-closedhand.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-cross.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-cross.png new file mode 100644 index 0000000..fe38e74 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-cross.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-forbidden.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-forbidden.png new file mode 100644 index 0000000..2b08c4e Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-forbidden.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hand.png new file mode 100644 index 0000000..d2004ae Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hand.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hsplit.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hsplit.png new file mode 100644 index 0000000..a5667e3 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hsplit.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-ibeam.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-ibeam.png new file mode 100644 index 0000000..097fc5f Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-ibeam.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-openhand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-openhand.png new file mode 100644 index 0000000..9181c85 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-openhand.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeall.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeall.png new file mode 100644 index 0000000..69f13eb Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeall.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeb.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeb.png new file mode 100644 index 0000000..f37d7b9 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeb.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizef.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizef.png new file mode 100644 index 0000000..3b127a0 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizef.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeh.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeh.png new file mode 100644 index 0000000..a9f40cb Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeh.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizev.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizev.png new file mode 100644 index 0000000..1edbab2 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizev.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-uparrow.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-uparrow.png new file mode 100644 index 0000000..d3e70ef Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-uparrow.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-vsplit.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-vsplit.png new file mode 100644 index 0000000..1beda25 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-vsplit.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-wait.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-wait.png new file mode 100644 index 0000000..69056c4 Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-wait.png differ diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png new file mode 100644 index 0000000..b47601c Binary files /dev/null and b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png differ diff --git a/src/gui/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp diff --git a/src/gui/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h diff --git a/src/gui/contrib/qtpropertybrowser/src/qteditorfactory.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qteditorfactory.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.cpp diff --git a/src/gui/contrib/qtpropertybrowser/src/qteditorfactory.h b/src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qteditorfactory.h rename to src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.h diff --git a/src/gui/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp diff --git a/src/gui/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.h b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.h diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.pri similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.pri diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertymanager.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtpropertymanager.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.cpp diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertymanager.h b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtpropertymanager.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.h diff --git a/src/gui/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp diff --git a/src/gui/contrib/qtpropertybrowser/src/qttreepropertybrowser.h b/src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qttreepropertybrowser.h rename to src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.h diff --git a/src/gui/contrib/qtpropertybrowser/src/qtvariantproperty.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.cpp similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtvariantproperty.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.cpp diff --git a/src/gui/contrib/qtpropertybrowser/src/qtvariantproperty.h b/src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.h similarity index 100% rename from src/gui/contrib/qtpropertybrowser/src/qtvariantproperty.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.h diff --git a/docs/LibremappingUML.dia b/src/mapmap/docs/LibremappingUML.dia similarity index 100% rename from docs/LibremappingUML.dia rename to src/mapmap/docs/LibremappingUML.dia diff --git a/docs/datasheet.rst b/src/mapmap/docs/datasheet.rst similarity index 100% rename from docs/datasheet.rst rename to src/mapmap/docs/datasheet.rst diff --git a/docs/documentation.qrc b/src/mapmap/docs/documentation.qrc similarity index 100% rename from docs/documentation.qrc rename to src/mapmap/docs/documentation.qrc diff --git a/docs/informations/CHANGELOG.html b/src/mapmap/docs/informations/CHANGELOG.html similarity index 100% rename from docs/informations/CHANGELOG.html rename to src/mapmap/docs/informations/CHANGELOG.html diff --git a/docs/informations/CONTRIBUTORS.html b/src/mapmap/docs/informations/CONTRIBUTORS.html similarity index 100% rename from docs/informations/CONTRIBUTORS.html rename to src/mapmap/docs/informations/CONTRIBUTORS.html diff --git a/docs/informations/CONTRIBUTORS.md b/src/mapmap/docs/informations/CONTRIBUTORS.md similarity index 100% rename from docs/informations/CONTRIBUTORS.md rename to src/mapmap/docs/informations/CONTRIBUTORS.md diff --git a/docs/informations/LICENSE b/src/mapmap/docs/informations/LICENSE similarity index 100% rename from docs/informations/LICENSE rename to src/mapmap/docs/informations/LICENSE diff --git a/docs/informations/LICENSE_SHORT.txt b/src/mapmap/docs/informations/LICENSE_SHORT.txt similarity index 100% rename from docs/informations/LICENSE_SHORT.txt rename to src/mapmap/docs/informations/LICENSE_SHORT.txt diff --git a/docs/informations/MAPPING b/src/mapmap/docs/informations/MAPPING similarity index 100% rename from docs/informations/MAPPING rename to src/mapmap/docs/informations/MAPPING diff --git a/docs/informations/osc.html b/src/mapmap/docs/informations/osc.html similarity index 100% rename from docs/informations/osc.html rename to src/mapmap/docs/informations/osc.html diff --git a/docs/informations/osc.md b/src/mapmap/docs/informations/osc.md similarity index 100% rename from docs/informations/osc.md rename to src/mapmap/docs/informations/osc.md diff --git a/resources/interface.qrc-bak b/src/mapmap/interface.qrc similarity index 100% rename from resources/interface.qrc-bak rename to src/mapmap/interface.qrc diff --git a/src/app/main.cpp b/src/mapmap/main.cpp similarity index 100% rename from src/app/main.cpp rename to src/mapmap/main.cpp diff --git a/mapmap.pro b/src/mapmap/mapmap.pro similarity index 54% rename from mapmap.pro rename to src/mapmap/mapmap.pro index f25797a..25cc4f0 100644 --- a/mapmap.pro +++ b/src/mapmap/mapmap.pro @@ -1,16 +1,105 @@ -CONFIG += c++11 - +CONFIG += qt debug c++11 +TEMPLATE = app # Always use major.minor.micro version number format VERSION = 0.5.1 TARGET = mapmap - +QT += gui opengl xml core network +greaterThan(QT_MAJOR_VERSION, 4) { + QT -= gui # using widgets instead gui in Qt5 + QT += widgets multimedia +} DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB -include(src/core/core.pri) -include(src/shape/shape.pri) -include(src/gui/gui.pri) -include(src/control/control.pri) -include(src/app/app.pri) +HEADERS = \ + AboutDialog.h \ + Commands.h \ + ConcurrentQueue.h \ + ConsoleWindow.h \ + Element.h \ + Ellipse.h \ + MM.h \ + MainApplication.h \ + MainWindow.h \ + MappingGui.h \ + MappingItemDelegate.h \ + MappingListModel.h \ + MapperGLCanvas.h \ + MapperGLCanvasToolbar.h \ + Mapping.h \ + MappingManager.h \ + Maths.h \ + Mesh.h \ + MetaObjectRegistry.h \ + OscInterface.h \ + OscReceiver.h \ + OutputGLCanvas.h \ + OutputGLWindow.h \ + Paint.h \ + PaintGui.h \ + Polygon.h \ + PreferenceDialog.h \ + ProjectLabels.h \ + ProjectReader.h \ + ProjectWriter.h \ + Quad.h \ + Serializable.h \ + Shape.h \ + Shapes.h \ + ShapeControlPainter.h \ + ShapeGraphicsItem.h \ + Triangle.h \ + UidAllocator.h \ + Util.h \ + VideoImpl.h \ + VideoUriDecodeBinImpl.h \ + VideoV4l2SrcImpl.h \ + VideoShmSrcImpl.h \ + GuiForward.h + +SOURCES = \ + AboutDialog.cpp \ + Commands.cpp \ + ConsoleWindow.cpp \ + Element.cpp \ + Ellipse.cpp \ + MM.cpp \ + MainApplication.cpp \ + MainWindow.cpp \ + MappingGui.cpp \ + MappingItemDelegate.cpp \ + MappingListModel.cpp \ + MapperGLCanvas.cpp \ + MapperGLCanvasToolbar.cpp \ + Mapping.cpp \ + MappingManager.cpp \ + Mesh.cpp \ + MetaObjectRegistry.cpp \ + OscInterface.cpp \ + OscReceiver.cpp \ + OutputGLCanvas.cpp \ + OutputGLWindow.cpp \ + Paint.cpp \ + PaintGui.cpp \ + Polygon.cpp \ + PreferenceDialog.cpp \ + ProjectLabels.cpp \ + ProjectReader.cpp \ + ProjectWriter.cpp \ + Serializable.cpp \ + Shape.cpp \ + ShapeControlPainter.cpp \ + ShapeGraphicsItem.cpp \ + UidAllocator.cpp \ + Util.cpp \ + VideoImpl.cpp \ + VideoUriDecodeBinImpl.cpp \ + VideoV4l2SrcImpl.cpp \ + VideoShmSrcImpl.cpp \ + main.cpp + +# FIXME: that file doesn't exist +include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri) +include(contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri) TRANSLATIONS = \ translations/mapmap_en.ts \ @@ -18,7 +107,7 @@ TRANSLATIONS = \ RESOURCES = \ translations/translation.qrc \ docs/documentation.qrc \ - resources/interface.qrc + interface.qrc # Manage lrelease (for translations) isEmpty(QMAKE_LRELEASE) { @@ -33,13 +122,24 @@ QMAKE_EXTRA_COMPILERS += updateqm PRE_TARGETDEPS += compiler_updateqm_make_all system($$QMAKE_LRELEASE mapmap.pro) # Run lrelease -## Add the docs target: -#docs.depends = $(HEADERS) $(SOURCES) -#docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen - -#QMAKE_EXTRA_TARGETS += docs +# Add the docs target: +docs.depends = $(HEADERS) $(SOURCES) +docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen - +QMAKE_EXTRA_TARGETS += docs - Linux-specific: +# Linux-specific: unix:!macx { + DEFINES += UNIX + CONFIG += link_pkgconfig + INCLUDE_PATH += + PKGCONFIG += \ + gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 gstreamer-pbutils-1.0 \ + liblo \ + gl x11 + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-result -Wno-unused-parameter \ + -Wno-unused-variable -Wno-switch -Wno-comment \ + -Wno-unused-but-set-variable + QMAKE_CXXFLAGS += -DHAVE_OSC mapmapfile.files = mapmap mapmapfile.path = /usr/bin INSTALLS += mapmapfile @@ -107,22 +207,22 @@ win32 { } # DESTDIR = ../../Mapmap # Just for packaging -# INCLUDEPATH += $${GST_HOME}/lib/gstreamer-1.0/include \ -# $${GST_HOME}/include/glib-2.0 \ -# $${GST_HOME}/lib/glib-2.0/include \ -# $${GST_HOME}/include/gstreamer-1.0 + INCLUDEPATH += $${GST_HOME}/lib/gstreamer-1.0/include \ + $${GST_HOME}/include/glib-2.0 \ + $${GST_HOME}/lib/glib-2.0/include \ + $${GST_HOME}/include/gstreamer-1.0 -# LIBS += $${GST_HOME}/lib/gstapp-1.0.lib \ -# $${GST_HOME}/lib/gstbase-1.0.lib \ -# $${GST_HOME}/lib/gstpbutils-1.0.lib \ -# $${GST_HOME}/lib/gstreamer-1.0.lib \ -# $${GST_HOME}/lib/gobject-2.0.lib \ -# $${GST_HOME}/lib/glib-2.0.lib \ -# -lopengl32 + LIBS += $${GST_HOME}/lib/gstapp-1.0.lib \ + $${GST_HOME}/lib/gstbase-1.0.lib \ + $${GST_HOME}/lib/gstpbutils-1.0.lib \ + $${GST_HOME}/lib/gstreamer-1.0.lib \ + $${GST_HOME}/lib/gobject-2.0.lib \ + $${GST_HOME}/lib/glib-2.0.lib \ + -lopengl32 CONFIG += release - RC_FILE = resources/windows_resource.rc + RC_FILE = mapmap_resource.rc QMAKE_CXXFLAGS += -D_USE_MATH_DEFINES } diff --git a/resources/windows_resource.rc b/src/mapmap/mapmap_resource.rc similarity index 91% rename from resources/windows_resource.rc rename to src/mapmap/mapmap_resource.rc index 361116d..27018c6 100644 --- a/resources/windows_resource.rc +++ b/src/mapmap/mapmap_resource.rc @@ -37,5 +37,5 @@ VS_VERSION_INFO VERSIONINFO END /* End of Version info */ -IDI_ICON1 ICON DISCARDABLE "images/logo/mapmap.ico" +IDI_ICON1 ICON DISCARDABLE "resources/images/logo/mapmap.ico" diff --git a/resources/fonts/DroidSans.otf b/src/mapmap/resources/fonts/DroidSans.otf similarity index 100% rename from resources/fonts/DroidSans.otf rename to src/mapmap/resources/fonts/DroidSans.otf diff --git a/resources/fonts/Hack-Regular.otf b/src/mapmap/resources/fonts/Hack-Regular.otf similarity index 100% rename from resources/fonts/Hack-Regular.otf rename to src/mapmap/resources/fonts/Hack-Regular.otf diff --git a/src/mapmap/resources/images/box/box.png b/src/mapmap/resources/images/box/box.png new file mode 100644 index 0000000..6c53ebf Binary files /dev/null and b/src/mapmap/resources/images/box/box.png differ diff --git a/src/mapmap/resources/images/box/box2.png b/src/mapmap/resources/images/box/box2.png new file mode 100644 index 0000000..e289322 Binary files /dev/null and b/src/mapmap/resources/images/box/box2.png differ diff --git a/src/mapmap/resources/images/box/box3.png b/src/mapmap/resources/images/box/box3.png new file mode 100644 index 0000000..a2bb6d1 Binary files /dev/null and b/src/mapmap/resources/images/box/box3.png differ diff --git a/src/mapmap/resources/images/checkbox/checkbox-checked-focused.png b/src/mapmap/resources/images/checkbox/checkbox-checked-focused.png new file mode 100644 index 0000000..99def6e Binary files /dev/null and b/src/mapmap/resources/images/checkbox/checkbox-checked-focused.png differ diff --git a/src/mapmap/resources/images/checkbox/checkbox-checked.png b/src/mapmap/resources/images/checkbox/checkbox-checked.png new file mode 100644 index 0000000..c85e7ff Binary files /dev/null and b/src/mapmap/resources/images/checkbox/checkbox-checked.png differ diff --git a/src/mapmap/resources/images/checkbox/checkbox-unchecked-focused.png b/src/mapmap/resources/images/checkbox/checkbox-unchecked-focused.png new file mode 100644 index 0000000..7fad500 Binary files /dev/null and b/src/mapmap/resources/images/checkbox/checkbox-unchecked-focused.png differ diff --git a/src/mapmap/resources/images/checkbox/checkbox-unchecked.png b/src/mapmap/resources/images/checkbox/checkbox-unchecked.png new file mode 100644 index 0000000..17aecd7 Binary files /dev/null and b/src/mapmap/resources/images/checkbox/checkbox-unchecked.png differ diff --git a/src/mapmap/resources/images/ctrl/pause.png b/src/mapmap/resources/images/ctrl/pause.png new file mode 100644 index 0000000..505033e Binary files /dev/null and b/src/mapmap/resources/images/ctrl/pause.png differ diff --git a/src/mapmap/resources/images/ctrl/play.png b/src/mapmap/resources/images/ctrl/play.png new file mode 100644 index 0000000..3b01edb Binary files /dev/null and b/src/mapmap/resources/images/ctrl/play.png differ diff --git a/src/mapmap/resources/images/ctrl/stop.png b/src/mapmap/resources/images/ctrl/stop.png new file mode 100644 index 0000000..83489c2 Binary files /dev/null and b/src/mapmap/resources/images/ctrl/stop.png differ diff --git a/resources/images/icons/add_circ.png b/src/mapmap/resources/images/icons/add_circ.png similarity index 100% rename from resources/images/icons/add_circ.png rename to src/mapmap/resources/images/icons/add_circ.png diff --git a/resources/images/icons/add_circ2.png b/src/mapmap/resources/images/icons/add_circ2.png similarity index 100% rename from resources/images/icons/add_circ2.png rename to src/mapmap/resources/images/icons/add_circ2.png diff --git a/resources/images/icons/add_circ_w.png b/src/mapmap/resources/images/icons/add_circ_w.png similarity index 100% rename from resources/images/icons/add_circ_w.png rename to src/mapmap/resources/images/icons/add_circ_w.png diff --git a/resources/images/icons/add_color.png b/src/mapmap/resources/images/icons/add_color.png similarity index 100% rename from resources/images/icons/add_color.png rename to src/mapmap/resources/images/icons/add_color.png diff --git a/resources/images/icons/add_color2_w.png b/src/mapmap/resources/images/icons/add_color2_w.png similarity index 100% rename from resources/images/icons/add_color2_w.png rename to src/mapmap/resources/images/icons/add_color2_w.png diff --git a/resources/images/icons/add_color3.png b/src/mapmap/resources/images/icons/add_color3.png similarity index 100% rename from resources/images/icons/add_color3.png rename to src/mapmap/resources/images/icons/add_color3.png diff --git a/resources/images/icons/add_color3_sof_w.png b/src/mapmap/resources/images/icons/add_color3_sof_w.png similarity index 100% rename from resources/images/icons/add_color3_sof_w.png rename to src/mapmap/resources/images/icons/add_color3_sof_w.png diff --git a/resources/images/icons/add_color3_w.png b/src/mapmap/resources/images/icons/add_color3_w.png similarity index 100% rename from resources/images/icons/add_color3_w.png rename to src/mapmap/resources/images/icons/add_color3_w.png diff --git a/resources/images/icons/add_color_w.png b/src/mapmap/resources/images/icons/add_color_w.png similarity index 100% rename from resources/images/icons/add_color_w.png rename to src/mapmap/resources/images/icons/add_color_w.png diff --git a/resources/images/icons/add_img.png b/src/mapmap/resources/images/icons/add_img.png similarity index 100% rename from resources/images/icons/add_img.png rename to src/mapmap/resources/images/icons/add_img.png diff --git a/resources/images/icons/add_img_w.png b/src/mapmap/resources/images/icons/add_img_w.png similarity index 100% rename from resources/images/icons/add_img_w.png rename to src/mapmap/resources/images/icons/add_img_w.png diff --git a/resources/images/icons/add_movie.png b/src/mapmap/resources/images/icons/add_movie.png similarity index 100% rename from resources/images/icons/add_movie.png rename to src/mapmap/resources/images/icons/add_movie.png diff --git a/resources/images/icons/add_movie_w.png b/src/mapmap/resources/images/icons/add_movie_w.png similarity index 100% rename from resources/images/icons/add_movie_w.png rename to src/mapmap/resources/images/icons/add_movie_w.png diff --git a/resources/images/icons/add_paint.png b/src/mapmap/resources/images/icons/add_paint.png similarity index 100% rename from resources/images/icons/add_paint.png rename to src/mapmap/resources/images/icons/add_paint.png diff --git a/resources/images/icons/add_paint_w.png b/src/mapmap/resources/images/icons/add_paint_w.png similarity index 100% rename from resources/images/icons/add_paint_w.png rename to src/mapmap/resources/images/icons/add_paint_w.png diff --git a/resources/images/icons/add_quad.png b/src/mapmap/resources/images/icons/add_quad.png similarity index 100% rename from resources/images/icons/add_quad.png rename to src/mapmap/resources/images/icons/add_quad.png diff --git a/resources/images/icons/add_quad2.png b/src/mapmap/resources/images/icons/add_quad2.png similarity index 100% rename from resources/images/icons/add_quad2.png rename to src/mapmap/resources/images/icons/add_quad2.png diff --git a/resources/images/icons/add_quad_w.png b/src/mapmap/resources/images/icons/add_quad_w.png similarity index 100% rename from resources/images/icons/add_quad_w.png rename to src/mapmap/resources/images/icons/add_quad_w.png diff --git a/resources/images/icons/add_tri.png b/src/mapmap/resources/images/icons/add_tri.png similarity index 100% rename from resources/images/icons/add_tri.png rename to src/mapmap/resources/images/icons/add_tri.png diff --git a/resources/images/icons/add_tri_2.png b/src/mapmap/resources/images/icons/add_tri_2.png similarity index 100% rename from resources/images/icons/add_tri_2.png rename to src/mapmap/resources/images/icons/add_tri_2.png diff --git a/resources/images/icons/color.png b/src/mapmap/resources/images/icons/color.png similarity index 100% rename from resources/images/icons/color.png rename to src/mapmap/resources/images/icons/color.png diff --git a/resources/images/icons/color2.png b/src/mapmap/resources/images/icons/color2.png similarity index 100% rename from resources/images/icons/color2.png rename to src/mapmap/resources/images/icons/color2.png diff --git a/resources/images/icons/color2_w.png b/src/mapmap/resources/images/icons/color2_w.png similarity index 100% rename from resources/images/icons/color2_w.png rename to src/mapmap/resources/images/icons/color2_w.png diff --git a/resources/images/icons/color3.png b/src/mapmap/resources/images/icons/color3.png similarity index 100% rename from resources/images/icons/color3.png rename to src/mapmap/resources/images/icons/color3.png diff --git a/resources/images/icons/color3_w.png b/src/mapmap/resources/images/icons/color3_w.png similarity index 100% rename from resources/images/icons/color3_w.png rename to src/mapmap/resources/images/icons/color3_w.png diff --git a/resources/images/icons/color_p.png b/src/mapmap/resources/images/icons/color_p.png similarity index 100% rename from resources/images/icons/color_p.png rename to src/mapmap/resources/images/icons/color_p.png diff --git a/resources/images/icons/ctrl.png b/src/mapmap/resources/images/icons/ctrl.png similarity index 100% rename from resources/images/icons/ctrl.png rename to src/mapmap/resources/images/icons/ctrl.png diff --git a/resources/images/icons/ctrl2.png b/src/mapmap/resources/images/icons/ctrl2.png similarity index 100% rename from resources/images/icons/ctrl2.png rename to src/mapmap/resources/images/icons/ctrl2.png diff --git a/resources/images/icons/ctrl2_w.png b/src/mapmap/resources/images/icons/ctrl2_w.png similarity index 100% rename from resources/images/icons/ctrl2_w.png rename to src/mapmap/resources/images/icons/ctrl2_w.png diff --git a/resources/images/icons/ctrl3_w.png b/src/mapmap/resources/images/icons/ctrl3_w.png similarity index 100% rename from resources/images/icons/ctrl3_w.png rename to src/mapmap/resources/images/icons/ctrl3_w.png diff --git a/resources/images/icons/ctrl_w.png b/src/mapmap/resources/images/icons/ctrl_w.png similarity index 100% rename from resources/images/icons/ctrl_w.png rename to src/mapmap/resources/images/icons/ctrl_w.png diff --git a/resources/images/icons/fullscreen.png b/src/mapmap/resources/images/icons/fullscreen.png similarity index 100% rename from resources/images/icons/fullscreen.png rename to src/mapmap/resources/images/icons/fullscreen.png diff --git a/resources/images/icons/fullscreen2.png b/src/mapmap/resources/images/icons/fullscreen2.png similarity index 100% rename from resources/images/icons/fullscreen2.png rename to src/mapmap/resources/images/icons/fullscreen2.png diff --git a/resources/images/icons/fullscreen3_w.png b/src/mapmap/resources/images/icons/fullscreen3_w.png similarity index 100% rename from resources/images/icons/fullscreen3_w.png rename to src/mapmap/resources/images/icons/fullscreen3_w.png diff --git a/resources/images/icons/fullscreen_w.png b/src/mapmap/resources/images/icons/fullscreen_w.png similarity index 100% rename from resources/images/icons/fullscreen_w.png rename to src/mapmap/resources/images/icons/fullscreen_w.png diff --git a/resources/images/icons/grille.png b/src/mapmap/resources/images/icons/grille.png similarity index 100% rename from resources/images/icons/grille.png rename to src/mapmap/resources/images/icons/grille.png diff --git a/resources/images/icons/grille_w.png b/src/mapmap/resources/images/icons/grille_w.png similarity index 100% rename from resources/images/icons/grille_w.png rename to src/mapmap/resources/images/icons/grille_w.png diff --git a/resources/images/icons/newdoc.png b/src/mapmap/resources/images/icons/newdoc.png similarity index 100% rename from resources/images/icons/newdoc.png rename to src/mapmap/resources/images/icons/newdoc.png diff --git a/resources/images/icons/newdoc_w.png b/src/mapmap/resources/images/icons/newdoc_w.png similarity index 100% rename from resources/images/icons/newdoc_w.png rename to src/mapmap/resources/images/icons/newdoc_w.png diff --git a/resources/images/icons/nofullscreen.png b/src/mapmap/resources/images/icons/nofullscreen.png similarity index 100% rename from resources/images/icons/nofullscreen.png rename to src/mapmap/resources/images/icons/nofullscreen.png diff --git a/resources/images/icons/nofullscreen_w.png b/src/mapmap/resources/images/icons/nofullscreen_w.png similarity index 100% rename from resources/images/icons/nofullscreen_w.png rename to src/mapmap/resources/images/icons/nofullscreen_w.png diff --git a/resources/images/icons/open.png b/src/mapmap/resources/images/icons/open.png similarity index 100% rename from resources/images/icons/open.png rename to src/mapmap/resources/images/icons/open.png diff --git a/resources/images/icons/open_w.png b/src/mapmap/resources/images/icons/open_w.png similarity index 100% rename from resources/images/icons/open_w.png rename to src/mapmap/resources/images/icons/open_w.png diff --git a/resources/images/icons/pause.png b/src/mapmap/resources/images/icons/pause.png similarity index 100% rename from resources/images/icons/pause.png rename to src/mapmap/resources/images/icons/pause.png diff --git a/resources/images/icons/pause_w.png b/src/mapmap/resources/images/icons/pause_w.png similarity index 100% rename from resources/images/icons/pause_w.png rename to src/mapmap/resources/images/icons/pause_w.png diff --git a/resources/images/icons/pause_w2.png b/src/mapmap/resources/images/icons/pause_w2.png similarity index 100% rename from resources/images/icons/pause_w2.png rename to src/mapmap/resources/images/icons/pause_w2.png diff --git a/resources/images/icons/play.png b/src/mapmap/resources/images/icons/play.png similarity index 100% rename from resources/images/icons/play.png rename to src/mapmap/resources/images/icons/play.png diff --git a/resources/images/icons/play_w.png b/src/mapmap/resources/images/icons/play_w.png similarity index 100% rename from resources/images/icons/play_w.png rename to src/mapmap/resources/images/icons/play_w.png diff --git a/resources/images/icons/rewind.png b/src/mapmap/resources/images/icons/rewind.png similarity index 100% rename from resources/images/icons/rewind.png rename to src/mapmap/resources/images/icons/rewind.png diff --git a/resources/images/icons/rewind_w.png b/src/mapmap/resources/images/icons/rewind_w.png similarity index 100% rename from resources/images/icons/rewind_w.png rename to src/mapmap/resources/images/icons/rewind_w.png diff --git a/resources/images/icons/save.png b/src/mapmap/resources/images/icons/save.png similarity index 100% rename from resources/images/icons/save.png rename to src/mapmap/resources/images/icons/save.png diff --git a/resources/images/icons/save_w.png b/src/mapmap/resources/images/icons/save_w.png similarity index 100% rename from resources/images/icons/save_w.png rename to src/mapmap/resources/images/icons/save_w.png diff --git a/resources/images/icons/small/delete.png b/src/mapmap/resources/images/icons/small/delete.png similarity index 100% rename from resources/images/icons/small/delete.png rename to src/mapmap/resources/images/icons/small/delete.png diff --git a/resources/images/icons/small/delete_w.png b/src/mapmap/resources/images/icons/small/delete_w.png similarity index 100% rename from resources/images/icons/small/delete_w.png rename to src/mapmap/resources/images/icons/small/delete_w.png diff --git a/resources/images/icons/small/duplicate.png b/src/mapmap/resources/images/icons/small/duplicate.png similarity index 100% rename from resources/images/icons/small/duplicate.png rename to src/mapmap/resources/images/icons/small/duplicate.png diff --git a/resources/images/icons/small/duplicate_w.png b/src/mapmap/resources/images/icons/small/duplicate_w.png similarity index 100% rename from resources/images/icons/small/duplicate_w.png rename to src/mapmap/resources/images/icons/small/duplicate_w.png diff --git a/resources/images/icons/small/lock.png b/src/mapmap/resources/images/icons/small/lock.png similarity index 100% rename from resources/images/icons/small/lock.png rename to src/mapmap/resources/images/icons/small/lock.png diff --git a/resources/images/icons/small/lock_w.png b/src/mapmap/resources/images/icons/small/lock_w.png similarity index 100% rename from resources/images/icons/small/lock_w.png rename to src/mapmap/resources/images/icons/small/lock_w.png diff --git a/resources/images/icons/small/solo.png b/src/mapmap/resources/images/icons/small/solo.png similarity index 100% rename from resources/images/icons/small/solo.png rename to src/mapmap/resources/images/icons/small/solo.png diff --git a/resources/images/icons/small/solo_w.png b/src/mapmap/resources/images/icons/small/solo_w.png similarity index 100% rename from resources/images/icons/small/solo_w.png rename to src/mapmap/resources/images/icons/small/solo_w.png diff --git a/resources/images/icons/small/visible.png b/src/mapmap/resources/images/icons/small/visible.png similarity index 100% rename from resources/images/icons/small/visible.png rename to src/mapmap/resources/images/icons/small/visible.png diff --git a/resources/images/icons/small/visible_w.png b/src/mapmap/resources/images/icons/small/visible_w.png similarity index 100% rename from resources/images/icons/small/visible_w.png rename to src/mapmap/resources/images/icons/small/visible_w.png diff --git a/resources/images/icons/test_signal_w.png b/src/mapmap/resources/images/icons/test_signal_w.png similarity index 100% rename from resources/images/icons/test_signal_w.png rename to src/mapmap/resources/images/icons/test_signal_w.png diff --git a/resources/images/icons/zoom_fit.png b/src/mapmap/resources/images/icons/zoom_fit.png similarity index 100% rename from resources/images/icons/zoom_fit.png rename to src/mapmap/resources/images/icons/zoom_fit.png diff --git a/resources/images/icons/zoom_fit_w.png b/src/mapmap/resources/images/icons/zoom_fit_w.png similarity index 100% rename from resources/images/icons/zoom_fit_w.png rename to src/mapmap/resources/images/icons/zoom_fit_w.png diff --git a/resources/images/icons/zoom_in.png b/src/mapmap/resources/images/icons/zoom_in.png similarity index 100% rename from resources/images/icons/zoom_in.png rename to src/mapmap/resources/images/icons/zoom_in.png diff --git a/resources/images/icons/zoom_in_w.png b/src/mapmap/resources/images/icons/zoom_in_w.png similarity index 100% rename from resources/images/icons/zoom_in_w.png rename to src/mapmap/resources/images/icons/zoom_in_w.png diff --git a/resources/images/icons/zoom_out.png b/src/mapmap/resources/images/icons/zoom_out.png similarity index 100% rename from resources/images/icons/zoom_out.png rename to src/mapmap/resources/images/icons/zoom_out.png diff --git a/resources/images/icons/zoom_out_w.png b/src/mapmap/resources/images/icons/zoom_out_w.png similarity index 100% rename from resources/images/icons/zoom_out_w.png rename to src/mapmap/resources/images/icons/zoom_out_w.png diff --git a/resources/images/icons/zoom_reset.png b/src/mapmap/resources/images/icons/zoom_reset.png similarity index 100% rename from resources/images/icons/zoom_reset.png rename to src/mapmap/resources/images/icons/zoom_reset.png diff --git a/resources/images/icons/zoom_reset_w.png b/src/mapmap/resources/images/icons/zoom_reset_w.png similarity index 100% rename from resources/images/icons/zoom_reset_w.png rename to src/mapmap/resources/images/icons/zoom_reset_w.png diff --git a/src/mapmap/resources/images/logo/logo_m_big_mapmap.png b/src/mapmap/resources/images/logo/logo_m_big_mapmap.png new file mode 100644 index 0000000..39649ae Binary files /dev/null and b/src/mapmap/resources/images/logo/logo_m_big_mapmap.png differ diff --git a/src/mapmap/resources/images/logo/logo_m_mapmap.png b/src/mapmap/resources/images/logo/logo_m_mapmap.png new file mode 100644 index 0000000..b2d7609 Binary files /dev/null and b/src/mapmap/resources/images/logo/logo_m_mapmap.png differ diff --git a/src/mapmap/resources/images/logo/logomapmap-light.png b/src/mapmap/resources/images/logo/logomapmap-light.png new file mode 100644 index 0000000..3353f13 Binary files /dev/null and b/src/mapmap/resources/images/logo/logomapmap-light.png differ diff --git a/src/mapmap/resources/images/logo/logomapmap.png b/src/mapmap/resources/images/logo/logomapmap.png new file mode 100644 index 0000000..a09bc6d Binary files /dev/null and b/src/mapmap/resources/images/logo/logomapmap.png differ diff --git a/src/mapmap/resources/images/logo/mapmap-fullname.svg b/src/mapmap/resources/images/logo/mapmap-fullname.svg new file mode 100644 index 0000000..065589d --- /dev/null +++ b/src/mapmap/resources/images/logo/mapmap-fullname.svg @@ -0,0 +1,75 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/resources/images/logo/mapmap-logo.ico b/src/mapmap/resources/images/logo/mapmap-logo.ico similarity index 100% rename from resources/images/logo/mapmap-logo.ico rename to src/mapmap/resources/images/logo/mapmap-logo.ico diff --git a/src/mapmap/resources/images/logo/mapmap-logo.png b/src/mapmap/resources/images/logo/mapmap-logo.png new file mode 100644 index 0000000..f35732b Binary files /dev/null and b/src/mapmap/resources/images/logo/mapmap-logo.png differ diff --git a/src/mapmap/resources/images/logo/mapmap-wide-with-border.svg b/src/mapmap/resources/images/logo/mapmap-wide-with-border.svg new file mode 100644 index 0000000..76f9af9 --- /dev/null +++ b/src/mapmap/resources/images/logo/mapmap-wide-with-border.svg @@ -0,0 +1,133 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/logo/mapmap.ico b/src/mapmap/resources/images/logo/mapmap.ico similarity index 100% rename from resources/images/logo/mapmap.ico rename to src/mapmap/resources/images/logo/mapmap.ico diff --git a/src/mapmap/resources/images/logo/mapmap.svg b/src/mapmap/resources/images/logo/mapmap.svg new file mode 100644 index 0000000..9f20b97 --- /dev/null +++ b/src/mapmap/resources/images/logo/mapmap.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/mapmap/resources/images/logo/splash.png b/src/mapmap/resources/images/logo/splash.png new file mode 100644 index 0000000..aebcbd9 Binary files /dev/null and b/src/mapmap/resources/images/logo/splash.png differ diff --git a/src/mapmap/resources/images/media/photo.png b/src/mapmap/resources/images/media/photo.png new file mode 100644 index 0000000..a3a82fd Binary files /dev/null and b/src/mapmap/resources/images/media/photo.png differ diff --git a/src/mapmap/resources/images/media/video.png b/src/mapmap/resources/images/media/video.png new file mode 100644 index 0000000..4ee5d48 Binary files /dev/null and b/src/mapmap/resources/images/media/video.png differ diff --git a/src/mapmap/resources/images/media/webcam.png b/src/mapmap/resources/images/media/webcam.png new file mode 100644 index 0000000..ab674f8 Binary files /dev/null and b/src/mapmap/resources/images/media/webcam.png differ diff --git a/src/mapmap/resources/images/menu/add_cam.png b/src/mapmap/resources/images/menu/add_cam.png new file mode 100644 index 0000000..dde3511 Binary files /dev/null and b/src/mapmap/resources/images/menu/add_cam.png differ diff --git a/src/mapmap/resources/images/menu/add_color.png b/src/mapmap/resources/images/menu/add_color.png new file mode 100644 index 0000000..69a3904 Binary files /dev/null and b/src/mapmap/resources/images/menu/add_color.png differ diff --git a/src/mapmap/resources/images/menu/fullscreen.png b/src/mapmap/resources/images/menu/fullscreen.png new file mode 100644 index 0000000..812fa90 Binary files /dev/null and b/src/mapmap/resources/images/menu/fullscreen.png differ diff --git a/src/mapmap/resources/images/menu/midi.png b/src/mapmap/resources/images/menu/midi.png new file mode 100644 index 0000000..3b5eaac Binary files /dev/null and b/src/mapmap/resources/images/menu/midi.png differ diff --git a/src/mapmap/resources/images/menu/preferences.png b/src/mapmap/resources/images/menu/preferences.png new file mode 100644 index 0000000..3a07a4d Binary files /dev/null and b/src/mapmap/resources/images/menu/preferences.png differ diff --git a/src/mapmap/resources/images/menu/record.png b/src/mapmap/resources/images/menu/record.png new file mode 100644 index 0000000..24ab1bc Binary files /dev/null and b/src/mapmap/resources/images/menu/record.png differ diff --git a/src/mapmap/resources/images/menu/reseaux.png b/src/mapmap/resources/images/menu/reseaux.png new file mode 100644 index 0000000..668997f Binary files /dev/null and b/src/mapmap/resources/images/menu/reseaux.png differ diff --git a/src/mapmap/resources/images/menu/save.png b/src/mapmap/resources/images/menu/save.png new file mode 100644 index 0000000..73a1d80 Binary files /dev/null and b/src/mapmap/resources/images/menu/save.png differ diff --git a/src/mapmap/resources/images/menu/sound.png b/src/mapmap/resources/images/menu/sound.png new file mode 100644 index 0000000..61d2465 Binary files /dev/null and b/src/mapmap/resources/images/menu/sound.png differ diff --git a/src/mapmap/resources/images/menu/webcam.png b/src/mapmap/resources/images/menu/webcam.png new file mode 100644 index 0000000..6ce6e4f Binary files /dev/null and b/src/mapmap/resources/images/menu/webcam.png differ diff --git a/src/mapmap/resources/images/shapes/add_circle.png b/src/mapmap/resources/images/shapes/add_circle.png new file mode 100644 index 0000000..7891480 Binary files /dev/null and b/src/mapmap/resources/images/shapes/add_circle.png differ diff --git a/src/mapmap/resources/images/shapes/add_line.png b/src/mapmap/resources/images/shapes/add_line.png new file mode 100644 index 0000000..26386b8 Binary files /dev/null and b/src/mapmap/resources/images/shapes/add_line.png differ diff --git a/src/mapmap/resources/images/shapes/add_quad.png b/src/mapmap/resources/images/shapes/add_quad.png new file mode 100644 index 0000000..e2dc266 Binary files /dev/null and b/src/mapmap/resources/images/shapes/add_quad.png differ diff --git a/src/mapmap/resources/images/shapes/add_triangle.png b/src/mapmap/resources/images/shapes/add_triangle.png new file mode 100644 index 0000000..fbb7a13 Binary files /dev/null and b/src/mapmap/resources/images/shapes/add_triangle.png differ diff --git a/src/mapmap/resources/images/shapes/mask.png b/src/mapmap/resources/images/shapes/mask.png new file mode 100644 index 0000000..a9b05f6 Binary files /dev/null and b/src/mapmap/resources/images/shapes/mask.png differ diff --git a/src/mapmap/resources/images/shapes/timeline.png b/src/mapmap/resources/images/shapes/timeline.png new file mode 100644 index 0000000..719370b Binary files /dev/null and b/src/mapmap/resources/images/shapes/timeline.png differ diff --git a/src/mapmap/resources/images/shapes/warping.png b/src/mapmap/resources/images/shapes/warping.png new file mode 100644 index 0000000..ed60e3c Binary files /dev/null and b/src/mapmap/resources/images/shapes/warping.png differ diff --git a/src/mapmap/resources/images/test-signal/examples/classic-test-card.png b/src/mapmap/resources/images/test-signal/examples/classic-test-card.png new file mode 100644 index 0000000..4e3e40f Binary files /dev/null and b/src/mapmap/resources/images/test-signal/examples/classic-test-card.png differ diff --git a/src/mapmap/resources/images/test-signal/examples/ntsc-test-card.png b/src/mapmap/resources/images/test-signal/examples/ntsc-test-card.png new file mode 100644 index 0000000..11a3b98 Binary files /dev/null and b/src/mapmap/resources/images/test-signal/examples/ntsc-test-card.png differ diff --git a/src/mapmap/resources/images/test-signal/examples/pal-test-card.png b/src/mapmap/resources/images/test-signal/examples/pal-test-card.png new file mode 100644 index 0000000..e60adac Binary files /dev/null and b/src/mapmap/resources/images/test-signal/examples/pal-test-card.png differ diff --git a/src/mapmap/resources/images/test-signal/ntsc-test-signal.svg b/src/mapmap/resources/images/test-signal/ntsc-test-signal.svg new file mode 100644 index 0000000..a76a1bd --- /dev/null +++ b/src/mapmap/resources/images/test-signal/ntsc-test-signal.svg @@ -0,0 +1,183 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mapmap/resources/images/test-signal/pal-test-signal.svg b/src/mapmap/resources/images/test-signal/pal-test-signal.svg new file mode 100644 index 0000000..acdfac5 --- /dev/null +++ b/src/mapmap/resources/images/test-signal/pal-test-signal.svg @@ -0,0 +1,1133 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/mapmap/resources/images/test-signal/test-signal.svg b/src/mapmap/resources/images/test-signal/test-signal.svg new file mode 100644 index 0000000..1ced9be --- /dev/null +++ b/src/mapmap/resources/images/test-signal/test-signal.svg @@ -0,0 +1,1354 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/resources/qss/mapmap.qss b/src/mapmap/resources/qss/mapmap.qss similarity index 100% rename from resources/qss/mapmap.qss rename to src/mapmap/resources/qss/mapmap.qss diff --git a/resources/texts/mapmap.desktop b/src/mapmap/resources/texts/mapmap.desktop similarity index 100% rename from resources/texts/mapmap.desktop rename to src/mapmap/resources/texts/mapmap.desktop diff --git a/resources/texts/mapmap.xml b/src/mapmap/resources/texts/mapmap.xml similarity index 100% rename from resources/texts/mapmap.xml rename to src/mapmap/resources/texts/mapmap.xml diff --git a/translations/mapmap_en.ts b/src/mapmap/translations/mapmap_en.ts similarity index 100% rename from translations/mapmap_en.ts rename to src/mapmap/translations/mapmap_en.ts diff --git a/translations/mapmap_fr.ts b/src/mapmap/translations/mapmap_fr.ts similarity index 100% rename from translations/mapmap_fr.ts rename to src/mapmap/translations/mapmap_fr.ts diff --git a/translations/translation.qrc b/src/mapmap/translations/translation.qrc similarity index 100% rename from translations/translation.qrc rename to src/mapmap/translations/translation.qrc diff --git a/src/shape/shape.pri b/src/shape/shape.pri deleted file mode 100644 index 9a2b34a..0000000 --- a/src/shape/shape.pri +++ /dev/null @@ -1,15 +0,0 @@ - -include(../src.pri) - -HEADERS += $$PWD/Ellipse.h \ - $$PWD/Mesh.h \ - $$PWD/Polygon.h \ - $$PWD/Quad.h \ - $$PWD/Shape.h \ - $$PWD/Shapes.h \ - $$PWD/Triangle.h - -SOURCES += $$PWD/Ellipse.cpp \ - $$PWD/Mesh.cpp \ - $$PWD/Polygon.cpp \ - $$PWD/Shape.cpp diff --git a/src/src.pri b/src/src.pri deleted file mode 100644 index 28f064f..0000000 --- a/src/src.pri +++ /dev/null @@ -1,47 +0,0 @@ -QT += gui opengl xml core network -greaterThan(QT_MAJOR_VERSION, 4) { - QT -= gui # using widgets instead gui in Qt5 - QT += widgets multimedia -} - -#Includes common configuration for all subdirectory .pro files. -INCLUDEPATH += $$PWD/core \ - $$PWD/shape \ - $$PWD/gui \ - $$PWD/control \ - $$PWD/app - -#Linux-specific: -unix:!macx { - DEFINES += UNIX - CONFIG += link_pkgconfig - INCLUDE_PATH += - PKGCONFIG += \ - gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 gstreamer-pbutils-1.0 \ - liblo \ - gl x11 - QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-result -Wno-unused-parameter \ - -Wno-unused-variable -Wno-switch -Wno-comment \ - -Wno-unused-but-set-variable - QMAKE_CXXFLAGS += -DHAVE_OSC -} - -# Windows-specific: -win32 { - INCLUDEPATH += $${GST_HOME}/lib/gstreamer-1.0/include \ - $${GST_HOME}/include/glib-2.0 \ - $${GST_HOME}/lib/glib-2.0/include \ - $${GST_HOME}/include/gstreamer-1.0 - - LIBS += $${GST_HOME}/lib/gstapp-1.0.lib \ - $${GST_HOME}/lib/gstbase-1.0.lib \ - $${GST_HOME}/lib/gstpbutils-1.0.lib \ - $${GST_HOME}/lib/gstreamer-1.0.lib \ - $${GST_HOME}/lib/gobject-2.0.lib \ - $${GST_HOME}/lib/glib-2.0.lib \ - -lopengl32 - - QMAKE_CXXFLAGS += -D_USE_MATH_DEFINES -} - - diff --git a/tests/TestMaths.cpp b/src/tests/TestMaths.cpp similarity index 100% rename from tests/TestMaths.cpp rename to src/tests/TestMaths.cpp diff --git a/tests/TestMaths.h b/src/tests/TestMaths.h similarity index 100% rename from tests/TestMaths.h rename to src/tests/TestMaths.h diff --git a/tests/tests.pro b/src/tests/tests.pro similarity index 82% rename from tests/tests.pro rename to src/tests/tests.pro index 6919f10..b923a21 100644 --- a/tests/tests.pro +++ b/src/tests/tests.pro @@ -12,5 +12,5 @@ SOURCES = TestMaths.cpp HEADERS = TestMaths.h -INCLUDEPATH += $$PWD/../src/ +INCLUDEPATH += $$PWD/../mapmap/