summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2016-04-28 09:02:51 +0200
committerAndré Hartmann <aha_1980@gmx.de>2016-05-03 10:25:21 +0000
commit9e3af4a3a828a0c632ef07969005f46fd30bee63 (patch)
treed4882451dc676f6a3cb50f611fce53b1e6a5ba83 /src
parentf183c72e5bd0bd253073783992d9bf860e0087ad (diff)
CAN-Example: Change SettingsDialog to ConnectDialog
This simplifies the handling and makes it more like how other CAN monitors behave. * After startup, the connect dialog is shown * If the dialog is accepted, the selected device is connected instantly * To interrupt a connection, the disconnect action can be used * To connect again, the action connect can be used Change-Id: I47db596658e90cc0393981fba135cd6d89191f1a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/serialbus/doc/images/can-example.pngbin44567 -> 14937 bytes
-rw-r--r--src/serialbus/doc/src/examples/can.qdoc4
2 files changed, 2 insertions, 2 deletions
diff --git a/src/serialbus/doc/images/can-example.png b/src/serialbus/doc/images/can-example.png
index f53df41..861218f 100644
--- a/src/serialbus/doc/images/can-example.png
+++ b/src/serialbus/doc/images/can-example.png
Binary files differ
diff --git a/src/serialbus/doc/src/examples/can.qdoc b/src/serialbus/doc/src/examples/can.qdoc
index dc3401a..0020823 100644
--- a/src/serialbus/doc/src/examples/can.qdoc
+++ b/src/serialbus/doc/src/examples/can.qdoc
@@ -31,8 +31,8 @@
\brief The example sends and received CAN bus frames.
The example sends and receives CAN bus frames. Incoming frames
- are ordered according to their type. A configuration
- dialog is provided to adjust CAN Bus connection parameter.
+ are ordered according to their type. A connect dialog is
+ provided to adjust the CAN Bus connection parameters.
\ingroup qtserialbus-examples