aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--data/ui/epiphany-toolbar.xml2
-rw-r--r--src/ephy-window.c4
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6db1abe6d..ff3589767 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-01-13 Christian Persch <chpe@cvs.gnome.org>
+ * data/ui/epiphany-toolbar.xml:
+ * src/ephy-window.c:
+
+ Fix zoom buttons order on default toolbar. Set short-label
+ property for zoom actions.
+
+2006-01-13 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/EventContext.cpp:
Don't require a HTML document to activate typeaheadfind.
diff --git a/data/ui/epiphany-toolbar.xml b/data/ui/epiphany-toolbar.xml
index ccc7ff532..7aa8e3662 100644
--- a/data/ui/epiphany-toolbar.xml
+++ b/data/ui/epiphany-toolbar.xml
@@ -31,8 +31,8 @@
<toolitem name="GoHistory"/>
<toolitem name="GoBookmarks"/>
<separator/>
- <toolitem name="ViewZoomIn"/>
<toolitem name="ViewZoomOut"/>
+ <toolitem name="ViewZoomIn"/>
</toolbar>
<toolbar name="EntryToolbar">
<toolitem name="Location"/>
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 2d6dbd37a..ece7da772 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1297,6 +1297,10 @@ setup_ui_manager (EphyWindow *window)
action = gtk_action_group_get_action (action_group, "ViewEncoding");
g_object_set (action, "hide_if_empty", FALSE, NULL);
+ action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+ g_object_set (action, "short-label", _("Larger"), NULL);
+ action = gtk_action_group_get_action (action_group, "ViewZoomOut");
+ g_object_set (action, "short-label", _("Smaller"), NULL);
action_group = gtk_action_group_new ("PopupsActions");
gtk_action_group_set_translation_domain (action_group, NULL);