Landing Arvid's new icons and style sheets for the Options panel, the bookmark manager and XP filepicker.

browser/components/bookmarks/skin/bookmarksManager.css

@@ -4,8 +4,15 @@
 }
 
 toolbarbutton#newbookmark {
-  -moz-image-region: rect(0px, 32px, 32px, 0px);
+  -moz-image-region: rect(0px, 224px, 32px, 192px);
 }
+toolbarbutton#newbookmark:hover {
+  -moz-image-region: rect(32px, 224px, 64px, 192px);
+}
+toolbarbutton#newbookmark[disabled="true"] {
+  -moz-image-region: rect(64px, 224px, 96px, 192px);
+}
+
 toolbarbutton#newfolder {
   -moz-image-region: rect(0px, 32px, 32px, 0px);
 }

browser/components/prefwindow/jar.mn

@@ -35,5 +35,4 @@ en-US.jar:
 
 classic.jar:
     skin/classic/browser/pref/pref.css                     (skin/pref.css)
-    
-    
+    skin/classic/browser/pref/Options.png                     (skin/Options.png)

browser/components/prefwindow/skin/pref.css

@@ -1,27 +1,27 @@
 /*
 # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # 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.org Code.
-# 
+#
 # The Initial Developer of the Original Code is
 # Doron Rosenberg.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
-# 
+#
 # Contributor(s):
 #   Ben Goodger <ben@netscape.com> (Original Author)
-# 
+#
 # 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"),
@@ -33,7 +33,7 @@
 # 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 *****
 */
 
@@ -58,6 +58,7 @@
   background-color: transparent;
   margin-left: 1px;
   margin-right: 1px;
+  list-style-image: url("chrome://browser/skin/pref/Options.png")
 }
 
 .buttonBoxButton > .button-box {
@@ -81,52 +82,36 @@
 .buttonBoxButton[checked="true"] {
   border: 1px solid;
   -moz-border-left-colors: #316AC5;
-  -moz-border-top-colors: #316AC5; 
+  -moz-border-top-colors: #316AC5;
   -moz-border-right-colors: #316AC5;
-  -moz-border-bottom-colors: #316AC5; 
+  -moz-border-bottom-colors: #316AC5;
   background-color: #C1D2EE;
 }
 
-#catGeneralButton {
-
-}
-
-#catPrivacyButton {
-
-}
-
-#catFontsButton {
-
-}
-
-#catFeaturesButton {
-
-}
-
+#catGeneralButton {-moz-image-region: rect(0px, 32px, 32px, 0px)}
+#catPrivacyButton {-moz-image-region: rect(0px, 64px, 32px, 32px)}
+#catFeaturesbutton {-moz-image-region: rect(0px, 96px, 32px, 64px)}
+#catThemesButton {-moz-image-region: rect(0px, 128px, 32px, 96px)}
+#catExtButton {-moz-image-region: rect(0px, 160px, 32px, 128px)}
+#catFontsButton {-moz-image-region: rect(0px, 192px, 32px, 160px)}
+#catProxiesButton {-moz-image-region: rect(0px, 224px, 32px, 192px)}
 #catDownloadsButton {
-
-}
-
-#catProxiesButton {
-
-}
-
-#catThemesButton {
-
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0px, 192px, 32px, 160px);
 }
 
 .indent {
   margin-left: 23px;
-  margin-right: 23px;  
+  margin-right: 23px;
 }
 
 .uniWidthButton {
-  min-width: 8em; 
+  min-width: 8em;
 }
 
 /** Privacy Panel Expander Box **/
 #privacyCategories {
-  margin: 5px; 
+  margin: 5px;
   padding: 5px;
 }
 
@@ -135,7 +120,7 @@
 }
 
 .expanderButton {
-  cursor: pointer; 
+  cursor: pointer;
 }
 
 /* Themes/Extensions Items */
@@ -151,21 +136,18 @@
 }
 
 #previewImageContainer {
-  height: 93px; 
+  height: 93px;
   padding: 1px;
 }
 
 #previewImage {
-  max-width: 355px; 
+  max-width: 355px;
   min-width: 355px;
   max-height: 85px;
   min-height: 85px;
 }
 
 .extensionInfoArea {
-  background-color: -moz-Field !important; 
+  background-color: -moz-Field !important;
   height: 10em;
 }
-
-
-

toolkit/components/filepicker/jar.mn

@@ -8,6 +8,4 @@ en-US.jar:
 
 classic.jar:
 +  skin/classic/global/filepicker.css               (skin/filepicker.css)
-+  skin/classic/global/filepicker/folder-home.gif   (skin/folder-home.gif)
-+  skin/classic/global/filepicker/folder-new.gif    (skin/folder-new.gif)
-+  skin/classic/global/filepicker/folder-up.gif     (skin/folder-up.gif)
+   skin/classic/global/Filepicker.png               (skin/Filepicker.png)

toolkit/components/filepicker/skin/filepicker.css

@@ -41,11 +41,12 @@
 /* ::::: file/directory items ::::: */
 
 treechildren:-moz-tree-image(FilenameColumn, directory) {
-  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 treechildren:-moz-tree-image(FilenameColumn, file) {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
   -moz-image-region: rect(16px, 16px, 32px, 0px);
 }
 
@@ -53,25 +54,28 @@ treechildren:-moz-tree-image(FilenameColumn, file) {
 
 #directoryTree > treerows > .tree-bodybox {
   border: 1px solid transparent;
-} 
+}
 
 #directoryTree:focus > treerows > .tree-bodybox {
   border-color: #000000;
-} 
+}
 
 /* ::::: button items ::::: */
 
 .up-button {
-  list-style-image: url("chrome://global/skin/filepicker/folder-up.gif");
+  list-style-image: url("chrome://global/skin/Filepicker.png");
+  -moz-image-region: rect(0px 20px 20px 00px);
   max-width: 36px;
 }
 
 .home-button {
-  list-style-image: url("chrome://global/skin/filepicker/folder-home.gif");
+  list-style-image: url("chrome://global/skin/Filepicker.png");
+  -moz-image-region: rect(0px 40px 20px 20px);
   max-width: 36px;
 }
 
 .new-dir-button {
-  list-style-image: url("chrome://global/skin/filepicker/folder-new.gif");
+  list-style-image: url("chrome://global/skin/Filepicker.png");
+  -moz-image-region: rect(0px, 60px, 20px, 40px);
   max-width: 36px;
 }