From ae5071d6cbad7611fbcb073a3f0ed079b591d0f0 Mon Sep 17 00:00:00 2001
From: Damien Churchill <damoxc@gmail.com>
Date: Tue, 9 Mar 2010 22:13:03 +0000
Subject: [PATCH] fix the button css adding !important to ensure that the
 background-image from them is used use iconCls for the toolbar rather than
 fixed paths

---
 deluge/ui/web/css/deluge.css                  | 42 ++++++++++++-------
 deluge/ui/web/js/deluge-all/Deluge.Toolbar.js | 28 ++++---------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css
index ca8abfc6a..05a7c0e5c 100644
--- a/deluge/ui/web/css/deluge.css
+++ b/deluge/ui/web/css/deluge.css
@@ -289,57 +289,69 @@ dl.singleline dd {
  */
 
 .icon-create {
-	background-image: url('../icons/create.png');
+	background-image: url('../icons/create.png') !important;
 }
 
 .icon-add {
-	background-image: url('../icons/add.png');
+	background-image: url('../icons/add.png') !important;
 }
 
 .icon-pause {
-	background-image: url('../icons/pause.png');
+	background-image: url('../icons/pause.png') !important;
 }
 
 .icon-resume {
-	background-image: url('../icons/start.png');
+	background-image: url('../icons/start.png') !important;
 }
 
 .icon-options {
-	background-image: url('../icons/preferences.png');
+	background-image: url('../icons/preferences.png') !important;
 }
 
 .icon-queue {
-	background-image: url('../icons/queue.png');
+	background-image: url('../icons/queue.png') !important;
 }
 
 .icon-top {
-	background-image: url('../icons/top.png');
+	background-image: url('../icons/top.png') !important;
 }
 
 .icon-up {
-	background-image: url('../icons/up.png');
+	background-image: url('../icons/up.png') !important;
 }
 
 .icon-down {
-	background-image: url('../icons/down.png');
+	background-image: url('../icons/down.png') !important;
 }
 
 .icon-bottom {
-	background-image: url('../icons/bottom.png');
+	background-image: url('../icons/bottom.png') !important;
 }
 
 .icon-update-tracker {
-	background-image: url('../icons/update.png');
+	background-image: url('../icons/update.png') !important;
 }
+
 .icon-edit-trackers {
-	background-image: url('../icons/edit_trackers.png');
+	background-image: url('../icons/edit_trackers.png') !important;
 }
+
 .icon-remove {
-	background-image: url('../icons/remove.png');
+	background-image: url('../icons/remove.png') !important;
 }
+
 .icon-recheck {
-	background-image: url('../icons/recheck.png');
+	background-image: url('../icons/recheck.png') !important;
 }
+
 .icon-move {
-	background-image: url('../icons/move.png');
+	background-image: url('../icons/move.png') !important;
+}
+
+.icon-help {
+	background-image: url('../icons/help.png') !important;
+}
+
+.icon-logout {
+	background-image: url('../icons/logout.png') !important;
 }
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js b/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js
index 5759bbf12..7da506b5e 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js
@@ -43,78 +43,68 @@ Ext.deluge.Toolbar = Ext.extend(Ext.Toolbar, {
 			items: [
 				{
 					id: 'create',
-					cls: 'x-btn-text-icon',
 					disabled: true,
 					text: _('Create'),
-					icon: '/icons/create.png',
+					iconCls: 'icon-create',
 					handler: this.onTorrentAction
 				},{
 					id: 'add',
-					cls: 'x-btn-text-icon',
 					disabled: true,
 					text: _('Add'),
-					icon: '/icons/add.png',
+					iconCls: 'icon-add',
 					handler: this.onTorrentAdd
 				},{
 					id: 'remove',
-					cls: 'x-btn-text-icon',
 					disabled: true,
 					text: _('Remove'),
-					icon: '/icons/remove.png',
+					iconCls: 'icon-remove',
 					handler: this.onTorrentAction
 				},'|',{
 					id: 'pause',
-					cls: 'x-btn-text-icon',
 					disabled: true,
 					text: _('Pause'),
-					icon: '/icons/pause.png',
+					iconCls: 'icon-pause',
 					handler: this.onTorrentAction
 				},{
 					id: 'resume',
-					cls: 'x-btn-text-icon',
 					disabled: true,
 					text: _('Resume'),
-					icon: '/icons/start.png',
+					iconCls: 'icon-resume',
 					handler: this.onTorrentAction
 				},'|',{
 					id: 'up',
 					cls: 'x-btn-text-icon',
 					disabled: true,
 					text: _('Up'),
-					icon: '/icons/up.png',
+					iconCls: 'icon-up',
 					handler: this.onTorrentAction
 				},{
 					id: 'down',
-					cls: 'x-btn-text-icon',
 					disabled: true,
 					text: _('Down'),
-					icon: '/icons/down.png',
+					iconCls: 'icon-down',
 					handler: this.onTorrentAction
 				},'|',{
 					id: 'preferences',
-					cls: 'x-btn-text-icon',
 					text: _('Preferences'),
 					iconCls: 'x-deluge-preferences',
 					handler: this.onPreferencesClick,
 					scope: this
 				},{
 					id: 'connectionman',
-					cls: 'x-btn-text-icon',
 					text: _('Connection Manager'),
 					iconCls: 'x-deluge-connection-manager',
 					handler: this.onConnectionManagerClick,
 					scope: this
 				},'->',{
 					id: 'help',
-					cls: 'x-btn-text-icon',
-					icon: '/icons/help.png',
+					iconCls: 'icon-help',
 					text: _('Help'),
 					handler: this.onHelpClick,
 					scope: this
 				},{
 					id: 'logout',
-					cls: 'x-btn-text-icon',
-					icon: '/icons/logout.png',
+					iconCls: 'icon-logout',
 					disabled: true,
 					text: _('Logout'),
 					handler: this.onLogout,