sync with EarlyBlue development and prepare 1.8 release

diff --git a/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css
index 7e9524019fa86b668c084d1dc08f18ca72031202..68f244fd1a118e3c179ea1c0d54e6cc7ca307821 100644 (file)
--- a/LCARStrek/communicator/communicator.css
+++ b/LCARStrek/communicator/communicator.css
@@ -60,7 +60,7 @@
 #offline-status {
   list-style-image: url("chrome://communicator/skin/icons/online.gif");
 }
-  
+
 /* ::::: directional button icons ::::: */
 
 .up {
@@ -87,6 +87,24 @@
 }
 
 /* ::::: download manager ::::: */
+
 #downloadView > treechildren::-moz-tree-image(Name) {
   margin-right: 2px;
 }
+
+/* :::::: autoscroll popup ::::: */
+
+#autoscroller {
+  height: 28px;
+  width: 28px;
+  border: 0px;
+  margin: -14px;
+  padding: 0px;
+  background-image: url("chrome://communicator/skin/icons/autoscroll.gif");
+}
+#autoscroller[scrolldir="NS"] {
+  background-image: url("chrome://communicator/skin/icons/autoscroll-ns.gif");
+}
+#autoscroller[scrolldir="EW"] {
+  background-image: url("chrome://communicator/skin/icons/autoscroll-ew.gif");
+}

diff --git a/LCARStrek/communicator/icons/autoscroll-ew.gif b/LCARStrek/communicator/icons/autoscroll-ew.gif
new file mode 100644 (file)
index 0000000..05d252e
Binary files /dev/null and b/LCARStrek/communicator/icons/autoscroll-ew.gif differ

diff --git a/LCARStrek/communicator/icons/autoscroll-ns.gif b/LCARStrek/communicator/icons/autoscroll-ns.gif
new file mode 100644 (file)
index 0000000..583cc51
Binary files /dev/null and b/LCARStrek/communicator/icons/autoscroll-ns.gif differ

diff --git a/LCARStrek/communicator/icons/autoscroll.gif b/LCARStrek/communicator/icons/autoscroll.gif
new file mode 100644 (file)
index 0000000..7108e6c
Binary files /dev/null and b/LCARStrek/communicator/icons/autoscroll.gif differ

diff --git a/LCARStrek/contents.rdf b/LCARStrek/contents.rdf
index 0778e205f5c02ac2ea5bb48c0bf1489b54314280..d426716c1995166f240681fa72673b244052d748 100644 (file)
--- a/LCARStrek/contents.rdf
+++ b/LCARStrek/contents.rdf
@@ -5,42 +5,42 @@
 
   <!-- List all the skins being supplied by this theme -->
   <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a" />
+    <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8" />
   </RDF:Seq>
 
   <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a"
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8"
         chrome:displayName="LCARStrek"
         chrome:accessKey="L"
         chrome:author="Robert Kaiser - KaiRo.at"
         chrome:description="For all Trekkies: A theme based on LCARS computer design. Get more info at http://www.kairo.at/download/"
-        chrome:name="LCARStrek/1.8a"
+        chrome:name="LCARStrek/1.8"
         chrome:image="global/preview.png">
     <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:LCARStrek/1.8a:packages">
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:global"/>
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:communicator"/>
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:navigator"/>
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:messenger"/>
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:editor"/>
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:chatzilla"/>
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:inspector"/>
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:browser"/>
-        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8a:mozapps"/>
+      <RDF:Seq about="urn:mozilla:skin:LCARStrek/1.8:packages">
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:global"/>
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:communicator"/>
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:navigator"/>
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:messenger"/>
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:editor"/>
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:chatzilla"/>
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:inspector"/>
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:browser"/>
+        <RDF:li resource="urn:mozilla:skin:LCARStrek/1.8:mozapps"/>
       </RDF:Seq>
     </chrome:packages>
   </RDF:Description>
 
   <!-- Version Information.  State that we work only with a certain version of this package. -->
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:global" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:communicator" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:navigator" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:messenger" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:editor" chrome:skinVersion="1.5"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:global" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:communicator" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:navigator" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:messenger" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:editor" chrome:skinVersion="1.8"/>
 <!-- chatzilla hasn't set skinVersion currently
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:chatzilla" chrome:skinVersion="1.5"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:chatzilla" chrome:skinVersion="1.8"/>
 -->
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:inspector" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:browser" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8a:mozapps" chrome:skinVersion="1.5"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:inspector" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:browser" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:LCARStrek/1.8:mozapps" chrome:skinVersion="1.8"/>
 </RDF:RDF>

diff --git a/LCARStrek/global/autocomplete.css b/LCARStrek/global/autocomplete.css
index 862405f828623505dc808352cb87ac87b61eb528..1d450ac98c8b3290214982fd98e3377283386474 100644 (file)
--- a/LCARStrek/global/autocomplete.css
+++ b/LCARStrek/global/autocomplete.css
@@ -91,7 +91,7 @@ textbox {
 }
 
 .autocomplete-history-popup {
-  max-height: 180px;
+  max-height: 25em;
 }
 
 /* ::::: tree ::::: */

diff --git a/LCARStrek/global/browser.css b/LCARStrek/global/browser.css
index 450d863da53b4041760f40c4553c9761e6b2b514..7999f5b57ce8b8c4736c6d60903633cea2a3d14d 100644 (file)
--- a/LCARStrek/global/browser.css
+++ b/LCARStrek/global/browser.css
@@ -94,4 +94,19 @@ tabbrowser > tabbox > tabpanels {
   margin-right: 1px;
   padding: 0px;
   list-style-image: url("chrome://global/skin/icons/tab-new.gif");
-}
\ No newline at end of file
+}
+
+.tab-drop-indicator-bar {
+  height: 11px;
+  margin-top: -11px;
+  margin-left: -8px;
+  position: relative;
+}
+
+.tab-drop-indicator {
+  height: 11px;
+  width: 11px;
+  margin-bottom: -8px;
+  position: relative;
+  list-style-image: url('chrome://global/skin/icons/tab-drag-indicator.gif');
+}

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 895e5802ef40cc29567f5d84a86c9c3e5c2eb82f..5d70b13567161fee18af93c858ea7f2abae4630c 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -62,7 +62,7 @@ menulist > menupopup,
 }
 
 .menulist-compact {
-  -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact");
 }
 
 /* LCARStrek special bindings */
@@ -197,3 +197,7 @@ resizer[dir="bottomright"] {
 .toolbar-focustarget {
   -moz-user-focus: ignore !important;
 }
+
+description.error {
+  color: #FF0000;
+}

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index 4fdab86f3f32311339574d9b947ad775c322c497..9c3c8a7fbc1f4dceb7cdf1c0494d2e18709b648f 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -39,6 +39,17 @@
     </content>
   </binding>
 
+  <binding id="menulist-compact" display="xul:menu"
+           extends="chrome://global/content/bindings/menulist.xml#menulist">
+    <content sizetopopup="false">
+      <xul:hbox class="menulist-label-box" flex="1">
+        <xul:image class="menulist-icon" xbl:inherits="src"/>
+        <xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
+      </xul:hbox>
+      <children includes="menupopup"/>
+    </content>
+  </binding>
+
 
   <binding id="statusbar" extends="xul:statusbar">
     <content>

diff --git a/LCARStrek/global/icons/tab-drag-indicator.gif b/LCARStrek/global/icons/tab-drag-indicator.gif
new file mode 100644 (file)
index 0000000..464bdd4
Binary files /dev/null and b/LCARStrek/global/icons/tab-drag-indicator.gif differ

diff --git a/LCARStrek/global/menulist.css b/LCARStrek/global/menulist.css
index 0742b2c896c3aedb0a7801796bff1476ce742237..7da4ac5bb39c596cbcab16b04d033db0b2fd7c19 100644 (file)
--- a/LCARStrek/global/menulist.css
+++ b/LCARStrek/global/menulist.css
@@ -168,13 +168,37 @@ html|*.menulist-editable-input {
   -moz-box-pack: center;
   margin: 0px;
   border: 1px solid #9C9CFF;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+}
+
+.menulist-compact > .menulist-label-box {
+  border: 1px solid transparent;
+  background-color: transparent;
+  color: inherit;
 }
 
-.menulist-compact > .menulist-label {
+.menulist-compact > .menulist-label-box > .menulist-label {
   margin: 0 3px !important;
   text-align: right;
 }
 
+.menulist-compact > .menulist-label-box > .menulist-icon {
+  margin-left: 2px;
+}
+
 .menulist-compact[open="true"] {
   border: 1px solid #FFCF00;
 }
+
+.menulist-compact:hover,
+.menulist-compact[open="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
+}
+
+.menulist-compact[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
+}
+
+.menulist-compact:focus > .menulist-label-box {
+  border: 1px dotted #008484;
+}

diff --git a/LCARStrek/global/netError.css b/LCARStrek/global/netError.css
index 4acba0d519d57fbb3776bae9597d2a723e652e2a..286f8b6e22a3fe526a51eda74d56df55b318407c 100644 (file)
--- a/LCARStrek/global/netError.css
+++ b/LCARStrek/global/netError.css
@@ -64,6 +64,7 @@ body[dir="rtl"] #errorPageContainer {
 }
 
 #errorShortDesc > p {
+  overflow: auto;
   border-bottom: 1px solid #008484;
   padding-bottom: 1em;
   font-size: 130%;
@@ -98,3 +99,7 @@ body[dir="rtl"] #brand {
 #brand > p {
   margin: 0;
 }
+
+#errorContainer {
+  display: none;
+}

diff --git a/LCARStrek/global/scrollbars.css b/LCARStrek/global/scrollbars.css
index 7df7d7a8b9af369b3f4c21b8dde2d55efbc87278..d53df486a3605c0c904b160073a95ae6c92b6b29 100644 (file)
--- a/LCARStrek/global/scrollbars.css
+++ b/LCARStrek/global/scrollbars.css
@@ -115,6 +115,7 @@ scrollcorner {
   -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar-base");
   cursor: default;
   background-color: #000000;
+  width: 13px;
 }
 
 /* ..... increment .... */

diff --git a/LCARStrek/global/splitter.css b/LCARStrek/global/splitter.css
index bdc8c9a1eb1ad87a95081ae9aea35d6c0fdeed5e..70a2c58528dbb0def4f64faee38575179fc3fd00 100644 (file)
--- a/LCARStrek/global/splitter.css
+++ b/LCARStrek/global/splitter.css
@@ -46,13 +46,13 @@
 splitter {
   -moz-box-align: center;
   -moz-box-pack: center;
-  cursor: e-resize;
+  cursor: ew-resize;
   border: none;
   border-top: 3px solid black;
   border-bottom: 3px solid black;
   min-width: 6px;
   background-color: #9C9CFF;
-  margin: 0px 3px 0px 3px; 
+  margin: 0px 3px 0px 3px;
 }
 
 splitter[state="dragging"],
@@ -60,7 +60,7 @@ splitter:hover:active {
   background-color: #FFCF00;
 }
 
-/* This takes margin away from outliner header splitters, else they look ugly! */  
+/* This takes margin away from outliner header splitters, else they look ugly! */
 splitter.tree-splitter {
   margin: 0px;
 }
@@ -68,7 +68,7 @@ splitter.tree-splitter {
 /* ::::: splitter (horizontal) ::::: */
 
 splitter[orient="vertical"] {
-  cursor: n-resize;
+  cursor: ns-resize;
   border: none;
   border-left: 3px solid black;
   border-right: 3px solid black;

diff --git a/LCARStrek/messenger/filterDialog.css b/LCARStrek/messenger/filterDialog.css
index c33e225a4696f91cd523592106580f54b20ba702..2a09fab18ee068dc37fa8a199d6d5380bc1de809 100644 (file)
--- a/LCARStrek/messenger/filterDialog.css
+++ b/LCARStrek/messenger/filterDialog.css
@@ -81,5 +81,9 @@ textbox {
 }
 
 .ruleactionitem {
+  min-width: 20em;
+}
+
+.ruleaction-type {
   min-width: 15em;
 }

diff --git a/LCARStrek/messenger/mailWindow1.css b/LCARStrek/messenger/mailWindow1.css
index c0b5725f1d59efec98ee0446998861a5c85ce5ab..2dc9c34c2748b6285f1f6291e15bbe2c6a6fef3d 100644 (file)
--- a/LCARStrek/messenger/mailWindow1.css
+++ b/LCARStrek/messenger/mailWindow1.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
  *   Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
@@ -63,8 +63,22 @@
   border: none;
 }
 
+/* XXX bug 313731 buttons are taller than menulists */
+
+#msgLocationToolbar > #searchBox[collapsed="true"] {
+  visibility: hidden;
+}
+
+#locationIcon {
+  list-style-image: none;
+}
+
+#locationFolders {
+  width: 20em;
+}
+
 /* ..... tree adjustments ..... */
- 
+
 #folderTree {
   min-width: 1px;
   border: none;

diff --git a/LCARStrek/messenger/messengercompose/messengercompose.css b/LCARStrek/messenger/messengercompose/messengercompose.css
index 0ec6aedce34152fe9622fef999881adb10edb76d..7498a4cbdddbad35177dda8ecadb49b9849022e1 100644 (file)
--- a/LCARStrek/messenger/messengercompose/messengercompose.css
+++ b/LCARStrek/messenger/messengercompose/messengercompose.css
@@ -172,15 +172,6 @@ treechildren::-moz-tree-image(remote-err) {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.gif");
 }
 
-.identity-popup-item {
-  -moz-binding: url("chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem");
-}
-
-.composemenu-text-2 {
-  font-style: italic;
-  color: #8050B0;
-}
-
 /* ::::: LCARStrek layout corrections ::::: */
 
 #msgheaderstoolbar-box {