1 files changed, 46 insertions, 80 deletions

diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp
index cb2e7591d8..ccff2b1743 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.cpp
+++ b/examples/dbus/remotecontrolledcar/controller/controller.cpp
@@ -1,92 +1,58 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "controller.h"
-#include "car_interface.h"
+#include <QGridLayout>
+#include <QHBoxLayout>
+
+using org::example::Examples::CarInterface;
 
-Controller::Controller(QWidget *parent)
-    : QWidget(parent)
+Controller::Controller(QWidget *parent) : QWidget(parent)
 {
-    ui.setupUi(this);
-    car = new org::example::Examples::CarInterface("org.example.CarExample", "/Car",
-                           QDBusConnection::sessionBus(), this);
+    car = new CarInterface("org.example.CarExample", "/Car", QDBusConnection::sessionBus(), this);
+
+    accelerate = new QPushButton(QIcon(":up.svg"), "", this);
+    accelerate->setFixedSize(80, 64);
+    accelerate->setIconSize(QSize(44, 44));
+    decelerate = new QPushButton(QIcon(":down.svg"), "", this);
+    decelerate->setFixedSize(80, 64);
+    decelerate->setIconSize(QSize(44, 44));
+    left = new QPushButton(QIcon(":left.svg"), "", this);
+    left->setFixedSize(64, 80);
+    left->setIconSize(QSize(44, 44));
+    right = new QPushButton(QIcon(":right.svg"), "", this);
+    right->setFixedSize(64, 80);
+    right->setIconSize(QSize(44, 44));
+
+    status = new QLabel(this);
+    statusSymbol = new QLabel(this);
+    statusSymbol->setFixedHeight(24);
+
+    QGridLayout *layout = new QGridLayout(this);
+    layout->addWidget(accelerate, 1, 1);
+    layout->addWidget(left, 2, 0);
+    layout->addWidget(right, 2, 2);
+    layout->addWidget(decelerate, 3, 1);
+
+    QHBoxLayout *statusLayout = new QHBoxLayout();
+    statusLayout->addWidget(status);
+    statusLayout->addWidget(statusSymbol);
+    layout->addLayout(statusLayout, 0, 1, 1, 2, Qt::AlignTop | Qt::AlignRight);
+
+    connect(accelerate, &QPushButton::clicked, car, &CarInterface::accelerate);
+    connect(decelerate, &QPushButton::clicked, car, &CarInterface::decelerate);
+    connect(left, &QPushButton::clicked, car, &CarInterface::turnLeft);
+    connect(right, &QPushButton::clicked, car, &CarInterface::turnRight);
+
     startTimer(1000);
 }
 
 void Controller::timerEvent(QTimerEvent *event)
 {
     Q_UNUSED(event);
-    if (car->isValid())
-        ui.label->setText("connected");
-    else
-        ui.label->setText("disconnected");
-}
-
-void Controller::on_accelerate_clicked()
-{
-    car->accelerate();
-}
 
-void Controller::on_decelerate_clicked()
-{
-    car->decelerate();
-}
-
-void Controller::on_left_clicked()
-{
-    car->turnLeft();
-}
-
-void Controller::on_right_clicked()
-{
-    car->turnRight();
+    static QPixmap connectedIcon = QPixmap::fromImage(QImage(":connected.svg"));
+    static QPixmap connectingIcon = QPixmap::fromImage(QImage(":connecting.svg"));
+    status->setText(car->isValid() ? tr("connected") : tr("searching..."));
+    statusSymbol->setPixmap(car->isValid() ? connectedIcon : connectingIcon);
 }