Mercurial > emacs
view etc/images/README @ 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 | 1d1d5d9bd884 |
children | c7c697c81a21 376148b31b5e |
line wrap: on
line source
* The default GTK icons were not overridden by the GNOME theme due to a bug which was fixed in GNOME 2.15. Once GNOME 2.16 is in wide circulation, the GTK icons should be replaced with the equivalent GNOME icons. * Recipe for Creating PBM Versions 1. Edit .xpm image in GIMP. 2. Image > Mode > Indexed. Check Use Black/White Palette and No Color Dithering. 3. File > Save As file.xbm. 4. Run xbmtopbm < file.xbm > file.pbm. Thanks to jan.h.d@swipnet.se for the help. COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES * The following icons are part of Emacs. All are licensed under the GNU General Public License version 3 (see COPYING) or later. The xpm and svg files contain copyright and license information, but it is reproduced here for convenience. File: mh-logo.xpm Author: Satyaki Das Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Files: splash.pbm, splash.xpm, gnus.pbm Author: Luis Fernandes <elf@ee.ryerson.ca> Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Files: splash.png, splash.svg Author: Francesc Rocher <rocher@member.fsf.org> Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. * The following icons are from GTK+ 2.x. They are not part of Emacs, but are distributed and used by Emacs. They are licensed under the GNU Library General Public License version 2 or later. See the source of the gtk+ package for more information. close.xpm copy.xpm cut.xpm help.xpm home.xpm index.xpm info.pbm info.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm paste.xpm preferences.xpm print.xpm refresh.xpm right-arrow.xpm save.xpm saveas.xpm search.xpm sort-ascending.xpm sort-descending.xpm spell.xpm undo.xpm up-arrow.xpm back-arrow.xpm and fwd-arrow.xpm are slightly modified undo and redo. diropen.xpm is file-manager.png from Gnome hicolor theme. * The following icons are from GNOME 2.x. They are not part of Emacs, but are distributed and used by Emacs. They are licensed under the GNU General Public License version 2 or later. See the source of the gnome-icons-theme package for more information. Emacs images and their source in the GNOME icons stock/ directory: attach.xpm document/stock_attach bookmark_add.xpm actions/bookmark_add cancel.xpm slightly modified generic/stock_stop connect.xpm net/stock_connect contact.xpm net/stock_contact data-save.xpm data/stock_data-save delete.xpm generic/stock_delete describe.xpm generic/stock_properties disconnect.xpm net/stock_disconnect exit.xpm generic/stock_exit lock-broken.xpm data/stock_lock-broken lock-ok.xpm data/stock_lock-ok lock.xpm data/stock_lock redo.xpm generic/stock_redo search-replace.xpm slightly modified generic/stock_search-and-replace next-page.xpm navigation/stock_next-page refresh.xpm generic/stock_refresh separator.xpm ? show.xpm slightly modified document/stock_new sort-ascending.xpm slightly modified data/stock_sort-ascending sort-column-ascending.xpm data/stock_sort-column-ascending sort-criteria.xpm data/stock_sort-criteria sort-descending.xpm slightly modified data/stock_sort-descending sort-row-ascending.xpm data/stock_sort-row-ascending zoom-in.xpm navigation/stock_zoom-in zoom-out.xpm navigation/stock_zoom-out next-node.xpm and prev-node.xpm are from gthumb version 2.0 (part of GNOME 2.x) where they are called next-image-24.png and prev-image-24.png. up-node.xpm is just next-node.xpm rotated 90 degrees. Some icons in the mail/ and gnus/ subdirectories are also taken from this source (see their separate README files). The images in the low-color/ subdirectory are low-color versions of the files of the same name in this directory, and are subject to the same conditions.