Mercurial > emacs
annotate 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 |
rev | line source |
---|---|
75830
de1ac66b39ff
Add section for icons that are a part of Emacs.
Bill Wohler <wohler@newt.com>
parents:
75809
diff
changeset
|
1 * The default GTK icons were not overridden by the GNOME theme due to |
de1ac66b39ff
Add section for icons that are a part of Emacs.
Bill Wohler <wohler@newt.com>
parents:
75809
diff
changeset
|
2 a bug which was fixed in GNOME 2.15. Once GNOME 2.16 is in wide |
de1ac66b39ff
Add section for icons that are a part of Emacs.
Bill Wohler <wohler@newt.com>
parents:
75809
diff
changeset
|
3 circulation, the GTK icons should be replaced with the equivalent |
de1ac66b39ff
Add section for icons that are a part of Emacs.
Bill Wohler <wohler@newt.com>
parents:
75809
diff
changeset
|
4 GNOME icons. |
69776
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
5 |
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
6 * Recipe for Creating PBM Versions |
69713
75b06a7624a1
* images/README: Update with following information.
Bill Wohler <wohler@newt.com>
parents:
66168
diff
changeset
|
7 |
69776
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
8 1. Edit .xpm image in GIMP. |
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
9 2. Image > Mode > Indexed. Check Use Black/White Palette and No |
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
10 Color Dithering. |
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
11 3. File > Save As file.xbm. |
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
12 4. Run xbmtopbm < file.xbm > file.pbm. |
69713
75b06a7624a1
* images/README: Update with following information.
Bill Wohler <wohler@newt.com>
parents:
66168
diff
changeset
|
13 |
69776
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
14 Thanks to jan.h.d@swipnet.se for the help. |
98fd471d25c9
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-191
Miles Bader <miles@gnu.org>
parents:
69763
diff
changeset
|
15 |
75728
7442836ceba2
Add GTK/Gnome icons copyright info.
Chong Yidong <cyd@stupidchicken.com>
parents:
69776
diff
changeset
|
16 |
7442836ceba2
Add GTK/Gnome icons copyright info.
Chong Yidong <cyd@stupidchicken.com>
parents:
69776
diff
changeset
|
17 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES |
7442836ceba2
Add GTK/Gnome icons copyright info.
Chong Yidong <cyd@stupidchicken.com>
parents:
69776
diff
changeset
|
18 |
96483 | 19 * The following icons are part of Emacs. All are licensed under the |
20 GNU General Public License version 3 (see COPYING) or later. | |
21 The xpm and svg files contain copyright and license information, but | |
22 it is reproduced here for convenience. | |
75845
5e25c83b84f0
Move mh-logo-copyright to copyrights section.
Chong Yidong <cyd@stupidchicken.com>
parents:
75830
diff
changeset
|
23 |
5e25c83b84f0
Move mh-logo-copyright to copyrights section.
Chong Yidong <cyd@stupidchicken.com>
parents:
75830
diff
changeset
|
24 File: mh-logo.xpm |
96483 | 25 Author: Satyaki Das |
106815 | 26 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
96483 | 27 Free Software Foundation, Inc. |
75845
5e25c83b84f0
Move mh-logo-copyright to copyrights section.
Chong Yidong <cyd@stupidchicken.com>
parents:
75830
diff
changeset
|
28 |
97388
2af88ef6a9d4
Remove reference to deleted splash8.xpm.
Glenn Morris <rgm@gnu.org>
parents:
96483
diff
changeset
|
29 Files: splash.pbm, splash.xpm, gnus.pbm |
82741
8846592b1afd
Relocate license info for moved images from etc/README to
Glenn Morris <rgm@gnu.org>
parents:
78270
diff
changeset
|
30 Author: Luis Fernandes <elf@ee.ryerson.ca> |
106815 | 31 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, |
32 2010 Free Software Foundation, Inc. | |
96483 | 33 |
34 Files: splash.png, splash.svg | |
35 Author: Francesc Rocher <rocher@member.fsf.org> | |
106815 | 36 Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. |
82741
8846592b1afd
Relocate license info for moved images from etc/README to
Glenn Morris <rgm@gnu.org>
parents:
78270
diff
changeset
|
37 |
8846592b1afd
Relocate license info for moved images from etc/README to
Glenn Morris <rgm@gnu.org>
parents:
78270
diff
changeset
|
38 |
87762
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
39 * The following icons are from GTK+ 2.x. They are not part of Emacs, but |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
40 are distributed and used by Emacs. They are licensed under the |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
41 GNU Library General Public License version 2 or later. See the source |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
42 of the gtk+ package for more information. |
87671
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
43 |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
44 close.xpm copy.xpm cut.xpm help.xpm home.xpm index.xpm info.pbm |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
45 info.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm paste.xpm |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
46 preferences.xpm print.xpm refresh.xpm right-arrow.xpm save.xpm |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
47 saveas.xpm search.xpm sort-ascending.xpm sort-descending.xpm |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
48 spell.xpm undo.xpm up-arrow.xpm |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
49 |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
50 back-arrow.xpm and fwd-arrow.xpm are slightly modified undo and redo. |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
51 diropen.xpm is file-manager.png from Gnome hicolor theme. |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
52 |
c6166f66e673
gnome icons are GPLv2 or later.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
53 |
87762
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
54 * The following icons are from GNOME 2.x. They are not part of Emacs, |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
55 but are distributed and used by Emacs. They are licensed under the |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
56 GNU General Public License version 2 or later. See the source of |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
57 the gnome-icons-theme package for more information. |
75728
7442836ceba2
Add GTK/Gnome icons copyright info.
Chong Yidong <cyd@stupidchicken.com>
parents:
69776
diff
changeset
|
58 |
87762
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
59 Emacs images and their source in the GNOME icons stock/ directory: |
75728
7442836ceba2
Add GTK/Gnome icons copyright info.
Chong Yidong <cyd@stupidchicken.com>
parents:
69776
diff
changeset
|
60 |
87762
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
61 attach.xpm document/stock_attach |
92526 | 62 bookmark_add.xpm actions/bookmark_add |
87762
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
63 cancel.xpm slightly modified generic/stock_stop |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
64 connect.xpm net/stock_connect |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
65 contact.xpm net/stock_contact |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
66 data-save.xpm data/stock_data-save |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
67 delete.xpm generic/stock_delete |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
68 describe.xpm generic/stock_properties |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
69 disconnect.xpm net/stock_disconnect |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
70 exit.xpm generic/stock_exit |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
71 lock-broken.xpm data/stock_lock-broken |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
72 lock-ok.xpm data/stock_lock-ok |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
73 lock.xpm data/stock_lock |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
74 redo.xpm generic/stock_redo |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
75 search-replace.xpm slightly modified generic/stock_search-and-replace |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
76 next-page.xpm navigation/stock_next-page |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
77 refresh.xpm generic/stock_refresh |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
78 separator.xpm ? |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
79 show.xpm slightly modified document/stock_new |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
80 sort-ascending.xpm slightly modified data/stock_sort-ascending |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
81 sort-column-ascending.xpm data/stock_sort-column-ascending |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
82 sort-criteria.xpm data/stock_sort-criteria |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
83 sort-descending.xpm slightly modified data/stock_sort-descending |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
84 sort-row-ascending.xpm data/stock_sort-row-ascending |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
85 zoom-in.xpm navigation/stock_zoom-in |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
86 zoom-out.xpm navigation/stock_zoom-out |
75733
e61c6445cee2
Add text about next-node.xpm, prev-node.xpm and up-node.xpm.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75732
diff
changeset
|
87 |
87762
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
88 next-node.xpm and prev-node.xpm are from gthumb version 2.0 (part of |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
89 GNOME 2.x) where they are called next-image-24.png and prev-image-24.png. |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
90 up-node.xpm is just next-node.xpm rotated 90 degrees. |
75792 | 91 |
87762
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
92 Some icons in the mail/ and gnus/ subdirectories are also taken |
9759bfb65382
Simplify details of external icon licensing.
Glenn Morris <rgm@gnu.org>
parents:
87671
diff
changeset
|
93 from this source (see their separate README files). |
75792 | 94 |
95 The images in the low-color/ subdirectory are low-color versions of | |
96 the files of the same name in this directory, and are subject to the | |
97 same conditions. |