Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.directory
*.pro.user*
CMakeLists.txt.user
CMakeLists.txt.user.*
quickqanava.pro.user
QuickContainers/quickcontainers.pro.user
QuickGeoGL/quickgeogl.pro.user
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ if (${QUICK_QANAVA_CI})
add_subdirectory(samples/groups) # Used to test CI
endif()

add_subdirectory(samples/groups)
if (${QUICK_QANAVA_BUILD_SAMPLES})
add_subdirectory(samples/advanced)
add_subdirectory(samples/connector)
Expand Down
17 changes: 16 additions & 1 deletion samples/groups/SampleGroups.qml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ ApplicationWindow {
groupEditor.group = undefined
contextMenu.node = undefined
}
onRightClicked: {
onRightClicked: (pos) => {
contextMenu.x = pos.x
contextMenu.y = pos.y
contextMenu.open()
Expand Down Expand Up @@ -180,6 +180,21 @@ ApplicationWindow {
}
}
MenuSeparator { }
MenuItem {
text: "Append column"
enabled: contextMenu.group?.isTable || false
onClicked: {
contextMenu.group.insertColumn()
}
}
MenuItem {
text: "Append row"
enabled: contextMenu.group?.isTable || false
onClicked: {
contextMenu.group.insertRow()
}
}
MenuSeparator { }
MenuItem {
text: "Send to front"
enabled: contextMenu.group !== undefined
Expand Down
4 changes: 2 additions & 2 deletions samples/groups/groups.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file groups.cpp
// \file groups.cpp
// \author [email protected]
// \date 2016 03 23
// \date 2016 03 23
//-----------------------------------------------------------------------------

// Qt headers
Expand Down
33 changes: 2 additions & 31 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,34 +141,23 @@ set(qan_qml_files

# Configure Qt
set(CMAKE_AUTOMOC ON)
qt_wrap_cpp(qan_source_files, qan_header_files) # Creates .moc files from sources
#qt_wrap_cpp(qan_moc_files ${qan_header_files}) # Creates .moc files from sources
set(CMAKE_AUTORCC ON)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:QT_QML_DEBUG>)

# Configure QuickQanava library ###############################################

# FIXME #248
# list(APPEND qan_resources QuickQanava_static.qrc)
# add_library(QuickQanava STATIC
# ${qan_source_files}
# ${qan_header_files}
# ${quickcontainers_source_files}
# ${quickcontainers_header_files}
# ${qan_resources}
# )

# qt_add_library(QuickQanava STATIC)
qt_add_qml_module(QuickQanava
STATIC
URI QuickQanava
# VERSION 2.5
SOURCES
${qan_source_files} ${qan_header_files} ${quickcontainers_source_files} ${quickcontainers_header_files}
${qan_source_files} ${qan_header_files} ${qan_moc_files} ${quickcontainers_source_files} ${quickcontainers_header_files}
QML_FILES
${qan_qml_files}
RESOURCE_PREFIX /
OUTPUT_DIRECTORY QuickQanava
#RESOURCE QuickQanava_static.qrc
)
set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/QuickQanava)

Expand All @@ -178,24 +167,6 @@ target_include_directories(QuickQanava
$<INSTALL_INTERFACE:include>
)

# target_compile_features(QuickQanava
# PUBLIC
# cxx_std_17
# )

# install(FILES
# ${qan_header_files}
# DESTINATION include/quickqanava
# )

# install(TARGETS QuickQanava
# EXPORT Targets
# LIBRARY DESTINATION lib
# ARCHIVE DESTINATION lib
# RUNTIME DESTINATION bin
# INCLUDES DESTINATION include/quickqanava
# )

set(CMAKE_INCLUDE_CURRENT_DIR ON)
target_link_libraries(QuickQanava PUBLIC Qt6::Core
Qt6::Gui
Expand Down
4 changes: 2 additions & 2 deletions src/CanvasNodeTemplate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file NodeCanvasTemplate.qml
// \file NodeCanvasTemplate.qml
// \author [email protected]
// \date 2015 11 30
// \date 2015 11 30
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/Edge.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file Edge.qml
// \file Edge.qml
// \author [email protected]
// \date 2016 09 04
// \date 2016 09 04
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeCurvedPath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeCurvedPath.qml
// \file EdgeCurvedPath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeDstArrowPath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeDstArrowPath.qml
// \file EdgeDstArrowPath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeDstCirclePath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeDstCirclePath.qml
// \file EdgeDstCirclePath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeDstRectPath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeDstRectPath.qml
// \file EdgeDstRectPath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeOrthoPath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeOrthoPath.qml
// \file EdgeOrthoPath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeSrcArrowPath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeSrcArrowPath.qml
// \file EdgeSrcArrowPath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeSrcCirclePath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeSrcCirclePath.qml
// \file EdgeSrcCirclePath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeSrcRectPath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeSrcRectPath.qml
// \file EdgeSrcRectPath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeStraightPath.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeStraightPath.qml
// \file EdgeStraightPath.qml
// \author [email protected]
// \date 2022 10 02
// \date 2022 10 02
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/EdgeTemplate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file EdgeTemplate.qml
// \file EdgeTemplate.qml
// \author [email protected]
// \date 2017 11 17
// \date 2017 11 17
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/GraphView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file GraphView.qml
// \file GraphView.qml
// \author [email protected]
// \date 2015 08 01
// \date 2015 08 01
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/Group.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file Group.qml
// \file Group.qml
// \author [email protected]
// \date 2016 03 22
// \date 2016 03 22
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/HorizontalDock.qml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
// \file HorizontalDock.qml
// \file HorizontalDock.qml
// \author [email protected]
// \date 2017 08 28
// \date 2017 08 28
//-----------------------------------------------------------------------------
import QtQuick
import QtQuick.Layouts
Expand Down
4 changes: 2 additions & 2 deletions src/LabelEditor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file LabelEditor.qml
// \file LabelEditor.qml
// \author [email protected]
// \date 2015 11 30
// \date 2015 11 30
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/LineGrid.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file LineGrid.qml
// \file LineGrid.qml
// \author [email protected]
// \date 2017 11 16
// \date 2017 11 16
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/Node.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file Node.qml
// \file Node.qml
// \author [email protected]
// \date 2015 06 16
// \date 2015 06 16
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/OriginCross.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file OriginCross.qml
// \file OriginCross.qml
// \author [email protected]
// \date 2024 08 23
// \date 2024 08 23
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/Port.qml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
// \file Port.qml
// \file Port.qml
// \author [email protected]
// \date 2017 08 12
// \date 2017 08 12
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/QuickQanava.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file QuickQanava.h
// \file QuickQanava.h
// \author [email protected]
// \date 2016 02 04
// \date 2016 02 04
//-----------------------------------------------------------------------------

#pragma once
Expand Down
4 changes: 2 additions & 2 deletions src/RectGlowEffect.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file RectGlowEffect.qml
// \file RectGlowEffect.qml
// \author [email protected]
// \date 2018 03 23
// \date 2018 03 23
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
4 changes: 2 additions & 2 deletions src/RectGradientBackground.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//-----------------------------------------------------------------------------
// This file is a part of the QuickQanava software library.
//
// \file RectGradientBackground.qml
// \file RectGradientBackground.qml
// \author [email protected]
// \date 2018 03 25
// \date 2018 03 25
//-----------------------------------------------------------------------------

import QtQuick
Expand Down
Loading