Re-structure Qt projects

Author: tomikaa87

GreeRemote.pro

@@ -1,82 +1,12 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2017-09-18T14:29:43
-#
-#-------------------------------------------------
+TEMPLATE = subdirs
 
-QT       += core gui network
+SUBDIRS = \
+    GreeLib \
+    GreeRemoteGuiQt
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+lib.subdir = GreeLib
 
-TARGET = GreeRemote
-TEMPLATE = app
+app.subdir = GreeRemoteGuiQt
+app.depends = lib
 
-CONFIG += c++14
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which has been marked as deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
-    src/main.cpp \
-    src/mainwindow.cpp \
-    src/deviceviewmodel.cpp \
-    src/deviceitem.cpp
-
-HEADERS += \
-    src/mainwindow.h \
-    src/deviceviewmodel.h \
-    src/deviceitem.h
-
-FORMS += \
-    src/mainwindow.ui
-
-RESOURCES += \
-    resources/res.qrc
-
-INCLUDEPATH += \
-    $$PWD/GreeLib/include
-
-LIBS += \
-    -L$$PWD/lib \
-    -L$$PWD/3rdparty/cryptopp \
-    -lcryptopp
-
-CONFIG(debug, debug|release) {
-    message(Debug build)
-
-    DESTDIR = $$PWD/bin
-    TARGET = $$join(TARGET,,,d)
-
-    LIBS += \
-        -lGreeLibd
-} else {
-    message(Release build)
-
-    DESTDIR = $$PWD/bin
-
-    LIBS += \
-        -lGreeLib
-}
-
-macx {
-    message(Building for macOS)
-
-    QT += macextras
-    QMAKE_INFO_PLIST = Info.plist
-    LIBS += -framework AppKit
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
-
-    SOURCES += \
-        src/mac/macnativelabel.mm
-
-    HEADERS += \
-        src/mac/macnativelabel.h
-}
+CONFIG += ordered

GreeRemoteGuiQt/GreeRemoteGuiQt.pro

@@ -0,0 +1,82 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2017-09-18T14:29:43
+#
+#-------------------------------------------------
+
+QT       += core gui network
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = GreeRemote
+TEMPLATE = app
+
+CONFIG += c++14
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which has been marked as deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += \
+    src/main.cpp \
+    src/mainwindow.cpp \
+    src/deviceviewmodel.cpp \
+    src/deviceitem.cpp
+
+HEADERS += \
+    src/mainwindow.h \
+    src/deviceviewmodel.h \
+    src/deviceitem.h
+
+FORMS += \
+    src/mainwindow.ui
+
+RESOURCES += \
+    resources/res.qrc
+
+INCLUDEPATH += \
+    $$PWD/../GreeLib/include
+
+LIBS += \
+    -L$$PWD/../lib \
+    -L$$PWD/../3rdparty/cryptopp \
+    -lcryptopp
+
+CONFIG(debug, debug|release) {
+    message(Debug build)
+
+    DESTDIR = $$PWD/bin
+    TARGET = $$join(TARGET,,,d)
+
+    LIBS += \
+        -lGreeLibd
+} else {
+    message(Release build)
+
+    DESTDIR = $$PWD/bin
+
+    LIBS += \
+        -lGreeLib
+}
+
+macx {
+    message(Building for macOS)
+
+    QT += macextras
+    QMAKE_INFO_PLIST = Info.plist
+    LIBS += -framework AppKit
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+
+    SOURCES += \
+        src/mac/macnativelabel.mm
+
+    HEADERS += \
+        src/mac/macnativelabel.h
+}

Info.plist GreeRemoteGuiQt/Info.plist

@@ -0,0 +1,95 @@
+#include "deviceitem.h"
+#ifdef Q_OS_MAC
+#include "mac/macnativelabel.h"
+#endif
+
+#include <QEvent>
+#include <QDebug>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QSlider>
+
+DeviceItem::DeviceItem(const QPointer<Device> &device, QObject *parent)
+    : QWidgetAction(parent)
+    , m_device(device)
+{
+//    installEventFilter(this);
+
+//    startTimer(100);
+}
+
+QWidget *DeviceItem::createWidget(QWidget *parent)
+{
+    if (m_widget)
+        return m_widget;
+
+    parent->installEventFilter(this);
+
+//    auto&& contextMenu = m_trayIcon->contextMenu();
+//    contextMenu->addSeparator();
+
+//    auto&& deviceMenu = new QMenu(contextMenu);
+//    deviceMenu->setTitle(device->descritptor().name);
+//    contextMenu->addMenu(deviceMenu);
+//    deviceMenu->addAction("Power on", []{});
+//    deviceMenu->addAction("Power off", []{});
+
+    m_widget = new QWidget(parent);
+    auto l = new QVBoxLayout;
+
+    l->setSpacing(0);
+    l->setContentsMargins(20, 0, 20, 0);
+
+    m_widget->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+    m_widget->setLayout(l);
+
+    auto buttonLayout = new QHBoxLayout;
+    buttonLayout->setContentsMargins(0, 0, 0, 0);
+    buttonLayout->setSpacing(8);
+    auto slider = new QSlider(Qt::Horizontal, m_widget);
+    slider->setMinimum(16);
+    slider->setMaximum(30);
+    slider->setMinimumWidth(100);
+
+#ifdef Q_OS_MAC
+    // We must use a native label (NSTextField) since QLabel's text color doesn't change
+    // when Dark theme is selected
+    auto&& label = new MacNativeLabel(m_widget);
+#else
+    auto&& label = new QLabel(m_widget);
+#endif
+
+    label->setMinimumWidth(30);
+    connect(slider, &QSlider::valueChanged, [label](int value) {
+        label->setText(QString{ "%1 C" }.arg(value));
+    });
+
+    buttonLayout->addWidget(slider);
+    buttonLayout->addWidget(label);
+
+    l->addLayout(buttonLayout);
+
+    return m_widget;
+
+//    auto action = new QWidgetAction(contextMenu);
+//    action->setDefaultWidget(w);
+    //    m_trayIcon->contextMenu()->addAction(action);
+}
+
+bool DeviceItem::event(QEvent* e)
+{
+    qInfo() << "DeviceItem::event:" << e->type();
+
+//    if (e->type() == QEvent::Timer)
+//        m_widget->update();
+
+    return QWidgetAction::event(e);
+}
+
+bool DeviceItem::eventFilter(QObject* o, QEvent* e)
+{
+    qInfo() << "DeviceItem::eventFilter::event:" << e->type();
+
+    return QWidgetAction::eventFilter(o, e);
+}

resources/air-conditioner-3.png GreeRemoteGuiQt/resources/air-conditioner-3.png

@@ -0,0 +1,26 @@
+#ifndef DEVICEITEM_H
+#define DEVICEITEM_H
+
+#include <QPalette>
+#include <QPointer>
+#include <QWidgetAction>
+
+class Device;
+
+class DeviceItem : public QWidgetAction
+{
+public:
+    DeviceItem(const QPointer<Device>& device, QObject* parent = nullptr);
+
+    QWidget* createWidget(QWidget* parent) override;
+
+protected:
+    bool event(QEvent *e) override;
+    bool eventFilter(QObject* o, QEvent* e) override;
+
+private:
+    QWidget* m_widget = nullptr;
+    const QPointer<Device> m_device;
+};
+
+#endif // DEVICEITEM_H

GreeRemoteGuiQt/resources/fan-3-20.png

@@ -0,0 +1,7 @@
+#include "deviceviewmodel.h"
+
+DeviceViewModel::DeviceViewModel(const QPointer<Device>&, QObject *parent)
+    : QObject(parent)
+{
+
+}

GreeRemoteGuiQt/resources/fan-3-40.png

@@ -0,0 +1,24 @@
+#ifndef DEVICEVIEWMODEL_H
+#define DEVICEVIEWMODEL_H
+
+#include <QObject>
+#include <QPointer>
+
+class Device;
+
+class DeviceViewModel : public QObject
+{
+    Q_OBJECT
+
+public:
+    DeviceViewModel(const QPointer<Device>& device, QObject *parent = nullptr);
+
+signals:
+
+public slots:
+
+private:
+    QPointer<Device> m_device;
+};
+
+#endif // DEVICEVIEWMODEL_H

GreeRemoteGuiQt/resources/fan-3-512.png

@@ -1,6 +1,7 @@
-#include "devicefinder.h"
 #include "mainwindow.h"
 
+#include <devicefinder.h>
+
 #include <QApplication>
 #include <QLoggingCategory>
 #include <QObject>
@@ -12,9 +13,12 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 
+    a.setAttribute(Qt::AA_EnableHighDpiScaling);
+
     qCInfo(MainLog) << "initializing";
 
     MainWindow w;
+//    w.show();
 
     DeviceFinder dh;
 
@@ -23,6 +27,11 @@ int main(int argc, char *argv[])
     });
     QObject::connect(&w, &MainWindow::scanInitiated, &dh, &DeviceFinder::scan);
     QObject::connect(&dh, &DeviceFinder::scanFinshed, &w, &MainWindow::onScanFinished);
+    QObject::connect(&dh, &DeviceFinder::deviceBound, [&w, &dh](const DeviceDescriptor& descriptor) {
+        w.addDevice(dh.getDevice(descriptor));
+    });
+
+    dh.scan();
 
     auto exitCode = a.exec();