view etc/images/up-arrow.xpm @ 108024:4d8277a44bb4

Gtk tool bars can be text, icons with text or just icons. * xsettings.c: Qmonospace_font_name, Qtool_bar_style and current_tool_bar_style are new. (store_config_changed_event): Rename from store_font_changed_event. (XSETTINGS_TOOL_BAR_STYLE): New define. (SEEN_FONT, SEEN_TB_STYLE): New enum values. (struct xsettings): Add font and tb_style, set xft stuff inside #ifdef HAVE_XFT. (something_changedCB): store_font_changed_event is now store_config_changed_event (parse_settings): Rename from parse_xft_settings. Read non-xft xsettings outside #ifdef HAVE_XFT. (read_settings): Renamed from read_xft_settings. (apply_xft_settings): Take current settings as parameter. Do not call read_(xft)_settings. (read_and_apply_settings): New function. (xft_settings_event): Do non-xft stuff out of HAVE_XFT. Call read_and_apply_settings if there are settings to be read. (init_xsettings): Renamed from init_xfd_settings. Call read_and_apply_settings unconditionally. (xsettings_initialize): Call init_xsettings. (Ftool_bar_get_system_style): New function. (syms_of_xsettings): Define Qmonospace_font_name and Qtool_bar_style. Initialize current_tool_bar_style to nil. defsubr Stool_bar_get_system_style. Fprovide on dynamic-setting. * xsettings.h (Ftool_bar_get_system_style): Declare. * xdisp.c: Vtool_bar_style, tool_bar_max_label_size, Qtext, Qboth, Qboth_horiz are new. (syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR Vtool_bar_style, tool_bar_max_label_size. * lisp.h: Extern declare Qtext, Qboth, Qboth_horiz. * keyboard.c: QClabel is new. (parse_tool_bar_item): Take out QClabel from tool bar items. Try to construct a label if ther is no QClabel. (syms_of_keyboard): Intern :label as QClabel. * dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new. (Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE): New. * Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to dynamic-setting.el. * gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item. (xg_make_tool_item, xg_show_toolbar_item): New function. (update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL. Call xg_make_tool_item to make a tool bar item. Call xg_show_toolbar_item. Use wtoolbar instead of x->toolbar_widget. * xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin into account for toolbars. * vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items. * tool-bar.el (tool-bar-setup): Add :label on some tool bar items. * loadup.el: Load dynamic-setting.el if feature dynamic-setting is present. * info.el (info-tool-bar-map): Add labels. * cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size. * cus-edit.el (custom-commands): Add labels for tool bar. (custom-buffer-create-internal, Custom-mode): Adjust for labels in custom-commands. * dynamic-setting.el: Renamed from font-setting.el.

/* XPM */
static char * up_arrow_xpm[] = {
"24 24 67 1",
" 	c None",
".	c #000000",
"+	c #2F2F2F",
"@	c #A5B4A4",
"#	c #E8F4E6",
"$	c #96B892",
"%	c #41533C",
"&	c #F1FFF0",
"*	c #B8D6B7",
"=	c #9FC49D",
"-	c #66815E",
";	c #B6D4B5",
">	c #B9D7B8",
",	c #A1C69F",
"'	c #68835F",
")	c #637D5B",
"!	c #3F5239",
"~	c #B8D7B7",
"{	c #A2C7A0",
"]	c #6A8561",
"^	c #657F5C",
"/	c #617959",
"(	c #3E4F39",
"_	c #F0FEEF",
":	c #B7D5B6",
"<	c #657E5C",
"[	c #5D7555",
"}	c #D6EAD6",
"|	c #BFD4BF",
"1	c #C0D5C0",
"2	c #637C5B",
"3	c #4D6246",
"4	c #4C6046",
"5	c #C7E1C6",
"6	c #A1C69E",
"7	c #67815E",
"8	c #627B59",
"9	c #3D4E39",
"0	c #D0E7D0",
"a	c #B5D3B4",
"b	c #A0C39D",
"c	c #607958",
"d	c #B5D2B4",
"e	c #9DC19B",
"f	c #647D5B",
"g	c #607858",
"h	c #C6E0C5",
"i	c #B4D2B3",
"j	c #9CBF99",
"k	c #C5DFC4",
"l	c #B1CEB0",
"m	c #99BC97",
"n	c #617A59",
"o	c #5E7756",
"p	c #C0D9BF",
"q	c #AFCCAE",
"r	c #AECBAD",
"s	c #93B690",
"t	c #607857",
"u	c #5E7656",
"v	c #8DB389",
"w	c #748A72",
"x	c #71916E",
"y	c #5A7257",
"z	c #4D6247",
"A	c #4D6146",
"B	c #43543D",
"                        ",
"                        ",
"           .            ",
"          +@.           ",
"         .#$%.          ",
"        .&*=-%.         ",
"       .&;>,')!.        ",
"      .&~;>{]^/(.       ",
"     ._~>:>,]</[(.      ",
"    .}|1>~~,'23444.     ",
"   .....5;;6789.....    ",
"       .0;ab^c9.        ",
"       .5;defg9.        ",
"       .haij2g9.        ",
"       .kilmno9.        ",
"       .pqrstu9.        ",
"       .vwxyzAB.        ",
"       .........        ",
"                        ",
"                        ",
"                        ",
"                        ",
"                        ",
"                        "};