Finish refactoring settings for timers and anarms

SergySanJj · SergySanJj · commit c60eafe3f6bc · 2018-11-04T23:23:46.000+02:00
Prepare to add signal settings and Don't disturb mode
diff --git a/SmartTimer/addalarmdialog.cpp b/SmartTimer/addalarmdialog.cpp
@@ -33,6 +33,6 @@ addAlarmDialog::~addAlarmDialog()
 
 void addAlarmDialog::sendData()
 {
-    emit sendAlarmData(getMsecs(ui->alarmTime->time()),ui->alarmName->text(),true);
+    emit sendAlarmData(WidgetSettings(getMsecs(ui->alarmTime->time()),ui->alarmName->text(),true));
     this->close();
 }
diff --git a/SmartTimer/addalarmdialog.h b/SmartTimer/addalarmdialog.h
@@ -1,6 +1,8 @@
 #ifndef ADDALARMDIALOG_H
 #define ADDALARMDIALOG_H
 
+#include "widgetsettings.h"
+
 #include <QDialog>
 
 namespace Ui {
@@ -17,7 +19,7 @@ class addAlarmDialog : public QDialog
 public slots:
     void sendData();
 signals:
-    void sendAlarmData(int,const QString&,bool);
+    void sendAlarmData(WidgetSettings);
 private:
     Ui::addAlarmDialog *ui;
 };
diff --git a/SmartTimer/addtimerdialog.cpp b/SmartTimer/addtimerdialog.cpp
@@ -44,7 +44,7 @@ void addTimerDialog::returnAndClose()
 
     QString timerName = ui->timerName->text();
 
-    emit this->sendTimerData(elpasedTime, timerName);
+    emit this->sendTimerData(WidgetSettings(elpasedTime, timerName));
 
     this->close();
 }
diff --git a/SmartTimer/addtimerdialog.h b/SmartTimer/addtimerdialog.h
@@ -1,6 +1,8 @@
 #ifndef ADDTIMERDIALOG_H
 #define ADDTIMERDIALOG_H
 
+#include "widgetsettings.h"
+
 #include <QDialog>
 
 namespace Ui {
@@ -18,7 +20,7 @@ class addTimerDialog : public QDialog
 public slots:
     void returnAndClose();
 signals:
-    void sendTimerData(int msecs, const QString& _name);
+    void sendTimerData(WidgetSettings settings);
 
 
 private:
diff --git a/SmartTimer/alertwidget.cpp b/SmartTimer/alertwidget.cpp
@@ -27,18 +27,19 @@ int calculateDuration(const QTime &t)
         return 0;
 }
 
-alertwidget::alertwidget(int msecs, const QString& name, bool turnedOn, QWidget *parent) :
+alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::alertwidget)
 {
-    alertName = name;
-    alertTime = QTime::fromMSecsSinceStartOfDay(msecs);
-    state = turnedOn;
+    Settings = settings;
+
+    alertTime = QTime::fromMSecsSinceStartOfDay(Settings.msecs);
+
     blinking = false;
     blinky=false;
 
     playlist = new QMediaPlaylist();
-    playlist->addMedia(QUrl("qrc:/sounds/sound1.wav"));
+    playlist->addMedia(QUrl(Settings.signalPath));
     playlist->setPlaybackMode(QMediaPlaylist::Loop);
 
     player = new QMediaPlayer();
@@ -55,9 +56,9 @@ alertwidget::alertwidget(int msecs, const QString& name, bool turnedOn, QWidget
     }
 
     ui->timeLabel->setText(alertTime.toString("hh:mm"));
-    ui->alarmNameLabel->setText(alertName);
+    ui->alarmNameLabel->setText(Settings.name);
 
-    ui->alertSwitch->setStatus(state);
+    ui->alertSwitch->setStatus(Settings.enabled);
 
     ui->stopButton->hide();
 
@@ -67,7 +68,7 @@ alertwidget::alertwidget(int msecs, const QString& name, bool turnedOn, QWidget
     connect(ui->stopButton, SIGNAL(clicked()), this, SLOT(stopBlinking()));
 
 
-    if (state)
+    if (Settings.enabled)
     {
         std::cout << calculateDuration(alertTime) << " "
                   << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
@@ -97,7 +98,7 @@ int alertwidget::getAlertTime()
 
 void alertwidget::statusChanged(bool stat)
 {
-    state = stat;
+    Settings.enabled = stat;
     if (stat)
     {
 
@@ -166,7 +167,7 @@ void alertwidget::stopBlinking()
     ui->widget->setStyleSheet("QWidget { background-color: rgb(113,113,113); }");
     player->stop();
     ui->stopButton->hide();
-    if (state)
+    if (Settings.enabled)
     {
         std::cout << calculateDuration(alertTime) << " "
                   << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
@@ -194,7 +195,7 @@ void alertwidget::changeAlarm()
 {
     ChangeAlarmDialog *dial = new ChangeAlarmDialog(this);
 
-    connect(dial, SIGNAL(changeAlarmSignal(int,QString)),this,SLOT(setAlarm(int,QString)));
+    connect(dial, SIGNAL(changeAlarmSignal(WidgetSettings)),this,SLOT(setAlarm(WidgetSettings)));
 
     dial->exec();
 }
@@ -215,13 +216,15 @@ void alertwidget::ShowContextMenu(const QPoint &pos)
 
 }
 
-void alertwidget::setAlarm(int msecs, const QString & _name)
+void alertwidget::setAlarm(WidgetSettings settings)
 {
-    ui->timeLabel->setText(QTime::fromMSecsSinceStartOfDay(msecs).toString("hh:mm"));
-    ui->alarmNameLabel->setText(_name);
+    Settings = settings;
+
+    ui->timeLabel->setText(QTime::fromMSecsSinceStartOfDay(Settings.msecs).toString("hh:mm"));
+    ui->alarmNameLabel->setText(Settings.name);
+
+    alertTime = QTime::fromMSecsSinceStartOfDay(Settings.msecs);
 
-    alertTime = QTime::fromMSecsSinceStartOfDay(msecs);
-    alertName = _name;
 
     statusChanged(true);
 
diff --git a/SmartTimer/alertwidget.h b/SmartTimer/alertwidget.h
@@ -20,11 +20,11 @@ class alertwidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit alertwidget(int msecs, const QString& name, bool turnedOn = false, QWidget *parent = nullptr);
+    explicit alertwidget(WidgetSettings settings, QWidget *parent = nullptr);
     ~alertwidget();
 
-    inline bool getState() { return state; }
-    inline QString getName() {return alertName; }
+    inline bool getState() { return Settings.enabled; }
+    inline QString getName() {return Settings.name; }
     int getAlertTime();
 
 public slots:
@@ -38,7 +38,7 @@ public slots:
 
     void ShowContextMenu(const QPoint &);
 
-    void setAlarm(int,const QString&);
+    void setAlarm(WidgetSettings settings);
 
 signals:
     void alarmFinished();
@@ -56,9 +56,8 @@ public slots:
     QTime alertTime;
     QTimer alertTick;
     QTimer blinkTimer;
-    QString alertName;
+    //QString alertName;
 
-    bool state;
     bool blinking;
     bool blinky;
 
diff --git a/SmartTimer/changealarmdialog.cpp b/SmartTimer/changealarmdialog.cpp
@@ -32,7 +32,7 @@ ChangeAlarmDialog::~ChangeAlarmDialog()
 
 void ChangeAlarmDialog::changeAlarm()
 {
-    emit changeAlarmSignal(getMsecs(ui->time->time()), ui->alarmName->text());
+    emit changeAlarmSignal(WidgetSettings(getMsecs(ui->time->time()), ui->alarmName->text()));
 
     this->close();
 }
diff --git a/SmartTimer/changealarmdialog.h b/SmartTimer/changealarmdialog.h
@@ -2,6 +2,7 @@
 #define CHANGEALARMDIALOG_H
 
 #include "alertwidget.h"
+#include "widgetsettings.h"
 
 #include <QDialog>
 
@@ -20,7 +21,7 @@ class ChangeAlarmDialog : public QDialog
 public slots:
     void changeAlarm();
 signals:
-    void changeAlarmSignal(int, const QString &);
+    void changeAlarmSignal(WidgetSettings settings);
 
 private:
     Ui::ChangeAlarmDialog *ui;
diff --git a/SmartTimer/changetimerdialog.h b/SmartTimer/changetimerdialog.h
@@ -2,6 +2,7 @@
 #define CHANGETIMERDIALOG_H
 
 #include "timerwidget.h"
+#include "widgetsettings.h"
 
 #include <QDialog>
 
diff --git a/SmartTimer/mainwindow.cpp b/SmartTimer/mainwindow.cpp
@@ -37,8 +37,8 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(ui->addAlarmButton,SIGNAL(clicked()),this,SLOT(addAlarm()));
     connect(ui->settingsButton,SIGNAL(clicked()),this,SLOT(changeSettings()));
 
-    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(createTimer(WidgetSettings)), this, SLOT(onTimeRecieved(WidgetSettings)));
+    connect(logger, SIGNAL(createAlarm(WidgetSettings)), this, SLOT(onAlarmTimeRecieved(WidgetSettings)));
     connect(logger, SIGNAL(createSettings(GlobalSettings)), this, SLOT(onSettingsRecieved(GlobalSettings)));
 
 
@@ -75,7 +75,7 @@ MainWindow::~MainWindow()
 void MainWindow::addTimer()
 {
     auto *addDial = new addTimerDialog(this);
-    connect(addDial,SIGNAL(sendTimerData(int,QString)),this, SLOT(onTimeRecieved(int,QString)));
+    connect(addDial,SIGNAL(sendTimerData(WidgetSettings)),this, SLOT(onTimeRecieved(WidgetSettings)));
 
 
     addDial->exec();
@@ -84,7 +84,7 @@ void MainWindow::addTimer()
 void MainWindow::addAlarm()
 {
     auto *addDial = new addAlarmDialog(this);
-    connect(addDial,SIGNAL(sendAlarmData(int,QString,bool)),this, SLOT(onAlarmTimeRecieved(int,QString,bool)));
+    connect(addDial,SIGNAL(sendAlarmData(WidgetSettings)),this, SLOT(onAlarmTimeRecieved(WidgetSettings)));
 
     addDial->exec();
 }
@@ -99,9 +99,9 @@ void MainWindow::changeSettings()
 
 }
 
-void MainWindow::onTimeRecieved(int msecs, const QString& _name)
+void MainWindow::onTimeRecieved(WidgetSettings settings)
 {
-    auto *newTimer = new TimerWidget(msecs, _name, this);
+    auto *newTimer = new TimerWidget(WidgetSettings(settings.msecs, settings.name), this);
 
     timerScrollWidget->layout()->addWidget(newTimer);
 
@@ -138,9 +138,9 @@ void MainWindow::onTimerFinished()
 #endif
 }
 
-void MainWindow::onAlarmTimeRecieved(int msecs, const QString& _name, bool turnedOn)
+void MainWindow::onAlarmTimeRecieved(WidgetSettings settings)
 {
-    auto *newAlarm = new alertwidget(msecs, _name, turnedOn, this);
+    auto *newAlarm = new alertwidget(settings, this);
 
     alarmScrollWidget->layout()->addWidget(newAlarm);
 
diff --git a/SmartTimer/mainwindow.h b/SmartTimer/mainwindow.h
@@ -36,11 +36,11 @@ public slots:
     void addTimer();
     void addAlarm();
     void changeSettings();
-    void onTimeRecieved(int msecs, const QString& _name);
+    void onTimeRecieved(WidgetSettings settings);
     void remove(const TimerWidget* twidget);
     void remove(const alertwidget* awidget);
     void onTimerFinished();
-    void onAlarmTimeRecieved(int msecs, const QString& _name, bool turnedOn);
+    void onAlarmTimeRecieved(WidgetSettings settings);
     void onSettingsRecieved(GlobalSettings settings);
 
 
diff --git a/SmartTimer/smarttimerlog.cpp b/SmartTimer/smarttimerlog.cpp
@@ -44,7 +44,7 @@ void smartTimerLog::runLogger()
         if (str != "")
         {
             str = toLoadFormat(str);
-            emit createTimer(tim,str);
+            emit createTimer(WidgetSettings(tim,str));
         }
     }
 
@@ -70,7 +70,8 @@ void smartTimerLog::runLogger()
         if (str != "")
         {
             str = toLoadFormat(str);
-            emit createAlarm(tim,str,turned);
+
+            emit createAlarm(WidgetSettings(tim,str,turned));
         }
     }
 
diff --git a/SmartTimer/smarttimerlog.h b/SmartTimer/smarttimerlog.h
@@ -17,8 +17,8 @@ class smartTimerLog : public QObject
     void runLogger();
 
 signals:
-    void createTimer(int duration, const QString& timerName);
-    void createAlarm(int msecs, const QString &alarmName, bool turnedOn);
+    void createTimer(WidgetSettings settings);
+    void createAlarm(WidgetSettings settings);
     void createSettings(GlobalSettings settings);
 public slots:
     void saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alarms, GlobalSettings settings);
diff --git a/SmartTimer/stylesheet.qss b/SmartTimer/stylesheet.qss
@@ -223,6 +223,12 @@ QLabel {
     font: bold 15pt;
 }
 
+
+QLabel#intervalTime {
+    color: rgb(220,220,220);
+    font: bold 14pt;
+}
+
 QSlider::groove:horizontal {
     border: 1px solid rgb(153,153,153);
     height: 2px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
diff --git a/SmartTimer/timerwidget.cpp b/SmartTimer/timerwidget.cpp
diff --git a/SmartTimer/timerwidget.h b/SmartTimer/timerwidget.h

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ addAlarmDialog::~addAlarmDialog()`
`33`	`33`
`34`	`34`	`void addAlarmDialog::sendData()`
`35`	`35`	`{`
`36`		`- emit sendAlarmData(getMsecs(ui->alarmTime->time()),ui->alarmName->text(),true);`
	`36`	`+ emit sendAlarmData(WidgetSettings(getMsecs(ui->alarmTime->time()),ui->alarmName->text(),true));`
`37`	`37`	`this->close();`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ void addTimerDialog::returnAndClose()`
`44`	`44`
`45`	`45`	`QString timerName = ui->timerName->text();`
`46`	`46`
`47`		`- emit this->sendTimerData(elpasedTime, timerName);`
	`47`	`+ emit this->sendTimerData(WidgetSettings(elpasedTime, timerName));`
`48`	`48`
`49`	`49`	`this->close();`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ ChangeAlarmDialog::~ChangeAlarmDialog()`
`32`	`32`
`33`	`33`	`void ChangeAlarmDialog::changeAlarm()`
`34`	`34`	`{`
`35`		`- emit changeAlarmSignal(getMsecs(ui->time->time()), ui->alarmName->text());`
	`35`	`+ emit changeAlarmSignal(WidgetSettings(getMsecs(ui->time->time()), ui->alarmName->text()));`
`36`	`36`
`37`	`37`	`this->close();`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ MainWindow::MainWindow(QWidget *parent) :`
`37`	`37`	`connect(ui->addAlarmButton,SIGNAL(clicked()),this,SLOT(addAlarm()));`
`38`	`38`	`connect(ui->settingsButton,SIGNAL(clicked()),this,SLOT(changeSettings()));`
`39`	`39`
`40`		`- connect(logger, SIGNAL(createTimer(int,QString)), this, SLOT(onTimeRecieved(int,QString)));`
`41`		`- connect(logger, SIGNAL(createAlarm(int,QString,bool)), this, SLOT(onAlarmTimeRecieved(int,QString,bool)));`
	`40`	`+ connect(logger, SIGNAL(createTimer(WidgetSettings)), this, SLOT(onTimeRecieved(WidgetSettings)));`
	`41`	`+ connect(logger, SIGNAL(createAlarm(WidgetSettings)), this, SLOT(onAlarmTimeRecieved(WidgetSettings)));`
`42`	`42`	`connect(logger, SIGNAL(createSettings(GlobalSettings)), this, SLOT(onSettingsRecieved(GlobalSettings)));`
`43`	`43`
`44`	`44`
`@@ -75,7 +75,7 @@ MainWindow::~MainWindow()`
`75`	`75`	`void MainWindow::addTimer()`
`76`	`76`	`{`
`77`	`77`	`auto *addDial = new addTimerDialog(this);`
`78`		`- connect(addDial,SIGNAL(sendTimerData(int,QString)),this, SLOT(onTimeRecieved(int,QString)));`
	`78`	`+ connect(addDial,SIGNAL(sendTimerData(WidgetSettings)),this, SLOT(onTimeRecieved(WidgetSettings)));`
`79`	`79`
`80`	`80`
`81`	`81`	`addDial->exec();`
`@@ -84,7 +84,7 @@ void MainWindow::addTimer()`
`84`	`84`	`void MainWindow::addAlarm()`
`85`	`85`	`{`
`86`	`86`	`auto *addDial = new addAlarmDialog(this);`
`87`		`- connect(addDial,SIGNAL(sendAlarmData(int,QString,bool)),this, SLOT(onAlarmTimeRecieved(int,QString,bool)));`
	`87`	`+ connect(addDial,SIGNAL(sendAlarmData(WidgetSettings)),this, SLOT(onAlarmTimeRecieved(WidgetSettings)));`
`88`	`88`
`89`	`89`	`addDial->exec();`
`90`	`90`	`}`
`@@ -99,9 +99,9 @@ void MainWindow::changeSettings()`
`99`	`99`
`100`	`100`	`}`
`101`	`101`
`102`		`-void MainWindow::onTimeRecieved(int msecs, const QString& _name)`
	`102`	`+void MainWindow::onTimeRecieved(WidgetSettings settings)`
`103`	`103`	`{`
`104`		`- auto *newTimer = new TimerWidget(msecs, _name, this);`
	`104`	`+ auto *newTimer = new TimerWidget(WidgetSettings(settings.msecs, settings.name), this);`
`105`	`105`
`106`	`106`	`timerScrollWidget->layout()->addWidget(newTimer);`
`107`	`107`
`@@ -138,9 +138,9 @@ void MainWindow::onTimerFinished()`
`138`	`138`	`#endif`
`139`	`139`	`}`
`140`	`140`
`141`		`-void MainWindow::onAlarmTimeRecieved(int msecs, const QString& _name, bool turnedOn)`
	`141`	`+void MainWindow::onAlarmTimeRecieved(WidgetSettings settings)`
`142`	`142`	`{`
`143`		`- auto *newAlarm = new alertwidget(msecs, _name, turnedOn, this);`
	`143`	`+ auto *newAlarm = new alertwidget(settings, this);`
`144`	`144`
`145`	`145`	`alarmScrollWidget->layout()->addWidget(newAlarm);`
`146`	`146`