diff --git a/.github/workflows/theme-checks.yml b/.github/workflows/theme-checks.yml index 477851d..cdc4e51 100644 --- a/.github/workflows/theme-checks.yml +++ b/.github/workflows/theme-checks.yml @@ -207,6 +207,8 @@ jobs: - uses: actions/checkout@v7 - name: Check Cinnamon preference activation run: python3 tests/test_install_settings.py DesktopSettingTests.test_cinnamon_activation + - name: Check real Cinnamon Settings preview lookup for all accents + run: python3 tests/report.py xvfb-run -a dbus-run-session -- python3 tests/cinnamon_theme_previews.py /tmp/cinnamon-color-evidence/previews - name: Check native Cinnamon colors and task overlays env: LIBGL_ALWAYS_SOFTWARE: '1' diff --git a/INSTALLING.md b/INSTALLING.md index befa2b2..b20f3d7 100644 --- a/INSTALLING.md +++ b/INSTALLING.md @@ -135,6 +135,12 @@ setup prints a manual reload/reselection hint. From the Cinnamon session, run: gdbus call --session --dest org.Cinnamon --object-path /org/Cinnamon --method org.Cinnamon.ReloadTheme ``` +Cinnamon/Mint Themes shows included previews for **Window borders**, **Controls** +and **Desktop**. These are compact palette-based illustrations, not screenshots. +Desktop and Controls previews follow the installed accent; window decorations +use the same neutral preview across accents. Reopen Themes after an update if +an already-open chooser still displays its earlier thumbnail. + Separate user and system installations each retain their own color. Shared-system guided setup also has an Accent color choice. diff --git a/accents/SHA256SUMS b/accents/SHA256SUMS index df3b233..eb8269d 100644 --- a/accents/SHA256SUMS +++ b/accents/SHA256SUMS @@ -1,4 +1,4 @@ -a1dd5d776928c5b7007aa15ced7934b2bf2748d1aa69ebab4abc5530d64651a6 gold/SHA256SUMS +9f8e2f7688e4769e65547a3ffaab4c917f2ad0b6de7a4995c46847f2d9b652c0 gold/SHA256SUMS 3bb0ac0514ee5ab7e91040c7aba0e969bfb308a4035f3c883f3877e2e83f9dec gold/accent-name 88f2d7f83ded536d78f28189e635a021c035e925c652ec499566a4e794e2695f gold/cinnamon/cinnamon.css 87d5f992a48ef1dc39585067c4253f3398cd9937c38087ea419569acd99e8e2e gold/cinnamon/common-assets/misc/add-workspace-active.svg @@ -25,6 +25,7 @@ b72fc84705bef30d99570241821c971a9b1db64d5a1597a20cbcbe7ea99de659 gold/cinnamon/ d64371b48dff72513d0bbba898461f75c1336d3fec971c4915194019bd4aacb9 gold/cinnamon/dark-assets/misc/message.svg 251cceda3464daa30321f2347ac018a35678e6cd1fd2bc0b4de19ee20b1942bf gold/cinnamon/dark-assets/misc/modal.svg 5b644ee5c2817f7d2b112687aba19b84f2db17b8341bf377c1a60603c6cbd058 gold/cinnamon/dark-assets/switch/switch-on.svg +ae6481a85d8001263016deeb96e4385f4d17ca5f91a7c49f97e447766e709dd2 gold/cinnamon/thumbnail.png 374bba72e793ceb9890d9e5d9e24cc291e7e744fa7919f8aadb0146f1068fc59 gold/extra/alacritty/alacritty.toml 9ba8abd50bf33f4eb0d96755662410735c0c1a6d00079acc1f074be9a0e410f6 gold/extra/bat/themes/adwaita-amoled.tmTheme c3c4cb8f2bbc6f2b46d09ac7ba1cbf78ceb5e97d609185793760a6441544bb30 gold/extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -85,10 +86,11 @@ cb3b550f3a7d3451c7903edc1a48401b1dbc8dc0b60fa937e174ea00cce74a89 gold/gnome-she 658450e293f643a36cc3e2354c753db3940eae2a415904055508ddfbf297ced4 gold/gnome-shell/gnome-shell.css bca3d24d700b9948d9681e656711015ceba25aafec3564ae353d70086d779347 gold/gtk-2.0/gtkrc 6a735cb2c10edded24483ed299fac7ba8258356915429412c3e26020c9ccff5e gold/gtk-3.0/gtk.gresource +abc2bdd2e22bb21509fa596496bb6f2beda0bf2f38aeedce0fed21f70c281e33 gold/gtk-3.0/thumbnail.png 75c9e54f83f7e33f84806633234d201b0a5ff5840356eaf933627756971665eb gold/gtk-4.0/gtk.gresource d07fe7472c95e7f18f669f4eb7e8698611c7d116ab4708d62d3b9d7329bed256 gold/metacity-1/metacity-theme-3.xml fd2667891e63f00f71f6c50966d3b6e9de5773e77ac2403b780f0e1a5887e744 gold/openbox-3/themerc -0520b47b4a476cc0fb9a79b2a1ec96d401cd952f5d4cc0d9f457f0a792c599d2 green/SHA256SUMS +539a937f1423fe12d32d43824404faef739ba571e021b188e2cb2b25dab1bf42 green/SHA256SUMS 068d48ea288a4f2178367c403a39abbb8d7ade9766b5cf33bedfabf4fd6443f2 green/accent-name a0308bfed21626ca74db06cd6af02f8189aa9cf3244003164107c9774d229edb green/cinnamon/cinnamon.css 6db4610f23db3e2b811e7ea48ab99a3a0f1a8aa9f7f85f8fa556fb51882650f0 green/cinnamon/common-assets/misc/add-workspace-active.svg @@ -115,6 +117,7 @@ f13eea1a003b3eed8140f1b1c8f791ebff700a20c0d60b33d79a048ad7644ec5 green/cinnamon 022c265606f9077cdadb0f680f6d6c194073ab23a18a24ba45d080412a3b08cb green/cinnamon/dark-assets/misc/message.svg f9336e5419e70984cf36d84bbf8a010cceb1214765d9735bab3f4791fd610e2e green/cinnamon/dark-assets/misc/modal.svg 5d0be499ba21245b62710ed8461a845cf9b4b7e0ef7b7f11e43c1f57de4aea8e green/cinnamon/dark-assets/switch/switch-on.svg +f0c03918511ccb03e7dc3df0d97c89aa16ded705bab7a90998d7a96352c037f6 green/cinnamon/thumbnail.png 55545e6e87dad51a1680c33322b2bc40ac82a71d892f8d64720021d17b20b7bf green/extra/alacritty/alacritty.toml 0d9f442d8e371841b20970d33af3357a99fba95ab8bbbe1ed63d7b9f8b8e4760 green/extra/bat/themes/adwaita-amoled.tmTheme beab6049bd35493205c7dadbb116d8c028120bdb8d44660ce1a3dd8cc512971a green/extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -175,10 +178,11 @@ dd61b735d19ac611cc998bb2793b249d4c8c1c9825624ff3e1e2196005a3b2fc green/gnome-sh 78936f0bcf8ddd16e3bc7af6e7fc94fee1a85dd07d5dfc6bd455bcc8388d026d green/gnome-shell/gnome-shell.css 3d444be15e10d370737a48b9bfe0fa075be52fec40fb00258df73179980588e2 green/gtk-2.0/gtkrc 7be5df384ac91d35a3157d47810280783d799e98331afff38dfb4069f0fc2928 green/gtk-3.0/gtk.gresource +71e0f96ae160cd87009166ca5c3fa3c66afaf47d1b5510ac7058c347f51cf2a4 green/gtk-3.0/thumbnail.png c95592fbf53473f8731630fc035fa4a887f68dc8d030147357be4aee97710c95 green/gtk-4.0/gtk.gresource 83dcd9f8ed1628598ac38d50c44f34fb8cce3e411c509e4f1f32a06d7060bc3c green/metacity-1/metacity-theme-3.xml 2172e8d2f8e60d4ff3699c6b3c5cca3908d2cb63fb2382c5ae19206004cc8de7 green/openbox-3/themerc -38404afcfdc6158763010540b99d3010a4fc4914d93e58be2e1285ed52885fc3 orange/SHA256SUMS +a0111cd3baed2171756ccb51749cfce197b1347aea9798e168403234ad8eddf0 orange/SHA256SUMS be6fe11876282442bead98e8b24aca07f8972a763cd366c56b4b5f7bcdd23eac orange/accent-name ed0e423f31b0f009c16f19d589bee92fa8dc6b7508f136fa00d11d9724ec7ee0 orange/cinnamon/cinnamon.css 81badb3f80d9f11b9176350c3c35411c89ca5bba0a9801f4eeefa42ce381a923 orange/cinnamon/common-assets/misc/add-workspace-active.svg @@ -205,6 +209,7 @@ be1531d9d08ef18bc9d8cb2f7706a41c143515bfc1d8b1623994e575bcab9542 orange/cinnamo 539693774b7afa173fdd51913d42d4958b9e610df523aba5bdc7a87a5953f987 orange/cinnamon/dark-assets/misc/message.svg f57b7c794864c4905876fcbfd01e6b1c0031164491d038f9ae7e251af6d4dc5e orange/cinnamon/dark-assets/misc/modal.svg 7cb63fecebdf6d452c3ade7986220c1a6923600b3c530880373d530690336cdb orange/cinnamon/dark-assets/switch/switch-on.svg +859dc933784c66b98600793e6472e865dbaba7bc6522201b20144846e872628a orange/cinnamon/thumbnail.png e068b777bd5d384783f974154a218a212ef4bee0bfaaa0c3144d9c6b37259ba6 orange/extra/alacritty/alacritty.toml 688c20b372a47363965302f6d4c7d117c41f0fa2e002f08377c2a22d6cc12aed orange/extra/bat/themes/adwaita-amoled.tmTheme 1103102b283d194ef7c2d7e5f3154eebe1c44eec7ac3b8e7cc6d8892e5fc136f orange/extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -265,10 +270,11 @@ a5e60b6a7716d97a9d52014c0b5c05a43dc57d8f0d78a7556b4a702985d167fc orange/extra/q 713b41ba0c61152b00e85273ecbc75e4b6ae2959581f9eeefbad647f1659cdd8 orange/gnome-shell/gnome-shell.css 4eadf61535f3857857106316921462efc57e405839b19301e6c4588b1aee55e5 orange/gtk-2.0/gtkrc 2e3745d462cb6c6bc3dc379ced85e44fe6a7cc2c1954e21e4066779ade4527b5 orange/gtk-3.0/gtk.gresource +ec1ae39b33def517a83a6858341c533e18ea84c1e77ce4d8ee89d206e3a6e69e orange/gtk-3.0/thumbnail.png d1bb488d15f1d02a6a71af9e9a1c1c05d1c1b9d016671a9fa1b990029d911ec4 orange/gtk-4.0/gtk.gresource 95a857de1c8b8c85713305df00b3eb3111584abbfc9e606c9d15837ad809a171 orange/metacity-1/metacity-theme-3.xml 55a9dde06cfd6829a1edb3018cafeb7fb25abfac8ae6a1437a1786014979abf1 orange/openbox-3/themerc -71edd56ad5bedf4f15bf684ea154ba2fe5871db959a39f49742ffd5a120692b2 pink/SHA256SUMS +6b55ca73ee3575130eb2658070d3c3bf24bd9dc8479702a2851798147db134d4 pink/SHA256SUMS 2747b90acedfbf6e4cd876ed207cc39da98bf4739d1c0965e94b9edb4951cf2f pink/accent-name dcd0904f2965f7d9fd128d798f3573df9cc2b8ebf9ad0f6decf39e32914cb9b9 pink/cinnamon/cinnamon.css 93df58a120e24e2df443d8551e60c7b84af73168c329fe8fa3a1b834e231e016 pink/cinnamon/common-assets/misc/add-workspace-active.svg @@ -295,6 +301,7 @@ d1b98dda25e6fabc4b4b00288330b3aeb7995c284d441b02858c5acbefbb8563 pink/cinnamon/ 55df089344b4c54e60ea7b11791b64bda93d6646df079e34b07d4816e34f952d pink/cinnamon/dark-assets/misc/message.svg ec1918e12fc6860a836ae5d5f85ce4160f58380d201e238a891ec203bfb5b6bb pink/cinnamon/dark-assets/misc/modal.svg bce9a3d41738587b03dab3208f4fde9204d8cb086126f207ef9a7ad1e38a6df5 pink/cinnamon/dark-assets/switch/switch-on.svg +5633bd9616e36815329aaa0b5939c371350f65adf4da73de069ffe7e4392dbfc pink/cinnamon/thumbnail.png fbb2133ee91673174b9f55bad3ede8dfad61a774a18f262cfdb889a52bc54438 pink/extra/alacritty/alacritty.toml ca735d2ae2305d84ab4664d4e8ed235614a60bdd89548bdf23ed4d8b7df869ee pink/extra/bat/themes/adwaita-amoled.tmTheme 2eaf2e7a76d5f17457b2f2bb882cfe91a4f0a400c00c2bc8835249b1fc1abda4 pink/extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -355,10 +362,11 @@ c919f2eeb56d9b377b085d4cbc51ab5db1e3975f8220e8af3c223be0dfa2e789 pink/gnome-she c919f2eeb56d9b377b085d4cbc51ab5db1e3975f8220e8af3c223be0dfa2e789 pink/gnome-shell/gnome-shell.css 2386ff5e652983cc69b2e5023f75c95e36f7fe9e07955e6ba8b4c8a58ad9ee60 pink/gtk-2.0/gtkrc 3466915177bb3ac9e80f53d3fa60ad9ac4d0ff27c665a0d76d1388d064dc60dd pink/gtk-3.0/gtk.gresource +f944575c30c563f7bd2728b90f8553256e0b060c4ac87674f1eafff8f5cf6349 pink/gtk-3.0/thumbnail.png b3f4f92d106a9c87232e47d4214cea0b74945f82dcc83c2f287f8e0fdb4ad180 pink/gtk-4.0/gtk.gresource 78bdae72d8ec41159296330d2a3b033d4ec74c513694e1fc6a179ecba2027ab2 pink/metacity-1/metacity-theme-3.xml 408df9631c080e8f54472bda191cc680c4e361f204250057bf2fe48fc03304d1 pink/openbox-3/themerc -21b9ef4096f492e7b576677dda5926771b93272cfbcc360b4ea8ded64c495552 purple/SHA256SUMS +44b51db20106f89309b1fa07e7b44bd71e42fa08cd5e31b27fd9de72b024884a purple/SHA256SUMS 596157e5858a0c647af6a4f55945b9c09ed70dc3f5d0e3db248ea5d5136e8ad3 purple/accent-name dfe8424608c12df323f392288abc5711d1a03d71f4e465c6e8f8f6549afeaed8 purple/cinnamon/cinnamon.css 8bb8080b644db60afa7675cf374cb5480facf1024022f4aeb616f92067bff621 purple/cinnamon/common-assets/misc/add-workspace-active.svg @@ -385,6 +393,7 @@ d4181661e69aed89d53ebe945258f51e28124050eaa944988adf4e3d23f153d6 purple/cinnamo 5792120dd1b047620456573a749bab73cbfd93bb97092d18a08db7ca87760ac4 purple/cinnamon/dark-assets/misc/message.svg 173d487d9b54278a00c6222987e0e22a6078e5f488d97b52a9c7671a3cf01f72 purple/cinnamon/dark-assets/misc/modal.svg 57653fa0125e564c6dfe20525da77ebe39ef2d30a2c5e8a941b50244d7e1a797 purple/cinnamon/dark-assets/switch/switch-on.svg +7f741108ef33581e304bade6233692c30b00b4118647ef1025ab90990ae8010d purple/cinnamon/thumbnail.png 8a11cc4fec7d687f9fa7664b0bcf6bf82d31a6248387aded27a99d18a51190f0 purple/extra/alacritty/alacritty.toml 7f91b189e823b1149d96f997fdd8eb96707fcd0dd1ad50e338031d1f966a13fc purple/extra/bat/themes/adwaita-amoled.tmTheme d2b251fcc043783b9948b62b796f58cd2ff2cd6b66651b22a0ce7b452ff9d76b purple/extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -445,10 +454,11 @@ d4ec91efc3e09435efbd983016dee179e5ea85b9e8985232ba8da1eb5bd3f4f9 purple/gnome-s 6ecf45acbd32eefa0a9a019f41d8d9c7296efbecd6d867f8fc83c5a654c6b27d purple/gnome-shell/gnome-shell.css aed26e8cc09280c6bb0b8fce134d5c71784284039816c5762c1c74266fd9987e purple/gtk-2.0/gtkrc c1182696d8aaf20df1d8484ebdf6675b6c6e59810f1402c23d00880f621dd145 purple/gtk-3.0/gtk.gresource +dbc6bce74619fcab001c54dfd2f1bf81d2be8b2713666c03ae37e026a04b0085 purple/gtk-3.0/thumbnail.png c61b15350b450d61b29d19fb9ffdaccc9a0f2b018290e7eee0653e2834e7cbbb purple/gtk-4.0/gtk.gresource bd5f7af843540db7b31b893e7aa17b486be272acc44d90d9c090ba43707d54e8 purple/metacity-1/metacity-theme-3.xml 059a59f1c3e03a359d696754db781cfabea8aa97cb8bbc985353eb6244162e47 purple/openbox-3/themerc -c6d1b584634a9c516598c38d7ba99b2b33c404f801ebcdea9118aac0146df1f5 red/SHA256SUMS +c77e76489f30ed2d3910a09e8455ad8555c2eade46bd8bfdcb7b0dc830f20db8 red/SHA256SUMS 6ace33171ce0acb6891e3cc311d75a97aa429d77c05cba600d49ed9652ed49de red/accent-name d3d75c825d0478353473602a9c033bcd651348e2f4b394bac5172068043910a1 red/cinnamon/cinnamon.css ca41c645adf455105cd2cacf6e39adf23b69dcc6f1bfadd01d633ec35619ba39 red/cinnamon/common-assets/misc/add-workspace-active.svg @@ -475,6 +485,7 @@ c59e3dba8c1a6ac71b9316a3d2ed86c266046c16db4d75b39c2056367ce3d1cc red/cinnamon/d 6636db242221d4719218eefae6cedb9098f48ea2a6b1d6adb45997d5ad900e26 red/cinnamon/dark-assets/misc/message.svg 2643a544366bed224e3ca1a3ee16b35eb7e135349c3a88ec73aac3cac4f1068e red/cinnamon/dark-assets/misc/modal.svg 98872ed7d52478622910966a529dfbb8569e371c905143615a843393dd4bbbdb red/cinnamon/dark-assets/switch/switch-on.svg +957df478ef433618116f2d5682e117fe445c4e842019b0d37cf578cf40a897d6 red/cinnamon/thumbnail.png dbc93f80f40311fade4cee0cc8a34d8abcba780af61b0cc92d3fb419071aaec2 red/extra/alacritty/alacritty.toml 65268998e82a1339f4b0bd41438ad9a7b43307b0249719364194ba8244be39a5 red/extra/bat/themes/adwaita-amoled.tmTheme 2596f07c57737389e09748251ba691cbfe531c9e902d365882523aa329108efe red/extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -535,10 +546,11 @@ bf8954bdd3face3a7436d8b6146ef3529d7bcef17d732524a7e3083011375e8a red/gnome-shel 93b9335314bbec070e02125e1d23765b3f10435bb5238f75576572e95ff67d53 red/gnome-shell/gnome-shell.css 49f49b83ff4d5e200e20b537fafc9f92332f37fc6a60178da111540dd282a69d red/gtk-2.0/gtkrc 325bf114b5ff25b2d548d695a749a9635158499ca0472e1e20fc49f1d749b875 red/gtk-3.0/gtk.gresource +a291a53695410617d1550791048cef5f4eeefc1970ac0de0fa12112fd39e0393 red/gtk-3.0/thumbnail.png 60f73b022d5124dcaeb638e753812f66de2d9d5e9d8401069e4c94ccb6765d68 red/gtk-4.0/gtk.gresource b4b4c68579f6482aef0455e2042a2f4af8d1cb8cd3115f4e65aec27de4529423 red/metacity-1/metacity-theme-3.xml ac63739c4b8a73ad6e4123587c7c5743f5e94583fca0ab2cb19d3915d9d4da09 red/openbox-3/themerc -8393ad23900f6b410bd361d70b2037a08eba8c36e23000e2d84bbef04b662e89 yellow/SHA256SUMS +962dfdc7e58706c82497f303840a524cf7c73013832ff55b2c007b2ef4f7139a yellow/SHA256SUMS 6b4f36d8805a243e2d880036398724b6e4f4fb9998dbccae74685a0be9e0e599 yellow/accent-name 94ba35e32aa7d2a7c2058f81e6269022c41dad037cda33c2aa4df256c29ade88 yellow/cinnamon/cinnamon.css 421909ab33d87cc1c77e0b5d04d1f197012b7abf4c933bbac4bb58a7e3f3c0bc yellow/cinnamon/common-assets/misc/add-workspace-active.svg @@ -565,6 +577,7 @@ d9f99f58d8c8df8e9e95f8231ae218bccbd12d24dac0593ef37ae07c6bcc24df yellow/cinnamo 9f66e86737e2314cdbba7ec117218e513c18179785b40b56715353a52cf5548d yellow/cinnamon/dark-assets/misc/message.svg 5630f5f6b99abce1ca6779d03c8ca6b84ebcd8179e7042e65c66d8515c2276d7 yellow/cinnamon/dark-assets/misc/modal.svg 86099a3c35eeb31c22e0a9624f5e92241048e6c43e115ff6a7aa2acf10916538 yellow/cinnamon/dark-assets/switch/switch-on.svg +d0774086b4e43dace63c0a7182e66b1fe7794a7a7d287feafc1129bf7b198494 yellow/cinnamon/thumbnail.png 1388457ae1ea615da07f69b8b5373b06dfae71b22a753c318b87d9f2bcd3d64a yellow/extra/alacritty/alacritty.toml 6de99f5cac6b9c2c4aaa8f523b6e39f2cf79e5167e1b899afbc243f452c76cb8 yellow/extra/bat/themes/adwaita-amoled.tmTheme fbd113cd36f7e03612b25410963ef0cf6f38e7be50af218d69080412fc07fa4c yellow/extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -625,6 +638,7 @@ d387163816a860e3399babca330f56c007c39411c4080143cae3e37f54e78080 yellow/gnome-s 11102e05b53cdd48a264563bd848c121b1bee777903f69763782a8c4e2dd3e3a yellow/gnome-shell/gnome-shell.css 4146c860efa3e6392bd7dc57ded1b9840b7b96ba4a1f1511273fa3b14769d995 yellow/gtk-2.0/gtkrc d0877f7698fd5bf09f7a3dc8582e25d213b3815581ffe608a5ccacfccb3ef35c yellow/gtk-3.0/gtk.gresource +417b6c345ce3581c8044fd578f3b71056d1251ae5d52227e06b149ad7e243fac yellow/gtk-3.0/thumbnail.png e54562ce26e512b70db2a758aff3198d2798883d1aa8169435267b7accb7bb6a yellow/gtk-4.0/gtk.gresource afb5210f37e3d67d2a4f7204417edc3a78c2b1bd1ec4728397e49814757b95fc yellow/metacity-1/metacity-theme-3.xml 6ccd6c2026985652c1dc42dfed442ac27f4d992752495af99527a6aa00e9798c yellow/openbox-3/themerc diff --git a/accents/gold/SHA256SUMS b/accents/gold/SHA256SUMS index 7ae8cfe..ba391fd 100644 --- a/accents/gold/SHA256SUMS +++ b/accents/gold/SHA256SUMS @@ -24,6 +24,7 @@ b72fc84705bef30d99570241821c971a9b1db64d5a1597a20cbcbe7ea99de659 cinnamon/dark- d64371b48dff72513d0bbba898461f75c1336d3fec971c4915194019bd4aacb9 cinnamon/dark-assets/misc/message.svg 251cceda3464daa30321f2347ac018a35678e6cd1fd2bc0b4de19ee20b1942bf cinnamon/dark-assets/misc/modal.svg 5b644ee5c2817f7d2b112687aba19b84f2db17b8341bf377c1a60603c6cbd058 cinnamon/dark-assets/switch/switch-on.svg +ae6481a85d8001263016deeb96e4385f4d17ca5f91a7c49f97e447766e709dd2 cinnamon/thumbnail.png 374bba72e793ceb9890d9e5d9e24cc291e7e744fa7919f8aadb0146f1068fc59 extra/alacritty/alacritty.toml 9ba8abd50bf33f4eb0d96755662410735c0c1a6d00079acc1f074be9a0e410f6 extra/bat/themes/adwaita-amoled.tmTheme c3c4cb8f2bbc6f2b46d09ac7ba1cbf78ceb5e97d609185793760a6441544bb30 extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -84,6 +85,7 @@ cb3b550f3a7d3451c7903edc1a48401b1dbc8dc0b60fa937e174ea00cce74a89 gnome-shell/as 658450e293f643a36cc3e2354c753db3940eae2a415904055508ddfbf297ced4 gnome-shell/gnome-shell.css bca3d24d700b9948d9681e656711015ceba25aafec3564ae353d70086d779347 gtk-2.0/gtkrc 6a735cb2c10edded24483ed299fac7ba8258356915429412c3e26020c9ccff5e gtk-3.0/gtk.gresource +abc2bdd2e22bb21509fa596496bb6f2beda0bf2f38aeedce0fed21f70c281e33 gtk-3.0/thumbnail.png 75c9e54f83f7e33f84806633234d201b0a5ff5840356eaf933627756971665eb gtk-4.0/gtk.gresource d07fe7472c95e7f18f669f4eb7e8698611c7d116ab4708d62d3b9d7329bed256 metacity-1/metacity-theme-3.xml fd2667891e63f00f71f6c50966d3b6e9de5773e77ac2403b780f0e1a5887e744 openbox-3/themerc diff --git a/accents/gold/cinnamon/thumbnail.png b/accents/gold/cinnamon/thumbnail.png new file mode 100644 index 0000000..16ba196 Binary files /dev/null and b/accents/gold/cinnamon/thumbnail.png differ diff --git a/accents/gold/gtk-3.0/thumbnail.png b/accents/gold/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..64ff340 Binary files /dev/null and b/accents/gold/gtk-3.0/thumbnail.png differ diff --git a/accents/green/SHA256SUMS b/accents/green/SHA256SUMS index fb75306..9ea4d7b 100644 --- a/accents/green/SHA256SUMS +++ b/accents/green/SHA256SUMS @@ -24,6 +24,7 @@ f13eea1a003b3eed8140f1b1c8f791ebff700a20c0d60b33d79a048ad7644ec5 cinnamon/dark- 022c265606f9077cdadb0f680f6d6c194073ab23a18a24ba45d080412a3b08cb cinnamon/dark-assets/misc/message.svg f9336e5419e70984cf36d84bbf8a010cceb1214765d9735bab3f4791fd610e2e cinnamon/dark-assets/misc/modal.svg 5d0be499ba21245b62710ed8461a845cf9b4b7e0ef7b7f11e43c1f57de4aea8e cinnamon/dark-assets/switch/switch-on.svg +f0c03918511ccb03e7dc3df0d97c89aa16ded705bab7a90998d7a96352c037f6 cinnamon/thumbnail.png 55545e6e87dad51a1680c33322b2bc40ac82a71d892f8d64720021d17b20b7bf extra/alacritty/alacritty.toml 0d9f442d8e371841b20970d33af3357a99fba95ab8bbbe1ed63d7b9f8b8e4760 extra/bat/themes/adwaita-amoled.tmTheme beab6049bd35493205c7dadbb116d8c028120bdb8d44660ce1a3dd8cc512971a extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -84,6 +85,7 @@ dd61b735d19ac611cc998bb2793b249d4c8c1c9825624ff3e1e2196005a3b2fc gnome-shell/as 78936f0bcf8ddd16e3bc7af6e7fc94fee1a85dd07d5dfc6bd455bcc8388d026d gnome-shell/gnome-shell.css 3d444be15e10d370737a48b9bfe0fa075be52fec40fb00258df73179980588e2 gtk-2.0/gtkrc 7be5df384ac91d35a3157d47810280783d799e98331afff38dfb4069f0fc2928 gtk-3.0/gtk.gresource +71e0f96ae160cd87009166ca5c3fa3c66afaf47d1b5510ac7058c347f51cf2a4 gtk-3.0/thumbnail.png c95592fbf53473f8731630fc035fa4a887f68dc8d030147357be4aee97710c95 gtk-4.0/gtk.gresource 83dcd9f8ed1628598ac38d50c44f34fb8cce3e411c509e4f1f32a06d7060bc3c metacity-1/metacity-theme-3.xml 2172e8d2f8e60d4ff3699c6b3c5cca3908d2cb63fb2382c5ae19206004cc8de7 openbox-3/themerc diff --git a/accents/green/cinnamon/thumbnail.png b/accents/green/cinnamon/thumbnail.png new file mode 100644 index 0000000..7534d03 Binary files /dev/null and b/accents/green/cinnamon/thumbnail.png differ diff --git a/accents/green/gtk-3.0/thumbnail.png b/accents/green/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..4304445 Binary files /dev/null and b/accents/green/gtk-3.0/thumbnail.png differ diff --git a/accents/orange/SHA256SUMS b/accents/orange/SHA256SUMS index b8468ec..bd8cd0c 100644 --- a/accents/orange/SHA256SUMS +++ b/accents/orange/SHA256SUMS @@ -24,6 +24,7 @@ be1531d9d08ef18bc9d8cb2f7706a41c143515bfc1d8b1623994e575bcab9542 cinnamon/dark- 539693774b7afa173fdd51913d42d4958b9e610df523aba5bdc7a87a5953f987 cinnamon/dark-assets/misc/message.svg f57b7c794864c4905876fcbfd01e6b1c0031164491d038f9ae7e251af6d4dc5e cinnamon/dark-assets/misc/modal.svg 7cb63fecebdf6d452c3ade7986220c1a6923600b3c530880373d530690336cdb cinnamon/dark-assets/switch/switch-on.svg +859dc933784c66b98600793e6472e865dbaba7bc6522201b20144846e872628a cinnamon/thumbnail.png e068b777bd5d384783f974154a218a212ef4bee0bfaaa0c3144d9c6b37259ba6 extra/alacritty/alacritty.toml 688c20b372a47363965302f6d4c7d117c41f0fa2e002f08377c2a22d6cc12aed extra/bat/themes/adwaita-amoled.tmTheme 1103102b283d194ef7c2d7e5f3154eebe1c44eec7ac3b8e7cc6d8892e5fc136f extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -84,6 +85,7 @@ a5e60b6a7716d97a9d52014c0b5c05a43dc57d8f0d78a7556b4a702985d167fc extra/qt6ct/co 713b41ba0c61152b00e85273ecbc75e4b6ae2959581f9eeefbad647f1659cdd8 gnome-shell/gnome-shell.css 4eadf61535f3857857106316921462efc57e405839b19301e6c4588b1aee55e5 gtk-2.0/gtkrc 2e3745d462cb6c6bc3dc379ced85e44fe6a7cc2c1954e21e4066779ade4527b5 gtk-3.0/gtk.gresource +ec1ae39b33def517a83a6858341c533e18ea84c1e77ce4d8ee89d206e3a6e69e gtk-3.0/thumbnail.png d1bb488d15f1d02a6a71af9e9a1c1c05d1c1b9d016671a9fa1b990029d911ec4 gtk-4.0/gtk.gresource 95a857de1c8b8c85713305df00b3eb3111584abbfc9e606c9d15837ad809a171 metacity-1/metacity-theme-3.xml 55a9dde06cfd6829a1edb3018cafeb7fb25abfac8ae6a1437a1786014979abf1 openbox-3/themerc diff --git a/accents/orange/cinnamon/thumbnail.png b/accents/orange/cinnamon/thumbnail.png new file mode 100644 index 0000000..7d5e0dc Binary files /dev/null and b/accents/orange/cinnamon/thumbnail.png differ diff --git a/accents/orange/gtk-3.0/thumbnail.png b/accents/orange/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..4d6bb46 Binary files /dev/null and b/accents/orange/gtk-3.0/thumbnail.png differ diff --git a/accents/pink/SHA256SUMS b/accents/pink/SHA256SUMS index 542247a..007d91e 100644 --- a/accents/pink/SHA256SUMS +++ b/accents/pink/SHA256SUMS @@ -24,6 +24,7 @@ d1b98dda25e6fabc4b4b00288330b3aeb7995c284d441b02858c5acbefbb8563 cinnamon/dark- 55df089344b4c54e60ea7b11791b64bda93d6646df079e34b07d4816e34f952d cinnamon/dark-assets/misc/message.svg ec1918e12fc6860a836ae5d5f85ce4160f58380d201e238a891ec203bfb5b6bb cinnamon/dark-assets/misc/modal.svg bce9a3d41738587b03dab3208f4fde9204d8cb086126f207ef9a7ad1e38a6df5 cinnamon/dark-assets/switch/switch-on.svg +5633bd9616e36815329aaa0b5939c371350f65adf4da73de069ffe7e4392dbfc cinnamon/thumbnail.png fbb2133ee91673174b9f55bad3ede8dfad61a774a18f262cfdb889a52bc54438 extra/alacritty/alacritty.toml ca735d2ae2305d84ab4664d4e8ed235614a60bdd89548bdf23ed4d8b7df869ee extra/bat/themes/adwaita-amoled.tmTheme 2eaf2e7a76d5f17457b2f2bb882cfe91a4f0a400c00c2bc8835249b1fc1abda4 extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -84,6 +85,7 @@ c919f2eeb56d9b377b085d4cbc51ab5db1e3975f8220e8af3c223be0dfa2e789 gnome-shell/gn c919f2eeb56d9b377b085d4cbc51ab5db1e3975f8220e8af3c223be0dfa2e789 gnome-shell/gnome-shell.css 2386ff5e652983cc69b2e5023f75c95e36f7fe9e07955e6ba8b4c8a58ad9ee60 gtk-2.0/gtkrc 3466915177bb3ac9e80f53d3fa60ad9ac4d0ff27c665a0d76d1388d064dc60dd gtk-3.0/gtk.gresource +f944575c30c563f7bd2728b90f8553256e0b060c4ac87674f1eafff8f5cf6349 gtk-3.0/thumbnail.png b3f4f92d106a9c87232e47d4214cea0b74945f82dcc83c2f287f8e0fdb4ad180 gtk-4.0/gtk.gresource 78bdae72d8ec41159296330d2a3b033d4ec74c513694e1fc6a179ecba2027ab2 metacity-1/metacity-theme-3.xml 408df9631c080e8f54472bda191cc680c4e361f204250057bf2fe48fc03304d1 openbox-3/themerc diff --git a/accents/pink/cinnamon/thumbnail.png b/accents/pink/cinnamon/thumbnail.png new file mode 100644 index 0000000..546b57c Binary files /dev/null and b/accents/pink/cinnamon/thumbnail.png differ diff --git a/accents/pink/gtk-3.0/thumbnail.png b/accents/pink/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..28aa40e Binary files /dev/null and b/accents/pink/gtk-3.0/thumbnail.png differ diff --git a/accents/purple/SHA256SUMS b/accents/purple/SHA256SUMS index db7f1f1..34e3979 100644 --- a/accents/purple/SHA256SUMS +++ b/accents/purple/SHA256SUMS @@ -24,6 +24,7 @@ d4181661e69aed89d53ebe945258f51e28124050eaa944988adf4e3d23f153d6 cinnamon/dark- 5792120dd1b047620456573a749bab73cbfd93bb97092d18a08db7ca87760ac4 cinnamon/dark-assets/misc/message.svg 173d487d9b54278a00c6222987e0e22a6078e5f488d97b52a9c7671a3cf01f72 cinnamon/dark-assets/misc/modal.svg 57653fa0125e564c6dfe20525da77ebe39ef2d30a2c5e8a941b50244d7e1a797 cinnamon/dark-assets/switch/switch-on.svg +7f741108ef33581e304bade6233692c30b00b4118647ef1025ab90990ae8010d cinnamon/thumbnail.png 8a11cc4fec7d687f9fa7664b0bcf6bf82d31a6248387aded27a99d18a51190f0 extra/alacritty/alacritty.toml 7f91b189e823b1149d96f997fdd8eb96707fcd0dd1ad50e338031d1f966a13fc extra/bat/themes/adwaita-amoled.tmTheme d2b251fcc043783b9948b62b796f58cd2ff2cd6b66651b22a0ce7b452ff9d76b extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -84,6 +85,7 @@ d4ec91efc3e09435efbd983016dee179e5ea85b9e8985232ba8da1eb5bd3f4f9 gnome-shell/gn 6ecf45acbd32eefa0a9a019f41d8d9c7296efbecd6d867f8fc83c5a654c6b27d gnome-shell/gnome-shell.css aed26e8cc09280c6bb0b8fce134d5c71784284039816c5762c1c74266fd9987e gtk-2.0/gtkrc c1182696d8aaf20df1d8484ebdf6675b6c6e59810f1402c23d00880f621dd145 gtk-3.0/gtk.gresource +dbc6bce74619fcab001c54dfd2f1bf81d2be8b2713666c03ae37e026a04b0085 gtk-3.0/thumbnail.png c61b15350b450d61b29d19fb9ffdaccc9a0f2b018290e7eee0653e2834e7cbbb gtk-4.0/gtk.gresource bd5f7af843540db7b31b893e7aa17b486be272acc44d90d9c090ba43707d54e8 metacity-1/metacity-theme-3.xml 059a59f1c3e03a359d696754db781cfabea8aa97cb8bbc985353eb6244162e47 openbox-3/themerc diff --git a/accents/purple/cinnamon/thumbnail.png b/accents/purple/cinnamon/thumbnail.png new file mode 100644 index 0000000..ac862d3 Binary files /dev/null and b/accents/purple/cinnamon/thumbnail.png differ diff --git a/accents/purple/gtk-3.0/thumbnail.png b/accents/purple/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..7982a26 Binary files /dev/null and b/accents/purple/gtk-3.0/thumbnail.png differ diff --git a/accents/red/SHA256SUMS b/accents/red/SHA256SUMS index b4bb065..a3ce155 100644 --- a/accents/red/SHA256SUMS +++ b/accents/red/SHA256SUMS @@ -24,6 +24,7 @@ c59e3dba8c1a6ac71b9316a3d2ed86c266046c16db4d75b39c2056367ce3d1cc cinnamon/dark- 6636db242221d4719218eefae6cedb9098f48ea2a6b1d6adb45997d5ad900e26 cinnamon/dark-assets/misc/message.svg 2643a544366bed224e3ca1a3ee16b35eb7e135349c3a88ec73aac3cac4f1068e cinnamon/dark-assets/misc/modal.svg 98872ed7d52478622910966a529dfbb8569e371c905143615a843393dd4bbbdb cinnamon/dark-assets/switch/switch-on.svg +957df478ef433618116f2d5682e117fe445c4e842019b0d37cf578cf40a897d6 cinnamon/thumbnail.png dbc93f80f40311fade4cee0cc8a34d8abcba780af61b0cc92d3fb419071aaec2 extra/alacritty/alacritty.toml 65268998e82a1339f4b0bd41438ad9a7b43307b0249719364194ba8244be39a5 extra/bat/themes/adwaita-amoled.tmTheme 2596f07c57737389e09748251ba691cbfe531c9e902d365882523aa329108efe extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -84,6 +85,7 @@ bf8954bdd3face3a7436d8b6146ef3529d7bcef17d732524a7e3083011375e8a gnome-shell/gn 93b9335314bbec070e02125e1d23765b3f10435bb5238f75576572e95ff67d53 gnome-shell/gnome-shell.css 49f49b83ff4d5e200e20b537fafc9f92332f37fc6a60178da111540dd282a69d gtk-2.0/gtkrc 325bf114b5ff25b2d548d695a749a9635158499ca0472e1e20fc49f1d749b875 gtk-3.0/gtk.gresource +a291a53695410617d1550791048cef5f4eeefc1970ac0de0fa12112fd39e0393 gtk-3.0/thumbnail.png 60f73b022d5124dcaeb638e753812f66de2d9d5e9d8401069e4c94ccb6765d68 gtk-4.0/gtk.gresource b4b4c68579f6482aef0455e2042a2f4af8d1cb8cd3115f4e65aec27de4529423 metacity-1/metacity-theme-3.xml ac63739c4b8a73ad6e4123587c7c5743f5e94583fca0ab2cb19d3915d9d4da09 openbox-3/themerc diff --git a/accents/red/cinnamon/thumbnail.png b/accents/red/cinnamon/thumbnail.png new file mode 100644 index 0000000..c7674ab Binary files /dev/null and b/accents/red/cinnamon/thumbnail.png differ diff --git a/accents/red/gtk-3.0/thumbnail.png b/accents/red/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..4bf9438 Binary files /dev/null and b/accents/red/gtk-3.0/thumbnail.png differ diff --git a/accents/yellow/SHA256SUMS b/accents/yellow/SHA256SUMS index 9bb3095..16099fe 100644 --- a/accents/yellow/SHA256SUMS +++ b/accents/yellow/SHA256SUMS @@ -24,6 +24,7 @@ d9f99f58d8c8df8e9e95f8231ae218bccbd12d24dac0593ef37ae07c6bcc24df cinnamon/dark- 9f66e86737e2314cdbba7ec117218e513c18179785b40b56715353a52cf5548d cinnamon/dark-assets/misc/message.svg 5630f5f6b99abce1ca6779d03c8ca6b84ebcd8179e7042e65c66d8515c2276d7 cinnamon/dark-assets/misc/modal.svg 86099a3c35eeb31c22e0a9624f5e92241048e6c43e115ff6a7aa2acf10916538 cinnamon/dark-assets/switch/switch-on.svg +d0774086b4e43dace63c0a7182e66b1fe7794a7a7d287feafc1129bf7b198494 cinnamon/thumbnail.png 1388457ae1ea615da07f69b8b5373b06dfae71b22a753c318b87d9f2bcd3d64a extra/alacritty/alacritty.toml 6de99f5cac6b9c2c4aaa8f523b6e39f2cf79e5167e1b899afbc243f452c76cb8 extra/bat/themes/adwaita-amoled.tmTheme fbd113cd36f7e03612b25410963ef0cf6f38e7be50af218d69080412fc07fa4c extra/icons/Adwaita-AMOLED/16x16/places/folder-bookmarks.svg @@ -84,6 +85,7 @@ d387163816a860e3399babca330f56c007c39411c4080143cae3e37f54e78080 gnome-shell/gn 11102e05b53cdd48a264563bd848c121b1bee777903f69763782a8c4e2dd3e3a gnome-shell/gnome-shell.css 4146c860efa3e6392bd7dc57ded1b9840b7b96ba4a1f1511273fa3b14769d995 gtk-2.0/gtkrc d0877f7698fd5bf09f7a3dc8582e25d213b3815581ffe608a5ccacfccb3ef35c gtk-3.0/gtk.gresource +417b6c345ce3581c8044fd578f3b71056d1251ae5d52227e06b149ad7e243fac gtk-3.0/thumbnail.png e54562ce26e512b70db2a758aff3198d2798883d1aa8169435267b7accb7bb6a gtk-4.0/gtk.gresource afb5210f37e3d67d2a4f7204417edc3a78c2b1bd1ec4728397e49814757b95fc metacity-1/metacity-theme-3.xml 6ccd6c2026985652c1dc42dfed442ac27f4d992752495af99527a6aa00e9798c openbox-3/themerc diff --git a/accents/yellow/cinnamon/thumbnail.png b/accents/yellow/cinnamon/thumbnail.png new file mode 100644 index 0000000..1b431e4 Binary files /dev/null and b/accents/yellow/cinnamon/thumbnail.png differ diff --git a/accents/yellow/gtk-3.0/thumbnail.png b/accents/yellow/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..ea4b14e Binary files /dev/null and b/accents/yellow/gtk-3.0/thumbnail.png differ diff --git a/cinnamon/thumbnail.png b/cinnamon/thumbnail.png new file mode 100644 index 0000000..6233520 Binary files /dev/null and b/cinnamon/thumbnail.png differ diff --git a/gtk-3.0/thumbnail.png b/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..760c8c8 Binary files /dev/null and b/gtk-3.0/thumbnail.png differ diff --git a/metacity-1/thumbnail.png b/metacity-1/thumbnail.png new file mode 100644 index 0000000..f46c7d9 Binary files /dev/null and b/metacity-1/thumbnail.png differ diff --git a/palette/README.md b/palette/README.md index 32dd696..4555c19 100644 --- a/palette/README.md +++ b/palette/README.md @@ -39,6 +39,14 @@ CI checks generation and native/source/bundle tests. Changing a color still requires contrast and native rendering review; generation does not establish that a new palette is readable. +`tools/theme_previews.py` generates three 247×100 PNG illustrations for Cinnamon +Settings' `thumbnail.png` lookup in `cinnamon`, `gtk-3.0` and `metacity-1`. +The palette generator writes the base previews; the accent builder includes +changed previews in each sparse overlay. The neutral window-decoration preview +is shared. Rendering uses only Python's standard library, with no font or image +package dependencies; installers copy the prebuilt PNGs. These thumbnails are +illustrations, separate from the native screenshot/rendering evidence. + ## Token syntax and scope - `{{accent_text}}` emits `#8ab4f8`. diff --git a/runtime-files.txt b/runtime-files.txt index c59ac90..8c80ead 100644 --- a/runtime-files.txt +++ b/runtime-files.txt @@ -178,3 +178,6 @@ extra/icons/Adwaita-AMOLED/scalable/places/user-bookmarks.svg extra/icons/Adwaita-AMOLED/scalable/places/user-desktop.svg extra/icons/Adwaita-AMOLED/scalable/places/user-home.svg extra/icons/Adwaita-AMOLED/COPYING_GPL +cinnamon/thumbnail.png +gtk-3.0/thumbnail.png +metacity-1/thumbnail.png diff --git a/tests/README.md b/tests/README.md index 2527e92..f8c7eb6 100644 --- a/tests/README.md +++ b/tests/README.md @@ -414,3 +414,10 @@ a real Cinnamon session, updates the selected theme without changing its name, checks seven resolved properties per state and saves actual menu/calendar screenshots. Its test-only inspection uses Cinnamon Eval; the installer uses only the public ReloadTheme API. Verified locally on Cinnamon 6.0.4 and 6.6.9. + +`test_accents.py` checks every Cinnamon CSS/SVG against the palette templates +for all eight presets, rejects leftover blue accent values in other presets, +and verifies each generated chooser preview. With Cinnamon Settings installed, +`xvfb-run -a dbus-run-session -- python3 tests/cinnamon_theme_previews.py /tmp/chooser` +tests its actual thumbnail lookup and native PictureChooserButton image loading +for all three components and eight accents, saving chooser screenshots. diff --git a/tests/cinnamon_theme_previews.py b/tests/cinnamon_theme_previews.py new file mode 100644 index 0000000..aa50e0b --- /dev/null +++ b/tests/cinnamon_theme_previews.py @@ -0,0 +1,67 @@ +"""Exercise Cinnamon Settings' real thumbnail lookup and chooser widgets.""" +import builtins +import inspect +import os +from pathlib import Path +import subprocess +import sys +import tempfile + +ROOT = Path(__file__).resolve().parents[1] +if '--isolated-child' not in sys.argv: + with tempfile.TemporaryDirectory(prefix='amoled-chooser-') as temporary: + home = Path(temporary) + env = dict(os.environ, HOME=str(home), XDG_DATA_HOME=str(home / 'data'), + XDG_CONFIG_HOME=str(home / 'config'), XDG_CACHE_HOME=str(home / 'cache'), + XDG_CURRENT_DESKTOP='', GSETTINGS_BACKEND='memory') + env.pop('GTK_THEME', None) + result = subprocess.run([sys.executable, __file__, sys.argv[1], '--isolated-child'], env=env) + raise SystemExit(result.returncode) + +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk, GdkPixbuf +builtins._ = lambda text: text +sys.path.extend(['/usr/share/cinnamon/cinnamon-settings', '/usr/share/cinnamon/cinnamon-settings/bin', + '/usr/share/cinnamon/cinnamon-settings/modules']) +import cs_themes + +out = Path(sys.argv[1]);out.mkdir(parents=True, exist_ok=True) +module = object.__new__(cs_themes.Module) +parent = Path(os.environ['XDG_DATA_HOME']) / 'themes' +theme = parent / 'Adwaita-AMOLED' + + +class Chooser(cs_themes.PictureChooserButton): + def __init__(self): + self.loaded = [] + parameters = inspect.signature(cs_themes.PictureChooserButton.__init__).parameters + sizing = {'button_picture_size': 100, 'menu_pictures_size': 100} if 'button_picture_size' in parameters else {'button_picture_width': 247, 'menu_picture_width': 247} + super().__init__(num_cols=1, has_button_label=True, **sizing) + + def create_scaled_surface(self, path): + surface = super().create_scaled_surface(path) + assert surface is not None, path + self.loaded.append(Path(path).resolve()) + return surface + + +for accent in ('blue', 'yellow', 'gold', 'purple', 'green', 'red', 'orange', 'pink'): + result = subprocess.run(['bash', str(ROOT / 'install.sh'), '--accent', accent], + capture_output=True, text=True) + assert result.returncode == 0, result.stdout + result.stderr + window = Gtk.OffscreenWindow();module.window = window + layout = Gtk.Box(spacing=12);layout.set_border_width(12);window.add(layout) + for kind in ('metacity-1', 'gtk-3.0', 'cinnamon'): + chooser = Chooser();layout.add(chooser) + module.set_button_chooser(chooser, 'Adwaita-AMOLED', 'themes', kind, 100) + module.refresh_chooser(chooser, kind, [('Adwaita-AMOLED', str(parent))], lambda *_: True) + expected = (theme / kind / 'thumbnail.png').resolve() + assert chooser.loaded.count(expected) == 2, (accent, kind, chooser.loaded) + pix = GdkPixbuf.Pixbuf.new_from_file(str(expected)) + assert (pix.get_width(), pix.get_height()) == (247, 100) + window.show_all() + while Gtk.events_pending():Gtk.main_iteration() + window.get_pixbuf().savev(str(out / (accent + '-chooser.png')), 'png', [], []) + window.destroy() + print(accent, 'all three native chooser previews loaded', flush=True) diff --git a/tests/report.py b/tests/report.py index fd39288..b6c58bf 100644 --- a/tests/report.py +++ b/tests/report.py @@ -22,6 +22,6 @@ def main(): stderr=subprocess.STDOUT, text=True) print(result.stdout, end='', flush=True) if result.returncode and os.environ.get('GITHUB_ACTIONS') == 'true': - message = result.stdout[-15000:].replace('%', '%25').replace('\r', '%0D').replace('\n', '%0A') + message = result.stdout[-3000:].replace('%', '%25').replace('\r', '%0D').replace('\n', '%0A') print(f'::error title=Native command exited {result.returncode}::{message}', flush=True) sys.exit(result.returncode if result.returncode >= 0 else 128 - result.returncode) diff --git a/tests/test_accents.py b/tests/test_accents.py index a1e4069..22cd8e8 100644 --- a/tests/test_accents.py +++ b/tests/test_accents.py @@ -39,6 +39,26 @@ class AccentTests(unittest.TestCase): run_cli = base.InstallerTests.run_cli fake_program = base.InstallerTests.fake_program + def test_every_cinnamon_css_svg_and_preview_matches_each_preset(self): + from theme_previews import render + sources = [p for p in (base.ROOT / 'cinnamon').rglob('*') + if p.suffix in ('.css', '.svg')] + blue = palette.preset_colors(base.ROOT, 'blue') + blue_accents = {v for k, v in blue.items() if k.startswith('accent_')} + for accent in ('blue', *COLORS): + colors = palette.preset_colors(base.ROOT, accent) + for source in sources: + name = source.relative_to(base.ROOT) + template = base.ROOT / 'palette/templates' / (str(name) + '.in') + expected = palette.render(template.read_text(), colors) if template.is_file() else source.read_bytes() + actual = self.expected(accent, str(name)).read_bytes() + self.assertEqual(actual, expected, (accent, name)) + if accent != 'blue': + for old in blue_accents - set(colors.values()): + self.assertNotIn(old.encode(), actual.lower(), (accent, name, old)) + for name, expected in render(colors).items(): + self.assertEqual(self.expected(accent, str(name)).read_bytes(), expected, (accent, name)) + def expected(self, accent, name): override = base.ROOT / "accents" / accent / name return override if accent != "blue" and override.is_file() else base.ROOT / name diff --git a/tools/build_accents.py b/tools/build_accents.py index ea80e1f..ea4c2fc 100644 --- a/tools/build_accents.py +++ b/tools/build_accents.py @@ -66,7 +66,7 @@ def build(root): shutil.copytree(root / folder, work / folder, dirs_exist_ok=True) for name in ["build.sh", "gnome-shell/build.sh"]: shutil.copy2(root / name, work / name) - for name in ["shell_palette.py", "generate_palette.py", "generate_icons.py"]: + for name in ["shell_palette.py", "generate_palette.py", "generate_icons.py", "theme_previews.py"]: dest = work / "tools" / name dest.parent.mkdir(exist_ok=True) shutil.copy2(root / "tools" / name, dest) diff --git a/tools/generate_palette.py b/tools/generate_palette.py index 9053885..3c9b575 100644 --- a/tools/generate_palette.py +++ b/tools/generate_palette.py @@ -6,6 +6,8 @@ from pathlib import Path import re +import theme_previews + ROOT = Path(__file__).resolve().parents[1] TOKEN = re.compile(r"\{\{([a-z][a-z0-9_]*)(?:\.(hex|upper|hex_upper|r|g|b))?\}\}") OUTPUT_ROOTS = { @@ -121,6 +123,10 @@ def outputs(root, colors=None): rendered[name] = render(template.read_text(), colors) if not rendered: raise ValueError("no palette templates found") + for name, data in theme_previews.render(colors).items(): + if not (root / name).resolve().is_relative_to(root.resolve()): + raise ValueError(f"palette output escapes checkout: {name}") + rendered[name] = data return rendered diff --git a/tools/theme_previews.py b/tools/theme_previews.py new file mode 100644 index 0000000..ad2283a --- /dev/null +++ b/tools/theme_previews.py @@ -0,0 +1,108 @@ +"""Small palette-based Cinnamon chooser illustrations, not runtime screenshots. + +Pure standard-library rasterization keeps builds deterministic and adds no +installer dependencies. Render at 2x and downsample for rounded edges. +""" +from pathlib import Path +import struct +import zlib + +WIDTH, HEIGHT, SCALE = 247, 100, 2 + + +class Canvas: + def __init__(self): + self.width = WIDTH * SCALE + self.height = HEIGHT * SCALE + self.pixels = bytearray(self.width * self.height * 4) + + def box(self, x, y, width, height, color, radius=0): + x, y, width, height, radius = (v * SCALE for v in (x, y, width, height, radius)) + rgba = bytes.fromhex(color[1:]) + b'\xff' + for row in range(max(0, int(y)), min(self.height, int(y + height))): + for column in range(max(0, int(x)), min(self.width, int(x + width))): + dx = max(x + radius - column - .5, column + .5 - (x + width - radius), 0) + dy = max(y + radius - row - .5, row + .5 - (y + height - radius), 0) + if dx * dx + dy * dy <= radius * radius: + offset = (row * self.width + column) * 4 + self.pixels[offset:offset + 4] = rgba + + def png(self): + raw = bytearray() + for y in range(HEIGHT): + raw.append(0) # PNG filter: None. + for x in range(WIDTH): + offsets = [((y * SCALE + dy) * self.width + x * SCALE + dx) * 4 + for dy in range(SCALE) for dx in range(SCALE)] + alpha = sum(self.pixels[i + 3] for i in offsets) + for channel in range(3): + raw.append(round(sum(self.pixels[i + channel] * self.pixels[i + 3] + for i in offsets) / alpha) if alpha else 0) + raw.append(round(alpha / (SCALE * SCALE))) + + def chunk(name, data): + return struct.pack('!I', len(data)) + name + data + struct.pack('!I', zlib.crc32(name + data)) + + return (b'\x89PNG\r\n\x1a\n' + chunk(b'IHDR', struct.pack('!2I5B', WIDTH, HEIGHT, 8, 6, 0, 0, 0)) + + chunk(b'tEXt', b'Description\0Palette-based theme chooser illustration; not a runtime screenshot.') + + chunk(b'IDAT', zlib.compress(bytes(raw), 9)) + chunk(b'IEND', b'')) + + +def render(colors): + """Return all three paths Cinnamon Settings probes before its fallback icon.""" + c = colors + result = {} + for kind in ('cinnamon', 'gtk-3.0', 'metacity-1'): + image = Canvas() + box = image.box + box(0, 0, WIDTH, HEIGHT, c['background'], 7) + if kind == 'cinnamon': + box(8, 8, 145, 76, c['decorative_border'], 7) + box(9, 9, 143, 74, c['popover'], 6) + box(17, 17, 127, 15, c['accent_text'], 4) + box(18, 18, 125, 13, c['background'], 3) + box(24, 23, 47, 3, c['secondary_text'], 1) + for row, length in ((40, 57), (55, 79), (70, 49)): + if row == 55: + box(16, row - 5, 128, 14, c['accent_fill'], 3) + box(22, row - 2, 7, 7, c['foreground'], 2) + box(36, row, length, 3, c['foreground'], 1) + box(163, 18, 75, 58, c['popover'], 6) + for row in range(3): + for column in range(5): + box(173 + column * 12, 29 + row * 14, 4, 4, c['secondary_text'], 1) + box(194, 40, 12, 12, c['accent_fill'], 4) + box(198, 44, 4, 4, c['foreground'], 1) + box(0, 89, WIDTH, 11, c['surface']) + for x in (12, 35, 58, 81): + box(x, 92, 6, 5, c['foreground'], 1) + box(78, 98, 12, 2, c['accent_text']) + box(214, 93, 20, 3, c['foreground'], 1) + else: + box(18, 9, 217, 65, c['decorative_border'], 7) + box(19, 10, 215, 63, c['background'], 6) + box(8, 24, 217, 69, c['decorative_border'], 7) + box(9, 25, 215, 67, c['background'], 6) + box(9, 25, 215, 23, c['surface'], 6) + box(9, 40, 215, 8, c['surface']) + box(24, 35, 76, 3, c['foreground'], 1) + box(163, 38, 7, 1, c['foreground']) + box(181, 33, 7, 7, c['foreground']) + box(182, 34, 5, 5, c['surface']) + box(200, 30, 15, 15, c['hover'], 7) + # Draw the close cross without font dependencies. + for i in range(5): + box(205 + i, 35 + i, 1, 1, c['foreground']) + box(209 - i, 35 + i, 1, 1, c['foreground']) + if kind == 'gtk-3.0': + box(20, 57, 122, 22, c['accent_text'], 4) + box(21, 58, 120, 20, c['background'], 3) + box(29, 67, 56, 3, c['secondary_text'], 1) + box(152, 57, 60, 22, c['accent_fill'], 4) + box(167, 67, 29, 3, c['foreground'], 1) + else: + # A quiet client area keeps the decoration itself easy to see. + box(24, 60, 165, 3, c['secondary_text'], 1) + box(24, 71, 116, 3, c['decorative_border'], 1) + result[Path(kind) / 'thumbnail.png'] = image.png() + return result