Mercurial > emacs
comparison lisp/info.el @ 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 | c168d4537385 |
children | ea9732b429b6 |
comparison
equal
deleted
inserted
replaced
108023:150fd3d78f5a | 108024:4d8277a44bb4 |
---|---|
3734 | 3734 |
3735 | 3735 |
3736 (defvar info-tool-bar-map | 3736 (defvar info-tool-bar-map |
3737 (let ((map (make-sparse-keymap))) | 3737 (let ((map (make-sparse-keymap))) |
3738 (tool-bar-local-item-from-menu 'Info-history-back "left-arrow" map Info-mode-map | 3738 (tool-bar-local-item-from-menu 'Info-history-back "left-arrow" map Info-mode-map |
3739 :rtl "right-arrow") | 3739 :rtl "right-arrow" |
3740 :label "Back") | |
3740 (tool-bar-local-item-from-menu 'Info-history-forward "right-arrow" map Info-mode-map | 3741 (tool-bar-local-item-from-menu 'Info-history-forward "right-arrow" map Info-mode-map |
3741 :rtl "left-arrow") | 3742 :rtl "left-arrow" |
3743 :label "Forward") | |
3742 (tool-bar-local-item-from-menu 'Info-prev "prev-node" map Info-mode-map | 3744 (tool-bar-local-item-from-menu 'Info-prev "prev-node" map Info-mode-map |
3743 :rtl "next-node") | 3745 :rtl "next-node") |
3744 (tool-bar-local-item-from-menu 'Info-next "next-node" map Info-mode-map | 3746 (tool-bar-local-item-from-menu 'Info-next "next-node" map Info-mode-map |
3745 :rtl "prev-node") | 3747 :rtl "prev-node") |
3746 (tool-bar-local-item-from-menu 'Info-up "up-node" map Info-mode-map) | 3748 (tool-bar-local-item-from-menu 'Info-up "up-node" map Info-mode-map) |
3747 (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map) | 3749 (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map) |
3748 (tool-bar-local-item-from-menu 'Info-goto-node "jump-to" map Info-mode-map) | 3750 (tool-bar-local-item-from-menu 'Info-goto-node "jump-to" map Info-mode-map) |
3749 (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map) | 3751 (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map |
3752 :label "Index Search") | |
3750 (tool-bar-local-item-from-menu 'Info-search "search" map Info-mode-map) | 3753 (tool-bar-local-item-from-menu 'Info-search "search" map Info-mode-map) |
3751 (tool-bar-local-item-from-menu 'Info-exit "exit" map Info-mode-map) | 3754 (tool-bar-local-item-from-menu 'Info-exit "exit" map Info-mode-map) |
3752 map)) | 3755 map)) |
3753 | 3756 |
3754 (defvar Info-menu-last-node nil) | 3757 (defvar Info-menu-last-node nil) |