[Pkg-mozext-commits] [compactheader] 173/441: First set of changes for 1.3.0beta1: Add sidebars (does not work for view message in new window) Fixes for Thunderbird 3.2
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:28:56 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 37d40634d86bc7cc288a5376e1250a37cc70e73a
Author: joachim.herb <none at none>
Date: Sun Sep 5 01:15:48 2010 +0000
First set of changes for 1.3.0beta1:
Add sidebars (does not work for view message in new window)
Fixes for Thunderbird 3.2
---
.../CompactHeader/content/compactHeaderOverlay.xul | 21 +++--------
chrome/CompactHeader/content/preferences.js | 16 +++++++++
chrome/CompactHeader/content/preferences.xul | 11 ++++++
chrome/CompactHeader/locale/da-DK/preferences.dtd | 42 ++++++++++++++++++++++
chrome/CompactHeader/locale/en-US/preferences.dtd | 42 ++++++++++++++++++++++
5 files changed, 116 insertions(+), 16 deletions(-)
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 5d9bf7d..325b222 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -21,7 +21,7 @@
<overlay id="compactHeaderOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/javascript" src="chrome://CompactHeader-d/content/compactHeaderOverlay.js"/>
+ <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
<keyset>
<key id="hideDetailsKey"
@@ -35,7 +35,7 @@
label="&dialog.title;"
oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no,centerscreen,modal');"/>
</popup>
-
+
<deck id="msgHeaderViewDeck">
<vbox id="expandedHeaderView" orient="horizontal">
@@ -55,7 +55,9 @@
<hbox id="expandedHeadersTopBox" flex="1">
<toolbox id="header-view-toolbox"
mode="icons"
- defaultmode="icons">
+ defaultmode="icons"
+ flex="1"
+ context="header-toolbar-context-menu">
<toolbarpalette id="header-view-toolbar-palette">
<toolbarbutton id="hdrOtherActionsButton"
label="&otherActionsButton.label;"
@@ -146,19 +148,6 @@
</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"/>
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index 8c718b2..25a8294 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -41,6 +41,8 @@ org.mozdev.compactHeader.preferences = function() {
//loadPrefInt("headersize.addressstyle", "AddressStyle");
loadPrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
loadPrefCheckbox("headersize.flatButtons", "checkbox.flatButtons");
+ loadRadio("toolbox.position", "hdrToolbox.pos");
+
}
///////////////////////////////////////////////////////////////////////////////
@@ -58,6 +60,7 @@ org.mozdev.compactHeader.preferences = function() {
//savePrefInt("headersize.addressstyle", "AddressStyle");
savePrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
savePrefCheckbox("headersize.flatButtons", "checkbox.flatButtons");
+ saveRadio("toolbox.position", "hdrToolbox.pos");
return true;
}
@@ -80,6 +83,14 @@ org.mozdev.compactHeader.preferences = function() {
document.getElementById(idCheckbox).value = prefBranch.getIntPref(pref);
}
+ function loadRadio(pref, idRadioGroup)
+ {
+ if (document.getElementById(prefBranch.getCharPref(pref))) {
+ document.getElementById(idRadioGroup).selectedItem =
+ document.getElementById(prefBranch.getCharPref(pref));
+ }
+ }
+
///////////////////////////////////////////////////////////////////////////////
//
// savePrefCheckbox
@@ -96,5 +107,10 @@ org.mozdev.compactHeader.preferences = function() {
{
prefBranch.setIntPref(pref, document.getElementById(idCheckbox).value);
}
+
+ function saveRadio(pref, idRadioGroup)
+ {
+ prefBranch.setCharPref(pref, document.getElementById(idRadioGroup).selectedItem.id);
+ }
return pub;
}();
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index f17eb34..74eb5d3 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -35,4 +35,15 @@
<checkbox id="checkbox.flatButtons"
label="&menu.flatButtons.caption;"/>
+ <groupbox>
+ <caption label="&radiobox.ToolbarPosition.caption;"/>
+ <radiogroup id="hdrToolbox.pos">
+ <hbox>
+ <radio id="hdrToolbox.pos.left" label="&radiobox.ToolbarPosition.left;"/>
+ <radio id="hdrToolbox.pos.top" label="&radiobox.ToolbarPosition.top;"/>
+ <radio id="hdrToolbox.pos.right" label="&radiobox.ToolbarPosition.right;"/>
+ <radio id="hdrToolbox.pos.none" label="&radiobox.ToolbarPosition.none;"/>
+ </hbox>
+ </radiogroup>
+ </groupbox>
</dialog>
diff --git a/chrome/CompactHeader/locale/da-DK/preferences.dtd b/chrome/CompactHeader/locale/da-DK/preferences.dtd
index 85227e9..947e7ae 100644
--- a/chrome/CompactHeader/locale/da-DK/preferences.dtd
+++ b/chrome/CompactHeader/locale/da-DK/preferences.dtd
@@ -1,5 +1,47 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+ The contents of this file are subject to the Mozilla Public License Version
+ 1.1 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+
+ The Original Code is Mozilla Communicator client code, released
+ March 31, 1998.
+
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 1998-1999
+ the Initial Developer. All Rights Reserved.
+
+ Contributor(s):
+
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+
+ ***** 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 radiobox.ToolbarPosition.caption "Position of Header Toolbar">
+<!ENTITY radiobox.ToolbarPosition.right "right">
+<!ENTITY radiobox.ToolbarPosition.top "top">
+<!ENTITY radiobox.ToolbarPosition.left "left">
+<!ENTITY radiobox.ToolbarPosition.none "invisible">
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index f14a3f1..071970d 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -1,5 +1,47 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+ The contents of this file are subject to the Mozilla Public License Version
+ 1.1 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+
+ The Original Code is Mozilla Communicator client code, released
+ March 31, 1998.
+
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 1998-1999
+ the Initial Developer. All Rights Reserved.
+
+ Contributor(s):
+
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+
+ ***** 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 radiobox.ToolbarPosition.caption "Position of Header Toolbar">
+<!ENTITY radiobox.ToolbarPosition.right "right">
+<!ENTITY radiobox.ToolbarPosition.top "top">
+<!ENTITY radiobox.ToolbarPosition.left "left">
+<!ENTITY radiobox.ToolbarPosition.none "invisible">
--
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