Updates

Signed-off-by: Carlos Agüero <[email protected]>
gazebosim · Jul 10, 2024 · bcf1e09 · bcf1e09
1 parent 0214391
commit bcf1e09
Show file tree

Hide file tree

Showing 34 changed files with 133 additions and 125 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,7 +82,7 @@ set(GZ_TOOLS_VER 2)
 #--------------------------------------
 # Find QT
 set(QT_MAJOR_VERSION 6)
-set(QT_MINOR_VERSION 0)
+set(QT_MINOR_VERSION 4)
 gz_find_package (Qt${QT_MAJOR_VERSION}
   VERSION ${QT_MAJOR_VERSION}.${QT_MINOR_VERSION}
   COMPONENTS

diff --git a/examples/plugin/custom_context_menu/CustomContext.qml b/examples/plugin/custom_context_menu/CustomContext.qml
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 
 Rectangle {
   id: customContext

diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.qml b/examples/plugin/dialog_from_plugin/DialogFromPlugin.qml
@@ -14,10 +14,10 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Dialogs 1.0
-import QtQuick.Window 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Dialogs
+import QtQuick.Window
 
 Rectangle {
   id: customPlugin

diff --git a/examples/plugin/gz_components/GzComponents.qml b/examples/plugin/gz_components/GzComponents.qml
@@ -14,9 +14,9 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.0
-import gz.gui 1.0
+import QtQuick
+import QtQuick.Controls
+import gz.gui
 
 Column {
   anchors.fill: parent

diff --git a/examples/plugin/hello_plugin/HelloPlugin.qml b/examples/plugin/hello_plugin/HelloPlugin.qml
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 Rectangle {
   color: "transparent"
   anchors.fill: parent

diff --git a/examples/plugin/multiple_qml/MultipleQml.qml b/examples/plugin/multiple_qml/MultipleQml.qml
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 import "qrc:/MultipleQml_qml"
 
 Column {

diff --git a/examples/standalone/custom_drawer/CustomDrawer.qml b/examples/standalone/custom_drawer/CustomDrawer.qml
@@ -14,9 +14,9 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.1
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 
 /**
  * Custom drawer

diff --git a/examples/standalone/start_dialog/start_dialog.qml b/examples/standalone/start_dialog/start_dialog.qml
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 Rectangle {
   color: "green"
   anchors.fill: parent

diff --git a/include/gz/gui/CMakeLists.txt b/include/gz/gui/CMakeLists.txt
@@ -83,9 +83,20 @@ if (QT_MAJOR_VERSION EQUAL 6)
   target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
     PUBLIC
     $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/gz/gui9>
   )
 
+  install(
+    TARGETS ${PROJECT_LIBRARY_TARGET_NAME}
+    EXPORT ${PROJECT_LIBRARY_TARGET_NAME}
+    LIBRARY DESTINATION ${GZ_LIB_INSTALL_DIR}
+    ARCHIVE DESTINATION ${GZ_LIB_INSTALL_DIR}
+    RUNTIME DESTINATION ${GZ_BIN_INSTALL_DIR}
+    COMPONENT libraries)
+
+  _gz_create_cmake_package()
+  _gz_create_pkgconfig()
+
 else()
   set (resources resources.qrc)
   qt_wrap_cpp(headers_MOC ${qt_headers})

diff --git a/include/gz/gui/qml/GzPose.qml b/include/gz/gui/qml/GzPose.qml
@@ -15,9 +15,7 @@
  *
 */
 import QtQuick
-import QtQuick.Control
-import QtQuick.Layout
-import QtQuick.Controls.Styles
+import QtQuick.Layouts
 
 /**
  *  Item displaying 3D pose information.
@@ -80,7 +78,7 @@ Item {
   signal gzPoseSet(double _x, double _y, double _z, double _roll, double _pitch, double _yaw)
 
   // Maximum spinbox value
-  property double spinMax: Number.MAX_VALUE
+  property int spinMax: Number.MAX_VALUE
 
   // Expand/Collapse of this widget
   property bool expand: true
@@ -121,10 +119,10 @@ Item {
     GzSpinBox {
       id: writableSpin
       value:  numberValue
-      minimumValue: -spinMax
-      maximumValue: spinMax
-      decimals: gzHelper.getDecimals(writableSpin.width)
-      onEditingFinished: {
+      from: -spinMax
+      to: spinMax
+      //decimals: gzHelper.getDecimals(writableSpin.width)
+      onValueChanged: {
         gzPoseRoot.gzPoseSet(xItem.value, yItem.value, zItem.value,
                              rollItem.value, pitchItem.value, yawItem.value)
       }

diff --git a/include/gz/gui/qml/PlottingInterface.qml b/include/gz/gui/qml/PlottingInterface.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls.Styles
 import QtQuick.Controls.Material
 import QtQuick.Layouts
 import Qt.labs.platform
-import "qrc:/qml"
+import "qrc:/gz/gui/qml"
 
 Rectangle
 {

diff --git a/src/plugins/CameraFps/CameraFps.qml b/src/plugins/CameraFps/CameraFps.qml
@@ -15,9 +15,9 @@
  *
 */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Rectangle {
   id: cameraFps

diff --git a/src/plugins/CameraTracking/CameraTracking.qml b/src/plugins/CameraTracking/CameraTracking.qml
@@ -15,9 +15,9 @@
  *
 */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 ColumnLayout {
   Layout.minimumWidth: 350

diff --git a/src/plugins/GridConfig/GridConfig.qml b/src/plugins/GridConfig/GridConfig.qml
@@ -14,12 +14,12 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.1
-import QtQuick.Controls.Material 2.1
-import QtQuick.Dialogs 1.0
-import QtQuick.Layouts 1.3
-import "qrc:/qml"
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Dialogs
+import QtQuick.Layouts
+import "qrc:/gz/gui/qml"
 
 GridLayout {
   columns: 4

diff --git a/src/plugins/ImageDisplay/ImageDisplay.qml b/src/plugins/ImageDisplay/ImageDisplay.qml
@@ -14,10 +14,10 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.1
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 
 Rectangle {
   id: "imageDisplay"

diff --git a/src/plugins/InteractiveViewControl/InteractiveViewControl.qml b/src/plugins/InteractiveViewControl/InteractiveViewControl.qml
@@ -15,9 +15,9 @@
  *
 */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 ColumnLayout {
   Layout.minimumWidth: 350

diff --git a/src/plugins/KeyPublisher/KeyPublisher.qml b/src/plugins/KeyPublisher/KeyPublisher.qml
@@ -15,9 +15,9 @@
  *
 */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 GridLayout {
   columns: 1

diff --git a/src/plugins/MarkerManager/MarkerManager.qml b/src/plugins/MarkerManager/MarkerManager.qml
@@ -15,9 +15,9 @@
  *
 */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 ColumnLayout {
   Layout.minimumWidth: 350

diff --git a/src/plugins/NavsatMap/NavSatMap.qml b/src/plugins/NavsatMap/NavSatMap.qml
@@ -14,12 +14,12 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-import QtQuick.Controls.Material 2.1
-import QtLocation 5.6
-import QtPositioning 5.6
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtLocation
+import QtPositioning
 
 Item {
   id: navSatMap

diff --git a/src/plugins/Plotting/TransportPlotting.qml b/src/plugins/Plotting/TransportPlotting.qml
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import "qrc:/qml"
+import "qrc:/gz/gui/qml"
 
 PlottingInterface {
   Layout.minimumWidth: 600

diff --git a/src/plugins/PointCloud/PointCloud.qml b/src/plugins/PointCloud/PointCloud.qml
@@ -15,13 +15,13 @@
  *
  */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.0
-import QtQuick.Controls.Material 2.1
-import QtQuick.Layouts 1.3
-import gz.gui 1.0
-import "qrc:/qml"
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Dialogs
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import gz.gui
+import "qrc:/gz/gui/qml"
 
 ColumnLayout {
   spacing: 10

diff --git a/src/plugins/Publisher/Publisher.qml b/src/plugins/Publisher/Publisher.qml
@@ -14,9 +14,9 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Rectangle {
   id: publisher

diff --git a/src/plugins/Screenshot/CMakeLists.txt b/src/plugins/Screenshot/CMakeLists.txt
@@ -3,6 +3,8 @@ gz_gui_add_plugin(Screenshot
     Screenshot.cc
   QT_HEADERS
     Screenshot.hh
+  QML_SOURCES
+    Screenshot.qml
   PUBLIC_LINK_LIBS
     gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
   TEST_SOURCES

diff --git a/src/plugins/Screenshot/Screenshot.qml b/src/plugins/Screenshot/Screenshot.qml
@@ -14,13 +14,12 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.1
-import QtQuick.Controls.Material 2.2
-import QtQuick.Controls.Material.impl 2.2
-import QtQuick.Layouts 1.3
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Dialogs 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import QtQuick.Layouts
+import QtQuick.Dialogs
 
 ToolBar {
   Layout.minimumWidth: 200
@@ -65,18 +64,16 @@ ToolBar {
         sourceSize.height: 40
       }
       onClicked: {
-        fileDialog.open()
+        folderDialog.open()
       }
     }
 
-    FileDialog {
-      id: fileDialog
+    FolderDialog {
+      id: folderDialog
       title: "Save screenshots"
-      folder: Screenshot.directory
-      selectExisting: false
-      selectFolder: true
+      currentFolder: Screenshot.directory
       onAccepted: {
-        Screenshot.SetDirectory(fileDialog.folder)
+        Screenshot.SetDirectory(folderDialog.folder)
         close()
       }
     }

diff --git a/src/plugins/ShutdownButton/ShutdownButton.qml b/src/plugins/ShutdownButton/ShutdownButton.qml
@@ -14,10 +14,10 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.1
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 
 RowLayout {
   id: shutdownButton