Mercurial > emacs
view etc/images/back-arrow.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 | 28718fa5d988 |
children |
line wrap: on
line source
/* XPM */ static char *back_arrow_xpm[] = { "24 24 30 1", " c #000000", ". c #53692A", "X c #59702D", "o c #657255", "O c #6D7A5B", "+ c #6D8839", "@ c #7C9B40", "# c #748261", "$ c #7F8E6B", "% c #818F71", "& c #879772", "* c #8C9A7F", "= c #85A24D", "- c #8BA859", "; c #92AD62", ": c #95A77E", "> c #98AF74", ", c #9BB572", "< c #9BAA87", "1 c #9CAF84", "2 c #A4B690", "3 c #A8BCA6", "4 c #ADBDA0", "5 c #AFC394", "6 c #BAD09D", "7 c #B5C3A9", "8 c #BED2A3", "9 c #D5E1C6", "0 c #FFFFFF", "q c None", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqq qqqqqqqqqqqqq", "qqqqqqqqq qqqqqqqqqqqqq", "qqqqqqqq 9 qqqqqqqqqqqqq", "qqqqqqq 96 qqqqqqqqqq", "qqqqqq 968664% qqqqqqqqq", "qqqqq 966666663 qqqqqqqq", "qqqq <666666666* qqqqqqq", "qqqqq X@@@@@@;67 qqqqqq", "qqqqqq .@@@@@@=6$ qqqqqq", "qqqqqqq .@ X@,2 qqqqqq", "qqqqqqqq X q +-6 qqqqqq", "qqqqqqqqq qq @6 qqqqqq", "qqqqqqqqqq qqq -: qqqqqq", "qqqqqqqqqqqqqq >o qqqqqq", "qqqqqqqqqqqqqq 5 qqqqqqq", "qqqqqqqqqqqqq 1O qqqqqqq", "qqqqqqqqqqqq &# qqqqqqqq", "qqqqqqqqqqqqq qqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq"};