[Pkg-mozext-commits] [compactheader] 33/441: New version 0.5.0: Integrated RSS Linkify Subject

[David Prévot]

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

taffit pushed a commit to branch master
in repository compactheader.

commit 424cfe2d1cb1b16fc6950b93e5a2a3a0d8336959
Author: joachim.herb <none at none>
Date:   Sun Aug 30 22:07:35 2009 +0000

    New version 0.5.0:
    Integrated RSS Linkify Subject
---
 .../CompactHeader/content/compactHeaderOverlay.js  | 26 ++++++----------------
 chrome/CompactHeader/content/preferences.js        |  4 ++++
 chrome/CompactHeader/content/preferences.xul       |  4 ++++
 chrome/CompactHeader/locale/de-DE/preferences.dtd  |  2 ++
 chrome/CompactHeader/locale/en-US/preferences.dtd  |  2 ++
 defaults/preferences/prefs.js                      |  2 ++
 install.rdf                                        |  6 ++---
 7 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index b995293..7926eb0 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -72,12 +72,10 @@ var gCoheCollapsedHeaderList = [
 
 var coheIntegrateRSSLinkify = false;
 
-if (coheIntegrateRSSLinkify) {
-	var RSSLinkify = {
-	    oldSubject: null,
-	    newSubject: null
-	};
-}
+var RSSLinkify = {
+    oldSubject: null,
+    newSubject: null
+};
 
 var coheFirstTime = true;
     
@@ -275,7 +273,7 @@ function coheInitializeHeaderViewTables()
 	} else {
   	create1LHeaderXUL();
 	}
-	
+  
 	//var tb = document.getElementById("collapsedsubjectValue");
   gCoheCollapsedHeaderView = {};
   var index;
@@ -283,7 +281,7 @@ function coheInitializeHeaderViewTables()
     gCoheCollapsedHeaderView[gCoheCollapsedHeaderList[index].name] =
       new createHeaderEntry('collapsed', gCoheCollapsedHeaderList[index]);
   }
-	if (coheIntegrateRSSLinkify) {
+	if (prefBranch.getBoolPref("headersize.linkify")) {
 	  RSSLinkify.newSubject = document.createElement("label");
 	  RSSLinkify.newSubject.setAttribute("id", "collapsedsubjectlinkValue");
 	  RSSLinkify.newSubject.setAttribute("class", "headerValue plain headerValueUrl");
@@ -298,20 +296,10 @@ function coheInitializeHeaderViewTables()
 	  RSSLinkify.oldSubject.parentNode.insertBefore(RSSLinkify.newSubject, RSSLinkify.oldSubject);
 	}
 	
-	//moveOtherActionBox();
   updateHdrButtons();
   updateHdrIconText();
 }
 
-function moveOtherActionBox() {
-	var newParent = document.getElementById("menuLineBox");
-	var myElement = document.getElementById("tagMenuBox");
-	newParent.appendChild(myElement);
-	//newParent = document.getElementById("otherBoxSpace");
-	myElement = document.getElementById("otherActionsBox");
-	newParent.appendChild(myElement);
-}
-
 function coheOnLoadMsgHeaderPane()
 { 
 	coheInitializeHeaderViewTables();
@@ -411,7 +399,7 @@ function coheUpdateHeaderView()
 	if (gCoheCollapsedHeaderViewMode)
   		showHeaderView(gCoheCollapsedHeaderView);
 
-  if (coheIntegrateRSSLinkify) {
+  if (prefBranch.getBoolPref("headersize.linkify")) {
 		var url = currentHeaderData["content-base"];
 		if(url) {
 		    RSSLinkify.newSubject.setAttribute("onclick", "if (!event.button) messenger.launchExternalURL('" + 
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index b45b564..3545e10 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -31,6 +31,8 @@ function onLoad()
     .getBranch("extensions.CompactHeader.");
 
   loadPrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
+  loadPrefCheckbox("headersize.linkify", "checkbox.Linkify");
+  
   updateTwolineView(prefBranch.getBoolPref("headersize.twolineview")); 
 
   loadPrefCheckbox("buttons.showonlyicon", "checkbox.IconText");
@@ -59,6 +61,8 @@ function onDialogAccept()
 {
   savePrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
 
+  savePrefCheckbox("headersize.linkify", "checkbox.Linkify");
+
   savePrefCheckbox("buttons.showonlyicon", "checkbox.IconText");
 
   for(var buttonname in buttonslist) {
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index f234e9b..e255316 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -100,4 +100,8 @@
     	</rows>
     </grid>
   </groupbox>
+
+	<checkbox id="checkbox.Linkify" 
+						label="&menu.Linkify.caption;"/>
+
 </dialog>
diff --git a/chrome/CompactHeader/locale/de-DE/preferences.dtd b/chrome/CompactHeader/locale/de-DE/preferences.dtd
index e9aa3f2..0af880f 100644
--- a/chrome/CompactHeader/locale/de-DE/preferences.dtd
+++ b/chrome/CompactHeader/locale/de-DE/preferences.dtd
@@ -13,3 +13,5 @@
 
 
 <!ENTITY menu.IconText.caption "Nur Icons in Schaltflächen">
+
+<!ENTITY menu.Linkify.caption "Link in Betreff von RSS Feeds">
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index 7826189..60e4a6c 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -12,3 +12,5 @@
 <!ENTITY checkbox.Compact.Trash.caption "Trash">
 
 <!ENTITY menu.IconText.caption "Show only icons inside buttons">
+
+<!ENTITY menu.Linkify.caption "Link in subjects of RSS feeds">
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 93419fe..f268fbf 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -1,4 +1,6 @@
 pref("extensions.CompactHeader.headersize.twolineview", false);
+pref("extensions.CompactHeader.headersize.linkify", false);
+
 pref("extensions.CompactHeader.buttons.showonlyicon", true);
 
 pref("extensions.CompactHeader.view.compact.displayReply", true);
diff --git a/install.rdf b/install.rdf
index 6913a3a..9d7cfe7 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,11 +6,11 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<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:version>0.5.0</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>
-		<em:contributor>Alex Dedul</em:contributor>
+		<em:contributor>Alex Dedul (original author of RSS Linkify Subject</em:contributor>
     <em:optionsURL>chrome://CompactHeader/content/preferences.xul</em:optionsURL>
 		<em:homepageURL>http://compactheader.mozdev.org/</em:homepageURL>
 		<em:id>{58D4392A-842E-11DE-B51A-C7B855D89593}</em:id>

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