From faae99d3d818af59b38065ba88cee11d2d2392c5 Mon Sep 17 00:00:00 2001
From: Damien Churchill <damoc@gmail.com>
Date: Thu, 19 Feb 2009 20:38:06 +0000
Subject: [PATCH] improve the statusbar, default to "Not Connected" with an
 icon

---
 deluge/ui/web/css/deluge.css     |  11 +++++++++++
 deluge/ui/web/icons/16/LICENSE   |   1 +
 deluge/ui/web/icons/16/error.png | Bin 0 -> 886 bytes
 deluge/ui/web/js/deluge-bars.js  |  27 ++++++++++++++++++++++++++-
 deluge/ui/web/js/deluge-ui.js    |   2 +-
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 deluge/ui/web/icons/16/error.png

diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css
index f0b8224f6..0d13a0f94 100644
--- a/deluge/ui/web/css/deluge.css
+++ b/deluge/ui/web/css/deluge.css
@@ -67,4 +67,15 @@ html, body {
 
 .deluge-status dd.torrent_name, .deluge-status dd.tracker, .deluge-status dd.path {
 	width: 500px;
+}
+
+
+/* Statusbar */
+#deluge-statusbar .x-not-connected {
+	background: url('/icons/16/error.png') no-repeat 2px;
+	padding-left: 20px;
+}
+
+#deluge-statusbar .x-connected {
+	background: transparent;
 }
\ No newline at end of file
diff --git a/deluge/ui/web/icons/16/LICENSE b/deluge/ui/web/icons/16/LICENSE
index 3baa3ecf9..8d6d0478e 100644
--- a/deluge/ui/web/icons/16/LICENSE
+++ b/deluge/ui/web/icons/16/LICENSE
@@ -15,6 +15,7 @@ Licensed under the Creative Common Attribution-ShareAlike 3.0 License.
  - connection_manager.png
  - create.png
  - down.png
+ - error.png
  - go-bottom.png
  - go-top.png
  - help.png
diff --git a/deluge/ui/web/icons/16/error.png b/deluge/ui/web/icons/16/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..0db86f68622b938352e8bfa7fc21156227a5aef5
GIT binary patch
literal 886
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFiUv4IEGZ*3JH$&2u_r!+qT*A;^LK>+uGJG%k?(a
ze&%$^<+mcMD3|u3QqfqK*w*b{Wz)ASaolxzpz-{?!G;&d+5~TMUAtfM?s#C-qa*WI
z-o6u9eSh+V+7EL+&;49?{`0@Ou4m8EG(@;Grh5JKJ)tbaI>G<Mk^5V{X57Dd^P`X$
z$BldU*!GA1*lxnII&QuF<x7`}4ks8)@tmY09ik=5)OcX}zkmPs6<GY4R_7}qlp}m5
z&A2-C)6rwcj)l!WTNeMR;#0kSeP6t-Z3hpZk`#x7kN^4gyUV`XxN7~Vu~Td3jBYxa
z@+e@{tXZ?7va_@E+pMe>$jP_Q+w*E`)Qh5G#dYhFjy^q<|J{Ac&8X9?juSjm8eOME
zM@Ro`ZEd~!{M^->OtNn+9NPVR`jTpEWhZ*L96NT5&2L{->z$*nXG+QzEn9YM+2xn3
zW}aqR8on-O-@ngavs2EUJNTmDM5TP)Hy&?qZ=;IytB<^FQ8Q_7HBZjSSh4?HjF?44
zKtRB*Uv*52G!6yE=*agSe|*8Vw(HHkxF3J(SehMe&Yg5DNoBprpO>-qR?xFe4q+y{
z+GZSQ)|~0$R%JCW;9lH%@z0+>ZxYykJ$2)W+^)$C^LvjzN?6wwbyR7>iuHy@d1uZ#
zF0mEm%GxTWsi|pXR93B<lc(fYHq$vq)pk+Sf~H+xBpyx4my+!3>HX{e%+kWzlyxF&
z$C-3SRc@D?zwdn6QXjM>Vx!B$tnU-{hlM-{uH30}V8bPwBO05w1dDRCrm4+5%{2dQ
z+3$e7P+p<qeTR!5Hu-!L{3-A=aYtrY#a;ucjlO-Gv{yeU;o~)&9{fX;=U43E!_Cak
z+G7JE{2r@{=E(Pd(5twgZs3r(w&mkN<(?i3cBh34x_2IWcXY<rs{NXpwojLCD=W_0
zD46Kj+rQcVLGVh&tFcWFugOZ}-*3MAFXhI=7t&ovlNOsOPjXtvHeuDpjG_#_EZ=29
zukY^8{VL|2dU0Mi+xFkF3wH0$F3EcJ`^c?Zw<44#Mm$-!slnld(i`=TkOMke5rVO^
x_Uyerb5YEK3Ct%`ie~P+&MA24lRP6EL%Ks(fzb+sYz77f22WQ%mvv4FO#u7%r6d3V

literal 0
HcmV?d00001

diff --git a/deluge/ui/web/js/deluge-bars.js b/deluge/ui/web/js/deluge-bars.js
index 0651878a4..9c28dbd76 100644
--- a/deluge/ui/web/js/deluge-bars.js
+++ b/deluge/ui/web/js/deluge-bars.js
@@ -177,7 +177,31 @@ Deluge.SideBar = {
 	margins: '5 0 0 5'
 };
 
-Deluge.StatusBar = new Ext.StatusBar({
+Deluge.StatusBar = {
+	onRender: function() {
+		this.bound = {
+			onConnect: this.onConnect.bindWithEvent(this)
+		}
+		Deluge.Events.on('connect', this.bound.onConnect);
+		Deluge.Events.on('disconnect', this.bound.onDisconnect);
+	},
+	
+	onConnect: function() {
+		this.Bar.setStatus({
+			iconCls: 'x-connected',
+			text: ''
+		});
+	},
+	
+	onDisconnect: function() {
+		this.Bar.clearStatus({useDefaults:true});
+	}
+}
+
+Deluge.StatusBar.Bar = new Ext.StatusBar({
+	id: 'deluge-statusbar',
+	defaultIconCls: 'x-not-connected',
+	defaultText: _('Not Connected'),
 	/*items: [{
 		id: 'statusbar-connections',
 		text: '200 (200)',
@@ -207,4 +231,5 @@ Deluge.StatusBar = new Ext.StatusBar({
 		cls: 'x-btn-text-icon',
 		icon: '/icons/16/dht.png'
 	}]*/
+	listeners: {'render': {scope: Deluge.StatusBar, fn: Deluge.StatusBar.onRender}}
 });
\ No newline at end of file
diff --git a/deluge/ui/web/js/deluge-ui.js b/deluge/ui/web/js/deluge-ui.js
index 391e8d855..ea7b7ca49 100644
--- a/deluge/ui/web/js/deluge-ui.js
+++ b/deluge/ui/web/js/deluge-ui.js
@@ -8,7 +8,7 @@ Deluge.Ui = {
 			layout: 'border',
 			tbar: Deluge.ToolBar.Bar,
 			items: [Deluge.SideBar, Deluge.Details.Panel,  Deluge.Torrents],
-			bbar: Deluge.StatusBar
+			bbar: Deluge.StatusBar.Bar
 		});
 
 		this.Viewport = new Ext.Viewport({