Skip to content

qerwqewr #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
notfounddd wants to merge 2 commits into
base: main
Choose a base branch
from
Open

qerwqewr #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c430b2
qerwqewr
notfounddd May 20, 2023
d0e4249
Merge branch 'main' into main
notfounddd May 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions UI/w_chooselist/chooselist.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,38 @@ QListWidget::item:focus {
<property name="text">
<string>Red</string>
</property>
<property name="foreground">
<brush brushstyle="NoBrush">
<color alpha="255">
<red>255</red>
<green>24</green>
<blue>105</blue>
</color>
</brush>
</property>
</item>
<item>
<property name="text">
<string>Blue</string>
</property>
<property name="background">
<brush brushstyle="NoBrush">
<color alpha="0">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</property>
<property name="foreground">
<brush brushstyle="NoBrush">
<color alpha="255">
<red>97</red>
<green>143</green>
<blue>229</blue>
</color>
</brush>
</property>
</item>
<item>
<property name="text">
Expand All @@ -87,6 +114,15 @@ QListWidget::item:focus {
<property name="text">
<string>Green</string>
</property>
<property name="foreground">
<brush brushstyle="NoBrush">
<color alpha="255">
<red>153</red>
<green>255</green>
<blue>75</blue>
</color>
</brush>
</property>
</item>
</widget>
<widget class="QPushButton" name="btn_choose">
Expand Down
21 changes: 17 additions & 4 deletions UI/w_deck/NewCell/newcell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;");
}

}


Expand Down
Loading