summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-07-01 21:47:15 +0200
committerAndré Hartmann <aha_1980@gmx.de>2017-07-07 13:18:53 +0000
commit25325b9ad1416119a69fca02ba331544ca4956a6 (patch)
tree35a512bd159a27fe1b21b1dc025ea1799be5b642 /examples
parent9ef964d045f218a501c03e31f4dbaa63d1acff6a (diff)
CAN-Example: Init all user interface actions in one function
Change-Id: I7a89ad9cf150b2bacedbb3ab246d5d89c0d92e56 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/serialbus/can/mainwindow.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 338e245..8754947 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -60,12 +60,8 @@ MainWindow::MainWindow(QWidget *parent) :
m_status = new QLabel;
m_ui->statusBar->addWidget(m_status);
- m_ui->sendMessagesBox->setEnabled(false);
-
initActionsConnections();
QTimer::singleShot(50, m_connectDialog, &ConnectDialog::show);
-
- connect(m_ui->sendButton, &QPushButton::clicked, this, &MainWindow::sendMessage);
}
MainWindow::~MainWindow()
@@ -84,7 +80,9 @@ void MainWindow::showStatusMessage(const QString &message)
void MainWindow::initActionsConnections()
{
m_ui->actionDisconnect->setEnabled(false);
+ m_ui->sendMessagesBox->setEnabled(false);
+ connect(m_ui->sendButton, &QPushButton::clicked, this, &MainWindow::sendMessage);
connect(m_ui->actionConnect, &QAction::triggered, m_connectDialog, &ConnectDialog::show);
connect(m_connectDialog, &QDialog::accepted, this, &MainWindow::connectDevice);
connect(m_ui->actionDisconnect, &QAction::triggered, this, &MainWindow::disconnectDevice);