Put error messages into the statusbar of master/slave examples

And while we are adding new includes related to the statusbar we may as
well convert existing includes to the proper qt style. This avoids
inconsistencies.

Change-Id: I77d26fcd707fcb018b2c27ee92a8d36c1c82f96c
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

2 files changed, 45 insertions, 51 deletions

diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp
index 5cc9f78..dc9e8db 100644
--- a/examples/serialbus/modbus/slave/mainwindow.cpp
+++ b/examples/serialbus/modbus/slave/mainwindow.cpp
@@ -43,7 +43,9 @@
 
 #include <QtSerialBus/qmodbusrtuserialslave.h>
 #include <QtSerialBus/qmodbustcpserver.h>
-#include <QRegularExpression>
+
+#include <QtCore/qregularexpression.h>
+#include <QtWidgets/qstatusbar.h>
 
 enum ModbusConnection {
     Serial,
@@ -91,9 +93,9 @@ void MainWindow::on_connectType_currentIndexChanged(int index)
     if (!modbusDevice) {
         ui->connectButton->setDisabled(true);
         if (type == Serial)
-            ui->errorLabel->setText(tr("Could not create Modbus slave."));
+            statusBar()->showMessage(tr("Could not create Modbus slave."), 5000);
         else
-            ui->errorLabel->setText(tr("Could not create Modbus server."));
+            statusBar()->showMessage(tr("Could not create Modbus server."), 5000);
     } else {
         QModbusDataUnitMap reg;
         reg.insert(QModbusDataUnit::Coils, { QModbusDataUnit::Coils, 0, 10 });
@@ -119,20 +121,20 @@ void MainWindow::handleDeviceError(QModbusDevice::ModbusError newError)
     if (newError == QModbusDevice::NoError || !modbusDevice)
         return;
 
-    ui->errorLabel->setText(modbusDevice->errorString());
+    statusBar()->showMessage(modbusDevice->errorString(), 5000);
 }
 
 void MainWindow::on_connectButton_clicked()
 {
     bool intendToConnect = (modbusDevice->state() == QModbusDevice::UnconnectedState);
 
-    ui->errorLabel->setText(QString());
+    statusBar()->clearMessage();
 
     if (intendToConnect) {
         modbusDevice->setPortName(ui->portEdit->text());
         modbusDevice->setSlaveAddress(ui->slaveEdit->text().toInt());
         if (!modbusDevice->connectDevice())
-            ui->errorLabel->setText(tr("Connect failed: ") + modbusDevice->errorString());
+            statusBar()->showMessage(tr("Connect failed: ") + modbusDevice->errorString(), 5000);
     } else {
         modbusDevice->disconnectDevice();
     }
@@ -164,7 +166,7 @@ void MainWindow::bitChanged(int id, QModbusDataUnit::RegisterType table, bool va
         return;
 
     if (!modbusDevice->setData(table, id, value))
-        ui->errorLabel->setText(tr("Could not set data: ") + modbusDevice->errorString());
+        statusBar()->showMessage(tr("Could not set data: ") + modbusDevice->errorString(), 5000);
 }
 
 void MainWindow::setRegister(const QString &value)
@@ -182,7 +184,8 @@ void MainWindow::setRegister(const QString &value)
             ok = modbusDevice->setData(QModbusDataUnit::HoldingRegisters, id, value.toInt(&ok, 16));
 
         if (!ok)
-            ui->errorLabel->setText(tr("Could not set register: ") + modbusDevice->errorString());
+            statusBar()->showMessage(tr("Could not set register: ") + modbusDevice->errorString(),
+                                     5000);
     }
 }
 
diff --git a/examples/serialbus/modbus/slave/mainwindow.ui b/examples/serialbus/modbus/slave/mainwindow.ui
index 769d153..cc13090 100644
--- a/examples/serialbus/modbus/slave/mainwindow.ui
+++ b/examples/serialbus/modbus/slave/mainwindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>516</width>
-    <height>372</height>
+    <height>356</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,6 +17,19 @@
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="5">
+       <widget class="QLabel" name="label_27">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Slave Address:</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="7">
        <widget class="QPushButton" name="connectButton">
         <property name="sizePolicy">
@@ -62,27 +75,18 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="3">
-       <widget class="QLineEdit" name="portEdit">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="5">
-       <widget class="QLabel" name="label_27">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Slave Address:</string>
-        </property>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="connectType">
+        <item>
+         <property name="text">
+          <string>Serial</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>TCP</string>
+         </property>
+        </item>
        </widget>
       </item>
       <item row="0" column="2">
@@ -105,30 +109,16 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="8">
-       <widget class="QLabel" name="errorLabel">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
+      <item row="0" column="3">
+       <widget class="QLineEdit" name="portEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="connectType">
-        <item>
-         <property name="text">
-          <string>Serial</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>TCP</string>
-         </property>
-        </item>
-       </widget>
-      </item>
      </layout>
     </item>
     <item>
@@ -710,6 +700,7 @@
     </item>
    </layout>
   </widget>
+  <widget class="QStatusBar" name="statusBar"/>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>