keeping up with Classic development, e.g. adding im, popup-blocker and junk mail...

diff --git a/LCARStrek/communicator/bookmarks/bookmarksWindow.css b/LCARStrek/communicator/bookmarks/bookmarksWindow.css
index 2db0e9c7eb3af86db1497c3b622d1b083b53eda8..bc2e8b8289182d1691e80e5844717fdc9eed70e8 100644 (file)
--- a/LCARStrek/communicator/bookmarks/bookmarksWindow.css
+++ b/LCARStrek/communicator/bookmarks/bookmarksWindow.css
@@ -38,7 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 @import url("chrome://communicator/skin/bookmarks/bookmarks.css");
-@import url("chrome://communicator/skin/bookmarks/platformBookmarks.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -61,7 +60,8 @@
   list-style-image: url("chrome://communicator/skin/bookmarks/schedule.gif");
 }
 
-#panel-bar {
+#panel-bar,
+#search-bar {
   border-top: 1px solid #9C9CFF;
   border-bottom: 1px solid #9C9CFF;
 }

diff --git a/LCARStrek/communicator/sidebar/sidebar.css b/LCARStrek/communicator/sidebar/sidebar.css
index a6551fdded7566ef4ad943fb78c27b1c81f8752c..92e19b59ea54c801e711903141410a25e2788ed2 100644 (file)
--- a/LCARStrek/communicator/sidebar/sidebar.css
+++ b/LCARStrek/communicator/sidebar/sidebar.css
@@ -102,7 +102,7 @@
   color: #FF9F00;
 }
 
-.iframe-panel {
+.iframe-panel, .browser-sidebar {
 }  
 
 /* ::::: loading info ::::: */

diff --git a/LCARStrek/editor/EdImageMap.css b/LCARStrek/editor/EdImageMap.css
index cebd6e9b3cb95251710e1d36effbf360d6d390ac..9664db00ffa23fa79a97aac9c375b43ca54da42c 100644 (file)
--- a/LCARStrek/editor/EdImageMap.css
+++ b/LCARStrek/editor/EdImageMap.css
@@ -61,6 +61,10 @@ toolbar#toolbox button.tool {
        color: inherit;
 }
 
+toolbar.toolbox > toolbargrippy {
+  visibility: collapse;
+}
+
 #pointerButton {
        list-style-image:url("chrome://editor/skin/icons/Map_pointerTool.gif");
 }

diff --git a/LCARStrek/global/dialog.css b/LCARStrek/global/dialog.css
index d59206d9c530421fe01f2631ac08a7851e1500ab..219d0ea2d6f59298ecc8546edcdc27fa1931d3c2 100644 (file)
--- a/LCARStrek/global/dialog.css
+++ b/LCARStrek/global/dialog.css
@@ -53,6 +53,7 @@ dialog {
 
 .dialog-button {
 /*  font: menu; */
+  margin-top: 5px;
 }
 
 /* ::::: dialog header ::::: */

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index 4ad4a8d6d188ffd8655d7dbad7e116c837453bc3..e8234612f6e2b32ed01da872a169b8145fe957c5 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -32,7 +32,8 @@
 
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <content>
-      <xul:hbox class="toolbar-begcap"/>
+      <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
+                         tbattr="toolbar-grippy" class="toolbar-grippy"/>
       <xul:hbox flex="1" class="toolbar-holder" align="center"
                xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
         <children/>
@@ -43,7 +44,8 @@
 
   <binding id="toolbar-primary" extends="chrome://global/content/bindings/toolbar.xml#toolbar-primary">
     <content>
-      <xul:hbox class="toolbar-begcap"/>
+      <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
+                         tbattr="toolbar-grippy" class="toolbar-grippy"/>
       <xul:hbox flex="1" class="toolbar-holder" align="center"
                xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
         <children/>
@@ -58,7 +60,8 @@
     </resources>
 
     <content>
-      <xul:hbox class="menubar-begcap"/>
+      <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
+                         tbattr="toolbar-grippy" class="toolbar-grippy"/>
       <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
         <children/>
       </xul:hbox>

diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css
index e373239f6c7a6e3da5865e61158b1c48e41861c4..df7bd62cbb4e00798f0a8c760c5b84936f42c445 100644 (file)
--- a/LCARStrek/global/toolbar.css
+++ b/LCARStrek/global/toolbar.css
@@ -66,10 +66,12 @@ menubar > .toolbar-holder {
   background-color: #6000CF;
 }
 
-/* ::::: begcap (LCARStrek specific) ::::: */
+/* ::::: toolbargrippy ::::: */
 
-toolbar > .toolbar-begcap {
+toolbargrippy {
   -moz-border-radius: 8px 0px 0px 8px;
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
   background-color: #FF9F00;
   border: none;
   border-right: 3px solid black;
@@ -77,13 +79,8 @@ toolbar > .toolbar-begcap {
   min-height: 16px;
 }
 
-menubar > .menubar-begcap {
-  -moz-border-radius: 8px 0px 0px 8px;
-  background-color: #FF9F00;
-  border: none;
-  border-right: 3px solid black;
-  width: 15px;
-  min-height: 16px;
+toolbargrippy:hover {
+  background-color: #FFCF00;
 }
 
 /* ::::: endcap (LCARStrek specific) ::::: */
@@ -106,6 +103,20 @@ menubar > .menubar-endcap {
   min-height: 16px;
 }
 
+/* ::::: collapsed tray and grippies ::::: */
+
+toolbargrippy[tbgrippy-collapsed="true"] {
+  -moz-box-orient: horizontal;
+  -moz-border-radius: 5px 0px 0px 5px;
+  margin-bottom: 3px;
+  width: 30px;
+  height: 10px;
+}
+
+.collapsed-tray-spacer {
+  border-bottom: none;
+}
+
 /* ::::: toolbarseparator ::::: */
 
 toolbarseparator {
@@ -113,4 +124,3 @@ toolbarseparator {
   border-right: 1px solid #000000; 
   width: 1px;
 }
-

diff --git a/LCARStrek/messenger/addressbook/addressPanes.css b/LCARStrek/messenger/addressbook/addressPanes.css
index 3e0e354d044af4204243a0ce2356a6dfadcafc04..74f3bea72bbc7441dd2744e9bf92eaddf16dafa6 100644 (file)
--- a/LCARStrek/messenger/addressbook/addressPanes.css
+++ b/LCARStrek/messenger/addressbook/addressPanes.css
@@ -56,3 +56,7 @@ treechildren:-moz-tree-image(DirCol, IsMailList-true) {
 treechildren:-moz-tree-image(DirCol, IsRemote-true) {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.gif");
 }
+
+treechildren:-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.gif");
+}

diff --git a/LCARStrek/messenger/addressbook/addressbook.css b/LCARStrek/messenger/addressbook/addressbook.css
index 3bd7c0a664208e296a4b6dfa3579e8eb125d5d21..04079cbe83cdb00627bcac6dc3965d6386b7dcf3 100644 (file)
--- a/LCARStrek/messenger/addressbook/addressbook.css
+++ b/LCARStrek/messenger/addressbook/addressbook.css
@@ -99,16 +99,16 @@
 } 
 
 #button-newim {
-  list-style-image:url("chrome://messenger/skin/addressbook/icons/newmsg.gif");
+  list-style-image:url("chrome://messenger/skin/addressbook/icons/im.gif");
 }
 
 #button-newim:hover,
 #button-newim:hover:active {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/newmsg-hover.gif");
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/im-hover.gif");
 } 
 
 #button-newim[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/newmsg-disabled.gif") !important;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/im-disabled.gif") !important;
 } 
 
 #button-delete {

diff --git a/LCARStrek/messenger/addressbook/icons/im-disabled.gif b/LCARStrek/messenger/addressbook/icons/im-disabled.gif
new file mode 100644 (file)
index 0000000..ad61812
Binary files /dev/null and b/LCARStrek/messenger/addressbook/icons/im-disabled.gif differ

diff --git a/LCARStrek/messenger/addressbook/icons/im-hover.gif b/LCARStrek/messenger/addressbook/icons/im-hover.gif
new file mode 100644 (file)
index 0000000..743444d
Binary files /dev/null and b/LCARStrek/messenger/addressbook/icons/im-hover.gif differ

diff --git a/LCARStrek/messenger/addressbook/icons/im.gif b/LCARStrek/messenger/addressbook/icons/im.gif
new file mode 100644 (file)
index 0000000..2a8a825
Binary files /dev/null and b/LCARStrek/messenger/addressbook/icons/im.gif differ

diff --git a/LCARStrek/messenger/addressbook/icons/secure-remote-addrbook.gif b/LCARStrek/messenger/addressbook/icons/secure-remote-addrbook.gif
new file mode 100644 (file)
index 0000000..6a01f62
Binary files /dev/null and b/LCARStrek/messenger/addressbook/icons/secure-remote-addrbook.gif differ

diff --git a/LCARStrek/messenger/folderMenus.css b/LCARStrek/messenger/folderMenus.css
index 1d87a20c4eb7154248e7679ce622ccd2139bb9ff..d3c6d48498b0e0e41d496ad1eaf5504b58a40cb2 100644 (file)
--- a/LCARStrek/messenger/folderMenus.css
+++ b/LCARStrek/messenger/folderMenus.css
@@ -102,6 +102,14 @@
   list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
 }
 
+.folderMenuItem[SpecialFolder="Junk"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+}
+
+.folderMenuItem[SpecialFolder="Junk"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+}
+
 .folderMenuItem[IsServer="true"] {
   list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }

diff --git a/LCARStrek/messenger/folderPane.css b/LCARStrek/messenger/folderPane.css
index 2dd9673a884a5b0dee3264c9055526e2258c3544..b8fe03b3aaf6ebe742d6ba6b80f29039f829e50a 100644 (file)
--- a/LCARStrek/messenger/folderPane.css
+++ b/LCARStrek/messenger/folderPane.css
@@ -96,6 +96,13 @@ treechildren:-moz-tree-image(folderNameCol, specialFolder-Templates) {
   list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
 }
 
+/* ..... Junk ..... */
+
+treechildren:-moz-tree-image(folderNameCol, specialFolder-Junk) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+}
+
 /* ..... Trash ..... */
 
 treechildren:-moz-tree-image(folderNameCol, specialFolder-Trash) {
@@ -197,7 +204,7 @@ treechildren:-moz-tree-image(syncCol, isServer-true) {
   border: none;
 }
 
-#folderUnreadCol,
-#folderTotalCol {
+#folderTotalCol,
+#folderSizeCol {
   text-align: right;
 }

diff --git a/LCARStrek/messenger/icons/folder-junk.gif b/LCARStrek/messenger/icons/folder-junk.gif
new file mode 100644 (file)
index 0000000..5050f62
Binary files /dev/null and b/LCARStrek/messenger/icons/folder-junk.gif differ

diff --git a/LCARStrek/messenger/icons/message-junk-other.gif b/LCARStrek/messenger/icons/message-junk-other.gif
new file mode 100644 (file)
index 0000000..8b18c2e
Binary files /dev/null and b/LCARStrek/messenger/icons/message-junk-other.gif differ

diff --git a/LCARStrek/messenger/icons/message-mail-imapdelete-offline.gif b/LCARStrek/messenger/icons/message-mail-imapdelete-offline.gif
index 34e8ee5e07bdfcf5b92c7d950c880ad8ecfce2e4..83b75ed549007f6f3159af2576bb84b607a3e1d6 100644 (file)
Binary files a/LCARStrek/messenger/icons/message-mail-imapdelete-offline.gif and b/LCARStrek/messenger/icons/message-mail-imapdelete-offline.gif differ

diff --git a/LCARStrek/messenger/icons/message-mail-imapdelete.gif b/LCARStrek/messenger/icons/message-mail-imapdelete.gif
index 57e3d16edc816b1d6eb9392993623a9aa4cad9a0..d16051d25c676db1f216fcc7ef4e6c7c43138ad3 100755 (executable)
Binary files a/LCARStrek/messenger/icons/message-mail-imapdelete.gif and b/LCARStrek/messenger/icons/message-mail-imapdelete.gif differ

diff --git a/LCARStrek/messenger/primaryToolbar.css b/LCARStrek/messenger/primaryToolbar.css
index a4a0d1b10e8ee445a19634959c445710eb69fa67..5a293fdebb070ec882b3d328998a2502082b044b 100644 (file)
--- a/LCARStrek/messenger/primaryToolbar.css
+++ b/LCARStrek/messenger/primaryToolbar.css
@@ -193,16 +193,16 @@
 }
 
 #button-junk {
-  list-style-image: url("chrome://messenger/skin/toolbar/mark.gif");
+  list-style-image: url("chrome://messenger/skin/toolbar/junk.gif");
 }
 
 #button-junk:hover,
 #button-junk[buttonover="true"],
 #button-junk[buttondown="true"],
 #button-junk[open="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/mark-hover.gif");
+  list-style-image: url("chrome://messenger/skin/toolbar/junk-hover.gif");
 } 
 
 #button-junk[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/mark-disabled.gif") !important;
+  list-style-image: url("chrome://messenger/skin/toolbar/junk-disabled.gif") !important;
 }

diff --git a/LCARStrek/messenger/threadPane.css b/LCARStrek/messenger/threadPane.css
index c380c226ba45cacc15168eb907b8cc566c2b3370..bffd33e9a02e5f9f5f8bced80ff60fdbfd52b986 100644 (file)
--- a/LCARStrek/messenger/threadPane.css
+++ b/LCARStrek/messenger/threadPane.css
@@ -170,6 +170,25 @@ treechildren:-moz-tree-image(flaggedCol, flagged) {
   list-style-image: url("chrome://messenger/skin/icons/flaggedmail.gif");
 }
 
+/* ..... junkStatus column ..... */
+
+treecol.junkStatusHeader {
+  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
+}
+
+/* "unknown" now looks like "not junk".  see bug #182386 */
+treechildren:-moz-tree-image(junkStatusCol) {
+  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+}
+
+treechildren:-moz-tree-image(junkStatusCol, junk) {
+  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
+}
+
+treechildren:-moz-tree-image(junkStatusCol, notjunk) {
+  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+}
+
 /* ..... subject column ..... */
 
 treechildren:-moz-tree-image(subjectCol) {

diff --git a/LCARStrek/messenger/toolbar/junk-disabled.gif b/LCARStrek/messenger/toolbar/junk-disabled.gif
new file mode 100644 (file)
index 0000000..289dae9
Binary files /dev/null and b/LCARStrek/messenger/toolbar/junk-disabled.gif differ

diff --git a/LCARStrek/messenger/toolbar/junk-hover.gif b/LCARStrek/messenger/toolbar/junk-hover.gif
new file mode 100644 (file)
index 0000000..8e1943a
Binary files /dev/null and b/LCARStrek/messenger/toolbar/junk-hover.gif differ

diff --git a/LCARStrek/messenger/toolbar/junk.gif b/LCARStrek/messenger/toolbar/junk.gif
new file mode 100644 (file)
index 0000000..6e72617
Binary files /dev/null and b/LCARStrek/messenger/toolbar/junk.gif differ

diff --git a/LCARStrek/navigator/icons/popup-blocked.gif b/LCARStrek/navigator/icons/popup-blocked.gif
new file mode 100644 (file)
index 0000000..69b0481
Binary files /dev/null and b/LCARStrek/navigator/icons/popup-blocked.gif differ

diff --git a/LCARStrek/navigator/navigator.css b/LCARStrek/navigator/navigator.css
index a44f1872aab82ff1c912727c5d396b56d1eb6e77..087ac685de55a2c5b4e6174b47b4b94d292e0c9d 100644 (file)
--- a/LCARStrek/navigator/navigator.css
+++ b/LCARStrek/navigator/navigator.css
@@ -314,6 +314,10 @@ toolbar[toolbarmode="small"] > toolbargrippy {
   list-style-image:url("chrome://communicator/skin/icons/lock-broken.gif");
 }
 
+#popupIcon {
+  list-style-image:url("chrome://navigator/skin/icons/popup-blocked.gif");
+}
+
 /* ::::: personal toolbar ::::: */
 
 #bookmarks-button {