Changeset a26656

Timestamp:

Aug 20, 2008, 5:13:14 PM (12 years ago)

Author:

rene <rene@…>

Branches:

master

Children:

e11e2c

Parents:

577806

Message:

implemented new notifcation-box. Now using textfield.

Location:

chrome

Files:

• content/v_identity/vI_getHeader.js (modified) (3 diffs)
• content/v_identity/vI_notificationBar.js (modified) (3 diffs)
• content/v_identity/vI_notificationBar.xml (modified) (11 diffs)
• skin/classic/v_identity/v_identity.css (modified) (2 diffs)

chrome/content/v_identity/vI_getHeader.js

@@ -91 +91 @@
         if (!vI_getHeader.headerToSearch) vI_getHeader.prepareHeaderToSearchArray()
 
-        var found = false;
-        var label = vI_getHeader.strings.getString("vident.getHeader.noHeader");
+        var found = false; var label = "";
+        var subtitle = vI_getHeader.strings.getString("vident.getHeader.noHeader");
         // create array to count the header
         var currentHeadersCounter = []
@@ -126 +126 @@
                     vI_notificationBar.dump(" ...stored as '" + storedConvValue + "'");
                     if (!found) { 
-                        label = vI_getHeader.strings.getString("vident.getHeader.headerFound");
+                        subtitle = vI_getHeader.strings.getString("vident.getHeader.headerFound");
                         found = true;
                     }
-                    label += " " + currentHeaderData[header].headerName + 
-                    "[:" + currentHeadersCounter[headerName] + "]:" + currentHeaderData[header].headerValue
+                    label += (label)?"\n":""
+                    label += currentHeaderData[header].headerName + 
+                    "[:" + currentHeadersCounter[headerName] + "]:\t" + currentHeaderData[header].headerValue
                     break;
                 }
@@ -136 +137 @@
             vI_notificationBar.dump("\n");
         }
-        vI_notificationBar.setNote(label, "get_header_notification");
+        vI_notificationBar.setNote(label, "get_header_notification", subtitle);
     },
     

chrome/content/v_identity/vI_notificationBar.js

@@ -84 +84 @@
         
         vI_notificationBar.Obj_vINotification = document.getElementById("vINotification");
-        vI_notificationBar.Obj_DebugBoxSplitter = document.getElementById("vIDebugBoxSplitter")
-        vI_notificationBar.Obj_DebugBaseID = document.getElementById("msgIdentity_clone")
+        vI_notificationBar.Obj_DebugBoxSplitter = document.getElementById("vIDebugBoxSplitter");
+        vI_notificationBar.Obj_DebugBaseID = document.getElementById("msgIdentity_clone");
         
         vI_notificationBar.addObserver();
@@ -177 +177 @@
     },
     
-    setNote: function(note, prefstring) {
+    setNote: function(note, prefstring, title) {
         vI_notificationBar.clear();
-        vI_notificationBar.addNote(note, prefstring);
-    },
-    
-    addNote: function(note, prefstring) {
+        vI_notificationBar.addNote(note, prefstring, title);
+    },
+
+    overflow : function(elem) {
+        // height will be cut off from messagepane (in 3pane window)
+        var objMessagepane = document.getElementById("messagepane");
+        var maxHeight = 1000;
+        if (objMessagepane) maxHeight = parseInt(objMessagepane.boxObject.height / 2) +1
+        var tooBig = (elem.inputField.scrollHeight > maxHeight)
+        var newHeight = (tooBig)?maxHeight:elem.inputField.scrollHeight
+        elem.height = newHeight;
+        vI_notificationBar.Obj_vINotification.height = newHeight + 24; // a little bigger
+        // give the box a frame if it is to bigger
+        if (tooBig) document.getElementById("vINotificationTextbox").setAttribute("class", "plain border")
+    },
+
+    __setTitle: function(title) {
+        if (!title) return;
+        vI_notificationBar.dump("** setTitle: " + title + "\n");
+        var Obj_vvINotificationTitle = document.getElementById("vINotificationTitle");
+        Obj_vvINotificationTitle.setAttribute("value", title);
+        Obj_vvINotificationTitle.removeAttribute("hidden");
+    },
+
+    addNote: function(note, prefstring, title) {
         vI_notificationBar.dump("** " + note + "\n");
         if (!vI_notificationBar.preferences.getBoolPref(prefstring)) return;
@@ -190 +211 @@
         if (vI_notificationBar.timer) window.clearTimeout(vI_notificationBar.timer);
         var oldNotification = vI_notificationBar.Obj_vINotification.currentNotification
-        
-        var newNotification;
-        if (oldNotification) {
-            var oldLabel = oldNotification.label
-            vI_notificationBar.clear();
-            newNotification = vI_notificationBar.Obj_vINotification
-                .appendNotification(oldLabel + note, "", "chrome://messenger/skin/icons/flag.png");
-        }
-        else newNotification = vI_notificationBar.Obj_vINotification
-                .appendNotification(note, "", "chrome://messenger/skin/icons/flag.png");
-        
-        // workaround, seems that my usage of notificationbox doesn't display multiple lines
-        vI_notificationBar.Obj_vINotification.height = newNotification.boxObject.height;
-        
+        var newLabel = (oldNotification)?oldNotification.label + note:note;
+        vI_notificationBar.clear();
+        vI_notificationBar.Obj_vINotification
+                .appendNotification(newLabel, "", "chrome://messenger/skin/icons/flag.png");
+        vI_notificationBar.__setTitle(title);
+
         if (vI_notificationBar.preferences.getIntPref("notification_timeout") != 0)
             vI_notificationBar.timer = window.setTimeout(vI_notificationBar.hide,

chrome/content/v_identity/vI_notificationBar.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE overlay [
+<!DOCTYPE bindings [
 <!ENTITY % versionDTD SYSTEM "chrome://v_identity/content/_version.dtd">
 %versionDTD;
@@ -39 +39 @@
       <field name="_timer">null</field>
       <field name="_closedNotification">null</field>
-      <field name="_blockBox">null</field>
+      <field name="_blockingCanvas">null</field>
 
       <property name="notificationsHidden"
@@ -47 +47 @@
             this.setAttribute('notificationshidden', true);
           else this.removeAttribute('notificationshidden');
+          return val;
         </setter>
       </property>
@@ -93 +94 @@
             newitem.setAttribute("label", aLabel);
             newitem.setAttribute("value", aValue);
-            newitem.setAttribute("image", aImage);
+            if (aImage)
+                newitem.setAttribute("image", aImage);
             if (!insertPos) {
               newitem.style.position = "fixed";
@@ -171 +173 @@
       </method>
 
+      <method name="removeTransientNotifications">
+        <body>
+          <![CDATA[
+            var notifications = this.allNotifications;
+            for (var n = notifications.length - 1; n >= 0; n--) {
+              var notification = notifications[n];
+              if (notification.persistence)
+                notification.persistence--;
+              else if (Date.now() > notification.timeout)
+                this.removeNotification(notification);
+            }
+          ]]>
+        </body>
+      </method>
+
       <method name="_showNotification">
         <parameter name="aNotification"/>
@@ -186 +203 @@
                   removeChild(this._closedNotification); }
           catch (e) {};
+              this._setBlockingState(this.currentNotification);
             }
 
@@ -245 +263 @@
                   self._closedNotification.parentNode.
                     removeChild(self._closedNotification);
+                self._setBlockingState(self.currentNotification);
               }
             }
 
             this._timer = setInterval(slide, 50);
+          ]]>
+        </body>
+      </method>
+
+      <method name="_setBlockingState">
+        <parameter name="aNotification"/>
+        <body>
+          <![CDATA[
+            var isblock = aNotification &&
+                          aNotification.priority == this.PRIORITY_CRITICAL_BLOCK;
+            var canvas = this._blockingCanvas;
+            if (isblock) {
+              if (!canvas)
+                canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
+              const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+              var content = this.firstChild;
+              if (!content ||
+                   content.namespaceURI != XULNS ||
+                   content.localName != "browser")
+                return;
+
+              var width = content.boxObject.width;
+              var height = content.boxObject.height;
+              content.collapsed = true;
+
+              canvas.setAttribute("width", width);
+              canvas.setAttribute("height", height);
+              canvas.setAttribute("flex", "1");
+
+              this.appendChild(canvas);
+              this._blockingCanvas = canvas;
+
+              var bgcolor = "white";
+              try {
+                var prefService = Components.classes["@mozilla.org/preferences-service;1"].
+                                    getService(Components.interfaces.nsIPrefBranch);
+                bgcolor = prefService.getCharPref("browser.display.background_color");
+
+                var win = content.contentWindow;
+                var context = canvas.getContext("2d");
+                context.globalAlpha = 0.5;
+                context.drawWindow(win, win.scrollX, win.scrollY,
+                                   width, height, bgcolor);
+              }
+              catch(ex) { };
+            }
+            else if (canvas) {
+              canvas.parentNode.removeChild(canvas);
+              this._blockingCanvas = null;
+              var content = this.firstChild;
+              if (content)
+                content.collapsed = false;
+            }
           ]]>
         </body>
@@ -255 +327 @@
     </implementation>
   </binding>
-      
+
   <binding id="notification">
     <content>
@@ -262 +334 @@
                   oncommand="this.parentNode.parentNode._doButtonCommand(event);">
           <xul:image anonid="messageImage" class="messageImage" xbl:inherits="src=image"/>
-          <xul:description anonid="messageText" class="messageText" flex="1" xbl:inherits="xbl:text=label"/>
-          <xul:spacer flex="1"/>
+      <xul:vbox><xul:spacer flex="1" />
+          <xul:label id="vINotificationTitle" hidden="true" align="right" />
+          <xul:label class="v_identity_logo vINotificationLogo"
+                              value="&vident.vidLogo.label; &vident.version;" align="right" />
+          <xul:spacer flex="1" /></xul:vbox>
+          <xul:textbox id="vINotificationTextbox" anonid="messageText" class="plain" height="3"
+            value="" flex="1" multiline="true" readonly="true" 
+            xbl:inherits="value=label"
+            DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"
+            onoverflow="vI_notificationBar.overflow(this);" oncontextmenu="" />
           <children/>
         </xul:hbox>
-        <xul:vbox><xul:spacer flex="1" /><xul:label class="v_identity_logo vINotificationLogo"
-            value="&vident.vidLogo.label; &vident.version;" align="right" />
-        <xul:spacer flex="1" /></xul:vbox>
         <xul:toolbarbutton ondblclick="event.stopPropagation();"
-                           class="messageCloseButton"
+                           class="messageCloseButton tabbable"
                            xbl:inherits="hidden=hideclose"
                            oncommand="vI_notificationBar.clear();"/>
@@ -279 +356 @@
     </resources>
     <implementation implements="nsIAccessibleProvider">
-      <property name="accessible" readonly="true">
+      <property name="accessibleType" readonly="true">
         <getter>
           <![CDATA[
-            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return accService.createXULAlertAccessible(this);
+            return Components.interfaces.nsIAccessibleProvider.XULAlert;
           ]]>
         </getter>
       </property>
 
-      <property name="label" onset="return this.setAttribute('label', val);"
+      <property name="label" onset="this.setAttribute('label', val); return val;"
                              onget="return this.getAttribute('label');"/>
-      <property name="value" onset="return this.setAttribute('value', val);"
+      <property name="value" onset="this.setAttribute('value', val); return val;"
                              onget="return this.getAttribute('value');"/>
-      <property name="image" onset="return this.setAttribute('image', val);"
+      <property name="image" onset="this.setAttribute('image', val); return val;"
                              onget="return this.getAttribute('image');"/>
-      <property name="type" onget="return this.getAttribute('type');"
-                            onset="this.setAttribute('type', val); return val;"/>
-      <property name="priority" onget="return this.getAttribute('priority');"
+      <property name="type" onset="this.setAttribute('type', val); return val;"
+                            onget="return this.getAttribute('type');"/>
+      <property name="priority" onget="return parseInt(this.getAttribute('priority')) || 0;"
                                 onset="this.setAttribute('priority', val); return val;"/>
+      <property name="persistence" onget="return parseInt(this.getAttribute('persistence')) || 0;"
+                                   onset="this.setAttribute('persistence', val); return val;"/>
+      <field name="timeout">0</field>
 
       <property name="control" readonly="true">
@@ -334 +413 @@
             var button = aEvent.target.buttonInfo;
             if (button.popup) {
+              document.popupNode = aEvent.target;
               document.getElementById(button.popup).
                 showPopup(aEvent.originalTarget, -1, -1, "popup", "bottomleft", "topleft");

chrome/skin/classic/v_identity/v_identity.css

@@ -2 +2 @@
 @import url("chrome://v_identity/locale/logo.css"); 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#vINotificationTitle {
+    text-align: right;
+    font-weight: bold;
+}
+
+#vINotificationTextbox
+    {
+    background-color: transparent;
+        margin: 5px !important;
+    margin-left: 20px !important;
+        -moz-border-top-colors: grey;
+        -moz-border-right-colors: grey;
+        -moz-border-bottom-colors: grey;
+        -moz-border-left-colors: grey;
+    }
+
+#vINotificationTextbox.border
+    {
+      border-style: solid !important;
+      border-right-style: none !important;
+      border-width: 1px !important;
+    }
 
 #vI-status-menu[save="off"] {
@@ -138 +161 @@
   width: 16px;
   height: 16px;
-  margin: 0px 1px 0px 6px;
+  margin: 0px 6px 0px 6px;
 }