Mercurial > emacs
view etc/images/mail/not-spam.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_not_spam_xpm[] = { "24 24 122 2", " c None", ". c #1D1E1E", "+ c #333839", "@ c #393F40", "# c #171819", "$ c #B2B8B9", "% c #D5E3E7", "& c #AABABD", "* c #64696A", "= c #0C0D0D", "- c #929C9E", "; c #E7F0F3", "> c #EDF0F1", ", c #E5EDEF", "' c #C5D9DD", ") c #2E3132", "! c #3F4343", "~ c #1F2121", "{ c #DFEBEE", "] c #B7C4C8", "^ c #D2D9DA", "/ c #E1EFF2", "( c #B6CBCF", "_ c #3C4547", ": c #1E2223", "< c #191E1F", "[ c #2D2E2F", "} c #191A1A", "| c #252829", "1 c #7E8E92", "2 c #B7C2C3", "3 c #C3D9DD", "4 c #9CACB0", "5 c #C3CDCE", "6 c #C7E1E7", "7 c #668F97", "8 c #90ACB2", "9 c #CDDDE1", "0 c #485559", "a c #88A6AC", "b c #1F2223", "c c #3F4545", "d c #242728", "e c #313B3E", "f c #A8C2C8", "g c #B2BDC0", "h c #CFE5E9", "i c #C2D9DE", "j c #81989C", "k c #A2C0C5", "l c #85A9B1", "m c #E5ECEE", "n c #E7F2F4", "o c #9BAEB3", "p c #C8E1E7", "q c #3A3E3F", "r c #0C0E0E", "s c #000000", "t c #333737", "u c #B3C2C5", "v c #DDEDF0", "w c #D8E4E6", "x c #DAECEF", "y c #D5E9ED", "z c #D2E7EC", "A c #95ADB2", "B c #DBE2E2", "C c #EDEFF0", "D c #A2B1B3", "E c #8FA4A8", "F c #D7E2E5", "G c #798F94", "H c #151819", "I c #F3B5A7", "J c #865E55", "K c #AFB9BB", "L c #F1F8F9", "M c #F7FBFB", "N c #D9EBEF", "O c #ECF4F6", "P c #F3F7F7", "Q c #E9F2F4", "R c #EEF2F3", "S c #E9EDEE", "T c #C5C8C9", "U c #C2C6C8", "V c #E0E7E7", "W c #DDEAED", "X c #7A9DA5", "Y c #EB8169", "Z c #B83618", "` c #924E3C", " . c #9FA5A6", ".. c #E3EEF0", "+. c #ECF5F7", "@. c #D6EAED", "#. c #CBE4E9", "$. c #747C7D", "%. c #B43518", "&. c #E76A4D", "*. c #B53F24", "=. c #CB705A", "-. c #C4D8DB", ";. c #D2E6E9", ">. c #CAE3E8", ",. c #A9C8CF", "'. c #EC927D", "). c #E66F54", "!. c #D26951", "~. c #F1A897", "{. c #E76547", "]. c #C58B7D", "^. c #A8ABAC", "/. c #70A1AB", "(. c #DF421E", "_. c #C43A1A", ":. c #E17055", "<. c #DD8D7A", "[. c #FFFFFF", "}. c #030505", "|. c #A2432E", "1. c #AC3316", " ", " ", " . + @ ", " # $ % & * . ", " = - ; > , ' ) ! ", " ~ { ] ^ / ( _ : < [ } ", " | 1 2 3 4 5 6 7 8 9 0 a b ", " c d e f g h i j k l m n o p q r ", " s t u v w / x y z A B C D E F G H ", " s s I J K L M N O P Q R S T U V W X < ", "s I Y Z ` ...+.@.#.$.s s s s s s s s s s s s ", "s %.&.Y *.=.-.;.>.,.s '.).).).).).).).).).).!.s ", "s %.%.%.&.~.{.].^./.s ).(.(.(.(.(.(.(.(.(.(._.s ", "s %.%.%.%.%.&.~.:.<.s ).(.[.[.(.(.(.(.[.[.(._.s ", " s s %.%.%.%.%.&.~.s ).(.[.[.[.(.(.[.[.[.(._.s ", " s s %.%.%.%.%.s ).(.(.[.[.[.[.[.[.(.(._.s ", " s s %.%.%.s ).(.(.(.[.[.[.[.(.(.(._.s ", " }.s s |.s ).(.(.(.[.[.[.[.(.(.(._.s ", " s s s ).(.(.[.[.[.[.[.[.(.(._.s ", " s ).(.[.[.[.(.(.[.[.[.(._.s ", " s ).(.[.[.(.(.(.(.[.[.(._.s ", " s ).(.(.(.(.(.(.(.(.(.(._.s ", " s !._._._._._._._._._._.1.s ", " s s s s s s s s s s s s "};