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

Normalize color strings so they are always upper case for better readability of the theme files and the values in the editor

Browse Source
This commit is contained in:
luisangelsm
2026-03-22 12:13:07 +01:00
parent 2560174a84
commit 0affbded6e
11 changed files with 587 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
YACReader/themes/builtin_classic.json
View File

@ -5,19 +5,19 @@
"goToFlowWidget": { "goToFlowWidget": {
"editBackgroundColor": "#55000000", "editBackgroundColor": "#55000000",
"editBorderColor": "#77000000", "editBorderColor": "#77000000",
"editTextColor": "#ffffff", "editTextColor": "#FFFFFF",
"flowBackgroundColor": "#282828", "flowBackgroundColor": "#282828",
"flowTextColor": "#ffffff", "flowTextColor": "#FFFFFF",
"iconColor": "#ffffff", "iconColor": "#FFFFFF",
"labelTextColor": "#ffffff", "labelTextColor": "#FFFFFF",
"sliderBorderColor": "#22ffffff", "sliderBorderColor": "#22FFFFFF",
"sliderGrooveColor": "#77000000", "sliderGrooveColor": "#77000000",
"sliderHandleColor": "#55ffffff", "sliderHandleColor": "#55FFFFFF",
"toolbarBackgroundColor": "#99000000" "toolbarBackgroundColor": "#99000000"
}, },
"helpAboutDialog": { "helpAboutDialog": {
"headingColor": "#302f2d", "headingColor": "#302F2D",
"linkColor": "#c19441" "linkColor": "#C19441"
}, },
"meta": { "meta": {
"displayName": "Default Classic", "displayName": "Default Classic",
@ -32,36 +32,36 @@
"translator": { "translator": {
"backgroundColor": "#404040", "backgroundColor": "#404040",
"borderColor": "#212121", "borderColor": "#212121",
"iconColor": "#cccccc", "iconColor": "#CCCCCC",
"inputBackgroundColor": "#2a2a2a", "inputBackgroundColor": "#2A2A2A",
"inputDarkerBackgroundColor": "#272727", "inputDarkerBackgroundColor": "#272727",
"primaryTextColor": "#ffffff", "primaryTextColor": "#FFFFFF",
"scrollbarHandleColor": "#dddddd", "scrollbarHandleColor": "#DDDDDD",
"secondaryTextColor": "#e3e3e3", "secondaryTextColor": "#E3E3E3",
"selectionBackgroundColor": "#202020" "selectionBackgroundColor": "#202020"
}, },
"toolbar": { "toolbar": {
"backgroundColor": "#f3f3f3", "backgroundColor": "#F3F3F3",
"checkedButtonColor": "#cccccc", "checkedButtonColor": "#CCCCCC",
"iconCheckedColor": "#5a5a5a", "iconCheckedColor": "#5A5A5A",
"iconColor": "#404040", "iconColor": "#404040",
"iconDisabledColor": "#858585", "iconDisabledColor": "#858585",
"menuIndicatorColor": "#404040", "menuIndicatorColor": "#404040",
"separatorColor": "#cccccc" "separatorColor": "#CCCCCC"
}, },
"viewer": { "viewer": {
"defaultBackgroundColor": "#282828", "defaultBackgroundColor": "#282828",
"defaultTextColor": "#ffffff", "defaultTextColor": "#FFFFFF",
"infoBackgroundColor": "#bb000000", "infoBackgroundColor": "#BB000000",
"infoTextColor": "#ffffff" "infoTextColor": "#FFFFFF"
}, },
"whatsNewDialog": { "whatsNewDialog": {
"backgroundColor": "#ffffff", "backgroundColor": "#FFFFFF",
"closeButtonColor": "#444444", "closeButtonColor": "#444444",
"contentTextColor": "#0a0a0a", "contentTextColor": "#0A0A0A",
"headerDecorationColor": "#e8b800", "headerDecorationColor": "#E8B800",
"headerTextColor": "#0a0a0a", "headerTextColor": "#0A0A0A",
"linkColor": "#e8b800", "linkColor": "#E8B800",
"versionTextColor": "#858585" "versionTextColor": "#858585"
} }
} }

56
YACReader/themes/builtin_dark.json
View File

@ -1,23 +1,23 @@
{ {
"dialogIcons": { "dialogIcons": {
"iconColor": "#cccccc" "iconColor": "#CCCCCC"
}, },
"goToFlowWidget": { "goToFlowWidget": {
"editBackgroundColor": "#55000000", "editBackgroundColor": "#55000000",
"editBorderColor": "#77000000", "editBorderColor": "#77000000",
"editTextColor": "#ffffff", "editTextColor": "#FFFFFF",
"flowBackgroundColor": "#282828", "flowBackgroundColor": "#282828",
"flowTextColor": "#ffffff", "flowTextColor": "#FFFFFF",
"iconColor": "#cccccc", "iconColor": "#CCCCCC",
"labelTextColor": "#ffffff", "labelTextColor": "#FFFFFF",
"sliderBorderColor": "#22ffffff", "sliderBorderColor": "#22FFFFFF",
"sliderGrooveColor": "#77000000", "sliderGrooveColor": "#77000000",
"sliderHandleColor": "#55ffffff", "sliderHandleColor": "#55FFFFFF",
"toolbarBackgroundColor": "#99000000" "toolbarBackgroundColor": "#99000000"
}, },
"helpAboutDialog": { "helpAboutDialog": {
"headingColor": "#e0e0e0", "headingColor": "#E0E0E0",
"linkColor": "#d4a84b" "linkColor": "#D4A84B"
}, },
"meta": { "meta": {
"displayName": "Default Dark", "displayName": "Default Dark",
@ -27,41 +27,41 @@
"version": "10.0.0" "version": "10.0.0"
}, },
"shortcutsIcons": { "shortcutsIcons": {
"iconColor": "#d0d0d0" "iconColor": "#D0D0D0"
}, },
"translator": { "translator": {
"backgroundColor": "#404040", "backgroundColor": "#404040",
"borderColor": "#212121", "borderColor": "#212121",
"iconColor": "#cccccc", "iconColor": "#CCCCCC",
"inputBackgroundColor": "#2a2a2a", "inputBackgroundColor": "#2A2A2A",
"inputDarkerBackgroundColor": "#272727", "inputDarkerBackgroundColor": "#272727",
"primaryTextColor": "#ffffff", "primaryTextColor": "#FFFFFF",
"scrollbarHandleColor": "#dddddd", "scrollbarHandleColor": "#DDDDDD",
"secondaryTextColor": "#e3e3e3", "secondaryTextColor": "#E3E3E3",
"selectionBackgroundColor": "#202020" "selectionBackgroundColor": "#202020"
}, },
"toolbar": { "toolbar": {
"backgroundColor": "#202020", "backgroundColor": "#202020",
"checkedButtonColor": "#3a3a3a", "checkedButtonColor": "#3A3A3A",
"iconCheckedColor": "#dadada", "iconCheckedColor": "#DADADA",
"iconColor": "#cccccc", "iconColor": "#CCCCCC",
"iconDisabledColor": "#444444", "iconDisabledColor": "#444444",
"menuIndicatorColor": "#cccccc", "menuIndicatorColor": "#CCCCCC",
"separatorColor": "#444444" "separatorColor": "#444444"
}, },
"viewer": { "viewer": {
"defaultBackgroundColor": "#282828", "defaultBackgroundColor": "#282828",
"defaultTextColor": "#ffffff", "defaultTextColor": "#FFFFFF",
"infoBackgroundColor": "#bb000000", "infoBackgroundColor": "#BB000000",
"infoTextColor": "#b0b0b0" "infoTextColor": "#B0B0B0"
}, },
"whatsNewDialog": { "whatsNewDialog": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"closeButtonColor": "#dddddd", "closeButtonColor": "#DDDDDD",
"contentTextColor": "#e0e0e0", "contentTextColor": "#E0E0E0",
"headerDecorationColor": "#e8b800", "headerDecorationColor": "#E8B800",
"headerTextColor": "#e0e0e0", "headerTextColor": "#E0E0E0",
"linkColor": "#e8b800", "linkColor": "#E8B800",
"versionTextColor": "#858585" "versionTextColor": "#858585"
} }
} }

46
YACReader/themes/builtin_light.json
View File

@ -6,18 +6,18 @@
"editBackgroundColor": "#22000000", "editBackgroundColor": "#22000000",
"editBorderColor": "#33000000", "editBorderColor": "#33000000",
"editTextColor": "#202020", "editTextColor": "#202020",
"flowBackgroundColor": "#f6f6f6", "flowBackgroundColor": "#F6F6F6",
"flowTextColor": "#202020", "flowTextColor": "#202020",
"iconColor": "#404040", "iconColor": "#404040",
"labelTextColor": "#202020", "labelTextColor": "#202020",
"sliderBorderColor": "#22000000", "sliderBorderColor": "#22000000",
"sliderGrooveColor": "#33000000", "sliderGrooveColor": "#33000000",
"sliderHandleColor": "#55000000", "sliderHandleColor": "#55000000",
"toolbarBackgroundColor": "#bbffffff" "toolbarBackgroundColor": "#BBFFFFFF"
}, },
"helpAboutDialog": { "helpAboutDialog": {
"headingColor": "#302f2d", "headingColor": "#302F2D",
"linkColor": "#c19441" "linkColor": "#C19441"
}, },
"meta": { "meta": {
"displayName": "Default Light", "displayName": "Default Light",
@ -30,38 +30,38 @@
"iconColor": "#606060" "iconColor": "#606060"
}, },
"translator": { "translator": {
"backgroundColor": "#e8e8e8", "backgroundColor": "#E8E8E8",
"borderColor": "#cccccc", "borderColor": "#CCCCCC",
"iconColor": "#404040", "iconColor": "#404040",
"inputBackgroundColor": "#f5f5f5", "inputBackgroundColor": "#F5F5F5",
"inputDarkerBackgroundColor": "#ebebeb", "inputDarkerBackgroundColor": "#EBEBEB",
"primaryTextColor": "#1a1a1a", "primaryTextColor": "#1A1A1A",
"scrollbarHandleColor": "#909090", "scrollbarHandleColor": "#909090",
"secondaryTextColor": "#2a2a2a", "secondaryTextColor": "#2A2A2A",
"selectionBackgroundColor": "#dcdcdc" "selectionBackgroundColor": "#DCDCDC"
}, },
"toolbar": { "toolbar": {
"backgroundColor": "#f3f3f3", "backgroundColor": "#F3F3F3",
"checkedButtonColor": "#cccccc", "checkedButtonColor": "#CCCCCC",
"iconCheckedColor": "#5a5a5a", "iconCheckedColor": "#5A5A5A",
"iconColor": "#404040", "iconColor": "#404040",
"iconDisabledColor": "#b0b0b0", "iconDisabledColor": "#B0B0B0",
"menuIndicatorColor": "#404040", "menuIndicatorColor": "#404040",
"separatorColor": "#cccccc" "separatorColor": "#CCCCCC"
}, },
"viewer": { "viewer": {
"defaultBackgroundColor": "#f6f6f6", "defaultBackgroundColor": "#F6F6F6",
"defaultTextColor": "#202020", "defaultTextColor": "#202020",
"infoBackgroundColor": "#bbffffff", "infoBackgroundColor": "#BBFFFFFF",
"infoTextColor": "#404040" "infoTextColor": "#404040"
}, },
"whatsNewDialog": { "whatsNewDialog": {
"backgroundColor": "#ffffff", "backgroundColor": "#FFFFFF",
"closeButtonColor": "#444444", "closeButtonColor": "#444444",
"contentTextColor": "#0a0a0a", "contentTextColor": "#0A0A0A",
"headerDecorationColor": "#e8b800", "headerDecorationColor": "#E8B800",
"headerTextColor": "#0a0a0a", "headerTextColor": "#0A0A0A",
"linkColor": "#e8b800", "linkColor": "#E8B800",
"versionTextColor": "#858585" "versionTextColor": "#858585"
} }
} }

302
YACReaderLibrary/themes/builtin_classic.json
View File

@ -1,124 +1,124 @@
{ {
"comicFlow": { "comicFlow": {
"backgroundColor": "#000000", "backgroundColor": "#000000",
"readMainColor": "#db4725", "readMainColor": "#DB4725",
"readTickColor": "#8a2c17", "readTickColor": "#8A2C17",
"readingColor": "#e6b90f", "readingColor": "#E6B90F",
"textColor": "#4c4c4c" "textColor": "#4C4C4C"
}, },
"comicsViewTable": { "comicsViewTable": {
"alternateBackgroundColor": "#f2f2f2", "alternateBackgroundColor": "#F2F2F2",
"backgroundColor": "#fafafa", "backgroundColor": "#FAFAFA",
"headerBackgroundColor": "#f5f5f5", "headerBackgroundColor": "#F5F5F5",
"headerBorderColor": "#b8bdc4", "headerBorderColor": "#B8BDC4",
"headerGradientColor": "#d1d1d1", "headerGradientColor": "#D1D1D1",
"headerTextColor": "#313232", "headerTextColor": "#313232",
"itemBorderBottomColor": "#dfdfdf", "itemBorderBottomColor": "#DFDFDF",
"itemBorderBottomWidth": 1, "itemBorderBottomWidth": 1,
"itemBorderTopColor": "#fefefe", "itemBorderTopColor": "#FEFEFE",
"itemBorderTopWidth": 1, "itemBorderTopWidth": 1,
"itemTextColor": "#252626", "itemTextColor": "#252626",
"selectedColor": "#d4d4d4", "selectedColor": "#D4D4D4",
"selectedTextColor": "#252626", "selectedTextColor": "#252626",
"starRatingColor": "#e9be0f", "starRatingColor": "#E9BE0F",
"starRatingSelectedColor": "#ffffff" "starRatingSelectedColor": "#FFFFFF"
}, },
"comicsViewToolbar": { "comicsViewToolbar": {
"backgroundColor": "#f0f0f0", "backgroundColor": "#F0F0F0",
"checkedBackgroundColor": "#cccccc", "checkedBackgroundColor": "#CCCCCC",
"iconColor": "#404040", "iconColor": "#404040",
"separatorColor": "#cccccc" "separatorColor": "#CCCCCC"
}, },
"contentSplitter": { "contentSplitter": {
"handleColor": "#b8b8b8", "handleColor": "#B8B8B8",
"horizontalHandleHeight": 4, "horizontalHandleHeight": 4,
"verticalHandleWidth": 4 "verticalHandleWidth": 4
}, },
"dialogIcons": { "dialogIcons": {
"iconColor": "#f7f7f7" "iconColor": "#F7F7F7"
}, },
"emptyContainer": { "emptyContainer": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"iconColor": "#4c4c4c", "iconColor": "#4C4C4C",
"titleTextColor": "#cccccc" "titleTextColor": "#CCCCCC"
}, },
"gridAndInfoView": { "gridAndInfoView": {
"backgroundBlurOverlayColor": "#2a2a2a", "backgroundBlurOverlayColor": "#2A2A2A",
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"borderColor": "#121212", "borderColor": "#121212",
"buttonColor": "#ffcc00", "buttonColor": "#FFCC00",
"buttonShadowColor": "#aa000000", "buttonShadowColor": "#AA000000",
"buttonTextColor": "#ffffff", "buttonTextColor": "#FFFFFF",
"cellColor": "#212121", "cellColor": "#212121",
"cellColorWithBackground": "#99212121", "cellColorWithBackground": "#99212121",
"cellSelectedBorderColor": "#ffcc00", "cellSelectedBorderColor": "#FFCC00",
"cellSelectedColor": "#121212", "cellSelectedColor": "#121212",
"comicCoverBorderColor": "#30ffffff", "comicCoverBorderColor": "#30FFFFFF",
"continueReadingBackgroundColor": "#88000000", "continueReadingBackgroundColor": "#88000000",
"continueReadingTextColor": "#ffffff", "continueReadingTextColor": "#FFFFFF",
"currentComicBackgroundColor": "#88000000", "currentComicBackgroundColor": "#88000000",
"currentComicCoverShadowColor": "#ff000000", "currentComicCoverShadowColor": "#FF000000",
"favCheckedColor": "#e84852", "favCheckedColor": "#E84852",
"favUncheckedColor": "#1c1c1c", "favUncheckedColor": "#1C1C1C",
"folderCoverBorderColor": "#20ffffff", "folderCoverBorderColor": "#20FFFFFF",
"infoBackgroundColor": "#2e2e2e", "infoBackgroundColor": "#2E2E2E",
"infoBorderColor": "#404040", "infoBorderColor": "#404040",
"infoMetadataTextColor": "#b0b0b0", "infoMetadataTextColor": "#B0B0B0",
"infoScrollbarColor": "#ff424246", "infoScrollbarColor": "#FF424246",
"infoShadowColor": "#000000", "infoShadowColor": "#000000",
"infoTextColor": "#ffffff", "infoTextColor": "#FFFFFF",
"itemDetailsColor": "#a8a8a8", "itemDetailsColor": "#A8A8A8",
"itemTitleColor": "#ffffff", "itemTitleColor": "#FFFFFF",
"linkColor": "#ffcc00", "linkColor": "#FFCC00",
"newItemColor": "#ffffcc00", "newItemColor": "#FFFFCC00",
"placeholderFolder1BorderColor": "#20ffffff", "placeholderFolder1BorderColor": "#20FFFFFF",
"placeholderFolder1Color": "#20000000", "placeholderFolder1Color": "#20000000",
"placeholderFolder2BorderColor": "#20ffffff", "placeholderFolder2BorderColor": "#20FFFFFF",
"placeholderFolder2Color": "#88000000", "placeholderFolder2Color": "#88000000",
"ratingSelectedColor": "#ffffff", "ratingSelectedColor": "#FFFFFF",
"ratingUnselectedColor": "#1c1c1c", "ratingUnselectedColor": "#1C1C1C",
"readTickCheckedColor": "#e84852", "readTickCheckedColor": "#E84852",
"readTickUncheckedColor": "#1c1c1c", "readTickUncheckedColor": "#1C1C1C",
"scrollbarBorderColor": "#aa313131", "scrollbarBorderColor": "#AA313131",
"scrollbarColor": "#88424242", "scrollbarColor": "#88424242",
"showDropShadow": true "showDropShadow": true
}, },
"helpAboutDialog": { "helpAboutDialog": {
"headingColor": "#302f2d", "headingColor": "#302F2D",
"linkColor": "#c19441" "linkColor": "#C19441"
}, },
"importWidget": { "importWidget": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"coversDecorationBgColor": "#3a3a3a", "coversDecorationBgColor": "#3A3A3A",
"coversDecorationShadowColor": "#1a1a1a", "coversDecorationShadowColor": "#1A1A1A",
"coversLabelColor": "#aaaaaa", "coversLabelColor": "#AAAAAA",
"coversViewBackgroundColor": "#3a3a3a", "coversViewBackgroundColor": "#3A3A3A",
"currentComicTextColor": "#aaaaaa", "currentComicTextColor": "#AAAAAA",
"descriptionTextColor": "#aaaaaa", "descriptionTextColor": "#AAAAAA",
"glowLineColor": "#ffe100", "glowLineColor": "#FFE100",
"iconCheckedColor": "#aaaaaa", "iconCheckedColor": "#AAAAAA",
"iconColor": "#cccccc", "iconColor": "#CCCCCC",
"modeIconColor": "#4a4a4a", "modeIconColor": "#4A4A4A",
"titleTextColor": "#cccccc" "titleTextColor": "#CCCCCC"
}, },
"libraryItem": { "libraryItem": {
"libraryIconColor": "#dddfdf", "libraryIconColor": "#DDDFDF",
"libraryIconSelectedColor": "#ffffff", "libraryIconSelectedColor": "#FFFFFF",
"libraryIconShadowColor": "#000000", "libraryIconShadowColor": "#000000",
"libraryOptionsIconColor": "#ffffff", "libraryOptionsIconColor": "#FFFFFF",
"selectedBackgroundColor": "#2e2e2e", "selectedBackgroundColor": "#2E2E2E",
"selectedTextColor": "#ffffff", "selectedTextColor": "#FFFFFF",
"textColor": "#dddfdf" "textColor": "#DDDFDF"
}, },
"mainToolbar": { "mainToolbar": {
"backgroundColor": "#f0f0f0", "backgroundColor": "#F0F0F0",
"dividerColor": "#b8bdc4", "dividerColor": "#B8BDC4",
"folderNameColor": "#404040", "folderNameColor": "#404040",
"iconColor": "#404040", "iconColor": "#404040",
"iconDisabledColor": "#b0b0b0" "iconDisabledColor": "#B0B0B0"
}, },
"menuIcons": { "menuIcons": {
"iconColor": "#f7f7f7" "iconColor": "#F7F7F7"
}, },
"meta": { "meta": {
"displayName": "Default Classic", "displayName": "Default Classic",
@ -128,137 +128,137 @@
"version": "10.0.0" "version": "10.0.0"
}, },
"metadataScraperDialog": { "metadataScraperDialog": {
"busyIndicatorColor": "#ffffff", "busyIndicatorColor": "#FFFFFF",
"buttonBackgroundColor": "#2e2e2e", "buttonBackgroundColor": "#2E2E2E",
"buttonBorderColor": "#242424", "buttonBorderColor": "#242424",
"buttonTextColor": "#ffffff", "buttonTextColor": "#FFFFFF",
"checkBoxTickColor": "#ffffff", "checkBoxTickColor": "#FFFFFF",
"contentAltBackgroundColor": "#2b2b2b", "contentAltBackgroundColor": "#2B2B2B",
"contentBackgroundColor": "#2b2b2b", "contentBackgroundColor": "#2B2B2B",
"contentTextColor": "#ffffff", "contentTextColor": "#FFFFFF",
"dialogBackgroundColor": "#404040", "dialogBackgroundColor": "#404040",
"downArrowColor": "#9f9f9f", "downArrowColor": "#9F9F9F",
"hyperlinkColor": "#ffcc00", "hyperlinkColor": "#FFCC00",
"labelBackgroundColor": "#2b2b2b", "labelBackgroundColor": "#2B2B2B",
"labelTextColor": "#ffffff", "labelTextColor": "#FFFFFF",
"navIconColor": "#ffffff", "navIconColor": "#FFFFFF",
"radioCheckedBackgroundColor": "#e5e5e5", "radioCheckedBackgroundColor": "#E5E5E5",
"radioCheckedIndicatorColor": "#5f5f5f", "radioCheckedIndicatorColor": "#5F5F5F",
"radioUncheckedColor": "#e5e5e5", "radioUncheckedColor": "#E5E5E5",
"rowIconColor": "#e5e5e5", "rowIconColor": "#E5E5E5",
"tableAltBackgroundColor": "#2e2e2e", "tableAltBackgroundColor": "#2E2E2E",
"tableBackgroundColor": "#2b2b2b", "tableBackgroundColor": "#2B2B2B",
"tableBorderColor": "#242424", "tableBorderColor": "#242424",
"tableHeaderBackgroundColor": "#292929", "tableHeaderBackgroundColor": "#292929",
"tableHeaderBorderColor": "#1f1f1f", "tableHeaderBorderColor": "#1F1F1F",
"tableHeaderGradientColor": "#292929", "tableHeaderGradientColor": "#292929",
"tableHeaderTextColor": "#ebebeb", "tableHeaderTextColor": "#EBEBEB",
"tableScrollBackgroundColor": "#404040", "tableScrollBackgroundColor": "#404040",
"tableScrollHandleColor": "#dddddd", "tableScrollHandleColor": "#DDDDDD",
"tableSectionBorderDark": "#dfdfdf", "tableSectionBorderDark": "#DFDFDF",
"tableSectionBorderLight": "#fefefe", "tableSectionBorderLight": "#FEFEFE",
"tableSelectedColor": "#555555", "tableSelectedColor": "#555555",
"toolButtonAccentColor": "#282828", "toolButtonAccentColor": "#282828",
"upArrowColor": "#9f9f9f" "upArrowColor": "#9F9F9F"
}, },
"navigationTree": { "navigationTree": {
"branchIndicatorColor": "#e0e0e0", "branchIndicatorColor": "#E0E0E0",
"branchIndicatorSelectedColor": "#ffffff", "branchIndicatorSelectedColor": "#FFFFFF",
"folderIconColor": "#e0e0e0", "folderIconColor": "#E0E0E0",
"folderIconSelectedColor": "#e0e0e0", "folderIconSelectedColor": "#E0E0E0",
"folderIconSelectedShadowColor": "#000000", "folderIconSelectedShadowColor": "#000000",
"folderIconShadowColor": "#000000", "folderIconShadowColor": "#000000",
"folderNotCompletedColor": "#edc518", "folderNotCompletedColor": "#EDC518",
"folderReadOverlayColor": "#464646", "folderReadOverlayColor": "#464646",
"folderReadOverlaySelectedColor": "#464646", "folderReadOverlaySelectedColor": "#464646",
"newItemColor": "#edc518", "newItemColor": "#EDC518",
"scrollBackgroundColor": "#404040", "scrollBackgroundColor": "#404040",
"scrollHandleColor": "#dddddd", "scrollHandleColor": "#DDDDDD",
"selectedTextColor": "#ffffff", "selectedTextColor": "#FFFFFF",
"selectionBackgroundColor": "#2e2e2e", "selectionBackgroundColor": "#2E2E2E",
"textColor": "#dddfdf" "textColor": "#DDDFDF"
}, },
"noLibrariesWidget": { "noLibrariesWidget": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"descriptionTextColor": "#aaaaaa", "descriptionTextColor": "#AAAAAA",
"iconColor": "#4c4c4c", "iconColor": "#4C4C4C",
"noLibrariesLineColor": "#a8a8a8", "noLibrariesLineColor": "#A8A8A8",
"textColor": "#cccccc" "textColor": "#CCCCCC"
}, },
"readingListIcons": { "readingListIcons": {
"currentlyReadingMainColor": "#ffcc00", "currentlyReadingMainColor": "#FFCC00",
"currentlyReadingMainSelectedColor": "#ffcc00", "currentlyReadingMainSelectedColor": "#FFCC00",
"currentlyReadingOuterColor": "#000000", "currentlyReadingOuterColor": "#000000",
"currentlyReadingOuterSelectedColor": "#000000", "currentlyReadingOuterSelectedColor": "#000000",
"favoritesMainColor": "#e15055", "favoritesMainColor": "#E15055",
"favoritesMainSelectedColor": "#e15055", "favoritesMainSelectedColor": "#E15055",
"labelColors": { "labelColors": {
"blue": "#82c7ff", "blue": "#82C7FF",
"cyan": "#a0fddb", "cyan": "#A0FDDB",
"dark": "#b7b7b7", "dark": "#B7B7B7",
"green": "#ade738", "green": "#ADE738",
"light": "#cbcbcb", "light": "#CBCBCB",
"orange": "#f5c240", "orange": "#F5C240",
"pink": "#fd9cda", "pink": "#FD9CDA",
"purple": "#d692fc", "purple": "#D692FC",
"red": "#f67a7b", "red": "#F67A7B",
"violet": "#8f95ff", "violet": "#8F95FF",
"white": "#fcfcfc", "white": "#FCFCFC",
"yellow": "#f2e446" "yellow": "#F2E446"
}, },
"labelShadowColor": "#000000", "labelShadowColor": "#000000",
"labelShadowSelectedColor": "#000000", "labelShadowSelectedColor": "#000000",
"listDetailColor": "#464646", "listDetailColor": "#464646",
"listDetailSelectedColor": "#464646", "listDetailSelectedColor": "#464646",
"listMainColor": "#e7e7e7", "listMainColor": "#E7E7E7",
"listMainSelectedColor": "#e7e7e7", "listMainSelectedColor": "#E7E7E7",
"listShadowColor": "#000000", "listShadowColor": "#000000",
"listShadowSelectedColor": "#000000", "listShadowSelectedColor": "#000000",
"readingListMainColor": "#e7e7e7", "readingListMainColor": "#E7E7E7",
"readingListMainSelectedColor": "#e7e7e7", "readingListMainSelectedColor": "#E7E7E7",
"specialListShadowColor": "#000000", "specialListShadowColor": "#000000",
"specialListShadowSelectedColor": "#000000" "specialListShadowSelectedColor": "#000000"
}, },
"searchLineEdit": { "searchLineEdit": {
"backgroundColor": "#404040", "backgroundColor": "#404040",
"iconColor": "#f7f7f7", "iconColor": "#F7F7F7",
"textColor": "#ababab" "textColor": "#ABABAB"
}, },
"serverConfigDialog": { "serverConfigDialog": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"checkBoxTextColor": "#262626", "checkBoxTextColor": "#262626",
"decorationColor": "#f7f7f7", "decorationColor": "#F7F7F7",
"labelTextColor": "#575757", "labelTextColor": "#575757",
"propagandaTextColor": "#4d4d4d", "propagandaTextColor": "#4D4D4D",
"qrBackgroundColor": "#2a2a2a", "qrBackgroundColor": "#2A2A2A",
"qrForegroundColor": "#ffffff", "qrForegroundColor": "#FFFFFF",
"qrMessageTextColor": "#a3a3a3", "qrMessageTextColor": "#A3A3A3",
"titleTextColor": "#474747" "titleTextColor": "#474747"
}, },
"shortcutsIcons": { "shortcutsIcons": {
"iconColor": "#f7f7f7" "iconColor": "#F7F7F7"
}, },
"sidebar": { "sidebar": {
"backgroundColor": "#454545", "backgroundColor": "#454545",
"busyIndicatorColor": "#ffffff", "busyIndicatorColor": "#FFFFFF",
"sectionSeparatorColor": "#575757", "sectionSeparatorColor": "#575757",
"separatorColor": "#bdbfbf", "separatorColor": "#BDBFBF",
"titleDropShadowColor": "#000000", "titleDropShadowColor": "#000000",
"titleTextColor": "#bdbfbf", "titleTextColor": "#BDBFBF",
"uppercaseLabels": true "uppercaseLabels": true
}, },
"sidebarIcons": { "sidebarIcons": {
"iconColor": "#e0e0e0", "iconColor": "#E0E0E0",
"shadowColor": "#000000", "shadowColor": "#000000",
"useSystemFolderIcons": false "useSystemFolderIcons": false
}, },
"whatsNewDialog": { "whatsNewDialog": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"closeButtonColor": "#dddddd", "closeButtonColor": "#DDDDDD",
"contentTextColor": "#e0e0e0", "contentTextColor": "#E0E0E0",
"headerDecorationColor": "#e8b800", "headerDecorationColor": "#E8B800",
"headerTextColor": "#e0e0e0", "headerTextColor": "#E0E0E0",
"linkColor": "#e8b800", "linkColor": "#E8B800",
"versionTextColor": "#858585" "versionTextColor": "#858585"
} }
} }

302
YACReaderLibrary/themes/builtin_dark.json
View File

@ -1,124 +1,124 @@
{ {
"comicFlow": { "comicFlow": {
"backgroundColor": "#111111", "backgroundColor": "#111111",
"readMainColor": "#db4725", "readMainColor": "#DB4725",
"readTickColor": "#8a2c17", "readTickColor": "#8A2C17",
"readingColor": "#e6b90f", "readingColor": "#E6B90F",
"textColor": "#888888" "textColor": "#888888"
}, },
"comicsViewTable": { "comicsViewTable": {
"alternateBackgroundColor": "#2c2c2c", "alternateBackgroundColor": "#2C2C2C",
"backgroundColor": "#232323", "backgroundColor": "#232323",
"headerBackgroundColor": "#2a2a2a", "headerBackgroundColor": "#2A2A2A",
"headerBorderColor": "#1f1f1f", "headerBorderColor": "#1F1F1F",
"headerGradientColor": "#252525", "headerGradientColor": "#252525",
"headerTextColor": "#dddddd", "headerTextColor": "#DDDDDD",
"itemBorderBottomColor": "#1f1f1f", "itemBorderBottomColor": "#1F1F1F",
"itemBorderBottomWidth": 0, "itemBorderBottomWidth": 0,
"itemBorderTopColor": "#353535", "itemBorderTopColor": "#353535",
"itemBorderTopWidth": 0, "itemBorderTopWidth": 0,
"itemTextColor": "#dddddd", "itemTextColor": "#DDDDDD",
"selectedColor": "#555555", "selectedColor": "#555555",
"selectedTextColor": "#ffffff", "selectedTextColor": "#FFFFFF",
"starRatingColor": "#e9be0f", "starRatingColor": "#E9BE0F",
"starRatingSelectedColor": "#ffffff" "starRatingSelectedColor": "#FFFFFF"
}, },
"comicsViewToolbar": { "comicsViewToolbar": {
"backgroundColor": "#1f1f1f", "backgroundColor": "#1F1F1F",
"checkedBackgroundColor": "#555555", "checkedBackgroundColor": "#555555",
"iconColor": "#dddddd", "iconColor": "#DDDDDD",
"separatorColor": "#444444" "separatorColor": "#444444"
}, },
"contentSplitter": { "contentSplitter": {
"handleColor": "#1f1f1f", "handleColor": "#1F1F1F",
"horizontalHandleHeight": 4, "horizontalHandleHeight": 4,
"verticalHandleWidth": 4 "verticalHandleWidth": 4
}, },
"dialogIcons": { "dialogIcons": {
"iconColor": "#f7f7f7" "iconColor": "#F7F7F7"
}, },
"emptyContainer": { "emptyContainer": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"iconColor": "#4c4c4c", "iconColor": "#4C4C4C",
"titleTextColor": "#cccccc" "titleTextColor": "#CCCCCC"
}, },
"gridAndInfoView": { "gridAndInfoView": {
"backgroundBlurOverlayColor": "#2a2a2a", "backgroundBlurOverlayColor": "#2A2A2A",
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"borderColor": "#121212", "borderColor": "#121212",
"buttonColor": "#ffcc00", "buttonColor": "#FFCC00",
"buttonShadowColor": "#aa000000", "buttonShadowColor": "#AA000000",
"buttonTextColor": "#ffffff", "buttonTextColor": "#FFFFFF",
"cellColor": "#212121", "cellColor": "#212121",
"cellColorWithBackground": "#99212121", "cellColorWithBackground": "#99212121",
"cellSelectedBorderColor": "#ffcc00", "cellSelectedBorderColor": "#FFCC00",
"cellSelectedColor": "#121212", "cellSelectedColor": "#121212",
"comicCoverBorderColor": "#30ffffff", "comicCoverBorderColor": "#30FFFFFF",
"continueReadingBackgroundColor": "#88000000", "continueReadingBackgroundColor": "#88000000",
"continueReadingTextColor": "#ffffff", "continueReadingTextColor": "#FFFFFF",
"currentComicBackgroundColor": "#55000000", "currentComicBackgroundColor": "#55000000",
"currentComicCoverShadowColor": "#ff000000", "currentComicCoverShadowColor": "#FF000000",
"favCheckedColor": "#e84852", "favCheckedColor": "#E84852",
"favUncheckedColor": "#1c1c1c", "favUncheckedColor": "#1C1C1C",
"folderCoverBorderColor": "#20ffffff", "folderCoverBorderColor": "#20FFFFFF",
"infoBackgroundColor": "#2e2e2e", "infoBackgroundColor": "#2E2E2E",
"infoBorderColor": "#404040", "infoBorderColor": "#404040",
"infoMetadataTextColor": "#b0b0b0", "infoMetadataTextColor": "#B0B0B0",
"infoScrollbarColor": "#ff424246", "infoScrollbarColor": "#FF424246",
"infoShadowColor": "#000000", "infoShadowColor": "#000000",
"infoTextColor": "#ffffff", "infoTextColor": "#FFFFFF",
"itemDetailsColor": "#a8a8a8", "itemDetailsColor": "#A8A8A8",
"itemTitleColor": "#ffffff", "itemTitleColor": "#FFFFFF",
"linkColor": "#ffcc00", "linkColor": "#FFCC00",
"newItemColor": "#ffffcc00", "newItemColor": "#FFFFCC00",
"placeholderFolder1BorderColor": "#20ffffff", "placeholderFolder1BorderColor": "#20FFFFFF",
"placeholderFolder1Color": "#20000000", "placeholderFolder1Color": "#20000000",
"placeholderFolder2BorderColor": "#20ffffff", "placeholderFolder2BorderColor": "#20FFFFFF",
"placeholderFolder2Color": "#88000000", "placeholderFolder2Color": "#88000000",
"ratingSelectedColor": "#ffffff", "ratingSelectedColor": "#FFFFFF",
"ratingUnselectedColor": "#1c1c1c", "ratingUnselectedColor": "#1C1C1C",
"readTickCheckedColor": "#e84852", "readTickCheckedColor": "#E84852",
"readTickUncheckedColor": "#1c1c1c", "readTickUncheckedColor": "#1C1C1C",
"scrollbarBorderColor": "#aa313131", "scrollbarBorderColor": "#AA313131",
"scrollbarColor": "#88424242", "scrollbarColor": "#88424242",
"showDropShadow": true "showDropShadow": true
}, },
"helpAboutDialog": { "helpAboutDialog": {
"headingColor": "#e0e0e0", "headingColor": "#E0E0E0",
"linkColor": "#d4a84b" "linkColor": "#D4A84B"
}, },
"importWidget": { "importWidget": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"coversDecorationBgColor": "#3a3a3a", "coversDecorationBgColor": "#3A3A3A",
"coversDecorationShadowColor": "#1a1a1a", "coversDecorationShadowColor": "#1A1A1A",
"coversLabelColor": "#aaaaaa", "coversLabelColor": "#AAAAAA",
"coversViewBackgroundColor": "#3a3a3a", "coversViewBackgroundColor": "#3A3A3A",
"currentComicTextColor": "#aaaaaa", "currentComicTextColor": "#AAAAAA",
"descriptionTextColor": "#aaaaaa", "descriptionTextColor": "#AAAAAA",
"glowLineColor": "#ffe100", "glowLineColor": "#FFE100",
"iconCheckedColor": "#aaaaaa", "iconCheckedColor": "#AAAAAA",
"iconColor": "#cccccc", "iconColor": "#CCCCCC",
"modeIconColor": "#4a4a4a", "modeIconColor": "#4A4A4A",
"titleTextColor": "#cccccc" "titleTextColor": "#CCCCCC"
}, },
"libraryItem": { "libraryItem": {
"libraryIconColor": "#dddfdf", "libraryIconColor": "#DDDFDF",
"libraryIconSelectedColor": "#ffffff", "libraryIconSelectedColor": "#FFFFFF",
"libraryIconShadowColor": "#000000", "libraryIconShadowColor": "#000000",
"libraryOptionsIconColor": "#ffffff", "libraryOptionsIconColor": "#FFFFFF",
"selectedBackgroundColor": "#2e2e2e", "selectedBackgroundColor": "#2E2E2E",
"selectedTextColor": "#ffffff", "selectedTextColor": "#FFFFFF",
"textColor": "#dddfdf" "textColor": "#DDDFDF"
}, },
"mainToolbar": { "mainToolbar": {
"backgroundColor": "#1f1f1f", "backgroundColor": "#1F1F1F",
"dividerColor": "#555555", "dividerColor": "#555555",
"folderNameColor": "#dddddd", "folderNameColor": "#DDDDDD",
"iconColor": "#dddddd", "iconColor": "#DDDDDD",
"iconDisabledColor": "#666666" "iconDisabledColor": "#666666"
}, },
"menuIcons": { "menuIcons": {
"iconColor": "#f7f7f7" "iconColor": "#F7F7F7"
}, },
"meta": { "meta": {
"displayName": "Default Dark", "displayName": "Default Dark",
@ -128,137 +128,137 @@
"version": "10.0.0" "version": "10.0.0"
}, },
"metadataScraperDialog": { "metadataScraperDialog": {
"busyIndicatorColor": "#ffffff", "busyIndicatorColor": "#FFFFFF",
"buttonBackgroundColor": "#2e2e2e", "buttonBackgroundColor": "#2E2E2E",
"buttonBorderColor": "#242424", "buttonBorderColor": "#242424",
"buttonTextColor": "#ffffff", "buttonTextColor": "#FFFFFF",
"checkBoxTickColor": "#ffffff", "checkBoxTickColor": "#FFFFFF",
"contentAltBackgroundColor": "#2e2e2e", "contentAltBackgroundColor": "#2E2E2E",
"contentBackgroundColor": "#2b2b2b", "contentBackgroundColor": "#2B2B2B",
"contentTextColor": "#ffffff", "contentTextColor": "#FFFFFF",
"dialogBackgroundColor": "#404040", "dialogBackgroundColor": "#404040",
"downArrowColor": "#9f9f9f", "downArrowColor": "#9F9F9F",
"hyperlinkColor": "#ffcc00", "hyperlinkColor": "#FFCC00",
"labelBackgroundColor": "#2b2b2b", "labelBackgroundColor": "#2B2B2B",
"labelTextColor": "#ffffff", "labelTextColor": "#FFFFFF",
"navIconColor": "#ffffff", "navIconColor": "#FFFFFF",
"radioCheckedBackgroundColor": "#e5e5e5", "radioCheckedBackgroundColor": "#E5E5E5",
"radioCheckedIndicatorColor": "#5f5f5f", "radioCheckedIndicatorColor": "#5F5F5F",
"radioUncheckedColor": "#e5e5e5", "radioUncheckedColor": "#E5E5E5",
"rowIconColor": "#e5e5e5", "rowIconColor": "#E5E5E5",
"tableAltBackgroundColor": "#2e2e2e", "tableAltBackgroundColor": "#2E2E2E",
"tableBackgroundColor": "#2b2b2b", "tableBackgroundColor": "#2B2B2B",
"tableBorderColor": "#242424", "tableBorderColor": "#242424",
"tableHeaderBackgroundColor": "#292929", "tableHeaderBackgroundColor": "#292929",
"tableHeaderBorderColor": "#1f1f1f", "tableHeaderBorderColor": "#1F1F1F",
"tableHeaderGradientColor": "#292929", "tableHeaderGradientColor": "#292929",
"tableHeaderTextColor": "#ebebeb", "tableHeaderTextColor": "#EBEBEB",
"tableScrollBackgroundColor": "#404040", "tableScrollBackgroundColor": "#404040",
"tableScrollHandleColor": "#dddddd", "tableScrollHandleColor": "#DDDDDD",
"tableSectionBorderDark": "#dfdfdf", "tableSectionBorderDark": "#DFDFDF",
"tableSectionBorderLight": "#fefefe", "tableSectionBorderLight": "#FEFEFE",
"tableSelectedColor": "#555555", "tableSelectedColor": "#555555",
"toolButtonAccentColor": "#282828", "toolButtonAccentColor": "#282828",
"upArrowColor": "#9f9f9f" "upArrowColor": "#9F9F9F"
}, },
"navigationTree": { "navigationTree": {
"branchIndicatorColor": "#e0e0e0", "branchIndicatorColor": "#E0E0E0",
"branchIndicatorSelectedColor": "#ffffff", "branchIndicatorSelectedColor": "#FFFFFF",
"folderIconColor": "#e0e0e0", "folderIconColor": "#E0E0E0",
"folderIconSelectedColor": "#e0e0e0", "folderIconSelectedColor": "#E0E0E0",
"folderIconSelectedShadowColor": "#000000", "folderIconSelectedShadowColor": "#000000",
"folderIconShadowColor": "#000000", "folderIconShadowColor": "#000000",
"folderNotCompletedColor": "#edc518", "folderNotCompletedColor": "#EDC518",
"folderReadOverlayColor": "#222222", "folderReadOverlayColor": "#222222",
"folderReadOverlaySelectedColor": "#222222", "folderReadOverlaySelectedColor": "#222222",
"newItemColor": "#edc518", "newItemColor": "#EDC518",
"scrollBackgroundColor": "#404040", "scrollBackgroundColor": "#404040",
"scrollHandleColor": "#dddddd", "scrollHandleColor": "#DDDDDD",
"selectedTextColor": "#ffffff", "selectedTextColor": "#FFFFFF",
"selectionBackgroundColor": "#2e2e2e", "selectionBackgroundColor": "#2E2E2E",
"textColor": "#dddfdf" "textColor": "#DDDFDF"
}, },
"noLibrariesWidget": { "noLibrariesWidget": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"descriptionTextColor": "#aaaaaa", "descriptionTextColor": "#AAAAAA",
"iconColor": "#4c4c4c", "iconColor": "#4C4C4C",
"noLibrariesLineColor": "#a8a8a8", "noLibrariesLineColor": "#A8A8A8",
"textColor": "#cccccc" "textColor": "#CCCCCC"
}, },
"readingListIcons": { "readingListIcons": {
"currentlyReadingMainColor": "#ffcc00", "currentlyReadingMainColor": "#FFCC00",
"currentlyReadingMainSelectedColor": "#ffcc00", "currentlyReadingMainSelectedColor": "#FFCC00",
"currentlyReadingOuterColor": "#000000", "currentlyReadingOuterColor": "#000000",
"currentlyReadingOuterSelectedColor": "#000000", "currentlyReadingOuterSelectedColor": "#000000",
"favoritesMainColor": "#e15055", "favoritesMainColor": "#E15055",
"favoritesMainSelectedColor": "#e15055", "favoritesMainSelectedColor": "#E15055",
"labelColors": { "labelColors": {
"blue": "#82c7ff", "blue": "#82C7FF",
"cyan": "#a0fddb", "cyan": "#A0FDDB",
"dark": "#b7b7b7", "dark": "#B7B7B7",
"green": "#ade738", "green": "#ADE738",
"light": "#cbcbcb", "light": "#CBCBCB",
"orange": "#f5c240", "orange": "#F5C240",
"pink": "#fd9cda", "pink": "#FD9CDA",
"purple": "#d692fc", "purple": "#D692FC",
"red": "#f67a7b", "red": "#F67A7B",
"violet": "#8f95ff", "violet": "#8F95FF",
"white": "#fcfcfc", "white": "#FCFCFC",
"yellow": "#f2e446" "yellow": "#F2E446"
}, },
"labelShadowColor": "#000000", "labelShadowColor": "#000000",
"labelShadowSelectedColor": "#000000", "labelShadowSelectedColor": "#000000",
"listDetailColor": "#464646", "listDetailColor": "#464646",
"listDetailSelectedColor": "#464646", "listDetailSelectedColor": "#464646",
"listMainColor": "#e7e7e7", "listMainColor": "#E7E7E7",
"listMainSelectedColor": "#e7e7e7", "listMainSelectedColor": "#E7E7E7",
"listShadowColor": "#000000", "listShadowColor": "#000000",
"listShadowSelectedColor": "#000000", "listShadowSelectedColor": "#000000",
"readingListMainColor": "#e7e7e7", "readingListMainColor": "#E7E7E7",
"readingListMainSelectedColor": "#e7e7e7", "readingListMainSelectedColor": "#E7E7E7",
"specialListShadowColor": "#000000", "specialListShadowColor": "#000000",
"specialListShadowSelectedColor": "#000000" "specialListShadowSelectedColor": "#000000"
}, },
"searchLineEdit": { "searchLineEdit": {
"backgroundColor": "#404040", "backgroundColor": "#404040",
"iconColor": "#f7f7f7", "iconColor": "#F7F7F7",
"textColor": "#ababab" "textColor": "#ABABAB"
}, },
"serverConfigDialog": { "serverConfigDialog": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"checkBoxTextColor": "#dddddd", "checkBoxTextColor": "#DDDDDD",
"decorationColor": "#f7f7f7", "decorationColor": "#F7F7F7",
"labelTextColor": "#c0c0c0", "labelTextColor": "#C0C0C0",
"propagandaTextColor": "#b0b0b0", "propagandaTextColor": "#B0B0B0",
"qrBackgroundColor": "#2a2a2a", "qrBackgroundColor": "#2A2A2A",
"qrForegroundColor": "#ffffff", "qrForegroundColor": "#FFFFFF",
"qrMessageTextColor": "#a3a3a3", "qrMessageTextColor": "#A3A3A3",
"titleTextColor": "#d0d0d0" "titleTextColor": "#D0D0D0"
}, },
"shortcutsIcons": { "shortcutsIcons": {
"iconColor": "#f7f7f7" "iconColor": "#F7F7F7"
}, },
"sidebar": { "sidebar": {
"backgroundColor": "#454545", "backgroundColor": "#454545",
"busyIndicatorColor": "#ffffff", "busyIndicatorColor": "#FFFFFF",
"sectionSeparatorColor": "#575757", "sectionSeparatorColor": "#575757",
"separatorColor": "#bdbfbf", "separatorColor": "#BDBFBF",
"titleDropShadowColor": "#000000", "titleDropShadowColor": "#000000",
"titleTextColor": "#bdbfbf", "titleTextColor": "#BDBFBF",
"uppercaseLabels": true "uppercaseLabels": true
}, },
"sidebarIcons": { "sidebarIcons": {
"iconColor": "#e0e0e0", "iconColor": "#E0E0E0",
"shadowColor": "#000000", "shadowColor": "#000000",
"useSystemFolderIcons": false "useSystemFolderIcons": false
}, },
"whatsNewDialog": { "whatsNewDialog": {
"backgroundColor": "#2a2a2a", "backgroundColor": "#2A2A2A",
"closeButtonColor": "#dddddd", "closeButtonColor": "#DDDDDD",
"contentTextColor": "#e0e0e0", "contentTextColor": "#E0E0E0",
"headerDecorationColor": "#e8b800", "headerDecorationColor": "#E8B800",
"headerTextColor": "#e0e0e0", "headerTextColor": "#E0E0E0",
"linkColor": "#e8b800", "linkColor": "#E8B800",
"versionTextColor": "#858585" "versionTextColor": "#858585"
} }
} }

266
YACReaderLibrary/themes/builtin_light.json
View File

@ -1,36 +1,36 @@
{ {
"comicFlow": { "comicFlow": {
"backgroundColor": "#dcdcdc", "backgroundColor": "#DCDCDC",
"readMainColor": "#db4725", "readMainColor": "#DB4725",
"readTickColor": "#8a2c17", "readTickColor": "#8A2C17",
"readingColor": "#e6b90f", "readingColor": "#E6B90F",
"textColor": "#303030" "textColor": "#303030"
}, },
"comicsViewTable": { "comicsViewTable": {
"alternateBackgroundColor": "#f2f2f2", "alternateBackgroundColor": "#F2F2F2",
"backgroundColor": "#fafafa", "backgroundColor": "#FAFAFA",
"headerBackgroundColor": "#f5f5f5", "headerBackgroundColor": "#F5F5F5",
"headerBorderColor": "#b8bdc4", "headerBorderColor": "#B8BDC4",
"headerGradientColor": "#f5f5f5", "headerGradientColor": "#F5F5F5",
"headerTextColor": "#313232", "headerTextColor": "#313232",
"itemBorderBottomColor": "#dfdfdf", "itemBorderBottomColor": "#DFDFDF",
"itemBorderBottomWidth": 0, "itemBorderBottomWidth": 0,
"itemBorderTopColor": "#fefefe", "itemBorderTopColor": "#FEFEFE",
"itemBorderTopWidth": 0, "itemBorderTopWidth": 0,
"itemTextColor": "#252626", "itemTextColor": "#252626",
"selectedColor": "#595959", "selectedColor": "#595959",
"selectedTextColor": "#ffffff", "selectedTextColor": "#FFFFFF",
"starRatingColor": "#e9be0f", "starRatingColor": "#E9BE0F",
"starRatingSelectedColor": "#ffffff" "starRatingSelectedColor": "#FFFFFF"
}, },
"comicsViewToolbar": { "comicsViewToolbar": {
"backgroundColor": "#f0f0f0", "backgroundColor": "#F0F0F0",
"checkedBackgroundColor": "#cccccc", "checkedBackgroundColor": "#CCCCCC",
"iconColor": "#404040", "iconColor": "#404040",
"separatorColor": "#cccccc" "separatorColor": "#CCCCCC"
}, },
"contentSplitter": { "contentSplitter": {
"handleColor": "#f0f0f0", "handleColor": "#F0F0F0",
"horizontalHandleHeight": 4, "horizontalHandleHeight": 4,
"verticalHandleWidth": 4 "verticalHandleWidth": 4
}, },
@ -38,84 +38,84 @@
"iconColor": "#606060" "iconColor": "#606060"
}, },
"emptyContainer": { "emptyContainer": {
"backgroundColor": "#ffffff", "backgroundColor": "#FFFFFF",
"iconColor": "#cccccc", "iconColor": "#CCCCCC",
"titleTextColor": "#888888" "titleTextColor": "#888888"
}, },
"gridAndInfoView": { "gridAndInfoView": {
"backgroundBlurOverlayColor": "#9e9e9e", "backgroundBlurOverlayColor": "#9E9E9E",
"backgroundColor": "#f6f6f6", "backgroundColor": "#F6F6F6",
"borderColor": "#dbdbdb", "borderColor": "#DBDBDB",
"buttonColor": "#ffcc00", "buttonColor": "#FFCC00",
"buttonShadowColor": "#aa000000", "buttonShadowColor": "#AA000000",
"buttonTextColor": "#ffffff", "buttonTextColor": "#FFFFFF",
"cellColor": "#ffffff", "cellColor": "#FFFFFF",
"cellColorWithBackground": "#99ffffff", "cellColorWithBackground": "#99FFFFFF",
"cellSelectedBorderColor": "#ffcc00", "cellSelectedBorderColor": "#FFCC00",
"cellSelectedColor": "#ffffff", "cellSelectedColor": "#FFFFFF",
"comicCoverBorderColor": "#30ffffff", "comicCoverBorderColor": "#30FFFFFF",
"continueReadingBackgroundColor": "#e8e8e8", "continueReadingBackgroundColor": "#E8E8E8",
"continueReadingTextColor": "#000000", "continueReadingTextColor": "#000000",
"currentComicBackgroundColor": "#88ffffff", "currentComicBackgroundColor": "#88FFFFFF",
"currentComicCoverShadowColor": "#ff000000", "currentComicCoverShadowColor": "#FF000000",
"favCheckedColor": "#e84852", "favCheckedColor": "#E84852",
"favUncheckedColor": "#dedede", "favUncheckedColor": "#DEDEDE",
"folderCoverBorderColor": "#20ffffff", "folderCoverBorderColor": "#20FFFFFF",
"infoBackgroundColor": "#ffffff", "infoBackgroundColor": "#FFFFFF",
"infoBorderColor": "#808080", "infoBorderColor": "#808080",
"infoMetadataTextColor": "#404040", "infoMetadataTextColor": "#404040",
"infoScrollbarColor": "#ff424246", "infoScrollbarColor": "#FF424246",
"infoShadowColor": "#444444", "infoShadowColor": "#444444",
"infoTextColor": "#2e2e2e", "infoTextColor": "#2E2E2E",
"itemDetailsColor": "#636363", "itemDetailsColor": "#636363",
"itemTitleColor": "#121212", "itemTitleColor": "#121212",
"linkColor": "#ffcc00", "linkColor": "#FFCC00",
"newItemColor": "#ffffcc00", "newItemColor": "#FFFFCC00",
"placeholderFolder1BorderColor": "#20ffffff", "placeholderFolder1BorderColor": "#20FFFFFF",
"placeholderFolder1Color": "#20000000", "placeholderFolder1Color": "#20000000",
"placeholderFolder2BorderColor": "#20ffffff", "placeholderFolder2BorderColor": "#20FFFFFF",
"placeholderFolder2Color": "#88000000", "placeholderFolder2Color": "#88000000",
"ratingSelectedColor": "#2b2b2b", "ratingSelectedColor": "#2B2B2B",
"ratingUnselectedColor": "#dedede", "ratingUnselectedColor": "#DEDEDE",
"readTickCheckedColor": "#e84852", "readTickCheckedColor": "#E84852",
"readTickUncheckedColor": "#dedede", "readTickUncheckedColor": "#DEDEDE",
"scrollbarBorderColor": "#aa313131", "scrollbarBorderColor": "#AA313131",
"scrollbarColor": "#88424242", "scrollbarColor": "#88424242",
"showDropShadow": true "showDropShadow": true
}, },
"helpAboutDialog": { "helpAboutDialog": {
"headingColor": "#302f2d", "headingColor": "#302F2D",
"linkColor": "#c19441" "linkColor": "#C19441"
}, },
"importWidget": { "importWidget": {
"backgroundColor": "#fafafa", "backgroundColor": "#FAFAFA",
"coversDecorationBgColor": "#e6e6e6", "coversDecorationBgColor": "#E6E6E6",
"coversDecorationShadowColor": "#a1a1a1", "coversDecorationShadowColor": "#A1A1A1",
"coversLabelColor": "#565959", "coversLabelColor": "#565959",
"coversViewBackgroundColor": "#e6e6e6", "coversViewBackgroundColor": "#E6E6E6",
"currentComicTextColor": "#565959", "currentComicTextColor": "#565959",
"descriptionTextColor": "#565959", "descriptionTextColor": "#565959",
"glowLineColor": "#ffe100", "glowLineColor": "#FFE100",
"iconCheckedColor": "#565959", "iconCheckedColor": "#565959",
"iconColor": "#495252", "iconColor": "#495252",
"modeIconColor": "#e6e6e6", "modeIconColor": "#E6E6E6",
"titleTextColor": "#495252" "titleTextColor": "#495252"
}, },
"libraryItem": { "libraryItem": {
"libraryIconColor": "#606060", "libraryIconColor": "#606060",
"libraryIconSelectedColor": "#ffffff", "libraryIconSelectedColor": "#FFFFFF",
"libraryIconShadowColor": "#ffffff", "libraryIconShadowColor": "#FFFFFF",
"libraryOptionsIconColor": "#ffffff", "libraryOptionsIconColor": "#FFFFFF",
"selectedBackgroundColor": "#333133", "selectedBackgroundColor": "#333133",
"selectedTextColor": "#ffffff", "selectedTextColor": "#FFFFFF",
"textColor": "#000000" "textColor": "#000000"
}, },
"mainToolbar": { "mainToolbar": {
"backgroundColor": "#f0f0f0", "backgroundColor": "#F0F0F0",
"dividerColor": "#b8bdc4", "dividerColor": "#B8BDC4",
"folderNameColor": "#333133", "folderNameColor": "#333133",
"iconColor": "#333133", "iconColor": "#333133",
"iconDisabledColor": "#b0b0b0" "iconDisabledColor": "#B0B0B0"
}, },
"menuIcons": { "menuIcons": {
"iconColor": "#606060" "iconColor": "#606060"
@ -129,136 +129,136 @@
}, },
"metadataScraperDialog": { "metadataScraperDialog": {
"busyIndicatorColor": "#000000", "busyIndicatorColor": "#000000",
"buttonBackgroundColor": "#e0e0e0", "buttonBackgroundColor": "#E0E0E0",
"buttonBorderColor": "#cccccc", "buttonBorderColor": "#CCCCCC",
"buttonTextColor": "#000000", "buttonTextColor": "#000000",
"checkBoxTickColor": "#000000", "checkBoxTickColor": "#000000",
"contentAltBackgroundColor": "#e0e0e0", "contentAltBackgroundColor": "#E0E0E0",
"contentBackgroundColor": "#ececec", "contentBackgroundColor": "#ECECEC",
"contentTextColor": "#000000", "contentTextColor": "#000000",
"dialogBackgroundColor": "#fbfbfb", "dialogBackgroundColor": "#FBFBFB",
"downArrowColor": "#222222", "downArrowColor": "#222222",
"hyperlinkColor": "#ffcc00", "hyperlinkColor": "#FFCC00",
"labelBackgroundColor": "#ececec", "labelBackgroundColor": "#ECECEC",
"labelTextColor": "#000000", "labelTextColor": "#000000",
"navIconColor": "#222222", "navIconColor": "#222222",
"radioCheckedBackgroundColor": "#e0e0e0", "radioCheckedBackgroundColor": "#E0E0E0",
"radioCheckedIndicatorColor": "#222222", "radioCheckedIndicatorColor": "#222222",
"radioUncheckedColor": "#e0e0e0", "radioUncheckedColor": "#E0E0E0",
"rowIconColor": "#222222", "rowIconColor": "#222222",
"tableAltBackgroundColor": "#fafafa", "tableAltBackgroundColor": "#FAFAFA",
"tableBackgroundColor": "#f4f4f4", "tableBackgroundColor": "#F4F4F4",
"tableBorderColor": "#cccccc", "tableBorderColor": "#CCCCCC",
"tableHeaderBackgroundColor": "#e0e0e0", "tableHeaderBackgroundColor": "#E0E0E0",
"tableHeaderBorderColor": "#c0c0c0", "tableHeaderBorderColor": "#C0C0C0",
"tableHeaderGradientColor": "#e0e0e0", "tableHeaderGradientColor": "#E0E0E0",
"tableHeaderTextColor": "#333333", "tableHeaderTextColor": "#333333",
"tableScrollBackgroundColor": "#d0d0d0", "tableScrollBackgroundColor": "#D0D0D0",
"tableScrollHandleColor": "#888888", "tableScrollHandleColor": "#888888",
"tableSectionBorderDark": "#cccccc", "tableSectionBorderDark": "#CCCCCC",
"tableSectionBorderLight": "#ffffff", "tableSectionBorderLight": "#FFFFFF",
"tableSelectedColor": "#dddddd", "tableSelectedColor": "#DDDDDD",
"toolButtonAccentColor": "#a0a0a0", "toolButtonAccentColor": "#A0A0A0",
"upArrowColor": "#222222" "upArrowColor": "#222222"
}, },
"navigationTree": { "navigationTree": {
"branchIndicatorColor": "#606060", "branchIndicatorColor": "#606060",
"branchIndicatorSelectedColor": "#ffffff", "branchIndicatorSelectedColor": "#FFFFFF",
"folderIconColor": "#606060", "folderIconColor": "#606060",
"folderIconSelectedColor": "#ffffff", "folderIconSelectedColor": "#FFFFFF",
"folderIconSelectedShadowColor": "#161616", "folderIconSelectedShadowColor": "#161616",
"folderIconShadowColor": "#ffffff", "folderIconShadowColor": "#FFFFFF",
"folderNotCompletedColor": "#555f7f", "folderNotCompletedColor": "#555F7F",
"folderReadOverlayColor": "#ffffff", "folderReadOverlayColor": "#FFFFFF",
"folderReadOverlaySelectedColor": "#161616", "folderReadOverlaySelectedColor": "#161616",
"newItemColor": "#555f7f", "newItemColor": "#555F7F",
"scrollBackgroundColor": "#e0e0e0", "scrollBackgroundColor": "#E0E0E0",
"scrollHandleColor": "#888888", "scrollHandleColor": "#888888",
"selectedTextColor": "#ffffff", "selectedTextColor": "#FFFFFF",
"selectionBackgroundColor": "#333133", "selectionBackgroundColor": "#333133",
"textColor": "#000000" "textColor": "#000000"
}, },
"noLibrariesWidget": { "noLibrariesWidget": {
"backgroundColor": "#ffffff", "backgroundColor": "#FFFFFF",
"descriptionTextColor": "#565959", "descriptionTextColor": "#565959",
"iconColor": "#cccccc", "iconColor": "#CCCCCC",
"noLibrariesLineColor": "#a8a8a8", "noLibrariesLineColor": "#A8A8A8",
"textColor": "#495252" "textColor": "#495252"
}, },
"readingListIcons": { "readingListIcons": {
"currentlyReadingMainColor": "#ffcc00", "currentlyReadingMainColor": "#FFCC00",
"currentlyReadingMainSelectedColor": "#ffcc00", "currentlyReadingMainSelectedColor": "#FFCC00",
"currentlyReadingOuterColor": "#000000", "currentlyReadingOuterColor": "#000000",
"currentlyReadingOuterSelectedColor": "#000000", "currentlyReadingOuterSelectedColor": "#000000",
"favoritesMainColor": "#e15055", "favoritesMainColor": "#E15055",
"favoritesMainSelectedColor": "#e15055", "favoritesMainSelectedColor": "#E15055",
"labelColors": { "labelColors": {
"blue": "#82c7ff", "blue": "#82C7FF",
"cyan": "#a0fddb", "cyan": "#A0FDDB",
"dark": "#b7b7b7", "dark": "#B7B7B7",
"green": "#ade738", "green": "#ADE738",
"light": "#cbcbcb", "light": "#CBCBCB",
"orange": "#f5c240", "orange": "#F5C240",
"pink": "#fd9cda", "pink": "#FD9CDA",
"purple": "#d692fc", "purple": "#D692FC",
"red": "#f67a7b", "red": "#F67A7B",
"violet": "#8f95ff", "violet": "#8F95FF",
"white": "#fcfcfc", "white": "#FCFCFC",
"yellow": "#f2e446" "yellow": "#F2E446"
}, },
"labelShadowColor": "#8f8f8f", "labelShadowColor": "#8F8F8F",
"labelShadowSelectedColor": "#161616", "labelShadowSelectedColor": "#161616",
"listDetailColor": "#ffffff", "listDetailColor": "#FFFFFF",
"listDetailSelectedColor": "#161616", "listDetailSelectedColor": "#161616",
"listMainColor": "#808080", "listMainColor": "#808080",
"listMainSelectedColor": "#ffffff", "listMainSelectedColor": "#FFFFFF",
"listShadowColor": "#8f8f8f", "listShadowColor": "#8F8F8F",
"listShadowSelectedColor": "#161616", "listShadowSelectedColor": "#161616",
"readingListMainColor": "#808080", "readingListMainColor": "#808080",
"readingListMainSelectedColor": "#808080", "readingListMainSelectedColor": "#808080",
"specialListShadowColor": "#8f8f8f", "specialListShadowColor": "#8F8F8F",
"specialListShadowSelectedColor": "#161616" "specialListShadowSelectedColor": "#161616"
}, },
"searchLineEdit": { "searchLineEdit": {
"backgroundColor": "#333133", "backgroundColor": "#333133",
"iconColor": "#efefef", "iconColor": "#EFEFEF",
"textColor": "#ffffff" "textColor": "#FFFFFF"
}, },
"serverConfigDialog": { "serverConfigDialog": {
"backgroundColor": "#ffffff", "backgroundColor": "#FFFFFF",
"checkBoxTextColor": "#262626", "checkBoxTextColor": "#262626",
"decorationColor": "#606060", "decorationColor": "#606060",
"labelTextColor": "#575757", "labelTextColor": "#575757",
"propagandaTextColor": "#4d4d4d", "propagandaTextColor": "#4D4D4D",
"qrBackgroundColor": "#ffffff", "qrBackgroundColor": "#FFFFFF",
"qrForegroundColor": "#606060", "qrForegroundColor": "#606060",
"qrMessageTextColor": "#a3a3a3", "qrMessageTextColor": "#A3A3A3",
"titleTextColor": "#474747" "titleTextColor": "#474747"
}, },
"shortcutsIcons": { "shortcutsIcons": {
"iconColor": "#606060" "iconColor": "#606060"
}, },
"sidebar": { "sidebar": {
"backgroundColor": "#fbfbfb", "backgroundColor": "#FBFBFB",
"busyIndicatorColor": "#808080", "busyIndicatorColor": "#808080",
"sectionSeparatorColor": "#e0e0e0", "sectionSeparatorColor": "#E0E0E0",
"separatorColor": "#808080", "separatorColor": "#808080",
"titleDropShadowColor": "#ffffff", "titleDropShadowColor": "#FFFFFF",
"titleTextColor": "#4a494a", "titleTextColor": "#4A494A",
"uppercaseLabels": true "uppercaseLabels": true
}, },
"sidebarIcons": { "sidebarIcons": {
"iconColor": "#4f4e4f", "iconColor": "#4F4E4F",
"shadowColor": "#fbfbfb", "shadowColor": "#FBFBFB",
"useSystemFolderIcons": false "useSystemFolderIcons": false
}, },
"whatsNewDialog": { "whatsNewDialog": {
"backgroundColor": "#ffffff", "backgroundColor": "#FFFFFF",
"closeButtonColor": "#444444", "closeButtonColor": "#444444",
"contentTextColor": "#0a0a0a", "contentTextColor": "#0A0A0A",
"headerDecorationColor": "#e8b800", "headerDecorationColor": "#E8B800",
"headerTextColor": "#0a0a0a", "headerTextColor": "#0A0A0A",
"linkColor": "#e8b800", "linkColor": "#E8B800",
"versionTextColor": "#858585" "versionTextColor": "#858585"
} }
} }

2
common/CMakeLists.txt
View File

@ -120,6 +120,8 @@ add_library(common_gui STATIC
themes/shared/whats_new_dialog_theme.h themes/shared/whats_new_dialog_theme.h
themes/theme_editor_dialog.h themes/theme_editor_dialog.h
themes/theme_editor_dialog.cpp themes/theme_editor_dialog.cpp
themes/theme_json_utils.h
themes/theme_json_utils.cpp
themes/theme_meta.h themes/theme_meta.h
themes/theme_repository.h themes/theme_repository.h
themes/theme_repository.cpp themes/theme_repository.cpp

23
common/themes/theme_editor_dialog.cpp
View File

@ -1,4 +1,5 @@
#include "theme_editor_dialog.h" #include "theme_editor_dialog.h"
#include "theme_json_utils.h"
#include <QApplication> #include <QApplication>
#include <QColorDialog> #include <QColorDialog>
@ -51,17 +52,8 @@ static QString displayKey(const QString &key)
return result; return result;
} }
static bool isColorString(const QString &s)
{
// Accepts #RGB, #RRGGBB, #AARRGGBB
if (!s.startsWith('#'))
return false;
const int len = s.length();
return len == 4 || len == 7 || len == 9;
}
ThemeEditorDialog::ThemeEditorDialog(const QJsonObject &params, QWidget *parent) ThemeEditorDialog::ThemeEditorDialog(const QJsonObject &params, QWidget *parent)
: QDialog(parent), params(params) : QDialog(parent), params(normalizeThemeJson(params))
{ {
setWindowTitle(tr("Theme Editor")); setWindowTitle(tr("Theme Editor"));
resize(520, 700); resize(520, 700);
@ -206,7 +198,7 @@ void ThemeEditorDialog::populate(QTreeWidgetItem *parent, const QJsonObject &obj
item->setData(0, PathRole, childPath); item->setData(0, PathRole, childPath);
const QString strVal = val.toString(); const QString strVal = val.toString();
if (val.isString() && isColorString(strVal)) { if (val.isString() && isThemeHexColorString(strVal)) {
const QColor color(strVal); const QColor color(strVal);
item->setIcon(1, colorIcon(color)); item->setIcon(1, colorIcon(color));
item->setText(1, strVal); item->setText(1, strVal);
@ -256,11 +248,12 @@ void ThemeEditorDialog::applyColorToItem(QTreeWidgetItem *item, const QColor &co
const QString hexStr = color.alpha() < 255 const QString hexStr = color.alpha() < 255
? color.name(QColor::HexArgb) ? color.name(QColor::HexArgb)
: color.name(QColor::HexRgb); : color.name(QColor::HexRgb);
item->setText(1, hexStr); const QString normalizedHexStr = hexStr.toUpper();
item->setText(1, normalizedHexStr);
item->setIcon(1, colorIcon(color)); item->setIcon(1, colorIcon(color));
const QStringList path = item->data(0, PathRole).toStringList(); const QStringList path = item->data(0, PathRole).toStringList();
setJsonPath(params, path, hexStr); setJsonPath(params, path, normalizedHexStr);
} }
void ThemeEditorDialog::toggleBoolItem(QTreeWidgetItem *item) void ThemeEditorDialog::toggleBoolItem(QTreeWidgetItem *item)
@ -409,7 +402,7 @@ void ThemeEditorDialog::saveToFile()
QMessageBox::warning(this, tr("Save failed"), tr("Could not open file for writing:\n%1").arg(path)); QMessageBox::warning(this, tr("Save failed"), tr("Could not open file for writing:\n%1").arg(path));
return; return;
} }
file.write(QJsonDocument(params).toJson(QJsonDocument::Indented)); file.write(serializeNormalizedThemeJson(params));
} }
void ThemeEditorDialog::loadFromFile() void ThemeEditorDialog::loadFromFile()
@ -436,7 +429,7 @@ void ThemeEditorDialog::loadFromFile()
return; return;
} }
params = doc.object(); params = normalizeThemeJson(doc.object());
syncMetaFromParams(); syncMetaFromParams();
tree->clear(); tree->clear();
populate(nullptr, params, { }); populate(nullptr, params, { });

50
common/themes/theme_json_utils.cpp Normal file
View File

@ -0,0 +1,50 @@
#include "theme_json_utils.h"
#include <QJsonArray>
#include <QJsonValue>
#include <QRegularExpression>
namespace {
QJsonValue normalizeThemeJsonValue(const QJsonValue &value)
{
if (value.isObject())
return normalizeThemeJson(value.toObject());
if (value.isArray()) {
QJsonArray normalizedArray = value.toArray();
for (int i = 0; i < normalizedArray.size(); ++i)
normalizedArray[i] = normalizeThemeJsonValue(normalizedArray.at(i));
return normalizedArray;
}
if (value.isString()) {
const QString stringValue = value.toString();
if (isThemeHexColorString(stringValue))
return stringValue.toUpper();
}
return value;
}
}
bool isThemeHexColorString(const QString &value)
{
static const QRegularExpression colorRegex(
"^#(?:[0-9A-Fa-f]{3}|[0-9A-Fa-f]{6}|[0-9A-Fa-f]{8})$");
return colorRegex.match(value).hasMatch();
}
QJsonObject normalizeThemeJson(const QJsonObject &json)
{
QJsonObject normalized;
for (auto it = json.constBegin(); it != json.constEnd(); ++it)
normalized.insert(it.key(), normalizeThemeJsonValue(it.value()));
return normalized;
}
QByteArray serializeNormalizedThemeJson(const QJsonObject &json, QJsonDocument::JsonFormat format)
{
return QJsonDocument(normalizeThemeJson(json)).toJson(format);
}

14
common/themes/theme_json_utils.h Normal file
View File

@ -0,0 +1,14 @@
#ifndef THEME_JSON_UTILS_H
#define THEME_JSON_UTILS_H
#include <QByteArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QString>
bool isThemeHexColorString(const QString &value);
QJsonObject normalizeThemeJson(const QJsonObject &json);
QByteArray serializeNormalizedThemeJson(const QJsonObject &json,
QJsonDocument::JsonFormat format = QJsonDocument::Indented);
#endif // THEME_JSON_UTILS_H

3
common/themes/theme_repository.cpp
View File

@ -1,4 +1,5 @@
#include "theme_repository.h" #include "theme_repository.h"
#include "theme_json_utils.h"
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
@ -78,7 +79,7 @@ QString ThemeRepository::saveUserTheme(QJsonObject themeJson)
QFile file(filePath); QFile file(filePath);
if (file.open(QIODevice::WriteOnly)) { if (file.open(QIODevice::WriteOnly)) {
file.write(QJsonDocument(themeJson).toJson(QJsonDocument::Indented)); file.write(serializeNormalizedThemeJson(themeJson));
file.close(); file.close();
} }