Skip to content

Commit f4a0d9b

Browse files
committed
Prepare to refactor time Labels
1 parent 490b379 commit f4a0d9b

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

SmartTimer/alertwidget.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,14 @@ void alertwidget::setAlarm(WidgetSettings settings)
230230

231231
}
232232

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+
233241
void alertwidget::mousePressEvent(QMouseEvent *e)
234242
{
235243
if (e->button() == Qt::RightButton && !blinkTimer.isActive())

SmartTimer/alertwidget.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public slots:
4040

4141
void setAlarm(WidgetSettings settings);
4242

43+
void updateWidget(GlobalSettings _globalSettings);
44+
4345
signals:
4446
void alarmFinished();
4547
void del(const alertwidget*);
@@ -48,10 +50,12 @@ public slots:
4850

4951
void blinkInfo(QString tabName, bool enable);
5052

53+
5154
private:
5255
Ui::alertwidget *ui;
5356

5457
WidgetSettings Settings;
58+
GlobalSettings globalSettings;
5559

5660
QTime alertTime;
5761
QTimer alertTick;

SmartTimer/mainwindow.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ MainWindow::MainWindow(QWidget *parent) :
6262
logger->runLogger();
6363

6464
this->setWindowOpacity(Settings.windowOpacity);
65+
66+
this->updateWidgets();
6567
}
6668

6769
MainWindow::~MainWindow()
@@ -111,6 +113,8 @@ void MainWindow::onTimeRecieved(WidgetSettings settings)
111113

112114

113115
timersList.append(newTimer);
116+
117+
newTimer->updateWidget(Settings);
114118
}
115119

116120
void MainWindow::remove(const TimerWidget *twidget)
@@ -149,6 +153,8 @@ void MainWindow::onAlarmTimeRecieved(WidgetSettings settings)
149153

150154

151155
alarmsList.append(newAlarm);
156+
157+
newAlarm->updateWidget(Settings);
152158
}
153159

154160
void MainWindow::onSettingsRecieved(GlobalSettings settings)
@@ -264,4 +270,9 @@ void MainWindow::updateWidgets()
264270
{
265271
timer->updateWidget(Settings);
266272
}
273+
274+
for (auto alarm:alarmsList)
275+
{
276+
alarm->updateWidget(Settings);
277+
}
267278
}

SmartTimer/timerwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void TimerWidget::updateWidget(GlobalSettings _globalSettings)
109109
globalSettings = _globalSettings;
110110
ui->intervalTime->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));
111111

112-
//ui->timeLeft->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));
112+
113113
}
114114

115115
void TimerWidget::resetTimer()

0 commit comments

Comments
 (0)