Add time format change in creation and change dialogs

Author: SergySanJj

SmartTimer/addalarmdialog.cpp

@@ -31,6 +31,12 @@ addAlarmDialog::~addAlarmDialog()
     delete ui;
 }
 
+void addAlarmDialog::updateWidget(GlobalSettings _globalSettings)
+{
+    globalSettings = _globalSettings;
+    ui->alarmTime->setDisplayFormat(globalSettings.alarmTimeFormat);
+}
+
 void addAlarmDialog::sendData()
 {
     emit sendAlarmData(WidgetSettings(getMsecs(ui->alarmTime->time()),ui->alarmName->text(),true));

SmartTimer/addalarmdialog.h

@@ -16,12 +16,15 @@ class addAlarmDialog : public QDialog
 public:
     explicit addAlarmDialog(QWidget *parent = nullptr);
     ~addAlarmDialog();
+
+    void updateWidget(GlobalSettings _globalSettings);
 public slots:
     void sendData();
 signals:
     void sendAlarmData(WidgetSettings);
 private:
     Ui::addAlarmDialog *ui;
+    GlobalSettings globalSettings;
 };
 
 #endif // ADDALARMDIALOG_H

SmartTimer/addtimerdialog.cpp

@@ -36,6 +36,13 @@ addTimerDialog::~addTimerDialog()
     delete ui;
 }
 
+void addTimerDialog::updateWidget(GlobalSettings _globalSettings)
+{
+    globalSettings = _globalSettings;
+
+    ui->interval->setDisplayFormat(globalSettings.timerTimeFormat);
+}
+
 void addTimerDialog::returnAndClose()
 {
     int elpasedTime = ui->interval->time().hour()*3600*1000+

SmartTimer/addtimerdialog.h

@@ -17,6 +17,7 @@ class addTimerDialog : public QDialog
     explicit addTimerDialog(QWidget *parent = nullptr);
     ~addTimerDialog();
 
+    void updateWidget(GlobalSettings _globalSettings);
 public slots:
     void returnAndClose();
 signals:
@@ -25,6 +26,7 @@ public slots:
 
 private:
     Ui::addTimerDialog *ui;
+    GlobalSettings globalSettings;
 };
 
 #endif // ADDTIMERDIALOG_H

SmartTimer/alertwidget.cpp

@@ -55,7 +55,7 @@ alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
         file.close();
     }
 
-    ui->timeLabel->setText(alertTime.toString("hh:mm"));
+    ui->timeLabel->setText(alertTime.toString(globalSettings.alarmTimeFormat));
     ui->alarmNameLabel->setText(Settings.name);
 
     ui->alertSwitch->setStatus(Settings.enabled);
@@ -136,7 +136,6 @@ void alertwidget::onTickCheck()
 
 void alertwidget::blink()
 {
-    //TODO: here
     if (blinky)
     {
         ui->widget->setStyleSheet("QWidget {"
@@ -197,6 +196,7 @@ void alertwidget::changeAlarm()
 
     connect(dial, SIGNAL(changeAlarmSignal(WidgetSettings)),this,SLOT(setAlarm(WidgetSettings)));
 
+    dial->updateWidget(globalSettings);
     dial->exec();
 }
 
@@ -220,7 +220,7 @@ void alertwidget::setAlarm(WidgetSettings settings)
 {
     Settings = settings;
 
-    ui->timeLabel->setText(QTime::fromMSecsSinceStartOfDay(Settings.msecs).toString("hh:mm"));
+    ui->timeLabel->setText(QTime::fromMSecsSinceStartOfDay(Settings.msecs).toString(globalSettings.alarmTimeFormat));
     ui->alarmNameLabel->setText(Settings.name);
 
     alertTime = QTime::fromMSecsSinceStartOfDay(Settings.msecs);

SmartTimer/changealarmdialog.cpp

@@ -30,6 +30,13 @@ ChangeAlarmDialog::~ChangeAlarmDialog()
 
 }
 
+void ChangeAlarmDialog::updateWidget(GlobalSettings _globalSettings)
+{
+    globalSettings = _globalSettings;
+
+    ui->time->setDisplayFormat(globalSettings.alarmTimeFormat);
+}
+
 void ChangeAlarmDialog::changeAlarm()
 {
     emit changeAlarmSignal(WidgetSettings(getMsecs(ui->time->time()), ui->alarmName->text()));

SmartTimer/changealarmdialog.h

@@ -18,13 +18,15 @@ class ChangeAlarmDialog : public QDialog
     explicit ChangeAlarmDialog(alertwidget *parent = nullptr);
     ~ChangeAlarmDialog();
 
+    void updateWidget(GlobalSettings _globalSettings);
 public slots:
     void changeAlarm();
 signals:
     void changeAlarmSignal(WidgetSettings settings);
 
 private:
     Ui::ChangeAlarmDialog *ui;
+    GlobalSettings globalSettings;
 };
 
 #endif // CHANGEALARMDIALOG_H

SmartTimer/changetimerdialog.cpp

@@ -38,6 +38,13 @@ ChangeTimerDialog::~ChangeTimerDialog()
     delete ui;
 }
 
+void ChangeTimerDialog::updateWidget(GlobalSettings _globalSettings)
+{
+    globalSettings = _globalSettings;
+
+    ui->interval->setDisplayFormat(globalSettings.timerTimeFormat);
+}
+
 void ChangeTimerDialog::changeTimerAndQuit()
 {
     int elpasedTime = ui->interval->time().hour()*3600*1000+

SmartTimer/changetimerdialog.h

@@ -18,12 +18,15 @@ class ChangeTimerDialog : public QDialog
     explicit ChangeTimerDialog(TimerWidget *parent = nullptr);
     ~ChangeTimerDialog();
 
+    void updateWidget(GlobalSettings _globalSettings);
 public slots:
     void changeTimerAndQuit();
 
 private:
     Ui::ChangeTimerDialog *ui;
     TimerWidget *par;
+
+    GlobalSettings globalSettings;
 };
 
 #endif // CHANGETIMERDIALOG_H

SmartTimer/mainwindow.cpp

@@ -80,6 +80,7 @@ void MainWindow::addTimer()
     connect(addDial,SIGNAL(sendTimerData(WidgetSettings)),this, SLOT(onTimeRecieved(WidgetSettings)));
 
 
+    addDial->updateWidget(Settings);
     addDial->exec();
 }
 
@@ -88,6 +89,7 @@ void MainWindow::addAlarm()
     auto *addDial = new addAlarmDialog(this);
     connect(addDial,SIGNAL(sendAlarmData(WidgetSettings)),this, SLOT(onAlarmTimeRecieved(WidgetSettings)));
 
+    addDial->updateWidget(Settings);
     addDial->exec();
 }
 
@@ -111,9 +113,7 @@ void MainWindow::onTimeRecieved(WidgetSettings settings)
     connect(newTimer, SIGNAL(timerFinished()), this, SLOT(onTimerFinished()));
     connect(newTimer, SIGNAL(blinkInfo(QString, bool)), this, SLOT(tabBlinking(QString,bool)));
 
-
     timersList.append(newTimer);
-
     newTimer->updateWidget(Settings);
 }