From 58141d74438f07cef50490ca9c439d1d3be535a8 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 6 May 2022 15:07:23 -0700 Subject: [PATCH] Migrate sources in src, test, examples, and include (#395) Signed-off-by: methylDragon --- .../custom_context_menu/CustomContext.cc | 2 +- .../custom_context_menu/CustomContext.hh | 8 ++--- .../dialog_from_plugin/DialogFromPlugin.cc | 2 +- .../dialog_from_plugin/DialogFromPlugin.hh | 8 ++--- examples/plugin/hello_plugin/HelloPlugin.cc | 2 +- examples/plugin/hello_plugin/HelloPlugin.hh | 8 ++--- .../plugin/ign_components/IgnComponents.cc | 2 +- .../plugin/ign_components/IgnComponents.hh | 6 ++-- examples/plugin/multiple_qml/MultipleQml.cc | 2 +- examples/plugin/multiple_qml/MultipleQml.hh | 8 ++--- .../standalone/custom_drawer/custom_drawer.cc | 8 ++--- .../standalone/custom_drawer/custom_drawer.hh | 6 ++-- examples/standalone/dialogs/dialogs.cc | 8 ++--- examples/standalone/marker/marker.cc | 6 ++-- .../standalone/point_cloud/point_cloud.cc | 6 ++-- .../scene_provider/scene_provider.cc | 12 ++++---- examples/standalone/window/window.cc | 6 ++-- include/gz/gui/Application.hh | 10 +++--- include/gz/gui/Conversions.hh | 20 ++++++------ include/gz/gui/Dialog.hh | 8 ++--- include/gz/gui/DragDropModel.hh | 8 ++--- include/gz/gui/Enums.hh | 6 ++-- include/gz/gui/GuiEvents.hh | 20 ++++++------ include/gz/gui/Helpers.hh | 8 ++--- include/gz/gui/MainWindow.hh | 10 +++--- include/gz/gui/PlottingInterface.hh | 6 ++-- include/gz/gui/Plugin.hh | 8 ++--- include/gz/gui/SearchModel.hh | 8 ++--- include/gz/gui/gz.hh | 6 ++-- include/gz/gui/gz_auto_headers.hh.in | 2 +- include/gz/gui/qml/GzCard.qml | 8 ++--- include/gz/gui/qml/GzCardSettings.qml | 10 +++--- include/gz/gui/qml/GzSplit.qml | 2 +- include/gz/gui/qml/Main.qml | 4 +-- include/gz/gui/qml/PluginMenu.qml | 2 +- ...logo_50x50.png => ignition_logo_50x50.png} | Bin include/gz/gui/qml/qmldir | 4 +-- include/gz/gui/qt.h | 6 ++-- include/gz/gui/resources.qrc | 29 ++++++++++++------ 39 files changed, 147 insertions(+), 138 deletions(-) rename include/gz/gui/qml/images/{gz_logo_50x50.png => ignition_logo_50x50.png} (100%) diff --git a/examples/plugin/custom_context_menu/CustomContext.cc b/examples/plugin/custom_context_menu/CustomContext.cc index e16fc98dd..5cba53224 100644 --- a/examples/plugin/custom_context_menu/CustomContext.cc +++ b/examples/plugin/custom_context_menu/CustomContext.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include "CustomContext.hh" diff --git a/examples/plugin/custom_context_menu/CustomContext.hh b/examples/plugin/custom_context_menu/CustomContext.hh index 88ff67541..fa229eb57 100644 --- a/examples/plugin/custom_context_menu/CustomContext.hh +++ b/examples/plugin/custom_context_menu/CustomContext.hh @@ -15,12 +15,12 @@ * */ -#ifndef IGNITION_GUI_CUSTOMCONTEXTPLUGIN_HH_ -#define IGNITION_GUI_CUSTOMCONTEXTPLUGIN_HH_ +#ifndef GZ_GUI_CUSTOMCONTEXTPLUGIN_HH_ +#define GZ_GUI_CUSTOMCONTEXTPLUGIN_HH_ #ifndef Q_MOC_RUN - #include - #include + #include + #include #endif namespace ignition diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc index 891ddd846..2bbf5d381 100644 --- a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc +++ b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include "DialogFromPlugin.hh" diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh index 35d048094..60d98120d 100644 --- a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh +++ b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh @@ -15,12 +15,12 @@ * */ -#ifndef IGNITION_GUI_DIALOGFROMPLUGIN_HH_ -#define IGNITION_GUI_DIALOGFROMPLUGIN_HH_ +#ifndef GZ_GUI_DIALOGFROMPLUGIN_HH_ +#define GZ_GUI_DIALOGFROMPLUGIN_HH_ #ifndef Q_MOC_RUN - #include - #include + #include + #include #endif namespace ignition diff --git a/examples/plugin/hello_plugin/HelloPlugin.cc b/examples/plugin/hello_plugin/HelloPlugin.cc index 4a980a45d..c49cb886d 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.cc +++ b/examples/plugin/hello_plugin/HelloPlugin.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include "HelloPlugin.hh" diff --git a/examples/plugin/hello_plugin/HelloPlugin.hh b/examples/plugin/hello_plugin/HelloPlugin.hh index 588ec4fa5..144937d75 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.hh +++ b/examples/plugin/hello_plugin/HelloPlugin.hh @@ -15,13 +15,13 @@ * */ -#ifndef IGNITION_GUI_HELLOPLUGIN_HH_ -#define IGNITION_GUI_HELLOPLUGIN_HH_ +#ifndef GZ_GUI_HELLOPLUGIN_HH_ +#define GZ_GUI_HELLOPLUGIN_HH_ #include -#include -#include +#include +#include namespace ignition { diff --git a/examples/plugin/ign_components/IgnComponents.cc b/examples/plugin/ign_components/IgnComponents.cc index ea2a010ae..f52a5f09e 100644 --- a/examples/plugin/ign_components/IgnComponents.cc +++ b/examples/plugin/ign_components/IgnComponents.cc @@ -15,7 +15,7 @@ * */ -#include +#include #include "IgnComponents.hh" // Register this plugin diff --git a/examples/plugin/ign_components/IgnComponents.hh b/examples/plugin/ign_components/IgnComponents.hh index 9130a936e..6c72e5b0a 100644 --- a/examples/plugin/ign_components/IgnComponents.hh +++ b/examples/plugin/ign_components/IgnComponents.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_GUI_EXAMPLES_PLUGIN_IGNCOMPONENTS_HH_ -#define IGNITION_GUI_EXAMPLES_PLUGIN_IGNCOMPONENTS_HH_ +#ifndef GZ_GUI_EXAMPLES_PLUGIN_GZCOMPONENTS_HH_ +#define GZ_GUI_EXAMPLES_PLUGIN_GZCOMPONENTS_HH_ -#include +#include namespace ignition { diff --git a/examples/plugin/multiple_qml/MultipleQml.cc b/examples/plugin/multiple_qml/MultipleQml.cc index 0a82868b2..8869c9820 100644 --- a/examples/plugin/multiple_qml/MultipleQml.cc +++ b/examples/plugin/multiple_qml/MultipleQml.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include "MultipleQml.hh" diff --git a/examples/plugin/multiple_qml/MultipleQml.hh b/examples/plugin/multiple_qml/MultipleQml.hh index dad17e517..489b53b2f 100644 --- a/examples/plugin/multiple_qml/MultipleQml.hh +++ b/examples/plugin/multiple_qml/MultipleQml.hh @@ -15,12 +15,12 @@ * */ -#ifndef IGNITION_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_ -#define IGNITION_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_ +#ifndef GZ_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_ +#define GZ_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_ #ifndef Q_MOC_RUN - #include - #include + #include + #include #endif namespace ignition diff --git a/examples/standalone/custom_drawer/custom_drawer.cc b/examples/standalone/custom_drawer/custom_drawer.cc index 0ac1f02fb..64bbc2fa7 100644 --- a/examples/standalone/custom_drawer/custom_drawer.cc +++ b/examples/standalone/custom_drawer/custom_drawer.cc @@ -15,12 +15,12 @@ * */ -#include +#include #ifndef Q_MOC_RUN - #include - #include - #include + #include + #include + #include #include "custom_drawer.hh" #endif diff --git a/examples/standalone/custom_drawer/custom_drawer.hh b/examples/standalone/custom_drawer/custom_drawer.hh index 5f4d678a7..64a7edd25 100644 --- a/examples/standalone/custom_drawer/custom_drawer.hh +++ b/examples/standalone/custom_drawer/custom_drawer.hh @@ -15,13 +15,13 @@ * */ -#ifndef IGNITION_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_ -#define IGNITION_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_ +#ifndef GZ_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_ +#define GZ_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_ #include #ifndef Q_MOC_RUN - #include + #include #endif namespace ignition diff --git a/examples/standalone/dialogs/dialogs.cc b/examples/standalone/dialogs/dialogs.cc index 1d7c665c3..07ee0c3d9 100644 --- a/examples/standalone/dialogs/dialogs.cc +++ b/examples/standalone/dialogs/dialogs.cc @@ -17,12 +17,12 @@ #include -#include +#include #ifndef Q_MOC_RUN - #include - #include - #include + #include + #include + #include #endif ////////////////////////////////////////////////// diff --git a/examples/standalone/marker/marker.cc b/examples/standalone/marker/marker.cc index 8d16b5c70..0ad086b80 100644 --- a/examples/standalone/marker/marker.cc +++ b/examples/standalone/marker/marker.cc @@ -15,9 +15,9 @@ * */ -#include -#include -#include +#include +#include +#include #include diff --git a/examples/standalone/point_cloud/point_cloud.cc b/examples/standalone/point_cloud/point_cloud.cc index b2d036839..34d86e5f7 100644 --- a/examples/standalone/point_cloud/point_cloud.cc +++ b/examples/standalone/point_cloud/point_cloud.cc @@ -15,10 +15,10 @@ * */ -#include -#include +#include +#include -#include +#include #include #include diff --git a/examples/standalone/scene_provider/scene_provider.cc b/examples/standalone/scene_provider/scene_provider.cc index 2bb4a9ab1..830b0c9df 100644 --- a/examples/standalone/scene_provider/scene_provider.cc +++ b/examples/standalone/scene_provider/scene_provider.cc @@ -18,12 +18,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace std::chrono_literals; diff --git a/examples/standalone/window/window.cc b/examples/standalone/window/window.cc index 8986216a1..5c67481e0 100644 --- a/examples/standalone/window/window.cc +++ b/examples/standalone/window/window.cc @@ -18,9 +18,9 @@ #include #ifndef Q_MOC_RUN - #include - #include - #include + #include + #include + #include #endif ////////////////////////////////////////////////// diff --git a/include/gz/gui/Application.hh b/include/gz/gui/Application.hh index db9fd4513..c947abeef 100644 --- a/include/gz/gui/Application.hh +++ b/include/gz/gui/Application.hh @@ -14,16 +14,16 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_APPLICATION_HH_ -#define IGNITION_GUI_APPLICATION_HH_ +#ifndef GZ_GUI_APPLICATION_HH_ +#define GZ_GUI_APPLICATION_HH_ #include #include #include #include -#include "ignition/gui/qt.h" -#include "ignition/gui/Export.hh" +#include "gz/gui/qt.h" +#include "gz/gui/Export.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by @@ -138,7 +138,7 @@ namespace ignition /// /// 1. Paths given by the environment variable /// 2. Paths added by calling addPluginPath - /// 3. Path ~/.ignition/gui/plugins + /// 3. Path ~/.gz/gui/plugins /// 4. The path where Ignition GUI plugins are installed /// /// \return A vector of pairs, where each pair contains: diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh index 6904e366f..2b566237f 100644 --- a/include/gz/gui/Conversions.hh +++ b/include/gz/gui/Conversions.hh @@ -15,24 +15,24 @@ * */ -#ifndef IGNITION_GUI_CONVERSIONS_HH_ -#define IGNITION_GUI_CONVERSIONS_HH_ +#ifndef GZ_GUI_CONVERSIONS_HH_ +#define GZ_GUI_CONVERSIONS_HH_ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include "ignition/gui/qt.h" -#include "ignition/gui/Export.hh" +#include "gz/gui/qt.h" +#include "gz/gui/Export.hh" namespace ignition { diff --git a/include/gz/gui/Dialog.hh b/include/gz/gui/Dialog.hh index 5da748d42..6572cc4c2 100644 --- a/include/gz/gui/Dialog.hh +++ b/include/gz/gui/Dialog.hh @@ -15,13 +15,13 @@ * */ -#ifndef IGNITION_GUI_DIALOG_HH_ -#define IGNITION_GUI_DIALOG_HH_ +#ifndef GZ_GUI_DIALOG_HH_ +#define GZ_GUI_DIALOG_HH_ #include -#include "ignition/gui/qt.h" -#include "ignition/gui/Export.hh" +#include "gz/gui/qt.h" +#include "gz/gui/Export.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/gui/DragDropModel.hh b/include/gz/gui/DragDropModel.hh index 397a0e6f5..cffe3be44 100644 --- a/include/gz/gui/DragDropModel.hh +++ b/include/gz/gui/DragDropModel.hh @@ -14,11 +14,11 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_DRAGDROPMODEL_HH_ -#define IGNITION_GUI_DRAGDROPMODEL_HH_ +#ifndef GZ_GUI_DRAGDROPMODEL_HH_ +#define GZ_GUI_DRAGDROPMODEL_HH_ -#include "ignition/gui/Export.hh" -#include "ignition/gui/qt.h" +#include "gz/gui/Export.hh" +#include "gz/gui/qt.h" namespace ignition { diff --git a/include/gz/gui/Enums.hh b/include/gz/gui/Enums.hh index 911b929e1..9fc2ab9ab 100644 --- a/include/gz/gui/Enums.hh +++ b/include/gz/gui/Enums.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_GUI_ENUMS_HH_ -#define IGNITION_GUI_ENUMS_HH_ +#ifndef GZ_GUI_ENUMS_HH_ +#define GZ_GUI_ENUMS_HH_ -#include "ignition/gui/qt.h" +#include "gz/gui/qt.h" namespace ignition { diff --git a/include/gz/gui/GuiEvents.hh b/include/gz/gui/GuiEvents.hh index df1a7e50d..aa9be8541 100644 --- a/include/gz/gui/GuiEvents.hh +++ b/include/gz/gui/GuiEvents.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_GUIEVENTS_HH_ -#define IGNITION_GUI_GUIEVENTS_HH_ +#ifndef GZ_GUI_GUIEVENTS_HH_ +#define GZ_GUI_GUIEVENTS_HH_ #include #include @@ -23,14 +23,14 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include "ignition/gui/Export.hh" +#include "gz/gui/Export.hh" namespace ignition { @@ -490,4 +490,4 @@ namespace ignition } } -#endif // IGNITION_GUI_GUIEVENTS_HH_ +#endif // GZ_GUI_GUIEVENTS_HH_ diff --git a/include/gz/gui/Helpers.hh b/include/gz/gui/Helpers.hh index 7ca3efe09..d25b5c759 100644 --- a/include/gz/gui/Helpers.hh +++ b/include/gz/gui/Helpers.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_HELPERS_HH_ -#define IGNITION_GUI_HELPERS_HH_ +#ifndef GZ_GUI_HELPERS_HH_ +#define GZ_GUI_HELPERS_HH_ #include -#include "ignition/gui/Enums.hh" -#include "ignition/gui/Export.hh" +#include "gz/gui/Enums.hh" +#include "gz/gui/Export.hh" namespace ignition { diff --git a/include/gz/gui/MainWindow.hh b/include/gz/gui/MainWindow.hh index 6c5241430..ddece5981 100644 --- a/include/gz/gui/MainWindow.hh +++ b/include/gz/gui/MainWindow.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_MAINWINDOW_HH_ -#define IGNITION_GUI_MAINWINDOW_HH_ +#ifndef GZ_GUI_MAINWINDOW_HH_ +#define GZ_GUI_MAINWINDOW_HH_ #include #include @@ -23,10 +23,10 @@ #include #include -#include +#include -#include "ignition/gui/qt.h" -#include "ignition/gui/Export.hh" +#include "gz/gui/qt.h" +#include "gz/gui/Export.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/gui/PlottingInterface.hh b/include/gz/gui/PlottingInterface.hh index 9f463202f..f67a7cda1 100644 --- a/include/gz/gui/PlottingInterface.hh +++ b/include/gz/gui/PlottingInterface.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_PLOTTINGINTERFACE_HH_ -#define IGNITION_GUI_PLOTTINGINTERFACE_HH_ +#ifndef GZ_GUI_PLOTTINGINTERFACE_HH_ +#define GZ_GUI_PLOTTINGINTERFACE_HH_ #include #include @@ -35,7 +35,7 @@ #include #include -#include "ignition/gui/Export.hh" +#include "gz/gui/Export.hh" namespace ignition { diff --git a/include/gz/gui/Plugin.hh b/include/gz/gui/Plugin.hh index b943b1e0d..dc96bc56e 100644 --- a/include/gz/gui/Plugin.hh +++ b/include/gz/gui/Plugin.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_PLUGIN_HH_ -#define IGNITION_GUI_PLUGIN_HH_ +#ifndef GZ_GUI_PLUGIN_HH_ +#define GZ_GUI_PLUGIN_HH_ #include #include #include -#include "ignition/gui/qt.h" -#include "ignition/gui/Export.hh" +#include "gz/gui/qt.h" +#include "gz/gui/Export.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/gui/SearchModel.hh b/include/gz/gui/SearchModel.hh index 563063f10..df75295fb 100644 --- a/include/gz/gui/SearchModel.hh +++ b/include/gz/gui/SearchModel.hh @@ -14,11 +14,11 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_SEARCHMODEL_HH_ -#define IGNITION_GUI_SEARCHMODEL_HH_ +#ifndef GZ_GUI_SEARCHMODEL_HH_ +#define GZ_GUI_SEARCHMODEL_HH_ -#include "ignition/gui/Export.hh" -#include "ignition/gui/qt.h" +#include "gz/gui/Export.hh" +#include "gz/gui/qt.h" namespace ignition { diff --git a/include/gz/gui/gz.hh b/include/gz/gui/gz.hh index f5541359c..397d94542 100644 --- a/include/gz/gui/gz.hh +++ b/include/gz/gui/gz.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_GUI_IGN_HH_ -#define IGNITION_GUI_IGN_HH_ +#ifndef GZ_GUI_GZ_HH_ +#define GZ_GUI_GZ_HH_ -#include "ignition/gui/Export.hh" +#include "gz/gui/Export.hh" /// \brief External hook to read the library version. /// \return C-string representing the version. Ex.: 0.1.2 diff --git a/include/gz/gui/gz_auto_headers.hh.in b/include/gz/gui/gz_auto_headers.hh.in index 62156f5f5..6a6849cf3 100644 --- a/include/gz/gui/gz_auto_headers.hh.in +++ b/include/gz/gui/gz_auto_headers.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/include/gz/gui/qml/GzCard.qml b/include/gz/gui/qml/GzCard.qml index c9b5031fa..c6c4464e6 100644 --- a/include/gz/gui/qml/GzCard.qml +++ b/include/gz/gui/qml/GzCard.qml @@ -180,7 +180,7 @@ Pane { // Keep a reference to the background // TODO(louise) This feels hacky, the card shouldn't care about the background, - // but I haven't figured out yet how the card can tell IgnSplit to create + // but I haven't figured out yet how the card can tell GzSplit to create // a new split and add the card to it. There must be a way using signals, events // or global functions...? var bgItemTemp = helpers.ancestorByName(cardPane, "background") @@ -224,7 +224,7 @@ Pane { anchored = false } - IgnHelpers { + GzHelpers { id: helpers } @@ -654,7 +654,7 @@ Pane { settingsDialog.open() } - IgnCardSettings { + GzCardSettings { id: settingsDialog modal: false focus: true @@ -695,7 +695,7 @@ Pane { } } - IgnRulers { + GzRulers { anchors.fill: parent enabled: cardPane.state === "floating" && resizable minSize: cardPane.minSize diff --git a/include/gz/gui/qml/GzCardSettings.qml b/include/gz/gui/qml/GzCardSettings.qml index 313fcf82e..0bf9423d9 100644 --- a/include/gz/gui/qml/GzCardSettings.qml +++ b/include/gz/gui/qml/GzCardSettings.qml @@ -133,7 +133,7 @@ Dialog { } } - IgnSpinBox { + GzSpinBox { visible: !cardPane.anchored maximumValue: cardPane.parent ? cardPane.parent.width - cardPane.width : minSize onVisibleChanged: value = cardPane.x @@ -145,7 +145,7 @@ Dialog { visible: !cardPane.anchored text: "X" } - IgnSpinBox { + GzSpinBox { visible: !cardPane.anchored maximumValue: cardPane.parent ? cardPane.parent.height - cardPane.height : minSize onVisibleChanged: value = cardPane.y @@ -157,7 +157,7 @@ Dialog { visible: !cardPane.anchored text: "Y" } - IgnSpinBox { + GzSpinBox { visible: !cardPane.anchored maximumValue: 10000 onVisibleChanged: value = cardPane.z @@ -176,7 +176,7 @@ Dialog { Text { text: "" } - IgnSpinBox { + GzSpinBox { maximumValue: cardPane.parent ? cardPane.parent.width : minSize onVisibleChanged: { if (cardPane) @@ -189,7 +189,7 @@ Dialog { Label { text: "Width" } - IgnSpinBox { + GzSpinBox { maximumValue: cardPane.parent ? cardPane.parent.height : minSize onVisibleChanged: { if (cardPane) diff --git a/include/gz/gui/qml/GzSplit.qml b/include/gz/gui/qml/GzSplit.qml index d41ca0a45..87e521a71 100644 --- a/include/gz/gui/qml/GzSplit.qml +++ b/include/gz/gui/qml/GzSplit.qml @@ -29,7 +29,7 @@ SplitView { id: background objectName: "background" - IgnHelpers { + GzHelpers { id: helpers } diff --git a/include/gz/gui/qml/Main.qml b/include/gz/gui/qml/Main.qml index 67aa99e87..a1401bab8 100644 --- a/include/gz/gui/qml/Main.qml +++ b/include/gz/gui/qml/Main.qml @@ -234,7 +234,7 @@ ApplicationWindow /** * Background */ - IgnSplit { + GzSplit { anchors.fill: parent } @@ -321,7 +321,7 @@ ApplicationWindow } } - IgnSnackBar { + GzSnackBar { id: notificationDialog } diff --git a/include/gz/gui/qml/PluginMenu.qml b/include/gz/gui/qml/PluginMenu.qml index 68de63a7c..7c7f52bd5 100644 --- a/include/gz/gui/qml/PluginMenu.qml +++ b/include/gz/gui/qml/PluginMenu.qml @@ -92,7 +92,7 @@ Popup { } } - IgnSortFilterModel { + GzSortFilterModel { id: filteredModel filterAcceptsItem: function(item) { diff --git a/include/gz/gui/qml/images/gz_logo_50x50.png b/include/gz/gui/qml/images/ignition_logo_50x50.png similarity index 100% rename from include/gz/gui/qml/images/gz_logo_50x50.png rename to include/gz/gui/qml/images/ignition_logo_50x50.png diff --git a/include/gz/gui/qml/qmldir b/include/gz/gui/qml/qmldir index f4f66ebc1..486b6c7aa 100644 --- a/include/gz/gui/qml/qmldir +++ b/include/gz/gui/qml/qmldir @@ -1,3 +1,3 @@ -module ignition.gui +module gz.gui -IgnSpinBox 1.0 IgnSpinBox.qml \ No newline at end of file +GzSpinBox 1.0 GzSpinBox.qml diff --git a/include/gz/gui/qt.h b/include/gz/gui/qt.h index b87be6d29..3da834cec 100644 --- a/include/gz/gui/qt.h +++ b/include/gz/gui/qt.h @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_QT_H_ -#define IGNITION_GUI_QT_H_ +#ifndef GZ_GUI_QT_H_ +#define GZ_GUI_QT_H_ #ifndef _MSC_VER #pragma GCC system_header @@ -43,4 +43,4 @@ #include -#endif // IGNITION_GUI_QT_H_ +#endif // GZ_GUI_QT_H_ diff --git a/include/gz/gui/resources.qrc b/include/gz/gui/resources.qrc index 71026a326..7a4fab98b 100644 --- a/include/gz/gui/resources.qrc +++ b/include/gz/gui/resources.qrc @@ -3,14 +3,14 @@ qtquickcontrols2.conf qml/Chart.qml - qml/IgnCard.qml - qml/IgnCardSettings.qml - qml/IgnHelpers.qml - qml/IgnRulers.qml - qml/IgnSnackBar.qml - qml/IgnSortFilterModel.qml - qml/IgnSpinBox.qml - qml/IgnSplit.qml + qml/GzCard.qml + qml/GzCardSettings.qml + qml/GzHelpers.qml + qml/GzRulers.qml + qml/GzSnackBar.qml + qml/GzSortFilterModel.qml + qml/GzSpinBox.qml + qml/GzSplit.qml qml/Main.qml qml/PlottingInterface.qml qml/PluginMenu.qml @@ -23,12 +23,21 @@ qml/images/menu.png qml/images/export_icon.png qml/images/search.svg + + qml/GzCard.qml + qml/GzCardSettings.qml + qml/GzHelpers.qml + qml/GzRulers.qml + qml/GzSnackBar.qml + qml/GzSortFilterModel.qml + qml/GzSpinBox.qml + qml/GzSplit.qml qml/qmldir - qml/IgnSnackBar.qml - qml/IgnSpinBox.qml + qml/GzSnackBar.qml + qml/GzSpinBox.qml