summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--data/ui/yelp.glade57
-rw-r--r--src/gtkentryaction.c3
-rw-r--r--src/yelp-window.c4
4 files changed, 39 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index d73dfae3..7ce5b8ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-01-15 Don Scorgie <dscorgie@cvs.gnome.org>
+ * data/ui/yelp.glade:
+ * src/yelp-window.c:
+ * src/gtkentryaction.c:
+ Patch from Dennis Cranston for several HIG issues
+ Add mnemonics to find and search labels Fixes #326134
+
* src/yelp-utils.c:
Add /usr/local/info and /usr/local/share/info to default infopaths
diff --git a/data/ui/yelp.glade b/data/ui/yelp.glade
index 0461f37c..c2d61400 100644
--- a/data/ui/yelp.glade
+++ b/data/ui/yelp.glade
@@ -5,7 +5,7 @@
<requires lib="gnome"/>
<widget class="GtkDialog" id="find_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="height_request">150</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Find</property>
@@ -25,7 +25,7 @@
<widget class="GtkVBox" id="dialog-vbox5">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area5">
@@ -197,11 +197,12 @@
<child>
<widget class="GtkAlignment" id="alignment10">
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="xalign">0.5</property>
- <property name="yalign">1</property>
- <property name="xscale">0.9</property>
- <property name="yscale">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
@@ -211,18 +212,18 @@
<widget class="GtkVBox" id="vbox132">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox88">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="label1225">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Find: </property>
+ <property name="label" translatable="yes">_Find:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -235,7 +236,7 @@
<property name="mnemonic_widget">find_entry</property>
</widget>
<packing>
- <property name="padding">3</property>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
@@ -263,7 +264,7 @@
</child>
</widget>
<packing>
- <property name="padding">3</property>
+ <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
@@ -327,7 +328,7 @@
</widget>
<widget class="GtkDialog" id="location_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Open Location</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -346,7 +347,7 @@
<widget class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area6">
@@ -390,7 +391,7 @@
<child>
<widget class="GtkHBox" id="hbox89">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -448,7 +449,7 @@
</widget>
<widget class="GtkDialog" id="prefs_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -467,7 +468,7 @@
<widget class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area7">
@@ -497,10 +498,10 @@
<child>
<widget class="GtkVBox" id="vbox133">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">18</property>
<child>
<widget class="GtkVBox" id="vbox133">
@@ -765,7 +766,7 @@
</widget>
<widget class="GtkDialog" id="bookmarks_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes">Bookmarks</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -785,7 +786,7 @@
<widget class="GtkVBox" id="dialog-vbox8">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area8">
@@ -815,7 +816,7 @@
<child>
<widget class="GtkTable" id="table1">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
@@ -826,9 +827,9 @@
<child>
<widget class="GtkLabel" id="label1231">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;_Bookmarks:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">_Bookmarks:</property>
<property name="use_underline">True</property>
- <property name="use_markup">True</property>
+ <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -852,7 +853,7 @@
<widget class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_START</property>
- <property name="spacing">0</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkButton" id="open_button">
@@ -942,7 +943,7 @@
</widget>
<widget class="GtkDialog" id="add_bookmark_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Add Bookmark</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -961,7 +962,7 @@
<widget class="GtkVBox" id="dialog-vbox9">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area9">
@@ -1017,7 +1018,7 @@
<child>
<widget class="GtkHBox" id="hbox90">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -1025,9 +1026,9 @@
<child>
<widget class="GtkLabel" id="label1230">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;_Title:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">_Title:</property>
<property name="use_underline">True</property>
- <property name="use_markup">True</property>
+ <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
diff --git a/src/gtkentryaction.c b/src/gtkentryaction.c
index 6bd111bc..e2a0a12d 100644
--- a/src/gtkentryaction.c
+++ b/src/gtkentryaction.c
@@ -90,6 +90,7 @@ gtk_entry_action_create_tool_item (GtkAction *action)
box = gtk_hbox_new (FALSE, 6);
label = gtk_label_new ("");
entry = gtk_entry_new ();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
gtk_container_add (GTK_CONTAINER (tool_item), box);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0);
@@ -121,7 +122,7 @@ sync_label (GtkAction *gaction,
char *text;
g_object_get (action, "label", &text, NULL);
- gtk_label_set_text (label, text);
+ gtk_label_set_text_with_mnemonic (label, text);
if (text && *text)
gtk_widget_show (GTK_WIDGET (label));
else
diff --git a/src/yelp-window.c b/src/yelp-window.c
index f57b732d..bd8e24de 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -1022,7 +1022,7 @@ window_populate (YelpWindow *window)
#ifdef ENABLE_SEARCH
action = gtk_entry_action_new ("Search",
- _("Search"),
+ _("_Search:"),
_("Search for other documentation"),
NULL);
g_signal_connect (G_OBJECT (action), "activate",
@@ -1169,7 +1169,7 @@ window_populate_find (YelpWindow *window, GtkWidget *find_bar)
g_return_if_fail (GTK_IS_TOOLBAR (find_bar));
box = gtk_hbox_new (FALSE, 0);
- label = gtk_label_new_with_mnemonic (_("Find:"));
+ label = gtk_label_new_with_mnemonic (_("Fin_d:"));
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 6);
priv->find_entry = gtk_entry_new ();
View Lorry Controller Status