diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-05-26 14:16:54 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-05-29 11:43:10 +0000 |
| commit | faa94e56eacf33bb49073e9fff60a821347e6628 (patch) | |
| tree | 3e73515d8cc800b2331808e2c0e14bc056b98cec | |
| parent | 51c7a948f6910f685dcf7b1a11ab41e57b66c9c5 (diff) | |
CAN Example: Add menu entry to show online documentation
The different plugins have varying runtime requirements,
that should be described in the plugins documentation.
Allow the user to open the documentation easily.
[ChangeLog][QCanBus] Added a menu to open plugins online
documentation to the CAN Example.
Change-Id: I2ae19b439f91042c6bcb09a7db079249fb34355c
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | examples/serialbus/can/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | examples/serialbus/can/mainwindow.ui | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp index f950938..19ed560 100644 --- a/examples/serialbus/can/mainwindow.cpp +++ b/examples/serialbus/can/mainwindow.cpp @@ -45,6 +45,7 @@ #include <QCanBus> #include <QCanBusFrame> #include <QCloseEvent> +#include <QDesktopServices> #include <QtDebug> #include <QTimer> @@ -92,6 +93,9 @@ void MainWindow::initActionsConnections() connect(m_ui->actionQuit, &QAction::triggered, this, &QWidget::close); connect(m_ui->actionAboutQt, &QAction::triggered, qApp, &QApplication::aboutQt); connect(m_ui->actionClearLog, &QAction::triggered, m_ui->receivedMessagesEdit, &QTextEdit::clear); + connect(m_ui->actionPluginDocumentation, &QAction::triggered, this, []() { + QDesktopServices::openUrl(QUrl("http://doc.qt.io/qt-5/qtcanbus-backends.html#can-bus-plugins")); + }); } void MainWindow::receiveError(QCanBusDevice::CanBusError error) const diff --git a/examples/serialbus/can/mainwindow.ui b/examples/serialbus/can/mainwindow.ui index 72dc62b..04f8c93 100644 --- a/examples/serialbus/can/mainwindow.ui +++ b/examples/serialbus/can/mainwindow.ui @@ -206,6 +206,7 @@ Otherwise, the standard format with 11 bit idenfier is used.</string> <property name="title"> <string>&Help</string> </property> + <addaction name="actionPluginDocumentation"/> <addaction name="actionAboutQt"/> </widget> <addaction name="menuCalls"/> @@ -265,6 +266,14 @@ Otherwise, the standard format with 11 bit idenfier is used.</string> <string>Clear &Log</string> </property> </action> + <action name="actionPluginDocumentation"> + <property name="text"> + <string>Plugin Documentation</string> + </property> + <property name="toolTip"> + <string>Open plugin documentation in Webbrowser</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <resources> |