Stock icons for back, forward, up, home, new, close, add bookmarks

2002-04-21  Alexander Larsson  <alla@lysator.liu.se>

	* src/nautilus-shell-ui.xml:
	Stock icons for back, forward, up, home, new, close,
	add bookmarks

	* icons/default/default.xml:
        * icons/crux_teal/crux_teal.xml:
	* icons/crux_eggplant/crux_eggplant.xml:
	Point throbber to http://www.gnome.org/nautilus/

	* icons/default/Makefile.am:
        * icons/crux_teal/Makefile.am:
	* icons/crux_eggplant/Makefile.am:
	* icons/default/Makefile.am:
	* icons/*/[Back|Forward|Home|Refresh|Stop|Up].png:
	Use stock toolbar items for all out themes.

	Patches from Dave Bordoley <bordoley@msu.edu>

33 files changed, 31 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index c046be288..e7f45b5f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 2002-04-21  Alexander Larsson  <alla@lysator.liu.se>
 
+	* src/nautilus-shell-ui.xml:
+	Stock icons for back, forward, up, home, new, close,
+	add bookmarks
+	
+	* icons/default/default.xml:
+        * icons/crux_teal/crux_teal.xml:
+	* icons/crux_eggplant/crux_eggplant.xml:
+	Point throbber to http://www.gnome.org/nautilus/
+
+	* icons/default/Makefile.am:
+        * icons/crux_teal/Makefile.am:
+	* icons/crux_eggplant/Makefile.am:
+	* icons/default/Makefile.am:
+	* icons/*/[Back|Forward|Home|Refresh|Stop|Up].png:
+	Use stock toolbar items for all out themes.
+	
+	Patches from Dave Bordoley <bordoley@msu.edu>
+	
+2002-04-21  Alexander Larsson  <alla@lysator.liu.se>
+
 	* src/nautilus-preferences-dialog.c:
 	* src/file-manager/fm-icon-view.c:
 	* src/nautilus-shell-ui.xml:
diff --git a/icons/Back.png b/icons/Back.png
deleted file mode 100644
index f1c9d94a7..000000000
--- a/icons/Back.png
+++ /dev/null
diff --git a/icons/Forward.png b/icons/Forward.png
deleted file mode 100644
index 64011ab54..000000000
--- a/icons/Forward.png
+++ /dev/null
diff --git a/icons/Home.png b/icons/Home.png
deleted file mode 100644
index e416606c2..000000000
--- a/icons/Home.png
+++ /dev/null
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 86610aefb..24099492e 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -14,13 +14,7 @@ SUBDIRS =\
 icondir = $(datadir)/pixmaps/nautilus
 
 icon_DATA =\
-	Back.png \
-	Forward.png \
-	Home.png \
-	Refresh.png \
 	Search.png \
-	Stop.png \
-	Up.png \
 	audio.png \
 	backgrounds.png \
 	chit_frame.png \
diff --git a/icons/Refresh.png b/icons/Refresh.png
deleted file mode 100644
index 8c3812185..000000000
--- a/icons/Refresh.png
+++ /dev/null
diff --git a/icons/Stop.png b/icons/Stop.png
deleted file mode 100644
index 6ddda21b2..000000000
--- a/icons/Stop.png
+++ /dev/null
diff --git a/icons/Up.png b/icons/Up.png
deleted file mode 100644
index 79c57c2ef..000000000
--- a/icons/Up.png
+++ /dev/null
diff --git a/icons/crux_eggplant/Back.png b/icons/crux_eggplant/Back.png
deleted file mode 100644
index 689482430..000000000
--- a/icons/crux_eggplant/Back.png
+++ /dev/null
diff --git a/icons/crux_eggplant/Forward.png b/icons/crux_eggplant/Forward.png
deleted file mode 100644
index f25bc02cf..000000000
--- a/icons/crux_eggplant/Forward.png
+++ /dev/null
diff --git a/icons/crux_eggplant/Home.png b/icons/crux_eggplant/Home.png
deleted file mode 100644
index 2ef24727d..000000000
--- a/icons/crux_eggplant/Home.png
+++ /dev/null
diff --git a/icons/crux_eggplant/Makefile.am b/icons/crux_eggplant/Makefile.am
index 4e051687b..51436daf5 100644
--- a/icons/crux_eggplant/Makefile.am
+++ b/icons/crux_eggplant/Makefile.am
@@ -4,13 +4,7 @@ SUBDIRS = sidebar_tab_pieces backgrounds throbber
 
 crux_eggplant_DATA =				\
 	crux_eggplant.xml			\
-	Back.png				\
-	Forward.png				\
-	Up.png					\
-	Refresh.png				\
-	Home.png				\
 	Search.png				\
-	Stop.png				\
 	decrement.png				\
 	decrement-i.png				\
 	emblem-nowrite.png			\
diff --git a/icons/crux_eggplant/Refresh.png b/icons/crux_eggplant/Refresh.png
deleted file mode 100644
index 693b88d18..000000000
--- a/icons/crux_eggplant/Refresh.png
+++ /dev/null
diff --git a/icons/crux_eggplant/Stop.png b/icons/crux_eggplant/Stop.png
deleted file mode 100644
index 25d32e35a..000000000
--- a/icons/crux_eggplant/Stop.png
+++ /dev/null
diff --git a/icons/crux_eggplant/Up.png b/icons/crux_eggplant/Up.png
deleted file mode 100644
index 00e4ec1ae..000000000
--- a/icons/crux_eggplant/Up.png
+++ /dev/null
diff --git a/icons/crux_eggplant/crux_eggplant.xml b/icons/crux_eggplant/crux_eggplant.xml
index f4ec05a70..9f6706d6d 100644
--- a/icons/crux_eggplant/crux_eggplant.xml
+++ b/icons/crux_eggplant/crux_eggplant.xml
@@ -15,5 +15,4 @@
            tab_font="Helvetica Bold" />
 
   <desktop background_tile_image="./backgrounds/background_pattern.png"/>
-  <throbber frame_count="30" url="http://www.eazel.com"/>
 </theme>
diff --git a/icons/crux_teal/Back.png b/icons/crux_teal/Back.png
deleted file mode 100644
index 69be3c151..000000000
--- a/icons/crux_teal/Back.png
+++ /dev/null
diff --git a/icons/crux_teal/Forward.png b/icons/crux_teal/Forward.png
deleted file mode 100644
index 29bbeaa93..000000000
--- a/icons/crux_teal/Forward.png
+++ /dev/null
diff --git a/icons/crux_teal/Home.png b/icons/crux_teal/Home.png
deleted file mode 100644
index 2ef24727d..000000000
--- a/icons/crux_teal/Home.png
+++ /dev/null
diff --git a/icons/crux_teal/Makefile.am b/icons/crux_teal/Makefile.am
index 02e810b4f..8c225c081 100644
--- a/icons/crux_teal/Makefile.am
+++ b/icons/crux_teal/Makefile.am
@@ -4,13 +4,7 @@ SUBDIRS = sidebar_tab_pieces backgrounds throbber
 
 crux_teal_DATA =	\
 	crux_teal.xml		\
-	Back.png	\
-	Forward.png	\
-	Up.png	\
-	Refresh.png	\
-	Home.png	\
 	Search.png	\
-	Stop.png	\
 	decrement.png		\
 	decrement-i.png		\
 	emblem-nowrite.png	\
diff --git a/icons/crux_teal/Refresh.png b/icons/crux_teal/Refresh.png
deleted file mode 100644
index 43318e744..000000000
--- a/icons/crux_teal/Refresh.png
+++ /dev/null
diff --git a/icons/crux_teal/Stop.png b/icons/crux_teal/Stop.png
deleted file mode 100644
index 25d32e35a..000000000
--- a/icons/crux_teal/Stop.png
+++ /dev/null
diff --git a/icons/crux_teal/Up.png b/icons/crux_teal/Up.png
deleted file mode 100644
index 76861fece..000000000
--- a/icons/crux_teal/Up.png
+++ /dev/null
diff --git a/icons/crux_teal/crux_teal.xml b/icons/crux_teal/crux_teal.xml
index 4197c7669..49ebddfa1 100644
--- a/icons/crux_teal/crux_teal.xml
+++ b/icons/crux_teal/crux_teal.xml
@@ -13,5 +13,4 @@
            tab_font="Helvetica Bold" />
            
   <desktop background_tile_image="./backgrounds/background_pattern.png" />
-  <throbber frame_count="30" url="http://www.eazel.com"/>
 </theme>
diff --git a/icons/default/Back.png b/icons/default/Back.png
deleted file mode 100644
index f1c9d94a7..000000000
--- a/icons/default/Back.png
+++ /dev/null
diff --git a/icons/default/Forward.png b/icons/default/Forward.png
deleted file mode 100644
index 64011ab54..000000000
--- a/icons/default/Forward.png
+++ /dev/null
diff --git a/icons/default/Home.png b/icons/default/Home.png
deleted file mode 100644
index e416606c2..000000000
--- a/icons/default/Home.png
+++ /dev/null
diff --git a/icons/default/Makefile.am b/icons/default/Makefile.am
index d082bed74..3eda91ed8 100644
--- a/icons/default/Makefile.am
+++ b/icons/default/Makefile.am
@@ -3,13 +3,7 @@ NULL=
 icondir = $(datadir)/pixmaps/nautilus/default
 
 icon_DATA =\
-	Back.png \
-	Forward.png \
-	Home.png \
-	Refresh.png \
 	Search.png \
-	Stop.png \
-	Up.png \
 	decrement.png \
 	default.xml \
 	desktop-home.png \
diff --git a/icons/default/Refresh.png b/icons/default/Refresh.png
deleted file mode 100644
index 8c3812185..000000000
--- a/icons/default/Refresh.png
+++ /dev/null
diff --git a/icons/default/Stop.png b/icons/default/Stop.png
deleted file mode 100644
index 6ddda21b2..000000000
--- a/icons/default/Stop.png
+++ /dev/null
diff --git a/icons/default/Up.png b/icons/default/Up.png
deleted file mode 100644
index 79c57c2ef..000000000
--- a/icons/default/Up.png
+++ /dev/null
diff --git a/icons/default/default.xml b/icons/default/default.xml
index 452983a84..f608646ac 100644
--- a/icons/default/default.xml
+++ b/icons/default/default.xml
@@ -19,7 +19,7 @@
        text_fill_color="#FFFFFF"/>
   
  <thumbnails frame_offsets="3,3,6,6"/>
- <throbber frame_count="30" url="http://www.eazel.com" delay="75"/>
+ <throbber frame_count="30" url="http://www.gnome.org/nautilus/" delay="75"/>
  <zoom_control number_v_offset="-1" number_h_offset="-2"/>
  
 </theme>
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 73ed6aa6f..b40a70786 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -54,6 +54,7 @@
 		<placeholder name="New Items Placeholder" delimit="none">
 			<menuitem name="New Window"
 				  _label="New _Window"
+				  pixtype="stock" pixname="gtk-new"
 				  verb="New Window"/>
 		</placeholder>
 		<placeholder name="Open Placeholder" delimit="top"/>
@@ -62,11 +63,13 @@
 			  _label="_Close Window"
 			  _tip="Close this window"
 			  accel="*Control*w"
+			  pixtype="stock" pixname="gtk-close"
 			  verb="Close"/>
 		<menuitem name="Close All Windows"
 			  _label="Close _All Windows"
 			  _tip="Close all Nautilus windows"
 			  accel="*Control**Shift*w"
+			  pixtype="stock" pixname="gtk-close"
 			  verb="Close All Windows"/>
 
 		<menuitem name="Find"
@@ -191,18 +194,22 @@
 
 	<submenu name="Go" _label="_Go">
 		<menuitem name="Back" 
-			  _label="_Back" 
+			  _label="_Back"
+ 			  pixtype="stock" pixname="gtk-go-back"
 			  verb="Back"/>
 		<menuitem name="Forward" 
-			  _label="_Forward" 
+			  _label="_Forward"
+ 			  pixtype="stock" pixname="gtk-go-forward"
 			  verb="Forward"/>
 		<menuitem name="Up" 
 			  _label="_Up a Level" 
 			  accel="*Control*u"
+			  pixtype="stock" pixname="gtk-go-up"
 			  verb="Up"/>
 		<menuitem name="Home" 
 			  _label="_Home" 
 			  accel="*Control*h"
+			  pixtype="stock" pixname="gtk-home"
 			  verb="Home"/>
 		<menuitem name="Start Here" 
 			  _label="_Start Here" 
@@ -228,6 +235,7 @@
 			  _label="_Add Bookmark" 
 			  _tip="Add a bookmark for the current location to this menu"
 			  accel="*Control*b"
+			  pixtype="stock" pixname="gtk-add"
 			  verb="Add Bookmark"/>
 		<menuitem name="Edit Bookmarks" 
 			  _label="_Edit Bookmarks..."