move all the icons

update the paths in the css/code
begin to use more iconCls rather than icon

deluge/ui/web/css/deluge.css

@@ -12,7 +12,7 @@ input {
 }
 
 .x-deluge-main-panel {
-	background-image: url('/icons/16/deluge.png');
+	background-image: url('/icons/deluge.png');
 }
 
 .deluge-torrents td, .x-deluge-peers td {
@@ -29,18 +29,22 @@ input {
 	text-align: center;
 }
 
-.x-deluge-downloading, .x-deluge-seeding {
+/*.x-deluge-downloading, .x-deluge-seeding {
 	background-repeat: no-repeat;
-}
+}*/
 
-.x-deluge-all { background-image: url('/icons/16/all.png'); }
-.x-deluge-active { background-image: url('/icons/16/active.png'); }
-.x-deluge-downloading, .x-deluge-peer { background-image: url('/icons/16/downloading.png'); }
-.x-deluge-seeding, .deluge-torrents .seeding, .x-deluge-seed { background-image: url('/icons/16/seeding.png'); }
-.x-deluge-queued, .deluge-torrents .queued { background-image: url('/icons/16/queued.png'); }
-.x-deluge-paused, .deluge-torrents .paused { background-image: url('/icons/16/inactive.png'); }
-.x-deluge-error, .deluge-torrents .error { background-image: url('/icons/16/alert.png'); }
-.x-deluge-checking, .deluge-torrents .checking { background-image: url('/icons/16/checking.png'); }
+/* Icon classes */
+.x-deluge-all { background-image: url('/icons/all.png'); }
+.x-deluge-active { background-image: url('/icons/active.png'); }
+.x-deluge-downloading, .x-btn .x-deluge-downloading, .x-deluge-peer { background-image: url('/icons/downloading.png'); }
+.x-deluge-seeding, .x-btn .x-deluge-seeding, .deluge-torrents .seeding, .x-deluge-seed { background-image: url('/icons/seeding.png'); }
+.x-deluge-queued, .x-btn .x-deluge-queued, .deluge-torrents .queued { background-image: url('/icons/queued.png'); }
+.x-deluge-paused, .x-btn .x-deluge-paused, .deluge-torrents .paused { background-image: url('/icons/inactive.png'); }
+.x-deluge-error, .deluge-torrents .error { background-image: url('/icons/alert.png'); }
+.x-deluge-checking, .deluge-torrents .checking { background-image: url('/icons/checking.png'); }
+.x-deluge-dht, .x-btn .x-deluge-dht { background-image: url('/icons/dht.png'); }
+.x-deluge-connections, .x-btn .x-deluge-connections { background-image: url('/icons/connections.png') }
+.x-deluge-traffic, .x-btn .x-deluge-traffic { background-image: url('/icons/traffic.png') }
 
 
 /* Torrent Details */
@@ -96,27 +100,27 @@ input {
 
 /* Login Window */
 .x-deluge-login-window-icon {
-	background: url('/icons/16/login.png') no-repeat 2px;
+	background: url('/icons/login.png') no-repeat 2px;
 }
 
 /* Add Window */
 .x-deluge-add-window-icon {
-	background: url('/icons/16/add.png') no-repeat 2px;
+	background: url('/icons/add.png') no-repeat 2px;
 }
 
 /* Add Url Window */
 .x-deluge-add-url-window-icon {
-	background: url('/icons/16/add_url.png') no-repeat 2px;
+	background: url('/icons/add_url.png') no-repeat 2px;
 }
 
 /* Connect Window */
 .x-deluge-connect-window-icon {
-	background: url('/icons/16/connection_manager.png') no-repeat 2px;
+	background: url('/icons/connection_manager.png') no-repeat 2px;
 }
 
 /* Statusbar */
 #deluge-statusbar .x-not-connected {
-	background: url('/icons/16/error.png') no-repeat 2px;
+	background: url('/icons/error.png') no-repeat 2px;
 	padding-left: 20px;
 }
 
@@ -168,15 +172,15 @@ input {
 
 /* MessageBox icon styles */
 .x-deluge-icon-warning {
-	background: url('/icons/16/warning.png') no-repeat 2px;
+	background: url('/icons/warning.png') no-repeat 2px;
 }
 
 .x-deluge-icon-error {
-	background: url('/icons/16/error.png') no-repeat 2px;
+	background: url('/icons/error.png') no-repeat 2px;
 }
 
 .x-tree-node-leaf .x-deluge-file {
-	background-image: url('/icons/16/document.png');
+	background-image: url('/icons/document.png');
 }
 
 .x-deluge-add-file-checkbox {

deluge/ui/web/js/deluge-add.js

@@ -138,24 +138,24 @@ Deluge.Add.Grid = new Ext.grid.GridPanel({
 				id: 'file',
 				cls: 'x-btn-text-icon',
 				text: _('File'),
-				icon: '/icons/16/add_file.png'
+				icon: '/icons/add_file.png'
 			}, {
 				id: 'url',
 				cls: 'x-btn-text-icon',
 				text: _('Url'),
-				icon: '/icons/16/add_url.png',
+				icon: '/icons/add_url.png',
 				handler: Deluge.Add.onUrl,
 				scope: Deluge.Add
 			}, {
 				id: 'infohash',
 				cls: 'x-btn-text-icon',
 				text: _('Infohash'),
-				icon: '/icons/16/add_magnet.png'
+				icon: '/icons/add_magnet.png'
 			}, '->', {
 				id: 'remove',
 				cls: 'x-btn-text-icon',
 				text: _('Remove'),
-				icon: '/icons/16/remove.png'
+				icon: '/icons/remove.png'
 			}
 		]
 	})

deluge/ui/web/js/deluge-bars.js

@@ -104,75 +104,75 @@ Deluge.ToolBar.Bar = new Ext.Toolbar({
 			cls: 'x-btn-text-icon',
 			disabled: true,
 			text: _('Create'),
-			icon: '/icons/16/create.png',
+			icon: '/icons/create.png',
 			handler: Deluge.ToolBar.onTorrentAction
 		},{
 			id: 'add',
 			cls: 'x-btn-text-icon',
 			disabled: true,
 			text: _('Add'),
-			icon: '/icons/16/add.png',
+			icon: '/icons/add.png',
 			handler: Deluge.ToolBar.onTorrentAdd
 		},{
 			id: 'remove',
 			cls: 'x-btn-text-icon',
 			disabled: true,
 			text: _('Remove'),
-			icon: '/icons/16/remove.png',
+			icon: '/icons/remove.png',
 			handler: Deluge.ToolBar.onTorrentAction
 		},'|',{
 			id: 'pause',
 			cls: 'x-btn-text-icon',
 			disabled: true,
 			text: _('Pause'),
-			icon: '/icons/16/pause.png',
+			icon: '/icons/pause.png',
 			handler: Deluge.ToolBar.onTorrentAction
 		},{
 			id: 'resume',
 			cls: 'x-btn-text-icon',
 			disabled: true,
 			text: _('Resume'),
-			icon: '/icons/16/start.png',
+			icon: '/icons/start.png',
 			handler: Deluge.ToolBar.onTorrentAction
 		},'|',{
 			id: 'up',
 			cls: 'x-btn-text-icon',
 			disabled: true,
 			text: _('Up'),
-			icon: '/icons/16/up.png',
+			icon: '/icons/up.png',
 			handler: Deluge.ToolBar.onTorrentAction
 		},{
 			id: 'down',
 			cls: 'x-btn-text-icon',
 			disabled: true,
 			text: _('Down'),
-			icon: '/icons/16/down.png',
+			icon: '/icons/down.png',
 			handler: Deluge.ToolBar.onTorrentAction
 		},'|',{
 			id: 'preferences',
 			cls: 'x-btn-text-icon',
 			text: _('Preferences'),
-			icon: '/icons/16/preferences.png',
+			icon: '/icons/preferences.png',
 			handler: Deluge.ToolBar.onTorrentAction
 		},{
 			id: 'connectionman',
 			cls: 'x-btn-text-icon',
 			text: _('Connection Manager'),
-			icon: '/icons/16/connection_manager.png',
+			iconCls: 'x-deluge-connections',
 			handler: Deluge.ToolBar.onConnectionManagerClick,
 			scope: Deluge.ToolBar
 		},'->',{
 			id: 'help',
 			cls: 'x-btn-text-icon',
 			disabled: true,
-			icon: '/icons/16/help.png',
+			icon: '/icons/help.png',
 			text: _('Help'),
 			handler: Deluge.ToolBar.onHelpClick,
 			scope: Deluge.ToolBar
 		},{
 			id: 'logout',
 			cls: 'x-btn-text-icon',
-			icon: '/icons/16/logout.png',
+			icon: '/icons/logout.png',
 			disabled: true,
 			text: _('Logout'),
 			handler: Deluge.ToolBar.onLogout,
@@ -198,30 +198,30 @@ Deluge.StatusBar = {
 			id: 'statusbar-connections',
 			text: '200 (200)',
 			cls: 'x-btn-text-icon',
-			icon: '/icons/16/connection_manager.png',
+			iconCls: 'x-deluge-connections',
 			menu: Deluge.Menus.Connections
 		}, '-', {
 			id: 'statusbar-downspeed',
 			text: '9.8KiB/s (30 KiB/s)',
 			cls: 'x-btn-text-icon',
-			icon: '/icons/16/downloading.png',
+			iconCls: 'x-deluge-downloading',
 			menu: Deluge.Menus.Download
 		}, '-', {
 			id: 'statusbar-upspeed',
 			text: '9.8KiB/s (30 KiB/s)',
 			cls: 'x-btn-text-icon',
-			icon: '/icons/16/seeding.png',
+			iconCls: 'x-deluge-seeding',
 			menu: Deluge.Menus.Upload
 		}, '-', {
 			id: 'statusbar-traffic',
 			text: '1.53/2,65 KiB/s',
 			cls: 'x-btn-text-icon',
-			icon: '/icons/16/traffic.png'
+			iconCls: 'x-deluge-traffic'
 		}, '-', {
 			id: 'statusbar-dht',
 			text: '161',
 			cls: 'x-btn-text-icon',
-			icon: '/icons/16/dht.png'
+			iconCls: 'x-deluge-dht'
 		});
 		this.created = true;
 	},

deluge/ui/web/js/deluge-connections.js

@@ -217,19 +217,19 @@ Deluge.Connections.Grid = new Ext.grid.GridPanel({
 				id: 'add',
 				cls: 'x-btn-text-icon',
 				text: _('Add'),
-				icon: '/icons/16/add.png',
+				icon: '/icons/add.png',
 				handler: Deluge.Connections.onAdd
 			}, {
 				id: 'remove',
 				cls: 'x-btn-text-icon',
 				text: _('Remove'),
-				icon: '/icons/16/remove.png',
+				icon: '/icons/remove.png',
 				handler: Deluge.Connections.onRemove
 			}, '->', {
 				id: 'stop',
 				cls: 'x-btn-text-icon',
 				text: _('Stop Daemon'),
-				icon: '/icons/16/error.png',
+				icon: '/icons/error.png',
 				handler: Deluge.Connections.onStop
 			}
 		]

deluge/ui/web/js/deluge-menus.js

@@ -78,19 +78,19 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({
 	items: [{
 		id: 'pause',
 		text: _('Pause'),
-		icon: '/icons/16/pause.png',
+		icon: '/icons/pause.png',
 		handler: Deluge.Menus.onTorrentAction,
 		scope: Deluge.Menus
 	}, {
 		id: 'resume',
 		text: _('Resume'),
-		icon: '/icons/16/start.png',
+		icon: '/icons/start.png',
 		handler: Deluge.Menus.onTorrentAction,
 		scope: Deluge.Menus
 	}, '-', {
 		id: 'options',
 		text: _('Options'),
-		icon: '/icons/16/preferences.png',
+		icon: '/icons/preferences.png',
 		menu: new Ext.menu.Menu({
 			items: [{
 				text: _('D/L Speed Limit'),
@@ -130,7 +130,7 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({
 				})
 			}, {
 				text: _('Connection Limit'),
-				icon: '/icons/16/connections.png',
+				iconCls: 'x-deluge-connections',
 				menu: new Ext.menu.Menu({
 					items: [{
 						text: _('50'),
@@ -148,7 +148,7 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({
 				})
 			}, {
 				text: _('Upload Slot Limit'),
-				icon: '/icons/16/upload_slots.png',
+				icon: '/icons/upload_slots.png',
 				menu: new Ext.menu.Menu({
 					items: [{
 						text: _('0'),
@@ -172,30 +172,30 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({
 		})
 	}, '-', {
 		text: _('Queue'),
-		icon: '/icons/16/queue.png',
+		icon: '/icons/queue.png',
 		menu: new Ext.menu.Menu({
 			items: [{
 				id: 'top',
 				text: _('Top'),
-				icon: '/icons/16/top.png',
+				icon: '/icons/top.png',
 				handler: Deluge.Menus.onTorrentAction,
 				scope: Deluge.Menus
 			},{
 				id: 'up',
 				text: _('Up'),
-				icon: '/icons/16/up.png',
+				icon: '/icons/up.png',
 				handler: Deluge.Menus.onTorrentAction,
 				scope: Deluge.Menus
 			},{
 				id: 'down',
 				text: _('Down'),
-				icon: '/icons/16/down.png',
+				icon: '/icons/down.png',
 				handler: Deluge.Menus.onTorrentAction,
 				scope: Deluge.Menus
 			},{
 				id: 'bottom',
 				text: _('Bottom'),
-				icon: '/icons/16/bottom.png',
+				icon: '/icons/bottom.png',
 				handler: Deluge.Menus.onTorrentAction,
 				scope: Deluge.Menus
 			}]
@@ -203,31 +203,31 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({
 	}, '-', {
 		id: 'update',
 		text: _('Update Tracker'),
-		icon: '/icons/16/update.png',
+		icon: '/icons/update.png',
 		handler: Deluge.Menus.onTorrentAction,
 		scope: Deluge.Menus
 	}, {
 		edit: 'edit_trackers',
 		text: _('Edit Trackers'),
-		icon: '/icons/16/edit_trackers.png',
+		icon: '/icons/edit_trackers.png',
 		handler: Deluge.Menus.onTorrentAction,
 		scope: Deluge.Menus
 	}, '-', {
 		id: 'remove',
 		text: _('Remove Torrent'),
-		icon: '/icons/16/remove.png',
+		icon: '/icons/remove.png',
 		handler: Deluge.Menus.onTorrentAction,
 		scope: Deluge.Menus
 	}, '-', {
 		id: 'recheck',
 		text: _('Force Recheck'),
-		icon: '/icons/16/recheck.png',
+		icon: '/icons/recheck.png',
 		handler: Deluge.Menus.onTorrentAction,
 		scope: Deluge.Menus
 	}, {
 		id: 'move',
 		text: _('Move Storage'),
-		icon: '/icons/16/move.png',
+		icon: '/icons/move.png',
 		handler: Deluge.Menus.onTorrentAction,
 		scope: Deluge.Menus
 	}]