diff --git a/deluge/ui/webui/scripts/copy_icons.py b/deluge/ui/webui/scripts/copy_icons.py index 3d1163e4f..b88d58dd2 100644 --- a/deluge/ui/webui/scripts/copy_icons.py +++ b/deluge/ui/webui/scripts/copy_icons.py @@ -19,15 +19,6 @@ # 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. @@ -38,8 +29,8 @@ 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" +ICON_SET = "/home/martijn/prj/oxygen/oxygen/16x16" +TARGET_DIR = "/home/martijn/src/deluge-stable/deluge/ui/webui/static/images/16" mapping = { @@ -53,11 +44,11 @@ mapping = { "go-top":"actions/2uparrow", "label":"actions/rss_tag", "list-add":"actions/add", - "list-remove":"actions/editdelete", + "list-remove":"actions/fileclose", "move":"actions/filesaveas", "pause":"actions/media_playback_pause", "preferences-system":"apps/preferences_system", - "proess-stop":"actions/process_stop", + "process-stop":"actions/process_stop", "queue-down":"actions/1downarrow", "queue-up":"actions/1uparrow", "start":"actions/media_playback_start", @@ -65,6 +56,9 @@ mapping = { "system-log-out":"actions/system_log_out", "user-trash":"actions/edittrash", "view-refresh":"actions/view_refresh", + "gtk-yes":"actions/flag_green", + "drive-harddisk":"devices/drive_harddisk", + "select-all":"actions/edit_select_all" } for target, source in mapping.iteritems(): diff --git a/deluge/ui/webui/static/images/16/LICENCE b/deluge/ui/webui/static/images/16/LICENSE similarity index 96% rename from deluge/ui/webui/static/images/16/LICENCE rename to deluge/ui/webui/static/images/16/LICENSE index 0ff982655..c6cd56804 100644 --- a/deluge/ui/webui/static/images/16/LICENCE +++ b/deluge/ui/webui/static/images/16/LICENSE @@ -8,7 +8,7 @@ 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 +*none yet *add them here if needed. diff --git a/deluge/ui/webui/static/images/16/drive-harddisk.png b/deluge/ui/webui/static/images/16/drive-harddisk.png new file mode 100644 index 000000000..bae21a835 Binary files /dev/null and b/deluge/ui/webui/static/images/16/drive-harddisk.png differ diff --git a/deluge/ui/webui/static/images/16/gtk-yes.png b/deluge/ui/webui/static/images/16/gtk-yes.png new file mode 100644 index 000000000..addab095f Binary files /dev/null and b/deluge/ui/webui/static/images/16/gtk-yes.png differ diff --git a/deluge/ui/webui/static/images/16/list-remove.png b/deluge/ui/webui/static/images/16/list-remove.png index ef8e685e2..06c1cf41f 100644 Binary files a/deluge/ui/webui/static/images/16/list-remove.png and b/deluge/ui/webui/static/images/16/list-remove.png differ diff --git a/deluge/ui/webui/static/images/16/proess-stop.png b/deluge/ui/webui/static/images/16/process-stop.png similarity index 100% rename from deluge/ui/webui/static/images/16/proess-stop.png rename to deluge/ui/webui/static/images/16/process-stop.png diff --git a/deluge/ui/webui/static/images/16/readme.txt b/deluge/ui/webui/static/images/16/readme.txt index f89f74105..0de2e9005 100644 --- a/deluge/ui/webui/static/images/16/readme.txt +++ b/deluge/ui/webui/static/images/16/readme.txt @@ -1,6 +1,5 @@ -All images from the kde-oxygen set. +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. +See LICENSE for a list of icons not taken from oxygen. diff --git a/deluge/ui/webui/static/images/16/select-all.png b/deluge/ui/webui/static/images/16/select-all.png new file mode 100644 index 000000000..24ce63b0e Binary files /dev/null and b/deluge/ui/webui/static/images/16/select-all.png differ