mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2026-04-12 15:49:53 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Extract noLibrariesWidget theme and use themed line assets
Some checks failed
Build / Initialization (push) Has been cancelled
Details
Build / Code Format Validation (push) Has been cancelled
Details
Build / Linux (Qt6) (push) Has been cancelled
Details
Build / Linux (Qt6 + 7zip) (push) Has been cancelled
Details
Build / macOS (Qt6 Universal) (push) Has been cancelled
Details
Build / Windows x64 (Qt6) (push) Has been cancelled
Details
Build / Windows ARM64 (Qt6) (push) Has been cancelled
Details
Build / Docker amd64 Image (push) Has been cancelled
Details
Build / Docker arm64 Image (push) Has been cancelled
Details
Build / Publish Dev Builds (push) Has been cancelled
Details
Build / Publish Release (push) Has been cancelled
Details
Build / Publish YACReader10 Pre-release Builds (push) Has been cancelled
Details

Browse Source
This commit is contained in:
luisangelsm
2026-03-21 20:55:23 +01:00
parent f65fd08e65
commit 2560174a84
14 changed files with 228 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
YACReaderLibrary/themes/builtin_classic.json
View File

@ -39,9 +39,7 @@
},
"emptyContainer": {
"backgroundColor": "#2a2a2a",
"descriptionTextColor": "#aaaaaa",
"searchIconColor": "#4c4c4c",
"textColor": "#cccccc",
"iconColor": "#4c4c4c",
"titleTextColor": "#cccccc"
},
"gridAndInfoView": {
@ -97,6 +95,7 @@
"coversViewBackgroundColor": "#3a3a3a",
"currentComicTextColor": "#aaaaaa",
"descriptionTextColor": "#aaaaaa",
"glowLineColor": "#ffe100",
"iconCheckedColor": "#aaaaaa",
"iconColor": "#cccccc",
"modeIconColor": "#4a4a4a",
@ -179,6 +178,13 @@
"selectionBackgroundColor": "#2e2e2e",
"textColor": "#dddfdf"
},
"noLibrariesWidget": {
"backgroundColor": "#2a2a2a",
"descriptionTextColor": "#aaaaaa",
"iconColor": "#4c4c4c",
"noLibrariesLineColor": "#a8a8a8",
"textColor": "#cccccc"
},
"readingListIcons": {
"currentlyReadingMainColor": "#ffcc00",
"currentlyReadingMainSelectedColor": "#ffcc00",

12
YACReaderLibrary/themes/builtin_dark.json
View File

@ -39,9 +39,7 @@
},
"emptyContainer": {
"backgroundColor": "#2a2a2a",
"descriptionTextColor": "#aaaaaa",
"searchIconColor": "#4c4c4c",
"textColor": "#cccccc",
"iconColor": "#4c4c4c",
"titleTextColor": "#cccccc"
},
"gridAndInfoView": {
@ -97,6 +95,7 @@
"coversViewBackgroundColor": "#3a3a3a",
"currentComicTextColor": "#aaaaaa",
"descriptionTextColor": "#aaaaaa",
"glowLineColor": "#ffe100",
"iconCheckedColor": "#aaaaaa",
"iconColor": "#cccccc",
"modeIconColor": "#4a4a4a",
@ -179,6 +178,13 @@
"selectionBackgroundColor": "#2e2e2e",
"textColor": "#dddfdf"
},
"noLibrariesWidget": {
"backgroundColor": "#2a2a2a",
"descriptionTextColor": "#aaaaaa",
"iconColor": "#4c4c4c",
"noLibrariesLineColor": "#a8a8a8",
"textColor": "#cccccc"
},
"readingListIcons": {
"currentlyReadingMainColor": "#ffcc00",
"currentlyReadingMainSelectedColor": "#ffcc00",

12
YACReaderLibrary/themes/builtin_light.json
View File

@ -39,9 +39,7 @@
},
"emptyContainer": {
"backgroundColor": "#ffffff",
"descriptionTextColor": "#565959",
"searchIconColor": "#cccccc",
"textColor": "#495252",
"iconColor": "#cccccc",
"titleTextColor": "#888888"
},
"gridAndInfoView": {
@ -97,6 +95,7 @@
"coversViewBackgroundColor": "#e6e6e6",
"currentComicTextColor": "#565959",
"descriptionTextColor": "#565959",
"glowLineColor": "#ffe100",
"iconCheckedColor": "#565959",
"iconColor": "#495252",
"modeIconColor": "#e6e6e6",
@ -179,6 +178,13 @@
"selectionBackgroundColor": "#333133",
"textColor": "#000000"
},
"noLibrariesWidget": {
"backgroundColor": "#ffffff",
"descriptionTextColor": "#565959",
"iconColor": "#cccccc",
"noLibrariesLineColor": "#a8a8a8",
"textColor": "#495252"
},
"readingListIcons": {
"currentlyReadingMainColor": "#ffcc00",
"currentlyReadingMainSelectedColor": "#ffcc00",

15
YACReaderLibrary/themes/theme.h
View File

@ -122,11 +122,6 @@ struct EmptyContainerTheme {
QColor backgroundColor;
QString titleLabelQSS;
// For NoLibrariesWidget
QColor textColor;
QColor descriptionTextColor;
QPixmap noLibrariesIcon;
// Search-related icons (themed from search_result.svg)
QPixmap searchingIcon; // For ClassicComicsView searching state
QPixmap noSearchResultsIcon; // For NoSearchResultsWidget empty state
@ -139,6 +134,14 @@ struct EmptyContainerTheme {
QMap<int, QPixmap> emptyLabelIcons; // Keyed by YACReader::LabelColors enum value
};
struct NoLibrariesWidgetTheme {
QColor backgroundColor; // Background of the widget
QColor textColor; // Main title text color
QColor descriptionTextColor; // Description text color
QPixmap noLibrariesIcon; // Icon displayed in the widget
QPixmap noLibrariesLinePixmap; // Themed horizontal line separator
};
struct SidebarTheme {
QColor backgroundColor;
QColor separatorColor;
@ -172,6 +175,7 @@ struct ImportWidgetTheme {
QPixmap importingIcon;
QPixmap updatingIcon;
QIcon coversToggleIcon;
QPixmap glowLinePixmap; // Themed glow line animation
};
struct NavigationTreeThemeTemplates {
@ -491,6 +495,7 @@ struct Theme {
HelpAboutDialogTheme helpAboutDialog;
WhatsNewDialogTheme whatsNewDialog;
EmptyContainerTheme emptyContainer;
NoLibrariesWidgetTheme noLibrariesWidget;
SidebarTheme sidebar;
SidebarIconsTheme sidebarIcons;
LibraryItemTheme libraryItem;

62
YACReaderLibrary/themes/theme_factory.cpp
View File

@ -60,11 +60,15 @@ struct EmptyContainerParams {
QColor backgroundColor;
QColor titleTextColor;
// For NoLibrariesWidget
QColor iconColor;
};
struct NoLibrariesWidgetParams {
QColor backgroundColor;
QColor textColor;
QColor descriptionTextColor;
QColor searchIconColor; // Color for search-related icons (replaces #f0f in search_result.svg)
QColor iconColor;
QColor noLibrariesLineColor;
};
struct SidebarParams {
@ -94,6 +98,7 @@ struct ImportWidgetParams {
QColor modeIconColor;
QColor iconColor;
QColor iconCheckedColor;
QColor glowLineColor;
};
struct NavigationTreeParams {
@ -345,6 +350,7 @@ struct ThemeParams {
MetadataScraperDialogParams metadataScraperDialogParams;
HelpAboutDialogTheme helpAboutDialogParams;
EmptyContainerParams emptyContainerParams;
NoLibrariesWidgetParams noLibrariesWidgetParams;
SidebarParams sidebarParams;
SidebarIconsParams sidebarIconsParams;
LibraryItemParams libraryItemParams;
@ -457,21 +463,19 @@ Theme makeTheme(const ThemeParams &params)
theme.emptyContainer.backgroundColor = ec.backgroundColor;
theme.emptyContainer.titleLabelQSS = ect.titleLabelQSS.arg(ec.titleTextColor.name());
theme.emptyContainer.textColor = ec.textColor;
theme.emptyContainer.descriptionTextColor = ec.descriptionTextColor;
theme.emptyContainer.noLibrariesIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/noLibrariesIcon.svg", ec.searchIconColor, params.meta.id), 165, 160, qApp->devicePixelRatio());
{
const qreal dpr = qApp->devicePixelRatio();
theme.emptyContainer.searchingIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/search_result.svg", ec.searchIconColor, params.meta.id, { .suffix = "_searching" }), 97, dpr);
theme.emptyContainer.noSearchResultsIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/search_result.svg", ec.searchIconColor, params.meta.id, { .suffix = "_no_results" }), 239, dpr);
const auto &rli = params.readingListIconsParams;
theme.emptyContainer.emptyFolderIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/empty_container/empty_folder.svg", ec.searchIconColor, params.meta.id), 319, 243, dpr);
theme.emptyContainer.emptyFavoritesIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/empty_container/empty_favorites.svg", QColor(0xe84853), params.meta.id), 238, 223, dpr);
theme.emptyContainer.emptyCurrentReadingsIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/empty_container/empty_current_readings.svg", ec.searchIconColor, params.meta.id), 167, 214, dpr);
theme.emptyContainer.emptyReadingListIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/empty_container/empty_reading_list.svg", ec.searchIconColor, params.meta.id), 248, 187, dpr);
theme.emptyContainer.searchingIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/search_result.svg", ec.iconColor, params.meta.id, { .suffix = "_searching" }), 97, dpr);
theme.emptyContainer.noSearchResultsIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/search_result.svg", ec.iconColor, params.meta.id, { .suffix = "_no_results" }), 239, dpr);
theme.emptyContainer.emptyFolderIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/empty_container/empty_folder.svg", ec.iconColor, params.meta.id), 319, 243, dpr);
theme.emptyContainer.emptyFavoritesIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/empty_container/empty_favorites.svg", rli.favoritesMainColor, params.meta.id), 238, 223, dpr);
theme.emptyContainer.emptyCurrentReadingsIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/empty_container/empty_current_readings.svg", ec.iconColor, params.meta.id), 167, 214, dpr);
theme.emptyContainer.emptyReadingListIcon = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/empty_container/empty_reading_list.svg", ec.iconColor, params.meta.id), 248, 187, dpr);
// Generate empty label icons for each label color
const auto &rli = params.readingListIconsParams;
for (int c = YACReader::YRed; c <= YACReader::YDark; ++c) {
auto labelColor = static_cast<YACReader::LabelColors>(c);
auto colorName = YACReader::colorToName(labelColor);
@ -484,6 +488,21 @@ Theme makeTheme(const ThemeParams &params)
}
// end EmptyContainer
// NoLibrariesWidget
const auto &nlw = params.noLibrariesWidgetParams;
const qreal dprNLW = qApp->devicePixelRatio();
theme.noLibrariesWidget.backgroundColor = nlw.backgroundColor;
theme.noLibrariesWidget.textColor = nlw.textColor;
theme.noLibrariesWidget.descriptionTextColor = nlw.descriptionTextColor;
theme.noLibrariesWidget.noLibrariesIcon = renderSvgToPixmap(
recoloredSvgToThemeFile(":/images/noLibrariesIcon.svg", nlw.iconColor, params.meta.id),
165, 160, dprNLW);
theme.noLibrariesWidget.noLibrariesLinePixmap = renderSvgToPixmap(
recoloredSvgToThemeFile(":/images/noLibrariesLine.svg", nlw.noLibrariesLineColor, params.meta.id),
579, 1, dprNLW);
// end NoLibrariesWidget
// Sidebar
const auto &sb = params.sidebarParams;
theme.sidebar.backgroundColor = sb.backgroundColor;
@ -508,6 +527,8 @@ Theme makeTheme(const ThemeParams &params)
theme.importWidget.bottomCoversDecoration = QPixmap(recoloredSvgToThemeFile(":/images/import/importBottomCoversDecoration.svg", iw.coversDecorationBgColor, iw.coversDecorationShadowColor, params.meta.id));
theme.importWidget.importingIcon = QPixmap(recoloredSvgToThemeFile(":/images/import/importingIcon.svg", iw.modeIconColor, params.meta.id));
theme.importWidget.updatingIcon = QPixmap(recoloredSvgToThemeFile(":/images/import/updatingIcon.svg", iw.modeIconColor, params.meta.id));
// glowLine: 579x5 glow line animation
theme.importWidget.glowLinePixmap = renderSvgToPixmap(recoloredSvgToThemeFile(":/images/glowLine.svg", iw.glowLineColor, params.meta.id), 579, 5, qApp->devicePixelRatio());
{
QIcon coversToggle;
const QString normalPath = recoloredSvgToThemeFile(":/images/import/coversToggle.svg", iw.iconColor, params.meta.id);
@ -1005,9 +1026,17 @@ Theme makeTheme(const QJsonObject &json)
auto &ec = p.emptyContainerParams;
ec.backgroundColor = colorFromJson(o, "backgroundColor", ec.backgroundColor);
ec.titleTextColor = colorFromJson(o, "titleTextColor", ec.titleTextColor);
ec.textColor = colorFromJson(o, "textColor", ec.textColor);
ec.descriptionTextColor = colorFromJson(o, "descriptionTextColor", ec.descriptionTextColor);
ec.searchIconColor = colorFromJson(o, "searchIconColor", ec.searchIconColor);
ec.iconColor = colorFromJson(o, "iconColor", ec.iconColor);
}
if (json.contains("noLibrariesWidget")) {
const auto o = json["noLibrariesWidget"].toObject();
auto &nlw = p.noLibrariesWidgetParams;
nlw.backgroundColor = colorFromJson(o, "backgroundColor", nlw.backgroundColor);
nlw.textColor = colorFromJson(o, "textColor", nlw.textColor);
nlw.descriptionTextColor = colorFromJson(o, "descriptionTextColor", nlw.descriptionTextColor);
nlw.iconColor = colorFromJson(o, "iconColor", nlw.iconColor);
nlw.noLibrariesLineColor = colorFromJson(o, "noLibrariesLineColor", nlw.noLibrariesLineColor);
}
if (json.contains("sidebar")) {
@ -1058,6 +1087,7 @@ Theme makeTheme(const QJsonObject &json)
iw.modeIconColor = colorFromJson(o, "modeIconColor", iw.modeIconColor);
iw.iconColor = colorFromJson(o, "iconColor", iw.iconColor);
iw.iconCheckedColor = colorFromJson(o, "iconCheckedColor", iw.iconCheckedColor);
iw.glowLineColor = colorFromJson(o, "glowLineColor", iw.glowLineColor);
}
if (json.contains("serverConfigDialog")) {