cneben#248 backport of layouts and selection samples to qml module.

Signed-off-by: cneben <[email protected]>

CMakeLists.txt

@@ -26,8 +26,9 @@ option(QUICK_QANAVA_BUILD_SAMPLES "Build QuickQanava samples" OFF)
     add_subdirectory(samples/navigable)
 
     add_subdirectory(samples/nodes)
-    #add_subdirectory(samples/layouts)
-    #add_subdirectory(samples/selection)
+    add_subdirectory(samples/layouts)
+    add_subdirectory(samples/selection)
+
     #add_subdirectory(samples/style)
     #add_subdirectory(samples/topology)
 #endif()

samples/groups/groups.cpp

@@ -52,10 +52,8 @@ int	main( int argc, char** argv )
     QQuickStyle::setStyle("Material");
     QQmlApplicationEngine engine;
     engine.addImportPath("../../src/");
-
     QuickQanava::initialize(&engine);
     engine.loadFromModule("SampleGroups", "SampleGroups");
-
     return app.exec();
 }
 //-----------------------------------------------------------------------------

samples/layouts/CMakeLists.txt

@@ -2,20 +2,19 @@ cmake_minimum_required(VERSION 3.16)
 
 project(QuickQanava_sample_layouts VERSION 2.5.0 LANGUAGES CXX)
 
-# Require C++17
+# Configure Qt
+find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2)
+qt_standard_project_setup(REQUIRES 6.6)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Configure Qt
-find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:QT_QML_DEBUG>)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} "../../src")
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} "../../src")
 if(NOT TARGET QuickQanava)
     add_subdirectory(../../ quickqanava_build)  # Use ../../src as quickqanava_build subdirectory
     # see https://stackoverflow.com/questions/50408169/cmake-error-add-subdirectory-not-given-a-binary-directory/50408555
@@ -32,6 +31,7 @@ add_executable(sample_layouts ${source_files} ${header_files} layouts.qrc)
 target_include_directories(sample_layouts PUBLIC QuickQanava Qt${QT_VERSION_MAJOR}::QuickControls2)
 target_link_libraries(sample_layouts
     QuickQanava
+    QuickQanavaplugin
     Qt${QT_VERSION_MAJOR}::Core
     Qt${QT_VERSION_MAJOR}::Gui
     Qt${QT_VERSION_MAJOR}::QuickControls2

samples/layouts/layouts.cpp

@@ -45,12 +45,11 @@ int	main( int argc, char** argv )
 {
     QGuiApplication app(argc, argv);
     QQuickStyle::setStyle("Material");
-    QQmlApplicationEngine* engine = new QQmlApplicationEngine();
-    //engine->addPluginPath(QStringLiteral("../../src")); // Necessary only for development when plugin is not installed to QTDIR/qml
-    //QuickQanava::initialize(engine);
-    engine->load(QUrl("qrc:/layouts.qml"));
+    QQmlApplicationEngine engine;
+    engine.addImportPath("../../src/");
+    QuickQanava::initialize(&engine);
+    engine.load(QUrl("qrc:/layouts.qml"));
     const auto status = app.exec();
-    delete engine;
     return status;
 }
 //-----------------------------------------------------------------------------

samples/layouts/layouts.qml

@@ -28,8 +28,7 @@ import QtQuick
 import QtQuick.Controls.Material
 import QtQuick.Layouts
 
-import QuickQanava 2.0 as Qan
-import "qrc:/QuickQanava" as Qan
+import QuickQanava as Qan
 
 ApplicationWindow {
     id: window

samples/selection/CMakeLists.txt

@@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.16)
 
 project(QuickQanava_sample_selection VERSION 2.5.0 LANGUAGES CXX)
 
+# Configure Qt
+find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2)
+qt_standard_project_setup(REQUIRES 6.6)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Configure Qt
-find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:QT_QML_DEBUG>)
@@ -30,6 +30,7 @@ add_executable(sample_selection ${source_files} selection.qrc)
 target_include_directories(sample_selection PUBLIC QuickQanava Qt${QT_VERSION_MAJOR}::QuickControls2)
 target_link_libraries(sample_selection
     QuickQanava
+    QuickQanavaplugin
     Qt${QT_VERSION_MAJOR}::Core
     Qt${QT_VERSION_MAJOR}::Gui
     Qt${QT_VERSION_MAJOR}::QuickControls2

samples/selection/selection.cpp

@@ -48,8 +48,8 @@ int	main( int argc, char** argv )
     QGuiApplication app(argc, argv);
     QQuickStyle::setStyle("Material");
     QQmlApplicationEngine engine;
+    engine.addImportPath("../../src/");
     QuickQanava::initialize(&engine);
-    engine.addPluginPath(QStringLiteral("../../src")); // Necessary only for development when plugin is not installed to QTDIR/qml
     engine.load(QUrl("qrc:/selection.qml"));
     return app.exec();
 }

samples/selection/selection.qml

@@ -29,8 +29,7 @@ import QtQuick.Controls.Material
 import QtQuick.Layouts
 import Qt.labs.platform as Labs    // ColorDialog
 
-import QuickQanava          2.0 as Qan
-import "qrc:/QuickQanava"   as Qan
+import QuickQanava as Qan
 
 ApplicationWindow {
     id: window
@@ -82,7 +81,7 @@ ApplicationWindow {
             onGroupRightClicked: (group) => { window.notifyUser( "Group <b>" + group.label + "</b> right clicked" ) }
         } // Qan.Graph: graph
         focus: true
-        Keys.onPressed: {
+        Keys.onPressed: (event) => {
             if (event.modifiers & Qt.ControlModifier &&      // CTRL+A
                 event.key === Qt.Key_A) {
                 topology.selectAll()