view etc/images/contact.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_contact_xpm[] = {
"24 24 102 2",
"  	c None",
". 	c #000000",
"+ 	c #E3E1DE",
"@ 	c #ECEBE7",
"# 	c #F0EEEB",
"$ 	c #D2CFC9",
"% 	c #81817F",
"& 	c #4C4C4A",
"* 	c #ECEAE6",
"= 	c #ECEAE5",
"- 	c #EBE9E5",
"; 	c #D2CEC8",
"> 	c #D9C7B8",
", 	c #D9C7B9",
"' 	c #D8C5B8",
") 	c #D1C0B3",
"! 	c #D6C5B7",
"~ 	c #EBEAE5",
"{ 	c #D3D0C9",
"] 	c #CDBCAC",
"^ 	c #AFA093",
"/ 	c #3A3531",
"( 	c #443F3A",
"_ 	c #AE9F93",
": 	c #CBBAAB",
"< 	c #4E4E4C",
"[ 	c #595957",
"} 	c #595857",
"| 	c #7D7C7A",
"1 	c #D3D0CA",
"2 	c #C6B5A4",
"3 	c #3D3833",
"4 	c #433D37",
"5 	c #C2B0A2",
"6 	c #D4D1CA",
"7 	c #B0A08E",
"8 	c #261F18",
"9 	c #D37D1E",
"0 	c #D68021",
"a 	c #B26616",
"b 	c #27241F",
"c 	c #9C8E7F",
"d 	c #EAE9E5",
"e 	c #A29281",
"f 	c #2E2012",
"g 	c #CC751A",
"h 	c #CC761A",
"i 	c #BF6C16",
"j 	c #24211C",
"k 	c #8E8170",
"l 	c #EAE8E3",
"m 	c #E9E8E3",
"n 	c #E9E7E3",
"o 	c #8E7F6C",
"p 	c #221E17",
"q 	c #C56D14",
"r 	c #7D450D",
"s 	c #AF5F11",
"t 	c #221E19",
"u 	c #7F7260",
"v 	c #E9E7E2",
"w 	c #E8E6E1",
"x 	c #E7E5E1",
"y 	c #E7E5E0",
"z 	c #D5D1CB",
"A 	c #3E372C",
"B 	c #1C1F1F",
"C 	c #301B06",
"D 	c #542D07",
"E 	c #291B0E",
"F 	c #151412",
"G 	c #473F33",
"H 	c #E8E6E2",
"I 	c #546371",
"J 	c #849CB4",
"K 	c #56687C",
"L 	c #343332",
"M 	c #495868",
"N 	c #566D85",
"O 	c #293643",
"P 	c #E6E4DF",
"Q 	c #E5E4DE",
"R 	c #EEEDE9",
"S 	c #7B95AF",
"T 	c #7B96B0",
"U 	c #68819B",
"V 	c #8999AA",
"W 	c #5A7088",
"X 	c #607A96",
"Y 	c #5B7691",
"Z 	c #E5E3DE",
"` 	c #4B4A48",
" .	c #757471",
"..	c #E6E3DE",
"+.	c #3B3A39",
"@.	c #747371",
"#.	c #D3CFC8",
"$.	c #E2E1DD",
"%.	c #E7E4E0",
"&.	c #D2CFC8",
"*.	c #D1D0CA",
"=.	c #C2C0B9",
"                                                ",
"                                                ",
"                                                ",
"    . . . . . . . . . . . . . . . . . . . .     ",
"  . + @ # # # # # # # # # # # # # # # # # $ .   ",
"  . # % . . . . . . . & * = - - - - - - - ; .   ",
"  . # . > , ' ) ! > , . * * ~ ~ ~ ~ - - ~ { .   ",
"  . # . ] ^ / . ( _ : . * < [ ~ } } | - ~ 1 .   ",
"  . # . 2 3 . . . 4 5 . * * ~ ~ - - - - - 6 .   ",
"  . # . 7 8 9 0 a b c . * [ < | [ - } | d 6 .   ",
"  . # . e f g h i j k . * * l l m n n n n 6 .   ",
"  . # . o p q r s t u . v v w w w x y y y z .   ",
"  . # . A B C D E F G . H H y y y y y y y 6 .   ",
"  . # . I J K L M N O . y y P P P P P P Q { .   ",
"  . R . S T U V W X Y . y y P P P P Z Z Z { .   ",
"  . d ` . . . . . . . ` y y  ...+.+.Z @.Z #..   ",
"  . $.y y y y y y y y y %.P Z Z Z Z Z Z Z &..   ",
"  . *.6 z 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 =..   ",
"    . . . . . . . . . . . . . . . . . . . . .   ",
"                                                ",
"                                                ",
"                                                ",
"                                                ",
"                                                "};