[Pkg-mozext-commits] [compactheader] 306/441: First patch for sidebar support based on old B_2_0 branch.

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 8becd63a96e511fdfbebbfa0695d1d031bcbf148
Author: joachim <none at none>
Date:   Tue Nov 15 22:51:02 2011 +0100

    First patch for sidebar support based on old B_2_0 branch.
    
    --HG--
    branch : sidebars
---
 chrome.manifest                                    |   1 +
 .../content/compactHeaderOverlay-10.xul            | 257 +++++++++++++++++++++
 .../CompactHeader/content/compactHeaderOverlay.js  |   2 +-
 chrome/CompactHeader/content/toolbar.js            | 128 ++++++++--
 chrome/CompactHeader/skin/windows/osdef.css        |  21 ++
 defaults/preferences/prefs.js                      |   4 +
 install.rdf                                        |   4 +-
 7 files changed, 393 insertions(+), 24 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 5a58cfb..1899c79 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -15,6 +15,7 @@ locale    CompactHeader     es-ES   chrome/CompactHeader/locale/es-ES/
 
 overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul   appversion<9.0a1
 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
 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
new file mode 100644
index 0000000..a0e6740
--- /dev/null
+++ b/chrome/CompactHeader/content/compactHeaderOverlay-10.xul
@@ -0,0 +1,257 @@
+<?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"?>
+
+
+<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">
+      <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="&copyLinkCmd.label;" accesskey="&copyLinkCmd.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">
+      <hbox id="CompactHeader_rightSidebar_dummy" hidden="true"/>
+    </vbox>
+  </hbox>
+
+</overlay>
+
+<!--
+-->
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index d72356b..ffd71a2 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -438,7 +438,7 @@ org.mozdev.compactHeader.pane = function() {
       document.getElementById("CompactHeader_hideDetailsMenu").setAttribute("label", strLabel);
     }
 
-    org.mozdev.compactHeader.toolbar.toggle(gCoheCollapsedHeaderViewMode);
+    org.mozdev.compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
 
     if (document.getElementById("CompactHeader_hideDetailsMenu")) {
       document.getElementById("CompactHeader_hideDetailsMenu").setAttribute("label", strLabel);
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 3f37e52..8971ac7 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -52,6 +52,29 @@ org.mozdev.compactHeader.toolbar = function() {
                                           .getService(Components.interfaces.nsIPrefService)
                                           .getBranch("extensions.CompactHeader.");
 
+  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:""},
+  ];
+
+  function getToolbarTarget(targetPos, targetHeader) {
+    targetPos = targetPos.replace('hdrToolbox.pos.', '');
+    for (i=0; i<gToolboxes.length; i++) {
+      if ((targetPos == gToolboxes[i].pos) &&
+          ((gToolboxes[i].header == null) || (targetHeader == gToolboxes[i].header))
+          ) {
+        return gToolboxes[i];
+      }
+    }
+    org.mozdev.compactHeader.debug.log("orient failed " + targetPos + " " + targetHeader, LOGLEVEL.warn);
+    return null;
+  }
+
+
+
   pub.fillToolboxPalette = function () {
     org.mozdev.compactHeader.debug.log("fillToolboxPalette start");
     removeButtonDispMUA();
@@ -196,16 +219,14 @@ org.mozdev.compactHeader.toolbar = function() {
     org.mozdev.compactHeader.debug.log("setButtonStyle stop");
   };
 
-  pub.toggle = function(aHeaderViewMode) {
+  function moveToolbox(aHeaderViewMode, cBoxId, orient) {
     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("CompactHeader_CoheHideDetailsLabel").value;
-    var strShowLabel = document.getElementById("CompactHeader_CoheShowDetailsLabel").value;
     var firstPermanentChild = hdrToolbar.firstPermanentChild;
     var lastPermanentChild = hdrToolbar.lastPermanentChild;
     if (aHeaderViewMode) {
-      var cBox = document.getElementById("CompactHeader_collapsed2LButtonBox");
+      var cBox = document.getElementById(cBoxId);
       if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
         var cloneToolboxPalette;
         var cloneToolbarset;
@@ -223,17 +244,7 @@ org.mozdev.compactHeader.toolbar = function() {
         hdrToolbar.lastPermanentChild = lastPermanentChild;
       }
     } else {
-      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);
-      var cBox;
-      if(versionChecker.compare(appInfo.version, "8.0") >= 0) {
-        cBox = document.getElementById("expandedBoxSpacer");
-      }
-      else {
-        cBox = document.getElementById("expandedHeaders");
-      }
+      cBox = document.getElementById(cBoxId);
       if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
         var cloneToolboxPalette;
         var cloneToolbarset;
@@ -243,12 +254,7 @@ org.mozdev.compactHeader.toolbar = function() {
         if (hdrToolbox.toolbarset) {
           cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
         }
-        if(versionChecker.compare(appInfo.version, "8.0") >= 0) {
-          cBox.parentNode.insertBefore(hdrToolbox, cBox);
-        }
-        else { // versions before 8.0
-          cBox.parentNode.appendChild(hdrToolbox);
-        }
+        cBox.parentNode.insertBefore(hdrToolbox, cBox);
         hdrToolbox.palette = cloneToolboxPalette;
         hdrToolbox.toolbarset = cloneToolbarset;
         hdrToolbar = document.getElementById("header-view-toolbar");
@@ -257,6 +263,7 @@ org.mozdev.compactHeader.toolbar = function() {
       }
     }
     pub.onChangeDispMUAicon();
+    hdrToolbar.setAttribute("orient", orient);
     org.mozdev.compactHeader.debug.log("toolbar toggle stop");
   };
 
@@ -486,5 +493,84 @@ org.mozdev.compactHeader.toolbar = function() {
     org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox done");
   };
 
+
+  pub.setCurrentToolboxPosition = function(aHeaderViewMode) {
+    org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition start");
+
+    var singleMessage = document.getElementById("singlemessage");
+    var targetPos = cohePrefBranch.getCharPref("toolbox.position");
+    var multiMessage = document.getElementById("multimessage");
+    var multiBBox;
+    if (multiMessage){
+      multiBBox = multiMessage.contentDocument.getElementById("buttonbox");
+    }
+
+    var hdrViewToolbox = document.getElementById("header-view-toolbox");
+    if (!hdrViewToolbox) {
+      org.mozdev.compactHeader.debug.log("no header-view-toolbox!", LOGLEVEL.warn);
+      return;
+    }
+
+    org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition mid 1");
+
+    if (targetPos == "hdrToolbox.pos.none") {
+      hdrViewToolbox.setAttribute("collapsed", "true");
+      if (multiBBox) {
+        multiBBox.setAttribute("collapsed", "true");
+      }
+      org.mozdev.compactHeader.debug.log("hdrToolbox.pos.none stop");
+      return;
+    }
+    else {
+      hdrViewToolbox.removeAttribute("collapsed");
+      if (multiBBox) {
+        multiBBox.removeAttribute("collapsed");
+      }
+    }
+
+    org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition mid 2");
+
+    if (multiBBox) {
+      multiBBox.removeAttribute("collapsed");
+    }
+
+    if (singleMessage.getAttribute("hidden")) {
+      // The multi message view is visible
+      org.mozdev.compactHeader.debug.log("move to multibuttonhbox");
+      var targetToolbox = getToolbarTarget(targetPos, "");
+      org.mozdev.compactHeader.debug.log("move to multibuttonhbox 1");
+      if (multiBBox) {
+        if (targetPos != "hdrToolbox.pos.top") {
+          org.mozdev.compactHeader.debug.log("x multiBBox: "+multiBBox);
+          multiBBox.setAttribute("collapsed", "true");
+          hdrViewToolbox.removeAttribute("collapsed");
+        } else {
+          org.mozdev.compactHeader.debug.log("x multiBBox: "+multiBBox);
+          multiBBox.removeAttribute("collapsed");
+          hdrViewToolbox.setAttribute("collapsed", "true");
+        }
+      }
+      if (targetToolbox) {
+        moveToolbox(aHeaderViewMode, targetToolbox.id, targetToolbox.orient);
+      }
+    }
+    else {
+      // The single message view is visible
+      org.mozdev.compactHeader.debug.log("move to singlemessage");
+      var targetToolbox;
+      if (aHeaderViewMode) {
+        targetToolbox = getToolbarTarget(targetPos, "compact");
+      }
+      else {
+        targetToolbox = getToolbarTarget(targetPos, "expanded");
+      }
+      if (targetToolbox) {
+        moveToolbox(aHeaderViewMode, targetToolbox.id, targetToolbox.orient);
+      }
+    }
+    org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition stop");
+  }
+
+
   return pub;
 }();
diff --git a/chrome/CompactHeader/skin/windows/osdef.css b/chrome/CompactHeader/skin/windows/osdef.css
index 79053d2..186e5fe 100644
--- a/chrome/CompactHeader/skin/windows/osdef.css
+++ b/chrome/CompactHeader/skin/windows/osdef.css
@@ -45,3 +45,24 @@
 #CompactHeader_checkboxflatButtons {
   display: none;
 }
+
+toolbar[orient="vertical"] toolbarpaletteitem {
+  margin: -2px 0px;
+  border: none;
+  border-top: 2px solid transparent;
+  border-bottom: 2px solid transparent;
+}
+
+toolbar[orient="vertical"] toolbarpaletteitem[dragover="left"] {
+  border-color: transparent;
+  border-top-color: #000000;
+}
+
+toolbar[orient="vertical"] toolbarpaletteitem[dragover="right"] {
+  border-color: transparent;
+  border-bottom-color: #000000;
+}
+
+#header-view-toolbar[orient="vertical"] toolbarbutton {
+  -moz-box-orient: vertical !important;
+}
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 5087fc2..fae29ba 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -3,6 +3,10 @@ pref("extensions.CompactHeader.headersize.linkify", false);
 pref("extensions.CompactHeader.headersize.addressstyle", false);
 pref("extensions.CompactHeader.headersize.flatButtons", false);
 
+pref("extensions.CompactHeader.headersize.flatButtons", false);
+
+pref("extensions.CompactHeader.toolbox.position", "top");
+
 pref("extensions.CompactHeader.version", "0");
 pref("extensions.CompactHeader.firstrun", true);
 pref("extensions.CompactHeader.debugLevel", 1);
diff --git a/install.rdf b/install.rdf
index 9c2a24e..e337b7f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>1.4.6</em:version>
+		<em:version>2.0.0alpha1</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>
@@ -23,7 +23,7 @@
 		<em:targetApplication>
 			<RDF:Description>
 				<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-				<em:minVersion>5.0</em:minVersion>
+				<em:minVersion>8.0</em:minVersion>
 				<em:maxVersion>11.0a1</em:maxVersion>
 			</RDF:Description>
 		</em:targetApplication>

-- 
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