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

Better naming in some of the theme properties used in qml

Browse Source
This commit is contained in:
luisangelsm
2026-03-07 22:21:18 +01:00
parent 7103d0de3c
commit 27b59ad8a9
11 changed files with 156 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
YACReaderLibrary/themes/builtin_classic.json
View File

@ -45,42 +45,42 @@
"backgroundBlurOverlayColor": "#2a2a2a",
"backgroundColor": "#2a2a2a",
"borderColor": "#121212",
"buttonColor": "#ffcc00",
"buttonShadowColor": "#aa000000",
"buttonTextColor": "#ffffff",
"cellColor": "#212121",
"cellColorWithBackground": "#99212121",
"cellSelectedBorderColor": "#ffcc00",
"cellSelectedColor": "#121212",
"comicCoverBorderColor": "#30ffffff",
"continueReadingBackgroundColor": "#88000000",
"continueReadingColor": "#ffffff",
"continueReadingTextColor": "#ffffff",
"currentComicBackgroundColor": "#88000000",
"currentComicCoverShadowColor": "#ff000000",
"favCheckedColor": "#e84852",
"favUncheckedColor": "#1c1c1c",
"folderCoverBorderColor": "#20ffffff",
"infoBackgroundColor": "#2e2e2e",
"infoBorderColor": "#404040",
"infoMetadataTextColor": "#b0b0b0",
"infoScrollbarColor": "#ff424246",
"infoShadowColor": "#000000",
"infoTextColor": "#b0b0b0",
"infoTitleColor": "#ffffff",
"infoTextColor": "#ffffff",
"itemDetailsColor": "#a8a8a8",
"itemTitleColor": "#ffffff",
"linkColor": "#ffcc00",
"newItemColor": "#ffffcc00",
"placeholderFolder1BorderColor": "#20ffffff",
"placeholderFolder1Color": "#20000000",
"placeholderFolder2BorderColor": "#20ffffff",
"placeholderFolder2Color": "#88000000",
"ratingSelectedColor": "#ffffff",
"ratingUnselectedColor": "#1c1c1c",
"readTickCheckedColor": "#e84852",
"readTickUncheckedColor": "#1c1c1c",
"selectedBorderColor": "#ffcc00",
"selectedColor": "#121212",
"showDropShadow": true,
"textColor": "#a8a8a8",
"titleColor": "#ffffff",
"newItemColor": "#ffffcc00",
"buttonColor": "#ffcc00",
"buttonTextColor": "#ffffff",
"linkColor": "#ffcc00",
"scrollbarColor": "#88424242",
"scrollbarBorderColor": "#aa313131",
"infoScrollbarColor": "#ff424246",
"comicCoverBorderColor": "#30ffffff",
"folderCoverBorderColor": "#20ffffff",
"placeholderFolder1Color": "#20000000",
"placeholderFolder1BorderColor": "#20ffffff",
"placeholderFolder2Color": "#88000000",
"placeholderFolder2BorderColor": "#20ffffff",
"currentComicCoverShadowColor": "#ff000000",
"buttonShadowColor": "#aa000000"
"scrollbarColor": "#88424242",
"showDropShadow": true
},
"helpAboutDialog": {
"headingColor": "#302f2d",
@ -166,10 +166,10 @@
"folderIconSelectedColor": "#e0e0e0",
"folderIconSelectedShadowColor": "#000000",
"folderIconShadowColor": "#000000",
"newItemColor": "#edc518",
"folderNotCompletedColor": "#edc518",
"folderReadOverlayColor": "#464646",
"folderReadOverlaySelectedColor": "#464646",
"newItemColor": "#edc518",
"scrollBackgroundColor": "#404040",
"scrollHandleColor": "#dddddd",
"selectedTextColor": "#ffffff",

46
YACReaderLibrary/themes/builtin_dark.json
View File

@ -45,42 +45,42 @@
"backgroundBlurOverlayColor": "#2a2a2a",
"backgroundColor": "#2a2a2a",
"borderColor": "#121212",
"buttonColor": "#ffcc00",
"buttonShadowColor": "#aa000000",
"buttonTextColor": "#ffffff",
"cellColor": "#212121",
"cellColorWithBackground": "#99212121",
"cellSelectedBorderColor": "#ffcc00",
"cellSelectedColor": "#121212",
"comicCoverBorderColor": "#30ffffff",
"continueReadingBackgroundColor": "#88000000",
"continueReadingColor": "#ffffff",
"continueReadingTextColor": "#ffffff",
"currentComicBackgroundColor": "#55000000",
"currentComicCoverShadowColor": "#ff000000",
"favCheckedColor": "#e84852",
"favUncheckedColor": "#1c1c1c",
"folderCoverBorderColor": "#20ffffff",
"infoBackgroundColor": "#2e2e2e",
"infoBorderColor": "#404040",
"infoMetadataTextColor": "#b0b0b0",
"infoScrollbarColor": "#ff424246",
"infoShadowColor": "#000000",
"infoTextColor": "#b0b0b0",
"infoTitleColor": "#ffffff",
"infoTextColor": "#ffffff",
"itemDetailsColor": "#a8a8a8",
"itemTitleColor": "#ffffff",
"linkColor": "#ffcc00",
"newItemColor": "#ffffcc00",
"placeholderFolder1BorderColor": "#20ffffff",
"placeholderFolder1Color": "#20000000",
"placeholderFolder2BorderColor": "#20ffffff",
"placeholderFolder2Color": "#88000000",
"ratingSelectedColor": "#ffffff",
"ratingUnselectedColor": "#1c1c1c",
"readTickCheckedColor": "#e84852",
"readTickUncheckedColor": "#1c1c1c",
"selectedBorderColor": "#ffcc00",
"selectedColor": "#121212",
"showDropShadow": true,
"textColor": "#a8a8a8",
"titleColor": "#ffffff",
"newItemColor": "#ffffcc00",
"buttonColor": "#ffcc00",
"buttonTextColor": "#ffffff",
"linkColor": "#ffcc00",
"scrollbarColor": "#88424242",
"scrollbarBorderColor": "#aa313131",
"infoScrollbarColor": "#ff424246",
"comicCoverBorderColor": "#30ffffff",
"folderCoverBorderColor": "#20ffffff",
"placeholderFolder1Color": "#20000000",
"placeholderFolder1BorderColor": "#20ffffff",
"placeholderFolder2Color": "#88000000",
"placeholderFolder2BorderColor": "#20ffffff",
"currentComicCoverShadowColor": "#ff000000",
"buttonShadowColor": "#aa000000"
"scrollbarColor": "#88424242",
"showDropShadow": true
},
"helpAboutDialog": {
"headingColor": "#e0e0e0",
@ -166,10 +166,10 @@
"folderIconSelectedColor": "#e0e0e0",
"folderIconSelectedShadowColor": "#000000",
"folderIconShadowColor": "#000000",
"newItemColor": "#edc518",
"folderNotCompletedColor": "#edc518",
"folderReadOverlayColor": "#222222",
"folderReadOverlaySelectedColor": "#222222",
"newItemColor": "#edc518",
"scrollBackgroundColor": "#404040",
"scrollHandleColor": "#dddddd",
"selectedTextColor": "#ffffff",

46
YACReaderLibrary/themes/builtin_light.json
View File

@ -45,42 +45,42 @@
"backgroundBlurOverlayColor": "#9e9e9e",
"backgroundColor": "#f6f6f6",
"borderColor": "#dbdbdb",
"buttonColor": "#ffcc00",
"buttonShadowColor": "#aa000000",
"buttonTextColor": "#ffffff",
"cellColor": "#ffffff",
"cellColorWithBackground": "#99ffffff",
"cellSelectedBorderColor": "#ffcc00",
"cellSelectedColor": "#ffffff",
"comicCoverBorderColor": "#30ffffff",
"continueReadingBackgroundColor": "#e8e8e8",
"continueReadingColor": "#000000",
"continueReadingTextColor": "#000000",
"currentComicBackgroundColor": "#88ffffff",
"currentComicCoverShadowColor": "#ff000000",
"favCheckedColor": "#e84852",
"favUncheckedColor": "#dedede",
"folderCoverBorderColor": "#20ffffff",
"infoBackgroundColor": "#ffffff",
"infoBorderColor": "#808080",
"infoMetadataTextColor": "#404040",
"infoScrollbarColor": "#ff424246",
"infoShadowColor": "#444444",
"infoTextColor": "#404040",
"infoTitleColor": "#2e2e2e",
"infoTextColor": "#2e2e2e",
"itemDetailsColor": "#636363",
"itemTitleColor": "#121212",
"linkColor": "#ffcc00",
"newItemColor": "#ffffcc00",
"placeholderFolder1BorderColor": "#20ffffff",
"placeholderFolder1Color": "#20000000",
"placeholderFolder2BorderColor": "#20ffffff",
"placeholderFolder2Color": "#88000000",
"ratingSelectedColor": "#2b2b2b",
"ratingUnselectedColor": "#dedede",
"readTickCheckedColor": "#e84852",
"readTickUncheckedColor": "#dedede",
"selectedBorderColor": "#ffcc00",
"selectedColor": "#ffffff",
"showDropShadow": true,
"textColor": "#636363",
"titleColor": "#121212",
"newItemColor": "#ffffcc00",
"buttonColor": "#ffcc00",
"buttonTextColor": "#ffffff",
"linkColor": "#ffcc00",
"scrollbarColor": "#88424242",
"scrollbarBorderColor": "#aa313131",
"infoScrollbarColor": "#ff424246",
"comicCoverBorderColor": "#30ffffff",
"folderCoverBorderColor": "#20ffffff",
"placeholderFolder1Color": "#20000000",
"placeholderFolder1BorderColor": "#20ffffff",
"placeholderFolder2Color": "#88000000",
"placeholderFolder2BorderColor": "#20ffffff",
"currentComicCoverShadowColor": "#ff000000",
"buttonShadowColor": "#aa000000"
"scrollbarColor": "#88424242",
"showDropShadow": true
},
"helpAboutDialog": {
"headingColor": "#302f2d",
@ -166,10 +166,10 @@
"folderIconSelectedColor": "#ffffff",
"folderIconSelectedShadowColor": "#161616",
"folderIconShadowColor": "#ffffff",
"newItemColor": "#555f7f",
"folderNotCompletedColor": "#555f7f",
"folderReadOverlayColor": "#ffffff",
"folderReadOverlaySelectedColor": "#161616",
"newItemColor": "#555f7f",
"scrollBackgroundColor": "#e0e0e0",
"scrollHandleColor": "#888888",
"selectedTextColor": "#ffffff",

12
YACReaderLibrary/themes/theme.h
View File

@ -215,11 +215,11 @@ struct GridAndInfoViewTheme {
QColor backgroundColor;
QColor cellColor;
QColor cellColorWithBackground;
QColor selectedColor;
QColor selectedBorderColor;
QColor cellSelectedColor;
QColor cellSelectedBorderColor;
QColor borderColor;
QColor titleColor;
QColor textColor;
QColor itemTitleColor;
QColor itemDetailsColor;
bool showDropShadow;
// Info panel colors
@ -227,8 +227,8 @@ struct GridAndInfoViewTheme {
QString topShadow; // Recolored SVG path
QString infoShadow; // Recolored SVG path
QString infoIndicator; // Recolored SVG path
QColor infoMetadataTextColor;
QColor infoTextColor;
QColor infoTitleColor;
// Rating and favorite colors
QColor ratingUnselectedColor;
@ -243,7 +243,7 @@ struct GridAndInfoViewTheme {
// Continue reading section (FolderContentView)
QColor continueReadingBackgroundColor;
QColor continueReadingColor;
QColor continueReadingTextColor;
// Blur overlay background (FlowView always, GridView when background image enabled)
QColor backgroundBlurOverlayColor;

36
YACReaderLibrary/themes/theme_factory.cpp
View File

@ -143,19 +143,19 @@ struct GridAndInfoViewParams {
QColor backgroundColor;
QColor cellColor;
QColor cellColorWithBackground;
QColor selectedColor;
QColor selectedBorderColor;
QColor cellSelectedColor;
QColor cellSelectedBorderColor;
QColor borderColor;
QColor titleColor;
QColor textColor;
QColor itemTitleColor;
QColor itemDetailsColor;
bool showDropShadow;
// Info panel colors
QColor infoBackgroundColor;
QColor infoBorderColor;
QColor infoShadowColor;
QColor infoMetadataTextColor;
QColor infoTextColor;
QColor infoTitleColor;
// Rating and favorite colors
QColor ratingUnselectedColor;
@ -170,7 +170,7 @@ struct GridAndInfoViewParams {
// Continue reading section (FolderContentView)
QColor continueReadingBackgroundColor;
QColor continueReadingColor;
QColor continueReadingTextColor;
// Blur overlay background (FlowView always, GridView when background image enabled)
QColor backgroundBlurOverlayColor;
@ -520,18 +520,18 @@ Theme makeTheme(const ThemeParams &params)
theme.gridAndInfoView.backgroundColor = giv.backgroundColor;
theme.gridAndInfoView.cellColor = giv.cellColor;
theme.gridAndInfoView.cellColorWithBackground = giv.cellColorWithBackground;
theme.gridAndInfoView.selectedColor = giv.selectedColor;
theme.gridAndInfoView.selectedBorderColor = giv.selectedBorderColor;
theme.gridAndInfoView.cellSelectedColor = giv.cellSelectedColor;
theme.gridAndInfoView.cellSelectedBorderColor = giv.cellSelectedBorderColor;
theme.gridAndInfoView.borderColor = giv.borderColor;
theme.gridAndInfoView.titleColor = giv.titleColor;
theme.gridAndInfoView.textColor = giv.textColor;
theme.gridAndInfoView.itemTitleColor = giv.itemTitleColor;
theme.gridAndInfoView.itemDetailsColor = giv.itemDetailsColor;
theme.gridAndInfoView.showDropShadow = giv.showDropShadow;
theme.gridAndInfoView.infoBackgroundColor = giv.infoBackgroundColor;
theme.gridAndInfoView.topShadow = recoloredSvgToThemeFile(":/qml/info-top-shadow.svg", giv.infoBackgroundColor, giv.infoBorderColor, giv.infoShadowColor, params.meta.id);
theme.gridAndInfoView.infoShadow = recoloredSvgToThemeFile(":/qml/info-shadow.svg", giv.infoBackgroundColor, giv.infoBorderColor, giv.infoShadowColor, params.meta.id);
theme.gridAndInfoView.infoIndicator = recoloredSvgToThemeFile(":/qml/info-indicator.svg", giv.infoBackgroundColor, giv.infoBorderColor, giv.infoShadowColor, params.meta.id);
theme.gridAndInfoView.infoMetadataTextColor = giv.infoMetadataTextColor;
theme.gridAndInfoView.infoTextColor = giv.infoTextColor;
theme.gridAndInfoView.infoTitleColor = giv.infoTitleColor;
theme.gridAndInfoView.ratingUnselectedColor = giv.ratingUnselectedColor;
theme.gridAndInfoView.ratingSelectedColor = giv.ratingSelectedColor;
theme.gridAndInfoView.favUncheckedColor = giv.favUncheckedColor;
@ -540,7 +540,7 @@ Theme makeTheme(const ThemeParams &params)
theme.gridAndInfoView.readTickCheckedColor = giv.readTickCheckedColor;
theme.gridAndInfoView.currentComicBackgroundColor = giv.currentComicBackgroundColor;
theme.gridAndInfoView.continueReadingBackgroundColor = giv.continueReadingBackgroundColor;
theme.gridAndInfoView.continueReadingColor = giv.continueReadingColor;
theme.gridAndInfoView.continueReadingTextColor = giv.continueReadingTextColor;
theme.gridAndInfoView.backgroundBlurOverlayColor = giv.backgroundBlurOverlayColor;
theme.gridAndInfoView.newItemColor = giv.newItemColor;
theme.gridAndInfoView.buttonColor = giv.buttonColor;
@ -1114,18 +1114,18 @@ Theme makeTheme(const QJsonObject &json)
giv.backgroundColor = colorFromJson(o, "backgroundColor", giv.backgroundColor);
giv.cellColor = colorFromJson(o, "cellColor", giv.cellColor);
giv.cellColorWithBackground = colorFromJson(o, "cellColorWithBackground", giv.cellColorWithBackground);
giv.selectedColor = colorFromJson(o, "selectedColor", giv.selectedColor);
giv.selectedBorderColor = colorFromJson(o, "selectedBorderColor", giv.selectedBorderColor);
giv.cellSelectedColor = colorFromJson(o, "cellSelectedColor", giv.cellSelectedColor);
giv.cellSelectedBorderColor = colorFromJson(o, "cellSelectedBorderColor", giv.cellSelectedBorderColor);
giv.borderColor = colorFromJson(o, "borderColor", giv.borderColor);
giv.titleColor = colorFromJson(o, "titleColor", giv.titleColor);
giv.textColor = colorFromJson(o, "textColor", giv.textColor);
giv.itemTitleColor = colorFromJson(o, "itemTitleColor", giv.itemTitleColor);
giv.itemDetailsColor = colorFromJson(o, "itemDetailsColor", giv.itemDetailsColor);
if (o.contains("showDropShadow"))
giv.showDropShadow = o["showDropShadow"].toBool(giv.showDropShadow);
giv.infoBackgroundColor = colorFromJson(o, "infoBackgroundColor", giv.infoBackgroundColor);
giv.infoBorderColor = colorFromJson(o, "infoBorderColor", giv.infoBorderColor);
giv.infoShadowColor = colorFromJson(o, "infoShadowColor", giv.infoShadowColor);
giv.infoMetadataTextColor = colorFromJson(o, "infoMetadataTextColor", giv.infoMetadataTextColor);
giv.infoTextColor = colorFromJson(o, "infoTextColor", giv.infoTextColor);
giv.infoTitleColor = colorFromJson(o, "infoTitleColor", giv.infoTitleColor);
giv.ratingUnselectedColor = colorFromJson(o, "ratingUnselectedColor", giv.ratingUnselectedColor);
giv.ratingSelectedColor = colorFromJson(o, "ratingSelectedColor", giv.ratingSelectedColor);
giv.favUncheckedColor = colorFromJson(o, "favUncheckedColor", giv.favUncheckedColor);
@ -1134,7 +1134,7 @@ Theme makeTheme(const QJsonObject &json)
giv.readTickCheckedColor = colorFromJson(o, "readTickCheckedColor", giv.readTickCheckedColor);
giv.currentComicBackgroundColor = colorFromJson(o, "currentComicBackgroundColor", giv.currentComicBackgroundColor);
giv.continueReadingBackgroundColor = colorFromJson(o, "continueReadingBackgroundColor", giv.continueReadingBackgroundColor);
giv.continueReadingColor = colorFromJson(o, "continueReadingColor", giv.continueReadingColor);
giv.continueReadingTextColor = colorFromJson(o, "continueReadingTextColor", giv.continueReadingTextColor);
giv.backgroundBlurOverlayColor = colorFromJson(o, "backgroundBlurOverlayColor", giv.backgroundBlurOverlayColor);
giv.newItemColor = colorFromJson(o, "newItemColor", giv.newItemColor);
giv.buttonColor = colorFromJson(o, "buttonColor", giv.buttonColor);