diff options
author | Matthias Clasen <maclas@gmx.de> | 2004-07-12 04:56:30 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-07-12 04:56:30 +0000 |
commit | 6c18d56a529b6072b7d87589661ef3a6add152b1 (patch) | |
tree | f1d6024f57ac0dc669a442eb3b114f053e915056 /gtk | |
parent | 1a5e92dd611a3b9739fa3e19c8dec1f07be9a296 (diff) | |
download | gtk+-6c18d56a529b6072b7d87589661ef3a6add152b1.tar.gz |
Add a number of new stock items. (#102530, #68015, #109811, Jordi Mallach,
Mon Jul 12 00:52:04 2004 Matthias Clasen <maclas@gmx.de>
* gtk/stock-icons/Makefile.am:
* gtk/stock-icons/stock_about_{16,24}.png:
* gtk/stock-icons/stock_connect_{16,24}.png:
* gtk/stock-icons/stock_disconnect_{16,24}.png:
* gtk/stock-icons/stock_edit_{16,24}.png:
* gtk/stock-icons/stock_media_forward_{16,24}.png:
* gtk/stock-icons/stock_media_next_{16,24}.png:
* gtk/stock-icons/stock_media_pause_{16,24}.png:
* gtk/stock-icons/stock_media_play_{16,24}.png:
* gtk/stock-icons/stock_media_previous_{16,24}.png:
* gtk/stock-icons/stock_media_record_{16,24}.png:
* gtk/stock-icons/stock_media_rewind_{16,24}.png:
* gtk/stock-icons/stock_media_stop_{16,24}.png:
* gtk/gtkstock.h (GTK_STOCK_ABOUT):
* gtk/gtkstock.h (GTK_STOCK_CONNECT):
* gtk/gtkstock.h (GTK_STOCK_DISCONNECT):
* gtk/gtkstock.h (GTK_STOCK_EDIT):
* gtk/gtkstock.h (GTK_STOCK_MEDIA_FORWARD):
* gtk/gtkstock.h (GTK_STOCK_MEDIA_NEXT):
* gtk/gtkstock.h (GTK_STOCK_MEDIA_PAUSE):
* gtk/gtkstock.h (GTK_STOCK_MEDIA_PLAY):
* gtk/gtkstock.h (GTK_STOCK_MEDIA_PREVIOUS):
* gtk/gtkstock.h (GTK_STOCK_MEDIA_RECORD):
* gtk/gtkstock.h (GTK_STOCK_MEDIA_REWIND):
* gtk/gtkstock.h (GTK_STOCK_MEDIA_STOP):
* gtk/gtkiconfactory.c (get_default_icons):
* gtk/gtkstock.c (builtin_items): Add a number of new stock
items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
Michael Opdenacker)
Diffstat (limited to 'gtk')
28 files changed, 122 insertions, 4 deletions
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index cc01fb75ee..4696043076 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -703,6 +703,54 @@ get_default_icons (GtkIconFactory *factory) 16, stock_directory_16, 24, stock_directory_24); + add_icon2 (factory, GTK_STOCK_ABOUT, + 16, stock_about_16, + 24, stock_about_24); + + add_icon2 (factory, GTK_STOCK_CONNECT, + 16, stock_connect_16, + 24, stock_connect_24); + + add_icon2 (factory, GTK_STOCK_DISCONNECT, + 16, stock_disconnect_16, + 24, stock_disconnect_24); + + add_icon2 (factory, GTK_STOCK_EDIT, + 16, stock_edit_16, + 24, stock_edit_24); + + add_icon2 (factory, GTK_STOCK_MEDIA_FORWARD, + 16, stock_media_forward_16, + 24, stock_media_forward_24); + + add_icon2 (factory, GTK_STOCK_MEDIA_NEXT, + 16, stock_media_next_16, + 24, stock_media_next_24); + + add_icon2 (factory, GTK_STOCK_MEDIA_PAUSE, + 16, stock_media_pause_16, + 24, stock_media_pause_24); + + add_icon2 (factory, GTK_STOCK_MEDIA_PLAY, + 16, stock_media_play_16, + 24, stock_media_play_24); + + add_icon2 (factory, GTK_STOCK_MEDIA_PREVIOUS, + 16, stock_media_previous_16, + 24, stock_media_previous_24); + + add_icon2 (factory, GTK_STOCK_MEDIA_RECORD, + 16, stock_media_record_16, + 24, stock_media_record_24); + + add_icon2 (factory, GTK_STOCK_MEDIA_REWIND, + 16, stock_media_rewind_16, + 24, stock_media_rewind_24); + + add_icon2 (factory, GTK_STOCK_MEDIA_STOP, + 16, stock_media_stop_16, + 24, stock_media_stop_24); + /* Generic size only */ add_icon (factory, GTK_STOCK_CLEAR, 24, stock_clear_24); diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c index 6bf445190e..e3a5174ffc 100644 --- a/gtk/gtkstock.c +++ b/gtk/gtkstock.c @@ -290,6 +290,7 @@ static const GtkStockItem builtin_items [] = /* FIXME these need accelerators when appropriate, and * need the mnemonics to be rationalized */ + { GTK_STOCK_ABOUT, N_("_About"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_ADD, N_("_Add"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_APPLY, N_("_Apply"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_BOLD, N_("_Bold"), 0, 0, GETTEXT_PACKAGE }, @@ -302,6 +303,7 @@ static const GtkStockItem builtin_items [] = { GTK_STOCK_CUT, N_("Cu_t"), GDK_CONTROL_MASK, 'x', GETTEXT_PACKAGE }, { GTK_STOCK_DELETE, N_("_Delete"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_EXECUTE, N_("_Execute"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_EDIT, N_("_Edit"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_FIND, N_("_Find"), GDK_CONTROL_MASK, 'f', GETTEXT_PACKAGE }, { GTK_STOCK_FIND_AND_REPLACE, N_("Find and _Replace"), GDK_CONTROL_MASK, 'r', GETTEXT_PACKAGE }, { GTK_STOCK_FLOPPY, N_("_Floppy"), 0, 0, GETTEXT_PACKAGE }, @@ -325,6 +327,14 @@ static const GtkStockItem builtin_items [] = { GTK_STOCK_JUSTIFY_FILL, N_("_Fill"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_JUSTIFY_LEFT, N_("_Left"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_JUSTIFY_RIGHT, N_("_Right"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_MEDIA_FORWARD, N_("_Forward"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_MEDIA_NEXT, N_("_Next"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_MEDIA_PAUSE, N_("P_ause"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_MEDIA_PLAY, N_("_Play"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_MEDIA_PREVIOUS, N_("Pre_vious"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_MEDIA_RECORD, N_("_Record"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_MEDIA_REWIND, N_("R_ewind"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_MEDIA_STOP, N_("_Stop"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_NETWORK, N_("_Network"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_NEW, N_("_New"), GDK_CONTROL_MASK, 'n', GETTEXT_PACKAGE }, { GTK_STOCK_NO, N_("_No"), 0, 0, GETTEXT_PACKAGE }, diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index 4fa1a7f8bf..419cc5075a 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -72,6 +72,7 @@ void gtk_stock_item_free (GtkStockItem *item); #define GTK_STOCK_DND "gtk-dnd" #define GTK_STOCK_DND_MULTIPLE "gtk-dnd-multiple" +#define GTK_STOCK_ABOUT "gtk-about" #define GTK_STOCK_ADD "gtk-add" #define GTK_STOCK_APPLY "gtk-apply" #define GTK_STOCK_BOLD "gtk-bold" @@ -81,10 +82,13 @@ void gtk_stock_item_free (GtkStockItem *item); #define GTK_STOCK_CLOSE "gtk-close" #define GTK_STOCK_COLOR_PICKER "gtk-color-picker" #define GTK_STOCK_CONVERT "gtk-convert" +#define GTK_STOCK_CONNECT "gtk-connect" #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_DISCONNECT "gtk-disconnect" +#define GTK_STOCK_EDIT "gtk-edit" #define GTK_STOCK_EXECUTE "gtk-execute" #define GTK_STOCK_FILE "gtk-file" #define GTK_STOCK_FIND "gtk-find" @@ -102,8 +106,8 @@ void gtk_stock_item_free (GtkStockItem *item); #define GTK_STOCK_HELP "gtk-help" #define GTK_STOCK_HOME "gtk-home" #define GTK_STOCK_INDEX "gtk-index" -#define GTK_STOCK_INDENT "gtk-indent" /* since gtk-2.4 */ -#define GTK_STOCK_UNINDENT "gtk-unindent" /* since gtk-2.4 */ +#define GTK_STOCK_INDENT "gtk-indent" +#define GTK_STOCK_UNINDENT "gtk-unindent" #define GTK_STOCK_ITALIC "gtk-italic" #define GTK_STOCK_JUMP_TO "gtk-jump-to" #define GTK_STOCK_JUSTIFY_CENTER "gtk-justify-center" @@ -111,6 +115,14 @@ void gtk_stock_item_free (GtkStockItem *item); #define GTK_STOCK_JUSTIFY_LEFT "gtk-justify-left" #define GTK_STOCK_JUSTIFY_RIGHT "gtk-justify-right" #define GTK_STOCK_MISSING_IMAGE "gtk-missing-image" +#define GTK_STOCK_MEDIA_FORWARD "gtk-media-forward" +#define GTK_STOCK_MEDIA_NEXT "gtk-media-next" +#define GTK_STOCK_MEDIA_PAUSE "gtk-media-pause" +#define GTK_STOCK_MEDIA_PLAY "gtk-media-play" +#define GTK_STOCK_MEDIA_PREVIOUS "gtk-media-previous" +#define GTK_STOCK_MEDIA_RECORD "gtk-media-record" +#define GTK_STOCK_MEDIA_REWIND "gtk-media-rewind" +#define GTK_STOCK_MEDIA_STOP "gtk-media-stop" #define GTK_STOCK_NETWORK "gtk-network" #define GTK_STOCK_NEW "gtk-new" #define GTK_STOCK_NO "gtk-no" diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 8a09dddf30..e57fba6b36 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -1,5 +1,7 @@ IMAGES = \ + stock_about_16.png \ + stock_about_24.png \ stock_add_16.png \ stock_add_24.png \ stock_align_center_16.png \ @@ -23,6 +25,8 @@ IMAGES = \ stock_close_24.png \ stock_colorselector_24.png \ stock_color_picker_25.png \ + stock_connect_16.png \ + stock_connect_24.png \ stock_convert_16.png \ stock_convert_24.png \ stock_copy_16.png \ @@ -36,9 +40,13 @@ IMAGES = \ stock_dialog_warning_48.png \ stock_directory_16.png \ stock_directory_24.png \ + stock_disconnect_16.png \ + stock_disconnect_24.png \ stock_dnd_multiple_32.png \ stock_down_arrow_16.png \ stock_down_arrow_24.png \ + stock_edit_16.png \ + stock_edit_24.png \ stock_exec_16.png \ stock_exec_24.png \ stock_exit_16.png \ @@ -64,6 +72,22 @@ IMAGES = \ stock_last_24.png \ stock_left_arrow_16.png \ stock_left_arrow_24.png \ + stock_media_forward_16.png \ + stock_media_forward_24.png \ + stock_media_next_16.png \ + stock_media_next_24.png \ + stock_media_pause_16.png \ + stock_media_pause_24.png \ + stock_media_play_16.png \ + stock_media_play_24.png \ + stock_media_previous_16.png \ + stock_media_previous_24.png \ + stock_media_record_16.png \ + stock_media_record_24.png \ + stock_media_rewind_16.png \ + stock_media_rewind_24.png \ + stock_media_stop_16.png \ + stock_media_stop_24.png \ stock_network_16.png \ stock_network_24.png \ stock_new_16.png \ @@ -145,6 +169,8 @@ IMAGES = \ stock_zoom_out_24.png VARIABLES1 = \ + stock_about_16 $(srcdir)/stock_about_16.png \ + stock_about_24 $(srcdir)/stock_about_24.png \ stock_add_16 $(srcdir)/stock_add_16.png \ stock_add_24 $(srcdir)/stock_add_24.png \ stock_align_center_16 $(srcdir)/stock_align_center_16.png \ @@ -170,6 +196,8 @@ VARIABLES1 = \ VARIABLES2 = \ stock_convert_16 $(srcdir)/stock_convert_16.png \ stock_convert_24 $(srcdir)/stock_convert_24.png \ + stock_connect_16 $(srcdir)/stock_connect_16.png \ + stock_connect_24 $(srcdir)/stock_connect_24.png \ stock_copy_16 $(srcdir)/stock_copy_16.png \ stock_copy_24 $(srcdir)/stock_copy_24.png \ stock_cut_16 $(srcdir)/stock_cut_16.png \ @@ -181,9 +209,13 @@ VARIABLES2 = \ 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_disconnect_16 $(srcdir)/stock_disconnect_16.png \ + stock_disconnect_24 $(srcdir)/stock_disconnect_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 \ + stock_edit_16 $(srcdir)/stock_edit_16.png \ + stock_edit_24 $(srcdir)/stock_edit_24.png \ stock_exec_16 $(srcdir)/stock_exec_16.png \ stock_exec_24 $(srcdir)/stock_exec_24.png \ stock_exit_16 $(srcdir)/stock_exit_16.png \ @@ -212,8 +244,24 @@ VARIABLES3 = \ stock_left_arrow_24 $(srcdir)/stock_left_arrow_24.png \ stock_missing_image_16 $(srcdir)/stock_broken_image_16.png \ stock_missing_image_24 $(srcdir)/stock_broken_image_24.png \ - stock_network_16 $(srcdir)/stock_network_16.png \ - stock_network_24 $(srcdir)/stock_network_24.png \ + stock_media_forward_16 $(srcdir)/stock_media_forward_16.png \ + stock_media_forward_24 $(srcdir)/stock_media_forward_24.png \ + stock_media_next_16 $(srcdir)/stock_media_next_16.png \ + stock_media_next_24 $(srcdir)/stock_media_next_24.png \ + stock_media_pause_16 $(srcdir)/stock_media_pause_16.png \ + stock_media_pause_24 $(srcdir)/stock_media_pause_24.png \ + stock_media_play_16 $(srcdir)/stock_media_play_16.png \ + stock_media_play_24 $(srcdir)/stock_media_play_24.png \ + stock_media_previous_16 $(srcdir)/stock_media_previous_16.png \ + stock_media_previous_24 $(srcdir)/stock_media_previous_24.png \ + stock_media_record_16 $(srcdir)/stock_media_record_16.png \ + stock_media_record_24 $(srcdir)/stock_media_record_24.png \ + stock_media_rewind_16 $(srcdir)/stock_media_rewind_16.png \ + stock_media_rewind_24 $(srcdir)/stock_media_rewind_24.png \ + stock_media_stop_16 $(srcdir)/stock_media_stop_16.png \ + stock_media_stop_24 $(srcdir)/stock_media_stop_24.png \ + stock_network_16 $(srcdir)/stock_network_16.png \ + stock_network_24 $(srcdir)/stock_network_24.png \ stock_new_16 $(srcdir)/stock_new_16.png \ stock_new_24 $(srcdir)/stock_new_24.png \ stock_no_20 $(srcdir)/stock_no_20.png \ diff --git a/gtk/stock-icons/stock_about_16.png b/gtk/stock-icons/stock_about_16.png Binary files differnew file mode 100644 index 0000000000..d66bfd7b02 --- /dev/null +++ b/gtk/stock-icons/stock_about_16.png diff --git a/gtk/stock-icons/stock_about_24.png b/gtk/stock-icons/stock_about_24.png Binary files differnew file mode 100644 index 0000000000..51af152945 --- /dev/null +++ b/gtk/stock-icons/stock_about_24.png diff --git a/gtk/stock-icons/stock_connect_16.png b/gtk/stock-icons/stock_connect_16.png Binary files differnew file mode 100644 index 0000000000..4f031b71c6 --- /dev/null +++ b/gtk/stock-icons/stock_connect_16.png diff --git a/gtk/stock-icons/stock_connect_24.png b/gtk/stock-icons/stock_connect_24.png Binary files differnew file mode 100644 index 0000000000..6a40c1b72b --- /dev/null +++ b/gtk/stock-icons/stock_connect_24.png diff --git a/gtk/stock-icons/stock_disconnect_16.png b/gtk/stock-icons/stock_disconnect_16.png Binary files differnew file mode 100644 index 0000000000..bc9a1b7215 --- /dev/null +++ b/gtk/stock-icons/stock_disconnect_16.png diff --git a/gtk/stock-icons/stock_disconnect_24.png b/gtk/stock-icons/stock_disconnect_24.png Binary files differnew file mode 100644 index 0000000000..0769aadcbb --- /dev/null +++ b/gtk/stock-icons/stock_disconnect_24.png diff --git a/gtk/stock-icons/stock_edit_16.png b/gtk/stock-icons/stock_edit_16.png Binary files differnew file mode 100644 index 0000000000..7c7d597da5 --- /dev/null +++ b/gtk/stock-icons/stock_edit_16.png diff --git a/gtk/stock-icons/stock_edit_24.png b/gtk/stock-icons/stock_edit_24.png Binary files differnew file mode 100644 index 0000000000..36775390f1 --- /dev/null +++ b/gtk/stock-icons/stock_edit_24.png diff --git a/gtk/stock-icons/stock_media_forward_16.png b/gtk/stock-icons/stock_media_forward_16.png Binary files differnew file mode 100644 index 0000000000..4d808e22f2 --- /dev/null +++ b/gtk/stock-icons/stock_media_forward_16.png diff --git a/gtk/stock-icons/stock_media_forward_24.png b/gtk/stock-icons/stock_media_forward_24.png Binary files differnew file mode 100644 index 0000000000..21d4016d9b --- /dev/null +++ b/gtk/stock-icons/stock_media_forward_24.png diff --git a/gtk/stock-icons/stock_media_next_16.png b/gtk/stock-icons/stock_media_next_16.png Binary files differnew file mode 100644 index 0000000000..574c95972f --- /dev/null +++ b/gtk/stock-icons/stock_media_next_16.png diff --git a/gtk/stock-icons/stock_media_next_24.png b/gtk/stock-icons/stock_media_next_24.png Binary files differnew file mode 100644 index 0000000000..b1d259a44a --- /dev/null +++ b/gtk/stock-icons/stock_media_next_24.png diff --git a/gtk/stock-icons/stock_media_pause_16.png b/gtk/stock-icons/stock_media_pause_16.png Binary files differnew file mode 100644 index 0000000000..5b2bbdebc2 --- /dev/null +++ b/gtk/stock-icons/stock_media_pause_16.png diff --git a/gtk/stock-icons/stock_media_pause_24.png b/gtk/stock-icons/stock_media_pause_24.png Binary files differnew file mode 100644 index 0000000000..1e03ef1564 --- /dev/null +++ b/gtk/stock-icons/stock_media_pause_24.png diff --git a/gtk/stock-icons/stock_media_play_16.png b/gtk/stock-icons/stock_media_play_16.png Binary files differnew file mode 100644 index 0000000000..48f9298c1d --- /dev/null +++ b/gtk/stock-icons/stock_media_play_16.png diff --git a/gtk/stock-icons/stock_media_play_24.png b/gtk/stock-icons/stock_media_play_24.png Binary files differnew file mode 100644 index 0000000000..d252e2de89 --- /dev/null +++ b/gtk/stock-icons/stock_media_play_24.png diff --git a/gtk/stock-icons/stock_media_previous_16.png b/gtk/stock-icons/stock_media_previous_16.png Binary files differnew file mode 100644 index 0000000000..8cd19ea374 --- /dev/null +++ b/gtk/stock-icons/stock_media_previous_16.png diff --git a/gtk/stock-icons/stock_media_previous_24.png b/gtk/stock-icons/stock_media_previous_24.png Binary files differnew file mode 100644 index 0000000000..2271a614f7 --- /dev/null +++ b/gtk/stock-icons/stock_media_previous_24.png diff --git a/gtk/stock-icons/stock_media_record_16.png b/gtk/stock-icons/stock_media_record_16.png Binary files differnew file mode 100644 index 0000000000..27137dc807 --- /dev/null +++ b/gtk/stock-icons/stock_media_record_16.png diff --git a/gtk/stock-icons/stock_media_record_24.png b/gtk/stock-icons/stock_media_record_24.png Binary files differnew file mode 100644 index 0000000000..a95830d23f --- /dev/null +++ b/gtk/stock-icons/stock_media_record_24.png diff --git a/gtk/stock-icons/stock_media_rewind_16.png b/gtk/stock-icons/stock_media_rewind_16.png Binary files differnew file mode 100644 index 0000000000..ae90e85c57 --- /dev/null +++ b/gtk/stock-icons/stock_media_rewind_16.png diff --git a/gtk/stock-icons/stock_media_rewind_24.png b/gtk/stock-icons/stock_media_rewind_24.png Binary files differnew file mode 100644 index 0000000000..50b61a3c73 --- /dev/null +++ b/gtk/stock-icons/stock_media_rewind_24.png diff --git a/gtk/stock-icons/stock_media_stop_16.png b/gtk/stock-icons/stock_media_stop_16.png Binary files differnew file mode 100644 index 0000000000..1fd0750333 --- /dev/null +++ b/gtk/stock-icons/stock_media_stop_16.png diff --git a/gtk/stock-icons/stock_media_stop_24.png b/gtk/stock-icons/stock_media_stop_24.png Binary files differnew file mode 100644 index 0000000000..e7c84a2b22 --- /dev/null +++ b/gtk/stock-icons/stock_media_stop_24.png |