Fixup artwork licenses
authorGeoff Levand <geoff@infradead.org>
Fri, 9 Mar 2012 23:36:40 +0000 (15:36 -0800)
committerGeoff Levand <geoff@infradead.org>
Sat, 10 Mar 2012 00:04:13 +0000 (16:04 -0800)
Replace icon files with files from KDE 4.3 Oxygen.  Add artwork
license info.

Signed-off-by: Geoff Levand <geoff@infradead.org>
20 files changed:
ui/common/Makefile.am
ui/common/artwork/COPYING-tux [new file with mode: 0644]
ui/common/artwork/cdrom.png [deleted file]
ui/common/artwork/cursor.gz [deleted file]
ui/common/artwork/hdd.png [deleted file]
ui/common/artwork/network.png [deleted file]
ui/common/artwork/oxygen/COPYING-oxygen [new file with mode: 0644]
ui/common/artwork/oxygen/applications-system.png [new file with mode: 0644]
ui/common/artwork/oxygen/configure.png [new file with mode: 0644]
ui/common/artwork/oxygen/drive-harddisk.png [new file with mode: 0644]
ui/common/artwork/oxygen/drive-optical.png [new file with mode: 0644]
ui/common/artwork/oxygen/drive-removable-media-usb-pendrive.png [new file with mode: 0644]
ui/common/artwork/oxygen/media-optical.png [new file with mode: 0644]
ui/common/artwork/oxygen/network-wired.png [new file with mode: 0644]
ui/common/artwork/oxygen/utilities-terminal.png [new file with mode: 0644]
ui/common/artwork/system.png [deleted file]
ui/common/artwork/usbpen.png [deleted file]
ui/twin/main-generic.c
ui/twin/main-ps3.c
ui/twin/pbt-scr.c

index 034c91be64106fb252aa722d13f3fc7bdbdfd0d3..855dde8ab65126ba78b90b6776d00fba1602a37e 100644 (file)
@@ -48,13 +48,17 @@ artwork =
 if WITH_TWIN
 artwork += \
        $(srcdir)/artwork/background.jpg \
-       $(srcdir)/artwork/cdrom.png \
-       $(srcdir)/artwork/cursor.gz \
-       $(srcdir)/artwork/hdd.png \
-       $(srcdir)/artwork/network.png \
-       $(srcdir)/artwork/system.png \
+       $(srcdir)/artwork/COPYING-tux \
        $(srcdir)/artwork/tux.png \
-       $(srcdir)/artwork/usbpen.png
+       $(srcdir)/artwork/oxygen/applications-system.png \
+       $(srcdir)/artwork/oxygen/configure.png \
+       $(srcdir)/artwork/oxygen/COPYING-oxygen \
+       $(srcdir)/artwork/oxygen/drive-harddisk.png \
+       $(srcdir)/artwork/oxygen/drive-optical.png \
+       $(srcdir)/artwork/oxygen/drive-removable-media-usb-pendrive.png \
+       $(srcdir)/artwork/oxygen/media-optical.png \
+       $(srcdir)/artwork/oxygen/network-wired.png \
+       $(srcdir)/artwork/oxygen/utilities-terminal.png
 endif
 
 artworkdir = $(pkgdatadir)/artwork/
diff --git a/ui/common/artwork/COPYING-tux b/ui/common/artwork/COPYING-tux
new file mode 100644 (file)
index 0000000..02b02cb
--- /dev/null
@@ -0,0 +1,10 @@
+tux.png
+
+Source: http://www.isc.tamu.edu/~lewing/linux/
+Copyright: 1996 Larry Ewing <lewing@isc.tamu.edu>
+License: tux
+ The copyright holder of this file allows anyone to use it for any purpose,
+ provided that you acknowledge lewing@isc.tamu.edu and The GIMP if someone
+ asks.
+Comment: This is a cropped version of sit3-shine.7.gif converted to PNG with
+ original transparent background.
diff --git a/ui/common/artwork/cdrom.png b/ui/common/artwork/cdrom.png
deleted file mode 100644 (file)
index 8b3eeb6..0000000
Binary files a/ui/common/artwork/cdrom.png and /dev/null differ
diff --git a/ui/common/artwork/cursor.gz b/ui/common/artwork/cursor.gz
deleted file mode 100644 (file)
index b73b72f..0000000
Binary files a/ui/common/artwork/cursor.gz and /dev/null differ
diff --git a/ui/common/artwork/hdd.png b/ui/common/artwork/hdd.png
deleted file mode 100644 (file)
index 2b1594c..0000000
Binary files a/ui/common/artwork/hdd.png and /dev/null differ
diff --git a/ui/common/artwork/network.png b/ui/common/artwork/network.png
deleted file mode 100644 (file)
index 2981c5b..0000000
Binary files a/ui/common/artwork/network.png and /dev/null differ
diff --git a/ui/common/artwork/oxygen/COPYING-oxygen b/ui/common/artwork/oxygen/COPYING-oxygen
new file mode 100644 (file)
index 0000000..045b62e
--- /dev/null
@@ -0,0 +1,216 @@
+The Oxygen Icon Theme
+    Copyright (C) 2007 Nuno Pinheiro <nuno@oxygen-icons.org>
+    Copyright (C) 2007 David Vignoni <david@icon-king.com>
+    Copyright (C) 2007 David Miller <miller@oxygen-icons.org>
+    Copyright (C) 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
+    Copyright (C) 2007 Kenneth Wimer <kwwii@bootsplash.org>
+    Copyright (C) 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
+    
+
+and others
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+Clarification:
+
+  The GNU Lesser General Public License or LGPL is written for
+  software libraries in the first place. We expressly want the LGPL to
+  be valid for this artwork library too.
+
+  KDE Oxygen theme icons is a special kind of software library, it is an
+  artwork library, it's elements can be used in a Graphical User Interface, or
+  GUI.
+
+  Source code, for this library means:
+   - where they exist, SVG;
+   - otherwise, if applicable, the multi-layered formats xcf or psd, or
+  otherwise png.
+
+  The LGPL in some sections obliges you to make the files carry
+  notices. With images this is in some cases impossible or hardly useful.
+
+  With this library a notice is placed at a prominent place in the directory
+  containing the elements. You may follow this practice.
+
+  The exception in section 5 of the GNU Lesser General Public License covers
+  the use of elements of this art library in a GUI.
+
+  kde-artists [at] kde.org
+
+-----
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/ui/common/artwork/oxygen/applications-system.png b/ui/common/artwork/oxygen/applications-system.png
new file mode 100644 (file)
index 0000000..4a37651
Binary files /dev/null and b/ui/common/artwork/oxygen/applications-system.png differ
diff --git a/ui/common/artwork/oxygen/configure.png b/ui/common/artwork/oxygen/configure.png
new file mode 100644 (file)
index 0000000..79f92de
Binary files /dev/null and b/ui/common/artwork/oxygen/configure.png differ
diff --git a/ui/common/artwork/oxygen/drive-harddisk.png b/ui/common/artwork/oxygen/drive-harddisk.png
new file mode 100644 (file)
index 0000000..68351d1
Binary files /dev/null and b/ui/common/artwork/oxygen/drive-harddisk.png differ
diff --git a/ui/common/artwork/oxygen/drive-optical.png b/ui/common/artwork/oxygen/drive-optical.png
new file mode 100644 (file)
index 0000000..82dd0cd
Binary files /dev/null and b/ui/common/artwork/oxygen/drive-optical.png differ
diff --git a/ui/common/artwork/oxygen/drive-removable-media-usb-pendrive.png b/ui/common/artwork/oxygen/drive-removable-media-usb-pendrive.png
new file mode 100644 (file)
index 0000000..568c078
Binary files /dev/null and b/ui/common/artwork/oxygen/drive-removable-media-usb-pendrive.png differ
diff --git a/ui/common/artwork/oxygen/media-optical.png b/ui/common/artwork/oxygen/media-optical.png
new file mode 100644 (file)
index 0000000..c11bf8a
Binary files /dev/null and b/ui/common/artwork/oxygen/media-optical.png differ
diff --git a/ui/common/artwork/oxygen/network-wired.png b/ui/common/artwork/oxygen/network-wired.png
new file mode 100644 (file)
index 0000000..2981c5b
Binary files /dev/null and b/ui/common/artwork/oxygen/network-wired.png differ
diff --git a/ui/common/artwork/oxygen/utilities-terminal.png b/ui/common/artwork/oxygen/utilities-terminal.png
new file mode 100644 (file)
index 0000000..8e2f3c1
Binary files /dev/null and b/ui/common/artwork/oxygen/utilities-terminal.png differ
diff --git a/ui/common/artwork/system.png b/ui/common/artwork/system.png
deleted file mode 100644 (file)
index 221b8fc..0000000
Binary files a/ui/common/artwork/system.png and /dev/null differ
diff --git a/ui/common/artwork/usbpen.png b/ui/common/artwork/usbpen.png
deleted file mode 100644 (file)
index 53a365e..0000000
Binary files a/ui/common/artwork/usbpen.png and /dev/null differ
index 53c32dda750b81a005f20621c7b87ec81de0f81f..ce6a5739e6f58351c5b47d10568cc56241537872 100644 (file)
@@ -71,7 +71,7 @@ static struct pbt_item *setup_system_item(struct pbt_menu *menu,
        struct pbt_quad q;
 
        top_item = pbt_item_create_reduced(menu, "system", 0,
-               PB_ARTWORK_PATH "/system.png");
+               PB_ARTWORK_PATH "/applications-system.png");
 
        if (!top_item)
                goto fail_top_item_create;
@@ -90,7 +90,7 @@ static struct pbt_item *setup_system_item(struct pbt_menu *menu,
                goto fail_sub_menu_create;
 
        sub_item = pbt_item_create(top_item->sub_menu, "Preferences", 0,
-               PB_ARTWORK_PATH "/system.png", "Preferences",
+               PB_ARTWORK_PATH "/configure.png", "Preferences",
                "Edit petitboot preferences");
 
        if (!sub_item)
@@ -101,7 +101,7 @@ static struct pbt_item *setup_system_item(struct pbt_menu *menu,
        pbt_menu_set_selected(top_item->sub_menu, sub_item);
 
        sub_item = pbt_item_create(top_item->sub_menu, "Exit to Shell", 1,
-               PB_ARTWORK_PATH "/system.png", "Exit to Shell",
+               PB_ARTWORK_PATH "/utilities-terminal.png", "Exit to Shell",
                "Exit to a system shell prompt");
 
        if (!sub_item)
index db0539a5076101d337f379b5c91bdd3c93434509..66ba5613c05d46c0ba68784903c0205b24bdb186 100644 (file)
@@ -148,7 +148,7 @@ static int ps3_setup_test_item(struct pbt_menu *menu,
        struct pbt_item *sub_item;
        twin_pixmap_t *icon;
 
-       icon = pbt_icon_load(PB_ARTWORK_PATH "/hdd.png");
+       icon = pbt_icon_load(PB_ARTWORK_PATH "/drive-harddisk.png");
 
        /* Main item */
 
index 8d6c498ec710cf1a38a0f7552d81930b8d8beef0..3d10b9590a8c6e783fb603722f53d2781c39d864 100644 (file)
@@ -180,7 +180,7 @@ twin_pixmap_t *pbt_background_load(twin_screen_t *tscreen,
 const char *pbt_icon_chooser(const char *hint)
 {
        if (strstr(hint, "net"))
-               return PB_ARTWORK_PATH "/network.png";
+               return PB_ARTWORK_PATH "/network-wired.png";
 
        return NULL;
 }