summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Voncken <mvoncken@gmail.com>2008-12-06 20:03:12 +0000
committerMartijn Voncken <mvoncken@gmail.com>2008-12-06 20:03:12 +0000
commit107c2aca80c3852189abd25986b1470f57bf0aa1 (patch)
tree9c06d6d56f130a09ce84629f5e743fbafd8864d0
parent9117823cbd488e1972b3ad4b01c0846dda638c79 (diff)
downloaddeluge-107c2aca80c3852189abd25986b1470f57bf0aa1.tar.gz
deluge-107c2aca80c3852189abd25986b1470f57bf0aa1.tar.bz2
deluge-107c2aca80c3852189abd25986b1470f57bf0aa1.zip
switch to oxygen icon set
-rw-r--r--deluge/ui/webui/scripts/copy_icons.py75
-rw-r--r--deluge/ui/webui/static/images/16/LICENCE14
-rw-r--r--deluge/ui/webui/static/images/16/connections.pngbin0 -> 868 bytes
-rw-r--r--deluge/ui/webui/static/images/16/details.pngbin0 -> 692 bytes
-rw-r--r--deluge/ui/webui/static/images/16/down.pngbin0 -> 525 bytes
-rw-r--r--deluge/ui/webui/static/images/16/edit-clear.pngbin0 -> 625 bytes
-rw-r--r--deluge/ui/webui/static/images/16/edit-redo.pngbin0 -> 813 bytes
-rw-r--r--deluge/ui/webui/static/images/16/go-bottom.pngbin0 -> 788 bytes
-rw-r--r--deluge/ui/webui/static/images/16/go-top.pngbin0 -> 792 bytes
-rw-r--r--deluge/ui/webui/static/images/16/label.pngbin0 -> 746 bytes
-rw-r--r--deluge/ui/webui/static/images/16/list-add.pngbin0 -> 761 bytes
-rw-r--r--deluge/ui/webui/static/images/16/list-remove.pngbin0 -> 666 bytes
-rw-r--r--deluge/ui/webui/static/images/16/move.pngbin0 -> 860 bytes
-rw-r--r--deluge/ui/webui/static/images/16/pause.pngbin0 -> 484 bytes
-rw-r--r--deluge/ui/webui/static/images/16/preferences-system.pngbin0 -> 874 bytes
-rw-r--r--deluge/ui/webui/static/images/16/proess-stop.pngbin0 -> 722 bytes
-rw-r--r--deluge/ui/webui/static/images/16/queue-down.pngbin0 -> 525 bytes
-rw-r--r--deluge/ui/webui/static/images/16/queue-up.pngbin0 -> 539 bytes
-rw-r--r--deluge/ui/webui/static/images/16/readme.txt6
-rw-r--r--deluge/ui/webui/static/images/16/start.pngbin0 -> 501 bytes
-rw-r--r--deluge/ui/webui/static/images/16/stop.pngbin0 -> 499 bytes
-rw-r--r--deluge/ui/webui/static/images/16/system-log-out.pngbin0 -> 775 bytes
-rw-r--r--deluge/ui/webui/static/images/16/up.pngbin0 -> 525 bytes
-rw-r--r--deluge/ui/webui/static/images/16/user-trash.pngbin0 -> 844 bytes
-rw-r--r--deluge/ui/webui/static/images/16/view-refresh.pngbin0 -> 931 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/LICENSE73
-rw-r--r--deluge/ui/webui/static/images/tango/connections.pngbin456 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/details.pngbin498 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/down.pngbin627 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/edit-clear.pngbin773 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/edit-redo.pngbin591 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/go-bottom.pngbin663 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/go-top.pngbin636 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/label.pngbin682 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/list-add.pngbin323 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/list-remove.pngbin247 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/move.pngbin866 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/pause.pngbin464 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/preferences-system.pngbin611 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/process-stop.pngbin820 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/queue-down.pngbin683 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/queue-up.pngbin652 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/start.pngbin660 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/stop.pngbin429 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/system-log-out.pngbin799 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/up.pngbin592 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/user-trash.pngbin655 -> 0 bytes
-rw-r--r--deluge/ui/webui/static/images/tango/view-refresh.pngbin912 -> 0 bytes
-rw-r--r--deluge/ui/webui/templates/classic/index.html8
-rw-r--r--deluge/ui/webui/templates/classic/part_auto_refresh.html4
-rw-r--r--deluge/ui/webui/templates/classic/part_stats.html4
-rw-r--r--deluge/ui/webui/templates/classic/sort_column_head.html4
-rw-r--r--deluge/ui/webui/templates/classic/torrent_info.html2
-rw-r--r--deluge/ui/webui/templates/white/part_label_filters.html2
-rw-r--r--deluge/ui/webui/templates/white/part_stats.html2
-rw-r--r--deluge/ui/webui/templates/white/part_toolbar.html2
-rw-r--r--deluge/ui/webui/templates/white/torrent_info.html2
-rw-r--r--setup.py2
58 files changed, 111 insertions, 89 deletions
diff --git a/deluge/ui/webui/scripts/copy_icons.py b/deluge/ui/webui/scripts/copy_icons.py
new file mode 100644
index 000000000..3d1163e4f
--- /dev/null
+++ b/deluge/ui/webui/scripts/copy_icons.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) Martijn Voncken 2008 <mvoncken@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, write to:
+# The Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor
+# Boston, MA 02110-1301, USA.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the OpenSSL
+# library.
+# You must obey the GNU General Public License in all respects for all of
+# the code used other than OpenSSL. If you modify file(s) with this
+# exception, you may extend this exception to your version of the file(s),
+# but you are not obligated to do so. If you do not wish to do so, delete
+# this exception statement from your version. If you delete this exception
+# statement from all source files in the program, then also delete it here.
+
+"""
+copy icons from kde icon set.
+Edit ICON_SET and TARGET before running this file.
+#perl -pi -w -e 's/tango/16/g;' *.html
+"""
+import os
+from os import path
+from shutil import copyfile
+
+ICON_SET = "/home/martijn/prj/oxygen/oxygen/16"
+TARGET_DIR = "/home/martijn/src/deluge-stable/deluge/ui/webui/static/images/16x16"
+
+
+mapping = {
+ "down":"actions/1downarrow",
+ "up":"actions/1downarrow",
+ "connections":"apps/preferences_system_network_sharing",
+ "details":"actions/object_edit",
+ "edit-clear":"actions/clear_left",
+ "edit-redo":"actions/edit_redo",
+ "go-bottom":"actions/2downarrow",
+ "go-top":"actions/2uparrow",
+ "label":"actions/rss_tag",
+ "list-add":"actions/add",
+ "list-remove":"actions/editdelete",
+ "move":"actions/filesaveas",
+ "pause":"actions/media_playback_pause",
+ "preferences-system":"apps/preferences_system",
+ "proess-stop":"actions/process_stop",
+ "queue-down":"actions/1downarrow",
+ "queue-up":"actions/1uparrow",
+ "start":"actions/media_playback_start",
+ "stop":"actions/media_playback_stop",
+ "system-log-out":"actions/system_log_out",
+ "user-trash":"actions/edittrash",
+ "view-refresh":"actions/view_refresh",
+}
+
+for target, source in mapping.iteritems():
+ source = path.join(ICON_SET, source) + ".png"
+ target = path.join(TARGET_DIR, target) + ".png"
+ print "%s->%s" % (source, target)
+ copyfile(source, target)
+
diff --git a/deluge/ui/webui/static/images/16/LICENCE b/deluge/ui/webui/static/images/16/LICENCE
new file mode 100644
index 000000000..0ff982655
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/LICENCE
@@ -0,0 +1,14 @@
+icons in this folder are copied from the kde oxygen set
+
+http://www.oxygen-icons.org/?page_id=4
+
+LICENCE:
+Oxygen icon theme is dual licensed.
+You may copy it under the Creative Common Attribution-ShareAlike 3.0 License
+or the GNU Library General Public License.
+
+ICONS NOT UNDER THIS LICENCE:
+*non yet
+*add them here if needed.
+
+
diff --git a/deluge/ui/webui/static/images/16/connections.png b/deluge/ui/webui/static/images/16/connections.png
new file mode 100644
index 000000000..2911e0cdc
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/connections.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/details.png b/deluge/ui/webui/static/images/16/details.png
new file mode 100644
index 000000000..0947dbfb4
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/details.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/down.png b/deluge/ui/webui/static/images/16/down.png
new file mode 100644
index 000000000..03f201428
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/down.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/edit-clear.png b/deluge/ui/webui/static/images/16/edit-clear.png
new file mode 100644
index 000000000..547dd41d3
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/edit-clear.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/edit-redo.png b/deluge/ui/webui/static/images/16/edit-redo.png
new file mode 100644
index 000000000..9bfee2d1f
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/edit-redo.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/go-bottom.png b/deluge/ui/webui/static/images/16/go-bottom.png
new file mode 100644
index 000000000..099cb3927
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/go-bottom.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/go-top.png b/deluge/ui/webui/static/images/16/go-top.png
new file mode 100644
index 000000000..b277d07c4
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/go-top.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/label.png b/deluge/ui/webui/static/images/16/label.png
new file mode 100644
index 000000000..0768148f1
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/label.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/list-add.png b/deluge/ui/webui/static/images/16/list-add.png
new file mode 100644
index 000000000..7bb9b1be8
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/list-add.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/list-remove.png b/deluge/ui/webui/static/images/16/list-remove.png
new file mode 100644
index 000000000..ef8e685e2
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/list-remove.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/move.png b/deluge/ui/webui/static/images/16/move.png
new file mode 100644
index 000000000..cac82e0fe
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/move.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/pause.png b/deluge/ui/webui/static/images/16/pause.png
new file mode 100644
index 000000000..a9b3113fb
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/pause.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/preferences-system.png b/deluge/ui/webui/static/images/16/preferences-system.png
new file mode 100644
index 000000000..f2c7c0867
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/preferences-system.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/proess-stop.png b/deluge/ui/webui/static/images/16/proess-stop.png
new file mode 100644
index 000000000..5b4c488bd
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/proess-stop.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/queue-down.png b/deluge/ui/webui/static/images/16/queue-down.png
new file mode 100644
index 000000000..03f201428
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/queue-down.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/queue-up.png b/deluge/ui/webui/static/images/16/queue-up.png
new file mode 100644
index 000000000..cd7263359
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/queue-up.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/readme.txt b/deluge/ui/webui/static/images/16/readme.txt
new file mode 100644
index 000000000..f89f74105
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/readme.txt
@@ -0,0 +1,6 @@
+All images from the kde-oxygen set.
+See webui/scripts/copy_icons.py for mapping.
+
+See LICENCE for a list of icons not taken from oxygen.
+
+
diff --git a/deluge/ui/webui/static/images/16/start.png b/deluge/ui/webui/static/images/16/start.png
new file mode 100644
index 000000000..80ff3a1d5
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/start.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/stop.png b/deluge/ui/webui/static/images/16/stop.png
new file mode 100644
index 000000000..180280e8b
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/stop.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/system-log-out.png b/deluge/ui/webui/static/images/16/system-log-out.png
new file mode 100644
index 000000000..201353e70
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/system-log-out.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/up.png b/deluge/ui/webui/static/images/16/up.png
new file mode 100644
index 000000000..03f201428
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/up.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/user-trash.png b/deluge/ui/webui/static/images/16/user-trash.png
new file mode 100644
index 000000000..5cd5e421f
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/user-trash.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/16/view-refresh.png b/deluge/ui/webui/static/images/16/view-refresh.png
new file mode 100644
index 000000000..86b6f82c1
--- /dev/null
+++ b/deluge/ui/webui/static/images/16/view-refresh.png
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/LICENSE b/deluge/ui/webui/static/images/tango/LICENSE
deleted file mode 100644
index 487b9e929..000000000
--- a/deluge/ui/webui/static/images/tango/LICENSE
+++ /dev/null
@@ -1,73 +0,0 @@
-Images in deluge/static/images/tango:
-
-http://creativecommons.org/licenses/by-sa/2.5/ :
-
-Creative Commons Attribution-ShareAlike 2.5 License Agreement
-
-
-CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
- 1. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
- 2. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
- 3. "Licensor" means the individual or entity that offers the Work under the terms of this License.
- 4. "Original Author" means the individual or entity who created the Work.
- 5. "Work" means the copyrightable work of authorship offered under the terms of this License.
- 6. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
- 7. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-
-2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
- 1. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
- 2. to create and reproduce Derivative Works;
- 3. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
- 4. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
- 5.
-
- For the avoidance of doubt, where the work is a musical composition:
- 1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
- 2. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
- 6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
- 1. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(c), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(c), as requested.
- 2. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License.
- 3. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
- 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
- 1. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
- 2. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
- 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
- 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
- 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-
-Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
-
-Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time.
-
-Creative Commons may be contacted at http://creativecommons.org/.
-
diff --git a/deluge/ui/webui/static/images/tango/connections.png b/deluge/ui/webui/static/images/tango/connections.png
deleted file mode 100644
index b57c65c86..000000000
--- a/deluge/ui/webui/static/images/tango/connections.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/details.png b/deluge/ui/webui/static/images/tango/details.png
deleted file mode 100644
index 8dd48c494..000000000
--- a/deluge/ui/webui/static/images/tango/details.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/down.png b/deluge/ui/webui/static/images/tango/down.png
deleted file mode 100644
index 732d46f37..000000000
--- a/deluge/ui/webui/static/images/tango/down.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/edit-clear.png b/deluge/ui/webui/static/images/tango/edit-clear.png
deleted file mode 100644
index e6c8e8b9f..000000000
--- a/deluge/ui/webui/static/images/tango/edit-clear.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/edit-redo.png b/deluge/ui/webui/static/images/tango/edit-redo.png
deleted file mode 100644
index c3b0df039..000000000
--- a/deluge/ui/webui/static/images/tango/edit-redo.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/go-bottom.png b/deluge/ui/webui/static/images/tango/go-bottom.png
deleted file mode 100644
index 2c5a80385..000000000
--- a/deluge/ui/webui/static/images/tango/go-bottom.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/go-top.png b/deluge/ui/webui/static/images/tango/go-top.png
deleted file mode 100644
index 70f2c996c..000000000
--- a/deluge/ui/webui/static/images/tango/go-top.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/label.png b/deluge/ui/webui/static/images/tango/label.png
deleted file mode 100644
index 7dc15ea96..000000000
--- a/deluge/ui/webui/static/images/tango/label.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/list-add.png b/deluge/ui/webui/static/images/tango/list-add.png
deleted file mode 100644
index 1aa7f095c..000000000
--- a/deluge/ui/webui/static/images/tango/list-add.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/list-remove.png b/deluge/ui/webui/static/images/tango/list-remove.png
deleted file mode 100644
index 00b654e8c..000000000
--- a/deluge/ui/webui/static/images/tango/list-remove.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/move.png b/deluge/ui/webui/static/images/tango/move.png
deleted file mode 100644
index 9bed1436e..000000000
--- a/deluge/ui/webui/static/images/tango/move.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/pause.png b/deluge/ui/webui/static/images/tango/pause.png
deleted file mode 100644
index c8b4fe225..000000000
--- a/deluge/ui/webui/static/images/tango/pause.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/preferences-system.png b/deluge/ui/webui/static/images/tango/preferences-system.png
deleted file mode 100644
index 9460dfc74..000000000
--- a/deluge/ui/webui/static/images/tango/preferences-system.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/process-stop.png b/deluge/ui/webui/static/images/tango/process-stop.png
deleted file mode 100644
index ab6808fba..000000000
--- a/deluge/ui/webui/static/images/tango/process-stop.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/queue-down.png b/deluge/ui/webui/static/images/tango/queue-down.png
deleted file mode 100644
index 3dd7fccdf..000000000
--- a/deluge/ui/webui/static/images/tango/queue-down.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/queue-up.png b/deluge/ui/webui/static/images/tango/queue-up.png
deleted file mode 100644
index fa9a7d71b..000000000
--- a/deluge/ui/webui/static/images/tango/queue-up.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/start.png b/deluge/ui/webui/static/images/tango/start.png
deleted file mode 100644
index a7de0feb0..000000000
--- a/deluge/ui/webui/static/images/tango/start.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/stop.png b/deluge/ui/webui/static/images/tango/stop.png
deleted file mode 100644
index ede2815e5..000000000
--- a/deluge/ui/webui/static/images/tango/stop.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/system-log-out.png b/deluge/ui/webui/static/images/tango/system-log-out.png
deleted file mode 100644
index 0010931e2..000000000
--- a/deluge/ui/webui/static/images/tango/system-log-out.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/up.png b/deluge/ui/webui/static/images/tango/up.png
deleted file mode 100644
index c4fae73de..000000000
--- a/deluge/ui/webui/static/images/tango/up.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/user-trash.png b/deluge/ui/webui/static/images/tango/user-trash.png
deleted file mode 100644
index 0e0953c73..000000000
--- a/deluge/ui/webui/static/images/tango/user-trash.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/static/images/tango/view-refresh.png b/deluge/ui/webui/static/images/tango/view-refresh.png
deleted file mode 100644
index 3fd71d6e5..000000000
--- a/deluge/ui/webui/static/images/tango/view-refresh.png
+++ /dev/null
Binary files differ
diff --git a/deluge/ui/webui/templates/classic/index.html b/deluge/ui/webui/templates/classic/index.html
index 237ca0ec9..9cf5dc01f 100644
--- a/deluge/ui/webui/templates/classic/index.html
+++ b/deluge/ui/webui/templates/classic/index.html
@@ -54,10 +54,10 @@ $for torrent in torrent_list:
<div class="panel">
<table><tr><td>
-$:render.part_button('GET', '/torrent/add', _('Add torrent'), 'tango/list-add.png')
-$:render.part_button('POST', '/pause_all', _('Pause all'), 'tango/pause.png')
-$:render.part_button('POST', '/resume_all', _('Resume all'), 'tango/start.png')
-<!--$:render.part_button('POST', '/logout', _('Logout'), 'tango/system-log-out.png')-->
+$:render.part_button('GET', '/torrent/add', _('Add torrent'), '16/list-add.png')
+$:render.part_button('POST', '/pause_all', _('Pause all'), '16/pause.png')
+$:render.part_button('POST', '/resume_all', _('Resume all'), '16/start.png')
+<!--$:render.part_button('POST', '/logout', _('Logout'), '16/system-log-out.png')-->
</td>
<td>
$if is_auto_refreshed:
diff --git a/deluge/ui/webui/templates/classic/part_auto_refresh.html b/deluge/ui/webui/templates/classic/part_auto_refresh.html
index 60a20be86..9aff0b69b 100644
--- a/deluge/ui/webui/templates/classic/part_auto_refresh.html
+++ b/deluge/ui/webui/templates/classic/part_auto_refresh.html
@@ -7,8 +7,8 @@
>
<div id="timer_bar" class="progress_bar" style="width:0%" style="text-align:left">
- <img src="$base/static/images/tango/pause.png" id="timer_pause" >
- <img src="$base/static/images/tango/view-refresh.png" id="timer_start" style="display:none">
+ <img src="$base/static/images/16/pause.png" id="timer_pause" >
+ <img src="$base/static/images/16/view-refresh.png" id="timer_start" style="display:none">
&nbsp;
</div>
</div>
diff --git a/deluge/ui/webui/templates/classic/part_stats.html b/deluge/ui/webui/templates/classic/part_stats.html
index 167aa07a8..5cd92b829 100644
--- a/deluge/ui/webui/templates/classic/part_stats.html
+++ b/deluge/ui/webui/templates/classic/part_stats.html
@@ -9,9 +9,9 @@ $def with (stats)
$_('Up Speed') : $stats.upload_rate ($stats.max_upload)
- $:render.part_button('GET', '/config/', _('Settings'), 'tango/preferences-system.png')
+ $:render.part_button('GET', '/config/', _('Settings'), '16/preferences-system.png')
- $:render.part_button('POST', '/logout', _('Logout'), 'tango/system-log-out.png')
+ $:render.part_button('POST', '/logout', _('Logout'), '16/system-log-out.png')
</div>
diff --git a/deluge/ui/webui/templates/classic/sort_column_head.html b/deluge/ui/webui/templates/classic/sort_column_head.html
index e12b447ad..861cf9184 100644
--- a/deluge/ui/webui/templates/classic/sort_column_head.html
+++ b/deluge/ui/webui/templates/classic/sort_column_head.html
@@ -3,9 +3,9 @@ $def with (column_id, column_name, order, active_up, active_down)
<a href="$base/index?sort=$column_id&order=$order&filter_cat=$get('filter_cat')&filter_value=$get('filter_value')"">
$column_name\
$if active_up:
- <img src="$base/static/images/tango/up.png" />
+ <img src="$base/static/images/16/up.png" />
$if active_down:
- <img src="$base/static/images/tango/down.png" />
+ <img src="$base/static/images/16/down.png" />
</a>
</th>
diff --git a/deluge/ui/webui/templates/classic/torrent_info.html b/deluge/ui/webui/templates/classic/torrent_info.html
index 505a7b3bd..16795af19 100644
--- a/deluge/ui/webui/templates/classic/torrent_info.html
+++ b/deluge/ui/webui/templates/classic/torrent_info.html
@@ -5,7 +5,7 @@ $:(render.header(_(torrent.state) + '/' + torrent.name))
<div class="button_bar">
$for id, title, image, flag, method, url, important in toolbar_items:
$if (flag > 0) and (id != 'details'):
- $:render.part_button(method, (url + str(torrent.id)), title, 'tango/' + image)
+ $:render.part_button(method, (url + str(torrent.id)), title, '16/' + image)
</div>
<div style="width:120px;height:20px;overflow:hidden;align:left;text-align:left;padding-left:20px;">
$:render.part_auto_refresh()
diff --git a/deluge/ui/webui/templates/white/part_label_filters.html b/deluge/ui/webui/templates/white/part_label_filters.html
index 0609c4b6a..e1c51a5dd 100644
--- a/deluge/ui/webui/templates/white/part_label_filters.html
+++ b/deluge/ui/webui/templates/white/part_label_filters.html
@@ -16,7 +16,7 @@ style="width:100px;padding:0px" title="$_('Filter on a keyword')"/>
$if get('filter_cat') == "keyword":
$if get('filter_value'):
- <img src="$base/static/images/tango/edit-clear.png" alt="$_('Clear')"
+ <img src="$base/static/images/16/edit-clear.png" alt="$_('Clear')"
onclick="el('keyword').value='';el('category_form').submit();"
>
</form>
diff --git a/deluge/ui/webui/templates/white/part_stats.html b/deluge/ui/webui/templates/white/part_stats.html
index e72779947..f63e7cda4 100644
--- a/deluge/ui/webui/templates/white/part_stats.html
+++ b/deluge/ui/webui/templates/white/part_stats.html
@@ -3,7 +3,7 @@ $def with (stats)
<div id='stats_panel'>
-<img src="$base/static/images/tango/connections.png" title="$_('Connections')">$stats.num_connections ($deluge_int(stats.max_num_connections))
+<img src="$base/static/images/16/connections.png" title="$_('Connections')">$stats.num_connections ($deluge_int(stats.max_num_connections))
<img src="$base/pixmaps/downloading16.png" title="$_('Down Speed')">$stats.download_rate ($deluge_int(stats.max_download))
diff --git a/deluge/ui/webui/templates/white/part_toolbar.html b/deluge/ui/webui/templates/white/part_toolbar.html
index 2c8ff9cb2..fc738c820 100644
--- a/deluge/ui/webui/templates/white/part_toolbar.html
+++ b/deluge/ui/webui/templates/white/part_toolbar.html
@@ -3,4 +3,4 @@ $for id, title, image, flag, method, url, important in toolbar_items:
<a class='toolbar_btn' href="#"
onclick='toolbar_$(method.lower()) ("$base$url",$flag)'
title='$title'><img class='toolbar_btn'
- src='$base/static/images/tango/$image'></a>
+ src='$base/static/images/16/$image'></a>
diff --git a/deluge/ui/webui/templates/white/torrent_info.html b/deluge/ui/webui/templates/white/torrent_info.html
index f996d2140..a6a0259cc 100644
--- a/deluge/ui/webui/templates/white/torrent_info.html
+++ b/deluge/ui/webui/templates/white/torrent_info.html
@@ -5,7 +5,7 @@ $:(render.header(_(torrent.state) + '/' + torrent.name))
<div class="button_bar">
$for id, title, image, flag, method, url, important in toolbar_items:
$if (flag > 0) and (id != 'details'):
- $:render.part_button(method, (url + str(torrent.id)), title, 'tango/' + image)
+ $:render.part_button(method, (url + str(torrent.id)), title, '16/' + image)
</div>
$for id, title, tab in detail_tabs:
<h3>$title</h3>
diff --git a/setup.py b/setup.py
index d6bd1ee43..b678c7b19 100644
--- a/setup.py
+++ b/setup.py
@@ -369,7 +369,7 @@ setup(
"ui/webui/static/images/*.png",
"ui/webui/static/images/*.jpg",
"ui/webui/static/images/*.gif",
- "ui/webui/static/images/tango/*.png",
+ "ui/webui/static/images/16/*",
"ui/webui/templates/deluge/*",
"ui/webui/templates/classic/*",
"ui/webui/templates/white/*"