Merge pull request #7 from cppqtdev/development

cppqtdev · web-flow · commit d41071165e08 · 2023-06-20T20:51:21.000+05:30
System Tray icon Created and App Icon Created
diff --git a/GameScreens/HomeScreen.qml b/GameScreens/HomeScreen.qml
diff --git a/Img/Basic/pngwing.com.png b/Img/Basic/pngwing.com.png
diff --git a/Settings/AboutPage.qml b/Settings/AboutPage.qml
@@ -129,8 +129,8 @@ ScreenPage{
                     buttonText: "Check For Updated";
                     innerText.color: "#0570eb"
                     color: "transparent"
-                    hoverColor: "#0570eb"
-                    pressColor: "#0570eb"
+                    hoverColor: "transparent"
+                    pressColor: "transparent"
                     borderColor: "#0570eb"
                     fontSize: 12
                     borderWidth: 1
diff --git a/Settings/AdvancedSettingsPage.qml b/Settings/AdvancedSettingsPage.qml
@@ -74,8 +74,8 @@ ScreenPage{
                 buttonText: "Send Diagnostics";
                 innerText.color: "#0570eb"
                 color: "transparent"
-                hoverColor: "#0570eb"
-                pressColor: "#0570eb"
+                hoverColor: "transparent"
+                pressColor: "transparent"
                 borderColor:"#0570eb"
                 fontSize: 12
                 borderWidth: 1
diff --git a/Settings/AppearanceSettingsPage.qml b/Settings/AppearanceSettingsPage.qml
@@ -57,6 +57,14 @@ ScreenPage{
             }
 
             // Iterface increase
+            PrefsSpinBox {
+                id: spinBox
+                width: 100
+                height: 30
+                minimumValue: 0
+                maximumValue: 100
+            }
+
 
             Label {
                 opacity: 0.87
diff --git a/common/PrefsButton.qml b/common/PrefsButton.qml
@@ -17,7 +17,7 @@ Item {
      property color borderColor: "white"
     property string sourceIcon: ""
     property int fontSize: 16
-    property int borderWidth: 1
+    property real borderWidth: 1
     property int borderRadius: 2
     property int iconWidth: 20
     property int iconHeight: 20
diff --git a/common/PrefsSpinBox.qml b/common/PrefsSpinBox.qml
@@ -0,0 +1,75 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.3
+Item {
+    property int value: 100
+    property int minimumValue: 75
+    property int maximumValue: 175
+
+    width: 100
+    height: 55
+
+    Rectangle {
+        id: background
+        color: "transparent"
+        anchors.fill: parent
+    }
+
+    RowLayout {
+        id: row
+        spacing: 0
+        width: parent.width
+        height: parent.height
+
+        PrefsButton{
+            width: parent.height
+            height: parent.height
+            buttonText: "-"
+            innerText.color: "black"
+            color: "#dde4de"
+            hoverColor: "#dde4de"
+            pressColor: "#dde4de"
+            borderColor: "grey"
+            fontSize: 12
+            borderWidth: 0.6
+            borderRadius: 8
+            onClicked: {
+                if (value > minimumValue) {
+                    value = value - 25
+                }
+            }
+        }
+
+        Rectangle{
+            width: parent.width * 0.8
+            height: parent.height
+            radius: 12
+            color: "transparent"
+            Label {
+                id: valueText
+                text: value.toString() + "%"
+                font.pointSize: 14
+                anchors.centerIn: parent
+            }
+        }
+
+        PrefsButton{
+            width: parent.height
+            height: parent.height
+            buttonText: "+";
+            innerText.color: "black"
+            color: "#dde4de"
+            hoverColor: "#dde4de"
+            pressColor: "#dde4de"
+            borderColor: "grey"
+            fontSize: 12
+            borderWidth: 0.6
+            borderRadius: 8
+            onClicked: {
+                if (value < maximumValue) {
+                    value = value + 25
+                }
+            }
+        }
+    }
+}
diff --git a/main.cpp b/main.cpp
@@ -1,14 +1,18 @@
-#include <QGuiApplication>
+#include <QScreen>
+#include <QApplication>
 #include <QQmlApplicationEngine>
-#include <QDebug>
 #include <QQmlContext>
+#include <QSystemTrayIcon>
+#include <QtQml/QQmlContext>
+#include<QIcon>
+#include <QDebug>
 #include <QtCore/QUrl>
 #include <QtCore/QCommandLineOption>
 #include <QtCore/QCommandLineParser>
 #include <QStyleHints>
-#include <QScreen>
-#include <QtQml/QQmlContext>
-#include<QIcon>
+
+#include <systemtray.h>
+
 class Utils : public QObject {
     Q_OBJECT
 public:
@@ -20,16 +24,25 @@ class Utils : public QObject {
 int main(int argc, char *argv[])
 {
     //! [0]
-    QGuiApplication app(argc, argv);
-    app.setWindowIcon(QIcon("qrc:/Img/Icons/hire-a-helper.svg"));
+    QApplication app(argc, argv);
+
+    QQmlApplicationEngine engine;
+    app.setOrganizationName("Aksh Software Solution");
+    app.setOrganizationName("akshsoftsolution.com");
+    app.setApplicationDisplayName("Aksh Software");
+    app.setApplicationName("Aksh Software");
+    app.setWindowIcon(QIcon(":/Img/Basic/pngwing.com.png"));
     //! [0]
-    QGuiApplication::setApplicationDisplayName(QCoreApplication::translate("main","Game Example"));
     ApplicationUI appui;
     QCommandLineParser parser;
     QCoreApplication::setApplicationVersion(QT_VERSION_STR);
 
-    QQmlApplicationEngine engine;
+
+
     QQmlContext *context = engine.rootContext();
+    SystemTray * systemTray = new SystemTray();
+
+    context->setContextProperty("systemTray", systemTray);
     context->setContextProperty("myApp", &appui);
 
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
diff --git a/main.qml b/main.qml
@@ -119,7 +119,47 @@ ApplicationWindow {
     property bool showFavorites: true
     property bool highlightActiveNavigationButton : true
 
+    // Chance to ignore the checkbox
+    property bool ignoreCheck: false
 
+    /* With help Connections object
+     * set connections with System tray class
+     * */
+
+    Connections {
+        target: systemTray
+        function onSignalShow() {
+            root.show();
+        }
+
+        // The signal - close the application by ignoring the check-box
+        function onSignalQuit() {
+            ignoreCheck = true
+            close();
+        }
+
+        // Minimize / maximize the window by clicking on the default system tray
+        function onSignalIconActivated() {
+             if(root.visibility === Window.Hidden) {
+                 root.show()
+             } else {
+                 root.hide()
+             }
+        }
+    }
+
+    // Handler window closing event
+    onClosing: {
+        /* If the check box should not be ignored and it is active,
+         * then hide the application. Otherwise, close the application
+         * */
+        if(ignoreCheck === false){
+            close.accepted = false
+            root.hide()
+        } else {
+            Qt.quit()
+        }
+    }
 
 
 
diff --git a/medicalDevice.pro b/medicalDevice.pro
@@ -1,12 +1,13 @@
-QT += quick
+QT += qml quick widgets
 
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
         applicationui.cpp \
-        main.cpp
+        main.cpp \
+        systemtray.cpp
 
 RESOURCES += qml.qrc
 
@@ -23,4 +24,5 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 HEADERS += \
     applicationui.hpp \
+    systemtray.h \
     uiconstants.hpp
diff --git a/qml.qrc b/qml.qrc
@@ -613,5 +613,7 @@
         <file>Settings/DeveloperSettingsPage.qml</file>
         <file>Settings/AboutPage.qml</file>
         <file>Img/Basic/undraw_programming_re_kg9v.svg</file>
+        <file>common/PrefsSpinBox.qml</file>
+        <file>Img/Basic/pngwing.com.png</file>
     </qresource>
 </RCC>
diff --git a/systemtray.cpp b/systemtray.cpp
@@ -0,0 +1,68 @@
+#include "systemtray.h"
+#include <QMenu>
+#include <QSystemTrayIcon>
+
+SystemTray::SystemTray(QObject *parent) : QObject(parent)
+{
+
+    // Create a context menu with two items
+    QMenu *trayIconMenu = new QMenu();
+
+    QAction * viewWindow = new QAction("Open 1Password", this);
+    viewWindow->setIcon(QIcon(":/Img/Basic/pngwing.com.png"));
+
+    QAction * quickWindow = new QAction("Open Quick Access", this);
+    quickWindow->setIcon(QIcon(":/Img/Basic/pngwing.com.png"));
+    quickWindow->setShortcut(QKeySequence(tr("Ctrl+S")));
+
+    QAction * settingsWindow = new QAction("Settings", this);
+    settingsWindow->setIcon(QIcon(":/Img/Basic/pngwing.com.png"));
+
+    QAction * quitAction = new QAction("Quit", this);
+    quitAction->setIcon(QIcon(":/Img/Basic/pngwing.com.png"));
+
+    /* to connect the signals clicks on menu items to the appropriate signals for QML.
+         * */
+    connect(viewWindow, &QAction::triggered, this, &SystemTray::signalShow);
+    connect(settingsWindow, &QAction::triggered, this, &SystemTray::showSettingsWindow);
+    connect(quickWindow, &QAction::triggered, this, &SystemTray::showQuickAccess);
+    connect(quitAction, &QAction::triggered, this, &SystemTray::signalQuit);
+
+    trayIconMenu->addAction(viewWindow);
+    trayIconMenu->addAction(quickWindow);
+    trayIconMenu->addAction(settingsWindow);
+    trayIconMenu->addAction(quitAction);
+
+    /* Initialize the tray icon, icon set, and specify the tooltip
+         * */
+    trayIcon = new QSystemTrayIcon();
+    trayIcon->setContextMenu(trayIconMenu);
+    trayIcon->setIcon(QIcon(":/Img/Basic/pngwing.com.png"));
+    trayIcon->show();
+    trayIcon->setToolTip("Adesh's Device");
+    trayIcon->showMessage("Adesh's Device Tray App Created","Click On Tray App to open Device App",QSystemTrayIcon::Information,1000);
+
+    /* Also connect clicking on the icon to the signal handler of the pressing
+         * */
+    connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+            this, SLOT(iconActivated(QSystemTrayIcon::ActivationReason)));
+}
+
+/* The method that handles click on the application icon in the system tray
+     * */
+void SystemTray::iconActivated(QSystemTrayIcon::ActivationReason reason)
+{
+    switch (reason){
+    case QSystemTrayIcon::Trigger:
+        // In the case of pressing the signal on the icon tray in the call signal QML layer
+        emit signalIconActivated();
+        break;
+    default:
+        break;
+    }
+}
+
+void SystemTray::hideIconTray()
+{
+    trayIcon->hide();
+}
diff --git a/systemtray.h b/systemtray.h
@@ -0,0 +1,34 @@
+#ifndef SYSTEMTRAY_H
+#define SYSTEMTRAY_H
+
+#include <QObject>
+#include <QAction>
+#include <QSystemTrayIcon>
+
+class SystemTray : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SystemTray(QObject *parent = 0);
+
+signals:
+    void signalIconActivated();
+    void signalShow();
+    void signalQuit();
+    void showSettingsWindow();
+    void showQuickAccess();
+
+private slots:
+    /* The slot that will accept the signal from the event click on the application icon in the system tray
+         */
+    void iconActivated(QSystemTrayIcon::ActivationReason reason);
+
+public slots:
+    void hideIconTray();
+
+private:
+    /* Declare the object of future applications for the tray icon*/
+    QSystemTrayIcon         * trayIcon;
+};
+
+#endif // SYSTEMTRAY_H
