Mercurial > hg > release > thermostat-0.11
changeset 1154:ed7fab187035
Update with latest icons
review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-June/007093.html
reviewed-by: vanaltj
| author | Mario Torre <neugens.limasoftware@gmail.com> |
|---|---|
| date | Tue, 09 Jul 2013 15:09:58 +0200 |
| parents | fe3f66cc83e7 |
| children | c70ab9ec00f5 |
| files | LICENSE OFL.txt client/swing/src/main/java/com/redhat/thermostat/client/swing/IconResource.java client/swing/src/main/resources/clean.png client/swing/src/main/resources/computer.png client/swing/src/main/resources/java_application_identifier.png client/swing/src/main/resources/record.png client/swing/src/main/resources/sample.png client/swing/src/main/resources/search.png client/swing/src/main/resources/trash.png client/swing/src/test/java/com/redhat/thermostat/client/swing/IconDescriptorTest.java vm-heap-analysis/client-core/src/main/resources/com/redhat/thermostat/vm/heap/analysis/client/core/take_dump.png |
| diffstat | 12 files changed, 101 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/LICENSE Fri Jun 28 16:46:25 2013 +0200 +++ b/LICENSE Tue Jul 09 15:09:58 2013 +0200 @@ -23,3 +23,10 @@ not obligated to do so. If you do not wish to do so, delete this exception statement from your version. +-------------------------------------------------------------------------------- +Additional files and licenses +-------------------------------------------------------------------------------- + +Thermostat uses Font Awesome by Dave Gandy (http://fontawesome.io) as primary +icon resource, distributed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). +A copy of the OFL 1.1 license is also included and distributed with Thermostat.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OFL.txt Tue Jul 09 15:09:58 2013 +0200 @@ -0,0 +1,93 @@ +Font Awesome Copyright by Dave Gandy, http://fontawesome.io + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/IconResource.java Fri Jun 28 16:46:25 2013 +0200 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/IconResource.java Tue Jul 09 15:09:58 2013 +0200 @@ -51,8 +51,6 @@ private boolean fromFileSytem = false; - private static final String ICON_PREFIX = "/usr/share/icons/gnome/"; - public static final IconResource JAVA_APPLICATION = new IconResource("java_application_identifier.png"); public static final IconResource HOST = new IconResource("computer.png"); public static final IconResource SEARCH = new IconResource("search.png");
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/IconDescriptorTest.java Fri Jun 28 16:46:25 2013 +0200 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/IconDescriptorTest.java Tue Jul 09 15:09:58 2013 +0200 @@ -54,7 +54,7 @@ IconDescriptor descriptor = IconDescriptor.loadIcon(classLoader, resource); ByteBuffer buffer = descriptor.getData(); - assertEquals(841, buffer.capacity()); + assertEquals(626, buffer.capacity()); byte[] data = buffer.array();