Use new typing, typed and unknown icons from idechix in conversation tabs.

2009-09-11 17:07:42 +02:00 · 2009-09-11 17:07:42 +02:00 · 301c401906
--- a/im/content/instantbird/conversation.xml
+++ b/im/content/instantbird/conversation.xml
@ -835,11 +835,18 @@
       <body>
       <![CDATA[
          let buddy = this._conv.buddy;
-          if (!buddy)
-            return;
-
-          if (!buddy.online)
+          if (!buddy || !buddy.account.connected) {
            this.tab.removeAttribute("status");
+
+            // This is ugly, but when an account gets disconnected libpurple
+            // doesn't reset the typing state... :(
+            this.tab.removeAttribute("typing");
+            this.tab.removeAttribute("typed");
+            this._statusText = "";
+            this.displayStatusText();
+          }
+          else if (!buddy.online)
+            this.tab.setAttribute("status", "offline");
          else if (buddy.idle)
            this.tab.setAttribute("status", "idle");
          else if (buddy.available)
--- a/im/themes/winstripe/instantbird/instantbird.css
+++ b/im/themes/winstripe/instantbird/instantbird.css
@ -88,7 +88,7 @@ tab[attention],
 /* Tab icons */
 .tab-icon-image,
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url("chrome://instantbird/skin/offline-16.png");
+  list-style-image: url("chrome://instantbird/skin/unknown-16.png");
  -moz-image-region: rect(0px, 16px, 16px, 0px);
 }

@ -105,6 +105,10 @@ tab[attention],
  list-style-image: url("chrome://instantbird/skin/chat-16.png") !important;
 }

+.tabbrowser-tab[status="offline"] > .tab-icon-image,
+.alltabs-item[status="offline"] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://instantbird/skin/offline-16.png") !important;
+}
 .tabbrowser-tab[status="available"] > .tab-icon-image,
 .alltabs-item[status="available"] > .menu-iconic-left > .menu-iconic-icon {
  list-style-image: url("chrome://instantbird/skin/available-16.png") !important;
@ -120,5 +124,10 @@ tab[attention],

 .tabbrowser-tab[typing] > .tab-icon-image,
 .alltabs-item[typing] > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
+  list-style-image: url("chrome://instantbird/skin/typing-16.png") !important;
+}
+
+.tabbrowser-tab[typed] > .tab-icon-image,
+.alltabs-item[typed] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://instantbird/skin/typed-16.png") !important;
 }
--- a/im/themes/winstripe/instantbird/jar.mn
+++ b/im/themes/winstripe/instantbird/jar.mn
@ -12,6 +12,8 @@ classic.jar:
 	skin/classic/instantbird/idle.png
 	skin/classic/instantbird/offline-16.png
 	skin/classic/instantbird/offline.png
+	skin/classic/instantbird/typing-16.png
+	skin/classic/instantbird/typed-16.png
 	skin/classic/instantbird/unknown-16.png
 	skin/classic/instantbird/chat-16.png
 	skin/classic/instantbird/founder.png
--- a/im/themes/winstripe/instantbird/tabbrowser-pinstripe/tabbrowser.css
+++ b/im/themes/winstripe/instantbird/tabbrowser-pinstripe/tabbrowser.css
@ -339,11 +339,6 @@ tabbrowser > tabbox > tabpanels {
 /**
 * All Tabs Menupopup
 */
-
-.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url("chrome://global/skin/tree/item.png");
-}
-
 .alltabs-item[selected="true"] {
  font-weight: bold;
 }
--- a/im/themes/winstripe/instantbird/typed-16.png
+++ b/im/themes/winstripe/instantbird/typed-16.png
--- a/im/themes/winstripe/instantbird/typing-16.png
+++ b/im/themes/winstripe/instantbird/typing-16.png
--- a/im/themes/winstripe/instantbird/unknown-16.png
+++ b/im/themes/winstripe/instantbird/unknown-16.png