Refactor the UI of CAN example application

* The SettingsDialog class is added
* The menu-bar actions and icons are added
* All widgets are wrapped with layouts
* A code related to device accessing is modified

Change-Id: I45d056951163441195f61df411669d1130a41867
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 15 insertions, 17 deletions

diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h
index 876c679..fe7e63c 100644
--- a/examples/serialbus/can/mainwindow.h
+++ b/examples/serialbus/can/mainwindow.h
@@ -41,17 +41,17 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QCanBusDevice>
+#include <QCanBusDevice> // for CanBusError
 
 #include <QMainWindow>
-#include <QPointer>
 
 QT_BEGIN_NAMESPACE
-class QSerialBusBackend;
-class QCanBus;
-class QSerialBusDevice;
+class QLabel;
+
 class QCanBusFrame;
 
+class SettingsDialog;
+
 namespace Ui {
 class MainWindow;
 }
@@ -68,23 +68,21 @@ public:
     ~MainWindow();
 
 private Q_SLOTS:
-
     void checkMessages();
-    void on_sendButton_clicked() const;
+    void sendMessage() const;
     void receiveError(QCanBusDevice::CanBusError) const;
-    void on_connectButton_clicked();
-    void on_pluginBox_activated(int index);
+    void connectDevice();
+    void disconnectDevice();
 
 private:
-    void init();
-    void connectDevice(int pluginIndex);
-    void interpretError(QString&, const QCanBusFrame&);
-
-    QPointer<QCanBusDevice> canDevice;
-    QString deviceName;
-    QList<QByteArray> plugins;
+    void showStatusMessage(const QString &message);
+    void initActionsConnections();
+    void interpretError(QString &, const QCanBusFrame &);
 
-    Ui::MainWindow *ui;
+    Ui::MainWindow *m_ui;
+    QLabel *m_status;
+    SettingsDialog *m_settings;
+    QCanBusDevice *m_canDevice;
 };
 
 #endif // MAINWINDOW_H