From 342bc91f0fb6ba26efdc6729ab9aac7a418b786a Mon Sep 17 00:00:00 2001
From: Nicolas Mailloux <nicolecrivain@gmail.com>
Date: Tue, 13 Apr 2021 10:23:12 -0400
Subject: [PATCH] Added Calculator launch button in Apps

---
 apps.cpp |   8 +++++
 apps.h   |   1 +
 apps.ui  | 107 ++++++++++++++++++++++++++++++++++---------------------
 3 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/apps.cpp b/apps.cpp
index 6e979d8..29b945e 100644
--- a/apps.cpp
+++ b/apps.cpp
@@ -18,6 +18,7 @@ apps::apps(QWidget *parent) :
     ui->lightmapsLaunchBtn->setStyleSheet("background: lightGrey; font-size: 9pt; padding: 8px");
     ui->calendarLaunchBtn->setStyleSheet("background: lightGrey; font-size: 9pt; padding: 8px");
     ui->savedWordsLaunchBtn->setStyleSheet("background: lightGrey; font-size: 9pt; padding: 8px");
+    ui->calculatorLaunchBtn->setStyleSheet("background: lightGrey; font-size: 9pt; padding: 8px");
 
     QFile stylesheetFile(":/resources/eink.qss");
     stylesheetFile.open(QFile::ReadOnly);
@@ -62,3 +63,10 @@ void apps::on_calendarLaunchBtn_clicked()
     calendarWindow->setAttribute(Qt::WA_DeleteOnClose);
     calendarWindow->showFullScreen();
 }
+
+void apps::on_calculatorLaunchBtn_clicked()
+{
+    QProcess process;
+    process.startDetached("calculator", QStringList());
+    qApp->quit();
+}
diff --git a/apps.h b/apps.h
index 5f3f7c9..c271d39 100644
--- a/apps.h
+++ b/apps.h
@@ -23,6 +23,7 @@ private slots:
     void on_lightmapsLaunchBtn_clicked();
     void on_savedWordsLaunchBtn_clicked();
     void on_calendarLaunchBtn_clicked();
+    void on_calculatorLaunchBtn_clicked();
 
 private:
     Ui::apps *ui;
diff --git a/apps.ui b/apps.ui
index 7800c3d..1bdca7d 100644
--- a/apps.ui
+++ b/apps.ui
@@ -85,6 +85,18 @@ Back
        <property name="bottomMargin">
         <number>0</number>
        </property>
+       <item row="3" column="1">
+        <widget class="QPushButton" name="savedWordsLaunchBtn">
+         <property name="font">
+          <font>
+           <family>Inter</family>
+          </font>
+         </property>
+         <property name="text">
+          <string>Launch</string>
+         </property>
+        </widget>
+       </item>
        <item row="2" column="0">
         <widget class="QLabel" name="calendarLabel">
          <property name="font">
@@ -98,19 +110,6 @@ Back
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_2">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Light Maps</string>
-         </property>
-        </widget>
-       </item>
        <item row="2" column="1">
         <widget class="QPushButton" name="calendarLaunchBtn">
          <property name="font">
@@ -123,32 +122,6 @@ Back
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QPushButton" name="scribbleLaunchBtn">
-         <property name="font">
-          <font>
-           <family>Inter</family>
-           <italic>false</italic>
-          </font>
-         </property>
-         <property name="text">
-          <string>Launch</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="scribbleLabel">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Scribble</string>
-         </property>
-        </widget>
-       </item>
        <item row="1" column="1">
         <widget class="QPushButton" name="lightmapsLaunchBtn">
          <property name="font">
@@ -175,8 +148,60 @@ Back
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QPushButton" name="savedWordsLaunchBtn">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Light Maps</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="scribbleLabel">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Scribble</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QPushButton" name="scribbleLaunchBtn">
+         <property name="font">
+          <font>
+           <family>Inter</family>
+           <italic>false</italic>
+          </font>
+         </property>
+         <property name="text">
+          <string>Launch</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Calculator</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QPushButton" name="calculatorLaunchBtn">
          <property name="font">
           <font>
            <family>Inter</family>