[Pkg-mozext-commits] [compactheader] 31/441: New Version: 0.4.6 Cleanup following suggestens by peterlairo

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:41 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit d1e28af7c7a9e2ca4ff1718943917bc3055ec335
Author: joachim.herb <none at none>
Date:   Sat Aug 29 18:52:54 2009 +0000

    New Version: 0.4.6
    Cleanup following suggestens by peterlairo
---
 .../CompactHeader/content/compactHeaderOverlay.js  | 28 +------
 .../CompactHeader/content/compactHeaderOverlay.xul | 93 ++++++++++++----------
 chrome/CompactHeader/skin/global/CompactHeader.css | 61 +++++++++-----
 install.rdf                                        |  2 +-
 4 files changed, 95 insertions(+), 89 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index e85e308..b995293 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -179,6 +179,7 @@ function create2LHeaderXUL() {
 	myElement.appendChild(xul5, myElement);
 
 	document.getElementById("collapsedsubjectBox").setAttribute("twolineview", "true");
+	document.getElementById("collapseddateBox").setAttribute("twolineview", "true");
 
 }
 
@@ -255,6 +256,7 @@ function create1LHeaderXUL() {
 
 	myElement.appendChild(xul3, myElement);
 	document.getElementById("collapsedsubjectBox").removeAttribute("twolineview");
+	document.getElementById("collapseddateBox").removeAttribute("twolineview");
 }
 
 // Now, for each view the message pane can generate, we need a global table
@@ -263,30 +265,6 @@ function create1LHeaderXUL() {
 // we find in the DOM based on properties in the header lists.
 var gCoheCollapsedHeaderView = {};
 
-/*
-function coheReInitializeHeaderViewTables()
-{
-  // iterate over each header in our header list array, create a header entry
-	// for it, and store it in our header table
-	if (prefBranch.getBoolPref("headersize.twolineview")) {
-  	create2LHeaderXUL();
-	} else {
-  	create1LHeaderXUL();
-	}
-	
-	// var tb = document.getElementById("collapsedsubjectValue");
-  gCoheCollapsedHeaderView = {};
-  var index;
-  for (index = 0; index < gCoheCollapsedHeaderList.length; index++) {
-    gCoheCollapsedHeaderView[gCoheCollapsedHeaderList[index].name] =
-      new createHeaderEntry('collapsed', gCoheCollapsedHeaderList[index]);
-  }
-    
-  updateHdrButtons();
-  updateHdrIconText();
-}
-*/
-
 function coheInitializeHeaderViewTables()
 {
 /*  coheReInitializeHeaderViewTables(); */
@@ -614,8 +592,6 @@ function MyInitViewHeadersMenu()
     menuitem.setAttribute("checked", "true");
 }
 
-
-
 var myPrefObserverView =
 {
   register: function()
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index e2a22ae..fc8f0e0 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -45,7 +45,7 @@
 
 	<!-- YYY namespace ids added here? -->
 	<hbox id="expandedHeaderView">
-		<vbox id="hideDetailsButtonID" insertbefore="expandedHeaders">
+		<vbox id="hideDetailsButtonBox" insertbefore="expandedHeaders">
 			<button id="hideDetailsButton"  
 							tooltiptext="&hideDetailsButton.label;"
 							onclick="coheToggleHeaderView();" 
@@ -67,6 +67,22 @@
 			                  insertbefore="viewSourceMenuItem"
 			                  key="key_toggleFlagged"/>
 			        <menu id="hdrPlane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
+<!--
+		            <menupopup id="menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
+		              <menuitem id="hdrPlane-viewallheaders"
+		               type="radio"
+		               name="viewheadergroup"
+		               label="&headersAllCmd.label;"
+		               accesskey="&headersAllCmd.accesskey;"
+		               command="cmd_viewAllHeader"/>
+		              <menuitem id="hdrPlane-viewnormalheaders"
+		               type="radio"
+		               name="viewheadergroup"
+		               label="&headersNormalCmd.label;"
+		               accesskey="&headersNormalCmd.accesskey;"
+		               command="cmd_viewNormalHeader"/>
+		            </menupopup>
+-->
 	            <menupopup id="hdrPlane-HeadersPopup" onpopupshowing="MyInitViewHeadersMenu();">
 	              <menuitem id="my_viewallheaders"
 	               type="radio"
@@ -91,10 +107,6 @@
 							          oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no');"/>
 						</menupopup>
 					</button>
-<!--
-				</vbox>
-				<vbox id="tagMenuBox">
-		-->
 					<button type="menu" 
 									id="tagMenuPopup"
 									label="&tagMenu.label;"
@@ -109,48 +121,47 @@
 					</button>
 				</vbox>
 			</vbox>
-			<!--
-			<hbox id="menuLineBox" flex="1" align="baseline" pack="end">
-			</hbox> 
-			-->
 		</hbox>
 	</hbox>
 
-	<vbox id="collapsedHeaderView" flex="2" pack="start" class="header-part1 headerContainer">
-		<hbox align="start" flex="0" id="collapsedHeaderViewFirstLine">
-      <hbox id="showDetailsButtonBox" align="start" flex="0">
-		    <button id="showDetailsButton"
-			          tooltiptext="&showDetailsButton.label;"
-			          onclick="coheToggleHeaderView();"
-			          class="msgHeaderView-button msgHeaderView-flat-button"/>
-	    </hbox>
-			<hbox id="collapsedfromBox" align="start" flex="1">
-				<mail-multi-emailHeaderField id="collapsedfromValue"
-																		 flex="0"
-																		 align="end"
-																		 pack="end"
-																		 class="collapsedHeaderDisplayName"
-																		 label="&fromField2.label;"/>
-			</hbox>
-			<hbox id="collapsedtoCcBccBox" align="end" pack="end" flex="3">
-				<hbox align="start" flex="100">
+	<hbox id="collapsedHeaderView" flex="2" pack="start" class="header-part1 headerContainer">
+    <vbox id="showDetailsButtonBox" align="start" flex="0">
+	    <button id="showDetailsButton"
+		          tooltiptext="&showDetailsButton.label;"
+		          onclick="coheToggleHeaderView();"
+		          class="msgHeaderView-button msgHeaderView-flat-button"/>
+    </vbox>
+		<vbox id="collapsedHeaderElementBox" flex="1">
+			<hbox align="start" flex="1" id="collapsedHeaderViewFirstLine">
+	<!--
+				<hbox id="collapsedfromBox" align="start" flex="100">
+					<mail-multi-emailHeaderField id="collapsedfromValue"
+																			 class="collapsedHeaderDisplayName"
+																			 label="&fromField2.label;"/>
 				</hbox>
-				<mail-multi-emailHeaderField id="collapsedtoCcBccValue"
-																		 flex="1"
-																		 pack="end"
-																		 class="collapsedHeaderDisplayName"/>
-			</hbox>
-			<header-view-button-box id="collapsedButtonBox"/>
-		</hbox>	
-		<hbox align="start" flex="1" id="collapsedHeaderViewSecondLine">
-			<hbox id="collapsedsubjectBox" align="start" flex="1" style="padding-left: 10px; padding-top: 1.6px">
-				<textbox id="collapsedsubjectValue" flex="1" readonly="true" class="collapsedHeaderValue plain"/>
+				<hbox id="collapsedtoCcBccBox" align="end" pack="end" flex="1">
+					<hbox align="start" flex="100">
+					</hbox>
+					<mail-multi-emailHeaderField id="collapsedtoCcBccValue"
+																			 flex="1"
+																			 pack="end"
+																			 class="collapsedHeaderDisplayName"/>
+				</hbox>
+				<header-view-button-box id="collapsedButtonBox"/>
+	-->	
 			</hbox>
-			<hbox id="collapseddateBox" align="end" flex="0" style="padding-bottom: 2px">
-				<textbox id="collapseddateValue" class="plain collapsedHeaderValue" flex="0" readonly="true"/>
+			<hbox align="start" flex="1" id="collapsedHeaderViewSecondLine">
+	<!--
+				<hbox id="collapsedsubjectBox" align="start" flex="99">
+					<textbox id="collapsedsubjectValue" flex="99" readonly="true" class="collapsedHeaderValue plain"/>
+				</hbox>
+				<hbox id="collapseddateBox" align="end" flex="0">
+					<textbox id="collapseddateValue" class="plain collapsedHeaderValue" flex="0" readonly="true"/>
+				</hbox>
+	-->
 			</hbox>
-		</hbox>
-	</vbox>
+		</vbox>
+	</hbox>
 
 	</deck>
 
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 019b768..40d1ae6 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -51,9 +51,22 @@
 }
 
 #collapsedsubjectValue {
-  -moz-margin-start: 3px;
-  -moz-box-align: stretch;
-  font-weight: bold;
+	font-weight: bold;
+}
+
+#tagMenuPopup,
+#otherActionsButton {
+  margin: 0px;
+  padding: 0px;
+}
+
+#tagMenuPopup .button-box,
+#otherActionsButton .button-box {
+  -moz-margin-start: 0px;
+  -moz-margin-end: 0px;
+  -moz-padding-start: 0px;
+  -moz-padding-end: 0px;
+	border: 0px;
 }
 
 #collapseddateValue {
@@ -69,6 +82,8 @@
   width: 1.3em;
   height: 1.3em;
   padding-bottom: 0px;
+  margin:0px;
+  padding:0px;
   background-image: url("chrome://CompactHeader/skin/twisty-open.png");
   background-repeat: no-repeat;
   background-position: center center;
@@ -77,6 +92,8 @@
 #hideDetailsButton:hover {
   background-color: rgb(230,231,227);
   border: 2px solid #C0C3C6;
+  margin:0px;
+  padding:0px;
 }
 
 #showDetailsButton {
@@ -86,6 +103,8 @@
   width: 1.3em;
   height: 1.3em;
   padding-bottom: 0px;
+  margin:0px;
+  padding:0px;
   background-image: url("chrome://CompactHeader/skin/twisty-clsd.png");
   background-repeat: no-repeat;
   background-position: center center;
@@ -94,15 +113,22 @@
 #showDetailsButton:hover {
   background-color: rgb(230,231,227);
   border: 2px solid #C0C3C6;
+  margin:0px;
+  padding:0px;
 }
 
-#collapsedsubjectBox, collapsedfromBox, collapsedfromBox,collapsedButtonBox {
+#collapsedsubjectBox, collapsedfromBox,collapsedButtonBox,
+#collapsedsubjectValue, #collapsedfromValue {
   margin: 0px;
   padding: 0px;
 }
 
 #collapsedsubjectBox[twolineview="true"] {
-  -moz-margin-start: 2.5em;
+  -moz-margin-start: .2em;
+}
+
+#collapseddateBox[twolineview="true"] {
+  -moz-margin-end: 0.5em;
 }
 
 #collapsedfromValue > .headerNameBox {
@@ -113,17 +139,17 @@
 
 .hdrReplyButton[mode="hdrReplyButton"] {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 63px 16px 47px);
+  -moz-image-region: rect(0px 64px 16px 48px);
 }
 
 .hdrReplyButton[mode="hdrReplyAllButton"] {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 79px 16px 64px);
+  -moz-image-region: rect(0px 80px 16px 64px);
 }
 
 .hdrReplyButton[mode="hdrReplyListButton"] {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 79px 16px 64px);
+  -moz-image-region: rect(0px 80px 16px 64px);
 }
 
 .hdrForwardButton {
@@ -146,25 +172,18 @@
   display: none;
 }
 
-/* set button margins */
-#collapsedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-icon,
-#expandedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-icon {
-  -moz-margin-start: 1px;
+#collapsedButtonBox[OnlyIcon="Text"] .msgHeaderView-button .button-text,
+#expandedButtonBox[OnlyIcon="Text"] .msgHeaderView-button .button-text {
+  -moz-padding-start: 5px;
   -moz-margin-end: 1px;
 }
 
 /* set button margins */
-#collapsedButtonBox[OnlyIcon="Text"] .msgHeaderView-button .button-icon,
-#expandedButtonBox[OnlyIcon="Text"] .msgHeaderView-button .button-icon {
+#collapsedButtonBox .msgHeaderView-button .button-icon,
+#expandedButtonBox .msgHeaderView-button .button-icon {
   -moz-margin-start: 1px;
-  -moz-margin-end: 5px;
-}
-
-/*
-#menuLineBox{
-	margin-top: -3em;
+  -moz-margin-end: 1px;
 }
-*/
 
 #otherActionsTopSpacer {
   display: none;
diff --git a/install.rdf b/install.rdf
index 8132c36..6913a3a 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>0.4.5</em:version>
+		<em:version>0.4.6</em:version>
 		<em:description>Add ability to reduce header size to one or two lines.</em:description> <!-- Linkify subjects in RSS feeds.-->
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git



More information about the Pkg-mozext-commits mailing list