view etc/images/describe.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 * stock_properties_xpm[] = {
"24 24 68 1",
" 	c None",
".	c #000000",
"+	c #74716E",
"@	c #C9C4BD",
"#	c #DFDAD2",
"$	c #F4EFE5",
"%	c #F2ECE1",
"&	c #FFFFFF",
"*	c #4C4B48",
"=	c #EEE5D4",
"-	c #ECE2CF",
";	c #EADFC9",
">	c #F9F9F9",
",	c #E2D2B1",
"'	c #F4F4F4",
")	c #EEEEEE",
"!	c #959595",
"~	c #F5F5F5",
"{	c #F6F6F6",
"]	c #D9D9D9",
"^	c #C7B99C",
"/	c #E9E9E9",
"(	c #787878",
"_	c #E1E1E1",
":	c #E2E2E2",
"<	c #C8C8C8",
"[	c #877E69",
"}	c #9A8F78",
"|	c #DEDEDE",
"1	c #E3E3E3",
"2	c #929292",
"3	c #AFA389",
"4	c #ACACAC",
"5	c #A2A2A2",
"6	c #E4E4E4",
"7	c #BCBCBC",
"8	c #939393",
"9	c #EDEDED",
"0	c #EFEFEF",
"a	c #F0F0F0",
"b	c #E5E5E5",
"c	c #E7E7E7",
"d	c #E8E8E8",
"e	c #EAEAEA",
"f	c #EBEBEB",
"g	c #BEBEBE",
"h	c #F1F1F1",
"i	c #DFDFDF",
"j	c #F3F3F3",
"k	c #E0E0E0",
"l	c #ABABAB",
"m	c #AEAEAE",
"n	c #AFAFAF",
"o	c #ADADAD",
"p	c #B0B0B0",
"q	c #B1B1B1",
"r	c #F7F7F7",
"s	c #B3B3B3",
"t	c #F8F8F8",
"u	c #B4B4B4",
"v	c #B5B5B5",
"w	c #B6B6B6",
"x	c #FAFAFA",
"y	c #FBFBFB",
"z	c #DCDCDC",
"A	c #DDDDDD",
"B	c #E6E6E6",
"C	c #969696",
"                        ",
"                        ",
"                        ",
"           .........    ",
"          .+@#$%.&&.    ",
"          *=---;.&>.    ",
"   .......;.,,,,.').    ",
"   !~~{].;.^.,^^./(..   ",
"  .~_:<.;.[.^.}..|]..   ",
"  .~:1.;.2.[.3.4...5.   ",
"  .{16..7/8.[.49)0a|.   ",
"  .{6bcd/ef8.g9)0ahi.   ",
"  .{bcd/ef9ef9)0ahjk.   ",
"  .{cllefmnomnppqj'_.   ",
"  .rd/ef9)09)0ahj'~:.   ",
"  .r/4o9)ppnppqss~{1.   ",
"  .tef9)0ah0ahj'~{rb.   ",
"  .>9npahssqssuvw>xc.   ",
"  .>)0ahj'~j'~{r>xyd.   ",
"  .nzA|ik_:k_:1bBcdC.   ",
"   .................    ",
"                        ",
"                        ",
"                        "};