Mercurial > emacs

comparison lisp/vc-dir.el @ 108024:4d8277a44bb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2cdeb4c70d45
children 136a119bc981
comparison
equal deleted inserted replaced
108023:150fd3d78f5a 108024:4d8277a44bb4
299 (let ((map (make-sparse-keymap))) 299 (let ((map (make-sparse-keymap)))
300 (tool-bar-local-item-from-menu 'vc-dir-find-file "open" 300 (tool-bar-local-item-from-menu 'vc-dir-find-file "open"
301 map vc-dir-mode-map) 301 map vc-dir-mode-map)
302 (tool-bar-local-item "bookmark_add" 302 (tool-bar-local-item "bookmark_add"
303 'vc-dir-toggle-mark 'vc-dir-toggle-mark map 303 'vc-dir-toggle-mark 'vc-dir-toggle-mark map
304 :help "Toggle mark on current item") 304 :help "Toggle mark on current item"
305 :label "Toggle Mark")
305 (tool-bar-local-item-from-menu 'vc-dir-previous-line "left-arrow" 306 (tool-bar-local-item-from-menu 'vc-dir-previous-line "left-arrow"
306 map vc-dir-mode-map 307 map vc-dir-mode-map
307 :rtl "right-arrow") 308 :rtl "right-arrow")
308 (tool-bar-local-item-from-menu 'vc-dir-next-line "right-arrow" 309 (tool-bar-local-item-from-menu 'vc-dir-next-line "right-arrow"
309 map vc-dir-mode-map 310 map vc-dir-mode-map
311 (tool-bar-local-item-from-menu 'vc-print-log "info" 312 (tool-bar-local-item-from-menu 'vc-print-log "info"
312 map vc-dir-mode-map) 313 map vc-dir-mode-map)
313 (tool-bar-local-item-from-menu 'revert-buffer "refresh" 314 (tool-bar-local-item-from-menu 'revert-buffer "refresh"
314 map vc-dir-mode-map) 315 map vc-dir-mode-map)
315 (tool-bar-local-item-from-menu 'nonincremental-search-forward 316 (tool-bar-local-item-from-menu 'nonincremental-search-forward
316 "search" map) 317 "search" map nil
318 :label "Search")
317 (tool-bar-local-item-from-menu 'vc-dir-query-replace-regexp 319 (tool-bar-local-item-from-menu 'vc-dir-query-replace-regexp
318 "search-replace" map vc-dir-mode-map) 320 "search-replace" map vc-dir-mode-map
321 :label "Replace")
319 (tool-bar-local-item-from-menu 'vc-dir-kill-dir-status-process "cancel" 322 (tool-bar-local-item-from-menu 'vc-dir-kill-dir-status-process "cancel"
320 map vc-dir-mode-map) 323 map vc-dir-mode-map
324 :label "Cancel")
321 (tool-bar-local-item-from-menu 'quit-window "exit" 325 (tool-bar-local-item-from-menu 'quit-window "exit"
322 map vc-dir-mode-map) 326 map vc-dir-mode-map)
323 map)) 327 map))
324 328
325 (defun vc-dir-node-directory (node) 329 (defun vc-dir-node-directory (node)