File tree Expand file tree Collapse file tree 4 files changed +24
-1
lines changed Expand file tree Collapse file tree 4 files changed +24
-1
lines changed Original file line number Diff line number Diff line change @@ -230,6 +230,14 @@ void alertwidget::setAlarm(WidgetSettings settings)
230
230
231
231
}
232
232
233
+ void alertwidget::updateWidget (GlobalSettings _globalSettings)
234
+ {
235
+ globalSettings = _globalSettings;
236
+ ui->timeLabel ->setText ((QTime::fromMSecsSinceStartOfDay (Settings.msecs )).toString (globalSettings.alarmTimeFormat ));
237
+
238
+ }
239
+
240
+
233
241
void alertwidget::mousePressEvent (QMouseEvent *e)
234
242
{
235
243
if (e->button () == Qt::RightButton && !blinkTimer.isActive ())
Original file line number Diff line number Diff line change @@ -40,6 +40,8 @@ public slots:
40
40
41
41
void setAlarm (WidgetSettings settings);
42
42
43
+ void updateWidget (GlobalSettings _globalSettings);
44
+
43
45
signals:
44
46
void alarmFinished ();
45
47
void del (const alertwidget*);
@@ -48,10 +50,12 @@ public slots:
48
50
49
51
void blinkInfo (QString tabName, bool enable);
50
52
53
+
51
54
private:
52
55
Ui::alertwidget *ui;
53
56
54
57
WidgetSettings Settings;
58
+ GlobalSettings globalSettings;
55
59
56
60
QTime alertTime;
57
61
QTimer alertTick;
Original file line number Diff line number Diff line change @@ -62,6 +62,8 @@ MainWindow::MainWindow(QWidget *parent) :
62
62
logger->runLogger ();
63
63
64
64
this ->setWindowOpacity (Settings.windowOpacity );
65
+
66
+ this ->updateWidgets ();
65
67
}
66
68
67
69
MainWindow::~MainWindow ()
@@ -111,6 +113,8 @@ void MainWindow::onTimeRecieved(WidgetSettings settings)
111
113
112
114
113
115
timersList.append (newTimer);
116
+
117
+ newTimer->updateWidget (Settings);
114
118
}
115
119
116
120
void MainWindow::remove (const TimerWidget *twidget)
@@ -149,6 +153,8 @@ void MainWindow::onAlarmTimeRecieved(WidgetSettings settings)
149
153
150
154
151
155
alarmsList.append (newAlarm);
156
+
157
+ newAlarm->updateWidget (Settings);
152
158
}
153
159
154
160
void MainWindow::onSettingsRecieved (GlobalSettings settings)
@@ -264,4 +270,9 @@ void MainWindow::updateWidgets()
264
270
{
265
271
timer->updateWidget (Settings);
266
272
}
273
+
274
+ for (auto alarm:alarmsList)
275
+ {
276
+ alarm->updateWidget (Settings);
277
+ }
267
278
}
Original file line number Diff line number Diff line change @@ -109,7 +109,7 @@ void TimerWidget::updateWidget(GlobalSettings _globalSettings)
109
109
globalSettings = _globalSettings;
110
110
ui->intervalTime ->setText ((QTime::fromMSecsSinceStartOfDay (Settings.msecs )).toString (globalSettings.timerTimeFormat ));
111
111
112
- // ui->timeLeft->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));
112
+
113
113
}
114
114
115
115
void TimerWidget::resetTimer ()
You can’t perform that action at this time.
0 commit comments