diff --git a/sources/mainwindow.cpp b/sources/mainwindow.cpp
index aab088c..0e295c2 100644
--- a/sources/mainwindow.cpp
+++ b/sources/mainwindow.cpp
@@ -76,23 +76,23 @@ void MainWindow::highlightDayOfWeek() {
ui->today_button->setDisabled(true);
switch (dayOfWeek) {
case 1: {
- ui->monLabel->setText(QString("%1 <").arg(ui->monLabel->text()));
+ ui->monLabel->setText(QString("%1 📆").arg(ui->monLabel->text()));
break;
}
case 2: {
- ui->tueLabel->setText(QString("%1 <").arg(ui->tueLabel->text()));
+ ui->tueLabel->setText(QString("%1 📆").arg(ui->tueLabel->text()));
break;
}
case 3: {
- ui->wedLabel->setText(QString("%1 <").arg(ui->wedLabel->text()));
+ ui->wedLabel->setText(QString("%1 📆").arg(ui->wedLabel->text()));
break;
}
case 4: {
- ui->thuLabel->setText(QString("%1 <").arg(ui->thuLabel->text()));
+ ui->thuLabel->setText(QString("%1 📆").arg(ui->thuLabel->text()));
break;
}
case 5: {
- ui->friLabel->setText(QString("%1 <").arg(ui->friLabel->text()));
+ ui->friLabel->setText(QString("%1 📆").arg(ui->friLabel->text()));
break;
}
default: break;
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index fc349db..efd840c 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -13,7 +13,7 @@
946
- 573
+ 671
@@ -41,9 +41,9 @@
- 670
+ 660
620
- 241
+ 251
31
@@ -115,13 +115,13 @@ color: white;
0h
-
+
50
- 160
+ 170
222
- 441
+ 431
@@ -193,35 +193,17 @@ font-size: 22px;
- -
-
-
-
- 16
- 16
-
-
-
-
- 16
- 16
-
-
-
- border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
+ -
+
+
+ Qt::Horizontal
+
+
+
-
-
@@ -284,35 +266,17 @@ font-size: 22px;
- -
-
-
-
- 16
- 16
-
-
-
-
- 16
- 16
-
-
-
- border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
+ -
+
+
+ Qt::Horizontal
+
+
+
-
-
@@ -375,35 +339,17 @@ font-size: 22px;
- -
-
-
-
- 16
- 16
-
-
-
-
- 16
- 16
-
-
-
- border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
+ -
+
+
+ Qt::Horizontal
+
+
+
-
-
@@ -466,35 +412,17 @@ font-size: 22px;
- -
-
-
-
- 16
- 16
-
-
-
-
- 16
- 16
-
-
-
- border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
+ -
+
+
+ Qt::Horizontal
+
+
+
-
-
@@ -557,44 +485,19 @@ font-size: 22px;
- -
-
-
-
- 16
- 16
-
-
-
-
- 16
- 16
-
-
-
- border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
+
310
170
601
- 422
+ 432
@@ -679,6 +582,67 @@ font-size: 22px;
-
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 16
+ 16
+
+
+
+
+ 16
+ 16
+
+
+
+ border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+
+
-
@@ -832,24 +796,89 @@ font-size: 22px;
-
-
-
-
- 0
- 42
-
-
-
- color: rgb(118, 118, 118);
+
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 16
+ 16
+
+
+
+
+ 16
+ 16
+
+
+
+ border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 42
+
+
+
+ color: rgb(118, 118, 118);
font-size: 18px;
-
-
- 00h00
-
-
- Qt::AlignCenter
-
-
+
+
+ 00h00
+
+
+ Qt::AlignCenter
+
+
+
+
-
@@ -977,24 +1006,89 @@ font-size: 22px;
-
-
-
-
- 0
- 42
-
-
-
- color: rgb(118, 118, 118);
+
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 16
+ 16
+
+
+
+
+ 16
+ 16
+
+
+
+ border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 42
+
+
+
+ color: rgb(118, 118, 118);
font-size: 18px;
-
-
- 00h00
-
-
- Qt::AlignCenter
-
-
+
+
+ 00h00
+
+
+ Qt::AlignCenter
+
+
+
+
-
@@ -1122,24 +1216,89 @@ font-size: 22px;
-
-
-
-
- 0
- 42
-
-
-
- color: rgb(118, 118, 118);
+
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 16
+ 16
+
+
+
+
+ 16
+ 16
+
+
+
+ border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 42
+
+
+
+ color: rgb(118, 118, 118);
font-size: 18px;
-
-
- 00h00
-
-
- Qt::AlignCenter
-
-
+
+
+ 00h00
+
+
+ Qt::AlignCenter
+
+
+
+
-
@@ -1267,24 +1426,89 @@ font-size: 22px;
-
-
-
-
- 0
- 42
-
-
-
- color: rgb(118, 118, 118);
+
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 16
+ 16
+
+
+
+
+ 16
+ 16
+
+
+
+ border-image: url(:/clock/pictures/warning.png) 0 0 0 0 stretch stretch;
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 42
+
+
+
+ color: rgb(118, 118, 118);
font-size: 18px;
-
-
- 00h00
-
-
- Qt::AlignCenter
-
-
+
+
+ 00h00
+
+
+ Qt::AlignCenter
+
+
+
+
-
@@ -1330,8 +1554,8 @@ font-size: 22px;
- 530
- 23
+ 50
+ 150
109
21
@@ -1416,7 +1640,7 @@ font-size: 22px;
true
-
+
310
@@ -1543,46 +1767,32 @@ font-weight: bold;
layoutWidget
layoutWidget
layoutWidget
- layoutWidget
- layoutWidget
- layoutWidget
template_settings_button
aboutButton
week_options_button
- thuLabel
- thurdayValidate
- thurdayWarning
- thu_time_label
- label_28
- thuStartLabel
- thuBreakLabel
- thuEndLabel
- label_32
- line_4
- fri_time_label
- friLabel
- fridayValidate
- fridayWarning
- label_34
- friStartLabel
- friBreakLabel
- label_38
- friEndLabel
- line_5
total_time_label
- late_time_label
- label_4
- label_8
- late_time_label_week
- label_6
- overtime_time_label
- label_9
- overtime_time_label_week
-
-
label_semaine
today_button
dateEdit
+ tuesdayWarning
+ tueBreakLabel
+ horizontalSpacer_6
+ horizontalSpacer_7
+ mondayWarning
+ horizontalSpacer_8
+ horizontalSpacer_9
+ wednesdayWarning
+ wedBreakLabel
+ horizontalSpacer_10
+ horizontalSpacer_11
+ thurdayWarning
+ horizontalSpacer_12
+ horizontalSpacer_13
+ thuBreakLabel
+ fridayWarning
+ horizontalSpacer_14
+ horizontalSpacer_15
+ friBreakLabel
diff --git a/ui/weekoption.ui b/ui/weekoption.ui
index be540cf..2fde678 100644
--- a/ui/weekoption.ui
+++ b/ui/weekoption.ui
@@ -28,9 +28,9 @@
- 280
+ 260
40
- 81
+ 101
27
@@ -38,10 +38,10 @@
min
- -1000
+ -1000000
- 1000
+ 1000000
@@ -49,12 +49,13 @@
10
10
- 101
+ 111
18
+ 75
true
@@ -93,7 +94,7 @@
172
52
- 101
+ 81
20
@@ -110,10 +111,10 @@
- 120
+ 130
16
- 241
- 16
+ 231
+ 20