diff --git a/src/gui/src/settings/options-window.cpp b/src/gui/src/settings/options-window.cpp index 2331a4776..9f087ee87 100644 --- a/src/gui/src/settings/options-window.cpp +++ b/src/gui/src/settings/options-window.cpp @@ -448,6 +448,10 @@ OptionsWindow::OptionsWindow(Profile *profile, ThemeLoader *themeLoader, QWidget ui->lineColoringBlacklisteds->setFont(qFontFromString(settings->value("blacklisteds").toString())); ui->lineColoringIgnoreds->setFont(qFontFromString(settings->value("ignoreds").toString())); settings->endGroup(); + settings->beginGroup("Borders"); + ui->lineColoringFavoritesBorder->setText(settings->value("favorites", "#ffc0cb").toString()); + ui->lineColoringBlacklistedsBorder->setText(settings->value("blacklisteds", "#000000").toString()); + settings->endGroup(); settings->endGroup(); settings->beginGroup("Margins"); @@ -987,10 +991,14 @@ void OptionsWindow::on_lineColoringGenerals_textChanged() { setColor(ui->lineColoringGenerals); } void OptionsWindow::on_lineColoringFavorites_textChanged() { setColor(ui->lineColoringFavorites); } +void OptionsWindow::on_lineColoringFavoritesBorder_textChanged() +{ setColor(ui->lineColoringFavoritesBorder); } void OptionsWindow::on_lineColoringKeptForLater_textChanged() { setColor(ui->lineColoringKeptForLater); } void OptionsWindow::on_lineColoringBlacklisteds_textChanged() { setColor(ui->lineColoringBlacklisteds); } +void OptionsWindow::on_lineColoringBlacklistedsBorder_textChanged() +{ setColor(ui->lineColoringBlacklistedsBorder); } void OptionsWindow::on_lineColoringIgnoreds_textChanged() { setColor(ui->lineColoringIgnoreds); } void OptionsWindow::on_lineBorderColor_textChanged() @@ -1014,10 +1022,14 @@ void OptionsWindow::on_buttonColoringGeneralsColor_clicked() { setColor(ui->lineColoringGenerals, true); } void OptionsWindow::on_buttonColoringFavoritesColor_clicked() { setColor(ui->lineColoringFavorites, true); } +void OptionsWindow::on_buttonColoringFavoritesBorderColor_clicked() +{ setColor(ui->lineColoringFavoritesBorder, true); } void OptionsWindow::on_buttonColoringKeptForLaterColor_clicked() { setColor(ui->lineColoringKeptForLater, true); } void OptionsWindow::on_buttonColoringBlacklistedsColor_clicked() { setColor(ui->lineColoringBlacklisteds, true); } +void OptionsWindow::on_buttonColoringBlacklistedsBorderColor_clicked() +{ setColor(ui->lineColoringBlacklistedsBorder, true); } void OptionsWindow::on_buttonColoringIgnoredsColor_clicked() { setColor(ui->lineColoringIgnoreds, true); } void OptionsWindow::on_buttonBorderColor_clicked() @@ -1435,6 +1447,10 @@ void OptionsWindow::save() settings->setValue("blacklisteds", ui->lineColoringBlacklisteds->font().toString()); settings->setValue("ignoreds", ui->lineColoringIgnoreds->font().toString()); settings->endGroup(); + settings->beginGroup("Borders"); + settings->setValue("favorites", ui->lineColoringFavoritesBorder->text()); + settings->setValue("blacklisteds", ui->lineColoringBlacklistedsBorder->text()); + settings->endGroup(); settings->endGroup(); settings->beginGroup("Margins"); diff --git a/src/gui/src/settings/options-window.h b/src/gui/src/settings/options-window.h index a9d3a4aa8..637282e14 100644 --- a/src/gui/src/settings/options-window.h +++ b/src/gui/src/settings/options-window.h @@ -46,8 +46,10 @@ class OptionsWindow : public QDialog void on_lineColoringModels_textChanged(); void on_lineColoringGenerals_textChanged(); void on_lineColoringFavorites_textChanged(); + void on_lineColoringFavoritesBorder_textChanged(); void on_lineColoringKeptForLater_textChanged(); void on_lineColoringBlacklisteds_textChanged(); + void on_lineColoringBlacklistedsBorder_textChanged(); void on_lineColoringIgnoreds_textChanged(); void on_buttonColoringArtistsColor_clicked(); void on_buttonColoringCirclesColor_clicked(); @@ -58,8 +60,10 @@ class OptionsWindow : public QDialog void on_buttonColoringModelsColor_clicked(); void on_buttonColoringGeneralsColor_clicked(); void on_buttonColoringFavoritesColor_clicked(); + void on_buttonColoringFavoritesBorderColor_clicked(); void on_buttonColoringKeptForLaterColor_clicked(); void on_buttonColoringBlacklistedsColor_clicked(); + void on_buttonColoringBlacklistedsBorderColor_clicked(); void on_buttonColoringIgnoredsColor_clicked(); void on_buttonColoringArtistsFont_clicked(); void on_buttonColoringCirclesFont_clicked(); diff --git a/src/gui/src/settings/options-window.ui b/src/gui/src/settings/options-window.ui index 84c45a17e..c62f884ec 100644 --- a/src/gui/src/settings/options-window.ui +++ b/src/gui/src/settings/options-window.ui @@ -1981,7 +1981,7 @@ 0 0 - 323 + 474 682 @@ -2691,7 +2691,7 @@ 0 0 - 388 + 474 710 @@ -4141,7 +4141,7 @@ 0 0 - 235 + 474 840 @@ -4680,27 +4680,27 @@ - - + + - Models + Species - - + + - + - + Color - + Font @@ -4708,27 +4708,27 @@ - - + + - Generals + Metas - - + + - + - + Color - + Font @@ -4736,27 +4736,27 @@ - - + + - Favorites + Models - - + + - + - + Color - + Font @@ -4764,27 +4764,27 @@ - - + + - Blacklisted + Generals - - + + - + - + Color - + Font @@ -4792,55 +4792,87 @@ - - + + - Ignored + Favorites - - - - - - - + + + + - Color + Tags - - + + + + + + + + + Color + + + + + + + Font + + + + + + + - Font + Border + + + + + + + + + Color + + + + + - - + + - Species + Kept for later - - + + - + - + Color - + Font @@ -4848,55 +4880,87 @@ - - + + - Kept for later + Blacklisted - - - - - - - + + + + - Color + Tags - - + + - Font + Border + + + + + + + + + Color + + + + + + + Font + + + + + + + + + + + + + + Color + + + + + - - + + - Metas + Ignored - - + + - + - + Color - + Font @@ -4911,12 +4975,14 @@ labelColoringModels labelColoringGenerals labelColoringFavorites - labelColoringBlacklisteds labelColoringIgnoreds labelColoringCircles labelColoringSpecies labelColoringKeptForLater labelColoringMetas + formLayoutWidget + formLayoutWidget_2 + labelColoringBlacklisteds diff --git a/src/lib/src/models/image.cpp b/src/lib/src/models/image.cpp index ea9d31e4e..054d36b23 100644 --- a/src/lib/src/models/image.cpp +++ b/src/lib/src/models/image.cpp @@ -960,7 +960,7 @@ QColor Image::color() const // Blacklisted QStringList detected = m_profile->getBlacklist().match(tokens(m_profile)); if (!detected.isEmpty()) { - return { 0, 0, 0 }; + return QColor(m_settings->value("Coloring/Borders/blacklisteds", "#000000").toString()); } // Favorited (except for exact favorite search) @@ -969,7 +969,7 @@ QColor Image::color() const if (!m_parent->search().contains(tag.text())) { for (const Favorite &fav : favorites) { if (fav.getName() == tag.text()) { - return { 255, 192, 203 }; + return QColor(m_settings->value("Coloring/Borders/favorites", "#ffc0cb").toString()); } } }