Mercurial > emacs
view etc/images/show.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 | 75b06a7624a1 |
children |
line wrap: on
line source
/* XPM */ static char * show_xpm[] = { "24 24 153 2", " c None", ". c #000000", "+ c #0E0E0E", "@ c #282828", "# c #616161", "$ c #D3D3D3", "% c #F6F6F6", "& c #FFFFFF", "* c #F9F9F9", "= c #F9F9F8", "- c #E7E7E7", "; c #E4E4E4", "> c #CDCDCD", ", c #1F1F1F", "' c #EFEFEE", ") c #AFAFAE", "! c #E9E9E9", "~ c #B3B3B3", "{ c #383838", "] c #C1C1C1", "^ c #B4B4B4", "/ c #A4A4A3", "( c #F0F0F0", "_ c #F4F4F4", ": c #ABABAB", "< c #050505", "[ c #FEFEFE", "} c #FDFDFD", "| c #FCFCFB", "1 c #FBFBFB", "2 c #F2F2F2", "3 c #9E9E9E", "4 c #C0C0C0", "5 c #BFBFBF", "6 c #BFBFBE", "7 c #BEBEBE", "8 c #BDBDBC", "9 c #BCBCBC", "0 c #B9B9B9", "a c #A0A0A0", "b c #B9B7B6", "c c #838381", "d c #848381", "e c #6A6763", "f c #FAFAF9", "g c #F8F8F7", "h c #F8F7F6", "i c #F3F2F1", "j c #E0E0DF", "k c #DCDAD8", "l c #CACAC8", "m c #B6B6B4", "n c #72706C", "o c #BCBCBB", "p c #BCBBBA", "q c #BBBAB9", "r c #BABAB9", "s c #B9B8B7", "t c #B6B6B5", "u c #B6B5B3", "v c #E5E4E2", "w c #C4C3C0", "x c #817D74", "y c #F7F6F5", "z c #F6F6F4", "A c #F5F4F3", "B c #F4F3F2", "C c #EBEAE8", "D c #E1DFDC", "E c #8B867D", "F c #B9B9B8", "G c #B8B8B6", "H c #B7B7B6", "I c #B5B5B3", "J c #B4B3B2", "K c #B3B3B2", "L c #ADADAB", "M c #A49E93", "N c #F6F5F4", "O c #F5F5F3", "P c #F3F3F1", "Q c #F2F2F0", "R c #F1F1EF", "S c #F1F0EE", "T c #EEEDEB", "U c #ECEBE9", "V c #E7E6E3", "W c #E2E1DF", "X c #E4E3E0", "Y c #B8B7B6", "Z c #B5B4B3", "` c #B3B2B0", " . c #B0AFAD", ".. c #ADADAA", "+. c #ADACAA", "@. c #E2E1DE", "#. c #F0F0EE", "$. c #EFEFED", "%. c #F0EFED", "&. c #EFEEEC", "*. c #E8E7E5", "=. c #E5E4E1", "-. c #B3B3B1", ";. c #AFAEAC", ">. c #E1E0DC", ",. c #E0DFDB", "'. c #A19C90", "). c #EDEDEB", "!. c #EDECEA", "~. c #E9E8E5", "{. c #E6E4E1", "]. c #E3E2DE", "^. c #DFDEDA", "/. c #DEDDD9", "(. c #DDDCD8", "_. c #A19B90", ":. c #B0B0AE", "<. c #AFADAB", "[. c #E4E2DF", "}. c #E2E1DD", "|. c #DCDBD7", "1. c #E6E5E2", "2. c #E5E4E0", "3. c #E4E3DF", "4. c #DBD9D5", "5. c #D9D7D3", "6. c #9F998D", "7. c #E3E2DF", "8. c #DDDBD7", "9. c #DCDAD6", "0. c #D8D6D2", "a. c #9E988D", "b. c #EDEDED", "c. c #E1E0DD", "d. c #E0DEDA", "e. c #D8D6D1", "f. c #D7D5D1", "g. c #9D978B", "h. c #D1D1D1", "i. c #E1DFDB", "j. c #DEDCD8", "k. c #D7D6D1", "l. c #D5D3CE", "m. c #9B958A", "n. c #999891", "o. c #A39E92", "p. c #A39D92", "q. c #A39D91", "r. c #A29C90", "s. c #A19B8F", "t. c #9D978C", "u. c #9B968A", "v. c #676359", " ", " . . . . . . . . . . . . . + @ # ", " . $ % & & & & & & & & * = = - ; > , ", " . % & & & & & & & & & & = ' ) ! & ~ { ", " . & & ] ] ] ] ] ] ] ] ] ] ^ / ( & _ : < ", " . & & & & & [ } | } | 1 = 2 3 . . . . . ", " . & & ] 4 5 6 7 8 7 8 9 9 0 a b c d e . ", " . & [ } | 1 f = g = g h = i j k l m n . ", " . & | 7 8 9 o p q p q r s t u u v w x . ", " . & f = g h y z A z A B B B B C D D E . ", " . & g p q r F s G s G H I J K L D D M . ", " . & N O B B P Q R Q R S T U V W X D M . ", " . & B Y H m I m u m u Z ` ...+.@.D M . ", " . & B i Q #.$.S %.S %.&.U *.=.X @.D M . ", " . & #.I I Z J -.-.-.-.` .;.W >.>.,.'.. ", " . & ).!.U U U C ~.C ~.~.=.{.].^./.(._.. ", " . & C :.:. . . .;. .;.<.[.}.,.(.(.|._.. ", " . & V 1.1.1.=.{.2.{.2.3.}.,./.|.4.5.6.. ", " . * X 7.].[.3.}.].}.].>.>./.8.9.5.0.a.. ", " . b.c.D >.,.}.,.>.,.>.^.d.8.9.5.e.f.g.. ", " . h.i.d.^./.,./.d./.d.j.j.9.9.0.k.l.m.. ", " . n.o.M p.q.p.'.r.'.r.s._.6.6.t.t.u.v.. ", " . . . . . . . . . . . . . . . . . . ", " "};