Skip to content

Commit 24d0577

Browse files
committed
save custom color config
1 parent 2078b0a commit 24d0577

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

data/tr.org.pardus.pen.default.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
[General]
22
version=1
33
color="#3498DB"
4+
color1="#0078d7"
5+
color2="#00ae4d"
6+
color3="#ffc000"
7+
color4="#ff0000"
48
history=50
59
pen-size=3
610
eraser-size=100

src/SetupWidgets.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ void setupWidgets(){
144144
floatingWidget->addWidget(toolButtons[NEXT]);
145145
floatingWidget->addWidget(toolButtons[PAGEMENU]);
146146
floatingWidget->addWidget(closeButton);
147-
floatingWidget->addWidget(create_color_button(QColor("#0078d7"), false));
148-
floatingWidget->addWidget(create_color_button(QColor("#00ae4d"), false));
149-
floatingWidget->addWidget(create_color_button(QColor("#ffc000"), false));
150-
floatingWidget->addWidget(create_color_button(QColor("#ff0000"), false));
147+
floatingWidget->addWidget(create_color_button(QColor(get_string("color1")), false, "color1"));
148+
floatingWidget->addWidget(create_color_button(QColor(get_string("color2")), false, "color2"));
149+
floatingWidget->addWidget(create_color_button(QColor(get_string("color3")), false, "color3"));
150+
floatingWidget->addWidget(create_color_button(QColor(get_string("color4")), false, "color4"));
151151
// disable minify if fual enabled
152152
toolButtons[MINIFY]->setEnabled(!get_bool("fuar"));
153153

@@ -306,7 +306,7 @@ void setupWidgets(){
306306

307307
// Color button offset is 100
308308
for (int i = 0; i < num_of_color; i++) {
309-
toolButtons[i+100] = create_color_button(colors[i], true);
309+
toolButtons[i+100] = create_color_button(colors[i], true, "");
310310
gridLayout->addWidget(toolButtons[i+100], (i+1) / rowsize, (i+1) % rowsize, Qt::AlignCenter);
311311
}
312312
colorDialog->setLayout(gridLayout);

src/widgets/Button.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ QPushButton* create_button(int id, ButtonEvent event) {
4343
button->setStyleSheet(QString("background-color: none;"));
4444
return button;
4545
}
46-
QPushButton* create_color_button(QColor fcolor, bool read_only){
46+
QPushButton* create_color_button(QColor fcolor, bool read_only, const char* name){
4747
QPushButton* button = new QPushButton();
4848
button->setFixedSize(butsize, butsize);
4949
QColor color = fcolor;
@@ -55,19 +55,23 @@ QPushButton* create_color_button(QColor fcolor, bool read_only){
5555

5656
QObject::connect(button, &QPushButton::pressed, [=]() mutable {
5757
time = get_epoch();
58-
printf("%ld %ld\n", get_epoch(), time);
5958
});
6059

6160
QObject::connect(button, &QPushButton::released, [=]() mutable {
6261
size_t diff = get_epoch() - time;
6362
if(diff > 500000 && ! read_only){
6463
QColor newColor = QColorDialog::getColor(drawing->penColor, NULL, _("Select Color"));
6564
if(newColor.isValid()) {
65+
if(strlen(name) > 0){
66+
set_string(name, newColor.name());
67+
}
6668
color = newColor;
6769
button->setStyleSheet(QString(
6870
"background-color: "+color.name()+";"
6971
"border-radius: 12px;"
7072
));
73+
} else {
74+
color = QColor(get_string(name));
7175
}
7276
}
7377
drawing->penColor = color;

src/widgets/Button.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ typedef std::function<void()> ButtonEvent;
1212

1313
QPushButton* create_button(int id, ButtonEvent event);
1414
QPushButton* create_button_text(const char* icon, ButtonEvent event);
15-
QPushButton* create_color_button(QColor color, bool read_only);
15+
QPushButton* create_color_button(QColor color, bool read_only, const char* name);
1616

1717
void set_icon(const char* name, QPushButton* button);
1818
void set_icon_combined(const char* name, const char* subname, QPushButton * button);

0 commit comments

Comments
 (0)