From 1bbfd6c024507c00e54ff6501243097b4671243e Mon Sep 17 00:00:00 2001 From: Luis Bocanegra Date: Mon, 15 Aug 2022 14:48:35 -0500 Subject: [PATCH 1/5] saturate colors for piwal light theme --- color_utils.py | 10 ++++++++ schemeconfigs.py | 64 +++++++++++++++++++++++++++++++----------------- 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/color_utils.py b/color_utils.py index 0192cd6..f087051 100644 --- a/color_utils.py +++ b/color_utils.py @@ -210,6 +210,16 @@ def lighteen_color(hex_color, min, blend): # print(f"result after blend: {o}") return o +def scale_saturation(hex_color, amount): + r, g, b = hex2rgb(hex_color) + # convert rgb to hls + h, s, v = colorsys.rgb_to_hsv(r, g, b) + # manipulate value and convert back to rgb + r, g, b = colorsys.hsv_to_rgb(h, amount, v) + o_hex = rgb2hex(int(r), int(g), int(b)) + # print(f"scale_lightness color: {hex_color} * amount: {amount} = {o_hex}") + return o_hex + # Tests if __name__ == '__main__': # Test color blend diff --git a/schemeconfigs.py b/schemeconfigs.py index be62bf9..96d8a76 100644 --- a/schemeconfigs.py +++ b/schemeconfigs.py @@ -1,4 +1,4 @@ -from color_utils import blendColors, color_luminance, hex2rgb, hex2alpha, sort_colors_luminance, blend2contrast, lighteen_color +from color_utils import blendColors, contrast_ratio, hex2rgb, hex2alpha, scale_saturation, sort_colors_luminance, blend2contrast, lighteen_color from utils import range_check, tup2str class ThemeConfig: def __init__(self, colors, wallpaper_data, light_blend_multiplier=1, dark_blend_multiplier=1, toolbar_opacity=100): @@ -83,7 +83,7 @@ def __init__(self, colors, wallpaper_data, light_blend_multiplier=1, dark_blend_ for x in range(7): str_x = str(x) if (len(pywal_colors_dark) <= 7): - if str_x in colors_best.keys(): #and color_luminance(colors_best[str_x])[1] > .15 + if str_x in colors_best.keys(): c = lighteen_color(colors_best[str_x],.2,tones_neutral[99]) pywal_colors_dark += (blend2contrast(c, pywal_colors_dark[0], tones_neutral[99], 4.5, .01, True),) else: @@ -109,43 +109,61 @@ def __init__(self, colors, wallpaper_data, light_blend_multiplier=1, dark_blend_ tones_neutral[99], sorted_colors[n], .85),) - tone = 38 + tone = 50 pywal_colors_light = (extras['SurfaceLight'],) pywal_colors_light_intense = (blendColors( - tones_neutral[20], colors_light['secondary'], .6*lbm),) + tones_neutral[20], colors_light['secondary'], .8*lbm),) pywal_colors_light_faint = (blendColors( - tones_neutral[55], colors_light['secondary'], .6*lbm),) + tones_neutral[55], colors_light['secondary'], .8*lbm),) + + # for x in range(7): + # str_x = str(x) + # if str_x in colors_best.keys()and color_luminance(colors_best[str_x])[1] > .15: #and contrast_ratio(pywal_colors_light[0],colors_best[str_x]) > .8 + # pywal_colors_light += (blend2contrast(colors_best[str_x], pywal_colors_light[0], tones_neutral[20], 4.5, .01, False),) + # else: + # pywal_colors_light += (blend2contrast(tones_primary[tone], pywal_colors_light[0], tones_neutral[20], 4.5, .01, False),) + # pywal_colors_light += (blend2contrast(tones_tertiary[tone], pywal_colors_light[0], tones_neutral[20], 4.5, .01, False),) + # if tone < 91: + # tone += 8 - for x in range(best_colors_count): + for x in range(7): str_x = str(x) - if str_x in colors_best.keys()and color_luminance(colors_best[str_x])[1] > .15: #and contrast_ratio(pywal_colors_light[0],colors_best[str_x]) > .8 - pywal_colors_light += (blend2contrast(colors_best[str_x], pywal_colors_light[0], tones_neutral[20], 4.5, .01, False),) + if (len(pywal_colors_light) <= 7): + if str_x in colors_best.keys(): + c = scale_saturation(colors_best[str_x],1) + pywal_colors_light += (blend2contrast(c, pywal_colors_light[0], tones_neutral[20], 3, .01, False),) + else: + if (len(pywal_colors_light) <= 7): + c = scale_saturation(tones_primary[tone],1) + pywal_colors_light += (blend2contrast(c, pywal_colors_light[0], tones_neutral[20], 3, .01, False),) + if (len(pywal_colors_light) <= 7): + c = scale_saturation(tones_tertiary[tone],1) + pywal_colors_light += (blend2contrast(c, pywal_colors_light[0], tones_neutral[20], 3, .01, False),) + if tone < 91: + tone += 8 else: - pywal_colors_light += (blend2contrast(tones_primary[tone], pywal_colors_light[0], tones_neutral[20], 4.5, .01, False),) - pywal_colors_light += (blend2contrast(tones_tertiary[tone], pywal_colors_light[0], tones_neutral[20], 4.5, .01, False),) - if tone < 91: - tone += 8 + break all = pywal_colors_light pywal_colors_light = (pywal_colors_light[0],) - sorted_colors = sort_colors_luminance(sort_colors_luminance(all,reverse=True)[-7:]) + sorted_colors = sort_colors_luminance(all,True)[-7:] for n in range(len(sorted_colors)): pywal_colors_light_intense += (sorted_colors[n],) pywal_colors_light += (blendColors( - tones_neutral[40], sorted_colors[n], .75*lbm),) + tones_neutral[30], sorted_colors[n], .8*lbm),) pywal_colors_light_faint += (blendColors( - tones_neutral[40], sorted_colors[n], .6*lbm),) + tones_neutral[60], sorted_colors[n], .8*lbm),) - ''' print("CONTRAST CHECK DARK") - for color in pywal_colors_dark: - c = contrast_ratio(color, pywal_colors_dark[0]) - print(f"{color} - {c}") - print("CONTRAST CHECK LIGHT") - for color in pywal_colors_light: - c = contrast_ratio(pywal_colors_light[0],color) - print(f"{color} - {c}") ''' + # print("CONTRAST CHECK DARK") + # for color in pywal_colors_dark: + # c = contrast_ratio(color, pywal_colors_dark[0]) + # print(f"{color} - {c}") + # print("CONTRAST CHECK LIGHT") + # for color in pywal_colors_light: + # c = contrast_ratio(pywal_colors_light[0],color) + # print(f"{color} - {c}") self._light_scheme = f"""[ColorEffects:Disabled] Color={extras['SurfaceLight1']} From 0cfbd5819e13ed00443f47b4a8c1f1282c79dc56 Mon Sep 17 00:00:00 2001 From: Luis Bocanegra Date: Mon, 15 Aug 2022 18:29:12 -0500 Subject: [PATCH 2/5] Update license --- LICENSE | 875 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 674 insertions(+), 201 deletions(-) diff --git a/LICENSE b/LICENSE index 261eeb9..f288702 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,674 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 5729fb16218ab215fbe1e2c71d8142612db90fc4 Mon Sep 17 00:00:00 2001 From: Luis Bocanegra Date: Mon, 15 Aug 2022 18:32:06 -0500 Subject: [PATCH 3/5] Add prebuilt package of material-color-utilies Co-authored-by: name avanishsubbiah Co-authored-by: 0xMRTT <0xMRTT@tuta.io> --- ...olor_utilities_python-0.1.0-py3-none-any.whl | Bin 0 -> 30258 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 monet/material_color_utilities_python-0.1.0-py3-none-any.whl diff --git a/monet/material_color_utilities_python-0.1.0-py3-none-any.whl b/monet/material_color_utilities_python-0.1.0-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..d1d1e19d4530f2f73a465780bdf6915aa13f57cf GIT binary patch literal 30258 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�a(xoPwwc06mC#-> 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 sp!jKhc**ke5dMpW&Ger) Date: Mon, 15 Aug 2022 19:56:27 -0500 Subject: [PATCH 4/5] Update installer scripts --- install-fedora-based.sh | 12 ++++++------ install-ubuntu-based.sh | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/install-fedora-based.sh b/install-fedora-based.sh index c477b2f..809cc6c 100644 --- a/install-fedora-based.sh +++ b/install-fedora-based.sh @@ -10,7 +10,11 @@ fi; echo -e "${BGreen}Installing dependencies${clean}" dnf update -dnf install python3 python3-dbus python3-numpy +dnf install python3 python3-dbus python3-numpy python3-pillow python3-pip + +echo -e "${BGreen}Installing python PIP package material_color_utilities_python as user $SUDO_USER ${clean}" + +sudo -u $SUDO_USER pip3 install monet/material_color_utilities_python-0.1.0-py3-none-any.whl echo -e "${BGreen}Installing kde-material-you-colors${clean}" # Cleanup @@ -19,8 +23,6 @@ rm -rf /usr/lib/${pkgname} mkdir -p /usr/lib/${pkgname} cp -f *.{py,conf,desktop} /usr/lib/${pkgname}/ cp -f kde-material-you-colors /usr/lib/${pkgname}/kde-material-you-colors -cp -f material-color-utility-bin /usr/lib/${pkgname}/material-color-utility-bin -cp -f libSkiaSharp.so /usr/lib/${pkgname}/libSkiaSharp.so chmod 755 /usr/lib/${pkgname}/*.py mkdir -p /usr/share/licenses/kde-material-you-colors/ @@ -29,7 +31,5 @@ chmod 664 /usr/share/licenses/${pkgname}/LICENSE chmod 664 /usr/lib/${pkgname}/*.{desktop,conf} chmod 755 /usr/lib/${pkgname}/kde-material-you-colors -chmod 755 /usr/lib/${pkgname}/material-color-utility-bin -chmod 755 /usr/lib/${pkgname}/libSkiaSharp.so ln -sf /usr/lib/${pkgname}/kde-material-you-colors /usr/bin/kde-material-you-colors -ln -sf /usr/lib/${pkgname}/material-color-utility-bin /usr/bin/material-color-utility + diff --git a/install-ubuntu-based.sh b/install-ubuntu-based.sh index 3c8d950..7a3cf5e 100644 --- a/install-ubuntu-based.sh +++ b/install-ubuntu-based.sh @@ -10,7 +10,11 @@ fi; echo -e "${BGreen}Installing dependencies${clean}" apt update -apt install python3 python3-dbus python3-numpy +apt install python3 python3-dbus python3-numpy python3-pillow python3-pip + +echo -e "${BGreen}Installing python PIP package material_color_utilities_python as user $SUDO_USER ${clean}" + +sudo -u $SUDO_USER pip3 install monet/material_color_utilities_python-0.1.0-py3-none-any.whl echo -e "${BGreen}Installing kde-material-you-colors${clean}" # Cleanup @@ -19,8 +23,6 @@ rm -rf /usr/lib/${pkgname} mkdir -p /usr/lib/${pkgname} cp -f *.{py,conf,desktop} /usr/lib/${pkgname}/ cp -f kde-material-you-colors /usr/lib/${pkgname}/kde-material-you-colors -cp -f material-color-utility-bin /usr/lib/${pkgname}/material-color-utility-bin -cp -f libSkiaSharp.so /usr/lib/${pkgname}/libSkiaSharp.so chmod 755 /usr/lib/${pkgname}/*.py mkdir -p /usr/share/licenses/kde-material-you-colors/ @@ -29,7 +31,4 @@ chmod 664 /usr/share/licenses/${pkgname}/LICENSE chmod 664 /usr/lib/${pkgname}/*.{desktop,conf} chmod 755 /usr/lib/${pkgname}/kde-material-you-colors -chmod 755 /usr/lib/${pkgname}/material-color-utility-bin -chmod 755 /usr/lib/${pkgname}/libSkiaSharp.so ln -sf /usr/lib/${pkgname}/kde-material-you-colors /usr/bin/kde-material-you-colors -ln -sf /usr/lib/${pkgname}/material-color-utility-bin /usr/bin/material-color-utility From ce275038b84224ec848ce9a8349cb9b30ab7ca0c Mon Sep 17 00:00:00 2001 From: Luis Bocanegra Date: Mon, 15 Aug 2022 20:01:31 -0500 Subject: [PATCH 5/5] PKGBUILD: Update license and dependencies --- PKGBUILD | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 51bf9ca..ebf8557 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,8 +5,8 @@ pkgrel=1 pkgdesc="Automatic Material You Colors Generator from your wallpaper for the Plasma Desktop" arch=('x86_64') url="https://github.com/luisbocanegra/kde-material-you-colors" -license=('APACHE') -depends=("dbus-python" "python-numpy") +license=('GPL3') +depends=("dbus-python" "python-numpy" "python-pillow" "python-regex" "python-material-color-utilities") optdepends=('python-colr: colored hex codes printing' 'python-pywal: theme other programs using Material You Colors' ) @@ -24,13 +24,8 @@ package() { install -Dm644 kde-material-you-colors.desktop ${pkgdir}/usr/lib/${pkgname}/kde-material-you-colors.desktop install -Dm644 sample_config.conf ${pkgdir}/usr/lib/${pkgname}/sample_config.conf install -Dm755 kde-material-you-colors ${pkgdir}/usr/lib/${pkgname}/kde-material-you-colors - install -Dm755 utils.py ${pkgdir}/usr/lib/${pkgname}/utils.py - install -Dm755 color_utils.py ${pkgdir}/usr/lib/${pkgname}/color_utils.py - install -Dm755 schemeconfigs.py ${pkgdir}/usr/lib/${pkgname}/schemeconfigs.py - install -Dm755 material-color-utility-bin ${pkgdir}/usr/lib/${pkgname}/material-color-utility-bin - install -Dm755 libSkiaSharp.so ${pkgdir}/usr/lib/${pkgname}/libSkiaSharp.so + find . -type f -name "*.py" -exec install -Dm755 {,${pkgdir}/usr/lib/${pkgname}/}{} \; install -dm755 ${pkgdir}/usr/bin - ln -s /usr/lib/${pkgname}/material-color-utility-bin ${pkgdir}/usr/bin/material-color-utility ln -s /usr/lib/${pkgname}/kde-material-you-colors ${pkgdir}/usr/bin/kde-material-you-colors install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE }