AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Mention the stripping of (_F) suffixes.

Browse Source 
2005-12-26  Matthias Clasen  <mclasen@redhat.com>

	* README.in: Mention the stripping of (_F) suffixes.

	* gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Strip a suffix of
	the form " (_<single character>)", since this is the preferred way
	for some languages to indicate accelerators.  (#323956, Yang Hong)
This commit is contained in:
Matthias Clasen 2005-12-26 07:52:43 +00:00 committed by Matthias Clasen
parent 168ad4bc79
commit b29a1d0f7e
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2005-12-26 Matthias Clasen <mclasen@redhat.com>
* README.in: Mention the stripping of (_F) suffixes.
* gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Strip a suffix of
the form " (_<single character>)", since this is the preferred way
for some languages to indicate accelerators. (#323956, Yang Hong)
* gtk/gtklabel.c (gtk_label_class_init): Add a gtk-label-select-on-focus
setting.
(gtk_label_grab_focus): And use it here to select the contents of

6
ChangeLog.pre-2-10
View File

@ -1,5 +1,11 @@
2005-12-26 Matthias Clasen <mclasen@redhat.com>
* README.in: Mention the stripping of (_F) suffixes.
* gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Strip a suffix of
the form " (_<single character>)", since this is the preferred way
for some languages to indicate accelerators. (#323956, Yang Hong)
* gtk/gtklabel.c (gtk_label_class_init): Add a gtk-label-select-on-focus
setting.
(gtk_label_grab_focus): And use it here to select the contents of

4
README.in
View File

@ -48,6 +48,10 @@ Release notes for 2.10
reference. Details about floating references can be found in the docs:
http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
* Suffixes like (_F) are now stripped from labels when they are displayed
in toolbars. If this is not wanted, the feature can be suppressed by
inserting a Unicode control character, e.g ZWNJ.
Release notes
=============

16
gtk/gtktoolbar.c
View File

@ -4876,11 +4876,13 @@ _gtk_toolbar_elide_underscores (const gchar *original)
gchar *q, *result;
const gchar *p;
gboolean last_underscore;
gint s;
if (!original)
return NULL;
q = result = g_malloc (strlen (original) + 1);
s = strlen (original);
q = result = g_malloc (s + 1);
last_underscore = FALSE;
for (p = original; *p; p++)
@ -4893,8 +4895,18 @@ _gtk_toolbar_elide_underscores (const gchar *original)
*q++ = *p;
}
}
*q = '\0';
if (s > 4)
{
if (original[s - 5] == ' ' &&
original[s - 4] == '(' &&
original[s - 3] == '_' &&
original[s - 1] == ')')
q[-4] = '\0';
}
return result;
}