diff --git a/AUTHORS b/AUTHORS index c41a53554..42d24764a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -39,14 +39,9 @@ Images Authors: * files: deluge/ui/data/pixmaps/*.svg, *.png deluge/ui/web/icons/active.png, alert.png, all.png, checking.png, dht.png, downloading.png, inactive.png, queued.png, seeding.png, traffic.png - exceptions: deluge/ui/data/pixmaps/deluge.svg and derivatives - copyright: Andrew Resch - license: GPLv3 - - * files: deluge/ui/data/pixmaps/deluge.svg and derivatives - deluge/ui/web/icons/apple-pre-*.png, deluge*.png deluge/ui/web/images/deluge*.png - copyright: Andrew Wedderburn + deluge/ui/web/icons/apple-pre-*.png, deluge*.png + copyright: Calum Lind license: GPLv3 * files: deluge/plugins/blocklist/blocklist/data/*.png @@ -55,11 +50,9 @@ Images Authors: license: GPLv2 url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme - * files: deluge/ui/data/pixmaps/magnet.png - copyright: Woothemes - license: Freeware - icon pack: WP Woothemes Ultimate - url: http://www.woothemes.com/ + * files: deluge/ui/data/pixmaps/magnet*.svg, *.png + copyright: Matias Wilkman + license: * files: deluge/ui/data/pixmaps/flags/*.png copyright: Mark James diff --git a/deluge/ui/data/pixmaps/checking16.png b/deluge/ui/data/pixmaps/checking16.png index 0ac2c657f..6758e36e8 100644 Binary files a/deluge/ui/data/pixmaps/checking16.png and b/deluge/ui/data/pixmaps/checking16.png differ diff --git a/deluge/ui/data/pixmaps/inactive16.png b/deluge/ui/data/pixmaps/inactive16.png index 9f38e77ef..cae8b2c0a 100644 Binary files a/deluge/ui/data/pixmaps/inactive16.png and b/deluge/ui/data/pixmaps/inactive16.png differ diff --git a/deluge/ui/data/pixmaps/magnet.png b/deluge/ui/data/pixmaps/magnet.png deleted file mode 100644 index a192cd8ad..000000000 Binary files a/deluge/ui/data/pixmaps/magnet.png and /dev/null differ diff --git a/deluge/ui/data/pixmaps/magnet.svg b/deluge/ui/data/pixmaps/magnet.svg new file mode 100644 index 000000000..f470b33c9 --- /dev/null +++ b/deluge/ui/data/pixmaps/magnet.svg @@ -0,0 +1,166 @@ + + + + + + + + image/svg+xml + + + November 2007 + + + Luca Ferretti + + + http://www.gnome.org + + + edit + copy + copy to clipboard + + + + + + + + + + + + + + + + + + + + + diff --git a/deluge/ui/data/pixmaps/magnet16.png b/deluge/ui/data/pixmaps/magnet16.png new file mode 100644 index 000000000..61d6dabb7 Binary files /dev/null and b/deluge/ui/data/pixmaps/magnet16.png differ diff --git a/deluge/ui/data/pixmaps/magnet_add.svg b/deluge/ui/data/pixmaps/magnet_add.svg new file mode 100644 index 000000000..d9ba67a5e --- /dev/null +++ b/deluge/ui/data/pixmaps/magnet_add.svg @@ -0,0 +1,175 @@ + + + + + + + + image/svg+xml + + + November 2007 + + + Luca Ferretti + + + http://www.gnome.org + + + edit + copy + copy to clipboard + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deluge/ui/data/pixmaps/magnet_add16.png b/deluge/ui/data/pixmaps/magnet_add16.png new file mode 100644 index 000000000..37c1c36b0 Binary files /dev/null and b/deluge/ui/data/pixmaps/magnet_add16.png differ diff --git a/deluge/ui/data/pixmaps/magnet_copy.svg b/deluge/ui/data/pixmaps/magnet_copy.svg new file mode 100644 index 000000000..dd4ba42c3 --- /dev/null +++ b/deluge/ui/data/pixmaps/magnet_copy.svg @@ -0,0 +1,163 @@ + + + + + + + + image/svg+xml + + + November 2007 + + + Luca Ferretti + + + http://www.gnome.org + + + edit + copy + copy to clipboard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deluge/ui/data/pixmaps/magnet_copy16.png b/deluge/ui/data/pixmaps/magnet_copy16.png new file mode 100644 index 000000000..a4be9d218 Binary files /dev/null and b/deluge/ui/data/pixmaps/magnet_copy16.png differ diff --git a/deluge/ui/gtk3/preferences.py b/deluge/ui/gtk3/preferences.py index daa046a15..5650ad8df 100644 --- a/deluge/ui/gtk3/preferences.py +++ b/deluge/ui/gtk3/preferences.py @@ -77,7 +77,7 @@ class Preferences(component.Component): self.load_pref_dialog_state() self.builder.get_object('image_magnet').set_from_file( - deluge.common.get_pixmap('magnet.png') + deluge.common.get_pixmap('magnet16.png') ) # Hide the unused associate magnet button on OSX see: #2420 diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css index b9fa03e98..c026b6d8e 100644 --- a/deluge/ui/web/css/deluge.css +++ b/deluge/ui/web/css/deluge.css @@ -458,8 +458,16 @@ dl.singleline dd { background-image: url('../icons/add_url.png') !important; } -.icon-add-magnet { - background-image: url('../icons/add_magnet.png') !important; +.icon-magnet-add { + background-image: url('../icons/magnet_add.png') !important; +} + +.icon-magnet-copy { + background-image: url('../icons/magnet_copy.png') !important; +} + +.icon-magnet { + background-image: url('../icons/magnet.png') !important; } .icon-pause { diff --git a/deluge/ui/web/icons/active.png b/deluge/ui/web/icons/active.png index daa4f64e3..c9af82a5f 100644 Binary files a/deluge/ui/web/icons/active.png and b/deluge/ui/web/icons/active.png differ diff --git a/deluge/ui/web/icons/add_magnet.png b/deluge/ui/web/icons/add_magnet.png deleted file mode 100644 index c015b18c0..000000000 Binary files a/deluge/ui/web/icons/add_magnet.png and /dev/null differ diff --git a/deluge/ui/web/icons/checking.png b/deluge/ui/web/icons/checking.png index 748735280..6758e36e8 100644 Binary files a/deluge/ui/web/icons/checking.png and b/deluge/ui/web/icons/checking.png differ diff --git a/deluge/ui/web/icons/deluge.png b/deluge/ui/web/icons/deluge.png index 2f4ae4c70..5afdbe4c6 100644 Binary files a/deluge/ui/web/icons/deluge.png and b/deluge/ui/web/icons/deluge.png differ diff --git a/deluge/ui/web/icons/downloading.png b/deluge/ui/web/icons/downloading.png index ec58cb54e..24d6ffa38 100644 Binary files a/deluge/ui/web/icons/downloading.png and b/deluge/ui/web/icons/downloading.png differ diff --git a/deluge/ui/web/icons/inactive.png b/deluge/ui/web/icons/inactive.png index b56213e3b..cae8b2c0a 100644 Binary files a/deluge/ui/web/icons/inactive.png and b/deluge/ui/web/icons/inactive.png differ diff --git a/deluge/ui/web/icons/magnet.png b/deluge/ui/web/icons/magnet.png new file mode 100644 index 000000000..61d6dabb7 Binary files /dev/null and b/deluge/ui/web/icons/magnet.png differ diff --git a/deluge/ui/web/icons/magnet_add.png b/deluge/ui/web/icons/magnet_add.png new file mode 100644 index 000000000..37c1c36b0 Binary files /dev/null and b/deluge/ui/web/icons/magnet_add.png differ diff --git a/deluge/ui/web/icons/magnet_copy.png b/deluge/ui/web/icons/magnet_copy.png new file mode 100644 index 000000000..a4be9d218 Binary files /dev/null and b/deluge/ui/web/icons/magnet_copy.png differ diff --git a/deluge/ui/web/js/deluge-all/add/AddWindow.js b/deluge/ui/web/js/deluge-all/add/AddWindow.js index fb89e479a..a4aff067b 100644 --- a/deluge/ui/web/js/deluge-all/add/AddWindow.js +++ b/deluge/ui/web/js/deluge-all/add/AddWindow.js @@ -147,7 +147,7 @@ Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, { }, { text: _('Infohash'), - iconCls: 'icon-add-magnet', + iconCls: 'icon-magnet-add', hidden: true, disabled: true, },