diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | NEWS | 26 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | gtk/gtkfilesel.c | 27 |
9 files changed, 105 insertions, 6 deletions
@@ -1,3 +1,12 @@ +Fri Nov 1 21:03:59 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfilesel.c: Add a mnemonic to the "selection" + label. (More of #74267) + + * configure.in: Version 2.1.2 + + * NEWS: Updates. + 2002-11-02 Matthias Clasen <maclas@gmx.de> * gtk/stock-icons/stock_jump_to_rtl_16.png, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 902487528..7e6252ff0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Fri Nov 1 21:03:59 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfilesel.c: Add a mnemonic to the "selection" + label. (More of #74267) + + * configure.in: Version 2.1.2 + + * NEWS: Updates. + 2002-11-02 Matthias Clasen <maclas@gmx.de> * gtk/stock-icons/stock_jump_to_rtl_16.png, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 902487528..7e6252ff0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Fri Nov 1 21:03:59 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfilesel.c: Add a mnemonic to the "selection" + label. (More of #74267) + + * configure.in: Version 2.1.2 + + * NEWS: Updates. + 2002-11-02 Matthias Clasen <maclas@gmx.de> * gtk/stock-icons/stock_jump_to_rtl_16.png, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 902487528..7e6252ff0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Fri Nov 1 21:03:59 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfilesel.c: Add a mnemonic to the "selection" + label. (More of #74267) + + * configure.in: Version 2.1.2 + + * NEWS: Updates. + 2002-11-02 Matthias Clasen <maclas@gmx.de> * gtk/stock-icons/stock_jump_to_rtl_16.png, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 902487528..7e6252ff0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Fri Nov 1 21:03:59 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfilesel.c: Add a mnemonic to the "selection" + label. (More of #74267) + + * configure.in: Version 2.1.2 + + * NEWS: Updates. + 2002-11-02 Matthias Clasen <maclas@gmx.de> * gtk/stock-icons/stock_jump_to_rtl_16.png, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 902487528..7e6252ff0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Fri Nov 1 21:03:59 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfilesel.c: Add a mnemonic to the "selection" + label. (More of #74267) + + * configure.in: Version 2.1.2 + + * NEWS: Updates. + 2002-11-02 Matthias Clasen <maclas@gmx.de> * gtk/stock-icons/stock_jump_to_rtl_16.png, @@ -1,3 +1,29 @@ +Overview of Changes in GTK+ 2.1.2 +================================= + +* Fixes for GtkIMContextXIM [HideToshi Tajima, Owen Taylor] +* Remove usage of XLookupString outside of GtkIMContextXIM [Owen] +* Handle Shift/Caps/Num_Lock properly for non-Xkb [Owen] +* Add a --screen option to set default screen [Balamurali Viswanathan, Owen] +* Handle focus indication for check and radio buttons without children + [Dave Camp, Owen] +* Much work on improve submenu navigation [Soeren Sandmann] +* Add "selected_shadow_type" property for menus [Soeren] +* Add "scrollbar_spacing" style property [Anders Carlsson, Owen] +* Rework GtkPaned keynav [Soeren, Calum Benson] +* Sensitivity and keynav fixes for GtkFileSelection [Muktha Narayan, Owen] +* Removed mnemonics for GtkToolbar Items [Mikael Hallendal] +* Tree view fixes and speedups + [Kristian Rietveld, Daniel Elstner, Havoc Pennington] +* Allow themes to set GtkTreeView even/odd row colors [Kristian] +* Doc fixes and improvements [Matthias Clasen, Vitaly Tishkov] +* Win32 fixes [Tor Lillqvist] +* Misc cleanups and bug fixes + +Other contributors: Phil Blundell, Erwanne Chenede, Jeremy Katz, + Padraig O'Briain, Havoc Pennington, Timo Sirainen, Nam SungHyun, + Matt Wilson, + Overview of Changes in GTK+ 2.1.1 ================================= * Cleanup of use of deprecated functions in GTK+ [Manish Singh] diff --git a/configure.in b/configure.in index 1ae6aa6b2..ca0853bce 100644 --- a/configure.in +++ b/configure.in @@ -32,9 +32,9 @@ GLIB_AC_DIVERT_BEFORE_HELP([ # GTK_MAJOR_VERSION=2 GTK_MINOR_VERSION=1 -GTK_MICRO_VERSION=1 +GTK_MICRO_VERSION=2 GTK_INTERFACE_AGE=0 -GTK_BINARY_AGE=101 +GTK_BINARY_AGE=102 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION dnl This is the X.Y used in -lgtk-FOO-X.Y GTK_API_VERSION=2.0 diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 501c73745..72b5cccfb 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -800,6 +800,9 @@ gtk_file_selection_init (GtkFileSelection *filesel) gtk_box_pack_start (GTK_BOX (entry_vbox), filesel->selection_entry, TRUE, TRUE, 0); gtk_widget_show (filesel->selection_entry); + gtk_label_set_mnemonic_widget (GTK_LABEL (filesel->selection_text), + filesel->selection_entry); + if (!cmpl_state_okay (filesel->cmpl_state)) { gchar err_buf[256]; @@ -2035,6 +2038,22 @@ win32_gtk_add_drives_to_dir_list (GtkListStore *model) } #endif +static gchar * +escape_underscores (const gchar *str) +{ + GString *result = g_string_new (NULL); + while (*str) + { + if (*str == '_') + g_string_append_c (result, '_'); + + g_string_append_c (result, *str); + str++; + } + + return g_string_free (result, FALSE); +} + static void gtk_file_selection_populate (GtkFileSelection *fs, gchar *rel_path, @@ -2165,11 +2184,11 @@ gtk_file_selection_populate (GtkFileSelection *fs, if (fs->selection_entry) { - sel_text = g_strconcat (_("Selection: "), - cmpl_reference_position (cmpl_state), - NULL); + char *escaped = escape_underscores (cmpl_reference_position (cmpl_state)); + sel_text = g_strconcat (_("_Selection: "), escaped, NULL); + g_free (escaped); - gtk_label_set_text (GTK_LABEL (fs->selection_text), sel_text); + gtk_label_set_text_with_mnemonic (GTK_LABEL (fs->selection_text), sel_text); g_free (sel_text); } |