Skip to content

Commit dd3434d

Browse files
SergySanJjSergySanJj
authored
Merge pull request #6 from secondYearProjects/dev
Add timeToAlarm to alarm add and change dialogs
2 parents e2eb54c + 8bba275 commit dd3434d

10 files changed

+228
-87
lines changed

‎SmartTimer/addalarmdialog.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
#include <QFile>
66

77

8-
static int getMsecs(const QTime& t)
9-
{
10-
return (t.hour()*3600+t.minute()*60+t.second())*1000;
11-
}
8+
9+
1210

1311
addAlarmDialog::addAlarmDialog(QWidget *parent) :
1412
QDialog(parent),
@@ -27,6 +25,8 @@ addAlarmDialog::addAlarmDialog(QWidget *parent) :
2725

2826
connect(ui->createButton,SIGNAL(clicked()),this,SLOT(sendData()));
2927
connect(ui->cancelButton,SIGNAL(clicked()),this,SLOT(close()));
28+
connect(ui->alarmTime,SIGNAL(timeChanged(QTime)),this,SLOT(updateTimeTo(QTime)));
29+
updateTimeTo(ui->alarmTime->time());
3030
}
3131

3232
addAlarmDialog::~addAlarmDialog()
@@ -45,3 +45,8 @@ void addAlarmDialog::sendData()
4545
emit sendAlarmData(WidgetSettings(getMsecs(ui->alarmTime->time()),ui->alarmName->text(),true,ui->SoundBox->itemData(ui->SoundBox->currentIndex()).toString()));
4646
this->close();
4747
}
48+
49+
void addAlarmDialog::updateTimeTo(QTime time)
50+
{
51+
ui->toAlarmLabel->setText(QTime::fromMSecsSinceStartOfDay(calculateDuration(time)).toString(globalSettings.alarmTimeFormat));
52+
}

‎SmartTimer/addalarmdialog.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class addAlarmDialog : public QDialog
2020
void updateWidget(GlobalSettings _globalSettings);
2121
public slots:
2222
void sendData();
23+
void updateTimeTo(QTime time);
2324
signals:
2425
void sendAlarmData(WidgetSettings);
2526
private:

‎SmartTimer/addalarmdialog.ui

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,66 @@
213213
</item>
214214
</layout>
215215
</item>
216+
<item>
217+
<layout class="QHBoxLayout" name="horizontalLayout_5">
218+
<item>
219+
<spacer name="horizontalSpacer_5">
220+
<property name="orientation">
221+
<enum>Qt::Horizontal</enum>
222+
</property>
223+
<property name="sizeHint" stdset="0">
224+
<size>
225+
<width>40</width>
226+
<height>20</height>
227+
</size>
228+
</property>
229+
</spacer>
230+
</item>
231+
<item>
232+
<widget class="QLabel" name="label_4">
233+
<property name="text">
234+
<string>To alarm:</string>
235+
</property>
236+
</widget>
237+
</item>
238+
<item>
239+
<spacer name="horizontalSpacer_4">
240+
<property name="orientation">
241+
<enum>Qt::Horizontal</enum>
242+
</property>
243+
<property name="sizeHint" stdset="0">
244+
<size>
245+
<width>40</width>
246+
<height>20</height>
247+
</size>
248+
</property>
249+
</spacer>
250+
</item>
251+
<item>
252+
<widget class="QLabel" name="toAlarmLabel">
253+
<property name="text">
254+
<string>TextLabel</string>
255+
</property>
256+
<property name="alignment">
257+
<set>Qt::AlignCenter</set>
258+
</property>
259+
</widget>
260+
</item>
261+
<item>
262+
<spacer name="horizontalSpacer_6">
263+
<property name="orientation">
264+
<enum>Qt::Horizontal</enum>
265+
</property>
266+
<property name="sizeHint" stdset="0">
267+
<size>
268+
<width>40</width>
269+
<height>20</height>
270+
</size>
271+
</property>
272+
</spacer>
273+
</item>
274+
</layout>
275+
</item>
216276
<item>
217277
<layout class="QHBoxLayout" name="horizontalLayout">
218278
<item>

‎SmartTimer/alertwidget.cpp

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,9 @@
11
#include "alertwidget.h"
22
#include "ui_alertwidget.h"
33
#include "changealarmdialog.h"
4-
4+
#include "widgetsettings.h"
55
#include <iostream>
66

7-
int getMsecs(const QTime& t)
8-
{
9-
return (t.hour()*3600+t.minute()*60+t.second())*1000+t.msec();
10-
}
11-
12-
int calculateDuration(const QTime &t)
13-
{
14-
int alertMsecs = getMsecs(t);
15-
int currMsecs = getMsecs(QTime::currentTime());
16-
17-
if (currMsecs > alertMsecs)
18-
{
19-
int wholeDay = 3600*24*1000;
20-
return (wholeDay+alertMsecs-currMsecs);
21-
}
22-
if (currMsecs < alertMsecs)
23-
{
24-
return (alertMsecs-currMsecs);
25-
}
26-
return 0;
27-
}
287

298

309
alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
@@ -70,8 +49,8 @@ alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
7049

7150
if (Settings.enabled)
7251
{
73-
std::cout << calculateDuration(alertTime) << " "
74-
<< QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
52+
//std::cout << calculateDuration(alertTime) << " "
53+
// << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
7554
alertTick.start(calculateDuration(alertTime));
7655
}
7756

@@ -102,8 +81,8 @@ void alertwidget::statusChanged(bool stat)
10281
if (stat)
10382
{
10483

105-
std::cout << calculateDuration(alertTime) << " "
106-
<< QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
84+
//std::cout << calculateDuration(alertTime) << " "
85+
// << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
10786
alertTick.start(calculateDuration(alertTime));
10887
}
10988
else
@@ -170,8 +149,8 @@ void alertwidget::stopBlinking()
170149
ui->stopButton->hide();
171150
if (Settings.enabled)
172151
{
173-
std::cout << calculateDuration(alertTime) << " "
174-
<< QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
152+
//std::cout << calculateDuration(alertTime) << " "
153+
// << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
175154
alertTick.start(calculateDuration(alertTime));
176155
}
177156
}

‎SmartTimer/changealarmdialog.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ ChangeAlarmDialog::ChangeAlarmDialog(alertwidget *parent) :
2626

2727
connect(ui->changeButton,SIGNAL(clicked()), this, SLOT(changeAlarm()));
2828
connect(ui->cancelButton,SIGNAL(clicked()), this, SLOT(close()));
29+
connect(ui->time,SIGNAL(timeChanged(QTime)),this,SLOT(updateTimeTo(QTime)));
30+
updateTimeTo(ui->time->time());
2931
}
3032

3133
ChangeAlarmDialog::~ChangeAlarmDialog()
@@ -48,3 +50,10 @@ void ChangeAlarmDialog::changeAlarm()
4850

4951
this->close();
5052
}
53+
54+
55+
56+
void ChangeAlarmDialog::updateTimeTo(QTime time)
57+
{
58+
ui->toAlarmLabel->setText(QTime::fromMSecsSinceStartOfDay(calculateDuration(time)).toString(globalSettings.alarmTimeFormat));
59+
}

‎SmartTimer/changealarmdialog.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class ChangeAlarmDialog : public QDialog
2121
void updateWidget(GlobalSettings _globalSettings);
2222
public slots:
2323
void changeAlarm();
24+
void updateTimeTo(QTime time);
2425
signals:
2526
void changeAlarmSignal(WidgetSettings settings);
2627

0 commit comments

Comments
 (0)