summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2015-08-01 15:09:13 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2015-08-03 18:29:00 +0000
commit441711874e3ee952b86f7c48aa534f835786bc06 (patch)
treecd9328b891e7c38e416d603bf7870f1677848e68
parent6177df568f1f55c311b301740d70f357bc54e27b (diff)
Use the permanent status message in Terminal example
... because earlier was used the temporal message which disappeared in case of moving of the mouse cursor on the menu. (cherry-picked from 0202ceea3a33f27c881a725ec9f7c1f35b8f9b49) Change-Id: I7a7cb10120ffdd242a76e91ec08554db69e0f959 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--examples/serialport/terminal/mainwindow.cpp29
-rw-r--r--examples/serialport/terminal/mainwindow.h5
2 files changed, 24 insertions, 10 deletions
diff --git a/examples/serialport/terminal/mainwindow.cpp b/examples/serialport/terminal/mainwindow.cpp
index 6924d3e0..bf51c1c6 100644
--- a/examples/serialport/terminal/mainwindow.cpp
+++ b/examples/serialport/terminal/mainwindow.cpp
@@ -46,6 +46,7 @@
#include "settingsdialog.h"
#include <QMessageBox>
+#include <QLabel>
#include <QtSerialPort/QSerialPort>
//! [0]
@@ -68,6 +69,9 @@ MainWindow::MainWindow(QWidget *parent) :
ui->actionQuit->setEnabled(true);
ui->actionConfigure->setEnabled(true);
+ status = new QLabel;
+ ui->statusBar->addWidget(status);
+
initActionsConnections();
connect(serial, SIGNAL(error(QSerialPort::SerialPortError)), this,
@@ -98,18 +102,18 @@ void MainWindow::openSerialPort()
serial->setStopBits(p.stopBits);
serial->setFlowControl(p.flowControl);
if (serial->open(QIODevice::ReadWrite)) {
- console->setEnabled(true);
- console->setLocalEchoEnabled(p.localEchoEnabled);
- ui->actionConnect->setEnabled(false);
- ui->actionDisconnect->setEnabled(true);
- ui->actionConfigure->setEnabled(false);
- ui->statusBar->showMessage(tr("Connected to %1 : %2, %3, %4, %5, %6")
- .arg(p.name).arg(p.stringBaudRate).arg(p.stringDataBits)
- .arg(p.stringParity).arg(p.stringStopBits).arg(p.stringFlowControl));
+ console->setEnabled(true);
+ console->setLocalEchoEnabled(p.localEchoEnabled);
+ ui->actionConnect->setEnabled(false);
+ ui->actionDisconnect->setEnabled(true);
+ ui->actionConfigure->setEnabled(false);
+ showStatusMessage(tr("Connected to %1 : %2, %3, %4, %5, %6")
+ .arg(p.name).arg(p.stringBaudRate).arg(p.stringDataBits)
+ .arg(p.stringParity).arg(p.stringStopBits).arg(p.stringFlowControl));
} else {
QMessageBox::critical(this, tr("Error"), serial->errorString());
- ui->statusBar->showMessage(tr("Open error"));
+ showStatusMessage(tr("Open error"));
}
}
//! [4]
@@ -123,7 +127,7 @@ void MainWindow::closeSerialPort()
ui->actionConnect->setEnabled(true);
ui->actionDisconnect->setEnabled(false);
ui->actionConfigure->setEnabled(true);
- ui->statusBar->showMessage(tr("Disconnected"));
+ showStatusMessage(tr("Disconnected"));
}
//! [5]
@@ -170,3 +174,8 @@ void MainWindow::initActionsConnections()
connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(about()));
connect(ui->actionAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
}
+
+void MainWindow::showStatusMessage(const QString &message)
+{
+ status->setText(message);
+}
diff --git a/examples/serialport/terminal/mainwindow.h b/examples/serialport/terminal/mainwindow.h
index 1be7f893..63a55c38 100644
--- a/examples/serialport/terminal/mainwindow.h
+++ b/examples/serialport/terminal/mainwindow.h
@@ -51,6 +51,8 @@
QT_BEGIN_NAMESPACE
+class QLabel;
+
namespace Ui {
class MainWindow;
}
@@ -81,7 +83,10 @@ private:
void initActionsConnections();
private:
+ void showStatusMessage(const QString &message);
+
Ui::MainWindow *ui;
+ QLabel *status;
Console *console;
SettingsDialog *settings;
QSerialPort *serial;