From c1f7cc847f45047fb26e27daed4a3e24d9ad2f25 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 22 Aug 2011 01:28:18 +0200
Subject: [PATCH] update diff script for rapid release and update both themes
 to the state of SeaMonkey 2.2 and Firefox 5

---
 EarlyBlue/communicator/toolbar.css            |   4 +
 EarlyBlue/install.rdf                         |   2 +-
 .../message-news-attach-kill-offline.gif      | Bin 0 -> 125 bytes
 .../icons/message-news-attach-kill.gif        | Bin 0 -> 125 bytes
 .../icons/message-news-kill-offline.gif       | Bin 0 -> 119 bytes
 .../messenger/icons/message-news-kill.gif     | Bin 0 -> 119 bytes
 EarlyBlue/messenger/threadPane.css            |  20 +++
 EarlyBlue/mozapps/extensions/extensions.css   |  12 +-
 EarlyBlue/navigator/navigator.css             |   8 +-
 LCARStrek/browser/browser.css                 |  22 +--
 LCARStrek/browser/tabview/tabview.css         |  17 ++-
 LCARStrek/communicator/toolbar.css            |   4 +
 LCARStrek/global/aboutMemory.css              |  14 ++
 LCARStrek/global/globalBindings.xml           |  30 ++++
 LCARStrek/install.rdf                         |   4 +-
 .../message-news-attach-kill-offline.gif      | Bin 0 -> 125 bytes
 .../icons/message-news-attach-kill.gif        | Bin 0 -> 125 bytes
 .../icons/message-news-kill-offline.gif       | Bin 0 -> 119 bytes
 .../messenger/icons/message-news-kill.gif     | Bin 0 -> 119 bytes
 LCARStrek/messenger/threadPane.css            |  20 +++
 LCARStrek/mozapps/extensions/extensions.css   |  12 +-
 LCARStrek/navigator/navigator.css             |   8 +-
 origdiff                                      | 129 ++++++++++--------
 origdiff2                                     |  72 ++++++++++
 24 files changed, 288 insertions(+), 90 deletions(-)
 create mode 100644 EarlyBlue/messenger/icons/message-news-attach-kill-offline.gif
 create mode 100644 EarlyBlue/messenger/icons/message-news-attach-kill.gif
 create mode 100644 EarlyBlue/messenger/icons/message-news-kill-offline.gif
 create mode 100644 EarlyBlue/messenger/icons/message-news-kill.gif
 create mode 100644 LCARStrek/messenger/icons/message-news-attach-kill-offline.gif
 create mode 100644 LCARStrek/messenger/icons/message-news-attach-kill.gif
 create mode 100644 LCARStrek/messenger/icons/message-news-kill-offline.gif
 create mode 100644 LCARStrek/messenger/icons/message-news-kill.gif
 create mode 100755 origdiff2

diff --git a/EarlyBlue/communicator/toolbar.css b/EarlyBlue/communicator/toolbar.css
index 420a40fa..1600cc2e 100644
--- a/EarlyBlue/communicator/toolbar.css
+++ b/EarlyBlue/communicator/toolbar.css
@@ -43,6 +43,10 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+toolbar[type="menubar"]:not([autohide="true"]):not([xpfe="false"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
+  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-drag");
+}
+
 /* ::::: toolbar & menubar ::::: */
 
 .toolbar-holder {
diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf
index dc0684cf..8d0e6bf4 100644
--- a/EarlyBlue/install.rdf
+++ b/EarlyBlue/install.rdf
@@ -12,7 +12,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>
-        <em:maxVersion>2.4a1</em:maxVersion>
+        <em:maxVersion>2.6a1</em:maxVersion>
       </Description>
     </em:targetApplication>
 
diff --git a/EarlyBlue/messenger/icons/message-news-attach-kill-offline.gif b/EarlyBlue/messenger/icons/message-news-attach-kill-offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..68072c845374188290da14b91d46dc0216ed40fd
GIT binary patch
literal 125
zcmZ?wbhEHb6krfwIK;w`mNxUunKNl=XZ|xV{6_+cKUo+V7+4r|7=QqzmVw#HW7nN^
z3j5faSp7Q!l&_z?7CZGq!Hd+HXDrs~{>syNxXd}O{Cxszv#TrXpPx+v{tgecnI!E`
TUp#RkV&;{TO6^y&gc+;>T+269

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/icons/message-news-attach-kill.gif b/EarlyBlue/messenger/icons/message-news-attach-kill.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e8248fa6ed693edf5a5a4d4a9041080343a49c38
GIT binary patch
literal 125
zcmZ?wbhEHb6krfwIK;@1mNxVM|Nm)eXZ|xV02y$g_>+Z^fq{iVhXDvcY8jZFJa*k#
zr?8K$iPgU&K>7OFYq3)=6ud~CdB$R$?yo$ZhszEw(7$UFVac%}>8EJ3nZHAFj$Xro
U`GTGoB4%FXbT+?GCCp$A0F~!9hX4Qo

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/icons/message-news-kill-offline.gif b/EarlyBlue/messenger/icons/message-news-kill-offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..37dced13dcc3509cd1b498f80414099398e79c56
GIT binary patch
literal 119
zcmZ?wbhEHb6krfwIK;w`mNqjj?F<n7XJGh`1QdU=FfuT(Fz7G<0Z1(avyI2DJO2cj
z4m9nZ?z5`t$Aj&@u^K(em2)#vH!ayc&-reJqCrEm&b#@s>s5pp`nhG!pYTr7aY#-H
Ll=hS7WUvMR9LF)B

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/icons/message-news-kill.gif b/EarlyBlue/messenger/icons/message-news-kill.gif
new file mode 100644
index 0000000000000000000000000000000000000000..854b8c704c10290c62fa93856b23870b45736996
GIT binary patch
literal 119
zcmZ?wbhEHb6krfwIK;$|mNqjj?aY55U|;}|FrfI8g^_`Qg+Ye_2taBXm~A|E-T5cL
zbf9VPbe~mCKOSuNjn(K$uAG~Zx@pPodCqq$6b%}hb>7X7U9Td<(9bP%{)Bgujze-v
LptPSnCxbNrR~j-m

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/threadPane.css b/EarlyBlue/messenger/threadPane.css
index a2293c25..ab34fb87 100644
--- a/EarlyBlue/messenger/threadPane.css
+++ b/EarlyBlue/messenger/threadPane.css
@@ -258,6 +258,11 @@ treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill.gif");
+}
+
 .tabmail-tab[type="message"][MessageType="rss"][Attachment="true"],
 .tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
@@ -265,6 +270,11 @@ tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attac
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach.gif");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill.gif");
+}
+
 .tabmail-tab[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
 .tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
@@ -272,6 +282,11 @@ tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attac
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offline.gif");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill-offline.gif");
+}
+
 treechildren::-moz-tree-image(subjectCol, rss, new),
 treechildren::-moz-tree-image(subjectCol, news, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
@@ -296,6 +311,11 @@ treechildren::-moz-tree-image(subjectCol, news, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-offline.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, offline, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill-offline.gif");
+}
+
 /* ..... new thread icons for watch and ignore ..... */
 
 treechildren::-moz-tree-image(news, threadCol, watch) {
diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css
index bf2e8662..c97408c8 100644
--- a/EarlyBlue/mozapps/extensions/extensions.css
+++ b/EarlyBlue/mozapps/extensions/extensions.css
@@ -35,6 +35,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
 #addons-page {
   background-color: #CCD0DD;
   color: #000000;
@@ -52,7 +54,6 @@
 
 .nav-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  min-width: 0;
 }
 
 #forward-btn {
@@ -320,14 +321,13 @@
   color: #808080;
 }
 
-#header-search[focused="true"] {
+#header-search[focused] {
   background-color: #FFFFFF;
 }
 
 #header-utils-btn {
-  min-width: 4.5em;
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.png");
-  -moz-margin-end: 18px;
+  -moz-margin-end: 16px;
 }
 
 .view-header {
@@ -475,6 +475,7 @@
   color: #404040;
   margin-bottom: 0;
   -moz-box-align: end;
+  -moz-box-flex: 1;
 }
 
 .creator {
@@ -486,7 +487,6 @@
 }
 
 .description-container {
-  margin-top: 8px;
   -moz-margin-start: 6px;
   -moz-box-align: center;
 }
@@ -513,11 +513,11 @@
   -moz-box-align: stretch;
 }
 
+.advancedinfo-container,
 .update-info-container {
   -moz-box-align: center;
 }
 
-.advancedinfo-container,
 .update-available {
   -moz-box-align: end;
 }
diff --git a/EarlyBlue/navigator/navigator.css b/EarlyBlue/navigator/navigator.css
index 62311ce7..44b63705 100644
--- a/EarlyBlue/navigator/navigator.css
+++ b/EarlyBlue/navigator/navigator.css
@@ -254,7 +254,9 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
 .popup-notification-icon[popupid="addon-install-started"],
 .popup-notification-icon[popupid="addon-install-cancelled"],
 .popup-notification-icon[popupid="addon-install-failed"],
-.popup-notification-icon[popupid="addon-install-complete"] {
+.popup-notification-icon[popupid="addon-install-complete"],
+.popup-notification-icon[popupid="lwtheme-install-request"],
+.popup-notification-icon[popupid="lwtheme-install-notification"] {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
   width: 32px;
   height: 32px;
@@ -391,6 +393,10 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
   font-weight: bold;
 }
 
+#search-button > .button-box > .button-icon {
+  display: -moz-box;
+}
+
 /*
 toolbar[mode="text"] #search-button > .button-box > .button-icon,
 toolbar[mode="icons"] #search-button > .button-box > .button-text {
diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 4be20425..708a139c 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1126,6 +1126,7 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 #urlbar {
   width: 7em;
   min-width: 7em;
+  color: #FFBFFF;
 }
 
 #urlbar,
@@ -1188,13 +1189,8 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 }
 
 #urlbar-display {
-  margin-top: -2px;
-  margin-bottom: -2px;
   -moz-border-end: 1px solid #9C9CFF;
   -moz-margin-end: 3px;
-}
-
-#urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
   color: #8050B0;
@@ -1293,7 +1289,7 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
   list-style-image: url("chrome://browser/skin/places/bookmark.png");
   -moz-image-region: rect(0px 16px 16px 0px);
-  width: 16px; 
+  width: 16px;
   height: 16px;
 }
 
@@ -1308,7 +1304,7 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 .ac-result-type-tag,
 .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
   list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
-  width: 16px; 
+  width: 16px;
   height: 16px;
 }
 
@@ -1339,8 +1335,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   color: inherit !important;
 }
 
-.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment), 
-.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment) 
+.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
+.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment)
 {
   color: #8050B0;
   font-size: smaller;
@@ -1521,7 +1517,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #TabsToolbar .toolbar-holder {
-  background-color: #000000; /* correct effect of being an actal toolbar */
+  background-color: #000000; /* correct effect of being an actual toolbar */
 }
 
 #main-window[disablechrome] #TabsToolbar,
@@ -1679,7 +1675,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 .tabs-newtab-button {
-  width: 31px;
+  width: 28px;
+}
+
+#TabsToolbar > #new-tab-button {
+  width: 26px;
 }
 
 .tabs-newtab-button:hover,
diff --git a/LCARStrek/browser/tabview/tabview.css b/LCARStrek/browser/tabview/tabview.css
index 4f4885c1..b36bc6f4 100644
--- a/LCARStrek/browser/tabview/tabview.css
+++ b/LCARStrek/browser/tabview/tabview.css
@@ -251,9 +251,12 @@ html[dir=rtl] .appTabTrayContainer {
 
 .undo {
   background-color: #8050B0;
-  width: 150px;
-  height: 30px;
-  line-height: 30px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 20px;
+  width: 135px;
+  line-height: 25px;
   box-shadow: 0px 1px 0px #9F9FCC, 0px -1px 0px #008484;
   color: #FFCF00;
   border-radius: 0.4em;
@@ -268,14 +271,14 @@ html[dir=rtl] .appTabTrayContainer {
 }
 
 .undo .close {
-  top: 4px;
-  left: 4px;
+  top: 7px;
+  right: 7px;
   opacity: 0.5;
 }
 
 html[dir=rtl] .undo .close {
-  left: auto;
-  right: 4px;
+  right: auto;
+  left: 7px;
 }
 
 .undo .close:hover{
diff --git a/LCARStrek/communicator/toolbar.css b/LCARStrek/communicator/toolbar.css
index 70881a8f..56de65c4 100644
--- a/LCARStrek/communicator/toolbar.css
+++ b/LCARStrek/communicator/toolbar.css
@@ -41,6 +41,10 @@
   == Styles used by XUL grippytoolbar in addition to general toolbar styles.
   ======================================================================= */
 
+toolbar[type="menubar"]:not([autohide="true"]):not([xpfe="false"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#grippytoolbar-drag");
+}
+
 /* ::::: primary toolbar ::::: */
 
 .toolbar-primary > .toolbar-box > .toolbar-holder {
diff --git a/LCARStrek/global/aboutMemory.css b/LCARStrek/global/aboutMemory.css
index f914608b..2146aa70 100644
--- a/LCARStrek/global/aboutMemory.css
+++ b/LCARStrek/global/aboutMemory.css
@@ -1 +1,15 @@
 @import url("chrome://global/content/aboutMemory.css");
+
+/* correct horrible colors for black background */
+
+.mrValue {
+  color: #E7ADE7;
+}
+
+.mrPerc {
+  color: #008484;
+}
+
+.mrName {
+  color: #9C9CFF;
+}
diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index 8ff632b6..bb672be3 100755
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -128,6 +128,21 @@
     </content>
   </binding>
 
+  <binding id="grippytoolbar-drag" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-drag">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
   <binding id="grippytoolbar-primary" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary">
     <content>
       <xul:hbox flex="1" class="toolbar-box">
@@ -143,6 +158,21 @@
     </content>
   </binding>
 
+  <binding id="grippytoolbar-primary-drag" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary-drag">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
   <binding id="grippymenubar" extends="chrome://communicator/content/bindings/toolbar.xml#grippymenubar">
     <resources>
       <stylesheet src="chrome://global/skin/toolbar.css"/>
diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf
index ff85d49a..9a495084 100644
--- a/LCARStrek/install.rdf
+++ b/LCARStrek/install.rdf
@@ -12,7 +12,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>
-        <em:maxVersion>2.4a1</em:maxVersion>
+        <em:maxVersion>2.6a1</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- Firefox -->
@@ -20,7 +20,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>7.0a1</em:maxVersion>
+        <em:maxVersion>9.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>
 
diff --git a/LCARStrek/messenger/icons/message-news-attach-kill-offline.gif b/LCARStrek/messenger/icons/message-news-attach-kill-offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..df181dae493151b4e6be5869b9a9e62b38443dfe
GIT binary patch
literal 125
zcmZ?wbhEHb6krfwIK;xx5U}C@e1<u5{{LrS_>Tk>f3h$#Ft9M_FaQBaEd#TY$F4i;
z6!x(-vHEueC|^H&Eq3aKf)}YX&seO}{gtQlaG7&l`TGRcW>;6%KR=rU{2d->GfCQ?
UzIft7#LO!vmD;al2{Tv&09Q0ONB{r;

literal 0
HcmV?d00001

diff --git a/LCARStrek/messenger/icons/message-news-attach-kill.gif b/LCARStrek/messenger/icons/message-news-attach-kill.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0d94af333c21ae3525d289bca490d05903ccc2ed
GIT binary patch
literal 125
zcmZ?wbhEHb6krfwIK;xx5U}C@d4@T2{{LrS_>Tk>f3h$#Ft9M_FaQBaEd#TY$F4i;
z6!x(-vHEueC|^H&Eq3aKf)}YX&seO}{gtQlaM{5H`gd(2EIBqL{S<9B^LI$j(Q7y`
TU(oYH#LSDF&gK`Ygc+;>Wm+~B

literal 0
HcmV?d00001

diff --git a/LCARStrek/messenger/icons/message-news-kill-offline.gif b/LCARStrek/messenger/icons/message-news-kill-offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0b3b15fd51b03232ac643c515b0aafb7a5ec40e2
GIT binary patch
literal 119
zcmZ?wbhEHb6krfwIK;xx5U^p+od5slGyG>@_>Tk>f3h$#Ft9M_FaQBaEd#TS$F4j7
z1egvq?Vawks_Dmr?Y^-ZJ;{}GGg3D#**(wsZiS*jL$l7i`LXL&gc$m{WzL`QPSSBm
NP6?Fuljmfx1^^qUF_ZuR

literal 0
HcmV?d00001

diff --git a/LCARStrek/messenger/icons/message-news-kill.gif b/LCARStrek/messenger/icons/message-news-kill.gif
new file mode 100644
index 0000000000000000000000000000000000000000..28347c18f809782b6932ed3b29cc67594f1ce05a
GIT binary patch
literal 119
zcmZ?wbhEHb6krfwIK;xx5U^p+od5sNGyG>@_>Tk>f3h$#Ft9M_FaQBaEd#TS$F4j7
z1egvq?Vawks_Dmr?Y^-ZJ;{}GGg3D#**(wsZiS*jL$l7i`LXL&gc$m{WzL`QPSSBm
NP6?Fuljmfx1^_NMF~k4>

literal 0
HcmV?d00001

diff --git a/LCARStrek/messenger/threadPane.css b/LCARStrek/messenger/threadPane.css
index f58462d6..6b9b73e1 100644
--- a/LCARStrek/messenger/threadPane.css
+++ b/LCARStrek/messenger/threadPane.css
@@ -262,6 +262,11 @@ treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill.gif");
+}
+
 .tabmail-tab[type="message"][MessageType="rss"][Attachment="true"],
 .tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
@@ -269,6 +274,11 @@ tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attac
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach.gif");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill.gif");
+}
+
 .tabmail-tab[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
 .tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
@@ -276,6 +286,11 @@ tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attac
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offline.gif");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill-offline.gif");
+}
+
 treechildren::-moz-tree-image(subjectCol, rss, new),
 treechildren::-moz-tree-image(subjectCol, news, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
@@ -296,6 +311,11 @@ treechildren::-moz-tree-image(subjectCol, news, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-offline.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, offline, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill-offline.gif");
+}
+
 /* ..... new thread icons for watch and ignore ..... */
 
 treechildren::-moz-tree-image(news, threadCol, watch) {
diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css
index 4a46d54e..a9e58c50 100644
--- a/LCARStrek/mozapps/extensions/extensions.css
+++ b/LCARStrek/mozapps/extensions/extensions.css
@@ -35,6 +35,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
 #addons-page {
   background-color: #000000;
   color: #FF9F00;
@@ -52,7 +54,6 @@
 
 .nav-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  min-width: 0;
 }
 
 #forward-btn {
@@ -331,14 +332,13 @@
   color: #8050B0;
 }
 
-#header-search[focused="true"] {
+#header-search[focused] {
   border-color: #008484;
 }
 
 #header-utils-btn {
-  min-width: 4.5em;
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.png");
-  -moz-margin-end: 18px;
+  -moz-margin-end: 16px;
 }
 
 #header-utils-btn:hover,
@@ -506,6 +506,7 @@
   color: #9C9CFF;
   margin-bottom: 0;
   -moz-box-align: end;
+  -moz-box-flex: 1;
 }
 
 .creator {
@@ -517,7 +518,6 @@
 }
 
 .description-container {
-  margin-top: 8px;
   -moz-margin-start: 6px;
   -moz-box-align: center;
 }
@@ -544,11 +544,11 @@
   -moz-box-align: stretch;
 }
 
+.advancedinfo-container,
 .update-info-container {
   -moz-box-align: center;
 }
 
-.advancedinfo-container,
 .update-available {
   -moz-box-align: end;
 }
diff --git a/LCARStrek/navigator/navigator.css b/LCARStrek/navigator/navigator.css
index 2002314e..8d585640 100644
--- a/LCARStrek/navigator/navigator.css
+++ b/LCARStrek/navigator/navigator.css
@@ -336,7 +336,9 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
 .popup-notification-icon[popupid="addon-install-started"],
 .popup-notification-icon[popupid="addon-install-cancelled"],
 .popup-notification-icon[popupid="addon-install-failed"],
-.popup-notification-icon[popupid="addon-install-complete"] {
+.popup-notification-icon[popupid="addon-install-complete"],
+.popup-notification-icon[popupid="lwtheme-install-request"],
+.popup-notification-icon[popupid="lwtheme-install-notification"] {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
   width: 32px;
   height: 32px;
@@ -486,6 +488,10 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
 /*  list-style-image: url("chrome://communicator/skin/icons/search.gif"); */
 }
 
+#search-button > .button-box > .button-icon {
+  display: -moz-box;
+}
+
 /*
 toolbar[mode="text"] #search-button > .button-box > .button-icon,
 toolbar[mode="icons"] #search-button > .button-box > .button-text {
diff --git a/origdiff b/origdiff
index cecebd50..f2df0f36 100755
--- a/origdiff
+++ b/origdiff
@@ -4,70 +4,89 @@ RUN_DIR=$(pwd)
 cd $(dirname "$0")
 SCRIPT_DIR=$(pwd)
 
-REPO_LIST="COMM MOZ MOZB DOMI CZ"
+# ============ vars specific to the versions ==============
+
+NAME_PRE=2
+NAME_POST=5
+
+TAG_PRE_COMM=COMM_2_0_BASE
+TAG_POST_COMM=BETA_5_END
+TAG_PRE_MOZ=GECKO_2_0_BASE
+TAG_POST_MOZ=FIREFOX_BETA_5_END
+TAG_PRE_EXT=SEAMONKEY_2_1_RELEASE
+TAG_POST_EXT=SEAMONKEY_2_2_RELEASE
 
-if [ -n "$1" ]; then
-  SRC_DATE="$1"
-  DST_DATE=`TZ=America/Los_Angeles date +%Y-%m-%d`
+# ===================== process repos =====================
+
+REPO_LIST="COMM MOZ MOZB DOMI CZ"
 
-  HG_COMM_DIR=/mnt/mozilla/hg/comm-2.0
-  #HG_COMM_DIR=/mnt/mozilla/hg/comm-central
-  COMM_HG_OPTIONS=
-  COMM_DIR=suite/themes/classic/
-  COMM_NAME_EXTRA=" (suite)"
-  COMM_LOG=$RUN_DIR/themelog-suitedefault.$SRC_DATE.$DST_DATE.log
+HG_COMM_DIR=/mnt/mozilla/hg/comm-beta
+COMM_HG_OPTIONS=
+COMM_DIR=suite/themes/classic/
+COMM_TAG_PRE=$TAG_PRE_COMM
+COMM_TAG_POST=$TAG_POST_COMM
+COMM_NAME_EXTRA=" (suite)"
+COMM_LOG=$RUN_DIR/theme-suitedefault.$NAME_PRE-$NAME_POST.log
 
-  HG_MOZ_DIR=/mnt/mozilla/hg/comm-2.0/mozilla
-  #HG_MOZ_DIR=/mnt/mozilla/hg/comm-central/mozilla
-  MOZ_HG_OPTIONS=
-  MOZ_DIR=toolkit/themes/winstripe/
-  MOZ_NAME_EXTRA=" (toolkit)"
-  MOZ_LOG=$RUN_DIR/themelog-tkwinstripe.$SRC_DATE.$DST_DATE.log
+HG_MOZ_DIR=/mnt/mozilla/hg/comm-beta/mozilla
+MOZ_HG_OPTIONS=
+MOZ_DIR=toolkit/themes/winstripe/
+MOZ_TAG_PRE=$TAG_PRE_MOZ
+MOZ_TAG_POST=$TAG_POST_MOZ
+MOZ_NAME_EXTRA=" (toolkit)"
+MOZ_LOG=$RUN_DIR/theme-toolkitwin.$NAME_PRE-$NAME_POST.log
 
-  HG_MOZB_DIR=/mnt/mozilla/hg/comm-2.0/mozilla
-  #HG_MOZB_DIR=/mnt/mozilla/hg/comm-central/mozilla
-  MOZB_HG_OPTIONS=
-  MOZB_DIR=browser/themes/winstripe/
-  MOZB_NAME_EXTRA=" (browser)"
-  MOZB_LOG=$RUN_DIR/themelog-browserwin.$SRC_DATE.$DST_DATE.log
+HG_MOZB_DIR=/mnt/mozilla/hg/comm-beta/mozilla
+MOZB_HG_OPTIONS=
+MOZB_DIR=browser/themes/winstripe/
+MOZB_TAG_PRE=$TAG_PRE_MOZ
+MOZB_TAG_POST=$TAG_POST_MOZ
+MOZB_NAME_EXTRA=" (browser)"
+MOZB_LOG=$RUN_DIR/theme-browserwin.$NAME_PRE-$NAME_POST.log
 
-  HG_DOMI_DIR=/mnt/mozilla/hg/comm-2.0/mozilla/extensions/inspector
-  #HG_DOMI_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/inspector
-  DOMI_HG_OPTIONS=
-  DOMI_DIR=resources/skin/classic/
-  DOMI_NAME_EXTRA=
-  DOMI_LOG=$RUN_DIR/themelog-domiclassic.$SRC_DATE.$DST_DATE.log
+HG_DOMI_DIR=/mnt/mozilla/hg/comm-beta/mozilla/extensions/inspector
+DOMI_HG_OPTIONS=
+DOMI_DIR=resources/skin/classic/
+DOMI_TAG_PRE=$TAG_PRE_EXT
+DOMI_TAG_POST=$TAG_POST_EXT
+DOMI_NAME_EXTRA=
+DOMI_LOG=$RUN_DIR/theme-domiclassic.$NAME_PRE-$NAME_POST.log
 
-  HG_CZ_DIR=/mnt/mozilla/hg/comm-2.0/mozilla/extensions/irc
-  #HG_CZ_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/irc
-  CZ_HG_OPTIONS=
-  CZ_DIR=xul/skin/
-  CZ_NAME_EXTRA=
-  CZ_LOG=$RUN_DIR/themelog-chatzilla.$SRC_DATE.$DST_DATE.log
+HG_CZ_DIR=/mnt/mozilla/hg/comm-beta/mozilla/extensions/irc
+CZ_HG_OPTIONS=
+CZ_DIR=xul/skin/
+CZ_TAG_PRE=$TAG_PRE_EXT
+CZ_TAG_POST=$TAG_POST_EXT
+CZ_NAME_EXTRA=
+CZ_LOG=$RUN_DIR/theme-chatzilla.$NAME_PRE-$NAME_POST.log
 
-  for repo in $REPO_LIST; do
-    HG_DIR_VAR="HG_${repo}_DIR"
-    HG_DIR=${!HG_DIR_VAR}
-    HG_OPTIONS_VAR="${repo}_HG_OPTIONS"
-    HG_OPTIONS=${!HG_OPTIONS_VAR}
-    SKIN_DIR_VAR="${repo}_DIR"
-    SKIN_DIR=${!SKIN_DIR_VAR}
-    LOG_VAR="${repo}_LOG"
-    LOG_NAME=${!LOG_VAR}
-    if [ ! -e $LOG_NAME ]; then
-      echo "Getting $LOG_NAME..."
-      cd $HG_DIR
-      LC_ALL=C hg log -d ">$SRC_DATE" $HG_OPTIONS $SKIN_DIR > $LOG_NAME
-    fi
-  done
-  cd $RUN_DIR
-else
-  echo "You must specify a start date."
-  exit 1
-fi
+for repo in $REPO_LIST; do
+  HG_DIR_VAR="HG_${repo}_DIR"
+  HG_DIR=${!HG_DIR_VAR}
+  HG_OPTIONS_VAR="${repo}_HG_OPTIONS"
+  HG_OPTIONS=${!HG_OPTIONS_VAR}
+  SKIN_DIR_VAR="${repo}_DIR"
+  SKIN_DIR=${!SKIN_DIR_VAR}
+  TAG_PRE_VAR="${repo}_TAG_PRE"
+  TAG_PRE=${!TAG_PRE_VAR}
+  TAG_POST_VAR="${repo}_TAG_POST"
+  TAG_POST=${!TAG_POST_VAR}
+  LOG_VAR="${repo}_LOG"
+  LOG_NAME=${!LOG_VAR}
+  if [ ! -e $LOG_NAME ]; then
+    echo "Getting $LOG_NAME..."
+    cd $HG_DIR
+    LC_ALL=C hg log -r $TAG_PRE:$TAG_POST $HG_OPTIONS $SKIN_DIR > $LOG_NAME
+  fi
+done
+cd $RUN_DIR
 
 for repo in $REPO_LIST; do
   HG_DIR_VAR="HG_${repo}_DIR"
+  TAG_PRE_VAR="${repo}_TAG_PRE"
+  TAG_PRE=${!TAG_PRE_VAR}
+  TAG_POST_VAR="${repo}_TAG_POST"
+  TAG_POST=${!TAG_POST_VAR}
   LOG_VAR="${repo}_LOG"
   NAME_EXTRA_VAR="${repo}_NAME_EXTRA"
   NAME_EXTRA=${!NAME_EXTRA_VAR}
@@ -83,7 +102,7 @@ for repo in $REPO_LIST; do
   echo "  </head>" >> $HTML_NAME
   echo "  <body>" >> $HTML_NAME
   echo "  <h1>$REPO_NAME Theme Changes</h1>" >> $HTML_NAME
-  echo "  <h2>$SRC_DATE to $DST_DATE</h2>" >> $HTML_NAME
+  echo "  <h2>$TAG_PRE to $TAG_POST</h2>" >> $HTML_NAME
   echo "    <pre>" >> $HTML_NAME
   sed -e "s/&/\&amp;/g" -e "s/</\&lt;/g" -e "s/>/\&gt;/g" \
       -e "s|\(changeset: *[0-9]*\):\([0-9a-f]*\)|\1:<a href=\"$HG_URL/rev/\2\">\2</a>|" \
diff --git a/origdiff2 b/origdiff2
new file mode 100755
index 00000000..982ac803
--- /dev/null
+++ b/origdiff2
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+RUN_DIR=$(pwd)
+cd $(dirname "$0")
+SCRIPT_DIR=$(pwd)
+
+# ============ vars specific to the versions ==============
+
+NAME_PRE=2
+NAME_POST=5
+
+TAG_PRE_COMM=COMM_2_0_BASE
+TAG_POST_COMM=BETA_5_END
+TAG_PRE_MOZ=GECKO_2_0_BASE
+TAG_POST_MOZ=FIREFOX_BETA_5_END
+TAG_PRE_EXT=SEAMONKEY_2_1_RELEASE
+TAG_POST_EXT=SEAMONKEY_2_2_RELEASE
+
+# ===================== process repos =====================
+
+REPO_LIST="COMM MOZ MOZB DOMI CZ"
+
+HG_COMM_DIR=/mnt/mozilla/hg/comm-beta
+COMM_DIR=suite/themes/classic/
+COMM_TAG_PRE=$TAG_PRE_COMM
+COMM_TAG_POST=$TAG_POST_COMM
+COMM_OUT=$RUN_DIR/theme-suitedefault.$NAME_PRE-$NAME_POST.diff
+
+HG_MOZ_DIR=/mnt/mozilla/hg/comm-beta/mozilla
+MOZ_DIR=toolkit/themes/winstripe/
+MOZ_TAG_PRE=$TAG_PRE_MOZ
+MOZ_TAG_POST=$TAG_POST_MOZ
+MOZ_OUT=$RUN_DIR/theme-toolkitwin.$NAME_PRE-$NAME_POST.diff
+
+HG_MOZB_DIR=/mnt/mozilla/hg/comm-beta/mozilla
+MOZB_DIR=browser/themes/winstripe/
+MOZB_TAG_PRE=$TAG_PRE_MOZ
+MOZB_TAG_POST=$TAG_POST_MOZ
+MOZB_OUT=$RUN_DIR/theme-browserwin.$NAME_PRE-$NAME_POST.diff
+
+HG_DOMI_DIR=/mnt/mozilla/hg/comm-beta/mozilla/extensions/inspector
+DOMI_DIR=resources/skin/classic/
+DOMI_TAG_PRE=$TAG_PRE_EXT
+DOMI_TAG_POST=$TAG_POST_EXT
+DOMI_OUT=$RUN_DIR/theme-domiclassic.$NAME_PRE-$NAME_POST.diff
+
+HG_CZ_DIR=/mnt/mozilla/hg/comm-beta/mozilla/extensions/irc
+CZ_DIR=xul/skin/
+CZ_TAG_PRE=$TAG_PRE_EXT
+CZ_TAG_POST=$TAG_POST_EXT
+CZ_OUT=$RUN_DIR/theme-chatzilla.$NAME_PRE-$NAME_POST.diff
+
+for repo in $REPO_LIST; do
+  HG_DIR_VAR="HG_${repo}_DIR"
+  HG_DIR=${!HG_DIR_VAR}
+  SKIN_DIR_VAR="${repo}_DIR"
+  SKIN_DIR=${!SKIN_DIR_VAR}
+  TAG_PRE_VAR="${repo}_TAG_PRE"
+  TAG_PRE=${!TAG_PRE_VAR}
+  TAG_POST_VAR="${repo}_TAG_POST"
+  TAG_POST=${!TAG_POST_VAR}
+  OUT_VAR="${repo}_OUT"
+  OUT_NAME=${!OUT_VAR}
+  if [ ! -e $OUT_NAME ]; then
+    echo "Getting $OUT_NAME..."
+    cd $HG_DIR
+    LC_ALL=C hg diff -r $TAG_PRE -r $TAG_POST $SKIN_DIR > $OUT_NAME
+  fi
+done
+cd $RUN_DIR
+
+echo "done."
-- 
2.43.0