summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-07-06 20:28:48 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-07-06 20:28:48 +0000
commit6b27f20668f0d367aec9e89976ed8158145fef06 (patch)
treeabce8475be631c49c5b4b7aaa970d14f2d8d433e
parentf80b81db14666a7d9d40a4845fc268615debaa0d (diff)
downloadgtk+-6b27f20668f0d367aec9e89976ed8158145fef06.tar.gz
Add stock_file_16.png, stock_file_24.png, stock_directory_16.png and
2004-07-06 Matthias Clasen <mclasen@redhat.com> * gtk/stock-icons/Makefile.am: Add stock_file_16.png, stock_file_24.png, stock_directory_16.png and stock_directory_24.png. * gtk/gtkstock.h (GTK_STOCK_FILE, GTK_STOCK_DIRECTORY): * gtk/gtkiconfactory.c (get_default_icons): New stock icons as fallbacks for gtkfilechooser. Currently these are the same images as the "new" and "open" items...
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-2-1010
-rw-r--r--ChangeLog.pre-2-610
-rw-r--r--ChangeLog.pre-2-810
-rw-r--r--gtk/gtkiconfactory.c8
-rw-r--r--gtk/gtkstock.h2
-rw-r--r--gtk/stock-icons/Makefile.am12
-rw-r--r--gtk/stock-icons/stock_directory_16.pngbin0 -> 448 bytes
-rw-r--r--gtk/stock-icons/stock_directory_24.pngbin0 -> 1076 bytes
-rw-r--r--gtk/stock-icons/stock_file_16.pngbin0 -> 349 bytes
-rw-r--r--gtk/stock-icons/stock_file_24.pngbin0 -> 757 bytes
11 files changed, 60 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 03405042dc..c88ee3f26b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-06 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/stock-icons/Makefile.am: Add stock_file_16.png,
+ stock_file_24.png, stock_directory_16.png and stock_directory_24.png.
+
+ * gtk/gtkstock.h (GTK_STOCK_FILE, GTK_STOCK_DIRECTORY):
+ * gtk/gtkiconfactory.c (get_default_icons): New stock icons as
+ fallbacks for gtkfilechooser. Currently these are the same images
+ as the "new" and "open" items...
+
Tue Jul 6 10:00:22 2004 Jonathan Blandford <jrb@redhat.com>
Fix for #136496, Pawel Salek:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 03405042dc..c88ee3f26b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2004-07-06 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/stock-icons/Makefile.am: Add stock_file_16.png,
+ stock_file_24.png, stock_directory_16.png and stock_directory_24.png.
+
+ * gtk/gtkstock.h (GTK_STOCK_FILE, GTK_STOCK_DIRECTORY):
+ * gtk/gtkiconfactory.c (get_default_icons): New stock icons as
+ fallbacks for gtkfilechooser. Currently these are the same images
+ as the "new" and "open" items...
+
Tue Jul 6 10:00:22 2004 Jonathan Blandford <jrb@redhat.com>
Fix for #136496, Pawel Salek:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 03405042dc..c88ee3f26b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2004-07-06 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/stock-icons/Makefile.am: Add stock_file_16.png,
+ stock_file_24.png, stock_directory_16.png and stock_directory_24.png.
+
+ * gtk/gtkstock.h (GTK_STOCK_FILE, GTK_STOCK_DIRECTORY):
+ * gtk/gtkiconfactory.c (get_default_icons): New stock icons as
+ fallbacks for gtkfilechooser. Currently these are the same images
+ as the "new" and "open" items...
+
Tue Jul 6 10:00:22 2004 Jonathan Blandford <jrb@redhat.com>
Fix for #136496, Pawel Salek:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 03405042dc..c88ee3f26b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2004-07-06 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/stock-icons/Makefile.am: Add stock_file_16.png,
+ stock_file_24.png, stock_directory_16.png and stock_directory_24.png.
+
+ * gtk/gtkstock.h (GTK_STOCK_FILE, GTK_STOCK_DIRECTORY):
+ * gtk/gtkiconfactory.c (get_default_icons): New stock icons as
+ fallbacks for gtkfilechooser. Currently these are the same images
+ as the "new" and "open" items...
+
Tue Jul 6 10:00:22 2004 Jonathan Blandford <jrb@redhat.com>
Fix for #136496, Pawel Salek:
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index a8dd18bd0e..cc01fb75ee 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -695,6 +695,14 @@ get_default_icons (GtkIconFactory *factory)
16, stock_up_arrow_16,
24, stock_up_arrow_24);
+ add_icon2 (factory, GTK_STOCK_FILE,
+ 16, stock_file_16,
+ 24, stock_file_24);
+
+ add_icon2 (factory, GTK_STOCK_DIRECTORY,
+ 16, stock_directory_16,
+ 24, stock_directory_24);
+
/* Generic size only */
add_icon (factory, GTK_STOCK_CLEAR, 24, stock_clear_24);
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index 37be20d2e8..4fa1a7f8bf 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -84,7 +84,9 @@ void gtk_stock_item_free (GtkStockItem *item);
#define GTK_STOCK_COPY "gtk-copy"
#define GTK_STOCK_CUT "gtk-cut"
#define GTK_STOCK_DELETE "gtk-delete"
+#define GTK_STOCK_DIRECTORY "gtk-directory"
#define GTK_STOCK_EXECUTE "gtk-execute"
+#define GTK_STOCK_FILE "gtk-file"
#define GTK_STOCK_FIND "gtk-find"
#define GTK_STOCK_FIND_AND_REPLACE "gtk-find-and-replace"
#define GTK_STOCK_FLOPPY "gtk-floppy"
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 9939ff4e34..8a09dddf30 100644
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -34,6 +34,8 @@ IMAGES = \
stock_dialog_info_48.png \
stock_dialog_question_48.png \
stock_dialog_warning_48.png \
+ stock_directory_16.png \
+ stock_directory_24.png \
stock_dnd_multiple_32.png \
stock_down_arrow_16.png \
stock_down_arrow_24.png \
@@ -41,12 +43,14 @@ IMAGES = \
stock_exec_24.png \
stock_exit_16.png \
stock_exit_24.png \
+ stock_file_16.png \
+ stock_file_24.png \
stock_first_16.png \
stock_first_24.png \
stock_font_16.png \
stock_font_24.png \
- stock_harddisk_16.png \
- stock_harddisk_24.png \
+ stock_harddisk_16.png \
+ stock_harddisk_24.png \
stock_help_16.png \
stock_help_24.png \
stock_home_16.png \
@@ -175,6 +179,8 @@ VARIABLES2 = \
stock_dialog_info_48 $(srcdir)/stock_dialog_info_48.png \
stock_dialog_question_48 $(srcdir)/stock_dialog_question_48.png \
stock_dialog_warning_48 $(srcdir)/stock_dialog_warning_48.png \
+ stock_directory_16 $(srcdir)/stock_directory_16.png \
+ stock_directory_24 $(srcdir)/stock_directory_24.png \
stock_dnd_32 $(srcdir)/stock_dnd_32.png \
stock_down_arrow_16 $(srcdir)/stock_down_arrow_16.png \
stock_down_arrow_24 $(srcdir)/stock_down_arrow_24.png \
@@ -182,6 +188,8 @@ VARIABLES2 = \
stock_exec_24 $(srcdir)/stock_exec_24.png \
stock_exit_16 $(srcdir)/stock_exit_16.png \
stock_exit_24 $(srcdir)/stock_exit_24.png \
+ stock_file_16 $(srcdir)/stock_file_16.png \
+ stock_file_24 $(srcdir)/stock_file_24.png \
stock_first_16 $(srcdir)/stock_first_16.png \
stock_first_24 $(srcdir)/stock_first_24.png \
stock_font_16 $(srcdir)/stock_font_16.png
diff --git a/gtk/stock-icons/stock_directory_16.png b/gtk/stock-icons/stock_directory_16.png
new file mode 100644
index 0000000000..ba8aa09a79
--- /dev/null
+++ b/gtk/stock-icons/stock_directory_16.png
Binary files differ
diff --git a/gtk/stock-icons/stock_directory_24.png b/gtk/stock-icons/stock_directory_24.png
new file mode 100644
index 0000000000..622b95a491
--- /dev/null
+++ b/gtk/stock-icons/stock_directory_24.png
Binary files differ
diff --git a/gtk/stock-icons/stock_file_16.png b/gtk/stock-icons/stock_file_16.png
new file mode 100644
index 0000000000..db8b087487
--- /dev/null
+++ b/gtk/stock-icons/stock_file_16.png
Binary files differ
diff --git a/gtk/stock-icons/stock_file_24.png b/gtk/stock-icons/stock_file_24.png
new file mode 100644
index 0000000000..e14977e601
--- /dev/null
+++ b/gtk/stock-icons/stock_file_24.png
Binary files differ