diff --git a/ChangeLog b/ChangeLog index c5295e284..bb35543fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ page allowing the movecom/copytorrent/autoadd boxes to be enabled. * Fix enabling plugins. * Implement installing plugins. + * Update some icons ==== GtkUI ==== * Attempt to register as the default magnet uri handler in GNOME on startup diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css index 89b030a46..12ed866ef 100644 --- a/deluge/ui/web/css/deluge.css +++ b/deluge/ui/web/css/deluge.css @@ -41,10 +41,14 @@ input { .x-deluge-dht, .x-btn .x-deluge-dht { background-image: url('/icons/dht.png'); } .x-deluge-preferences, .x-btn .x-deluge-preferences { background-image: url('/icons/preferences.png') } .x-deluge-connections, .x-btn .x-deluge-connections { background-image: url('/icons/connections.png') } +.x-deluge-connection-manager, .x-btn .x-deluge-connection-manager { background-image: url('/icons/connection_manager.png') } .x-deluge-traffic, .x-btn .x-deluge-traffic { background-image: url('/icons/traffic.png') } .x-deluge-edit-trackers, .x-btn .x-deluge-edit-trackers {background-image: url('/icons/edit_trackers.png'); } .x-deluge-freespace, .x-btn .x-deluge-freespace {background-image: url('/icons/drive.png'); } +.x-deluge-install-plugin, .x-btn .x-deluge-install-plugin {background-image: url('/icons/install_plugin.png'); } +.x-deluge-find-more, .x-btn .x-deluge-find-more {background-image: url('/icons/find_more.png'); } + /* Torrent Details */ #torrentDetails dl, dl.singleline { diff --git a/deluge/ui/web/icons/connections.png b/deluge/ui/web/icons/connections.png index 8856340b9..b18a74d91 100644 Binary files a/deluge/ui/web/icons/connections.png and b/deluge/ui/web/icons/connections.png differ diff --git a/deluge/ui/web/icons/find_more.png b/deluge/ui/web/icons/find_more.png new file mode 100644 index 000000000..7a5ae62e3 Binary files /dev/null and b/deluge/ui/web/icons/find_more.png differ diff --git a/deluge/ui/web/icons/install_plugin.png b/deluge/ui/web/icons/install_plugin.png new file mode 100644 index 000000000..932d1deca Binary files /dev/null and b/deluge/ui/web/icons/install_plugin.png differ diff --git a/deluge/ui/web/js/Deluge.Preferences.Plugins.js b/deluge/ui/web/js/Deluge.Preferences.Plugins.js index 811d9773d..8485d9b6f 100644 --- a/deluge/ui/web/js/Deluge.Preferences.Plugins.js +++ b/deluge/ui/web/js/Deluge.Preferences.Plugins.js @@ -44,7 +44,7 @@ Ext.deluge.preferences.InstallPlugin = Ext.extend(Ext.Window, { closeAction: 'hide', - iconCls: 'x-deluge-add-file', + iconCls: 'x-deluge-install-plugin', layout: 'fit', @@ -61,7 +61,7 @@ Ext.deluge.preferences.InstallPlugin = Ext.extend(Ext.Window, { this.form = this.add({ xtype: 'form', baseCls: 'x-plain', - labelWidth: 55, + labelWidth: 70, autoHeight: true, fileUpload: true, items: [{ @@ -182,13 +182,14 @@ Ext.deluge.preferences.Plugins = Ext.extend(Ext.Panel, { bbar: new Ext.Toolbar({ items: [{ cls: 'x-btn-text-icon', - iconCls: 'x-deluge-add', + iconCls: 'x-deluge-install-plugin', text: _('Install'), handler: this.onInstallPlugin, scope: this }, '->', { cls: 'x-btn-text-icon', text: _('Find More'), + iconCls: 'x-deluge-find-more', handler: this.onFindMorePlugins, scope: this }] diff --git a/deluge/ui/web/js/Deluge.Toolbar.js b/deluge/ui/web/js/Deluge.Toolbar.js index dea3719b9..b69f64385 100644 --- a/deluge/ui/web/js/Deluge.Toolbar.js +++ b/deluge/ui/web/js/Deluge.Toolbar.js @@ -90,14 +90,14 @@ Copyright: id: 'preferences', cls: 'x-btn-text-icon', text: _('Preferences'), - icon: '/icons/preferences.png', + iconCls: 'x-deluge-preferences', handler: this.onPreferencesClick, scope: this },{ id: 'connectionman', cls: 'x-btn-text-icon', text: _('Connection Manager'), - iconCls: 'x-deluge-connections', + iconCls: 'x-deluge-connection-manager', handler: this.onConnectionManagerClick, scope: this },'->',{ @@ -200,4 +200,4 @@ Copyright: }); Deluge.Toolbar = new Ext.deluge.Toolbar(); -})(); \ No newline at end of file +})();