Mercurial > emacs
view etc/images/mail/save-draft.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.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Tue, 20 Apr 2010 20:52:07 +0200 |
parents | ed7704221f2b |
children |
line wrap: on
line source
/* XPM */ static char * stock_mail_handling_xpm[] = { "24 24 72 1", " c None", ". c #000000", "+ c #BCBCBC", "@ c #FFFFFF", "# c #535353", "$ c #EEEEEE", "% c #4F4F4F", "& c #F5F5F5", "* c #FBFBFB", "= c #F7F7F7", "- c #FAFAFA", "; c #AEAEAE", "> c #E4E4E4", ", c #434343", "' c #ACACAC", ") c #C8C8C8", "! c #A0A0A0", "~ c #D4D4D4", "{ c #959595", "] c #3E3E3E", "^ c #4D4D4D", "/ c #818181", "( c #C6C6C6", "_ c #6A6A6A", ": c #636363", "< c #B9B9B9", "[ c #737373", "} c #010101", "| c #AAAAAA", "1 c #0B0B0B", "2 c #0C0C0C", "3 c #060606", "4 c #E4E3E1", "5 c #050505", "6 c #B3B3B1", "7 c #484641", "8 c #9F9D96", "9 c #888781", "0 c #7C7C7C", "a c #B0AFAD", "b c #A8A7A1", "c c #908E86", "d c #97958E", "e c #807D74", "f c #969696", "g c #090909", "h c #595854", "i c #605E57", "j c #898883", "k c #76746B", "l c #43423F", "m c #282724", "n c #363430", "o c #6D6B63", "p c #E2E2E1", "q c #B6B5AF", "r c #21201E", "s c #0A0908", "t c #181816", "u c #E6E6E4", "v c #65635C", "w c #161614", "x c #8C8B89", "y c #DFDEDC", "z c #B0AFA9", "A c #D5D4D1", "B c #93918B", "C c #D6D5D2", "D c #ABA9A3", "E c #5D5C55", "F c #494943", "G c #42413C", " ", " ................. ", " .+@@@@@@@@@@@@@@@#. ", " .$%&*&*=*&*&*=-&%;. ", " .@>,&&&&&&&&&&&%'). ", " .@&>%&&&&&&&&&,!~). ", " .@*&>,&&&&&&&%{~>). ", " .@&&&>]&&&&&^/(>>). ", " .@*&&&_,&&&%_!>&>). ", " .@&&&:<<%&%{([(}}}. ", " .@*&:(&>~%'|12:345... ", " .@&[~&&&&>>2>62787.9.. ", " .@0~>>>>>>>1ab888cde7. ", " .[+++++++++fg88hijek. ", " ...........78ilmn8o7..", " .pq8hrstuevi.", " ..78jnwxyv7..", " .zequABv. ", " .CD8eekkE7. ", " ..h.7k7.F.. ", " .. .G. .. ", " ... ", " ", " "};