Mercurial > emacs
view lisp/url/url-privacy.el @ 108027:2ba5d029fd5e
Gtk tool bars can be text, icons with text or just icons
* frames.texi (Tool Bars): Add tool-bar-style.
* 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.
* 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.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 21 Apr 2010 18:26:09 +0200 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; url-privacy.el --- Global history tracking for URL package ;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008, ;; 2009, 2010 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Code: (eval-when-compile (require 'cl)) (require 'url-vars) (defun url-device-type (&optional device) (if (fboundp 'device-type) (device-type device) ; XEmacs (or window-system 'tty))) ;;;###autoload (defun url-setup-privacy-info () "Setup variables that expose info about you and your system." (interactive) (setq url-system-type (cond ((or (eq url-privacy-level 'paranoid) (and (listp url-privacy-level) (memq 'os url-privacy-level))) nil) ;; First, we handle the inseparable OS/Windowing system ;; combinations ((eq system-type 'windows-nt) "Windows-NT; 32bit") ((eq system-type 'ms-dos) "MS-DOS; 32bit") ((memq (url-device-type) '(win32 w32)) "Windows; 32bit") ((eq (url-device-type) 'pm) "OS/2; 32bit") (t (case (url-device-type) (x "X11") (ns "OpenStep") (tty "TTY") (otherwise nil))))) (setq url-personal-mail-address (or url-personal-mail-address user-mail-address (format "%s@%s" (user-real-login-name) (system-name)))) (if (or (memq url-privacy-level '(paranoid high)) (and (listp url-privacy-level) (memq 'email url-privacy-level))) (setq url-personal-mail-address nil)) (setq url-os-type (cond ((or (eq url-privacy-level 'paranoid) (and (listp url-privacy-level) (memq 'os url-privacy-level))) nil) ((boundp 'system-configuration) system-configuration) ((boundp 'system-type) (symbol-name system-type)) (t nil)))) (provide 'url-privacy) ;; arch-tag: fdaf95e4-98f0-4680-94c3-f3eadafabe1d ;;; url-privacy.el ends here