fix some styling

This commit is contained in:
Crylia
2024-06-24 22:51:15 +02:00
parent b98c1a5765
commit 5ec9f4a913
3 changed files with 137 additions and 104 deletions

3
.gitignore vendored
View File

@@ -53,4 +53,5 @@ compile_commands.json
*_qmlcache.qrc *_qmlcache.qrc
build/ build
debug

View File

@@ -1,8 +1,7 @@
# include "EinsatzplanFrame.hpp" # include "EinsatzplanFrame.hpp"
EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin) EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
:QFrame(parent) :QFrame(parent) {
{
setFrameStyle(QFrame::Box); setFrameStyle(QFrame::Box);
setObjectName("einsatzplanFrame"); setObjectName("einsatzplanFrame");
setStyleSheet(R"( setStyleSheet(R"(
@@ -97,6 +96,7 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
background-color: #DCFF78; background-color: #DCFF78;
color: #212121;
border-radius: 10px; border-radius: 10px;
} }
#createMember:pressed{ #createMember:pressed{
@@ -114,6 +114,7 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
background-color: #DCFF78; background-color: #DCFF78;
color: #212121;
border-radius: 10px; border-radius: 10px;
} }
#deleteMember:pressed{ #deleteMember:pressed{
@@ -131,6 +132,7 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
background-color: #DCFF78; background-color: #DCFF78;
color: #212121;
border-radius: 10px; border-radius: 10px;
} }
#createVeranstaltung:pressed{ #createVeranstaltung:pressed{
@@ -148,6 +150,7 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
background-color: #DCFF78; background-color: #DCFF78;
color: #212121;
border-radius: 10px; border-radius: 10px;
} }
#deleteVeranstaltung:pressed{ #deleteVeranstaltung:pressed{

View File

@@ -1,8 +1,7 @@
# include "PlanGrid.hpp" # include "PlanGrid.hpp"
PlanGrid::PlanGrid(QWidget* parent) PlanGrid::PlanGrid(QWidget* parent)
:QWidget(parent) :QWidget(parent) {
{
setObjectName("PlanGrid"); setObjectName("PlanGrid");
setStyleSheet(R"( setStyleSheet(R"(
QWidget{ QWidget{
@@ -43,7 +42,7 @@ PlanGrid::PlanGrid(QWidget* parent)
} }
)"); )");
temp->setFixedSize(250,40); temp->setFixedSize(240, 40);
planMap->insert(qMakePair(weekdays[i], times[j]), temp); planMap->insert(qMakePair(weekdays[i], times[j]), temp);
} }
} }
@@ -58,13 +57,24 @@ PlanGrid::PlanGrid(QWidget* parent)
border-top-left-radius: 10px; border-top-left-radius: 10px;
} }
)"); )");
temp->setFixedSize(140,80); temp->setFixedSize(130, 80);
gridLayout->addWidget(temp, 0, 0); gridLayout->addWidget(temp, 0, 0);
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
QLabel* temp = new QLabel(weekdays[i]); QLabel* temp = new QLabel(weekdays[i]);
temp->setFixedSize(250,80); temp->setFixedSize(240, 80);
temp->setObjectName("temp"); temp->setObjectName("temp");
if (i == 4) {
temp->setStyleSheet(R"(
#temp{
font-size: 24px;
font-weight: bold;
border-top-right-radius: 10px;
color: #d8d8d8;
}
)");
} else {
temp->setStyleSheet(R"( temp->setStyleSheet(R"(
#temp{ #temp{
font-size: 24px; font-size: 24px;
@@ -72,13 +82,25 @@ PlanGrid::PlanGrid(QWidget* parent)
color: #d8d8d8; color: #d8d8d8;
} }
)"); )");
gridLayout->addWidget(temp, 0, i+1,Qt::AlignCenter); }
temp->setAlignment(Qt::AlignCenter);
gridLayout->addWidget(temp, 0, i + 1);
} }
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
QLabel* temp = new QLabel(times[i]); QLabel* temp = new QLabel(times[i]);
temp->setFixedSize(140,40); temp->setFixedSize(130, 40);
temp->setObjectName("temp"); temp->setObjectName("temp");
if (i == 9) {
temp->setStyleSheet(R"(
#temp{
font-size: 16px;
font-weight: bold;
border-bottom-left-radius: 10px;
color: #d8d8d8;
}
)");
} else {
temp->setStyleSheet(R"( temp->setStyleSheet(R"(
#temp{ #temp{
font-size: 16px; font-size: 16px;
@@ -86,7 +108,9 @@ PlanGrid::PlanGrid(QWidget* parent)
color: #d8d8d8; color: #d8d8d8;
} }
)"); )");
gridLayout->addWidget(temp, i+1, 0, Qt::AlignCenter); }
temp->setAlignment(Qt::AlignRight);
gridLayout->addWidget(temp, i + 1, 0);
} }
gridLayout->setSpacing(0); gridLayout->setSpacing(0);
@@ -97,6 +121,11 @@ void PlanGrid::populateGrid(){
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
for (int j = 0; j < 10; ++j) { for (int j = 0; j < 10; ++j) {
gridLayout->addWidget(planMap->value(qMakePair(weekdays[i], times[j])), j + 1, i + 1); gridLayout->addWidget(planMap->value(qMakePair(weekdays[i], times[j])), j + 1, i + 1);
if (i == 4 && j == 9) {
(planMap->value(qMakePair(weekdays[i], times[j])))->setStyleSheet(R"(
border-bottom-right-radius:10px;
)");
}
} }
} }
} }