diff --git a/CHANGELOG.md b/CHANGELOG.md index da124e9..d241a78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ## [1.15beta] - 2023-xx-xx * Revamp Debug dialog. * Fixed breakpoints with conditional statements. +* Fixed up icons and Debian "copyright" file for Debian Intent-To-Package. ## [1.14] - 2023-01-02 * Happy New Year! diff --git a/debian/copyright b/debian/copyright index b115c86..078b1de 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,37 +25,7 @@ Files: src/resources/seergdb_*.png Copyright: FlatIcon https://www.flaticon.com/free-icon/seer_2689789 -License: Attribution - (https://support.flaticon.com/s/article/Attribution-How-when-and-where?language=en_US) - -Files: - src/resources/icons-icons/gdb.png -Copyright: - John Gardner -License: CC4.0 - -Files: - src/resources/icons-icons/keyboard.png -Copyright: - Dirtyworks -License: CC4.0 - -Files: - src/resources/icons-icons/editor.png -Copyright: - Piksart -License: CC4.0 - -Files: - src/resources/icons-icons/font.png -Copyright: - DaveGandy -License: CC4.0 - -Files: - src/resources/icons-icons/configure.png -Copyright: - Chameleon -License: CC4.0 +License: FlatIcon Free Use License Files: src/resources/icons-icons/arguments.png @@ -63,12 +33,24 @@ Copyright: IconBox License: CC4.0 +Files: + src/resources/icons-icons/console.png +Copyright: + Icons8 +License: CC4.0 + Files: src/resources/icons-icons/debug.png Copyright: CarbonDes License: CC4.0 +Files: + src/resources/icons-icons/editor.png +Copyright: + Piksart +License: CC4.0 + Files: src/resources/icons-icons/exit.png Copyright: @@ -76,9 +58,21 @@ Copyright: License: CC4.0 Files: - src/resources/icons-icons/console.png + src/resources/icons-icons/font.png Copyright: - Icons8 + DaveGandy +License: CC4.0 + +Files: + src/resources/icons-icons/gdb.png +Copyright: + John Gardner +License: CC4.0 + +Files: + src/resources/icons-icons/hide.png +Copyright: + FerdiSetiadi License: CC4.0 Files: @@ -93,12 +87,6 @@ Copyright: FerdiSetiadi License: CC4.0 -Files: - src/resources/icons-icons/hide.png -Copyright: - FerdiSetiadi -License: CC4.0 - Files: src/resources/icons-icons/style.png Copyright: @@ -112,9 +100,15 @@ Copyright: License: CC3.0 Files: - src/resources/thenounproject/source.svg + src/resources/thenounproject/configure.svg Copyright: - kozinn + tomas.knopp +License: CC3.0 + +Files: + src/resources/thenounproject/keyboard.svg +Copyright: + Flowicon License: CC3.0 Files: @@ -124,25 +118,13 @@ Copyright: License: CC3.0 Files: - src/resources/thenounproject/configuratio + src/resources/thenounproject/source.svg Copyright: - tomas.knopp + kozinn License: CC3.0 Files: - src/resources/thenounproject/debug.sgv -Copyright: - prosymbols -License: CC3.0 - -Files: - src/resources/thenounproject/keyboard.sgv -Copyright: - Flowicon -License: CC3.0 - -Files: - src/resources/thenounproject/stop.sgv + src/resources/thenounproject/stop.svg Copyright: andre.buand10 License: CC3.0 @@ -242,3 +224,52 @@ License: Creative Commons Attribution 4.0 International (CC BY 4.0) technological measures that legally restrict others from doing anything the license permits. +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/SeerMainWindow.ui b/src/SeerMainWindow.ui index 280219d..230a918 100644 --- a/src/SeerMainWindow.ui +++ b/src/SeerMainWindow.ui @@ -311,7 +311,7 @@ - :/seer/resources/thenounproject/array.svg:/seer/resources/thenounproject/array.svg + :/seer/resources/thenounproject/memory.svg:/seer/resources/thenounproject/memory.svg Array Visualizer diff --git a/src/resource.qrc b/src/resource.qrc index fc4e5c4..d264296 100644 --- a/src/resource.qrc +++ b/src/resource.qrc @@ -7,7 +7,6 @@ resources/seergdb_512x512.png resources/ABOUT.md resources/thenounproject/memory.svg - resources/thenounproject/array.svg resources/thenounproject/source.svg resources/thenounproject/assembly.svg resources/thenounproject/keyboard.svg @@ -15,9 +14,7 @@ resources/thenounproject/stop.svg resources/icons-icons/gdb.png resources/icons-icons/editor.png - resources/icons-icons/keyboard.png resources/icons-icons/font.png - resources/icons-icons/configure.png resources/icons-icons/arguments.png resources/icons-icons/debug.png resources/icons-icons/exit.png diff --git a/src/resources/ABOUT.md b/src/resources/ABOUT.md index 2873f7c..0ff59b2 100644 --- a/src/resources/ABOUT.md +++ b/src/resources/ABOUT.md @@ -23,25 +23,22 @@ Other icons used by Seer. | Icon | Creator | License | | ------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | |Icons Breeze Icon set | Created by L4ki | (License GPLv3) | -|Icon gdb.png | Created by John Gardner | (License CC4.0) | -|Icon keyboard.png | Created by Dirtyworks | (License CC4.0) | -|Icon editor.png | Created by Piksart | (License CC4.0) | -|Icon font.png | Created by Dave Gandy | (License CC4.0) | -|Icon configure.png | Created by Chameleon Design | (License CC4.0) | |Icon arguments.png | Created by Icon box | (License CC4.0) | -|Icon debug.png | Created by Carbon Design | (License CC4.0) | -|Icon exit.png | Created by Nicky Lim | (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 hide.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 source.svg | Created by kozinn | (License CC3.0) | -|Icon memory.svg | Created by mudassar.hussain323 | (License CC3.0) | |Icon configuration.sgv | Created by tomas.knopp | (License CC3.0) | -|Icon debug.sgv | Created by prosymbols | (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 d353272..0fe5aed 100644 --- a/src/resources/README.icons +++ b/src/resources/README.icons @@ -1,52 +1,64 @@ -Seer icons are from Flat Icon and licensed under the terms of the Flat Icon free icon use. -Most are 32x32. - https://www.flaticon.com/free-icon/seer_2689789 https://www.flaticon.com/authors/flat-icons seergdb_xxx.png - https://www.flaticon.com/free-icon/matrix_3815250 https://www.flaticon.com/authors/freepik memory.png - https://www.flaticon.com/premium-icon/array_725259 https://www.flaticon.com/authors/voysla array.png - https://www.flaticon.com/free-icon/log-out_6238589 https://www.flaticon.com/authors/creatype exit.png - https://www.flaticon.com/free-icon/bug_2535485 https://www.flaticon.com/authors/flat-icons debug.png - https://www.flaticon.com/premium-icon/contrast-adjustment_4353977 https://www.flaticon.com/authors/creatype configure.png - https://www.flaticon.com/free-icon/blogger_3860232 https://www.flaticon.com/authors/xnimrodx editor.png - https://www.flaticon.com/premium-icon/c_2085176 https://www.flaticon.com/authors/justicon source.png - https://www.flaticon.com/premium-icon/command_6008504 https://www.flaticon.com/authors/flat-icons console.png - https://www.flaticon.com/free-icon/maximize_3580204 https://www.flaticon.com/authors/mavadee maximize.png - https://www.flaticon.com/free-icon/minimize_3580225 https://www.flaticon.com/authors/mavadee minimize.png - https://www.flaticon.com/premium-icon/close_3718000 https://www.flaticon.com/authors/flat-icons hide.png - https://www.flaticon.com/free-icon/up-arrow_2223694 https://www.flaticon.com/authors/bqlqn up_arrow.png - https://www.flaticon.com/free-icon/down-arrow_2223613 https://www.flaticon.com/authors/bqlqn down_arrow.png - https://www.flaticon.com/free-icons/keyboard https://www.flaticon.com/authors/freepik keyboard-key.png - https://www.flaticon.com/free-icons/compiler https://www.flaticon.com/authors/iconixar assembly.png +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 + + https://www.flaticon.com/free-icon/seer_2689789 https://www.flaticon.com/authors/flat-icons seergdb_*.png - -The debugging icons used are from the NetBeans project (via the Gede debugger) and licensed under the +Some icons are used from "IconsIcons" and "TheNounProject" and are licensed under "CreativeCommons" CC3.0 and CC4.0 licenses. terms of the NetBeans License Agreement. - https://icon-icons.com/icon/GDB/132365 https://icon-icons.com/users/AmQJzv5e8DpITUWIRmGPz/icon-sets/ gdb.png CC4.0 - https://icon-icons.com/icon/keyboard/122169 https://icon-icons.com/users/z1gHIAw5WHSQk4RJ0exyV/icon-sets/ keyboard.png CC4.0 - https://icon-icons.com/icon/web-design-writing-coding-development/220538 https://icon-icons.com/users/14h9fJJJmBr3Dm13gYSpS/icon-sets/ editor.png CC4.0 - https://icon-icons.com/icon/font-symbol-of-letter-a/73556 https://icon-icons.com/users/2LUKwJe4QDNsjuhkS98IX/icon-sets/ font.png CC4.0 - https://icon-icons.com/icon/setting-configure-repair-support-optimization-google/83447 https://icon-icons.com/users/Nixd2U1fkolfZAGKcPLGu/icon-sets/ configure.png CC4.0 - https://icon-icons.com/icon/setting-balance-equalizer/152217 https://icon-icons.com/users/67020lqBmzmzx0F3OH2GE/icon-sets/ arguments.png CC4.0 - https://icon-icons.com/icon/debug/215819 https://icon-icons.com/users/7dBLqleqakUowFGJkWLXY/icon-sets/ debug.png CC4.0 - https://icon-icons.com/icon/logout-exit/176185 https://icon-icons.com/users/ah334sOoBVVE7GXS94Who/icon-sets/ exit.png CC4.0 - https://icon-icons.com/icon/console/5091 https://icon-icons.com/users/Vn6TUStZ7Ng5JKLU3rRHX/icon-sets/ console.png CC4.0 - https://icon-icons.com/icon/resize-maximize/175765 https://icon-icons.com/users/sr18GsT8hXb37mrJn4kOU/icon-sets/ maximize.png CC4.0 - https://icon-icons.com/icon/minimize-window/175768 https://icon-icons.com/users/sr18GsT8hXb37mrJn4kOU/icon-sets/ minimize.png CC4.0 - https://icon-icons.com/icon/delete-remove/175783 https://icon-icons.com/users/sr18GsT8hXb37mrJn4kOU/icon-sets/ hide.png CC4.0 - https://icon-icons.com/icon/face-glasses-sunglasses/107950 https://icon-icons.com/users/7VZI9qW3el29z8Ka5fjmo/icon-sets/ style.png CC4.0 + https://icon-icons.com/icon/GDB/132365 https://icon-icons.com/users/AmQJzv5e8DpITUWIRmGPz/icon-sets/ icons-icons/gdb.png CC4.0 + https://icon-icons.com/icon/keyboard/122169 https://icon-icons.com/users/z1gHIAw5WHSQk4RJ0exyV/icon-sets/ icons-icons/keyboard.png CC4.0 + https://icon-icons.com/icon/web-design-writing-coding-development/220538 https://icon-icons.com/users/14h9fJJJmBr3Dm13gYSpS/icon-sets/ icons-icons/editor.png CC4.0 + https://icon-icons.com/icon/font-symbol-of-letter-a/73556 https://icon-icons.com/users/2LUKwJe4QDNsjuhkS98IX/icon-sets/ icons-icons/font.png CC4.0 + https://icon-icons.com/icon/setting-configure-repair-support-optimization-google/83447 https://icon-icons.com/users/Nixd2U1fkolfZAGKcPLGu/icon-sets/ icons-icons/configure.png CC4.0 + https://icon-icons.com/icon/setting-balance-equalizer/152217 https://icon-icons.com/users/67020lqBmzmzx0F3OH2GE/icon-sets/ icons-icons/arguments.png CC4.0 + https://icon-icons.com/icon/debug/215819 https://icon-icons.com/users/7dBLqleqakUowFGJkWLXY/icon-sets/ icons-icons/debug.png CC4.0 + https://icon-icons.com/icon/logout-exit/176185 https://icon-icons.com/users/ah334sOoBVVE7GXS94Who/icon-sets/ icons-icons/exit.png CC4.0 + https://icon-icons.com/icon/console/5091 https://icon-icons.com/users/Vn6TUStZ7Ng5JKLU3rRHX/icon-sets/ icons-icons/console.png CC4.0 + https://icon-icons.com/icon/resize-maximize/175765 https://icon-icons.com/users/sr18GsT8hXb37mrJn4kOU/icon-sets/ icons-icons/maximize.png CC4.0 + https://icon-icons.com/icon/minimize-window/175768 https://icon-icons.com/users/sr18GsT8hXb37mrJn4kOU/icon-sets/ icons-icons/minimize.png CC4.0 + https://icon-icons.com/icon/delete-remove/175783 https://icon-icons.com/users/sr18GsT8hXb37mrJn4kOU/icon-sets/ icons-icons/hide.png CC4.0 + https://icon-icons.com/icon/face-glasses-sunglasses/107950 https://icon-icons.com/users/7VZI9qW3el29z8Ka5fjmo/icon-sets/ icons-icons/style.png CC4.0 + + https://thenounproject.com/icon/asm-file-document-icon-2598539/ https://thenounproject.com/iyikon/ thenounproject/assembly.svg CC3.0 + https://thenounproject.com/icon/configuration-1115171/ https://thenounproject.com/tomas.knopp/ thenounproject/configure.svg CC3.0 + https://thenounproject.com/icon/keyboard-key-4571629/ https://thenounproject.com/Flowicon/ thenounproject/keyboard.svg CC3.0 + https://thenounproject.com/icon/binary-data-search-4065152/ https://thenounproject.com/mudassar.hussain323/ thenounproject/memory.svg CC3.0 + https://thenounproject.com/icon/cpp-file-252779/ https://thenounproject.com/kozinn/ thenounproject/source.svg CC3.0 + https://thenounproject.com/icon/interruption-4417639/ https://thenounproject.com/andre.buand10/ thenounproject/stop.sgv CC3.0 +Some icons are used from the RelaxLightIcons set. Licensed under the GPL-3.0+ license. +L4ki https://github.com/L4ki - https://thenounproject.com/icon/asm-file-document-icon-2598539/ https://thenounproject.com/iyikon/ assembly.svg CC3.0 - https://thenounproject.com/icon/cpp-file-252779/ https://thenounproject.com/kozinn/ source.svg CC3.0 - https://thenounproject.com/icon/binary-data-search-4065152/ https://thenounproject.com/mudassar.hussain323/ memory.svg CC3.0 - https://thenounproject.com/icon/configuration-1115171/ https://thenounproject.com/tomas.knopp/ configure.svg CC3.0 - https://thenounproject.com/icon/debugging-1978211/ https://thenounproject.com/prosymbols/ debug.svg CC3.0 - https://thenounproject.com/icon/keyboard-key-4571629/ https://thenounproject.com/Flowicon/ keyboard.svg CC3.0 - https://thenounproject.com/icon/interruption-4417639/ https://thenounproject.com/andre.buand10/ stop.sgv CC3.0 - - + RelaxLightIcons/debug-execute-from-cursor.svg + RelaxLightIcons/debug-execute-to-cursor.svg + RelaxLightIcons/debug-run-cursor.svg + RelaxLightIcons/debug-run.svg + RelaxLightIcons/debug-step-instruction.svg + RelaxLightIcons/debug-step-into-instruction.svg + RelaxLightIcons/debug-step-into.svg + RelaxLightIcons/debug-step-out.svg + RelaxLightIcons/debug-step-over.svg + RelaxLightIcons/document-new.svg + RelaxLightIcons/document-open.svg + RelaxLightIcons/document-print.svg + RelaxLightIcons/document-save-as.svg + RelaxLightIcons/document-save.svg + RelaxLightIcons/edit-clear.svg + RelaxLightIcons/edit-delete.svg + RelaxLightIcons/edit-find.svg + RelaxLightIcons/go-down.svg + RelaxLightIcons/go-next.svg + RelaxLightIcons/go-previous.svg + RelaxLightIcons/go-up.svg + RelaxLightIcons/help-about.svg + RelaxLightIcons/help-whatsthis.svg + RelaxLightIcons/list-add.svg + RelaxLightIcons/list-remove.svg + RelaxLightIcons/tools-media-optical-burn-image.svg + RelaxLightIcons/view-refresh.svg diff --git a/src/resources/icons-icons/configure.png b/src/resources/icons-icons/configure.png deleted file mode 100644 index d3aad2e..0000000 Binary files a/src/resources/icons-icons/configure.png and /dev/null differ diff --git a/src/resources/icons-icons/keyboard.png b/src/resources/icons-icons/keyboard.png deleted file mode 100644 index 9c5b8e0..0000000 Binary files a/src/resources/icons-icons/keyboard.png and /dev/null differ diff --git a/src/resources/thenounproject/array.svg b/src/resources/thenounproject/array.svg deleted file mode 100644 index 2fcda04..0000000 --- a/src/resources/thenounproject/array.svg +++ /dev/null @@ -1,371 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/resources/thenounproject/debug.svg b/src/resources/thenounproject/debug.svg deleted file mode 100644 index d0b812c..0000000 --- a/src/resources/thenounproject/debug.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -