From 08dcecbee9e8ef21cdeb265ba0c961d21148ea2a Mon Sep 17 00:00:00 2001 From: Alexis Delhaie Date: Fri, 2 Oct 2020 21:29:14 +0200 Subject: [PATCH] New interface theme, new icon --- Chronos.pro | 1 - Chronos.pro.user | 6 +- sources/aboutbox.cpp | 25 +++ sources/aboutbox.h | 11 ++ sources/mainwindow.cpp | 10 +- sources/mainwindow.h | 1 + sources/setdaydialog.cpp | 26 +++ sources/setdaydialog.h | 11 ++ sources/welcome.cpp | 26 +++ sources/welcome.h | 11 ++ stylesheets/style.qss | 67 +++++--- ui/aboutbox.ui | 316 ++++++++++++++++++++++++------------- ui/mainwindow.ui | 331 ++++++++++++++++++++++++--------------- ui/setdaydialog.ui | 169 +++++++++++++++++--- ui/welcome.ui | 133 +++++++++++++++- 15 files changed, 849 insertions(+), 295 deletions(-) diff --git a/Chronos.pro b/Chronos.pro index 685f641..25b44f6 100644 --- a/Chronos.pro +++ b/Chronos.pro @@ -1,5 +1,4 @@ QT += core gui - greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++17 diff --git a/Chronos.pro.user b/Chronos.pro.user index 4a8d138..993f80e 100644 --- a/Chronos.pro.user +++ b/Chronos.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -77,7 +77,7 @@ Desktop Qt 5.15.0 MSVC2019 64bit Desktop Qt 5.15.0 MSVC2019 64bit qt.qt5.5150.win64_msvc2019_64_kit - 0 + 1 0 0 @@ -320,7 +320,7 @@ false true - C:/Users/robof/OneDrive/Documents/build-Chronos-Desktop_Qt_5_15_0_MSVC2019_64bit-Debug + C:/Users/robof/OneDrive/Documents/build-Chronos-Desktop_Qt_5_15_0_MSVC2019_64bit-Release 1 diff --git a/sources/aboutbox.cpp b/sources/aboutbox.cpp index 0688698..3cf3f73 100644 --- a/sources/aboutbox.cpp +++ b/sources/aboutbox.cpp @@ -6,9 +6,34 @@ AboutBox::AboutBox(QWidget *parent) : ui(new Ui::AboutBox) { ui->setupUi(this); + this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); + xmax = ui->frame->x() + ui->frame->width(); + xmin = ui->frame->x(); + ymax = ui->frame->x() + ui->frame->height(); + ymin = ui->frame->y(); } AboutBox::~AboutBox() { delete ui; } + +void AboutBox::mousePressEvent(QMouseEvent *event) { + m_nMouseClick_X_Coordinate = event->x(); + m_nMouseClick_Y_Coordinate = event->y(); +} + +void AboutBox::mouseMoveEvent(QMouseEvent *event) { + if (isWidgetIsTitleBar()) { + move(event->globalX() - m_nMouseClick_X_Coordinate , + event->globalY() - m_nMouseClick_Y_Coordinate); + } + +} + +bool AboutBox::isWidgetIsTitleBar() { + return (m_nMouseClick_X_Coordinate >= xmin && + m_nMouseClick_X_Coordinate < xmax && + m_nMouseClick_Y_Coordinate >= ymin && + m_nMouseClick_Y_Coordinate < ymax); +} diff --git a/sources/aboutbox.h b/sources/aboutbox.h index 58c51bc..d20317b 100644 --- a/sources/aboutbox.h +++ b/sources/aboutbox.h @@ -2,6 +2,7 @@ #define ABOUTBOX_H #include +#include #include namespace Ui { @@ -18,6 +19,16 @@ public: private: Ui::AboutBox *ui; + + void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); + int m_nMouseClick_X_Coordinate; + int m_nMouseClick_Y_Coordinate; + int xmax; + int xmin; + int ymax; + int ymin; + inline bool isWidgetIsTitleBar(); }; #endif // ABOUTBOX_H diff --git a/sources/mainwindow.cpp b/sources/mainwindow.cpp index 26332dc..aafa25d 100644 --- a/sources/mainwindow.cpp +++ b/sources/mainwindow.cpp @@ -55,10 +55,10 @@ void MainWindow::init() { objectId.insert(ui->wed_button->objectName(), Identifier::wed); objectId.insert(ui->thu_button->objectName(), Identifier::thu); objectId.insert(ui->fri_button->objectName(), Identifier::fri); - xmax = ui->window_title->x() + ui->window_title->width(); - xmin = ui->window_title->x(); - ymax = ui->window_title->x() + ui->window_title->height(); - ymin = ui->window_title->y(); + xmax = ui->titleBar->x() + ui->titleBar->width(); + xmin = ui->titleBar->x(); + ymax = ui->titleBar->x() + ui->titleBar->height(); + ymin = ui->titleBar->y(); connect(ui->aboutButton, &QPushButton::clicked, this, &MainWindow::open_about); connect(ui->template_settings_button, &QPushButton::clicked, this, &MainWindow::edit_template); connect(ui->dateEdit, &QDateEdit::dateTimeChanged, this, &MainWindow::compute_week_number); @@ -89,7 +89,7 @@ void MainWindow::highlightDayOfWeek() { ui->tueLabel->setText("Mardi"); ui->wedLabel->setText("Mercredi"); ui->thuLabel->setText("Jeudi"); - ui->friLabel->setText("Friday"); + ui->friLabel->setText("Vendredi"); if (todayWeekNumber == current_week.getWeekNumber()) { switch (dayOfWeek) { case 1: { diff --git a/sources/mainwindow.h b/sources/mainwindow.h index cf3ff7e..81631e4 100644 --- a/sources/mainwindow.h +++ b/sources/mainwindow.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "week.h" #include "welcome.h" diff --git a/sources/setdaydialog.cpp b/sources/setdaydialog.cpp index 57115f5..c338570 100644 --- a/sources/setdaydialog.cpp +++ b/sources/setdaydialog.cpp @@ -6,6 +6,8 @@ SetDayDialog::SetDayDialog(Day d, bool isNotValidable, QWidget *parent) : ui(new Ui::SetDayDialog) { ui->setupUi(this); + ui->window_title->setText(this->windowTitle()); + this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); ui->validateButton->setEnabled(!isNotValidable); this->d = d; init(); @@ -16,10 +18,34 @@ SetDayDialog::~SetDayDialog() delete ui; } +void SetDayDialog::mousePressEvent(QMouseEvent *event) { + m_nMouseClick_X_Coordinate = event->x(); + m_nMouseClick_Y_Coordinate = event->y(); +} + +void SetDayDialog::mouseMoveEvent(QMouseEvent *event) { + if (isWidgetIsTitleBar()) { + move(event->globalX() - m_nMouseClick_X_Coordinate , + event->globalY() - m_nMouseClick_Y_Coordinate); + } + +} + +bool SetDayDialog::isWidgetIsTitleBar() { + return (m_nMouseClick_X_Coordinate >= xmin && + m_nMouseClick_X_Coordinate < xmax && + m_nMouseClick_Y_Coordinate >= ymin && + m_nMouseClick_Y_Coordinate < ymax); +} + void SetDayDialog::init() { ui->start_edit->setTime(d.get_start()); ui->end_edit->setTime(d.get_end()); ui->break_edit->setValue(d.get_time_break()); + xmax = ui->titleBar->x() + ui->titleBar->width(); + xmin = ui->titleBar->x(); + ymax = ui->titleBar->x() + ui->titleBar->height(); + ymin = ui->titleBar->y(); connect(ui->start_edit, &QTimeEdit::timeChanged, this, &SetDayDialog::compute_time); connect(ui->end_edit, &QTimeEdit::timeChanged, this, &SetDayDialog::compute_time); connect(ui->validateButton, &QPushButton::clicked, this, &SetDayDialog::validate); diff --git a/sources/setdaydialog.h b/sources/setdaydialog.h index 9a7877c..45491e7 100644 --- a/sources/setdaydialog.h +++ b/sources/setdaydialog.h @@ -2,6 +2,7 @@ #define SETDAYDIALOG_H #include +#include #include "day.h" #include "tools.h" @@ -30,6 +31,16 @@ private: Day d; void init(); + + void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); + int m_nMouseClick_X_Coordinate; + int m_nMouseClick_Y_Coordinate; + int xmax; + int xmin; + int ymax; + int ymin; + inline bool isWidgetIsTitleBar(); }; #endif // SETDAYDIALOG_H diff --git a/sources/welcome.cpp b/sources/welcome.cpp index 05ff99f..e211bb2 100644 --- a/sources/welcome.cpp +++ b/sources/welcome.cpp @@ -6,6 +6,8 @@ Welcome::Welcome(Week wtemplate, QWidget *parent) : ui(new Ui::Welcome) { ui->setupUi(this); + ui->window_title->setText(this->windowTitle()); + this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); w = wtemplate; init(); } @@ -15,6 +17,26 @@ Welcome::~Welcome() delete ui; } +void Welcome::mousePressEvent(QMouseEvent *event) { + m_nMouseClick_X_Coordinate = event->x(); + m_nMouseClick_Y_Coordinate = event->y(); +} + +void Welcome::mouseMoveEvent(QMouseEvent *event) { + if (isWidgetIsTitleBar()) { + move(event->globalX() - m_nMouseClick_X_Coordinate , + event->globalY() - m_nMouseClick_Y_Coordinate); + } + +} + +bool Welcome::isWidgetIsTitleBar() { + return (m_nMouseClick_X_Coordinate >= xmin && + m_nMouseClick_X_Coordinate < xmax && + m_nMouseClick_Y_Coordinate >= ymin && + m_nMouseClick_Y_Coordinate < ymax); +} + void Welcome::init() { set_value_to_widget(); objectId.insert(ui->mon_button->objectName(), Identifier::mon); @@ -22,6 +44,10 @@ void Welcome::init() { objectId.insert(ui->wed_button->objectName(), Identifier::wed); objectId.insert(ui->thu_button->objectName(), Identifier::thu); objectId.insert(ui->fri_button->objectName(), Identifier::fri); + xmax = ui->titleBar->x() + ui->titleBar->width(); + xmin = ui->titleBar->x(); + ymax = ui->titleBar->x() + ui->titleBar->height(); + ymin = ui->titleBar->y(); connect(ui->mon_button, &QPushButton::clicked, this, &Welcome::edit); connect(ui->tue_button, &QPushButton::clicked, this, &Welcome::edit); connect(ui->wed_button, &QPushButton::clicked, this, &Welcome::edit); diff --git a/sources/welcome.h b/sources/welcome.h index c310d01..49a51b3 100644 --- a/sources/welcome.h +++ b/sources/welcome.h @@ -3,6 +3,7 @@ #include #include +#include #include #include "week.h" @@ -43,6 +44,16 @@ private: Identifier get_identifier(QString objectName); Day modify_value(Day); + void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); + int m_nMouseClick_X_Coordinate; + int m_nMouseClick_Y_Coordinate; + int xmax; + int xmin; + int ymax; + int ymin; + inline bool isWidgetIsTitleBar(); + public slots: void edit(); }; diff --git a/stylesheets/style.qss b/stylesheets/style.qss index a33f0ee..e7486cd 100644 --- a/stylesheets/style.qss +++ b/stylesheets/style.qss @@ -52,18 +52,45 @@ QPushButton::default{ border-top-color: transparent; border-right-color: transparent; border-left-color: transparent; - border-bottom-color: #04b97f; + border-bottom-color: rgba(204, 22, 0, 255); border-width: 1px; color: #a9b7c6; padding: 2px; background-color: #1e1d23; } + + +QPushButton#closeButton, QPushButton#minimizeButton{ + color: white; + padding: 2px; + background-color: transparent; + border: none; + font-size: 11px; +} +QPushButton#closeButton::default, QFrame#titleBar QPushButton#minimizeButton::default{ + color: white; + padding: 2px; + background-color: transparent; + border: none; + font-size: 11px; +} +QPushButton#closeButton:hover{ + color: white; + padding-bottom: 2px; + background-color: #eb4034; +} +QPushButton#closeButton:pressed{ + color: white; + padding-bottom: 1px; + background-color: #b83228; +} + QToolButton { border-style: solid; border-top-color: transparent; border-right-color: transparent; border-left-color: transparent; - border-bottom-color: #04b97f; + border-bottom-color: rgba(204, 22, 0, 255); border-bottom-width: 1px; border-style: solid; color: #a9b7c6; @@ -75,7 +102,7 @@ QToolButton:hover{ border-top-color: transparent; border-right-color: transparent; border-left-color: transparent; - border-bottom-color: #37efba; + border-bottom-color: rgba(204, 22, 0, 255); border-bottom-width: 2px; border-style: solid; color: #FFFFFF; @@ -87,7 +114,7 @@ QPushButton:hover{ border-top-color: transparent; border-right-color: transparent; border-left-color: transparent; - border-bottom-color: #37efba; + border-bottom-color: rgba(204, 22, 0, 255); border-bottom-width: 1px; border-style: solid; color: #FFFFFF; @@ -99,10 +126,10 @@ QPushButton:pressed{ border-top-color: transparent; border-right-color: transparent; border-left-color: transparent; - border-bottom-color: #37efba; + border-bottom-color: rgba(204, 22, 0, 255); border-bottom-width: 2px; border-style: solid; - color: #37efba; + color: rgba(204, 22, 0, 255); padding-bottom: 1px; background-color: #1e1d23; } @@ -144,7 +171,7 @@ QProgressBar { background-color:#1e1d23; } QProgressBar::chunk { - background-color: #04b97f; + background-color: rgba(204, 22, 0, 255); border-radius: 5px; } QMenuBar { @@ -165,7 +192,7 @@ QMenu::item:selected { border-style: solid; border-top-color: transparent; border-right-color: transparent; - border-left-color: #04b97f; + border-left-color: rgba(204, 22, 0, 255); border-bottom-color: transparent; border-left-width: 2px; color: #FFFFFF; @@ -222,7 +249,7 @@ QTabBar::tab:selected, QTabBar::tab:last:selected, QTabBar::tab:hover { border-top-color: transparent; border-right-color: transparent; border-left-color: transparent; - border-bottom-color: #04b97f; + border-bottom-color: rgba(204, 22, 0, 255); border-bottom-width: 2px; border-style: solid; color: #FFFFFF; @@ -258,9 +285,9 @@ QCheckBox::indicator:checked { width: 10px; border-style:solid; border-width: 1px; - border-color: #04b97f; + border-color: rgba(204, 22, 0, 255); color: #a9b7c6; - background-color: #04b97f; + background-color: rgba(204, 22, 0, 255); } QCheckBox::indicator:unchecked { @@ -268,7 +295,7 @@ QCheckBox::indicator:unchecked { width: 10px; border-style:solid; border-width: 1px; - border-color: #04b97f; + border-color: rgba(204, 22, 0, 255); color: #a9b7c6; background-color: transparent; } @@ -283,9 +310,9 @@ QRadioButton::indicator:checked { border-style:solid; border-radius:5px; border-width: 1px; - border-color: #04b97f; + border-color: rgba(204, 22, 0, 255); color: #a9b7c6; - background-color: #04b97f; + background-color: rgba(204, 22, 0, 255); } QRadioButton::indicator:!checked { height: 10px; @@ -293,7 +320,7 @@ QRadioButton::indicator:!checked { border-style:solid; border-radius:5px; border-width: 1px; - border-color: #04b97f; + border-color: rgba(204, 22, 0, 255); color: #a9b7c6; background-color: transparent; } @@ -361,11 +388,11 @@ QScrollArea { } QSlider::groove:horizontal { height: 5px; - background: #04b97f; + background: rgba(204, 22, 0, 255); } QSlider::groove:vertical { width: 5px; - background: #04b97f; + background: rgba(204, 22, 0, 255); } QSlider::handle:horizontal { background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f); @@ -388,8 +415,8 @@ QSlider::add-page:vertical { background: white; } QSlider::sub-page:horizontal { - background: #04b97f; + background: rgba(204, 22, 0, 255); } QSlider::sub-page:vertical { - background: #04b97f; -} \ No newline at end of file + background: rgba(204, 22, 0, 255); +} diff --git a/ui/aboutbox.ui b/ui/aboutbox.ui index 0b59af2..708b4cb 100644 --- a/ui/aboutbox.ui +++ b/ui/aboutbox.ui @@ -62,77 +62,194 @@ QFrame::Raised - + - 30 - 150 - 551 + 665 + 0 + 41 21 - - font-size: 12px; + + + Segoe MDL2 Assets + - Author: Alexis Delhaie + - - - - - 30 - 190 - 551 - 21 - - - - font-size: 12px; - - - Version: 1.0.0 (Beta 5) - - - - - - 30 - 230 - 541 - 21 - - - - font-size: 12px; - - - <html><head/><body><p>Made with Qt 5.15.0 MSVC2019 64bit (C++17) (<a href="https://github.com/alexlegarnd/Chronos"><span style=" text-decoration: underline; color:#0000ff;">Source Github</span></a>)</p></body></html> - - - - - - 390 - 160 - 301 - 181 - - - - - - - font-size: 12px; - - - false - - + true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + + 0 + 0 + 2 + 381 + + + + border: none; +background-color: rgba(204, 22, 0, 255); + + + Qt::Vertical + + + + + + 705 + 0 + 2 + 381 + + + + border: none; +background-color: rgba(217, 0, 112, 255); + + + Qt::Vertical + + + + + + 0 + 379 + 707 + 2 + + + + border: none; +background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:1, y2:1, stop:0 rgba(204, 22, 0, 255), stop:1 rgba(217, 0, 112, 255)); + + + Qt::Horizontal + + + + + + 20 + 120 + 671 + 241 + + + + 0 + + + + Information + + + + + 10 + 0 + 714 + 211 + + + + + + + font-size: 12px; + + + Author: Alexis Delhaie + + + + + + + font-size: 12px; + + + Version: 1.0.0 (Beta 5) + + + + + + + font-size: 12px; + + + <html><head/><body><p>Software: Qt 5.15.0 MSVC2019 64bit (C++17) (<a href="https://github.com/alexlegarnd/Chronos"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/alexlegarnd/Chronos</span></a>)</p></body></html> + + + + + + + font-size: 12px; + + + <html><head/><body><p>Save Updater: Rust (<a href="https://github.com/alexlegarnd/chronos-save-updater"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/alexlegarnd/chronos-save-updater</span></a>)</p></body></html> + + + + + + + font-size: 12px; + + + <html><head/><body><p>Installer: Delphi 10.3.3 Community (<a href="https://github.com/alexlegarnd/chronos-installer"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/alexlegarnd/chronos-installer</span></a>)</p></body></html> + + + + + + + font-size: 12px; + + + <html><head/><body><p>Installer Bootstrap: Python 3.8.5 [MSC v.1924 (AMD64)] (<a href="https://github.com/alexlegarnd/chronos-installer-bootstrap"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/alexlegarnd/chronos-installer-bootstrap</span></a>)</p></body></html> + + + + + + + + + Third party + + + + + 8 + 10 + 651 + 191 + + + + + + + font-size: 12px; + + + false + + + true + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:12px; font-weight:400; font-style:normal;"> @@ -145,57 +262,34 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Running image: Icons made by </span><a href="https://www.flaticon.com/authors/freepik"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Freepik</span></a><span style=" font-size:10pt;"> from </span><a href="https://www.flaticon.com/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">www.flaticon.com</span></a></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; text-decoration: underline; color:#0000ff;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Calendar image: Icons made by </span><a href="https://www.flaticon.com/authors/freepik"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Freepik</span></a><span style=" font-size:10pt;"> from </span><a href="https://www.flaticon.com/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">www.flaticon.com</span></a></p></body></html> - - - - - - 393 - 130 - 211 - 21 - - - - font-size: 12px; - - - Third party: - - - - - - 30 - 270 - 541 - 21 - - - - font-size: 12px; - - - <html><head/><body><p>Installer made with Delphi 10.3 Community (<a href="https://github.com/alexlegarnd/chronos-installer"><span style=" text-decoration: underline; color:#0000ff;">Source Github</span></a>)</p></body></html> - - - - - - 30 - 310 - 541 - 21 - - - - font-size: 12px; - - - <html><head/><body><p>Installer Bootstrap made with Python 3 (<a href="https://github.com/alexlegarnd/chronos-installer-bootstrap"><span style=" text-decoration: underline; color:#0000ff;">Source Github</span></a>)</p></body></html> - + + + + tabWidget + window_border_left + window_border_right + window_border_bottom + frame + closeButton - + + + closeButton + clicked() + AboutBox + close() + + + 685 + 10 + + + 353 + 190 + + + + diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 6bda025..f2b4935 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -6,20 +6,20 @@ 0 0 - 1206 - 662 + 946 + 573 - 1206 - 662 + 946 + 573 - 1206 - 662 + 946 + 573 @@ -41,8 +41,8 @@ - 192 - 41 + 165 + 29 20 81 @@ -54,8 +54,8 @@ - 236 - 51 + 209 + 39 151 61 @@ -116,8 +116,8 @@ color: white; - 40 - 51 + 13 + 39 161 61 @@ -175,90 +175,11 @@ color: white; - - - - 1022 - 45 - 153 - 61 - - - - - - - - - - - - Date : - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 100 - 32 - - - - - 100 - 32 - - - - - - - border: 1px solid white - - - false - - - false - - - QAbstractSpinBox::NoButtons - - - QAbstractSpinBox::CorrectToNearestValue - - - true - - - - - - - - - - - - Semaine : 0 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 427 - 52 + 400 + 40 161 61 @@ -319,8 +240,8 @@ color: white; - 378 - 42 + 351 + 30 20 81 @@ -332,8 +253,8 @@ color: white; - 930 - 622 + 670 + 530 261 31 @@ -345,10 +266,10 @@ color: white; - 140 - 182 - 921 - 391 + 44 + 140 + 861 + 351 @@ -1616,21 +1537,21 @@ font-size: 22px; 20 - 610 - 44 - 44 + 530 + 24 + 24 - 44 - 44 + 24 + 24 - 44 - 44 + 24 + 24 @@ -1646,38 +1567,108 @@ font-size: 22px; true - + - 10 - -1 - 1081 - 41 + 0 + 0 + 946 + 21 - - TextLabel + + background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:1, y2:1, stop:0 rgba(204, 22, 0, 255), stop:1 rgba(217, 0, 112, 255)); + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 10 + -1 + 121 + 21 + + + + color: rgb(255, 255, 255); +font-size: 11px; +background: none; + + + TextLabel + + + + + + + 0 + 0 + 2 + 573 + + + + border: none; +background-color: rgba(204, 22, 0, 255); + + + Qt::Vertical + + + + + + 944 + 0 + 2 + 573 + + + + border: none; +background-color: rgba(217, 0, 112, 255); + + + Qt::Vertical + + + + + + 0 + 571 + 946 + 2 + + + + border: none; +background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:1, y2:1, stop:0 rgba(204, 22, 0, 255), stop:1 rgba(217, 0, 112, 255)); + + + Qt::Horizontal - 1156 + 904 0 - 51 - 31 + 41 + 21 Segoe MDL2 Assets - -1 - - border: none; -font-size: 14px; - @@ -1688,21 +1679,19 @@ font-size: 14px; - 1101 + 862 0 - 51 - 31 + 41 + 21 Segoe MDL2 Assets - -1 - border: none; -font-size: 14px; + @@ -1711,6 +1700,90 @@ font-size: 14px; true + + + + 790 + 40 + 111 + 54 + + + + + + + + 100 + 32 + + + + + 100 + 32 + + + + + + + border: none; + + + false + + + false + + + Qt::AlignCenter + + + false + + + QAbstractSpinBox::NoButtons + + + QAbstractSpinBox::CorrectToNearestValue + + + true + + + + + + + + + + Semaine : 0 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + titleBar + line + layoutWidget + layoutWidget + layoutWidget_2 + line_2 + template_settings_button + layoutWidget + aboutButton + window_border_left + window_border_right + window_border_bottom + closeButton + minimizeButton + dateEdit + label_semaine diff --git a/ui/setdaydialog.ui b/ui/setdaydialog.ui index 2d117db..51b3f46 100644 --- a/ui/setdaydialog.ui +++ b/ui/setdaydialog.ui @@ -10,19 +10,19 @@ 0 0 419 - 177 + 192 419 - 177 + 192 419 - 177 + 192 @@ -34,8 +34,8 @@ - 214 - 110 + 210 + 130 181 23 @@ -50,8 +50,8 @@ - 40 - 49 + 36 + 69 91 31 @@ -73,8 +73,8 @@ - 300 - 49 + 296 + 69 91 31 @@ -96,8 +96,8 @@ - 170 - 49 + 166 + 69 91 31 @@ -115,8 +115,8 @@ - 40 - 9 + 36 + 29 91 31 @@ -131,8 +131,8 @@ - 170 - 9 + 166 + 29 91 31 @@ -147,8 +147,8 @@ - 300 - 9 + 296 + 29 91 31 @@ -163,9 +163,9 @@ - 40 - 103 - 141 + 36 + 123 + 143 61 @@ -225,8 +225,8 @@ color: white; - 214 - 140 + 210 + 160 181 23 @@ -238,6 +238,115 @@ color: white; Définir l'horaire comme valide + + + + 0 + 0 + 419 + 21 + + + + background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:1, y2:1, stop:0 rgba(204, 22, 0, 255), stop:1 rgba(217, 0, 112, 255)); + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 10 + -1 + 281 + 21 + + + + color: rgb(255, 255, 255); +font-size: 11px; +background: none; + + + TextLabel + + + + + + + 377 + 0 + 41 + 21 + + + + + Segoe MDL2 Assets + + + + + + + true + + + + + + 0 + 0 + 2 + 192 + + + + border: none; +background-color: rgba(204, 22, 0, 255); + + + Qt::Vertical + + + + + + 0 + 190 + 419 + 2 + + + + border: none; +background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:1, y2:1, stop:0 rgba(204, 22, 0, 255), stop:1 rgba(217, 0, 112, 255)); + + + Qt::Horizontal + + + + + + 417 + 0 + 2 + 192 + + + + border: none; +background-color: rgba(217, 0, 112, 255); + + + Qt::Vertical + + @@ -257,5 +366,21 @@ color: white; + + closeButton + clicked() + SetDayDialog + close() + + + 397 + 10 + + + 209 + 95 + + + diff --git a/ui/welcome.ui b/ui/welcome.ui index 8fc5c2e..c51400e 100644 --- a/ui/welcome.ui +++ b/ui/welcome.ui @@ -42,8 +42,8 @@ - 30 - 20 + 25 + 37 261 201 @@ -304,8 +304,8 @@ - 300 - 60 + 295 + 77 201 103 @@ -347,6 +347,115 @@ color: white; + + + + 0 + 0 + 516 + 21 + + + + background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:1, y2:1, stop:0 rgba(204, 22, 0, 255), stop:1 rgba(217, 0, 112, 255)); + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 10 + -1 + 371 + 21 + + + + color: rgb(255, 255, 255); +font-size: 11px; +background: none; + + + TextLabel + + + + + + + 514 + 0 + 2 + 276 + + + + border: none; +background-color: rgba(217, 0, 112, 255); + + + Qt::Vertical + + + + + + 0 + 0 + 2 + 276 + + + + border: none; +background-color: rgba(204, 22, 0, 255); + + + Qt::Vertical + + + + + + 0 + 274 + 516 + 2 + + + + border: none; +background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:1, y2:1, stop:0 rgba(204, 22, 0, 255), stop:1 rgba(217, 0, 112, 255)); + + + Qt::Horizontal + + + + + + 473 + 0 + 41 + 21 + + + + + Segoe MDL2 Assets + + + + + + + true + + @@ -366,5 +475,21 @@ color: white; + + closeButton + clicked() + Welcome + close() + + + 493 + 10 + + + 257 + 137 + + +