Add new "bookmark-view" icon from Andreas Nilsson, replacing

2006-12-14  Luca Ferretti  <elle.uca@libero.it>

	* data/icons/16x16/actions/Makefile.am:
	* data/icons/16x16/actions/bookmark-view.png:
	* data/icons/16x16/actions/bookmark-view.xcf:
	* data/icons/16x16/actions/download.xcf:
	* data/icons/16x16/actions/epiphany-download.xcf.bz2:
	* data/icons/16x16/status/Makefile.am:
	* data/icons/16x16/status/popup-hidden.xcf:
	* data/icons/16x16/status/popup-hidden.xcf.bz2:
	* data/icons/22x22/actions/Makefile.am:
	* data/icons/22x22/actions/bookmark-view.png:
	* data/icons/22x22/actions/bookmark-view.xcf:
	* data/icons/22x22/actions/download.xcf:
	* data/icons/22x22/actions/epiphany-download.xcf.bz2:
	* data/icons/22x22/status/Makefile.am:
	* data/icons/22x22/status/popup-hidden.xcf:
	* data/icons/22x22/status/popup-hidden.xcf.bz2:
	* data/icons/24x24/actions/Makefile.am:
	* data/icons/24x24/actions/README:
	* data/icons/24x24/actions/bookmark-view.png:
	* data/icons/24x24/actions/web-bookmarks.png:
	* data/icons/32x32/actions/Makefile.am:
	* data/icons/32x32/actions/download.svg:
	* data/icons/32x32/actions/epiphany-download.svg:
	* data/icons/scalable/status/Makefile.am:

	Add new "bookmark-view" icon from Andreas Nilsson, replacing
	"web-bookmarks". Move images source from xcf.bz2 to xcf and
	use the same name of the named icon, including them in dist.

	* lib/ephy-stock-icons.h:

	Use "bookmark-view" named icon for EPHY_STOCK_BOOKMARKS.

25 files changed, 75 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index dcfff5c74..675e1cfc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2006-12-14  Luca Ferretti  <elle.uca@libero.it>
+
+	* data/icons/16x16/actions/Makefile.am:
+	* data/icons/16x16/actions/bookmark-view.png:
+	* data/icons/16x16/actions/bookmark-view.xcf:
+	* data/icons/16x16/actions/download.xcf:
+	* data/icons/16x16/actions/epiphany-download.xcf.bz2:
+	* data/icons/16x16/status/Makefile.am:
+	* data/icons/16x16/status/popup-hidden.xcf:
+	* data/icons/16x16/status/popup-hidden.xcf.bz2:
+	* data/icons/22x22/actions/Makefile.am:
+	* data/icons/22x22/actions/bookmark-view.png:
+	* data/icons/22x22/actions/bookmark-view.xcf:
+	* data/icons/22x22/actions/download.xcf:
+	* data/icons/22x22/actions/epiphany-download.xcf.bz2:
+	* data/icons/22x22/status/Makefile.am:
+	* data/icons/22x22/status/popup-hidden.xcf:
+	* data/icons/22x22/status/popup-hidden.xcf.bz2:
+	* data/icons/24x24/actions/Makefile.am:
+	* data/icons/24x24/actions/README:
+	* data/icons/24x24/actions/bookmark-view.png:
+	* data/icons/24x24/actions/web-bookmarks.png:
+	* data/icons/32x32/actions/Makefile.am:
+	* data/icons/32x32/actions/download.svg:
+	* data/icons/32x32/actions/epiphany-download.svg:
+	* data/icons/scalable/status/Makefile.am:
+
+	Add new "bookmark-view" icon from Andreas Nilsson, replacing
+	"web-bookmarks". Move images source from xcf.bz2 to xcf and
+	use the same name of the named icon, including them in dist.
+
+	* lib/ephy-stock-icons.h:
+
+	Use "bookmark-view" named icon for EPHY_STOCK_BOOKMARKS.
+
 2006-12-13  Christian Persch  <chpe@cvs.gnome.org>
 
 	* data/icons/16x16/actions/Makefile.am:
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
index 2792e93af..6f9d8074b 100644
--- a/data/icons/16x16/actions/Makefile.am
+++ b/data/icons/16x16/actions/Makefile.am
@@ -6,7 +6,14 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
 	download.png		\
+	bookmark-view.png	\
 	history-view.png
 
+noinst_DATA = \
+	download.xcf		\
+	bookmark-view.xcf	\
+	history-view.svg	\
+
 EXTRA_DIST = \
-	$(icons_DATA)
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/16x16/actions/bookmark-view.png b/data/icons/16x16/actions/bookmark-view.png
new file mode 100644
index 000000000..7817a0fa7
--- /dev/null
+++ b/data/icons/16x16/actions/bookmark-view.png
diff --git a/data/icons/16x16/actions/bookmark-view.xcf b/data/icons/16x16/actions/bookmark-view.xcf
new file mode 100644
index 000000000..653e3472e
--- /dev/null
+++ b/data/icons/16x16/actions/bookmark-view.xcf
diff --git a/data/icons/16x16/actions/download.xcf b/data/icons/16x16/actions/download.xcf
new file mode 100644
index 000000000..df3f287ca
--- /dev/null
+++ b/data/icons/16x16/actions/download.xcf
diff --git a/data/icons/16x16/actions/epiphany-download.xcf.bz2 b/data/icons/16x16/actions/epiphany-download.xcf.bz2
deleted file mode 100644
index 5570f9c66..000000000
--- a/data/icons/16x16/actions/epiphany-download.xcf.bz2
+++ /dev/null
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index 0658fb3e9..cd87d487c 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -3,8 +3,13 @@ size = 16x16
 context = status
 
 iconsdir = $(themedir)/$(size)/$(context)
+
 icons_DATA = \
 	popup-hidden.png
 
+noinst_DATA = \
+	popup-hidden.xcf
+
 EXTRA_DIST = \
-	$(icons_DATA)
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/16x16/status/popup-hidden.xcf b/data/icons/16x16/status/popup-hidden.xcf
new file mode 100644
index 000000000..6b30badda
--- /dev/null
+++ b/data/icons/16x16/status/popup-hidden.xcf
diff --git a/data/icons/16x16/status/popup-hidden.xcf.bz2 b/data/icons/16x16/status/popup-hidden.xcf.bz2
deleted file mode 100644
index a7f4587bf..000000000
--- a/data/icons/16x16/status/popup-hidden.xcf.bz2
+++ /dev/null
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
index 79336063c..dbfbe5a00 100644
--- a/data/icons/22x22/actions/Makefile.am
+++ b/data/icons/22x22/actions/Makefile.am
@@ -6,9 +6,12 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
 	download.png		\
+	bookmark-view.png	\
 	history-view.png
 
 noinst_DATA = \
+	download.xcf		\
+	bookmark-view.xcf	\
 	history-view.svg
 
 EXTRA_DIST = \
diff --git a/data/icons/22x22/actions/bookmark-view.png b/data/icons/22x22/actions/bookmark-view.png
new file mode 100644
index 000000000..3c94640fb
--- /dev/null
+++ b/data/icons/22x22/actions/bookmark-view.png
diff --git a/data/icons/22x22/actions/bookmark-view.xcf b/data/icons/22x22/actions/bookmark-view.xcf
new file mode 100644
index 000000000..a9da95aca
--- /dev/null
+++ b/data/icons/22x22/actions/bookmark-view.xcf
diff --git a/data/icons/22x22/actions/download.xcf b/data/icons/22x22/actions/download.xcf
new file mode 100644
index 000000000..c9d0695ae
--- /dev/null
+++ b/data/icons/22x22/actions/download.xcf
diff --git a/data/icons/22x22/actions/epiphany-download.xcf.bz2 b/data/icons/22x22/actions/epiphany-download.xcf.bz2
deleted file mode 100644
index edcdaeeac..000000000
--- a/data/icons/22x22/actions/epiphany-download.xcf.bz2
+++ /dev/null
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
index 777377210..31b6ec70b 100644
--- a/data/icons/22x22/status/Makefile.am
+++ b/data/icons/22x22/status/Makefile.am
@@ -3,8 +3,13 @@ size = 22x22
 context = status
 
 iconsdir = $(themedir)/$(size)/$(context)
+
 icons_DATA = \
 	popup-hidden.png
 
+noinst_DATA = \
+	popup-hidden.xcf
+
 EXTRA_DIST = \
-	$(icons_DATA)
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/22x22/status/popup-hidden.xcf b/data/icons/22x22/status/popup-hidden.xcf
new file mode 100644
index 000000000..64fbedea9
--- /dev/null
+++ b/data/icons/22x22/status/popup-hidden.xcf
diff --git a/data/icons/22x22/status/popup-hidden.xcf.bz2 b/data/icons/22x22/status/popup-hidden.xcf.bz2
deleted file mode 100644
index e88240772..000000000
--- a/data/icons/22x22/status/popup-hidden.xcf.bz2
+++ /dev/null
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
index dd15b1457..27434992a 100644
--- a/data/icons/24x24/actions/Makefile.am
+++ b/data/icons/24x24/actions/Makefile.am
@@ -6,8 +6,8 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
 	download.png		\
+	bookmark-view.png	\
 	history-view.png	\
-	web-bookmarks.png	\
 	location-entry.png
 
 EXTRA_DIST = \
diff --git a/data/icons/24x24/actions/README b/data/icons/24x24/actions/README
new file mode 100644
index 000000000..4d49699c6
--- /dev/null
+++ b/data/icons/24x24/actions/README
@@ -0,0 +1,13 @@
+From Tango website (http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines)
+
+
+   Historically Gnome uses 24×24 size (which is 1/4 of 48×48);
+   just adding a 1 pixel empty space on all sides can make
+   Tango icons useful on the Gnome desktop in the transition
+   phase. One can easily do this with imagemagick:
+
+   convert -bordercolor Transparent -border 1x1 tango_size.png gnome_size.png
+
+
+So sources for "small" size should be drawn at 22x22 pixel and converted
+to 24x24 adding a transparent border.
\ No newline at end of file
diff --git a/data/icons/24x24/actions/bookmark-view.png b/data/icons/24x24/actions/bookmark-view.png
new file mode 100644
index 000000000..a2b5dd484
--- /dev/null
+++ b/data/icons/24x24/actions/bookmark-view.png
diff --git a/data/icons/24x24/actions/web-bookmarks.png b/data/icons/24x24/actions/web-bookmarks.png
deleted file mode 100644
index 389152ef3..000000000
--- a/data/icons/24x24/actions/web-bookmarks.png
+++ /dev/null
diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am
index c9209c44b..b80ab2a00 100644
--- a/data/icons/32x32/actions/Makefile.am
+++ b/data/icons/32x32/actions/Makefile.am
@@ -8,7 +8,7 @@ icons_DATA = \
 	download.png
 
 noinst_DATA = \
-	epiphany-download.svg
+	download.svg
 
 EXTRA_DIST = \
 	$(icons_DATA)	\
diff --git a/data/icons/32x32/actions/epiphany-download.svg b/data/icons/32x32/actions/download.svg
index 6b4d12719..6b4d12719 100644
--- a/data/icons/32x32/actions/epiphany-download.svg
+++ b/data/icons/32x32/actions/download.svg
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
index 46bb1c070..c742b21aa 100644
--- a/data/icons/scalable/status/Makefile.am
+++ b/data/icons/scalable/status/Makefile.am
@@ -3,6 +3,7 @@ size = scalable
 context = status
 
 iconsdir = $(themedir)/$(size)/$(context)
+
 icons_DATA = \
 	popup-hidden.svg
 
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index 37fcb1e6a..1ae910cb7 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -25,7 +25,7 @@ G_BEGIN_DECLS
 
 #define EPHY_STOCK_POPUPS	   "popup-hidden"
 #define EPHY_STOCK_HISTORY         "history-view"
-#define EPHY_STOCK_BOOKMARKS       "web-bookmarks"
+#define EPHY_STOCK_BOOKMARKS       "bookmark-view"
 #define EPHY_STOCK_ENTRY	   "location-entry"
 #define EPHY_STOCK_DOWNLOAD	   "download"