Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some gui tutorial tweaks #132

Merged
merged 3 commits into from
Sep 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/config/layout.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<state>AAAA/wAAAAD9AAAAAQAAAAIAAAHeAAACJ/wBAAAAAfwAAAAAAAAB3gAAAYQA/////AIAAAAD/AAAAAAAAABZAAAAWQD////8AQAAAAP7AAAAAgAzAQAAAAAAAAB+AAAAfgD////7AAAAAgAyAQAAAIMAAAB+AAAAfgD////7AAAAAgAxAQAAAQYAAADYAAAAfgD////7AAAAAgA1AQAAAF4AAAD4AAAAWQD////7AAAAAgA0AQAAAVsAAADMAAAAWQD///8AAAHeAAAAAAAAAAQAAAAEAAAACAAAAAj8AAAAAA==</state>
<position_x>873</position_x>
<position_y>230</position_y>
<width>478</width>
<width>550</width>
<height>551</height>
</window>
<plugin filename="Publisher">
Expand Down
15 changes: 10 additions & 5 deletions examples/plugin/hello_plugin/HelloPlugin.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion src/plugins/world_control/WorldControl.qml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RowLayout {
width: 200
spacing: 2
Layout.minimumWidth: 121
Layout.minimumHeight: 72
Layout.minimumHeight: 100

Connections {
target: WorldControl
Expand Down
4 changes: 2 additions & 2 deletions tutorials/02_commandline.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ If you have Ignition Tools installed, you can use the `ign gui` command line too
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 <VERSION> Use a specific library version.

--versions Show the available versions.

13 changes: 8 additions & 5 deletions tutorials/05_style.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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.