Add global settings logging

SergySanJj · SergySanJj · commit 1397e4415a07 · 2018-11-03T15:08:13.000+02:00
diff --git a/SmartTimer/alertwidget.cpp b/SmartTimer/alertwidget.cpp
@@ -107,6 +107,9 @@ void alertwidget::statusChanged(bool stat)
     }
     else
     {
+        if (blinkTimer.isActive())
+            emit blinkInfo("Alarms",false);
+
         alertTick.stop();
         blinkTimer.stop();
         blinking = false;
@@ -154,6 +157,9 @@ void alertwidget::blink()
 
 void alertwidget::stopBlinking()
 {
+    if (blinkTimer.isActive())
+        emit blinkInfo("Alarms",false);
+
     alertTick.stop();
     blinkTimer.stop();
     blinking = false;
@@ -170,13 +176,16 @@ void alertwidget::stopBlinking()
 
 void alertwidget::closeAlarm()
 {
+    if (blinkTimer.isActive())
+        emit blinkInfo("Alarms",false);
+
     alertTick.stop();
     blinkTimer.stop();
     player->stop();
 
 
     emit del(this);
-    emit blinkInfo("Alarms",false);
+
 
     this->close();
 }
@@ -220,7 +229,7 @@ void alertwidget::setAlarm(int msecs, const QString & _name)
 
 void alertwidget::mousePressEvent(QMouseEvent *e)
 {
-    if (e->button() == Qt::RightButton)
+    if (e->button() == Qt::RightButton && !blinkTimer.isActive())
     {
         player->stop();
         ShowContextMenu(e->pos());
diff --git a/SmartTimer/main.cpp b/SmartTimer/main.cpp
@@ -8,6 +8,7 @@ int main(int argc, char *argv[])
 
     MainWindow w;
 
+
     w.show();
 
     return QApplication::exec();
diff --git a/SmartTimer/mainwindow.cpp b/SmartTimer/mainwindow.cpp
@@ -15,6 +15,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
 {
+
     ui->setupUi(this);
 
 
@@ -29,12 +30,14 @@ MainWindow::MainWindow(QWidget *parent) :
     logger = new smartTimerLog(this);
     alarmsBlinkTimer = new QTimer(this);
     timersBlinkTimer = new QTimer(this);
+    Settings = GlobalSettings(1.0,"HH:mm","HH:mm:ss");
 
     connect(ui->addTimerButton,SIGNAL(clicked()),this,SLOT(addTimer()));
     connect(ui->addAlarmButton,SIGNAL(clicked()),this,SLOT(addAlarm()));
 
     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(logger, SIGNAL(createSettings(GlobalSettings)), this, SLOT(onSettingsRecieved(GlobalSettings)));
 
 
     connect(alarmsBlinkTimer,SIGNAL(timeout()),this,SLOT(alarmsTabBlink()));
@@ -55,11 +58,13 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->alarmScroll->setWidget(alarmScrollWidget);
 
     logger->runLogger();
+
+    this->setWindowOpacity(Settings.windowOpacity);
 }
 
 MainWindow::~MainWindow()
 {
-    emit del(this->timersList, this->alarmsList);
+    emit del(this->timersList, this->alarmsList, this->Settings);
 
     delete ui;
 }
@@ -134,10 +139,16 @@ void MainWindow::onAlarmTimeRecieved(int msecs, const QString& _name, bool turne
     alarmsList.append(newAlarm);
 }
 
+void MainWindow::onSettingsRecieved(GlobalSettings settings)
+{
+    Settings = settings;
+}
+
 void MainWindow::tabBlinking(QString tabName, bool enable)
 {
     if (enable)
     {
+        this->showMaximized();
         if (tabName=="Timers")
         {
             blinkingTimers++;
diff --git a/SmartTimer/mainwindow.h b/SmartTimer/mainwindow.h
@@ -1,9 +1,9 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#pragma once
 
 #include "smarttimerlog.h"
 #include "timerwidget.h"
 #include "alertwidget.h"
+#include "widgetsettings.h"
 
 #include <QMainWindow>
 #include <QSettings>
@@ -20,6 +20,17 @@ class MainWindow : public QMainWindow
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
+    GlobalSettings getSettings() {return Settings; }
+
+    double getOpacity() { return Settings.windowOpacity; }
+    QString getAlarmFormat() {return Settings.alarmTimeFormat; }
+    QString getTimerFormat() {return Settings.timerTimeFormat; }
+
+    void setSettings(GlobalSettings val) { Settings = val; this->update(); }
+
+    void setOpacity(double val) { Settings.windowOpacity = val; this->update();}
+    void setAlarmFormat(QString val) {Settings.alarmTimeFormat = val; this->update();}
+    void setTimerFormat(QString val) {Settings.timerTimeFormat = val; this->update();}
 
 public slots:
     void addTimer();
@@ -29,13 +40,14 @@ public slots:
     void remove(const alertwidget* awidget);
     void onTimerFinished();
     void onAlarmTimeRecieved(int msecs, const QString& _name, bool turnedOn);
+    void onSettingsRecieved(GlobalSettings settings);
 
     void tabBlinking(QString tabName, bool enable);
     void alarmsTabBlink();
     void timersTabBlink();
 
 signals:
-    void del(QList<TimerWidget*> timers,QList<alertwidget*> alarms);
+    void del(QList<TimerWidget*> timers,QList<alertwidget*> alarms,GlobalSettings);
 private:
     Ui::MainWindow *ui;
 
@@ -59,6 +71,7 @@ public slots:
     QTimer *alarmsBlinkTimer;
     QTimer *timersBlinkTimer;
 
+    GlobalSettings Settings;
+
 };
 
-#endif // MAINWINDOW_H
diff --git a/SmartTimer/mainwindow.ui b/SmartTimer/mainwindow.ui
@@ -223,7 +223,7 @@
               </size>
              </property>
              <property name="text">
-              <string>Add new Alarm</string>
+              <string>Add new Timer</string>
              </property>
             </widget>
            </item>
diff --git a/SmartTimer/save.txt b/SmartTimer/save.txt
diff --git a/SmartTimer/saves/save.txt b/SmartTimer/saves/save.txt
diff --git a/SmartTimer/smarttimerlog.cpp b/SmartTimer/smarttimerlog.cpp
@@ -1,6 +1,7 @@
 #include "smarttimerlog.h"
 #include "timerwidget.h"
 #include "widgetsettings.h"
+#include "widgetsettings.h"
 
 #include <iostream>
 #include <fstream>
@@ -11,10 +12,10 @@
 
 #include <QJsonDocument>
 
-smartTimerLog::smartTimerLog(QObject *parent) : QObject(parent)
+smartTimerLog::smartTimerLog(QObject *parent) : par(parent)
 {
     this->par = parent;
-    connect(par, SIGNAL(del(QList<TimerWidget*>,QList<alertwidget*>)), this, SLOT(saveLog(QList<TimerWidget*>,QList<alertwidget*>)));
+    connect(par, SIGNAL(del(QList<TimerWidget*>,QList<alertwidget*>, GlobalSettings)), this, SLOT(saveLog(QList<TimerWidget*>,QList<alertwidget*>,GlobalSettings)));
 
 }
 
@@ -27,6 +28,8 @@ void smartTimerLog::runLogger()
     int boolTmp;
 
     QFile logFile("save.txt");
+    if (!logFile.exists())
+        return;
     if (!logFile.open(QIODevice::ReadOnly))
     {
         // std::cerr << "Can't open log file." << std::endl;
@@ -50,13 +53,16 @@ void smartTimerLog::runLogger()
 
     // alarm part
     QFile logFile2("saveA.txt");
+    if (!logFile2.exists())
+        return;
     if (!logFile2.open(QIODevice::ReadOnly))
     {
         // std::cerr << "Can't open log file." << std::endl;
         return;
     }
 
     QTextStream stream2( &logFile2 );
+
     while(!stream2.atEnd())
     {
         stream2 >> tim >> str >> boolTmp;
@@ -70,21 +76,29 @@ void smartTimerLog::runLogger()
 
     logFile2.close();
 
+    // global settings
 
+    QFile logFile3("saveSettings.txt");
+    if (!logFile3.exists())
+        return;
+    if (!logFile3.open(QIODevice::ReadOnly))
+    {
+        // std::cerr << "Can't open log file." << std::endl;
+        return;
+    }
 
-    QString alarms = "alarms.json";
-
-
-
-
-
-
-
+    QTextStream stream3( &logFile3 );
+    double opacity;
+    QString alarmFormat;
+    QString timerFormat;
+    stream3 >> opacity >> alarmFormat >> timerFormat;
+    emit createSettings(GlobalSettings(opacity,alarmFormat,timerFormat));
 
 
+    logFile3.close();
 }
 
-void smartTimerLog::saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alarms)
+void smartTimerLog::saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alarms, GlobalSettings settings)
 {
 
     int tim;
@@ -131,14 +145,25 @@ void smartTimerLog::saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alar
     }
 
     logFile2.close();
-}
 
-// TODO: validator
-bool smartTimerLog::validateLog()
-{
-    return true;
+
+    // Global settings
+    QFile logFile3("saveSettings.txt");
+    if (!logFile3.open(QIODevice::WriteOnly))
+    {
+        std::cerr << "Log file can't be created.";
+    }
+
+    QTextStream stream3( &logFile3 );
+
+    stream3 << settings.windowOpacity << "\n";
+    stream3 << toLoadFormat(settings.alarmTimeFormat) << "\n";
+    stream3 << toLoadFormat(settings.timerTimeFormat) << "\n";
+
+    logFile3.close();
 }
 
+
 QString smartTimerLog::toLoadFormat(const QString &str)
 {
     if (str == "&")
diff --git a/SmartTimer/smarttimerlog.h b/SmartTimer/smarttimerlog.h
@@ -1,10 +1,10 @@
-#ifndef SMARTTIMERLOG_H
-#define SMARTTIMERLOG_H
+#pragma once
 
 #include "timerwidget.h"
 #include "alertwidget.h"
 #include "widgetsettings.h"
 
+
 #include <QObject>
 #include <QString>
 #include <QFile>
@@ -19,17 +19,17 @@ class smartTimerLog : public QObject
 signals:
     void createTimer(int duration, const QString& timerName);
     void createAlarm(int msecs, const QString &alarmName, bool turnedOn);
+    void createSettings(GlobalSettings settings);
 public slots:
-    void saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alarms);
+    void saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alarms, GlobalSettings settings);
 
 private:
 
     QObject* par;
 
-    bool validateLog();
     QString toLoadFormat(const QString& str);
     QString toSaveFormat(const QString& str);
 
 };
 
-#endif // SMARTTIMERLOG_H
+
diff --git a/SmartTimer/widgetsettings.h b/SmartTimer/widgetsettings.h
@@ -23,4 +23,15 @@ class WidgetSettings
 
 };
 
+struct GlobalSettings
+{
+public:
+    GlobalSettings(double opacity=1.0 ,QString alarmFormat="HH:mm" ,QString timerFormat="HH:mm:ss"):
+        windowOpacity(opacity), alarmTimeFormat(alarmFormat), timerTimeFormat(timerFormat) {}
+
+    double windowOpacity=1.0;
+    QString alarmTimeFormat = "HH:mm";
+    QString timerTimeFormat = "HH:mm:ss";
+};
+
 #endif // WIDGETSETTINGS_H

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,9 @@ void alertwidget::statusChanged(bool stat)`
`107`	`107`	`}`
`108`	`108`	`else`
`109`	`109`	`{`
	`110`	`+ if (blinkTimer.isActive())`
	`111`	`+ emit blinkInfo("Alarms",false);`
	`112`	`+`
`110`	`113`	`alertTick.stop();`
`111`	`114`	`blinkTimer.stop();`
`112`	`115`	`blinking = false;`
`@@ -154,6 +157,9 @@ void alertwidget::blink()`
`154`	`157`
`155`	`158`	`void alertwidget::stopBlinking()`
`156`	`159`	`{`
	`160`	`+ if (blinkTimer.isActive())`
	`161`	`+ emit blinkInfo("Alarms",false);`
	`162`	`+`
`157`	`163`	`alertTick.stop();`
`158`	`164`	`blinkTimer.stop();`
`159`	`165`	`blinking = false;`
`@@ -170,13 +176,16 @@ void alertwidget::stopBlinking()`
`170`	`176`
`171`	`177`	`void alertwidget::closeAlarm()`
`172`	`178`	`{`
	`179`	`+ if (blinkTimer.isActive())`
	`180`	`+ emit blinkInfo("Alarms",false);`
	`181`	`+`
`173`	`182`	`alertTick.stop();`
`174`	`183`	`blinkTimer.stop();`
`175`	`184`	`player->stop();`
`176`	`185`
`177`	`186`
`178`	`187`	`emit del(this);`
`179`		`- emit blinkInfo("Alarms",false);`
	`188`	`+`
`180`	`189`
`181`	`190`	`this->close();`
`182`	`191`	`}`
`@@ -220,7 +229,7 @@ void alertwidget::setAlarm(int msecs, const QString & _name)`
`220`	`229`
`221`	`230`	`void alertwidget::mousePressEvent(QMouseEvent *e)`
`222`	`231`	`{`
`223`		`- if (e->button() == Qt::RightButton)`
	`232`	`+ if (e->button() == Qt::RightButton && !blinkTimer.isActive())`
`224`	`233`	`{`
`225`	`234`	`player->stop();`
`226`	`235`	`ShowContextMenu(e->pos());`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ MainWindow::MainWindow(QWidget *parent) :`
`15`	`15`	`QMainWindow(parent),`
`16`	`16`	`ui(new Ui::MainWindow)`
`17`	`17`	`{`
	`18`	`+`
`18`	`19`	`ui->setupUi(this);`
`19`	`20`
`20`	`21`
`@@ -29,12 +30,14 @@ MainWindow::MainWindow(QWidget *parent) :`
`29`	`30`	`logger = new smartTimerLog(this);`
`30`	`31`	`alarmsBlinkTimer = new QTimer(this);`
`31`	`32`	`timersBlinkTimer = new QTimer(this);`
	`33`	`+ Settings = GlobalSettings(1.0,"HH:mm","HH:mm:ss");`
`32`	`34`
`33`	`35`	`connect(ui->addTimerButton,SIGNAL(clicked()),this,SLOT(addTimer()));`
`34`	`36`	`connect(ui->addAlarmButton,SIGNAL(clicked()),this,SLOT(addAlarm()));`
`35`	`37`
`36`	`38`	`connect(logger, SIGNAL(createTimer(int,QString)), this, SLOT(onTimeRecieved(int,QString)));`
`37`	`39`	`connect(logger, SIGNAL(createAlarm(int,QString,bool)), this, SLOT(onAlarmTimeRecieved(int,QString,bool)));`
	`40`	`+ connect(logger, SIGNAL(createSettings(GlobalSettings)), this, SLOT(onSettingsRecieved(GlobalSettings)));`
`38`	`41`
`39`	`42`
`40`	`43`	`connect(alarmsBlinkTimer,SIGNAL(timeout()),this,SLOT(alarmsTabBlink()));`
`@@ -55,11 +58,13 @@ MainWindow::MainWindow(QWidget *parent) :`
`55`	`58`	`ui->alarmScroll->setWidget(alarmScrollWidget);`
`56`	`59`
`57`	`60`	`logger->runLogger();`
	`61`	`+`
	`62`	`+ this->setWindowOpacity(Settings.windowOpacity);`
`58`	`63`	`}`
`59`	`64`
`60`	`65`	`MainWindow::~MainWindow()`
`61`	`66`	`{`
`62`		`- emit del(this->timersList, this->alarmsList);`
	`67`	`+ emit del(this->timersList, this->alarmsList, this->Settings);`
`63`	`68`
`64`	`69`	`delete ui;`
`65`	`70`	`}`
`@@ -134,10 +139,16 @@ void MainWindow::onAlarmTimeRecieved(int msecs, const QString& _name, bool turne`
`134`	`139`	`alarmsList.append(newAlarm);`
`135`	`140`	`}`
`136`	`141`
	`142`	`+void MainWindow::onSettingsRecieved(GlobalSettings settings)`
	`143`	`+{`
	`144`	`+ Settings = settings;`
	`145`	`+}`
	`146`	`+`
`137`	`147`	`void MainWindow::tabBlinking(QString tabName, bool enable)`
`138`	`148`	`{`
`139`	`149`	`if (enable)`
`140`	`150`	`{`
	`151`	`+ this->showMaximized();`
`141`	`152`	`if (tabName=="Timers")`
`142`	`153`	`{`
`143`	`154`	`blinkingTimers++;`