From ab218c164d578f42be9c798d6feb95a5b6434220 Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Tue, 29 Sep 2020 12:12:59 -0700 Subject: [PATCH 1/3] some gui tutorial tweaks Signed-off-by: John Shepherd --- examples/config/layout.config | 2 +- examples/plugin/hello_plugin/HelloPlugin.qml | 15 ++++++++++----- src/plugins/world_control/WorldControl.qml | 2 +- tutorials/05_style.md | 13 ++++++++----- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/examples/config/layout.config b/examples/config/layout.config index 91a5c0009..3f6ac5aab 100644 --- a/examples/config/layout.config +++ b/examples/config/layout.config @@ -4,7 +4,7 @@ AAAA/wAAAAD9AAAAAQAAAAIAAAHeAAACJ/wBAAAAAfwAAAAAAAAB3gAAAYQA/////AIAAAAD/AAAAAAAAABZAAAAWQD////8AQAAAAP7AAAAAgAzAQAAAAAAAAB+AAAAfgD////7AAAAAgAyAQAAAIMAAAB+AAAAfgD////7AAAAAgAxAQAAAQYAAADYAAAAfgD////7AAAAAgA1AQAAAF4AAAD4AAAAWQD////7AAAAAgA0AQAAAVsAAADMAAAAWQD///8AAAHeAAAAAAAAAAQAAAAEAAAACAAAAAj8AAAAAA== 873 230 - 478 + 550 551 diff --git a/examples/plugin/hello_plugin/HelloPlugin.qml b/examples/plugin/hello_plugin/HelloPlugin.qml index 0879273a4..4d4dafc7a 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.qml +++ b/examples/plugin/hello_plugin/HelloPlugin.qml @@ -16,9 +16,14 @@ */ import QtQuick 2.0 import QtQuick.Controls 2.0 - -Button { - text: qsTr("Hello, plugin!") - highlighted: true - onClicked: { HelloPlugin.OnButton(); } +Rectangle { + color: "transparent" + anchors.fill: parent + Button { + text: qsTr("Hello, plugin!") + highlighted: true + onClicked: { HelloPlugin.OnButton(); } + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + } } diff --git a/src/plugins/world_control/WorldControl.qml b/src/plugins/world_control/WorldControl.qml index 1270bbeda..001c82d4f 100644 --- a/src/plugins/world_control/WorldControl.qml +++ b/src/plugins/world_control/WorldControl.qml @@ -25,7 +25,7 @@ RowLayout { width: 200 spacing: 2 Layout.minimumWidth: 121 - Layout.minimumHeight: 72 + Layout.minimumHeight: 100 Connections { target: WorldControl diff --git a/tutorials/05_style.md b/tutorials/05_style.md index 6c3a3a218..ae56607e3 100644 --- a/tutorials/05_style.md +++ b/tutorials/05_style.md @@ -68,9 +68,9 @@ accent colors. From the color dropdown menu, it is possible to choose one of the [pre-defined material colors](https://doc.qt.io/qt-5.9/qtquickcontrols2-material.html#pre-defined-material-colors), and from the button next to it, it is possible to choose any custom color. -> **Note**: Custom colors won't be automatically shaded based on the theme. +\note Custom colors won't be automatically shaded based on the theme. -> **Note** Toolbar colors can't be changed through the GUI yet. +\note Toolbar colors can't be changed through the GUI yet. ## Environment variables @@ -81,9 +81,12 @@ You can try running the following command for example: QT_QUICK_CONTROLS_MATERIAL_THEME=Dark QT_QUICK_CONTROLS_MATERIAL_PRIMARY=Blue ign gui -v 4 -> **Note** Toolbar colors can't be changed through environment variables yet. +\note Any previously saved default configuration (usually stored in ~/.ignition/gui/default.config) will override +these environment variable preferences. -> **Note** Applications built on top of Ignition GUI may override custom environment variables. +\note Toolbar colors can't be changed through environment variables yet. + +\note Applications built on top of Ignition GUI may override custom environment variables. ## Config files @@ -110,6 +113,6 @@ And an example also configuring the toolbars: ign gui -c examples/config/style_toolbars.config -> **Note**: When saving the configuration file through the GUI, the current style +\note When saving the configuration file through the GUI, the current style will be saved as well. From ffaf6c368fa61fa0a88dac982dab9305ed20f1de Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Tue, 29 Sep 2020 12:50:18 -0700 Subject: [PATCH 2/3] Update commandline out Signed-off-by: John Shepherd --- tutorials/02_commandline.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tutorials/02_commandline.md b/tutorials/02_commandline.md index 457af4f32..f43ec1fa1 100644 --- a/tutorials/02_commandline.md +++ b/tutorials/02_commandline.md @@ -14,21 +14,21 @@ If you have Ignition Tools installed, you can use the `ign gui` command line too ign gui [options] Options: - + -l [ --list ] List all available plugins. - + -s [ --standalone ] arg Run a plugin as a standalone window. Give the plugin filename as an argument. - + -c [ --config ] arg Open the main window with a configuration file. Give the configuration file path as an argument. - + -v [ --verbose ] [arg] Adjust the level of console output (0~4). - If no argument is provided, the level is set to 4. - + The default verbosity is 1, use -v without + arguments for level 3. + -h [ --help ] Print this help message. - + --force-version Use a specific library version. - + --versions Show the available versions. - From 9392d48c8bb3efbb48f1a1045a1ab8e0f2d2092d Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Tue, 29 Sep 2020 12:51:30 -0700 Subject: [PATCH 3/3] Remove whitespace Signed-off-by: John Shepherd --- tutorials/02_commandline.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tutorials/02_commandline.md b/tutorials/02_commandline.md index f43ec1fa1..daa19ab4e 100644 --- a/tutorials/02_commandline.md +++ b/tutorials/02_commandline.md @@ -14,21 +14,21 @@ If you have Ignition Tools installed, you can use the `ign gui` command line too ign gui [options] Options: - + -l [ --list ] List all available plugins. - + -s [ --standalone ] arg Run a plugin as a standalone window. Give the plugin filename as an argument. - + -c [ --config ] arg Open the main window with a configuration file. Give the configuration file path as an argument. - + -v [ --verbose ] [arg] Adjust the level of console output (0~4). The default verbosity is 1, use -v without arguments for level 3. - + -h [ --help ] Print this help message. - + --force-version Use a specific library version. - + --versions Show the available versions.