Progress commit

Author: SergySanJj

SmartTimer/mainwindow.cpp

@@ -156,6 +156,8 @@ void MainWindow::onSettingsRecieved(GlobalSettings settings)
     Settings = settings;
 
     this->setWindowOpacity(Settings.windowOpacity);
+
+    updateWidgets();
 }
 
 // TODO: here
@@ -255,3 +257,11 @@ void MainWindow::timersTabBlink()
 
     timersBlinkState = !timersBlinkState;
 }
+
+void MainWindow::updateWidgets()
+{
+    for (auto timer:timersList)
+    {
+        timer->updateWidget(Settings);
+    }
+}

SmartTimer/mainwindow.h

@@ -32,6 +32,8 @@ class MainWindow : public QMainWindow
     void setAlarmFormat(QString val) {Settings.alarmTimeFormat = val; this->update();}
     void setTimerFormat(QString val) {Settings.timerTimeFormat = val; this->update();}
 
+    GlobalSettings getSettings() const { return Settings; }
+
 public slots:
     void addTimer();
     void addAlarm();
@@ -48,6 +50,9 @@ public slots:
     void alarmsTabBlink();
     void timersTabBlink();
 
+
+    void updateWidgets();
+
 signals:
     void del(QList<TimerWidget*> timers,QList<alertwidget*> alarms,GlobalSettings);
 private:

SmartTimer/mainwindow.ui

@@ -238,7 +238,7 @@
        <string notr="true"/>
       </property>
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="Timers">
        <property name="sizePolicy">

SmartTimer/timerwidget.cpp

@@ -7,6 +7,7 @@
 #include <string>
 
 #include <QFile>
+#include <QTextFormat>
 
 int TimerWidget::MAXID = 0;
 
@@ -103,6 +104,14 @@ void TimerWidget::setTimerDuration(int _duration)
     ui->timeLeft->setText(QString::fromStdString(secondsToTimeString(Settings.msecs/1000)));
 }
 
+void TimerWidget::updateWidget(GlobalSettings _globalSettings)
+{
+    globalSettings = _globalSettings;
+    ui->intervalTime->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));
+
+    //ui->timeLeft->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));
+}
+
 void TimerWidget::resetTimer()
 {
     timer->stop();

SmartTimer/timerwidget.h

@@ -5,6 +5,7 @@
 
 #include "widgetsettings.h"
 
+
 #include <QWidget>
 #include <QTimer>
 #include <QTime>
@@ -35,6 +36,8 @@ class TimerWidget : public QWidget
     void setTimerName(const QString &_name);
     void setTimerDuration(int _duration);
 
+    void updateWidget(GlobalSettings _globalSettings);
+
 public slots:
     void startTimer();
     void resetTimer();
@@ -60,6 +63,7 @@ public slots:
     static int MAXID;
 
     WidgetSettings Settings;
+    GlobalSettings globalSettings;
 
     int id;
     QTimer *timer;
@@ -76,6 +80,8 @@ public slots:
     Ui::TimerWidget *ui;
 
     std::string secondsToTimeString(int val);
+
+
 };