[Pkg-mozext-commits] [compactheader] 271/441: Prefix all DOM objects with cohe_
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:09 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 cbccaf3a363090fe5a14520cc658644cc4bd2725
Author: joachim <none at none>
Date: Tue Aug 23 22:17:12 2011 +0200
Prefix all DOM objects with cohe_
--HG--
branch : review_requests
extra : rebase_source : d5080b998b4e019990d34fc97b9dd303b89966bc
---
chrome/CompactHeader/content/CHTMessenger.js | 8 +-
chrome/CompactHeader/content/CHTMessenger.xul | 8 +-
chrome/CompactHeader/content/RSSLinkify.js | 10 +-
chrome/CompactHeader/content/buttonsOverlay.js | 5 +-
chrome/CompactHeader/content/buttonsOverlay.xul | 8 +-
.../CompactHeader/content/compactHeaderOverlay.js | 52 ++++----
.../CompactHeader/content/compactHeaderOverlay.xul | 145 ++++++++++-----------
.../content/customizeToolbarOverlay.xul | 4 +-
chrome/CompactHeader/content/preferences.xul | 36 ++---
chrome/CompactHeader/content/toolbar.js | 60 ++++-----
.../CompactHeader/locale/da-DK/CompactHeader.dtd | 6 +-
chrome/CompactHeader/locale/da-DK/preferences.dtd | 10 +-
.../CompactHeader/locale/de-DE/CompactHeader.dtd | 6 +-
chrome/CompactHeader/locale/de-DE/preferences.dtd | 10 +-
.../CompactHeader/locale/en-US/CompactHeader.dtd | 6 +-
chrome/CompactHeader/locale/en-US/preferences.dtd | 10 +-
.../CompactHeader/locale/es-ES/CompactHeader.dtd | 6 +-
chrome/CompactHeader/locale/es-ES/preferences.dtd | 20 +--
.../CompactHeader/locale/fr-FR/CompactHeader.dtd | 6 +-
chrome/CompactHeader/locale/fr-FR/preferences.dtd | 20 +--
.../CompactHeader/locale/it-IT/CompactHeader.dtd | 6 +-
chrome/CompactHeader/locale/it-IT/preferences.dtd | 10 +-
.../CompactHeader/skin/common/buttonsOverlay.css | 14 +-
chrome/CompactHeader/skin/global/CompactHeader.css | 92 +++++++------
chrome/CompactHeader/skin/gnome/buttonsOverlay.css | 22 ++--
chrome/CompactHeader/skin/gnome/osdef.css | 2 +-
chrome/CompactHeader/skin/mac/buttonsOverlay.css | 22 ++--
chrome/CompactHeader/skin/mac/osdef.css | 4 +-
.../CompactHeader/skin/windows/buttonsOverlay.css | 14 +-
chrome/CompactHeader/skin/windows/osdef.css | 2 +-
test/compactheader/test-compactheader-collapse.js | 10 +-
.../test-compactheader-preferences.js | 6 +-
test/compactheader/test-compactheader-toolbar.js | 2 +-
test/shared-modules/test-compactheader-helpers.js | 10 +-
34 files changed, 327 insertions(+), 325 deletions(-)
diff --git a/chrome/CompactHeader/content/CHTMessenger.js b/chrome/CompactHeader/content/CHTMessenger.js
index 8d230db..4cb4bd4 100644
--- a/chrome/CompactHeader/content/CHTMessenger.js
+++ b/chrome/CompactHeader/content/CHTMessenger.js
@@ -58,8 +58,8 @@ org.mozdev.customizeHeaderToolbar.messenger = function(){
pub.saveToolboxData = function() {
var hdrToolbox = document.getElementById("header-view-toolbox");
var hdrToolbar = document.getElementById("header-view-toolbar");
- var saveToolbox = document.getElementById("CHTSaveToolboxData");
- var saveToolbar = document.getElementById("CHTSaveToolbarData");
+ var saveToolbox = document.getElementById("cohe_CHTSaveToolboxData");
+ var saveToolbar = document.getElementById("cohe_CHTSaveToolbarData");
if (hdrToolbox && hdrToolbar && saveToolbox && saveToolbar) {
saveToolbar.firstPermanentChild = hdrToolbar.firstPermanentChild;
saveToolbar.lastPermanentChild = hdrToolbar.lastPermanentChild;
@@ -93,8 +93,8 @@ org.mozdev.customizeHeaderToolbar.messenger = function(){
pub.loadToolboxData = function() {
var hdrToolbox = document.getElementById("header-view-toolbox");
var hdrToolbar = document.getElementById("header-view-toolbar");
- var saveToolbox = document.getElementById("CHTSaveToolboxData");
- var saveToolbar = document.getElementById("CHTSaveToolbarData");
+ var saveToolbox = document.getElementById("cohe_CHTSaveToolboxData");
+ var saveToolbar = document.getElementById("cohe_CHTSaveToolbarData");
if (hdrToolbox && hdrToolbar && saveToolbox && saveToolbar && saveToolbox.getAttribute("gotData") == "true") {
hdrToolbar.firstPermanentChild = saveToolbar.firstPermanentChild;
hdrToolbar.lastPermanentChild = saveToolbar.lastPermanentChild;
diff --git a/chrome/CompactHeader/content/CHTMessenger.xul b/chrome/CompactHeader/content/CHTMessenger.xul
index 90bb0f3..7f24957 100644
--- a/chrome/CompactHeader/content/CHTMessenger.xul
+++ b/chrome/CompactHeader/content/CHTMessenger.xul
@@ -40,13 +40,13 @@
]>
-<overlay id="CHTmessengerWindow"
+<overlay id="cohe_CHTmessengerWindow"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/x-javascript"
+ <script type="application/x-javascript"
src="chrome://CompactHeader/content/CHTMessenger.js"/>
<window id="messengerWindow">
- <toolbox id="CHTSaveToolboxData" collapsed="true">
- <toolbar id="CHTSaveToolbarData" collapsed="true"/>
+ <toolbox id="cohe_CHTSaveToolboxData" collapsed="true">
+ <toolbar id="cohe_CHTSaveToolbarData" collapsed="true"/>
</toolbox>
</window>
</overlay>
diff --git a/chrome/CompactHeader/content/RSSLinkify.js b/chrome/CompactHeader/content/RSSLinkify.js
index d4e8ff2..9322d8b 100644
--- a/chrome/CompactHeader/content/RSSLinkify.js
+++ b/chrome/CompactHeader/content/RSSLinkify.js
@@ -38,8 +38,6 @@
# ***** END LICENSE BLOCK *****
*/
-EXPORTED_SYMBOLS = ["org"];
-
//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
if(!org) var org={};
@@ -117,9 +115,9 @@ org.mozdev.compactHeader.RSSLinkify = function() {
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start");
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 1");
- RSSLinkify.newSubject = document.getElementById("collapsedsubjectlinkBox") || document.createElement("label");
+ RSSLinkify.newSubject = document.getElementById("cohe_collapsedsubjectlinkBox") || document.createElement("label");
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 2");
- RSSLinkify.newSubject.setAttribute("id", "collapsedsubjectlinkBox");
+ RSSLinkify.newSubject.setAttribute("id", "cohe_collapsedsubjectlinkBox");
RSSLinkify.newSubject.setAttribute("class", "headerValue plain headerValueUrl");
RSSLinkify.newSubject.setAttribute("originalclass", "headerValue plain headerValueUrl");
RSSLinkify.newSubject.setAttribute("context", "CohecopyUrlPopup");
@@ -129,9 +127,9 @@ org.mozdev.compactHeader.RSSLinkify = function() {
RSSLinkify.newSubject.setAttribute("flex", "1");
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 3");
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
- RSSLinkify.oldSubject = document.getElementById("collapsed2LsubjectBox");
+ RSSLinkify.oldSubject = document.getElementById("cohe_collapsed2LsubjectBox");
} else {
- RSSLinkify.oldSubject = document.getElementById("collapsed1LsubjectBox");
+ RSSLinkify.oldSubject = document.getElementById("cohe_collapsed1LsubjectBox");
}
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 3");
RSSLinkify.oldSubject.parentNode.insertBefore(RSSLinkify.newSubject, RSSLinkify.oldSubject);
diff --git a/chrome/CompactHeader/content/buttonsOverlay.js b/chrome/CompactHeader/content/buttonsOverlay.js
index bbcec15..20bbe52 100644
--- a/chrome/CompactHeader/content/buttonsOverlay.js
+++ b/chrome/CompactHeader/content/buttonsOverlay.js
@@ -54,7 +54,8 @@ org.mozdev.compactHeader.buttons = function() {
}
pub.coheToggleStar = function () {
- var starButton = document.getElementById("header-view-toolbox").getElementsByAttribute("id", "button-starMessages")[0];
+ var starButton = document.getElementById("header-view-toolbox").
+ getElementsByAttribute("id", "cohe_button-starMessages")[0];
if (starButton) {
//alert("test2");
@@ -71,7 +72,7 @@ org.mozdev.compactHeader.buttons = function() {
var folderListener = {
OnItemPropertyFlagChanged: function(item, property, oldFlag, newFlag) {
var changedFlag = oldFlag ^ newFlag;
-
+
if (changedFlag & MSG_FLAG_FLAGGED) {
pub.coheToggleStar();
}
diff --git a/chrome/CompactHeader/content/buttonsOverlay.xul b/chrome/CompactHeader/content/buttonsOverlay.xul
index db50da7..3e37694 100644
--- a/chrome/CompactHeader/content/buttonsOverlay.xul
+++ b/chrome/CompactHeader/content/buttonsOverlay.xul
@@ -7,7 +7,7 @@
%messengerDTD;
]>
-<overlay id="CompactHeaderButtonsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<overlay id="cohe_ButtonsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
@@ -20,17 +20,17 @@
<toolbarbutton
class="toolbarbutton-1"
- id="button-starMessages"
+ id="cohe_button-starMessages"
label="&markStarredCmd.label;"
tooltiptext="&markStarredCmd.label;"
oncommand="goDoCommand('cmd_markAsFlagged');" />
<toolbarbutton
class="toolbarbutton-1"
- id="button-dispMUA"
+ id="cohe_button-dispMUA"
image="chrome://dispmua/content/48x48/thunderbird-windows.png"
label="display MUA"
oncommand="dispMUA.infopopup();">
</toolbarbutton>
</toolbarpalette>
-
+
</overlay>
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 5ef9309..505141d 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -110,9 +110,9 @@ org.mozdev.compactHeader.pane = function() {
var subjectBox;
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
- subjectBox = document.getElementById("collapsed2LsubjectOutBox")
+ subjectBox = document.getElementById("cohe_collapsed2LsubjectOutBox")
} else {
- subjectBox = document.getElementById("collapsed1LsubjectOutBox")
+ subjectBox = document.getElementById("cohe_collapsed1LsubjectOutBox")
}
// if (subjectBox) {
@@ -177,12 +177,12 @@ org.mozdev.compactHeader.pane = function() {
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
for (index = 0; index < gCoheCollapsedHeader2LListLongAddresses.length; index++) {
gCoheCollapsedHeaderView[gCoheCollapsedHeader2LListLongAddresses[index].name] =
- new createHeaderEntry('collapsed2L', gCoheCollapsedHeader2LListLongAddresses[index]);
+ new createHeaderEntry('cohe_collapsed2L', gCoheCollapsedHeader2LListLongAddresses[index]);
}
} else {
for (index = 0; index < gCoheCollapsedHeader1LListLongAddresses.length; index++) {
gCoheCollapsedHeaderView[gCoheCollapsedHeader1LListLongAddresses[index].name] =
- new createHeaderEntry('collapsed1L', gCoheCollapsedHeader1LListLongAddresses[index]);
+ new createHeaderEntry('cohe_collapsed1L', gCoheCollapsedHeader1LListLongAddresses[index]);
}
}
@@ -204,7 +204,7 @@ org.mozdev.compactHeader.pane = function() {
var deckHeaderView = document.getElementById("msgHeaderViewDeck");
gCoheCollapsedHeaderViewMode =
- deckHeaderView.selectedPanel == document.getElementById('collapsedHeaderView');
+ deckHeaderView.selectedPanel == document.getElementById('cohe_collapsedHeaderView');
var headerViewToolbox = document.getElementById("header-view-toolbox");
if (headerViewToolbox) {
@@ -229,14 +229,14 @@ org.mozdev.compactHeader.pane = function() {
if (gCoheCollapsedHeaderViewMode)
document.getElementById('expandedHeaderView').collapsed = true;
else
- document.getElementById('collapsedHeaderView').collapsed = true;
+ document.getElementById('cohe_collapsedHeaderView').collapsed = true;
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
- document.getElementById('collapsed1LHeadersBox').collapsed = true;
- document.getElementById('collapsed2LHeadersBox').collapsed = false;
+ document.getElementById('cohe_collapsed1LHeadersBox').collapsed = true;
+ document.getElementById('cohe_collapsed2LHeadersBox').collapsed = false;
} else {
- document.getElementById('collapsed1LHeadersBox').collapsed = false;
- document.getElementById('collapsed2LHeadersBox').collapsed = true;
+ document.getElementById('cohe_collapsed1LHeadersBox').collapsed = false;
+ document.getElementById('cohe_collapsed2LHeadersBox').collapsed = true;
}
if (coheFirstTime)
@@ -257,7 +257,7 @@ org.mozdev.compactHeader.pane = function() {
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
};
- let collapsed2LtoCcBccBox = document.getElementById("collapsed2LtoCcBccBox");
+ let collapsed2LtoCcBccBox = document.getElementById("cohe_collapsed2LtoCcBccBox");
if (collapsed2LtoCcBccBox) {
let updateEmailAddressNodeFunction = collapsed2LtoCcBccBox.updateEmailAddressNode;
function updateEmailAddressNodeNew(aEmailNode, aAddress) {
@@ -383,7 +383,7 @@ org.mozdev.compactHeader.pane = function() {
deck.selectedPanel.collapsed = true;
if (gCoheCollapsedHeaderViewMode) {
- deck.selectedPanel = document.getElementById("collapsedHeaderView")
+ deck.selectedPanel = document.getElementById("cohe_collapsedHeaderView")
coheUpdateMessageHeaders();
} else {
deck.selectedPanel = document.getElementById("expandedHeaderView");
@@ -401,16 +401,16 @@ org.mozdev.compactHeader.pane = function() {
}
function coheToggleHeaderContent() {
- var strHideLabel = document.getElementById("CoheHideDetailsLabel").value;
- var strShowLabel = document.getElementById("CoheShowDetailsLabel").value;
+ var strHideLabel = document.getElementById("cohe_CoheHideDetailsLabel").value;
+ var strShowLabel = document.getElementById("cohe_CoheShowDetailsLabel").value;
var strLabel;
var smimeBox = document.getElementById("smimeBox");
if (smimeBox != null) {
if (gCoheCollapsedHeaderViewMode) {
- var parent = document.getElementById("collapsed2LdateOutBox");
- var refElement = document.getElementById("collapsed2LdateRow");
+ var parent = document.getElementById("cohe_collapsed2LdateOutBox");
+ var refElement = document.getElementById("cohe_collapsed2LdateRow");
if (parent != null && refElement != null) {
parent.insertBefore(smimeBox, refElement);
}
@@ -429,8 +429,8 @@ org.mozdev.compactHeader.pane = function() {
if (dispMUABox != null) {
if (gCoheCollapsedHeaderViewMode) {
- var parent = document.getElementById("collapsed2LdateOutBox");
- var refElement = document.getElementById("collapsed2LdateRow");
+ var parent = document.getElementById("cohe_collapsed2LdateOutBox");
+ var refElement = document.getElementById("cohe_collapsed2LdateRow");
if (parent != null && refElement != null) {
parent.insertBefore(dispMUABox, refElement);
}
@@ -452,14 +452,14 @@ org.mozdev.compactHeader.pane = function() {
strLabel = strHideLabel;
}
- if (document.getElementById("hideDetailsMenu")) {
- document.getElementById("hideDetailsMenu").setAttribute("label", strLabel);
+ if (document.getElementById("cohe_hideDetailsMenu")) {
+ document.getElementById("cohe_hideDetailsMenu").setAttribute("label", strLabel);
}
org.mozdev.compactHeader.toolbar.toggle(gCoheCollapsedHeaderViewMode);
- if (document.getElementById("hideDetailsMenu")) {
- document.getElementById("hideDetailsMenu").setAttribute("label", strLabel);
+ if (document.getElementById("cohe_hideDetailsMenu")) {
+ document.getElementById("cohe_hideDetailsMenu").setAttribute("label", strLabel);
}
}
@@ -472,9 +472,9 @@ org.mozdev.compactHeader.pane = function() {
function coheUpdateDateValue(headerEntry, headerValue) {
//var t = currentHeaderData.date.headerValue;
var d
- d = document.getElementById("collapsed1LdateBox");
+ d = document.getElementById("cohe_collapsed1LdateBox");
d.textContent = headerValue;
- d = document.getElementById("collapsed2LdateBox");
+ d = document.getElementById("cohe_collapsed2LdateBox");
d.textContent = headerValue;
}
@@ -518,7 +518,7 @@ org.mozdev.compactHeader.pane = function() {
}
function selectEmailDisplayed() {
- var xulemail = document.getElementById("collapsedtoCcBccBox");
+ var xulemail = document.getElementById("cohe_collapsedtoCcBccBox");
if (xulemail != null) {
var nextbox = document.getAnonymousElementByAttribute(xulemail, "anonid", "longEmailAddresses");
if (nextbox != null) {
@@ -536,7 +536,7 @@ org.mozdev.compactHeader.pane = function() {
}
}
}
- var xulemail = document.getElementById("collapsedfromBox");
+ var xulemail = document.getElementById("cohe_collapsedfromBox");
if (xulemail != null) {
var nextbox = document.getAnonymousElementByAttribute(xulemail, "anonid", "longEmailAddresses");
if (nextbox != null) {
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 7b75974..78ef5bb 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -28,31 +28,31 @@
<script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
<keyset>
- <key id="hideDetailsKey"
+ <key id="cohe_hideDetailsKey"
modifiers="shift"
- key="&toggleDetails.key;"
+ key="&cohe_toggleDetails.key;"
oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
</keyset>
<menupopup id="header-toolbar-context-menu">
- <menuitem id="hidecohePreferencesButton"
- label="&dialog.title;"
+ <menuitem id="cohe_hidecohePreferencesButton"
+ label="&cohe_dialog.title;"
oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no,centerscreen,modal');"/>
</menupopup>
<deck id="msgHeaderViewDeck">
<vbox id="expandedHeaderView" orient="horizontal">
- <vbox id="hideDetailsButtonBox" insertbefore="expandedHeadersBox">
- <button id="hideDetailsButton"
- tooltiptext="&hideDetailsButton.label;"
+ <vbox id="cohe_hideDetailsButtonBox" insertbefore="expandedHeadersBox">
+ <button id="cohe_hideDetailsButton"
+ tooltiptext="&cohe_hideDetailsButton.label;"
onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
class="msgHeaderView-flat-button"/>
</vbox>
- <hbox id="coheStringTransferBox" hidden="true">
- <label id="CoheHideDetailsLabel" value="&hideDetailsButton.label;"/>
- <label id="CoheShowDetailsLabel" value="&showDetailsButton.label;"/>
+ <hbox id="cohe_coheStringTransferBox" hidden="true">
+ <label id="cohe_CoheHideDetailsLabel" value="&cohe_hideDetailsButton.label;"/>
+ <label id="cohe_CoheShowDetailsLabel" value="&cohe_showDetailsButton.label;"/>
</hbox>
<vbox id="expandedHeadersBox">
@@ -61,7 +61,7 @@
mode="icons"
defaultmode="icons">
<toolbarpalette id="header-view-toolbar-palette">
- <toolbarbutton id="hdrOtherActionsButton"
+ <toolbarbutton id="cohe_hdrOtherActionsButton"
label="&otherActionsButton.label;"
tooltiptext="&otherActionsButton.label;"
class="toolbarbutton-1 msgHeaderView-button hdrOtherActionsButton"
@@ -69,7 +69,7 @@
</toolbarpalette>
<toolbar id="header-view-toolbar"
mode="icons" defaultmode="icons"
- defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,hdrOtherActionsButton">
+ defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,cohe_hdrOtherActionsButton">
</toolbar>
</toolbox>
</hbox>
@@ -83,22 +83,22 @@
label="&otherActionsButton.label;"
class="msgHeaderView-button msgHeaderView-flat-button">
<menupopup id="otherActionsPopup" onpopupshowing="InitMessageMark()">
- <menuitem id="hdrPlane-markFlagged"
+ <menuitem id="cohe_hdrPane-markFlagged"
type="checkbox"
label="&markStarredCmd.label;"
accesskey="&markStarredCmd.accesskey;"
command="cmd_markAsFlagged"
insertbefore="viewSourceMenuItem"
key="key_toggleFlagged"/>
- <menu id="hdrPlane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
+ <menu id="cohe_hdrPane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
<menupopup id="menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
- <menuitem id="hdrPlane-viewallheaders"
+ <menuitem id="cohe_hdrPane-viewallheaders"
type="radio"
name="viewheadergroup"
label="&headersAllCmd.label;"
accesskey="&headersAllCmd.accesskey;"
command="cmd_viewAllHeader"/>
- <menuitem id="hdrPlane-viewnormalheaders"
+ <menuitem id="cohe_hdrPane-viewnormalheaders"
type="radio"
name="viewheadergroup"
label="&headersNormalCmd.label;"
@@ -107,11 +107,11 @@
</menupopup>
</menu>
<menuseparator id="otherActionPopupAfterViewSource"/>
- <menuitem id="hideDetailsMenu"
- label="&hideDetailsButton.label;"
+ <menuitem id="cohe_hideDetailsMenu"
+ label="&cohe_hideDetailsButton.label;"
oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
- <menuitem id="hidecohePreferencesButton"
- label="&dialog.title;"
+ <menuitem id="cohe_hidecohePreferencesButton"
+ label="&cohe_dialog.title;"
oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,centerscreen,dependent,all,resizable=no');"/>
</menupopup>
</button>
@@ -120,104 +120,93 @@
</vbox>
- <vbox id="dispMUAexp" collapsed="false">
- <image id="dispMUAiconExp" tooltiptext="" style="width:48px; height:48px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
+ <vbox id="cohe_dispMUAexp" collapsed="false">
+ <image id="cohe_dispMUAiconExp" tooltiptext=""
+ style="width:48px; height:48px; margin-left:2px; margin-right:2px;"
+ onclick="dispMUA.infopopup();"/>
</vbox>
</vbox>
- <vbox id="collapsedHeaderView" orient="horizontal" flex="1">
- <menupopup id="CohecopyUrlPopup" popupanchor="bottomleft">
+ <vbox id="cohe_collapsedHeaderView" orient="horizontal" flex="1">
+ <menupopup id="cohe_CohecopyUrlPopup" popupanchor="bottomleft">
<menuitem label="©LinkCmd.label;" accesskey="©LinkCmd.accesskey;"
oncommand="org.mozdev.compactHeader.RSSLinkify.CoheCopyWebsiteAddress(document.popupNode)"/>
</menupopup>
- <vbox id="showDetailsButtonBox" align="start" flex="0">
- <button id="showDetailsButton"
- tooltiptext="&showDetailsButton.label;"
+ <vbox id="cohe_showDetailsButtonBox" align="start" flex="0">
+ <button id="cohe_showDetailsButton"
+ tooltiptext="&cohe_showDetailsButton.label;"
onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
class="msgHeaderView-flat-button"/>
</vbox>
- <vbox id="collapsed1LHeadersBox" flex="1" collapsed="false">
- <hbox id="collapsed1LHeaderViewFirstLine" flex="0">
- <hbox id="collapsed1LsubjectOutBox" align="start" flex="99">
- <row id="collapsed1LsubjectRow" flex="99">
- <mail-headerfield id="collapsed1LsubjectBox" flex="99"/>
+ <vbox id="cohe_collapsed1LHeadersBox" flex="1" collapsed="false">
+ <hbox id="cohe_collapsed1LHeaderViewFirstLine" flex="0">
+ <hbox id="cohe_collapsed1LsubjectOutBox" align="start" flex="99">
+ <row id="cohe_collapsed1LsubjectRow" flex="99">
+ <mail-headerfield id="cohe_collapsed1LsubjectBox" flex="99"/>
</row>
</hbox>
- <hbox id="collapsed1LfromOutBox" align="start" flex="0">
+ <hbox id="cohe_collapsed1LfromOutBox" align="start" flex="0">
<grid flex="1">
<columns>
<column flex="0"/>
</columns>
<rows>
- <row id="collapsed1LfromRow">
- <mail-multi-emailHeaderField id="collapsed1LfromBox" flex="0"/>
+ <row id="cohe_collapsed1LfromRow">
+ <mail-multi-emailHeaderField id="cohe_collapsed1LfromBox" flex="0"/>
</row>
</rows>
</grid>
</hbox>
-<!--
- <grid id="collapsed1LtoCcBccOutBox" flex="1" hidden="true">
- <columns>
- <column flex="0"/>
- <column flex="1"/>
- </columns>
- <row id="collapsed1LtoCcBccRow" align="baseline">
- <label id="collapsed1LtoCcBccLabel" class="headerName"
- value="&toField2.label;" control="collapsed1LtoCcBccBox"/>
- <mail-multi-emailHeaderField id="collapsed1LtoCcBccBox" flex="1"/>
- </row>
- </grid>
--->
- <hbox id="collapsed1LdateOutBox" align="start" pack="end" flex="0">
- <row id="collapsed1LdateRow">
- <label id="collapsed1LdateBox" class="dateLabel" flex="1"/>
+ <hbox id="cohe_collapsed1LdateOutBox" align="start" pack="end" flex="0">
+ <row id="cohe_collapsed1LdateRow">
+ <label id="cohe_collapsed1LdateBox" class="dateLabel" flex="1"/>
</row>
</hbox>
- <header-view-button-box id="collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
+ <header-view-button-box id="cohe_collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
</hbox>
- <hbox id="collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
+ <hbox id="cohe_collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
</hbox>
</vbox>
- <vbox id="collapsed2LHeadersBox" flex="1" collapsed="true">
- <hbox id="collapsed2LHeaderViewFirstLine" flex="0">
- <hbox id="collapsed2LfromOutBox" align="start" flex="0">
+ <vbox id="cohe_collapsed2LHeadersBox" flex="1" collapsed="true">
+ <hbox id="cohe_collapsed2LHeaderViewFirstLine" flex="0">
+ <hbox id="cohe_collapsed2LfromOutBox" align="start" flex="0">
<grid flex="1">
<columns>
<column flex="0"/>
</columns>
<rows>
- <row id="collapsed2LfromRow">
- <mail-multi-emailHeaderField id="collapsed2LfromBox" flex="0"/>
+ <row id="cohe_collapsed2LfromRow">
+ <mail-multi-emailHeaderField id="cohe_collapsed2LfromBox" flex="0"/>
</row>
</rows>
</grid>
</hbox>
- <grid id="collapsed2LtoCcBccOutBox" flex="1">
+ <grid id="cohe_collapsed2LtoCcBccOutBox" flex="1">
<columns>
<column flex="0"/>
<column flex="1"/>
</columns>
<rows>
- <row id="collapsed2LtoCcBccRow" align="baseline">
- <label id="collapsed2LtoCcBccLabel" class="headerName"
- value="&toField2.label;" control="collapsed2LtoCcBccBox"/>
- <mail-multi-emailHeaderField id="collapsed2LtoCcBccBox" flex="1"/>
+ <row id="cohe_collapsed2LtoCcBccRow" align="baseline">
+ <label id="cohe_collapsed2LtoCcBccLabel" class="headerName"
+ value="&toField2.label;" control="cohe_collapsed2LtoCcBccBox"/>
+ <mail-multi-emailHeaderField id="cohe_collapsed2LtoCcBccBox" flex="1"/>
</row>
</rows>
</grid>
- <header-view-button-box id="collapsed2LButtonBox" flex="0" align="start"/>
+ <header-view-button-box id="cohe_collapsed2LButtonBox" flex="0" align="start"/>
</hbox>
- <hbox id="collapsed2LHeaderViewSecondLine" align="top" flex="1">
- <hbox id="collapsed2LsubjectOutBox" align="top" flex="99">
- <row id="collapsed2LsubjectRow" flex="99">
- <mail-headerfield id="collapsed2LsubjectBox" flex="99"/>
+ <hbox id="cohe_collapsed2LHeaderViewSecondLine" align="top" flex="1">
+ <hbox id="cohe_collapsed2LsubjectOutBox" align="top" flex="99">
+ <row id="cohe_collapsed2LsubjectRow" flex="99">
+ <mail-headerfield id="cohe_collapsed2LsubjectBox" flex="99"/>
</row>
</hbox>
- <hbox id="collapsed2LdateOutBox" align="top" pack="end" flex="0">
- <row id="collapsed2LdateRow" align="top" pack="end">
- <label id="collapsed2LdateBox" class="dateLabel" flex="1"/>
+ <hbox id="cohe_collapsed2LdateOutBox" align="top" pack="end" flex="0">
+ <row id="cohe_collapsed2LdateRow" align="top" pack="end">
+ <label id="cohe_collapsed2LdateBox" class="dateLabel" flex="1"/>
</row>
</hbox>
</hbox>
@@ -226,12 +215,18 @@
</vbox>
- <vbox id="dispMUA2line">
- <image id="dispMUAicon2line" tooltiptext="" style="width:32px; height:32px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
+ <vbox id="cohe_dispMUA2line">
+ <image id="cohe_dispMUAicon2line"
+ tooltiptext=""
+ style="width:32px; height:32px; margin-left:2px; margin-right:2px;"
+ onclick="dispMUA.infopopup();"/>
</vbox>
- <vbox id="dispMUAcompact">
- <image id="dispMUAiconCompact" tooltiptext="" style="width:24px; height:24px; margin:-2px 2px -2px 2px;" onclick="dispMUA.infopopup();"/>
+ <vbox id="cohe_dispMUAcompact">
+ <image id="cohe_dispMUAiconCompact"
+ tooltiptext=""
+ style="width:24px; height:24px; margin:-2px 2px -2px 2px;"
+ onclick="dispMUA.infopopup();"/>
</vbox>
diff --git a/chrome/CompactHeader/content/customizeToolbarOverlay.xul b/chrome/CompactHeader/content/customizeToolbarOverlay.xul
index 35246f5..c3ac9bf 100644
--- a/chrome/CompactHeader/content/customizeToolbarOverlay.xul
+++ b/chrome/CompactHeader/content/customizeToolbarOverlay.xul
@@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
-<overlay id="customizeToolbarOverlay"
+<overlay id="cohe_customizeToolbarOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://CompactHeader/content/debug.js"/>
@@ -15,6 +15,4 @@
<script type="application/javascript" src="chrome://CompactHeader/content/RSSLinkify.js"/>
<script type="application/javascript" src="chrome://CompactHeader/content/toolbar.js"/>
- <window id="CustomizeToolbarWindow"
- windowtype="mail:customizetoolbar"/>
</overlay>
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index b122f5c..5dbc4f8 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -18,33 +18,33 @@
void(openDialog("chrome://CompactHeader/content/preferences.xul"))
-->
-<prefwindow id="cohePreferences"
- title="&dialog.title;"
+<prefwindow id="cohe_Preferences"
+ title="&cohe_dialog.title;"
windowtype="ext:options"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="cohePreferences-pane">
<preferences>
- <preference id="cohetwolineview"
+ <preference id="cohe_twolineview"
name="extensions.CompactHeader.headersize.twolineview" type="bool"/>
- <preference id="cohelinkify"
+ <preference id="cohe_linkify"
name="extensions.CompactHeader.headersize.linkify" type="bool"/>
- <preference id="coheaddressstyle"
+ <preference id="cohe_addressstyle"
name="extensions.CompactHeader.headersize.addressstyle" type="bool"/>
- <preference id="coheflatButtons"
+ <preference id="cohe_flatButtons"
name="extensions.CompactHeader.headersize.flatButtons" type="bool"/>
</preferences>
- <checkbox id="checkboxCompactTwolineView"
- preference="cohetwolineview"
- label="&checkbox.Compact.TwolineView.caption;"/>
- <checkbox id="checkboxLinkify"
- preference="cohelinkify"
- label="&menu.Linkify.caption;"/>
- <checkbox id="checkboxShowOnlyAddress"
- preference="coheaddressstyle"
- label="&menu.ShowOnlyAddress.caption;"/>
- <checkbox id="checkboxflatButtons"
- preference="coheflatButtons"
- label="&menu.flatButtons.caption;"/>
+ <checkbox id="cohe_checkboxCompactTwolineView"
+ preference="cohe_twolineview"
+ label="&cohe_checkbox.Compact.TwolineView.caption;"/>
+ <checkbox id="cohe_checkboxLinkify"
+ preference="cohe_linkify"
+ label="&cohe_menu.Linkify.caption;"/>
+ <checkbox id="cohe_checkboxShowOnlyAddress"
+ preference="cohe_addressstyle"
+ label="&cohe_menu.ShowOnlyAddress.caption;"/>
+ <checkbox id="cohe_checkboxflatButtons"
+ preference="cohe_flatButtons"
+ label="&cohe_menu.flatButtons.caption;"/>
</prefpane>
</prefwindow>
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 60b9936..129e389 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -61,7 +61,7 @@ org.mozdev.compactHeader.toolbar = function() {
var hdrToolbox = document.getElementById("header-view-toolbox");
var buttons = ["button-reply", "button-replyall", "button-replylist",
"button-tag", "button-forward", "button-archive", "button-file",
- "button-print", "button-mark", "button-starMessages",
+ "button-print", "button-mark", "cohe_button-starMessages",
"button-newmsg", "button-goback", "button-goforward",
"button-previous", "button-next", "button-compact",
"button-address", "button-stop", "button-getmsg",
@@ -76,7 +76,7 @@ org.mozdev.compactHeader.toolbar = function() {
//"realPrevMessageButton", "realNextMessageButton",
"lightningbutton-convert-to-task",
"lightningbutton-convert-to-event",
- "button-dispMUA"];
+ "cohe_button-dispMUA"];
var currentSet=hdrToolbar.getAttribute("currentset");
hdrToolbar.currentSet = currentSet;
for (var i=0; i<buttons.length; i++) {
@@ -125,7 +125,7 @@ org.mozdev.compactHeader.toolbar = function() {
}
}
- var target = "hdrOtherActionsButton";
+ var target = "cohe_hdrOtherActionsButton";
var newParent = document.getElementById(target) ||
document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", target)[0];
@@ -202,12 +202,12 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("toolbar toggle start");
var hdrToolbox = document.getElementById("header-view-toolbox");
var hdrToolbar = document.getElementById("header-view-toolbar");
- var strHideLabel = document.getElementById("CoheHideDetailsLabel").value;
- var strShowLabel = document.getElementById("CoheShowDetailsLabel").value;
+ var strHideLabel = document.getElementById("cohe_CoheHideDetailsLabel").value;
+ var strShowLabel = document.getElementById("cohe_CoheShowDetailsLabel").value;
var firstPermanentChild = hdrToolbar.firstPermanentChild;
var lastPermanentChild = hdrToolbar.lastPermanentChild;
if (aHeaderViewMode) {
- var cBox = document.getElementById("collapsed2LButtonBox");
+ var cBox = document.getElementById("cohe_collapsed2LButtonBox");
if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
var cloneToolboxPalette;
var cloneToolbarset;
@@ -248,42 +248,42 @@ org.mozdev.compactHeader.toolbar = function() {
pub.dispMUACheck = function() {
org.mozdev.compactHeader.debug.log("dispMUACheck start");
- var dispMUAButton = document.getElementById("button-dispMUA");
+ var dispMUAButton = document.getElementById("cohe_button-dispMUA");
var dispMUABox = document.getElementById("dispMUA");
if (dispMUABox) {
dispMUABox.setAttribute("collapsed", "true"); // hide original
var IconContainerDispMUA = null;
if (dispMUAButton) {
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconExp")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAicon2line")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconCompact")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
}
else if (dispMUABox){
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconExp")) {
IconContainerDispMUA.removeAttribute("collapsed");
}
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAicon2line"))
IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconCompact"))
IconContainerDispMUA.setAttribute("collapsed", "true");
}
else {
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconCompact"))
IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAicon2line"))
IconContainerDispMUA.setAttribute("collapsed", "true");
}
}
@@ -291,15 +291,15 @@ org.mozdev.compactHeader.toolbar = function() {
else {
var IconContainerDispMUA = null;
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconExp")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAicon2line")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconCompact")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
}
@@ -312,19 +312,19 @@ org.mozdev.compactHeader.toolbar = function() {
var imageSrc = document.getElementById("dispMUAicon").getAttribute("src");
var IconContainerDispMUA = null;
/* toolbar button */
- if (IconContainerDispMUA = document.getElementById("button-dispMUA")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_button-dispMUA")) {
IconContainerDispMUA.setAttribute("image", imageSrc);
}
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconExp")) {
IconContainerDispMUA.setAttribute("src", imageSrc);
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAicon2line")) {
IconContainerDispMUA.setAttribute("src", imageSrc);
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconCompact")) {
IconContainerDispMUA.setAttribute("src", imageSrc);
}
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
@@ -332,20 +332,20 @@ org.mozdev.compactHeader.toolbar = function() {
else if (event.attrName == "tooltiptext") {
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
var tooltipText = document.getElementById("dispMUAicon").getAttribute("tooltiptext");
- var buttonDispMUA = document.getElementById("button-dispMUA");
+ var buttonDispMUA = document.getElementById("cohe_button-dispMUA");
if (buttonDispMUA) {
buttonDispMUA.setAttribute("tooltiptext", tooltipText);
}
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconExp")) {
IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAicon2line")) {
IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ if (IconContainerDispMUA = document.getElementById("cohe_dispMUAiconCompact")) {
IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
}
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
@@ -395,17 +395,19 @@ org.mozdev.compactHeader.toolbar = function() {
function removeButtonDispMUA() {
org.mozdev.compactHeader.debug.log("removeButtonDispMUA start");
if (!document.getElementById("dispMUA")) {
- var button = document.getElementById("button-dispMUA");
+ var button = document.getElementById("cohe_button-dispMUA");
if (button) {
button.parentNode.removeChild(button);
}
- var button1 = document.getElementById("mail-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
+ var button1 = document.getElementById("mail-toolbox").palette.
+ getElementsByAttribute("id", "cohe_button-dispMUA")[0];
if (button1) {
button1.parentNode.removeChild(button1);
}
- var button2 = document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
+ var button2 = document.getElementById("header-view-toolbox").palette.
+ getElementsByAttribute("id", "cohe_button-dispMUA")[0];
if (button2) {
button2.parentNode.removeChild(button2);
}
diff --git a/chrome/CompactHeader/locale/da-DK/CompactHeader.dtd b/chrome/CompactHeader/locale/da-DK/CompactHeader.dtd
index 0c38b91..8832203 100644
--- a/chrome/CompactHeader/locale/da-DK/CompactHeader.dtd
+++ b/chrome/CompactHeader/locale/da-DK/CompactHeader.dtd
@@ -35,6 +35,6 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY hideDetailsButton.label "Skjul detaljer">
-<!ENTITY toggleDetails.key "d">
-<!ENTITY showDetailsButton.label "Vis detaljer">
+<!ENTITY cohe_hideDetailsButton.label "Skjul detaljer">
+<!ENTITY cohe_toggleDetails.key "d">
+<!ENTITY cohe_showDetailsButton.label "Vis detaljer">
diff --git a/chrome/CompactHeader/locale/da-DK/preferences.dtd b/chrome/CompactHeader/locale/da-DK/preferences.dtd
index 02d3db5..3e80e97 100644
--- a/chrome/CompactHeader/locale/da-DK/preferences.dtd
+++ b/chrome/CompactHeader/locale/da-DK/preferences.dtd
@@ -35,8 +35,8 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY dialog.title "CompactHeader Indstillinger">
-<!ENTITY checkbox.Compact.TwolineView.caption "Vis to linjer i sammenfoldet visning">
-<!ENTITY menu.Linkify.caption "Link i feed-emner">
-<!ENTITY menu.ShowOnlyAddress.caption "Vis kun adresse">
-<!ENTITY menu.flatButtons.caption "Flade knapper">
+<!ENTITY cohe_dialog.title "CompactHeader Indstillinger">
+<!ENTITY cohe_checkbox.Compact.TwolineView.caption "Vis to linjer i sammenfoldet visning">
+<!ENTITY cohe_menu.Linkify.caption "Link i feed-emner">
+<!ENTITY cohe_menu.ShowOnlyAddress.caption "Vis kun adresse">
+<!ENTITY cohe_menu.flatButtons.caption "Flade knapper">
diff --git a/chrome/CompactHeader/locale/de-DE/CompactHeader.dtd b/chrome/CompactHeader/locale/de-DE/CompactHeader.dtd
index a440ea4..ed1c026 100644
--- a/chrome/CompactHeader/locale/de-DE/CompactHeader.dtd
+++ b/chrome/CompactHeader/locale/de-DE/CompactHeader.dtd
@@ -35,6 +35,6 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY hideDetailsButton.label "Details verbergen">
-<!ENTITY toggleDetails.key "h">
-<!ENTITY showDetailsButton.label "Details anzeigen">
+<!ENTITY cohe_hideDetailsButton.label "Details verbergen">
+<!ENTITY cohe_toggleDetails.key "h">
+<!ENTITY cohe_showDetailsButton.label "Details anzeigen">
diff --git a/chrome/CompactHeader/locale/de-DE/preferences.dtd b/chrome/CompactHeader/locale/de-DE/preferences.dtd
index 3af6fda..dd0d246 100644
--- a/chrome/CompactHeader/locale/de-DE/preferences.dtd
+++ b/chrome/CompactHeader/locale/de-DE/preferences.dtd
@@ -35,8 +35,8 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY dialog.title "CompactHeader Einstellungen">
-<!ENTITY checkbox.Compact.TwolineView.caption "Kompakte Headeranzeige mit zwei Zeilen">
-<!ENTITY menu.Linkify.caption "Link in Betreff von RSS Feeds">
-<!ENTITY menu.ShowOnlyAddress.caption "Nur Adresse anzeigen">
-<!ENTITY menu.flatButtons.caption "Flache Schaltflächen">
+<!ENTITY cohe_dialog.title "CompactHeader Einstellungen">
+<!ENTITY cohe_checkbox.Compact.TwolineView.caption "Kompakte Headeranzeige mit zwei Zeilen">
+<!ENTITY cohe_menu.Linkify.caption "Link in Betreff von RSS Feeds">
+<!ENTITY cohe_menu.ShowOnlyAddress.caption "Nur Adresse anzeigen">
+<!ENTITY cohe_menu.flatButtons.caption "Flache Schaltflächen">
diff --git a/chrome/CompactHeader/locale/en-US/CompactHeader.dtd b/chrome/CompactHeader/locale/en-US/CompactHeader.dtd
index 3eb2903..2a09f60 100644
--- a/chrome/CompactHeader/locale/en-US/CompactHeader.dtd
+++ b/chrome/CompactHeader/locale/en-US/CompactHeader.dtd
@@ -35,6 +35,6 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY hideDetailsButton.label "Hide details">
-<!ENTITY toggleDetails.key "h">
-<!ENTITY showDetailsButton.label "Show details">
+<!ENTITY cohe_hideDetailsButton.label "Hide details">
+<!ENTITY cohe_toggleDetails.key "h">
+<!ENTITY cohe_showDetailsButton.label "Show details">
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index 2571c05..b646dbf 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -35,8 +35,8 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY dialog.title "CompactHeader Preferences">
-<!ENTITY checkbox.Compact.TwolineView.caption "Display two lines in compact view">
-<!ENTITY menu.Linkify.caption "Link in subjects of RSS feeds">
-<!ENTITY menu.ShowOnlyAddress.caption "Display only address">
-<!ENTITY menu.flatButtons.caption "Flat buttons">
+<!ENTITY cohe_dialog.title "CompactHeader Preferences">
+<!ENTITY cohe_checkbox.Compact.TwolineView.caption "Display two lines in compact view">
+<!ENTITY cohe_menu.Linkify.caption "Link in subjects of RSS feeds">
+<!ENTITY cohe_menu.ShowOnlyAddress.caption "Display only address">
+<!ENTITY cohe_menu.flatButtons.caption "Flat buttons">
diff --git a/chrome/CompactHeader/locale/es-ES/CompactHeader.dtd b/chrome/CompactHeader/locale/es-ES/CompactHeader.dtd
index 12455a4..c2abc83 100644
--- a/chrome/CompactHeader/locale/es-ES/CompactHeader.dtd
+++ b/chrome/CompactHeader/locale/es-ES/CompactHeader.dtd
@@ -35,6 +35,6 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY hideDetailsButton.label "Ocultar detalles">
-<!ENTITY toggleDetails.key "t">
-<!ENTITY showDetailsButton.label "Mostrar detalles">
+<!ENTITY cohe_hideDetailsButton.label "Ocultar detalles">
+<!ENTITY cohe_toggleDetails.key "t">
+<!ENTITY cohe_showDetailsButton.label "Mostrar detalles">
diff --git a/chrome/CompactHeader/locale/es-ES/preferences.dtd b/chrome/CompactHeader/locale/es-ES/preferences.dtd
index eda4fbc..b454713 100644
--- a/chrome/CompactHeader/locale/es-ES/preferences.dtd
+++ b/chrome/CompactHeader/locale/es-ES/preferences.dtd
@@ -35,13 +35,13 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY dialog.title "Preferencias de CompactHeader">
-<!ENTITY checkbox.Compact.TwolineView.caption "Usar dos filas para la vista compacta">
-<!ENTITY menu.Linkify.caption "Mostrar asunto como un enlace en los canales RSS">
-<!ENTITY menu.ShowOnlyAddress.caption "Mostrar sólo las direcciones de correo">
-<!ENTITY menu.flatButtons.caption "Mostrar botones planos">
-<!ENTITY radiobox.ToolbarPosition.caption "Posición de la barra de herramientas de cabeceras">
-<!ENTITY radiobox.ToolbarPosition.right "Derecha">
-<!ENTITY radiobox.ToolbarPosition.top "Arriba">
-<!ENTITY radiobox.ToolbarPosition.left "Izquierda">
-<!ENTITY radiobox.ToolbarPosition.none "Invisible">
\ No newline at end of file
+<!ENTITY cohe_dialog.title "Preferencias de CompactHeader">
+<!ENTITY cohe_checkbox.Compact.TwolineView.caption "Usar dos filas para la vista compacta">
+<!ENTITY cohe_menu.Linkify.caption "Mostrar asunto como un enlace en los canales RSS">
+<!ENTITY cohe_menu.ShowOnlyAddress.caption "Mostrar sólo las direcciones de correo">
+<!ENTITY cohe_menu.flatButtons.caption "Mostrar botones planos">
+<!ENTITY cohe_radiobox.ToolbarPosition.caption "Posición de la barra de herramientas de cabeceras">
+<!ENTITY cohe_radiobox.ToolbarPosition.right "Derecha">
+<!ENTITY cohe_radiobox.ToolbarPosition.top "Arriba">
+<!ENTITY cohe_radiobox.ToolbarPosition.left "Izquierda">
+<!ENTITY cohe_radiobox.ToolbarPosition.none "Invisible">
\ No newline at end of file
diff --git a/chrome/CompactHeader/locale/fr-FR/CompactHeader.dtd b/chrome/CompactHeader/locale/fr-FR/CompactHeader.dtd
index b851d41..2742dba 100644
--- a/chrome/CompactHeader/locale/fr-FR/CompactHeader.dtd
+++ b/chrome/CompactHeader/locale/fr-FR/CompactHeader.dtd
@@ -35,6 +35,6 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY hideDetailsButton.label "Vue compacte">
-<!ENTITY toggleDetails.key "h">
-<!ENTITY showDetailsButton.label "Vue détaillée">
+<!ENTITY cohe_hideDetailsButton.label "Vue compacte">
+<!ENTITY cohe_toggleDetails.key "h">
+<!ENTITY cohe_showDetailsButton.label "Vue détaillée">
diff --git a/chrome/CompactHeader/locale/fr-FR/preferences.dtd b/chrome/CompactHeader/locale/fr-FR/preferences.dtd
index b2dce7f..d3d7de7 100644
--- a/chrome/CompactHeader/locale/fr-FR/preferences.dtd
+++ b/chrome/CompactHeader/locale/fr-FR/preferences.dtd
@@ -35,13 +35,13 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY dialog.title "Préférences de CompactHeader">
-<!ENTITY checkbox.Compact.TwolineView.caption "Afficher la vue compacte sur deux lignes">
-<!ENTITY menu.Linkify.caption "Transformer en lien les sujets des fils RSS">
-<!ENTITY menu.ShowOnlyAddress.caption "Afficher seulement les adresses des courriels">
-<!ENTITY menu.flatButtons.caption "Boutons plats">
-<!ENTITY radiobox.ToolbarPosition.caption "Position de la barre d'outil">
-<!ENTITY radiobox.ToolbarPosition.right "droite">
-<!ENTITY radiobox.ToolbarPosition.top "haut">
-<!ENTITY radiobox.ToolbarPosition.left "gauche">
-<!ENTITY radiobox.ToolbarPosition.none "invisible">
+<!ENTITY cohe_dialog.title "Préférences de CompactHeader">
+<!ENTITY cohe_checkbox.Compact.TwolineView.caption "Afficher la vue compacte sur deux lignes">
+<!ENTITY cohe_menu.Linkify.caption "Transformer en lien les sujets des fils RSS">
+<!ENTITY cohe_menu.ShowOnlyAddress.caption "Afficher seulement les adresses des courriels">
+<!ENTITY cohe_menu.flatButtons.caption "Boutons plats">
+<!ENTITY cohe_radiobox.ToolbarPosition.caption "Position de la barre d'outil">
+<!ENTITY cohe_radiobox.ToolbarPosition.right "droite">
+<!ENTITY cohe_radiobox.ToolbarPosition.top "haut">
+<!ENTITY cohe_radiobox.ToolbarPosition.left "gauche">
+<!ENTITY cohe_radiobox.ToolbarPosition.none "invisible">
diff --git a/chrome/CompactHeader/locale/it-IT/CompactHeader.dtd b/chrome/CompactHeader/locale/it-IT/CompactHeader.dtd
index b72f5cb..19e9b85 100644
--- a/chrome/CompactHeader/locale/it-IT/CompactHeader.dtd
+++ b/chrome/CompactHeader/locale/it-IT/CompactHeader.dtd
@@ -35,6 +35,6 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY hideDetailsButton.label "Nascondi dettagli">
-<!ENTITY toggleDetails.key "h">
-<!ENTITY showDetailsButton.label "Mostra dettagli">
+<!ENTITY cohe_hideDetailsButton.label "Nascondi dettagli">
+<!ENTITY cohe_toggleDetails.key "h">
+<!ENTITY cohe_showDetailsButton.label "Mostra dettagli">
diff --git a/chrome/CompactHeader/locale/it-IT/preferences.dtd b/chrome/CompactHeader/locale/it-IT/preferences.dtd
index 856b578..df819b7 100644
--- a/chrome/CompactHeader/locale/it-IT/preferences.dtd
+++ b/chrome/CompactHeader/locale/it-IT/preferences.dtd
@@ -35,8 +35,8 @@
***** END LICENSE BLOCK ***** -->
-<!ENTITY dialog.title "Preferenze di CompactHeader">
-<!ENTITY checkbox.Compact.TwolineView.caption "Mostra due linee nella visualizzazione compatta">
-<!ENTITY menu.Linkify.caption "Link nell'oggetto dei feed RSS">
-<!ENTITY menu.ShowOnlyAddress.caption "Mostra solo l'indirizzo">
-<!ENTITY menu.flatButtons.caption "Pulsanti piani">
\ No newline at end of file
+<!ENTITY cohe_dialog.title "Preferenze di CompactHeader">
+<!ENTITY cohe_checkbox.Compact.TwolineView.caption "Mostra due linee nella visualizzazione compatta">
+<!ENTITY cohe_menu.Linkify.caption "Link nell'oggetto dei feed RSS">
+<!ENTITY cohe_menu.ShowOnlyAddress.caption "Mostra solo l'indirizzo">
+<!ENTITY cohe_menu.flatButtons.caption "Pulsanti piani">
\ No newline at end of file
diff --git a/chrome/CompactHeader/skin/common/buttonsOverlay.css b/chrome/CompactHeader/skin/common/buttonsOverlay.css
index f2f3bfb..a5b9c69 100644
--- a/chrome/CompactHeader/skin/common/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/common/buttonsOverlay.css
@@ -38,26 +38,26 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-#button-starMessages{
+#cohe_button-starMessages{
list-style-image: url("chrome://messenger/skin/starred48.png");
}
-#button-starMessages .toolbarbutton-icon {
+#cohe_button-starMessages .toolbarbutton-icon {
height: 24px;
width: 24px;
}
-toolbar[iconsize="small"] #button-starMessages .toolbarbutton-icon {
+toolbar[iconsize="small"] #cohe_button-starMessages .toolbarbutton-icon {
height: 16px;
width: 16px;
}
-#button-dispMUA .toolbarbutton-icon {
- width:24px;
+#cohe_button-dispMUA .toolbarbutton-icon {
+ width:24px;
height:24px;
}
-toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
- width:18px;
+toolbar[iconsize="small"] #cohe_button-dispMUA .toolbarbutton-icon {
+ width:18px;
height:18px;
}
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 9aed338..258bf43 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -43,43 +43,43 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: msg header toolbars ::::: */
-#collapsedHeaderView {
+#cohe_collapsedHeaderView {
min-width: 1px;
}
-#collapsed1LtoCcBccLabel {
+#cohe_collapsed1LtoCcBccLabel {
-moz-padding-start: 2px;
-moz-padding-end: 1px;
}
-#collapsedHeaderView {
+#cohe_collapsedHeaderView {
overflow-y: hidden;
overflow-x: hidden;
max-height: 30em;
}
-#collapsed1LHeaderRows > row,
-#collapsed1LHeader2Rows > row {
+#cohe_collapsed1LHeaderRows > row,
+#cohe_collapsed1LHeader2Rows > row {
/* Ensure that the header names and values are aligned with each other. */
-moz-box-align: baseline;
}
-#collapsedHeadersTopBox {
+#cohe_collapsedHeadersTopBox {
/* Ensure that the space between the from row and the one after is
identical to the spacing between the subsequent header lines. */
-moz-box-align: end;
}
-#collapsed1LHeaderViewFirstLine {
+#cohe_collapsed1LHeaderViewFirstLine {
-moz-box-align: baseline;
}
-#collapsed2LHeaderViewFirstLine {
+#cohe_collapsed2LHeaderViewFirstLine {
-moz-box-align: start;
}
-#collapsed1LsubjectBox > .headerValue {
+#cohe_collapsed1LsubjectBox > .headerValue {
font-weight: bold;
}
@@ -96,48 +96,50 @@
margin: 0px;
}
-#collapsed1LtoCcBccBox .headerNameBox,
-#collapsed1LfromBox .headerNameBox {
+#cohe_collapsed1LtoCcBccBox .headerNameBox,
+#cohe_collapsed1LfromBox .headerNameBox {
display: none;
}
-#collapsed1LfromBox > .headerNameBox {
+
+#cohe_collapsed1LfromBox > .headerNameBox {
display: none;
}
-#otherActionsButton[OnlyIcon="Text"] .button-text,
+#cohe_otherActionsButton[OnlyIcon="Text"] .button-text,
#tagMenuPopup[OnlyIcon="Text"] .button-text {
-moz-padding-end: 1px;
-moz-padding-start: 5px;
}
-#otherActionsButton[OnlyIcon="Icon"] .button-text,
+#cohe_otherActionsButton[OnlyIcon="Icon"] .button-text,
#tagMenuPopup[OnlyIcon="Icon"] .button-text {
display: none;
}
-#otherActionsButton .button-icon,
-#tagMenuPopup .button-icon {
+#cohe_otherActionsButton .button-icon,
+#cohe_tagMenuPopup .button-icon {
-moz-margin-start: 1px;
-moz-margin-end: 1px;
}
-#collapsedHeaderDisplayName {
+#cohe_collapsedHeaderDisplayName {
text-align: left;
}
-#collapsedsubjectlinkBox,
-#collapsed1LsubjectBox,
-#collapsed2LsubjectBox {
+#cohe_collapsedsubjectlinkBox,
+#cohe_collapsed1LsubjectBox,
+#cohe_collapsed2LsubjectBox {
font-weight: bold;
}
-#collapsed1LdateBox {
+#cohe_collapsed1LdateBox {
-moz-box-align: stretch;
text-align: right;
-moz-padding-end: 0.5em;
}
-#hideDetailsButton:hover, #hideDetailsButton {
+#cohe_hideDetailsButton:hover,
+#cohe_hideDetailsButton {
-moz-appearance: none;
border: 2px solid transparent;
background-color: transparent;
@@ -153,7 +155,8 @@
-moz-margin-start: 2px;
}
-#showDetailsButton:hover, #showDetailsButton {
+#cohe_showDetailsButton:hover,
+#cohe_showDetailsButton {
-moz-appearance: none;
border: 2px solid transparent;
background-color: transparent;
@@ -170,10 +173,13 @@
}
#expandedfromBox,
-#collapsed1LtoCcBccRow,
-#collapsed1LsubjectOutBox, #collapsed1LfromOutBox,#collapsedButtonBox,
+#cohe_collapsed1LtoCcBccRow,
+#cohe_collapsed1LsubjectOutBox,
+#cohe_collapsed1LfromOutBox,
+#cohe_collapsedButtonBox,
#expandedButtonBox,
-#collapsed1LsubjectBox, #collapsed1LfromBox {
+#cohe_collapsed1LsubjectBox,
+#cohe_collapsed1LfromBox {
margin: 0px;
padding: 0px;
}
@@ -182,22 +188,24 @@
-moz-box-align: start;
}
-#expandedfromBox, #collapsed1LfromOutBox, #collapsed1LtoCcBccOutBox,
-#collapsed2LfromOutBox,
-#collapsed2LtoCcBccOutBox {
+#expandedfromBox,
+#cohe_collapsed1LfromOutBox,
+#cohe_collapsed1LtoCcBccOutBox,
+#cohe_collapsed2LfromOutBox,
+#cohe_collapsed2LtoCcBccOutBox {
margin-top: 2px;
}
-#collapsed2LsubjectBox {
+#cohe_collapsed2LsubjectBox {
-moz-margin-start: 0px;
}
-#collapsed2LdateBox {
+#cohe_collapsed2LdateBox {
-moz-margin-end: 5px;
}
-#collapsedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-text,
-#expandedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-text {
+#cohe_collapsedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-text,
+#cohe_expandedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-text {
display: none;
}
@@ -220,39 +228,39 @@
display: none;
}
-#collapsedHeaderView #signedHdrIcon[signed="ok"] {
+#cohe_collapsedHeaderView #signedHdrIcon[signed="ok"] {
list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
}
-#collapsedHeaderView #signedHdrIcon[signed="unknown"] {
+#cohe_collapsedHeaderView #signedHdrIcon[signed="unknown"] {
list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
}
-#collapsedHeaderView #signedHdrIcon[signed="mismatch"] {
+#cohe_collapsedHeaderView #signedHdrIcon[signed="mismatch"] {
list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
}
-#collapsedHeaderView #signedHdrIcon[signed="notok"] {
+#cohe_collapsedHeaderView #signedHdrIcon[signed="notok"] {
list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
}
-#collapsedHeaderView #encryptedHdrIcon[encrypted="ok"] {
+#cohe_collapsedHeaderView #encryptedHdrIcon[encrypted="ok"] {
list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
}
-#collapsedHeaderView #encryptedHdrIcon[encrypted="notok"] {
+#cohe_collapsedHeaderView #encryptedHdrIcon[encrypted="notok"] {
list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
}
-#collapsedHeaderView #signedHdrIcon {
+#cohe_collapsedHeaderView #signedHdrIcon {
-moz-margin-end: 3px;
}
-#collapsed2LtoCcBccBox mail-emailaddress[addressType="cc"] {
+#cohe_collapsed2LtoCcBccBox mail-emailaddress[addressType="cc"] {
font-style:italic;
}
-#collapsed2LtoCcBccBox mail-emailaddress[addressType="bcc"] {
+#cohe_collapsed2LtoCcBccBox mail-emailaddress[addressType="bcc"] {
font-style:oblique;
text-decoration:underline;
}
diff --git a/chrome/CompactHeader/skin/gnome/buttonsOverlay.css b/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
index b7817b4..dc80aa5 100644
--- a/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
@@ -38,42 +38,42 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-#button-starMessages{
+#cohe_button-starMessages{
list-style-image: url("chrome://messenger/skin/starred48.png");
}
-#button-starMessages .toolbarbutton-icon {
+#cohe_button-starMessages .toolbarbutton-icon {
height: 24px;
width: 24px;
}
-toolbar[iconsize="small"] #button-starMessages .toolbarbutton-icon {
+toolbar[iconsize="small"] #cohe_button-starMessages .toolbarbutton-icon {
height: 16px;
width: 16px;
}
-#header-view-toolbox #button-starMessages{
+#header-view-toolbox #cohe_button-starMessages{
list-style-image: url("chrome://CompactHeader-os/skin/flag-empty.png");
}
-#header-view-toolbox #button-starMessages[flagged]{
+#header-view-toolbox #cohe_button-starMessages[flagged]{
list-style-image: url("chrome://CompactHeader-os/skin/flag.png");
}
-#header-view-toolbox #button-starMessages .toolbarbutton-icon {
+#header-view-toolbox #cohe_button-starMessages .toolbarbutton-icon {
-moz-image-region: rect(-6px 18px 18px -6px);
}
-#header-view-toolbox toolbar[iconsize="small"] #button-starMessages .toolbarbutton-icon {
+#header-view-toolbox toolbar[iconsize="small"] #cohe_button-starMessages .toolbarbutton-icon {
-moz-image-region: rect(-2px 14px 14px -2px);
}
-#button-dispMUA .toolbarbutton-icon {
- width:24px;
+#cohe_button-dispMUA .toolbarbutton-icon {
+ width:24px;
height:24px;
}
-toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
- width:18px;
+toolbar[iconsize="small"] #cohe_button-dispMUA .toolbarbutton-icon {
+ width:18px;
height:18px;
}
diff --git a/chrome/CompactHeader/skin/gnome/osdef.css b/chrome/CompactHeader/skin/gnome/osdef.css
index 23be058..8723d4e 100644
--- a/chrome/CompactHeader/skin/gnome/osdef.css
+++ b/chrome/CompactHeader/skin/gnome/osdef.css
@@ -139,7 +139,7 @@ toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-flat-button-out .t
-moz-margin-start: 2px !important;
}
-#collapsedHeaderView #dispMUAicon {
+#cohe_collapsedHeaderView #cohe_dispMUAicon {
height: 20px !important;
width: 20px !important;
}
diff --git a/chrome/CompactHeader/skin/mac/buttonsOverlay.css b/chrome/CompactHeader/skin/mac/buttonsOverlay.css
index 369a1dc..6c3c1ad 100644
--- a/chrome/CompactHeader/skin/mac/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/mac/buttonsOverlay.css
@@ -38,42 +38,42 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-#button-starMessages{
+#cohe_button-starMessages{
list-style-image: url("chrome://messenger/skin/starred48.png");
}
-#button-starMessages .toolbarbutton-icon {
+#cohe_button-starMessages .toolbarbutton-icon {
height: 32px;
width: 32px;
}
-toolbar[iconsize="small"] #button-starMessages .toolbarbutton-icon {
+toolbar[iconsize="small"] #cohe_button-starMessages .toolbarbutton-icon {
height: 24px;
width: 24px;
}
-#header-view-toolbox #button-starMessages{
+#header-view-toolbox #cohe_button-starMessages{
list-style-image: url("chrome://CompactHeader-os/skin/flag-empty.png");
}
-#header-view-toolbox #button-starMessages[flagged]{
+#header-view-toolbox #cohe_button-starMessages[flagged]{
list-style-image: url("chrome://CompactHeader-os/skin/flag.png");
}
-#header-view-toolbox #button-starMessages .toolbarbutton-icon {
+#header-view-toolbox #cohe_button-starMessages .toolbarbutton-icon {
-moz-image-region: rect(-10px 22px 22px -10px);
}
-#header-view-toolbox toolbar[iconsize="small"] #button-starMessages .toolbarbutton-icon {
+#header-view-toolbox toolbar[iconsize="small"] #cohe_button-starMessages .toolbarbutton-icon {
-moz-image-region: rect(-6px 18px 18px -6px);
}
-#button-dispMUA .toolbarbutton-icon {
- width:36px;
+#cohe_button-dispMUA .toolbarbutton-icon {
+ width:36px;
height:36px;
}
-toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
- width:24px;
+toolbar[iconsize="small"] #cohe_button-dispMUA .toolbarbutton-icon {
+ width:24px;
height:24px;
}
diff --git a/chrome/CompactHeader/skin/mac/osdef.css b/chrome/CompactHeader/skin/mac/osdef.css
index 1f517af..90d9fab 100644
--- a/chrome/CompactHeader/skin/mac/osdef.css
+++ b/chrome/CompactHeader/skin/mac/osdef.css
@@ -42,11 +42,11 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* All values copied from gnomestrip theme. Have to be checked */
-.hdrOtherActionsButton {
+#cohe_hdrOtherActionsButton {
list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
}
-toolbar[iconsize="small"] .hdrOtherActionsButton {
+toolbar[iconsize="small"] #cohe_hdrOtherActionsButton {
list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
}
diff --git a/chrome/CompactHeader/skin/windows/buttonsOverlay.css b/chrome/CompactHeader/skin/windows/buttonsOverlay.css
index aa29de1..ac1b9a8 100644
--- a/chrome/CompactHeader/skin/windows/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/windows/buttonsOverlay.css
@@ -38,32 +38,32 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-#button-starMessages{
+#cohe_button-starMessages{
list-style-image: url("chrome://messenger/skin/icons/flag.png");
}
-#header-view-toolbox #button-starMessages{
+#header-view-toolbox #cohe_button-starMessages{
list-style-image: url("chrome://messenger/skin/icons/flag-empty.png");
}
-#header-view-toolbox #button-starMessages[flagged]{
+#header-view-toolbox #cohe_button-starMessages[flagged]{
list-style-image: url("chrome://messenger/skin/icons/flag.png");
}
-#button-starMessages .toolbarbutton-icon {
+#cohe_button-starMessages .toolbarbutton-icon {
-moz-image-region: rect(-6px 18px 18px -6px);
}
-toolbar[iconsize="small"] #button-starMessages .toolbarbutton-icon {
+toolbar[iconsize="small"] #cohe_button-starMessages .toolbarbutton-icon {
-moz-image-region: rect(-2px 14px 14px -2px);
}
-#button-dispMUA .toolbarbutton-icon {
+#cohe_button-dispMUA .toolbarbutton-icon {
width:24px;
height:24px;
}
-toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
+toolbar[iconsize="small"] #cohe_button-dispMUA .toolbarbutton-icon {
width:16px;
height:16px;
}
diff --git a/chrome/CompactHeader/skin/windows/osdef.css b/chrome/CompactHeader/skin/windows/osdef.css
index dd4a4ed..48824da 100644
--- a/chrome/CompactHeader/skin/windows/osdef.css
+++ b/chrome/CompactHeader/skin/windows/osdef.css
@@ -42,6 +42,6 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-#checkboxflatButtons {
+#cohe_checkboxflatButtons {
display: none;
}
diff --git a/test/compactheader/test-compactheader-collapse.js b/test/compactheader/test-compactheader-collapse.js
index 5b77d6a..af9dcfd 100644
--- a/test/compactheader/test-compactheader-collapse.js
+++ b/test/compactheader/test-compactheader-collapse.js
@@ -143,11 +143,11 @@ function test_address_type_format(){
collapse_and_assert_header(mc);
// Check the mode of the header.
- let headerBox = mc.eid("collapsedHeaderView");
+ let headerBox = mc.eid("cohe_collapsedHeaderView");
let previousHeaderMode = headerBox.node.getAttribute("show_header_mode");
// Click the "more" button.
- let moreIndicator = mc.eid("collapsed2LtoCcBccBox");
+ let moreIndicator = mc.eid("cohe_collapsed2LtoCcBccBox");
moreIndicator = mc.window.document.getAnonymousElementByAttribute(
moreIndicator.node, "anonid", "more");
moreIndicator = new elementslib.Elem(moreIndicator);
@@ -164,7 +164,7 @@ function test_address_type_format(){
// headerBox.node.getAttribute("show_header_mode"));
- let toDescription = mc.a('collapsed2LtoCcBccBox', {class: "headerValue"});
+ let toDescription = mc.a('cohe_collapsed2LtoCcBccBox', {class: "headerValue"});
let addrs = toDescription.getElementsByTagName('mail-emailaddress');
for (let i=0; i<addrs.length; i++) {
assert_true(addrs[i].hasAttribute("addressType"));
@@ -172,7 +172,7 @@ function test_address_type_format(){
}
function set_preferences_twoline(aController) {
- let checkboxCompactTwolineView = aController.eid("checkboxCompactTwolineView");
+ let checkboxCompactTwolineView = aController.eid("cohe_checkboxCompactTwolineView");
if (!checkboxCompactTwolineView.node.getAttribute("checked")) {
aController.click(checkboxCompactTwolineView);
}
@@ -180,7 +180,7 @@ function set_preferences_twoline(aController) {
}
function set_preferences_oneline(aController) {
- let checkboxCompactTwolineView = aController.eid("checkboxCompactTwolineView");
+ let checkboxCompactTwolineView = aController.eid("cohe_checkboxCompactTwolineView");
if (checkboxCompactTwolineView.node.getAttribute("checked")) {
aController.click(checkboxCompactTwolineView);
}
diff --git a/test/compactheader/test-compactheader-preferences.js b/test/compactheader/test-compactheader-preferences.js
index da49b8f..b086d77 100644
--- a/test/compactheader/test-compactheader-preferences.js
+++ b/test/compactheader/test-compactheader-preferences.js
@@ -130,8 +130,8 @@ function test_double_preference_change_UTF(){
}
function subtest_change_twoline_linkify(aController) {
- aController.click(aController.eid("checkboxCompactTwolineView"));
- aController.click(aController.eid("checkboxLinkify"));
+ aController.click(aController.eid("cohe_checkboxCompactTwolineView"));
+ aController.click(aController.eid("cohe_checkboxLinkify"));
close_preferences_dialog(aController);
}
@@ -142,7 +142,7 @@ function test_single_preference_change_folder(){
}
function subtest_change_twoline(aController) {
- aController.click(aController.eid("checkboxCompactTwolineView"));
+ aController.click(aController.eid("cohe_checkboxCompactTwolineView"));
close_preferences_dialog(aController);
}
diff --git a/test/compactheader/test-compactheader-toolbar.js b/test/compactheader/test-compactheader-toolbar.js
index 0426c32..b696173 100644
--- a/test/compactheader/test-compactheader-toolbar.js
+++ b/test/compactheader/test-compactheader-toolbar.js
@@ -637,7 +637,7 @@ function open_header_pane_toolbar_customization(aController)
ctc = WindowHelper.augment_controller(new controller.MozMillController(contentWindow));
}
else {
- ctc = WindowHelper.wait_for_existing_window("mail:customizetoolbar");
+ ctc = WindowHelper.wait_for_existing_window("CustomizeToolbarWindow");
}
return ctc;
}
diff --git a/test/shared-modules/test-compactheader-helpers.js b/test/shared-modules/test-compactheader-helpers.js
index 0a1d313..ce68766 100644
--- a/test/shared-modules/test-compactheader-helpers.js
+++ b/test/shared-modules/test-compactheader-helpers.js
@@ -113,7 +113,7 @@ function openAddressBook() {
function open_preferences_dialog(aController, aSubtest) {
windowHelper.plan_for_modal_dialog("ext:options", aSubtest);
- aController.click(aController.eid("hidecohePreferencesButton"));
+ aController.click(aController.eid("cohe_hidecohePreferencesButton"));
windowHelper.wait_for_modal_dialog("ext:options", 1);
}
@@ -148,21 +148,21 @@ function select_message_in_folder(aFolder, aMessageNum, aController)
}
function collapse_and_assert_header(aController) {
- let collapsedHeaderView = aController.e("collapsedHeaderView");
+ let collapsedHeaderView = aController.e("cohe_collapsedHeaderView");
let expandedHeaderView = aController.e("expandedHeaderView");
if (collapsedHeaderView.getAttribute("collapsed")) {
- aController.click(aController.eid("hideDetailsButton"));
+ aController.click(aController.eid("cohe_hideDetailsButton"));
}
folderDisplayHelper.assert_true(!collapsedHeaderView.hasAttribute("collapsed"));
folderDisplayHelper.assert_true(expandedHeaderView.getAttribute("collapsed"));
}
function expand_and_assert_header(aController) {
- let collapsedHeaderView = aController.e("collapsedHeaderView");
+ let collapsedHeaderView = aController.e("cohe_collapsedHeaderView");
let expandedHeaderView = aController.e("expandedHeaderView");
if (!collapsedHeaderView.hasAttribute("collapsed") ||
!collapsedHeaderView.getAttribute("collapsed")) {
- aController.click(aController.eid("showDetailsButton"));
+ aController.click(aController.eid("cohe_showDetailsButton"));
}
folderDisplayHelper.assert_true(collapsedHeaderView.getAttribute("collapsed"));
folderDisplayHelper.assert_true(!expandedHeaderView.hasAttribute("collapsed"));
--
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