[Pkg-mozext-commits] [compactheader] 26/441: New version: 0.4.3 Added two menuitems to Other Actions menu: - Open CompactHeader Preferences - Mark Message as Flagged

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:40 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 90114f6c62c8b77d734b2dbe935145275f7b1e8a
Author: joachim.herb <none at none>
Date:   Mon Aug 24 20:16:48 2009 +0000

    New version: 0.4.3
    Added two menuitems to Other Actions menu:
    - Open CompactHeader Preferences
    - Mark Message as Flagged
---
 .../CompactHeader/content/compactHeaderOverlay.js  |  4 +++
 .../CompactHeader/content/compactHeaderOverlay.xul | 35 +++++++++++++++++++---
 chrome/CompactHeader/content/preferences.xul       |  2 +-
 chrome/CompactHeader/locale/de-DE/preferences.dtd  |  2 +-
 chrome/CompactHeader/locale/en-US/preferences.dtd  |  2 +-
 chrome/CompactHeader/skin/global/CompactHeader.css | 11 +++++--
 install.rdf                                        |  2 +-
 7 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 5a2103f..63ca3c2 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -549,11 +549,15 @@ function updateHdrIconText() {
 	var myE2 = document.getElementById("expandedButtonBox");
 	
 	if (prefBranch.getBoolPref("buttons.showonlyicon")) {
+		myE1.removeAttribute("OnlyIcon");
+		myE2.removeAttribute("OnlyIcon");
 		myE1.setAttribute("OnlyIcon", "Icon");
 		myE2.setAttribute("OnlyIcon", "Icon");
 	} else {
 		myE1.removeAttribute("OnlyIcon");
 		myE2.removeAttribute("OnlyIcon");
+		myE1.setAttribute("OnlyIcon", "Text");
+		myE2.setAttribute("OnlyIcon", "Text");
 	}
 }
 
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 13a5603..3c62e53 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -7,13 +7,30 @@
 	<!ENTITY % compactHeaderDTD SYSTEM
 	"chrome://CompactHeader/locale/CompactHeader.dtd">
 	%compactHeaderDTD;
+	<!ENTITY % preferencesDTD SYSTEM
+	"chrome://CompactHeader/locale/preferences.dtd">
+	%preferencesDTD;
+  <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
+  %messengerDTD;
 ]>
 
 <?xml-stylesheet href="chrome://CompactHeader/skin/CompactHeader.css" type="text/css"?>
 
+
+
 <overlay id="compactHeaderOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
+<!--
+	<commandset id="mailMarkMenuItems"
+	              commandupdater="true"
+	              events="create-menu-mark"
+	              oncommandupdate="goUpdateMailMenuItems(this)">
+	
+	    <command id="cmd_markAsFlagged" 
+	    				 oncommand="goDoCommand('cmd_markAsFlagged'); event.stopPropagation()" 
+	    				 disabled="false"/>
+	</commandset>
+-->
   <script type="application/javascript" src="chrome://CompactHeader/content/buttons.js"/>
   <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
 
@@ -33,9 +50,19 @@
 					<button type="menu" id="otherActionsButton"
 							label="&otherActionsButton.label;"
 	                        class="msgHeaderView-button msgHeaderView-flat-button">
-						<menupopup id="otherActionsPopup">
-							<menuitem id="hideDetailsMenu" label="&hideDetailsButton.label;"
-							                               oncommand="coheToggleHeaderView();" />
+						<menupopup id="otherActionsPopup" onpopupshowing="InitMessageMark()">
+							<menuitem id="hideDetailsMenu" 
+												label="&hideDetailsButton.label;"
+							          oncommand="coheToggleHeaderView();"/>
+							<menuitem id="hidecohePreferencesButton" 
+												label="&dialog.title;"
+							          oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no');"/>
+			        <menuitem id="mailContext-markFlagged"
+			                  type="checkbox"
+			                  label="&markStarredCmd.label;"
+			                  accesskey="&markStarredCmd.accesskey;"
+			                  command="cmd_markAsFlagged"
+			                  key="key_toggleFlagged"/>
 						</menupopup>
 					</button>
 				</vbox>
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index be6d435..330e2ac 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -10,7 +10,7 @@
   void(openDialog("chrome://CompactHeader/content/preferences.xul"))
 -->
 
-<dialog title="&dialog.title;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<dialog id="cohePreferences" title="&dialog.title;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="onLoad()" ondialogaccept="return onDialogAccept()">
 
   <script type="application/x-javascript" src="chrome://CompactHeader/content/preferences.js"/>
diff --git a/chrome/CompactHeader/locale/de-DE/preferences.dtd b/chrome/CompactHeader/locale/de-DE/preferences.dtd
index da5781a..e9aa3f2 100644
--- a/chrome/CompactHeader/locale/de-DE/preferences.dtd
+++ b/chrome/CompactHeader/locale/de-DE/preferences.dtd
@@ -1,4 +1,4 @@
-<!ENTITY dialog.title "Compact Header">
+<!ENTITY dialog.title "CompactHeader Einstellungen">
 
 <!ENTITY groupbox.Buttons.caption "Anzuzeigende Schaltflächen">
 <!ENTITY groupbox.Column.Compact "Kompakt">
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index aa41473..7826189 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -1,4 +1,4 @@
-<!ENTITY dialog.title "Compact Header">
+<!ENTITY dialog.title "CompactHeader Preferences">
 
 <!ENTITY groupbox.Buttons.caption "Select Buttons to Display">
 <!ENTITY groupbox.Column.Compact "Compact">
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 276fb18..100a45b 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -147,8 +147,15 @@
 }
 
 /* set button margins */
-#collapsedButtonBox .msgHeaderView-button .button-icon,
-#expandedButtonBox .msgHeaderView-button .button-icon {
+#collapsedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-icon,
+#expandedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-icon {
   -moz-margin-start: 1px;
   -moz-margin-end: 1px;
+}
+
+/* set button margins */
+#collapsedButtonBox[OnlyIcon="Text"] .msgHeaderView-button .button-icon,
+#expandedButtonBox[OnlyIcon="Text"] .msgHeaderView-button .button-icon {
+  -moz-margin-start: 1px;
+  -moz-margin-end: 5px;
 }
\ No newline at end of file
diff --git a/install.rdf b/install.rdf
index df4103b..153e919 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.2</em:version>
+		<em:version>0.4.3</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<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