Merge pull request #1 from secondYearProjects/dev

GUI changes

Author: SergySanJj

SmartTimer/SmartTimer.pro

@@ -47,7 +47,8 @@ HEADERS += \
     toggleswitch.h \
     alertwidget.h \
     addalarmdialog.h \
-    changealarmdialog.h
+    changealarmdialog.h \
+    widgetsettings.h
 
 FORMS += \
         mainwindow.ui \

SmartTimer/addalarmdialog.ui

@@ -78,6 +78,16 @@
           <property name="alignment">
            <set>Qt::AlignCenter</set>
           </property>
+          <property name="displayFormat">
+           <string>HH:mm</string>
+          </property>
+          <property name="time">
+           <time>
+            <hour>0</hour>
+            <minute>0</minute>
+            <second>0</second>
+           </time>
+          </property>
          </widget>
         </item>
        </layout>
@@ -120,6 +130,18 @@
             <height>50</height>
            </size>
           </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Alarm</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
          </widget>
         </item>
        </layout>

SmartTimer/alertwidget.cpp

@@ -77,7 +77,7 @@ alertwidget::alertwidget(int msecs, const QString& name, bool turnedOn, QWidget
 
     this->setContextMenuPolicy(Qt::CustomContextMenu);
 
-    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
+    connect(this, SIGNAL(customContextMenuRequest(const QPoint &)),
             this, SLOT(ShowContextMenu(const QPoint &)));
 
 }
@@ -126,6 +126,8 @@ void alertwidget::onTickCheck()
     player->play();
     ui->stopButton->show();
     ui->stopButton->setEnabled(true);
+
+    emit blinkInfo("Alarms",true);
 }
 
 void alertwidget::blink()
@@ -174,6 +176,7 @@ void alertwidget::closeAlarm()
 
 
     emit del(this);
+    emit blinkInfo("Alarms",false);
 
     this->close();
 }

SmartTimer/alertwidget.h

@@ -42,7 +42,9 @@ public slots:
     void alarmFinished();
     void del(const alertwidget*);
 
-    void customContextMenuRequested(const QPoint &);
+    void customContextMenuRequest(const QPoint &);
+
+    void blinkInfo(QString tabName, bool enable);
 
 private:
     Ui::alertwidget *ui;

SmartTimer/alertwidget.ui

@@ -44,7 +44,7 @@ QPushButton {
 		border-radius: 35px;
 }
 
-QPushButton:hover:enabled {	
+QPushButton#stopButton:hover:enabled {	
 	background-color: rgb(213, 126, 76);
 }</string>
   </property>
@@ -108,7 +108,7 @@ QPushButton:hover:enabled {
          </font>
         </property>
         <property name="text">
-         <string>TextLabel</string>
+         <string>Alarm</string>
         </property>
        </widget>
       </item>

SmartTimer/changealarmdialog.ui

@@ -129,6 +129,9 @@
           <bold>true</bold>
          </font>
         </property>
+        <property name="text">
+         <string>Alarm</string>
+        </property>
         <property name="maxLength">
          <number>25</number>
         </property>

SmartTimer/mainwindow.cpp

@@ -27,14 +27,21 @@ MainWindow::MainWindow(QWidget *parent) :
 
 
     logger = new smartTimerLog(this);
+    alarmsBlinkTimer = new QTimer(this);
+    timersBlinkTimer = new QTimer(this);
 
     connect(ui->addTimerButton,SIGNAL(clicked()),this,SLOT(addTimer()));
     connect(ui->addAlarmButton,SIGNAL(clicked()),this,SLOT(addAlarm()));
-    // TODO : here
+
     connect(logger, SIGNAL(createTimer(int,QString)), this, SLOT(onTimeRecieved(int,QString)));
     connect(logger, SIGNAL(createAlarm(int,QString,bool)), this, SLOT(onAlarmTimeRecieved(int,QString,bool)));
 
 
+    connect(alarmsBlinkTimer,SIGNAL(timeout()),this,SLOT(alarmsTabBlink()));
+    connect(timersBlinkTimer,SIGNAL(timeout()),this,SLOT(timersTabBlink()));
+
+
+
     timerScrollWidget = new QWidget;
     timerScrollWidget->setLayout(new QVBoxLayout);
     timerScrollWidget->setMaximumWidth(400);
@@ -63,6 +70,7 @@ void MainWindow::addTimer()
     auto *addDial = new addTimerDialog();
     connect(addDial,SIGNAL(sendTimerData(int,QString)),this, SLOT(onTimeRecieved(int,QString)));
 
+
     addDial->exec();
 }
 
@@ -82,6 +90,8 @@ void MainWindow::onTimeRecieved(int msecs, const QString& _name)
 
     connect(newTimer, SIGNAL(del(const TimerWidget*)), this, SLOT(remove(const TimerWidget*)));
     connect(newTimer, SIGNAL(timerFinished()), this, SLOT(onTimerFinished()));
+    connect(newTimer, SIGNAL(blinkInfo(QString, bool)), this, SLOT(tabBlinking(QString,bool)));
+
 
     timersList.append(newTimer);
 }
@@ -118,6 +128,99 @@ void MainWindow::onAlarmTimeRecieved(int msecs, const QString& _name, bool turne
     alarmScrollWidget->layout()->addWidget(newAlarm);
 
     connect(newAlarm, SIGNAL(del(const alertwidget*)), this, SLOT(remove(const alertwidget*)));
+    connect(newAlarm, SIGNAL(blinkInfo(QString, bool)), this, SLOT(tabBlinking(QString,bool)));
+
 
     alarmsList.append(newAlarm);
 }
+
+void MainWindow::tabBlinking(QString tabName, bool enable)
+{
+    if (enable)
+    {
+        if (tabName=="Timers")
+        {
+            blinkingTimers++;
+            ui->SmartTimerTabs->setCurrentIndex(0);
+        }
+        if (tabName=="Alarms")
+        {
+            blinkingAlarms++;
+            ui->SmartTimerTabs->setCurrentIndex(1);
+        }
+    }
+    else
+    {
+        if (tabName=="Timers" && blinkingTimers)
+        {
+            blinkingTimers--;
+        }
+        if (tabName=="Alarms" && blinkingAlarms)
+        {
+            blinkingAlarms--;
+        }
+    }
+    if (blinkingTimers && !timersBlinking)
+    {
+        timersBlinkTimer->start(400);
+        timersBlinking = true;
+        timersBlinkState = false;
+    }
+    if (blinkingAlarms && !alarmsBlinking)
+    {
+        alarmsBlinkTimer->start(400);
+        alarmsBlinking = true;
+        alarmsBlinkState = false;
+    }
+
+    if (!blinkingTimers)
+    {
+        timersBlinkTimer->stop();
+
+        ui->Timers->setProperty("blink", false);
+        this->style()->unpolish(ui->Timers);
+        this->style()->polish(ui->Timers);
+
+        timersBlinkState = false;
+
+        timersBlinking = false;
+
+    }
+
+    if (!blinkingAlarms)
+    {
+        alarmsBlinkTimer->stop();
+
+        ui->Alarms->setProperty("blink", false);
+        this->style()->unpolish(ui->Alarms);
+        this->style()->polish(ui->Alarms);
+
+        alarmsBlinkState = false;
+
+        alarmsBlinking = false;
+    }
+
+}
+
+void MainWindow::alarmsTabBlink()
+{
+    ui->Alarms->setProperty("blink", !alarmsBlinkState);
+    ui->Alarms->style()->unpolish(ui->Alarms);
+    ui->Alarms->style()->polish(ui->Alarms);
+
+
+    alarmsBlinkState = !alarmsBlinkState;
+}
+
+void MainWindow::timersTabBlink()
+{
+
+    ui->Timers->setProperty("blink", !timersBlinkState);
+    ui->Timers->style()->unpolish(ui->Timers);
+    ui->Timers->style()->polish(ui->Timers);
+    ui->Timers->update();
+
+
+
+    timersBlinkState = !timersBlinkState;
+}

SmartTimer/mainwindow.h

@@ -30,6 +30,10 @@ public slots:
     void onTimerFinished();
     void onAlarmTimeRecieved(int msecs, const QString& _name, bool turnedOn);
 
+    void tabBlinking(QString tabName, bool enable);
+    void alarmsTabBlink();
+    void timersTabBlink();
+
 signals:
     void del(QList<TimerWidget*> timers,QList<alertwidget*> alarms);
 private:
@@ -42,6 +46,19 @@ public slots:
 
     QWidget *timerScrollWidget;
     QWidget *alarmScrollWidget;
+
+    int blinkingAlarms = 0;
+    int blinkingTimers = 0;
+
+    bool alarmsBlinking = false;
+    bool timersBlinking = false;
+
+    bool alarmsBlinkState = false;
+    bool timersBlinkState = false;
+
+    QTimer *alarmsBlinkTimer;
+    QTimer *timersBlinkTimer;
+
 };
 
 #endif // MAINWINDOW_H

SmartTimer/mainwindow.ui

@@ -63,10 +63,18 @@
       <height>791</height>
      </rect>
     </property>
+    <property name="styleSheet">
+     <string notr="true">QWidget[blink=true] {
+	background-color: black;
+}</string>
+    </property>
     <property name="currentIndex">
-     <number>1</number>
+     <number>0</number>
     </property>
     <widget class="QWidget" name="Timers">
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
      <attribute name="title">
       <string>Timers</string>
      </attribute>

SmartTimer/smarttimerlog.cpp

@@ -1,5 +1,6 @@
 #include "smarttimerlog.h"
 #include "timerwidget.h"
+#include "widgetsettings.h"
 
 #include <iostream>
 #include <fstream>
@@ -8,6 +9,8 @@
 #include <QUrl>
 #include <QString>
 
+#include <QJsonDocument>
+
 smartTimerLog::smartTimerLog(QObject *parent) : QObject(parent)
 {
     this->par = parent;
@@ -66,6 +69,19 @@ void smartTimerLog::runLogger()
     }
 
     logFile2.close();
+
+
+
+    QString alarms = "alarms.json";
+
+
+
+
+
+
+
+
+
 }
 
 void smartTimerLog::saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alarms)