diff --git a/UI/w_chooselist/chooselist.ui b/UI/w_chooselist/chooselist.ui
index b05668e..4593b06 100644
--- a/UI/w_chooselist/chooselist.ui
+++ b/UI/w_chooselist/chooselist.ui
@@ -72,11 +72,38 @@ QListWidget::item:focus {
Red
+
+
+
+ 255
+ 24
+ 105
+
+
+
-
Blue
+
+
+
+ 0
+ 0
+ 0
+
+
+
+
+
+
+ 97
+ 143
+ 229
+
+
+
-
@@ -87,6 +114,15 @@ QListWidget::item:focus {
Green
+
+
+
+ 153
+ 255
+ 75
+
+
+
diff --git a/UI/w_deck/NewCell/newcell.cpp b/UI/w_deck/NewCell/newcell.cpp
index eb1eba6..7620d8a 100644
--- a/UI/w_deck/NewCell/newcell.cpp
+++ b/UI/w_deck/NewCell/newcell.cpp
@@ -57,14 +57,27 @@ void NewCell::on_btn_color_clicked()
void NewCell::setColor(QString Color)
{
if (Color == "Black") {
- ui->label_cell_color->setStyleSheet("background-color: black");
+ ui->label_cell_color->setStyleSheet("background-color: rgb(0, 0, 0);"
+ "border: 2px solid rgb(156, 132, 192);"
+ "border-radius: 20px;");
} else if (Color == "Red") {
- ui->label_cell_color->setStyleSheet("background-color: red");
+ ui->label_cell_color->setStyleSheet("background-color: rgb(255, 24, 105);"
+ "border: 2px solid rgb(156, 132, 192);"
+ "border-radius: 20px;");
} else if (Color == "Green") {
- ui->label_cell_color->setStyleSheet("background-color: green");
+ ui->label_cell_color->setStyleSheet("background-color: rgb(153, 255, 75);"
+ "border: 2px solid rgb(156, 132, 192);"
+ "border-radius: 20px;");
} else if (Color == "Blue") {
- ui->label_cell_color->setStyleSheet("background-color: blue");
+ ui->label_cell_color->setStyleSheet("background-color: rgb(97, 143, 229);"
+ "border: 2px solid rgb(156, 132, 192);"
+ "border-radius: 20px;");
+ } else {
+ ui->label_cell_color->setStyleSheet("background-color: rgb(255, 255, 255);"
+ "border: 2px solid rgb(156, 132, 192);"
+ "border-radius: 20px;");
}
+
}
diff --git a/UI/w_deck/NewCell/newcell.ui b/UI/w_deck/NewCell/newcell.ui
index c3796ca..73ab0f0 100644
--- a/UI/w_deck/NewCell/newcell.ui
+++ b/UI/w_deck/NewCell/newcell.ui
@@ -7,22 +7,23 @@
0
0
272
- 550
+ 486
Form
- background-color: rgb(254, 200, 255);
+ background-color: rgb(254, 200, 255);
+color: rgb(0, 0, 0);
10
80
- 211
- 241
+ 251
+ 211
@@ -46,26 +47,83 @@ QTextEdit:focus {
-
+
+
+
+ 220
+ 20
+ 40
+ 40
+
+
+
+ QLabel {
+ border: 2px solid rgb(156, 132, 192);
+ border-radius: 20px;
+ color: rgb(255, 255, 255);
+ background-color: #FFF;
+ font: 600 11pt "Montserrat SemiBold";
+}
+
+
+
+
+
+
+
+
+
+
+
+
+ 11
+ 11
+ 201
+ 23
+
+
+
+ QLabel {
+ color: rgb(0, 0, 0);
+background-color: rgb(254, 200, 255);
+ font: 600 12pt "Montserrat SemiBold";
+}
+
+
+ CellName
+
+
+
+
+
+ 11
+ 44
+ 201
+ 23
+
+
+
+ QLabel {
+ color: rgb(0, 0, 0);
+background-color: rgb(254, 200, 255);
+ font: 600 12pt "Montserrat SemiBold";
+}
+
+
+ Coowner
+
+
+
10
- 330
+ 300
251
- 191
+ 27
-
-
- 1
-
-
- QLayout::SetFixedSize
-
- -
-
-
- QPushButton {
+
+ QPushButton {
border: 2px solid rgb(155, 144, 200);
border-radius: 8px;
padding-left: auto;
@@ -82,16 +140,22 @@ QPushButton:focus {
border: 2px solid rgb(109, 86, 154);
}
-
-
- Delete
-
-
-
- -
-
-
- QPushButton {
+
+
+ Delete
+
+
+
+
+
+ 10
+ 330
+ 251
+ 27
+
+
+
+ QPushButton {
border: 2px solid rgb(155, 144, 200);
border-radius: 8px;
padding-left: auto;
@@ -108,16 +172,22 @@ QPushButton:focus {
border: 2px solid rgb(109, 86, 154);
}
-
-
- Change Color
-
-
-
- -
-
-
- QPushButton {
+
+
+ Change Color
+
+
+
+
+
+ 10
+ 390
+ 249
+ 27
+
+
+
+ QPushButton {
border: 2px solid rgb(155, 144, 200);
border-radius: 8px;
padding-left: auto;
@@ -134,16 +204,22 @@ QPushButton:focus {
border: 2px solid rgb(109, 86, 154);
}
-
-
- Change Position
-
-
-
- -
-
-
- QPushButton {
+
+
+ Choose CoOwner
+
+
+
+
+
+ 10
+ 360
+ 251
+ 27
+
+
+
+ QPushButton {
border: 2px solid rgb(155, 144, 200);
border-radius: 8px;
padding-left: auto;
@@ -160,16 +236,22 @@ QPushButton:focus {
border: 2px solid rgb(109, 86, 154);
}
-
-
- Choose CoOwner
-
-
-
- -
-
-
- QPushButton {
+
+
+ Change Position
+
+
+
+
+
+ 10
+ 450
+ 251
+ 27
+
+
+
+ QPushButton {
border: 2px solid rgb(155, 144, 200);
border-radius: 8px;
padding-left: auto;
@@ -186,16 +268,22 @@ QPushButton:focus {
border: 2px solid rgb(109, 86, 154);
}
-
-
- Rename
-
-
-
- -
-
-
- QPushButton {
+
+
+ Save
+
+
+
+
+
+ 10
+ 420
+ 251
+ 27
+
+
+
+ QPushButton {
border: 2px solid rgb(155, 144, 200);
border-radius: 8px;
padding-left: auto;
@@ -212,82 +300,9 @@ QPushButton:focus {
border: 2px solid rgb(109, 86, 154);
}
-
-
- Save
-
-
-
-
- btn_color
- btn_coowner
- btn_position
- deleteButton
- btn_savetext
- btn_rename
-
-
-
-
- 10
- 10
- 211
- 61
-
-
-
- -
-
-
- QLabel {
- color: rgb(0, 0, 0);
- font: 600 12pt "Montserrat SemiBold";
-}
-
-
- CellName
-
-
-
- -
-
-
- QLabel {
- color: rgb(0, 0, 0);
- font: 600 12pt "Montserrat SemiBold";
-}
-
-
- Coowner
-
-
-
-
-
-
-
-
- 220
- 20
- 40
- 40
-
-
-
- QLabel {
- border: 2px solid rgb(156, 132, 192);
- border-radius: 20px;
- color: rgb(255, 255, 255);
- background-color: #FFF;
- font: 600 11pt "Montserrat SemiBold";
-}
-
-
-
-
-
+ Rename
diff --git a/UI/w_deck/NewTab/newtab.ui b/UI/w_deck/NewTab/newtab.ui
index 2f31729..03466d8 100644
--- a/UI/w_deck/NewTab/newtab.ui
+++ b/UI/w_deck/NewTab/newtab.ui
@@ -16,6 +16,7 @@
QWidget {
background-color: rgb(254, 200, 255);
+color: rgb(0, 0, 0);
}
diff --git a/UI/w_deck/deck.ui b/UI/w_deck/deck.ui
index d614b7e..df563df 100644
--- a/UI/w_deck/deck.ui
+++ b/UI/w_deck/deck.ui
@@ -24,7 +24,8 @@
:/res/windows.ico:/res/windows.ico
- background-color: rgb(254, 200, 255);
+ background-color: rgb(254, 200, 255);
+color: rgb(0, 0, 0);
@@ -47,7 +48,7 @@
color: rgb(0, 0, 0);
}
QTabWidget::pane {
- border: 1px solid dark;
+ border: 1px solid rgb(0, 0, 0);
top:-1px;
background: rgb(245, 245, 245);
}
@@ -55,12 +56,12 @@ QTabWidget::pane {
QTabBar::tab {
color: rgb(0, 0, 0);
background: rgb(142, 127, 165);
- border: 1px solid lightgray;
+ border: 1px solid rgb(0, 0, 0);
padding: 15px;
}
QTabBar::tab:selected {
- background: rgb(187, 159, 207);
+ background: rgb(254, 200, 255);
margin-bottom: -1px;
}
diff --git a/UI/w_login/loginwindow.ui b/UI/w_login/loginwindow.ui
index 19705b8..3199614 100644
--- a/UI/w_login/loginwindow.ui
+++ b/UI/w_login/loginwindow.ui
@@ -30,7 +30,8 @@
:/res/windows.ico:/res/windows.ico
- background-color: rgb(254, 200, 255);
+ background-color: rgb(254, 200, 255);
+color: rgb(0, 0, 0);
diff --git a/data/boards.json b/data/boards.json
index db5bdb8..80ce91f 100644
--- a/data/boards.json
+++ b/data/boards.json
@@ -31,7 +31,7 @@
"CardText": "LOREM IPSUM LOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUMLOREM IPSUM"
}
],
- "ColumnName": "FIRST"
+ "ColumnName": "jjj"
},
{
"Cards": [
@@ -57,7 +57,20 @@
"ColumnName": "SDFB"
},
{
- "Cards": null,
+ "Cards": [
+ {
+ "CardColor": "XXXXX",
+ "CardName": "CardName",
+ "CardOwners": [],
+ "CardText": "CellText"
+ },
+ {
+ "CardColor": "XXXXX",
+ "CardName": "CardName",
+ "CardOwners": [],
+ "CardText": "CellText"
+ }
+ ],
"ColumnName": "ABOB"
},
{
@@ -67,6 +80,24 @@
"CardName": "CardName",
"CardOwners": [],
"CardText": "NewNeWnEw"
+ },
+ {
+ "CardColor": "XXXXX",
+ "CardName": "CardName",
+ "CardOwners": [],
+ "CardText": "CellText"
+ },
+ {
+ "CardColor": "XXXXX",
+ "CardName": "CardName",
+ "CardOwners": [],
+ "CardText": "CellText"
+ },
+ {
+ "CardColor": "XXXXX",
+ "CardName": "CardName",
+ "CardOwners": [],
+ "CardText": "CellText"
}
],
"ColumnName": "3fd4gsdfg"
@@ -79,6 +110,60 @@
"1234"
],
"Type": "private"
+ },
+ {
+ "Columns": [
+ {
+ "Cards": [
+ {
+ "CardColor": "XXXXX",
+ "CardName": "CardName",
+ "CardOwners": [],
+ "CardText": "CellText"
+ },
+ {
+ "CardColor": "Red",
+ "CardName": "CardName",
+ "CardOwners": [],
+ "CardText": "CellText"
+ },
+ {
+ "CardColor": "XXXXX",
+ "CardName": "vcxvxcv",
+ "CardOwners": [],
+ "CardText": "CellText"
+ },
+ {
+ "CardColor": "XXXXX",
+ "CardName": "CardName",
+ "CardOwners": [],
+ "CardText": "CellText"
+ }
+ ],
+ "ColumnName": "erty"
+ },
+ {
+ "Cards": null,
+ "ColumnName": "NewColumn"
+ },
+ {
+ "Cards": null,
+ "ColumnName": "NewColumn"
+ },
+ {
+ "Cards": null,
+ "ColumnName": "NewColumn"
+ },
+ {
+ "Cards": null,
+ "ColumnName": "NewColumn"
+ }
+ ],
+ "Name": "456",
+ "Owners": [
+ "qwerty"
+ ],
+ "Type": "private"
}
]
}
diff --git a/data/users.json b/data/users.json
index 5a22ee4..d414fef 100644
--- a/data/users.json
+++ b/data/users.json
@@ -39,6 +39,10 @@
{
"Login": "1237777",
"Password": "1bobobosisi"
+ },
+ {
+ "Login": "qwerty",
+ "Password": "12345"
}
]
}
diff --git a/main.cpp b/main.cpp
index fb9ed43..dd33812 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,6 +38,46 @@ int main(int argc, char *argv[])
//Database::DeleteCardFromColumn("BIB", 0, 0);
QApplication a(argc, argv);
a.setStyle(QStyleFactory::create("Fusion"));
+ a.setStyleSheet("QMessageBox {"
+ "color: rgb(0, 0, 0);"
+ "font: 600 10pt Montserrat SemiBold;"
+ "}"
+ "QMainWindow {"
+ "color: rgb(0, 0, 0);"
+ "}"
+ "QTabWidget {"
+ "color: rgb(0, 0, 0);"
+ "}"
+ "QMessageBox QPushButton {"
+ "border: 2px solid rgb(155, 144, 200);"
+ "border-radius: 8px;"
+ "padding-left: auto;"
+ "padding-right: auto;"
+ "color: rgb(0, 0, 0);"
+ "font: 600 10pt Montserrat SemiBold;"
+ "}"
+ "QInputDialog {"
+ "color: rgb(0, 0, 0);"
+ "font: 600 10pt Montserrat SemiBold;"
+ "}"
+ "QInputDialog QPushButton {"
+ "border: 2px solid rgb(155, 144, 200);"
+ "border-radius: 8px;"
+ "padding-left: auto;"
+ "padding-right: auto;"
+ "color: rgb(0, 0, 0);"
+ "font: 600 10pt Montserrat SemiBold;"
+ "}"
+ "QInputDialog QLineEdit {"
+ "border: 2px solid rgb(156, 132, 192);"
+ "border-radius: 8px;"
+ "padding-left: auto;"
+ "padding-right: auto;"
+ "color: rgb(0, 0, 0);"
+ "background-color: rgb(27, 29, 35);"
+ "font: 600 10pt Montserrat SemiBold;"
+ "}"
+ );
LoginWindow w;
w.show();
return a.exec();