thelilfrog/Chronos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

New interface theme, new icon

Browse Source
This commit is contained in:
Alexis Delhaie
2020-10-02 21:29:14 +02:00
parent 4308d9e93a
commit 08dcecbee9
15 changed files with 849 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sources/aboutbox.cpp
View File

@@ -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);
}

11
sources/aboutbox.h
View File

@@ -2,6 +2,7 @@
#define ABOUTBOX_H
#include <QDialog>
#include <QMouseEvent>
#include <iostream>
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

10
sources/mainwindow.cpp
View File

@@ -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: {

1
sources/mainwindow.h
View File

@@ -21,6 +21,7 @@
#include <QTimer>
#include <QProcess>
#include <QDir>
#include <QtWinExtras/QtWin>
#include "week.h"
#include "welcome.h"

26
sources/setdaydialog.cpp
View File

@@ -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);

11
sources/setdaydialog.h
View File

@@ -2,6 +2,7 @@
#define SETDAYDIALOG_H
#include <QDialog>
#include <QMouseEvent>
#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

26
sources/welcome.cpp
View File

@@ -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);

11
sources/welcome.h
View File

@@ -3,6 +3,7 @@
#include <QDialog>
#include <QDoubleSpinBox>
#include <QMouseEvent>
#include <math.h>
#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();
};