Skip to content

Commit

Permalink
Fix licensing issues (#5786)
Browse files Browse the repository at this point in the history
* Fix GPL address (#5772)

* Replace showcase icons with Open Iconic

- The icon set Open Iconic is licensed under MIT unlike the previous
  ones, which are CC-BY-NC
  • Loading branch information
dolang authored and tshirtman committed Jun 11, 2018
1 parent 7303582 commit 0c63c69
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 5 deletions.
5 changes: 4 additions & 1 deletion examples/demo/showcase/data/icons/README
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
Icon from http://www.gentleface.com/free_icon_set.html#geticons
Icons adapted from the Open Iconic set of icons, which are licensed under MIT.

https://useiconic.com/
https://github.com/iconic/open-iconic
Binary file added examples/demo/showcase/data/icons/bug.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/demo/showcase/data/icons/chevron-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/demo/showcase/data/icons/chevron-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed examples/demo/showcase/data/icons/next.png
Binary file not shown.
Binary file removed examples/demo/showcase/data/icons/prev.png
Binary file not shown.
Binary file removed examples/demo/showcase/data/icons/sourcecode.png
Binary file not shown.
6 changes: 3 additions & 3 deletions examples/demo/showcase/showcase.kv
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ BoxLayout:
app.go_screen(idx)
ActionToggleButton:
text: 'Toggle sourcecode'
icon: 'data/icons/sourcecode.png'
icon: 'data/icons/bug.png'
on_release: app.toggle_source_code()
ActionButton:
text: 'Previous screen'
icon: 'data/icons/prev.png'
icon: 'data/icons/chevron-left.png'
on_release: app.go_previous_screen()

ActionButton:
text: 'Next screen'
icon: 'data/icons/next.png'
icon: 'data/icons/chevron-right.png'
on_release: app.go_next_screen()
important: True

Expand Down
2 changes: 1 addition & 1 deletion kivy/tools/highlight/kivy-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

;; You should have received a copy of the GNU General Public License along
;; with GNU Emacs; see the file COPYING. If not, write to the Free Software
;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
;; USA.

;;; Installation:
Expand Down

0 comments on commit 0c63c69

Please sign in to comment.