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...

diff --git a/ChangeLog b/ChangeLog
index 03405042dcccbbb34f16cb424c0480f340895a4f..c88ee3f26b72b4cef022f925f4385058a8a62013 100644 (file)
--- 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 03405042dcccbbb34f16cb424c0480f340895a4f..c88ee3f26b72b4cef022f925f4385058a8a62013 100644 (file)
--- 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 03405042dcccbbb34f16cb424c0480f340895a4f..c88ee3f26b72b4cef022f925f4385058a8a62013 100644 (file)
--- 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 03405042dcccbbb34f16cb424c0480f340895a4f..c88ee3f26b72b4cef022f925f4385058a8a62013 100644 (file)
--- 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 a8dd18bd0e5f16f4a476f9069426b337c16c6a8e..cc01fb75ee39d3bbf932b0f4ca774665f546c688 100644 (file)
--- 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 37be20d2e868a4bc9a7f16b32dafde82ff106ccf..4fa1a7f8bfa72feb86c7502c5bd2ffa6cc8a16df 100644 (file)
--- 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 9939ff4e344cf958c2a96cee107f5b24e4ab6be5..8a09dddf30c93334957f79f25524cdb1a4be9827 100644 (file)
--- 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 (file)
index 0000000..ba8aa09
Binary files /dev/null and b/gtk/stock-icons/stock_directory_16.png differ

diff --git a/gtk/stock-icons/stock_directory_24.png b/gtk/stock-icons/stock_directory_24.png
new file mode 100644 (file)
index 0000000..622b95a
Binary files /dev/null and b/gtk/stock-icons/stock_directory_24.png differ

diff --git a/gtk/stock-icons/stock_file_16.png b/gtk/stock-icons/stock_file_16.png
new file mode 100644 (file)
index 0000000..db8b087
Binary files /dev/null and b/gtk/stock-icons/stock_file_16.png differ

diff --git a/gtk/stock-icons/stock_file_24.png b/gtk/stock-icons/stock_file_24.png
new file mode 100644 (file)
index 0000000..e14977e
Binary files /dev/null and b/gtk/stock-icons/stock_file_24.png differ