diff --git a/CHANGELOG.md b/CHANGELOG.md index 014cffa6..070761d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## [2.4beta] - 2023-XX-XX * Prepare for the 2.4 release cycle. +* Changed main icon to a more license friendly one. + All icons are now GPLv3, CC3.0, or CC4.0 * Fixed string compares for breakpoint conditions (#184) * Added '--bs' command line option to specify a breakpoint at a source.cpp:lineno * Fixed long tooltips text by restricting them to 100 characters. (#189) diff --git a/debian/copyright b/debian/copyright index a09d4c3e..a8720506 100644 --- a/debian/copyright +++ b/debian/copyright @@ -24,8 +24,8 @@ License: GPL-3.0+ Files: src/resources/seergdb_*.png Copyright: - FlatIcon https://www.flaticon.com/free-icon/seer_2689789 -License: FlatIcon Free Use License + Toli +License: CC-BY-3.0 Files: src/resources/icons-icons/* @@ -49,6 +49,7 @@ Copyright: mudassar.hussain323 kozinn andre.buand10 + Toli License: CC-BY-3.0 License: GPL-3.0+ @@ -96,7 +97,7 @@ License: BSD-3-clause License: CC-BY-3.0 -y http://creativecommons.org/licenses/by/3.0/ + http://creativecommons.org/licenses/by/3.0/ . THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY @@ -693,54 +694,3 @@ License: CC-BY-4.0 that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. - - -License: FlatIcon Free Use License - - https://support.flaticon.com/s/article/Attribution-How-when-and-where?language=en_US - - This is a human-readable summary of (and not a substitute for) the license. - - If you are a Free user you must always attribute the author when using our resources, - below you can see the structure of the correct attribution line. - - The attribution line would follow the same rules: - - "Icon made by Freepik from www.flaticon.com" - - You need to include one line for each author (not for each icon). - - Please note that there are 18 packs created by third parties and therefore not covered by - our license: - All packs created by Google: https://www.flaticon.com/authors/google - And this pack: https://www.flaticon.com/autores/dave-gandy - - - Below you can find a few different scenarios and how the attribution must be inserted for - each of them: - - Websites: - - Insert the attribution on the page where the icon is shown. This can be placed next to - the image or on the footer of the website. - - Printed products: - - Paste this attribution on the final work so the authorship is known (for instance, in the - acknowledgements chapter of a book). - - Apps/games: - - Place the attribution on the app's credits page and on the description page on the app store. - - Social Networks: - - Insert the attribution line "Icon made by [author link] from @flaticon" (E.g.: Icon made by - Freepik from @flaticon) on the post or post comments. - - Stickers: - - It would be great if you could add the attribution line "Sticker made by Flaticon" where you use it, - but we understand that it's complicated to add this line in a chat, and therefore it's not mandatory - to add the attribution line if you use our stickers in a chat. - diff --git a/src/resource.qrc b/src/resource.qrc index e56bd6bf..ac66cc07 100644 --- a/src/resource.qrc +++ b/src/resource.qrc @@ -13,6 +13,7 @@ resources/thenounproject/keyboard.svg resources/thenounproject/configure.svg resources/thenounproject/stop.svg + resources/thenounproject/fortune-teller.svg resources/icons-icons/gdb.png resources/icons-icons/editor.png resources/icons-icons/font.png diff --git a/src/resources/ABOUT.md b/src/resources/ABOUT.md index b19dbfd0..b90ea3d6 100644 --- a/src/resources/ABOUT.md +++ b/src/resources/ABOUT.md @@ -4,7 +4,7 @@ Version VERSIONNUMBER Seer, a simple and easy-to-use gui frontend to the GDB debugger, having many features. -Copyright (C) 2021-2023    Ernie Pasveer. +Copyright (C) 2021-2024    Ernie Pasveer.       [https://github.com/epasveer/seer](https://github.com/epasveer/seer) @@ -13,33 +13,31 @@ Copyright (C) 2021-2023    Ernie Pasveer. Icons used by Seer are the property of the original creators. -The Seer icon. -    Seer icon created by Flat Icons - Flaticon (License FlatIcon free-use) -  -Other icons used by Seer. -  - - -| Icon | Creator | License | -| ------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | -|Icons Breeze Icon set | Created by L4ki | (License GPLv3) | -|Icon arguments.png | Created by Icon box | (License CC4.0) | -|Icon console.png | Created by Icons8 | (License CC4.0) | -|Icon debug.png | Created by Carbon Design | (License CC4.0) | -|Icon editor.png | Created by Piksart | (License CC4.0) | -|Icon exit.png | Created by Nicky Lim | (License CC4.0) | -|Icon font.png | Created by Dave Gandy | (License CC4.0) | -|Icon gdb.png | Created by John Gardner | (License CC4.0) | -|Icon hide.png | Created by ferdi setiadi | (License CC4.0) | -|Icon maximize.png | Created by ferdi setiadi | (License CC4.0) | -|Icon minimize.png | Created by ferdi setiadi | (License CC4.0) | -|Icon style.png | Created by Free Icons | (License CC4.0) | -|Icon assembly.svg | Created by iyikon | (License CC3.0) | -|Icon configuration.sgv | Created by tomas.knopp | (License CC3.0) | -|Icon keyboard.sgv | Created by Flowicon | (License CC3.0) | -|Icon memory.svg | Created by mudassar.hussain323 | (License CC3.0) | -|Icon source.svg | Created by kozinn | (License CC3.0) | -|Icon stop.sgv | Created by andre.buand10 | (License CC3.0) | +The main Seer icon and other icons. +  + + +| Icon | Creator | License | +| -------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | +|Icon fortune_teller.sgv | Created by Toli | (License CC3.0) | +|Icons Breeze Icon set | Created by L4ki | (License GPLv3) | +|Icon arguments.png | Created by Icon box | (License CC4.0) | +|Icon console.png | Created by Icons8 | (License CC4.0) | +|Icon debug.png | Created by Carbon Design | (License CC4.0) | +|Icon editor.png | Created by Piksart | (License CC4.0) | +|Icon exit.png | Created by Nicky Lim | (License CC4.0) | +|Icon font.png | Created by Dave Gandy | (License CC4.0) | +|Icon gdb.png | Created by John Gardner | (License CC4.0) | +|Icon hide.png | Created by ferdi setiadi | (License CC4.0) | +|Icon maximize.png | Created by ferdi setiadi | (License CC4.0) | +|Icon minimize.png | Created by ferdi setiadi | (License CC4.0) | +|Icon style.png | Created by Free Icons | (License CC4.0) | +|Icon assembly.svg | Created by iyikon | (License CC3.0) | +|Icon configuration.sgv | Created by tomas.knopp | (License CC3.0) | +|Icon keyboard.sgv | Created by Flowicon | (License CC3.0) | +|Icon memory.svg | Created by mudassar.hussain323 | (License CC3.0) | +|Icon source.svg | Created by kozinn | (License CC3.0) | +|Icon stop.sgv | Created by andre.buand10 | (License CC3.0) |     diff --git a/src/resources/README.icons b/src/resources/README.icons index 0fe5aed5..8a8cfc5b 100644 --- a/src/resources/README.icons +++ b/src/resources/README.icons @@ -1,8 +1,9 @@ -The main Seer icon is from Flat Icon and licensed under the terms of the "Flat Icon free use" license. -https://support.flaticon.com/s/article/Attribution-How-when-and-where?language=en_US +The main Seer icon is from TheNounProject under the CC3.0 license. The .svg file was converted to .png for better handling of fixed +sized .png files. "Toli" is the copyright owner, as mentioned below. Seer uses it under the CC3.0 license. - https://www.flaticon.com/free-icon/seer_2689789 https://www.flaticon.com/authors/flat-icons seergdb_*.png + https://thenounproject.com/icon/fortune-teller-3505303/ https://thenounproject.com/tolicon/ thenounproject/fortune-teller.svg CC3.0 + seergdb_*.png Some icons are used from "IconsIcons" and "TheNounProject" and are licensed under "CreativeCommons" CC3.0 and CC4.0 licenses. diff --git a/src/resources/seergdb_128x128.png b/src/resources/seergdb_128x128.png index 89922651..2489fd10 100644 Binary files a/src/resources/seergdb_128x128.png and b/src/resources/seergdb_128x128.png differ diff --git a/src/resources/seergdb_256x256.png b/src/resources/seergdb_256x256.png index bc198376..ec51c36f 100644 Binary files a/src/resources/seergdb_256x256.png and b/src/resources/seergdb_256x256.png differ diff --git a/src/resources/seergdb_32x32.png b/src/resources/seergdb_32x32.png index a4d1134e..8b78f202 100644 Binary files a/src/resources/seergdb_32x32.png and b/src/resources/seergdb_32x32.png differ diff --git a/src/resources/seergdb_512x512.png b/src/resources/seergdb_512x512.png index 3c10cae4..876df2ed 100644 Binary files a/src/resources/seergdb_512x512.png and b/src/resources/seergdb_512x512.png differ diff --git a/src/resources/seergdb_64x64.png b/src/resources/seergdb_64x64.png index 26906085..e7410b41 100644 Binary files a/src/resources/seergdb_64x64.png and b/src/resources/seergdb_64x64.png differ diff --git a/src/resources/thenounproject/fortune-teller.readme b/src/resources/thenounproject/fortune-teller.readme new file mode 100644 index 00000000..e1a065e1 --- /dev/null +++ b/src/resources/thenounproject/fortune-teller.readme @@ -0,0 +1,18 @@ + +The Seer icon is from: + + https://thenounproject.com/icon/fortune-teller-3505303/ + noun-fortune-teller-3505303.svg + + https://creativecommons.org/licenses/by/3.0/ + +Convert to png and resize. + + mv noun-fortune-teller-3505303.svg fortune-teller.svg + + convert -background transparent -resize 32x32 fortune-teller.svg ../seergdb_32x32.png + convert -background transparent -resize 64x64 fortune-teller.svg ../seergdb_64x64.png + convert -background transparent -resize 128x128 fortune-teller.svg ../seergdb_128x128.png + convert -background transparent -resize 256x256 fortune-teller.svg ../seergdb_256x256.png + convert -background transparent -resize 515x512 fortune-teller.svg ../seergdb_512x512.png + diff --git a/src/resources/thenounproject/fortune-teller.svg b/src/resources/thenounproject/fortune-teller.svg new file mode 100644 index 00000000..82fc53cd --- /dev/null +++ b/src/resources/thenounproject/fortune-teller.svg @@ -0,0 +1,4 @@ + + + +