summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-04-09 23:42:19 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-04-09 23:42:19 +0000
commit94af542f772f04ece399f3b98248a532715c0847 (patch)
treec7233f454c898d78d40339485379e35faac3cdd2
parent0613b441902d5892880920cccf6e6874bc00608f (diff)
downloadgtk+-94af542f772f04ece399f3b98248a532715c0847.tar.gz
Add 16x16 versions of the zoom icons and of GTK_STOCK_INDEX. Some of the
2005-04-09 Matthias Clasen <mclasen@redhat.com> Add 16x16 versions of the zoom icons and of GTK_STOCK_INDEX. Some of the images were taken from the hicolor icon theme, and were originally created by Jakub Steiner and Tuomas Kuosmanen. (#167515, Vincent Noel) * gtk/stock-icons/stock_index_16.png: * gtk/stock-icons/stock_zoom_1_16.png: * gtk/stock-icons/stock_zoom_fit_16.png: * gtk/stock-icons/stock_zoom_in_16.png: * gtk/stock-icons/stock_zoom_out_16.png: New images. * gtk/stock-icons/Makefile.am: Add the new images. * gtk/gtkiconfactory.c (get_default_icons): Add the new images.
-rw-r--r--ChangeLog17
-rw-r--r--ChangeLog.pre-2-1017
-rw-r--r--ChangeLog.pre-2-817
-rw-r--r--gtk/gtkiconfactory.c25
-rw-r--r--gtk/stock-icons/Makefile.am10
-rw-r--r--gtk/stock-icons/stock_index_16.pngbin0 -> 565 bytes
-rw-r--r--gtk/stock-icons/stock_zoom_1_16.pngbin0 -> 492 bytes
-rw-r--r--gtk/stock-icons/stock_zoom_fit_16.pngbin0 -> 483 bytes
-rw-r--r--gtk/stock-icons/stock_zoom_in_16.pngbin0 -> 534 bytes
-rw-r--r--gtk/stock-icons/stock_zoom_out_16.pngbin0 -> 513 bytes
10 files changed, 81 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 15a67a671d..0f2b8a1532 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2005-04-09 Matthias Clasen <mclasen@redhat.com>
+ Add 16x16 versions of the zoom icons and of
+ GTK_STOCK_INDEX. Some of the images were taken from
+ the hicolor icon theme, and were originally created
+ by Jakub Steiner and Tuomas Kuosmanen. (#167515,
+ Vincent Noel)
+
+ * gtk/stock-icons/stock_index_16.png:
+ * gtk/stock-icons/stock_zoom_1_16.png:
+ * gtk/stock-icons/stock_zoom_fit_16.png:
+ * gtk/stock-icons/stock_zoom_in_16.png:
+ * gtk/stock-icons/stock_zoom_out_16.png: New images.
+
+ * gtk/stock-icons/Makefile.am: Add the new images.
+
+ * gtk/gtkiconfactory.c (get_default_icons): Add the new
+ images.
+
* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
Don't display too many broken images. (#169870, Roman
Kagan, patch by Ivan Wong)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 15a67a671d..0f2b8a1532 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,22 @@
2005-04-09 Matthias Clasen <mclasen@redhat.com>
+ Add 16x16 versions of the zoom icons and of
+ GTK_STOCK_INDEX. Some of the images were taken from
+ the hicolor icon theme, and were originally created
+ by Jakub Steiner and Tuomas Kuosmanen. (#167515,
+ Vincent Noel)
+
+ * gtk/stock-icons/stock_index_16.png:
+ * gtk/stock-icons/stock_zoom_1_16.png:
+ * gtk/stock-icons/stock_zoom_fit_16.png:
+ * gtk/stock-icons/stock_zoom_in_16.png:
+ * gtk/stock-icons/stock_zoom_out_16.png: New images.
+
+ * gtk/stock-icons/Makefile.am: Add the new images.
+
+ * gtk/gtkiconfactory.c (get_default_icons): Add the new
+ images.
+
* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
Don't display too many broken images. (#169870, Roman
Kagan, patch by Ivan Wong)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 15a67a671d..0f2b8a1532 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,22 @@
2005-04-09 Matthias Clasen <mclasen@redhat.com>
+ Add 16x16 versions of the zoom icons and of
+ GTK_STOCK_INDEX. Some of the images were taken from
+ the hicolor icon theme, and were originally created
+ by Jakub Steiner and Tuomas Kuosmanen. (#167515,
+ Vincent Noel)
+
+ * gtk/stock-icons/stock_index_16.png:
+ * gtk/stock-icons/stock_zoom_1_16.png:
+ * gtk/stock-icons/stock_zoom_fit_16.png:
+ * gtk/stock-icons/stock_zoom_in_16.png:
+ * gtk/stock-icons/stock_zoom_out_16.png: New images.
+
+ * gtk/stock-icons/Makefile.am: Add the new images.
+
+ * gtk/gtkiconfactory.c (get_default_icons): Add the new
+ images.
+
* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
Don't display too many broken images. (#169870, Roman
Kagan, patch by Ivan Wong)
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 5706320611..30f2a373e9 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -760,16 +760,31 @@ get_default_icons (GtkIconFactory *factory)
16, stock_media_stop_16,
24, stock_media_stop_24);
+ add_icon2 (factory, GTK_STOCK_INDEX,
+ 16, stock_index_16,
+ 24, stock_index_24);
+
+ add_icon2 (factory, GTK_STOCK_ZOOM_100,
+ 16, stock_zoom_1_16,
+ 24, stock_zoom_1_24);
+
+ add_icon2 (factory, GTK_STOCK_ZOOM_IN,
+ 16, stock_zoom_in_16,
+ 24, stock_zoom_in_24);
+
+ add_icon2 (factory, GTK_STOCK_ZOOM_OUT,
+ 16, stock_zoom_out_16,
+ 24, stock_zoom_out_24);
+
+ add_icon2 (factory, GTK_STOCK_ZOOM_FIT,
+ 16, stock_zoom_fit_16,
+ 24, stock_zoom_fit_24);
+
/* Generic size only */
add_icon (factory, GTK_STOCK_CLEAR, 24, stock_clear_24);
add_icon (factory, GTK_STOCK_SELECT_COLOR, 24, stock_colorselector_24);
add_icon (factory, GTK_STOCK_COLOR_PICKER, 25, stock_color_picker_25);
- add_icon (factory, GTK_STOCK_INDEX, 24, stock_index_24);
- add_icon (factory, GTK_STOCK_ZOOM_100, 24, stock_zoom_1_24);
- add_icon (factory, GTK_STOCK_ZOOM_FIT, 24, stock_zoom_fit_24);
- add_icon (factory, GTK_STOCK_ZOOM_IN, 24, stock_zoom_in_24);
- add_icon (factory, GTK_STOCK_ZOOM_OUT, 24, stock_zoom_out_24);
}
/************************************************************
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 9963b62363..6086415e5e 100644
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -63,6 +63,7 @@ IMAGES = \
stock_help_24.png \
stock_home_16.png \
stock_home_24.png \
+ stock_index_16.png \
stock_index_24.png \
stock_jump_to_16.png \
stock_jump_to_24.png \
@@ -165,9 +166,13 @@ IMAGES = \
stock_up_arrow_16.png \
stock_up_arrow_24.png \
stock_yes_20.png \
+ stock_zoom_1_16.png \
stock_zoom_1_24.png \
+ stock_zoom_fit_16.png \
stock_zoom_fit_24.png \
+ stock_zoom_in_16.png \
stock_zoom_in_24.png \
+ stock_zoom_out_16.png \
stock_zoom_out_24.png
VARIABLES1 = \
@@ -235,6 +240,7 @@ VARIABLES3 = \
stock_harddisk_24 $(srcdir)/stock_harddisk_24.png \
stock_home_16 $(srcdir)/stock_home_16.png \
stock_home_24 $(srcdir)/stock_home_24.png \
+ stock_index_16 $(srcdir)/stock_index_16.png \
stock_index_24 $(srcdir)/stock_index_24.png \
stock_jump_to_16 $(srcdir)/stock_jump_to_16.png \
stock_jump_to_24 $(srcdir)/stock_jump_to_24.png \
@@ -342,9 +348,13 @@ VARIABLES6 = \
stock_up_arrow_16 $(srcdir)/stock_up_arrow_16.png \
stock_up_arrow_24 $(srcdir)/stock_up_arrow_24.png \
stock_yes_20 $(srcdir)/stock_yes_20.png \
+ stock_zoom_1_16 $(srcdir)/stock_zoom_1_16.png \
stock_zoom_1_24 $(srcdir)/stock_zoom_1_24.png \
+ stock_zoom_fit_16 $(srcdir)/stock_zoom_fit_16.png \
stock_zoom_fit_24 $(srcdir)/stock_zoom_fit_24.png \
+ stock_zoom_in_16 $(srcdir)/stock_zoom_in_16.png \
stock_zoom_in_24 $(srcdir)/stock_zoom_in_24.png \
+ stock_zoom_out_16 $(srcdir)/stock_zoom_out_16.png \
stock_zoom_out_24 $(srcdir)/stock_zoom_out_24.png
noinst_DATA = gtkstockpixbufs.h
diff --git a/gtk/stock-icons/stock_index_16.png b/gtk/stock-icons/stock_index_16.png
new file mode 100644
index 0000000000..1b0e844788
--- /dev/null
+++ b/gtk/stock-icons/stock_index_16.png
Binary files differ
diff --git a/gtk/stock-icons/stock_zoom_1_16.png b/gtk/stock-icons/stock_zoom_1_16.png
new file mode 100644
index 0000000000..d83c95ddc1
--- /dev/null
+++ b/gtk/stock-icons/stock_zoom_1_16.png
Binary files differ
diff --git a/gtk/stock-icons/stock_zoom_fit_16.png b/gtk/stock-icons/stock_zoom_fit_16.png
new file mode 100644
index 0000000000..dfedab0e00
--- /dev/null
+++ b/gtk/stock-icons/stock_zoom_fit_16.png
Binary files differ
diff --git a/gtk/stock-icons/stock_zoom_in_16.png b/gtk/stock-icons/stock_zoom_in_16.png
new file mode 100644
index 0000000000..41de93cc02
--- /dev/null
+++ b/gtk/stock-icons/stock_zoom_in_16.png
Binary files differ
diff --git a/gtk/stock-icons/stock_zoom_out_16.png b/gtk/stock-icons/stock_zoom_out_16.png
new file mode 100644
index 0000000000..1d0cd2ac24
--- /dev/null
+++ b/gtk/stock-icons/stock_zoom_out_16.png
Binary files differ