fix some styling
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -53,4 +53,5 @@ compile_commands.json
|
|||||||
|
|
||||||
*_qmlcache.qrc
|
*_qmlcache.qrc
|
||||||
|
|
||||||
build/
|
build
|
||||||
|
debug
|
||||||
|
|||||||
@@ -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"(
|
||||||
@@ -14,29 +13,29 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
|
|||||||
|
|
||||||
|
|
||||||
profileImg_m = new QLabel(this);
|
profileImg_m = new QLabel(this);
|
||||||
profileImg_m->setFixedSize(60,60);
|
profileImg_m->setFixedSize(60, 60);
|
||||||
profileImg_m->setObjectName("profileImg");
|
profileImg_m->setObjectName("profileImg");
|
||||||
profileImg_m->setStyleSheet(R"(
|
profileImg_m->setStyleSheet(R"(
|
||||||
#profileImg{
|
#profileImg{
|
||||||
background-color: #000000;
|
background-color: #000000;
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
profileImg_m->show();
|
profileImg_m->show( );
|
||||||
|
|
||||||
|
|
||||||
id_m = new QLabel(id,this);
|
id_m = new QLabel(id, this);
|
||||||
id_m->setFixedSize(122,80);
|
id_m->setFixedSize(122, 80);
|
||||||
id_m->setObjectName("id");
|
id_m->setObjectName("id");
|
||||||
id_m->setStyleSheet(R"(
|
id_m->setStyleSheet(R"(
|
||||||
#id{
|
#id{
|
||||||
|
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
id_m->show();
|
id_m->show( );
|
||||||
|
|
||||||
|
|
||||||
abmeldenButton_m = new QPushButton("Abmelden",this);
|
abmeldenButton_m = new QPushButton("Abmelden", this);
|
||||||
abmeldenButton_m->setFixedSize(150,50);
|
abmeldenButton_m->setFixedSize(150, 50);
|
||||||
abmeldenButton_m->setObjectName("abmeldenButton");
|
abmeldenButton_m->setObjectName("abmeldenButton");
|
||||||
abmeldenButton_m->setStyleSheet(R"(
|
abmeldenButton_m->setStyleSheet(R"(
|
||||||
#abmeldenButton{
|
#abmeldenButton{
|
||||||
@@ -50,25 +49,25 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
|
|||||||
background-color: #D0793A;
|
background-color: #D0793A;
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
abmeldenButton_m->show();
|
abmeldenButton_m->show( );
|
||||||
|
|
||||||
|
|
||||||
einsatzplanLabel_m = new QLabel("Einsatzplan",this);
|
einsatzplanLabel_m = new QLabel("Einsatzplan", this);
|
||||||
einsatzplanLabel_m->setFixedSize(645,80);
|
einsatzplanLabel_m->setFixedSize(645, 80);
|
||||||
einsatzplanLabel_m->setObjectName("einsatzplanLabel");
|
einsatzplanLabel_m->setObjectName("einsatzplanLabel");
|
||||||
einsatzplanLabel_m->setStyleSheet(R"(
|
einsatzplanLabel_m->setStyleSheet(R"(
|
||||||
#einsatzplanLabel{
|
#einsatzplanLabel{
|
||||||
|
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
einsatzplanLabel_m->show();
|
einsatzplanLabel_m->show( );
|
||||||
|
|
||||||
|
|
||||||
planGrid_m = new PlanGrid(this);
|
planGrid_m = new PlanGrid(this);
|
||||||
planGrid_m->show();
|
planGrid_m->show( );
|
||||||
|
|
||||||
QVBoxLayout* totalLayout = new QVBoxLayout(this);
|
QVBoxLayout* totalLayout = new QVBoxLayout(this);
|
||||||
totalLayout->setContentsMargins(30,20,30,20);
|
totalLayout->setContentsMargins(30, 20, 30, 20);
|
||||||
|
|
||||||
QHBoxLayout* topLayout = new QHBoxLayout(this);
|
QHBoxLayout* topLayout = new QHBoxLayout(this);
|
||||||
topLayout->addWidget(profileImg_m, 1, Qt::AlignLeft);
|
topLayout->addWidget(profileImg_m, 1, Qt::AlignLeft);
|
||||||
@@ -83,85 +82,89 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
|
|||||||
|
|
||||||
|
|
||||||
totalLayout->addLayout(topLayout);
|
totalLayout->addLayout(topLayout);
|
||||||
totalLayout->addLayout(bottomLayout,2);
|
totalLayout->addLayout(bottomLayout, 2);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (admin){
|
if (admin) {
|
||||||
|
|
||||||
createMemberButton_m = new QPushButton("Mitarbeiter\nHinzufügen",this);
|
createMemberButton_m = new QPushButton("Mitarbeiter\nHinzufügen", this);
|
||||||
createMemberButton_m->setFixedSize(200,50);
|
createMemberButton_m->setFixedSize(200, 50);
|
||||||
createMemberButton_m->setObjectName("createMember");
|
createMemberButton_m->setObjectName("createMember");
|
||||||
createMemberButton_m->setStyleSheet(R"(
|
createMemberButton_m->setStyleSheet(R"(
|
||||||
#createMember{
|
#createMember{
|
||||||
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{
|
||||||
background-color: #CCEF68;
|
background-color: #CCEF68;
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
createMemberButton_m->show();
|
createMemberButton_m->show( );
|
||||||
|
|
||||||
|
|
||||||
deleteMemberButton_m = new QPushButton("Mitarbeiter\nEntfernen",this);
|
deleteMemberButton_m = new QPushButton("Mitarbeiter\nEntfernen", this);
|
||||||
deleteMemberButton_m->setFixedSize(200,50);
|
deleteMemberButton_m->setFixedSize(200, 50);
|
||||||
deleteMemberButton_m->setObjectName("deleteMember");
|
deleteMemberButton_m->setObjectName("deleteMember");
|
||||||
deleteMemberButton_m->setStyleSheet(R"(
|
deleteMemberButton_m->setStyleSheet(R"(
|
||||||
#deleteMember{
|
#deleteMember{
|
||||||
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{
|
||||||
background-color: #CCEF68;
|
background-color: #CCEF68;
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
deleteMemberButton_m->show();
|
deleteMemberButton_m->show( );
|
||||||
|
|
||||||
|
|
||||||
createVeranstaltungButton_m = new QPushButton("Veranstaltung\nHinzufügen",this);
|
createVeranstaltungButton_m = new QPushButton("Veranstaltung\nHinzufügen", this);
|
||||||
createVeranstaltungButton_m->setFixedSize(200,50);
|
createVeranstaltungButton_m->setFixedSize(200, 50);
|
||||||
createVeranstaltungButton_m->setObjectName("createVeranstaltung");
|
createVeranstaltungButton_m->setObjectName("createVeranstaltung");
|
||||||
createVeranstaltungButton_m->setStyleSheet(R"(
|
createVeranstaltungButton_m->setStyleSheet(R"(
|
||||||
#createVeranstaltung{
|
#createVeranstaltung{
|
||||||
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{
|
||||||
background-color: #CCEF68;
|
background-color: #CCEF68;
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
createVeranstaltungButton_m->show();
|
createVeranstaltungButton_m->show( );
|
||||||
|
|
||||||
|
|
||||||
deleteVeranstaltungButton_m = new QPushButton("Veranstaltung\nEntfernen",this);
|
deleteVeranstaltungButton_m = new QPushButton("Veranstaltung\nEntfernen", this);
|
||||||
deleteVeranstaltungButton_m->setFixedSize(200,50);
|
deleteVeranstaltungButton_m->setFixedSize(200, 50);
|
||||||
deleteVeranstaltungButton_m->setObjectName("deleteVeranstaltung");
|
deleteVeranstaltungButton_m->setObjectName("deleteVeranstaltung");
|
||||||
deleteVeranstaltungButton_m->setStyleSheet(R"(
|
deleteVeranstaltungButton_m->setStyleSheet(R"(
|
||||||
#deleteVeranstaltung{
|
#deleteVeranstaltung{
|
||||||
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{
|
||||||
background-color: #CCEF68;
|
background-color: #CCEF68;
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
deleteVeranstaltungButton_m->show();
|
deleteVeranstaltungButton_m->show( );
|
||||||
|
|
||||||
QHBoxLayout* adminLayout = new QHBoxLayout(this);
|
QHBoxLayout* adminLayout = new QHBoxLayout(this);
|
||||||
adminLayout->addWidget(createMemberButton_m, 1, Qt::AlignLeft);
|
adminLayout->addWidget(createMemberButton_m, 1, Qt::AlignLeft);
|
||||||
adminLayout->addWidget(deleteMemberButton_m,1 , Qt::AlignLeft);
|
adminLayout->addWidget(deleteMemberButton_m, 1, Qt::AlignLeft);
|
||||||
adminLayout->addStretch(1);
|
adminLayout->addStretch(1);
|
||||||
adminLayout->addWidget(createVeranstaltungButton_m,1 , Qt::AlignRight);
|
adminLayout->addWidget(createVeranstaltungButton_m, 1, Qt::AlignRight);
|
||||||
adminLayout->addWidget(deleteVeranstaltungButton_m,1 , Qt::AlignRight);
|
adminLayout->addWidget(deleteVeranstaltungButton_m, 1, Qt::AlignRight);
|
||||||
|
|
||||||
totalLayout->addLayout(adminLayout);
|
totalLayout->addLayout(adminLayout);
|
||||||
|
|
||||||
|
|||||||
@@ -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{
|
||||||
@@ -36,35 +35,46 @@ PlanGrid::PlanGrid(QWidget* parent)
|
|||||||
|
|
||||||
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) {
|
||||||
QLabel* temp = new QLabel();
|
QLabel* temp = new QLabel( );
|
||||||
temp->setObjectName("temp");
|
temp->setObjectName("temp");
|
||||||
temp->setStyleSheet(R"(
|
temp->setStyleSheet(R"(
|
||||||
#temp{
|
#temp{
|
||||||
|
|
||||||
}
|
}
|
||||||
)");
|
)");
|
||||||
temp->setFixedSize(250,40);
|
temp->setFixedSize(240, 40);
|
||||||
planMap->insert(qMakePair(weekdays[i], times[j]), temp);
|
planMap->insert(qMakePair(weekdays[i], times[j]), temp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
populateGrid();
|
populateGrid( );
|
||||||
|
|
||||||
|
|
||||||
QLabel* temp = new QLabel();
|
QLabel* temp = new QLabel( );
|
||||||
temp->setObjectName("temp");
|
temp->setObjectName("temp");
|
||||||
temp->setStyleSheet(R"(
|
temp->setStyleSheet(R"(
|
||||||
#temp{
|
#temp{
|
||||||
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,17 +108,24 @@ 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);
|
||||||
setLayout(gridLayout);
|
setLayout(gridLayout);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlanGrid::populateGrid(){
|
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;
|
||||||
|
)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user