[Pkg-mozext-commits] [compactheader] 309/441: Version 2.0.0a1: First alpha release of sidebar support.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:12 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 3dab843acc57a60bab335190ee37fc26a899c7cd
Author: joachim <none at none>
Date: Thu Nov 17 23:52:55 2011 +0100
Version 2.0.0a1: First alpha release of sidebar support.
--HG--
branch : sidebars
---
chrome.manifest | 2 +
.../content/compactHeaderOverlay-10.xul | 245 +--------------------
.../content/compactHeaderOverlay-9.xul | 1 +
.../CompactHeader/content/compactHeaderOverlay.js | 27 ++-
chrome/CompactHeader/content/preferences-old.xul | 6 +
chrome/CompactHeader/content/preferences.xul | 23 ++
chrome/CompactHeader/content/toolbar.js | 37 +++-
chrome/CompactHeader/locale/da-DK/preferences.dtd | 6 +
chrome/CompactHeader/locale/de-DE/preferences.dtd | 6 +
chrome/CompactHeader/locale/en-US/preferences.dtd | 5 +
chrome/CompactHeader/locale/it-IT/preferences.dtd | 7 +-
11 files changed, 105 insertions(+), 260 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index 1899c79..c3a89f1 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -17,6 +17,8 @@ overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/
overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay-9.xul appversion>=9.0a1
overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay-10.xul appversion>=10.0a1
overlay chrome://global/content/customizeToolbar.xul chrome://CompactHeader/content/customizeToolbarOverlay.xul
+overlay chrome://CompactHeader/content/preferences.xul chrome://CompactHeader/content/preferences-old.xul appversion<10.0a2
+
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader-os/skin/osdef.css
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader/skin/CompactHeader.css
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay-10.xul b/chrome/CompactHeader/content/compactHeaderOverlay-10.xul
index a0e6740..db37bb9 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay-10.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay-10.xul
@@ -1,19 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE overlay [
- <!ENTITY % msgHeaderDTD SYSTEM
- "chrome://messenger/locale/msgHdrViewOverlay.dtd">
- %msgHeaderDTD;
- <!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"?>
<?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
@@ -21,237 +7,16 @@
<overlay id="compactHeaderOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/javascript" src="chrome://CompactHeader/content/debug.js"/>
- <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
- <script type="application/javascript" src="chrome://CompactHeader/content/RSSLinkify.js"/>
- <script type="application/javascript" src="chrome://CompactHeader/content/toolbar.js"/>
- <script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
-
- <keyset>
- <key id="CompactHeader_hideDetailsKey"
- modifiers="shift"
- key="&CompactHeader_toggleDetails.key;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
- </keyset>
-
- <menupopup id="header-toolbar-context-menu">
- <menuitem id="CompactHeader_hidecohePreferencesButton"
- label="&CompactHeader_dialog.title;"
- oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no,centerscreen,modal');"/>
- </menupopup>
-
<hbox id="messagepaneboxwrapper">
- <vbox id="CompactHeader_leftSidebar" insertbefore="messagepanebox">
+ <vbox id="CompactHeader_leftSidebar"
+ context="header-toolbar-context-menu"
+ insertbefore="messagepanebox">
<hbox id="CompactHeader_leftSidebar_dummy" hidden="true"/>
</vbox>
- <vbox id="messagepanebox">
- <vbox id="singlemessage">
- <hbox id="msgHeaderView">
- <deck id="msgHeaderViewDeck">
-
- <vbox id="expandedHeaderView" orient="horizontal">
- <vbox id="CompactHeader_hideDetailsButtonBox" insertbefore="expandedHeadersBox">
- <button id="CompactHeader_hideDetailsButton"
- tooltiptext="&CompactHeader_hideDetailsButton.label;"
- onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
- class="msgHeaderView-flat-button"/>
- </vbox>
-
- <hbox id="CompactHeader_coheStringTransferBox" hidden="true">
- <label id="CompactHeader_CoheHideDetailsLabel" value="&CompactHeader_hideDetailsButton.label;"/>
- <label id="CompactHeader_CoheShowDetailsLabel" value="&CompactHeader_showDetailsButton.label;"/>
- </hbox>
-
- <vbox id="expandedHeadersBox">
- <html:div xmlns:html="http://www.w3.org/1999/xhtml" id="expandedHeadersTopBox" flex="1">
- <!-- <hbox id="expandedHeadersTopBox" flex="1"> -->
- <toolbox id="header-view-toolbox"
- mode="icons"
- defaultmode="icons"
- context="header-toolbar-context-menu">
- <toolbarpalette id="header-view-toolbar-palette">
- <toolbarbutton id="CompactHeader_hdrOtherActionsButton"
- label="&otherActionsButton1.label;"
- tooltiptext="&otherActionsButton1.label;"
- class="toolbarbutton-1 msgHeaderView-button hdrOtherActionsButton"
- type="menu"/>
- </toolbarpalette>
- <toolbar id="header-view-toolbar"
- mode="icons" defaultmode="icons"
- defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,CompactHeader_hdrOtherActionsButton">
- </toolbar>
- </toolbox>
- <!-- </hbox> -->
- </html:div>
-
-
- <hbox id="expandedHeadersBottomBox">
-
- <vbox id="otherActionsBox" flex="0">
- <hbox id="dateValueBox" flex="0"/>
- <button type="menu" id="otherActionsButton" collapsed="true"
- label="&otherActionsButton1.label;"
- class="msgHeaderView-button msgHeaderView-flat-button">
- <menupopup id="otherActionsPopup" onpopupshowing="InitMessageMark()">
- <menuitem id="CompactHeader_hdrPane-markFlagged"
- type="checkbox"
- label="&markStarredCmd.label;"
- accesskey="&markStarredCmd.accesskey;"
- command="cmd_markAsFlagged"
- insertbefore="viewSourceMenuItem"
- key="key_toggleFlagged"/>
- <menu id="CompactHeader_hdrPane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
- <menupopup id="menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
- <menuitem id="CompactHeader_hdrPane-viewallheaders"
- type="radio"
- name="viewheadergroup"
- label="&headersAllCmd.label;"
- accesskey="&headersAllCmd.accesskey;"
- command="cmd_viewAllHeader"/>
- <menuitem id="CompactHeader_hdrPane-viewnormalheaders"
- type="radio"
- name="viewheadergroup"
- label="&headersNormalCmd.label;"
- accesskey="&headersNormalCmd.accesskey;"
- command="cmd_viewNormalHeader"/>
- </menupopup>
- </menu>
- <menuseparator id="otherActionPopupAfterViewSource"/>
- <menuitem id="CompactHeader_hideDetailsMenu"
- label="&CompactHeader_hideDetailsButton.label;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
- <menuitem id="CompactHeader_hidecohePreferencesButton"
- label="&CompactHeader_dialog.title;"
- oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,centerscreen,dependent,all,resizable=no');"/>
- </menupopup>
- </button>
- </vbox>
- </hbox>
-
- </vbox>
-
- <vbox id="CompactHeader_dispMUAexp" collapsed="false">
- <image id="CompactHeader_dispMUAiconExp" observes="dispMUAbroadcast" tooltiptext=""
- style="width:48px; height:48px; margin-left:2px; margin-right:2px;"
- onclick="dispMUA.infopopup();"/>
- </vbox>
-
- </vbox>
-
- <vbox id="CompactHeader_collapsedHeaderView" orient="horizontal" flex="1">
- <menupopup id="CompactHeader_CohecopyUrlPopup" popupanchor="bottomleft">
- <menuitem label="©LinkCmd.label;" accesskey="©LinkCmd.accesskey;"
- oncommand="org.mozdev.compactHeader.RSSLinkify.CoheCopyWebsiteAddress(document.popupNode)"/>
- </menupopup>
- <vbox id="CompactHeader_showDetailsButtonBox" align="start" flex="0">
- <button id="CompactHeader_showDetailsButton"
- tooltiptext="&CompactHeader_showDetailsButton.label;"
- onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
- class="msgHeaderView-flat-button"/>
- </vbox>
- <vbox id="CompactHeader_collapsed1LHeadersBox" flex="1" collapsed="false">
- <hbox id="CompactHeader_collapsed1LHeaderViewFirstLine" flex="0">
- <hbox id="CompactHeader_collapsed1LsubjectOutBox" align="start" flex="99">
- <row id="CompactHeader_collapsed1LsubjectRow" flex="99">
- <mail-headerfield id="CompactHeader_collapsed1LsubjectBox" flex="99"/>
- </row>
- </hbox>
- <hbox id="CompactHeader_collapsed1LfromOutBox" align="start" flex="0">
- <grid flex="1">
- <columns>
- <column flex="0"/>
- </columns>
- <rows>
- <row id="CompactHeader_collapsed1LfromRow">
- <mail-multi-emailHeaderField id="CompactHeader_collapsed1LfromBox" flex="0"/>
- </row>
- </rows>
- </grid>
- </hbox>
- <hbox id="CompactHeader_collapsed1LdateOutBox" align="start" pack="end" flex="0">
- <row id="CompactHeader_collapsed1LdateRow">
- <label id="CompactHeader_collapsed1LdateBox" class="dateLabel" flex="1"/>
- </row>
- </hbox>
- <header-view-button-box id="CompactHeader_collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
- </hbox>
- <hbox id="CompactHeader_collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
- </hbox>
- </vbox>
-
- <vbox id="CompactHeader_collapsed2LHeadersBox" flex="1" collapsed="true">
- <hbox id="CompactHeader_collapsed2LHeaderViewFirstLine" flex="0">
- <hbox id="CompactHeader_collapsed2LfromOutBox" align="start" flex="0">
- <grid flex="1">
- <columns>
- <column flex="0"/>
- </columns>
- <rows>
- <row id="CompactHeader_collapsed2LfromRow">
- <mail-multi-emailHeaderField id="CompactHeader_collapsed2LfromBox" flex="0"/>
- </row>
- </rows>
- </grid>
- </hbox>
- <grid id="CompactHeader_collapsed2LtoCcBccOutBox" flex="1">
- <columns>
- <column flex="0"/>
- <column flex="1"/>
- </columns>
- <rows>
- <row id="CompactHeader_collapsed2LtoCcBccRow" align="baseline">
- <label id="CompactHeader_collapsed2LtoCcBccLabel" class="headerName"
- value="&toField3.label;" control="CompactHeader_collapsed2LtoCcBccBox"/>
- <mail-multi-emailHeaderField id="CompactHeader_collapsed2LtoCcBccBox" flex="1"/>
- </row>
- </rows>
- </grid>
- <header-view-button-box id="CompactHeader_collapsed2LButtonBox" flex="0" align="start"/>
- </hbox>
- <hbox id="CompactHeader_collapsed2LHeaderViewSecondLine" align="top" flex="1">
- <hbox id="CompactHeader_collapsed2LsubjectOutBox" align="top" flex="99">
- <row id="CompactHeader_collapsed2LsubjectRow" flex="99">
- <mail-headerfield id="CompactHeader_collapsed2LsubjectBox" flex="99"/>
- </row>
- </hbox>
- <hbox id="CompactHeader_collapsed2LdateOutBox" align="top" pack="end" flex="0">
- <row id="CompactHeader_collapsed2LdateRow" align="top" pack="end">
- <label id="CompactHeader_collapsed2LdateBox" class="dateLabel" flex="1"/>
- </row>
- </hbox>
- </hbox>
-
-
-
- </vbox>
-
- <vbox id="CompactHeader_dispMUA2line">
- <image id="CompactHeader_dispMUAicon2line" observes="dispMUAbroadcast"
- tooltiptext=""
- style="width:32px; height:32px; margin-left:2px; margin-right:2px;"
- onclick="dispMUA.infopopup();"/>
- </vbox>
-
- <vbox id="CompactHeader_dispMUAcompact">
- <image id="CompactHeader_dispMUAiconCompact" observes="dispMUAbroadcast"
- tooltiptext=""
- style="width:24px; height:24px; margin:-2px 2px -2px 2px;"
- onclick="dispMUA.infopopup();"/>
- </vbox>
-
-
- </vbox>
-
- </deck>
- </hbox>
- </vbox>
- </vbox>
- <vbox id="CompactHeader_rightSidebar">
+ <vbox id="CompactHeader_rightSidebar"
+ context="header-toolbar-context-menu">
<hbox id="CompactHeader_rightSidebar_dummy" hidden="true"/>
</vbox>
</hbox>
</overlay>
-
-<!--
--->
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
index 4cc7e8c..712c68c 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
@@ -60,6 +60,7 @@
<!-- <hbox id="expandedHeadersTopBox" flex="1"> -->
<toolbox id="header-view-toolbox"
mode="icons"
+ minwidth="10px"
defaultmode="icons">
<toolbarpalette id="header-view-toolbar-palette">
<toolbarbutton id="CompactHeader_hdrOtherActionsButton"
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index ffd71a2..db11202 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -471,6 +471,7 @@ org.mozdev.compactHeader.pane = function() {
// view care about this header value. if it does then call updateHeaderEntry
function coheUpdateMessageHeaders()
{
+ org.mozdev.compactHeader.debug.log("coheUpdateMessageHeaders start");
// Remove the height attr so that it redraws correctly. Works around a
// problem that attachment-splitter causes if it's moved high enough to
// affect the header box:
@@ -525,6 +526,7 @@ org.mozdev.compactHeader.pane = function() {
// now update the view to make sure the right elements are visible
coheUpdateHeaderView();
+ org.mozdev.compactHeader.debug.log("coheUpdateMessageHeaders stop");
}
function selectEmailDisplayed() {
@@ -566,7 +568,7 @@ org.mozdev.compactHeader.pane = function() {
}
};
- var myPrefObserverHeaderSize =
+ var myPrefObserver =
{
register: function()
{
@@ -575,7 +577,7 @@ org.mozdev.compactHeader.pane = function() {
.getService(Components.interfaces.nsIPrefService);
// For this._branch we ask that the preferences for extensions.myextension. and children
- this._branch = prefService.getBranch("extensions.CompactHeader.headersize.");
+ this._branch = prefService.getBranch("extensions.CompactHeader.");
// Now we queue the interface called nsIPrefBranch2. This interface is described as:
// "nsIPrefBranch2 allows clients to observe changes to pref values."
@@ -599,9 +601,10 @@ org.mozdev.compactHeader.pane = function() {
// aData is the name of the pref that's been changed (relative to aSubject)
org.mozdev.compactHeader.debug.log("prefObserver 1: " + aData);
- if ( (aData == "addressstyle")
- ||(aData == "twolineview")
- ||(aData == "linkify")
+ if ( (aData == "headersize.addressstyle")
+ ||(aData == "headersize.twolineview")
+ ||(aData == "headersize.linkify")
+ ||(aData == "toolbox.position")
) {
preferencesUpdate();
}
@@ -621,6 +624,7 @@ org.mozdev.compactHeader.pane = function() {
wasHere = true;
ReloadMessage();
pub.coheOnLoadMsgHeaderPane();
+ org.mozdev.compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
// var event = document.createEvent('Events');
// event.initEvent('messagepane-loaded', false, true);
// var headerViewElement = document.getElementById("msgHeaderView");
@@ -684,10 +688,19 @@ org.mozdev.compactHeader.pane = function() {
//}
org.mozdev.compactHeader.debug.log("before register");
coheUninstallObserver.register();
- myPrefObserverHeaderSize.register();
+ myPrefObserver.register();
org.mozdev.compactHeader.debug.log("register PrefObserver");
org.mozdev.compactHeader.debug.log("after register");
- }
+ var oldUpdateActiveMessagePane = MessageDisplayWidget.prototype._updateActiveMessagePane;
+ MessageDisplayWidget.prototype._updateActiveMessagePane = function() {
+ org.mozdev.compactHeader.debug.log("_updateActiveMessagePane start");
+ oldUpdateActiveMessagePane.call(this);
+ org.mozdev.compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
+ org.mozdev.compactHeader.debug.log("_updateActiveMessagePane stop");
+ };
+
+ org.mozdev.compactHeader.debug.log("coheInitializeOverlay stop");
+ };
var coheUninstallObserver = {
_uninstall : false,
diff --git a/chrome/CompactHeader/content/preferences-old.xul b/chrome/CompactHeader/content/preferences-old.xul
new file mode 100644
index 0000000..f889ef6
--- /dev/null
+++ b/chrome/CompactHeader/content/preferences-old.xul
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+
+<overlay id="CompactHeader_customizeToolbarOverlay"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ <groupbox id="CompactHeader_radiobox.ToolbarPosition" hidden="true"/>
+</overlay>
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index 1529635..09f119e 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -32,6 +32,8 @@
name="extensions.CompactHeader.headersize.addressstyle" type="bool"/>
<preference id="CompactHeader_flatButtons"
name="extensions.CompactHeader.headersize.flatButtons" type="bool"/>
+ <preference id="CompactHeader_position"
+ name="extensions.CompactHeader.toolbox.position" type="string"/>
</preferences>
<checkbox id="CompactHeader_checkboxCompactTwolineView"
@@ -46,5 +48,26 @@
<checkbox id="CompactHeader_checkboxflatButtons"
preference="CompactHeader_flatButtons"
label="&CompactHeader_menu.flatButtons.caption;"/>
+ <groupbox id="CompactHeader_radiobox.ToolbarPosition">
+ <caption label="&CompactHeader_radiobox.ToolbarPosition.caption;"/>
+ <radiogroup id="CompactHeader_hdrToolbox.pos"
+ preference="CompactHeader_position">
+ <hbox>
+ <radio id="CompactHeader_hdrToolbox.pos.left"
+ value="left"
+ label="&CompactHeader_radiobox.ToolbarPosition.left;"/>
+ <radio id="CompactHeader_hdrToolbox.pos.top"
+ value="top"
+ label="&CompactHeader_radiobox.ToolbarPosition.top;"/>
+ <radio id="CompactHeader_hdrToolbox.pos.right"
+ value="right"
+ label="&CompactHeader_radiobox.ToolbarPosition.right;"/>
+ <radio id="CompactHeader_hdrToolbox.pos.none"
+ value="none"
+ label="&CompactHeader_radiobox.ToolbarPosition.none;"/>
+ </hbox>
+ </radiogroup>
+ </groupbox>
+
</prefpane>
</prefwindow>
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 8971ac7..4f03742 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -54,14 +54,25 @@ org.mozdev.compactHeader.toolbar = function() {
var gToolboxes = [
{pos:"top", id:"CompactHeader_collapsed2LButtonBox", orient:"horizontal", header:"compact"},
- {pos:"top", id:"expandedBoxSpacer", orient:"horizontal", header:"expanded"},
- {pos:"left", id:"CompactHeader_leftSidebar_dummy", orient:"vertical"},
- {pos:"right", id:"CompactHeader_rightSidebar_dummy", orient:"vertical"},
- {pos:"none", id:"", orient:""},
+ {pos:"top", id:"expandedBoxSpacer", orient:"horizontal", header:"expanded"},
+ {pos:"left", id:"CompactHeader_leftSidebar_dummy", orient:"vertical"},
+ {pos:"right", id:"CompactHeader_rightSidebar_dummy", orient:"vertical"},
+ {pos:"none", id:"", orient:""},
];
+ pub.cannotMoveToolbox = function() {
+ var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+ .getService(Components.interfaces.nsIXULAppInfo);
+ var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+ .getService(Components.interfaces.nsIVersionComparator);
+ return (versionChecker.compare(appInfo.version, "10.0a2") < 0)
+ };
+
function getToolbarTarget(targetPos, targetHeader) {
- targetPos = targetPos.replace('hdrToolbox.pos.', '');
+ //targetPos = targetPos.replace('hdrToolbox.pos.', '');
+ if (pub.cannotMoveToolbox()) {
+ targetPos = "top";
+ }
for (i=0; i<gToolboxes.length; i++) {
if ((targetPos == gToolboxes[i].pos) &&
((gToolboxes[i].header == null) || (targetHeader == gToolboxes[i].header))
@@ -220,14 +231,15 @@ org.mozdev.compactHeader.toolbar = function() {
};
function moveToolbox(aHeaderViewMode, cBoxId, orient) {
- org.mozdev.compactHeader.debug.log("toolbar toggle start");
+ org.mozdev.compactHeader.debug.log("toolbar toggle start headermode: " + aHeaderViewMode +
+ " cBoxId: " + cBoxId + " orien: " + orient);
var hdrToolbox = document.getElementById("header-view-toolbox");
var hdrToolbar = document.getElementById("header-view-toolbar");
var firstPermanentChild = hdrToolbar.firstPermanentChild;
var lastPermanentChild = hdrToolbar.lastPermanentChild;
if (aHeaderViewMode) {
var cBox = document.getElementById(cBoxId);
- if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
+ if ((cBox) && (cBox.parentNode.id != hdrToolbox.parentNode.id)) {
var cloneToolboxPalette;
var cloneToolbarset;
if (hdrToolbox.palette) {
@@ -245,7 +257,7 @@ org.mozdev.compactHeader.toolbar = function() {
}
} else {
cBox = document.getElementById(cBoxId);
- if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
+ if ((cBox) && (cBox.parentNode.id != hdrToolbox.parentNode.id)) {
var cloneToolboxPalette;
var cloneToolbarset;
if (hdrToolbox.palette) {
@@ -502,7 +514,8 @@ org.mozdev.compactHeader.toolbar = function() {
var multiMessage = document.getElementById("multimessage");
var multiBBox;
if (multiMessage){
- multiBBox = multiMessage.contentDocument.getElementById("buttonbox");
+ org.mozdev.compactHeader.debug.log("multiMessage " + multiMessage);
+ multiBBox = multiMessage.contentDocument.getElementById("header-view-toolbox");
}
var hdrViewToolbox = document.getElementById("header-view-toolbox");
@@ -513,12 +526,12 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition mid 1");
- if (targetPos == "hdrToolbox.pos.none") {
+ if (targetPos == "none") {
hdrViewToolbox.setAttribute("collapsed", "true");
if (multiBBox) {
multiBBox.setAttribute("collapsed", "true");
}
- org.mozdev.compactHeader.debug.log("hdrToolbox.pos.none stop");
+ org.mozdev.compactHeader.debug.log("none stop");
return;
}
else {
@@ -540,7 +553,7 @@ org.mozdev.compactHeader.toolbar = function() {
var targetToolbox = getToolbarTarget(targetPos, "");
org.mozdev.compactHeader.debug.log("move to multibuttonhbox 1");
if (multiBBox) {
- if (targetPos != "hdrToolbox.pos.top") {
+ if (targetPos != "top") {
org.mozdev.compactHeader.debug.log("x multiBBox: "+multiBBox);
multiBBox.setAttribute("collapsed", "true");
hdrViewToolbox.removeAttribute("collapsed");
diff --git a/chrome/CompactHeader/locale/da-DK/preferences.dtd b/chrome/CompactHeader/locale/da-DK/preferences.dtd
index 39fadb6..dca3ede 100644
--- a/chrome/CompactHeader/locale/da-DK/preferences.dtd
+++ b/chrome/CompactHeader/locale/da-DK/preferences.dtd
@@ -40,3 +40,9 @@
<!ENTITY CompactHeader_menu.Linkify.caption "Link i feed-emner">
<!ENTITY CompactHeader_menu.ShowOnlyAddress.caption "Vis kun adresse">
<!ENTITY CompactHeader_menu.flatButtons.caption "Flade knapper">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.caption "Position of Header Toolbar">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.right "right">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.top "top">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.left "left">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.none "invisible">
+
diff --git a/chrome/CompactHeader/locale/de-DE/preferences.dtd b/chrome/CompactHeader/locale/de-DE/preferences.dtd
index 07dbfdc..73214e5 100644
--- a/chrome/CompactHeader/locale/de-DE/preferences.dtd
+++ b/chrome/CompactHeader/locale/de-DE/preferences.dtd
@@ -40,3 +40,9 @@
<!ENTITY CompactHeader_menu.Linkify.caption "Link in Betreff von RSS Feeds">
<!ENTITY CompactHeader_menu.ShowOnlyAddress.caption "Nur Adresse anzeigen">
<!ENTITY CompactHeader_menu.flatButtons.caption "Flache Schaltflächen">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.caption "Position der Kopfzeilenwerkzeugleiste">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.right "rechts">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.top "oben">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.left "links">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.none "unsichtbar">
+
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index da1ef50..3376a0a 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -40,3 +40,8 @@
<!ENTITY CompactHeader_menu.Linkify.caption "Link in subjects of RSS feeds">
<!ENTITY CompactHeader_menu.ShowOnlyAddress.caption "Display only address">
<!ENTITY CompactHeader_menu.flatButtons.caption "Flat buttons">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.caption "Position of Header Toolbar">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.right "right">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.top "top">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.left "left">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.none "invisible">
diff --git a/chrome/CompactHeader/locale/it-IT/preferences.dtd b/chrome/CompactHeader/locale/it-IT/preferences.dtd
index 24ca399..57a28af 100644
--- a/chrome/CompactHeader/locale/it-IT/preferences.dtd
+++ b/chrome/CompactHeader/locale/it-IT/preferences.dtd
@@ -39,4 +39,9 @@
<!ENTITY CompactHeader_checkbox.Compact.TwolineView.caption "Mostra due linee nella visualizzazione compatta">
<!ENTITY CompactHeader_menu.Linkify.caption "Link nell'oggetto dei feed RSS">
<!ENTITY CompactHeader_menu.ShowOnlyAddress.caption "Mostra solo l'indirizzo">
-<!ENTITY CompactHeader_menu.flatButtons.caption "Pulsanti piani">
\ No newline at end of file
+<!ENTITY CompactHeader_menu.flatButtons.caption "Pulsanti piani">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.caption "Posizione della Barra Intestazioni">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.right "destra">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.top "alto">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.left "sinistra">
+<!ENTITY CompactHeader_radiobox.ToolbarPosition.none "invisibile">
--
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