Mercurial > emacs
annotate 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 |
rev | line source |
---|---|
69424
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
1 /* XPM */ |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
2 static char * stock_mail_handling_xpm[] = { |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
3 "24 24 72 1", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
4 " c None", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
5 ". c #000000", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
6 "+ c #BCBCBC", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
7 "@ c #FFFFFF", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
8 "# c #535353", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
9 "$ c #EEEEEE", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
10 "% c #4F4F4F", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
11 "& c #F5F5F5", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
12 "* c #FBFBFB", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
13 "= c #F7F7F7", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
14 "- c #FAFAFA", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
15 "; c #AEAEAE", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
16 "> c #E4E4E4", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
17 ", c #434343", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
18 "' c #ACACAC", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
19 ") c #C8C8C8", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
20 "! c #A0A0A0", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
21 "~ c #D4D4D4", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
22 "{ c #959595", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
23 "] c #3E3E3E", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
24 "^ c #4D4D4D", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
25 "/ c #818181", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
26 "( c #C6C6C6", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
27 "_ c #6A6A6A", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
28 ": c #636363", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
29 "< c #B9B9B9", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
30 "[ c #737373", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
31 "} c #010101", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
32 "| c #AAAAAA", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
33 "1 c #0B0B0B", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
34 "2 c #0C0C0C", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
35 "3 c #060606", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
36 "4 c #E4E3E1", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
37 "5 c #050505", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
38 "6 c #B3B3B1", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
39 "7 c #484641", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
40 "8 c #9F9D96", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
41 "9 c #888781", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
42 "0 c #7C7C7C", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
43 "a c #B0AFAD", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
44 "b c #A8A7A1", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
45 "c c #908E86", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
46 "d c #97958E", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
47 "e c #807D74", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
48 "f c #969696", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
49 "g c #090909", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
50 "h c #595854", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
51 "i c #605E57", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
52 "j c #898883", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
53 "k c #76746B", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
54 "l c #43423F", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
55 "m c #282724", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
56 "n c #363430", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
57 "o c #6D6B63", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
58 "p c #E2E2E1", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
59 "q c #B6B5AF", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
60 "r c #21201E", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
61 "s c #0A0908", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
62 "t c #181816", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
63 "u c #E6E6E4", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
64 "v c #65635C", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
65 "w c #161614", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
66 "x c #8C8B89", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
67 "y c #DFDEDC", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
68 "z c #B0AFA9", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
69 "A c #D5D4D1", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
70 "B c #93918B", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
71 "C c #D6D5D2", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
72 "D c #ABA9A3", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
73 "E c #5D5C55", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
74 "F c #494943", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
75 "G c #42413C", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
76 " ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
77 " ................. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
78 " .+@@@@@@@@@@@@@@@#. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
79 " .$%&*&*=*&*&*=-&%;. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
80 " .@>,&&&&&&&&&&&%'). ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
81 " .@&>%&&&&&&&&&,!~). ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
82 " .@*&>,&&&&&&&%{~>). ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
83 " .@&&&>]&&&&&^/(>>). ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
84 " .@*&&&_,&&&%_!>&>). ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
85 " .@&&&:<<%&%{([(}}}. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
86 " .@*&:(&>~%'|12:345... ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
87 " .@&[~&&&&>>2>62787.9.. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
88 " .@0~>>>>>>>1ab888cde7. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
89 " .[+++++++++fg88hijek. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
90 " ...........78ilmn8o7..", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
91 " .pq8hrstuevi.", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
92 " ..78jnwxyv7..", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
93 " .zequABv. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
94 " .CD8eekkE7. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
95 " ..h.7k7.F.. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
96 " .. .G. .. ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
97 " ... ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
98 " ", |
ed7704221f2b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
99 " "}; |