[Pkg-mozext-commits] [compactheader] 68/441: New version: 0.8.3 Another try to fix Mac OS X version. Button icons are copied from toolbar buttons again.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:28:45 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 0f032b12079b00d54c01ca2ee36c03018bdb0878
Author: joachim.herb <none at none>
Date: Sun Sep 27 22:47:31 2009 +0000
New version: 0.8.3
Another try to fix Mac OS X version. Button icons are copied from toolbar buttons again.
---
build.xml | 28 +++++++++++++++------
chrome.manifest | 5 ++--
chrome/CompactHeader/skin/global/CompactHeader.css | 17 ++-----------
.../skin/global/other-action-small.png | Bin 957 -> 0 bytes
chrome/CompactHeader/skin/global/other-action.png | Bin 1469 -> 0 bytes
chrome/CompactHeader/skin/mac/osdef.css | 24 ++++++++++++++++++
install.rdf | 2 +-
7 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/build.xml b/build.xml
index 494da40..bcace01 100644
--- a/build.xml
+++ b/build.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" ?>
-<project name="getpartialmessages" default="dist">
+<project name="CompactHeader" default="dist">
<property name="src.dir" value="." />
- <property name="dist.dir" value="../downloads/" />
+ <property name="dist.dir" value="../downloads/"/>
+ <property name="www.dir" value="../www/"/>
- <xmlproperty file="./install.rdf" prefix="myFileContent"/>
- <property name="app.version" value="${myFileContent.RDF.RDF:Description.em:version}"/>
- <property name="app.name" value="${myFileContent.RDF.RDF:Description.em:name}" />
- <property name="app.id" value="${myFileContent.RDF.RDF:Description.em:id}" />
+ <xmlproperty file="./install.rdf" prefix="installContent"/>
+ <property name="app.version" value="${installContent.RDF.RDF:Description.em:version}"/>
+ <property name="app.name" value="${installContent.RDF.RDF:Description.em:name}" />
+ <property name="app.id" value="${installContent.RDF.RDF:Description.em:id}" />
- <!--
+ <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask"/>
+
+ <!--
<property name="ff.dir" value="C:\Users\joachim\comm-central\objdir-tb-release\mozilla\dist\bin" />
<condition property="ff.present">
<and>
@@ -26,7 +29,8 @@
</target>
-->
- <target name="dist">
+ <target name="dist" depends="spreadVersion">
+
<zip destfile="${dist.dir}/${app.name}-${app.version}.xpi">
<fileset dir="${src.dir}">
<include name="chrome.manifest" />
@@ -43,6 +47,14 @@
<delete file="${dist.dir}/${app.name}-${app.version}.xpi" />
</target>
+ <target name="spreadVersion">
+ <xmltask source="${www.dir}/availableVersion.xml" dest="${www.dir}/availableVersion.xml.new">
+ <replace path="/updates/update[1]/version" withXml="<version>${app.version}</version>"/>
+ </xmltask>
+ <move file="${www.dir}/availableVersion.xml.new" tofile="${www.dir}/availableVersion.xml"/>
+
+ </target>
+
<!--
<target name="clean.ff" if="ff.present">
<delete dir="${ff.dir}/extensions/${app.id}" failonerror="false" />
diff --git a/chrome.manifest b/chrome.manifest
index 397518a..2e38e32 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -4,9 +4,10 @@ skin CompactHeader global chrome/CompactHeader/skin/global/
skin CompactHeader-os classic/1.0 chrome/CompactHeader/skin/common/
skin CompactHeader-os classic/1.0 chrome/CompactHeader/skin/gnome/ os=Linux
skin CompactHeader-os classic/1.0 chrome/CompactHeader/skin/windows/ os=WINNT
-skin CompactHeader-os classic/1.0 chrome/CompactHeader/skin/common/ os=Darwin
+skin CompactHeader-os classic/1.0 chrome/CompactHeader/skin/mac/ os=Darwin
locale CompactHeader en-US chrome/CompactHeader/locale/en-US/
locale CompactHeader de-DE chrome/CompactHeader/locale/de-DE/
-overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul
\ No newline at end of file
+overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul
+overlay chrome://global/content/customizeToolbar.xul chrome://CompactHeader/content/customizeToolbarOverlay.xul
\ No newline at end of file
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 5622b76..fae16e1 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -119,19 +119,6 @@
*/
/*
-toolbar[iconsize="small"] #button-other-actions,*/
-#otherActionsButton {
- list-style-image: url("chrome://CompactHeader/skin/other-action-small.png");
- -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-/*
-#button-other-actions {
- list-style-image: url("chrome://CompactHeader/skin/other-action.png");
- -moz-image-region: rect(0px 24px 24px 0px);
-}
-*/
-/*
#tagMenuPopup {
list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-moz-image-region: rect(0px 240px 16px 224px);
@@ -140,8 +127,8 @@ toolbar[iconsize="small"] #button-other-actions,*/
#otherActionsButton[OnlyIcon="Text"] .button-text,
#tagMenuPopup[OnlyIcon="Text"] .button-text {
- -moz-padding-start: 1px;
- -moz-padding-end: 5px;
+ -moz-padding-end: 1px;
+ -moz-padding-start: 5px;
}
#otherActionsButton[OnlyIcon="Icon"] .button-text,
diff --git a/chrome/CompactHeader/skin/global/other-action-small.png b/chrome/CompactHeader/skin/global/other-action-small.png
deleted file mode 100644
index 23293a0..0000000
Binary files a/chrome/CompactHeader/skin/global/other-action-small.png and /dev/null differ
diff --git a/chrome/CompactHeader/skin/global/other-action.png b/chrome/CompactHeader/skin/global/other-action.png
deleted file mode 100644
index 8b9b005..0000000
Binary files a/chrome/CompactHeader/skin/global/other-action.png and /dev/null differ
diff --git a/chrome/CompactHeader/skin/mac/osdef.css b/chrome/CompactHeader/skin/mac/osdef.css
index 8ad5d65..a7556e0 100644
--- a/chrome/CompactHeader/skin/mac/osdef.css
+++ b/chrome/CompactHeader/skin/mac/osdef.css
@@ -41,6 +41,29 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+toolbar[iconsize="small"] #button-other-actions,
+#otherActionsButton {
+ list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
+ -moz-image-region: rect(0px 24px 24px 0px);
+}
+
+#button-other-actions {
+ list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
+ -moz-image-region: rect(0px 32px 32px 0px);
+}
+
+
+#button-archive {
+ list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar.png");
+ -moz-image-region: rect(0px 640px 32px 608px);
+}
+
+toolbar[iconsize="small"] #button-archive {
+ list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
+ -moz-image-region: rect(0px 480px 24px 456px);
+}
+
+/*
.cohe-buttons {
list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
}
@@ -82,3 +105,4 @@
.cohe-button-tag {
-moz-image-region: rect(0px 384px 24px 360px);
}
+*/
\ No newline at end of file
diff --git a/install.rdf b/install.rdf
index d909b4f..da8d580 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>0.8.2</em:version>
+ <em:version>0.8.3</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>
--
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