From bc90810bd603d3235c89bc5be1817c14c7f223f2 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 17 May 2022 23:17:17 -0700 Subject: [PATCH] Migrate examples Signed-off-by: methylDragon --- .../{ign_components => gz_components}/CMakeLists.txt | 8 ++++---- .../IgnComponents.cc => gz_components/GzComponents.cc} | 4 ++-- examples/plugin/gz_components/GzComponents.config | 2 ++ .../IgnComponents.hh => gz_components/GzComponents.hh} | 4 ++-- .../IgnComponents.qml => gz_components/GzComponents.qml} | 4 ++-- examples/plugin/gz_components/GzComponents.qrc | 5 +++++ .../plugin/{ign_components => gz_components}/README.md | 5 ++--- examples/plugin/ign_components/IgnComponents.config | 2 -- examples/plugin/ign_components/IgnComponents.qrc | 5 ----- 9 files changed, 19 insertions(+), 20 deletions(-) rename examples/plugin/{ign_components => gz_components}/CMakeLists.txt (83%) rename examples/plugin/{ign_components/IgnComponents.cc => gz_components/GzComponents.cc} (90%) create mode 100644 examples/plugin/gz_components/GzComponents.config rename examples/plugin/{ign_components/IgnComponents.hh => gz_components/GzComponents.hh} (91%) rename examples/plugin/{ign_components/IgnComponents.qml => gz_components/GzComponents.qml} (97%) create mode 100644 examples/plugin/gz_components/GzComponents.qrc rename examples/plugin/{ign_components => gz_components}/README.md (68%) delete mode 100644 examples/plugin/ign_components/IgnComponents.config delete mode 100644 examples/plugin/ign_components/IgnComponents.qrc diff --git a/examples/plugin/ign_components/CMakeLists.txt b/examples/plugin/gz_components/CMakeLists.txt similarity index 83% rename from examples/plugin/ign_components/CMakeLists.txt rename to examples/plugin/gz_components/CMakeLists.txt index 92fe3a234..e0a74ef6a 100644 --- a/examples/plugin/ign_components/CMakeLists.txt +++ b/examples/plugin/gz_components/CMakeLists.txt @@ -21,7 +21,7 @@ find_package(ignition-common5 REQUIRED) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}") -QT5_ADD_RESOURCES(resources_RCC IgnComponents.qrc) +QT5_ADD_RESOURCES(resources_RCC GzComponents.qrc) include_directories(SYSTEM ${IGNITION-COMMON_INCLUDE_DIRS} @@ -34,11 +34,11 @@ link_directories( ) # Generate examples -add_library(IgnComponents SHARED ${headers_MOC} - IgnComponents.cc +add_library(GzComponents SHARED ${headers_MOC} + GzComponents.cc ${resources_RCC} ) -target_link_libraries(IgnComponents +target_link_libraries(GzComponents ${IGNITION-GUI_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Qml_LIBRARIES} diff --git a/examples/plugin/ign_components/IgnComponents.cc b/examples/plugin/gz_components/GzComponents.cc similarity index 90% rename from examples/plugin/ign_components/IgnComponents.cc rename to examples/plugin/gz_components/GzComponents.cc index f52a5f09e..06cbfe70a 100644 --- a/examples/plugin/ign_components/IgnComponents.cc +++ b/examples/plugin/gz_components/GzComponents.cc @@ -16,8 +16,8 @@ */ #include -#include "IgnComponents.hh" +#include "GzComponents.hh" // Register this plugin -IGNITION_ADD_PLUGIN(ignition::gui::IgnComponents, +IGNITION_ADD_PLUGIN(ignition::gui::GzComponents, ignition::gui::Plugin); diff --git a/examples/plugin/gz_components/GzComponents.config b/examples/plugin/gz_components/GzComponents.config new file mode 100644 index 000000000..82b51f112 --- /dev/null +++ b/examples/plugin/gz_components/GzComponents.config @@ -0,0 +1,2 @@ + + diff --git a/examples/plugin/ign_components/IgnComponents.hh b/examples/plugin/gz_components/GzComponents.hh similarity index 91% rename from examples/plugin/ign_components/IgnComponents.hh rename to examples/plugin/gz_components/GzComponents.hh index 6c72e5b0a..1ba75af93 100644 --- a/examples/plugin/ign_components/IgnComponents.hh +++ b/examples/plugin/gz_components/GzComponents.hh @@ -24,12 +24,12 @@ namespace ignition { namespace gui { - class IgnComponents : public Plugin + class GzComponents : public Plugin { Q_OBJECT /// \brief Constructor - public: IgnComponents() = default; + public: GzComponents() = default; }; } } diff --git a/examples/plugin/ign_components/IgnComponents.qml b/examples/plugin/gz_components/GzComponents.qml similarity index 97% rename from examples/plugin/ign_components/IgnComponents.qml rename to examples/plugin/gz_components/GzComponents.qml index c1360b403..8e516d93b 100644 --- a/examples/plugin/ign_components/IgnComponents.qml +++ b/examples/plugin/gz_components/GzComponents.qml @@ -23,7 +23,7 @@ Column { spacing: 2 // Integer spin box - IgnSpinBox { + GzSpinBox { minimumValue: -2 maximumValue: 19 decimals: 0 @@ -32,7 +32,7 @@ Column { } // Double spin box - IgnSpinBox { + GzSpinBox { minimumValue: -2.5 maximumValue: 19.3 decimals: 4 diff --git a/examples/plugin/gz_components/GzComponents.qrc b/examples/plugin/gz_components/GzComponents.qrc new file mode 100644 index 000000000..5e781be28 --- /dev/null +++ b/examples/plugin/gz_components/GzComponents.qrc @@ -0,0 +1,5 @@ + + + GzComponents.qml + + diff --git a/examples/plugin/ign_components/README.md b/examples/plugin/gz_components/README.md similarity index 68% rename from examples/plugin/ign_components/README.md rename to examples/plugin/gz_components/README.md index d946455c0..b8d240aaf 100644 --- a/examples/plugin/ign_components/README.md +++ b/examples/plugin/gz_components/README.md @@ -13,11 +13,10 @@ useful for downstream developers. Standalone: cd build - export GZ_GUI_PLUGIN_PATH=`pwd`; ign gui -s IgnComponents + export GZ_GUI_PLUGIN_PATH=`pwd`; ign gui -s GzComponents Within a window where other plugins can also be inserted, using a custom configuration: cd build - export GZ_GUI_PLUGIN_PATH=`pwd`; ign gui -c ../IgnComponents.config - + export GZ_GUI_PLUGIN_PATH=`pwd`; ign gui -c ../GzComponents.config diff --git a/examples/plugin/ign_components/IgnComponents.config b/examples/plugin/ign_components/IgnComponents.config deleted file mode 100644 index e91b0dbcb..000000000 --- a/examples/plugin/ign_components/IgnComponents.config +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/examples/plugin/ign_components/IgnComponents.qrc b/examples/plugin/ign_components/IgnComponents.qrc deleted file mode 100644 index 89c4ec549..000000000 --- a/examples/plugin/ign_components/IgnComponents.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - IgnComponents.qml - -