[Pkg-mozext-commits] [automatic-save-folder] 71/133: Add : ASF button for the Toolbar customization, and an icon in front of ASF menu.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch wip
in repository automatic-save-folder.

commit cf910e38501174bc8ee44b0a4fe3858b298c5201
Author: Cyan <Cyan at d0063192-6b2e-11de-89a9-0b20f3e2dceb>
Date:   Sun Jun 20 12:43:45 2010 +0000

    Add : ASF button for the Toolbar customization, and an icon in front of ASF menu.
    
    git-svn-id: http://automatic-save-folder.googlecode.com/svn/trunk@77 d0063192-6b2e-11de-89a9-0b20f3e2dceb
---
 chrome.manifest                 |   7 ++++++-
 content/common.dtd              |   2 +-
 content/overlay_preferences.xul |  18 ++++++++++++------
 skin/asf-icon_16x16.png         | Bin 0 -> 1284 bytes
 skin/asf-icon_24x24.png         | Bin 0 -> 1458 bytes
 skin/style.css                  |  16 ++++++++++++++++
 6 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 706e2d0..d41bdb2 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,8 +1,13 @@
 content	asf	content/
+
 locale	asf	en-US	locale/en-US/
 locale	asf	fr		locale/fr/
 locale	asf	it		locale/it/
 locale	asf	ru		locale/ru/
+
 skin	asf	classic/1.0	skin/
+
 overlay	chrome://browser/content/browser.xul	chrome://asf/content/overlay_preferences.xul
-overlay	chrome://mozapps/content/downloads/unknownContentType.xul	chrome://asf/content/overlay_unknownContentType.xul
\ No newline at end of file
+overlay	chrome://mozapps/content/downloads/unknownContentType.xul	chrome://asf/content/overlay_unknownContentType.xul
+
+style	chrome://global/content/customizeToolbar.xul	chrome://asf/skin/style.css
\ No newline at end of file
diff --git a/content/common.dtd b/content/common.dtd
index 7d9811b..3284811 100644
--- a/content/common.dtd
+++ b/content/common.dtd
@@ -1,2 +1,2 @@
 <!-- Current version -->
-<!ENTITY asf.version "1.0.2b Rev76">
\ No newline at end of file
+<!ENTITY asf.version "1.0.2b Rev77">
\ No newline at end of file
diff --git a/content/overlay_preferences.xul b/content/overlay_preferences.xul
index a26a1d1..910e15d 100644
--- a/content/overlay_preferences.xul
+++ b/content/overlay_preferences.xul
@@ -6,13 +6,19 @@
     You may find the license in the LICENSE file
 
     ***** END LICENSE BLOCK ***** -->
-<?xml-stylesheet href="chrome://asf/skin/overlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://asf/skin/style.css" type="text/css"?>
 <!DOCTYPE overlay SYSTEM "chrome://asf/locale/asf.dtd">
-<overlay id="asf-overlay-preferences"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<overlay id="asf-overlay-preferences" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+	
 	<script type="application/x-javascript" src="chrome://asf/content/asf_right_click.js"/>
+	
 	<menupopup id="menu_ToolsPopup">
-		<menuitem insertafter="sanitizeItem" id="asf-option" label="&asf.label;" 
-            oncommand="window.openDialog('chrome://asf/content/options.xul','Automatic_Save_Folder_Preferences','chrome,centerscreen,resizable=yes, dialog=no');" />
-  </menupopup>
+		<menuitem insertafter="sanitizeItem" id="asf-menu-preferences" label="&asf.label;" class="menuitem-iconic" oncommand="window.openDialog('chrome://asf/content/options.xul','Automatic_Save_Folder_Preferences','chrome,centerscreen,resizable=yes, dialog=no');" />
+	</menupopup>
+	
+	<toolbarpalette id="BrowserToolbarPalette">
+		<toolbarbutton id="asf-toolbar-icon-preferences" class="toolbarbutton-1" label="ASF" tooltiptext="Automatic Save Folder" oncommand="window.openDialog('chrome://asf/content/options.xul','Automatic_Save_Folder_Preferences','chrome,centerscreen,resizable=yes, dialog=no');" />
+	</toolbarpalette>
+	
 </overlay>
diff --git a/skin/asf-icon_16x16.png b/skin/asf-icon_16x16.png
new file mode 100644
index 0000000..6bbad1f
Binary files /dev/null and b/skin/asf-icon_16x16.png differ
diff --git a/skin/asf-icon_24x24.png b/skin/asf-icon_24x24.png
new file mode 100644
index 0000000..3617fb7
Binary files /dev/null and b/skin/asf-icon_24x24.png differ
diff --git a/skin/style.css b/skin/style.css
index 66a593a..fc9310d 100644
--- a/skin/style.css
+++ b/skin/style.css
@@ -1,3 +1,19 @@
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+  /* Toolbar buttons */
+
+#asf-toolbar-icon-preferences
+{
+  list-style-image: url("chrome://asf/skin/asf-icon_24x24.png");
+}
+
+toolbar[iconsize="small"] #asf-toolbar-icon-preferences, #asf-menu-preferences
+{
+  list-style-image: url("chrome://asf/skin/asf-icon_16x16.png");
+}
+
+  /* Filter tree */
+
 treechildren::-moz-tree-checkbox
 {
   /* unchecked checkbox treecells */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/automatic-save-folder.git