Mercurial > emacs
view etc/images/lock.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_lock_xpm[] = { "24 24 200 2", " c None", ". c #000000", "+ c #212121", "@ c #9E9E9E", "# c #E6E6E6", "$ c #E7E7E7", "% c #C8C8C8", "& c #A0A0A0", "* c #131313", "= c #5F5F5F", "- c #EDEDED", "; c #D6D6D6", "> c #D5D5D5", ", c #DDDDDD", "' c #D8D8D8", ") c #A1A1A1", "! c #3C3C3C", "~ c #353535", "{ c #EFEFEF", "] c #CFCFCF", "^ c #4C4C4C", "/ c #141414", "( c #6A6A6A", "_ c #D0D0D0", ": c #B2B2B2", "< c #454545", "[ c #E2E2E2", "} c #292929", "| c #0F0F0F", "1 c #949494", "2 c #E9E9E9", "3 c #C3C3C3", "4 c #1C1C1C", "5 c #E1E1E1", "6 c #272727", "7 c #DEDEDE", "8 c #B6B6B6", "9 c #B7B6B6", "0 c #150902", "a c #2E2419", "b c #251D15", "c c #616160", "d c #5E5A56", "e c #29211A", "f c #15100C", "g c #2F251B", "h c #1D1710", "i c #4A392B", "j c #656361", "k c #565352", "l c #392B1D", "m c #322110", "n c #0C0500", "o c #EFDBBF", "p c #EDD9C0", "q c #E9D5BE", "r c #E7D2B9", "s c #E5D0B3", "t c #DCC09D", "u c #D9BE99", "v c #DABE99", "w c #D7BB95", "x c #D5B68E", "y c #D2AF85", "z c #CFA77C", "A c #9A5E1B", "B c #F0DABF", "C c #E4C6A0", "D c #D6AF80", "E c #D3AC7B", "F c #D0A570", "G c #C99F68", "H c #C69B64", "I c #C69C64", "J c #C89D66", "K c #C79C65", "L c #C39860", "M c #C09256", "N c #BC8645", "O c #B67C36", "P c #985E1A", "Q c #EED8BC", "R c #E3C39C", "S c #D3AA7B", "T c #CFA670", "U c #CA9F68", "V c #C89E66", "W c #C89F68", "X c #C49961", "Y c #C09358", "Z c #BC8746", "` c #B77D39", " . c #EED8BB", ".. c #E2C29B", "+. c #D6AE7F", "@. c #CA9E6D", "#. c #C69861", "$. c #BF925A", "%. c #BB8E56", "&. c #BD8E56", "*. c #BD9058", "=. c #BC8F58", "-. c #B9884E", ";. c #B48145", ">. c #BA8442", ",. c #B47834", "'. c #975C1A", "). c #EFDABE", "!. c #E4C49D", "~. c #D7B080", "{. c #DAB685", "]. c #D4B07C", "^. c #D0A971", "/. c #CEA46B", "(. c #CDA46D", "_. c #CCA66D", ":. c #CCA46B", "<. c #CA9F63", "[. c #C79858", "}. c #B9813F", "|. c #B37834", "1. c #975D1A", "2. c #EFD8BB", "3. c #E0C199", "4. c #D3AA7A", "5. c #C89B67", "6. c #C3965F", "7. c #BC8E56", "8. c #BA8B52", "9. c #BA8C54", "0. c #BB8D55", "a. c #BA8C55", "b. c #B6864C", "c. c #B47F43", "d. c #BA833F", "e. c #B37934", "f. c #9B601E", "g. c #E3C29C", "h. c #D9B484", "i. c #D4AE77", "j. c #CFA770", "k. c #CBA36B", "l. c #CCA46C", "m. c #CA9D61", "n. c #C69856", "o. c #BA813E", "p. c #B27733", "q. c #A36B2F", "r. c #EDD6B8", "s. c #E1BD94", "t. c #D1A874", "u. c #B7874E", "v. c #B48349", "w. c #B5844C", "x. c #B5884D", "y. c #B48146", "z. c #B27A3C", "A. c #B67D3A", "B. c #B07530", "C. c #A67137", "D. c #EED8BA", "E. c #E0C099", "F. c #D8B37F", "G. c #D2AD76", "H. c #CEA66F", "I. c #CCA46D", "J. c #CCA56D", "K. c #C99D61", "L. c #C69858", "M. c #B9803D", "N. c #B67D38", "O. c #AB783F", "P. c #EED5B7", "Q. c #DFC096", "R. c #D2A776", "S. c #CEA46E", "T. c #C89D65", "U. c #C49960", "V. c #C1955C", "W. c #C2955C", "X. c #C2965C", "Y. c #C09155", "Z. c #BC8A4B", "`. c #BE8A4C", " + c #A9773C", ".+ c #AC8C65", "++ c #CFA772", "@+ c #C49256", "#+ c #C08D51", "$+ c #BA8849", "%+ c #B78342", "&+ c #B48240", "*+ c #B68241", "=+ c #B88544", "-+ c #BB8949", ";+ c #BC8748", ">+ c #BA874A", ",+ c #B98548", "'+ c #B27B3B", ")+ c #6D4215", " ", " ", " . . . . . ", " . + @ # $ % & * ", " . = - # ; > , ' ) ! . ", " ~ { ] ^ . . / ( _ : < ", " . [ ' } . | ( % 1 . ", " * 2 3 . 4 5 @ . ", " 6 7 8 . . $ 9 . ", " 0 a b c d e f g b h b i j k l m n ", " . o p q r s t u u v u w x y z A . ", " . B C D E F G H I J K L M N O P . ", " . Q R D S T U I V W V X Y Z ` A . ", " . ...+.@.#.$.%.&.*.=.-.;.>.,.'.. ", " . ).!.~.{.].^./.(._.:.<.[.}.|.1.. ", " . 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.. ", " . Q g.+.h.i.j.:.k.l.k.m.n.o.p.q.. ", " . r.s.t.#.*.u.v.w.x.b.y.z.A.B.C.. ", " . D.E.S F.G.H.:.I.J.l.K.L.M.N.O.. ", " . P.Q.R.S.T.U.V.W.X.X.Y.Z.>.`. +. ", " . .+++@+#+$+%+&+*+=+-+;+>+,+'+)+. ", " . . . . . . . . . . . . . . . ", " ", " "};