diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | data/ui/epiphany-toolbar.xml.in | 3 | ||||
| -rwxr-xr-x | lib/widgets/ephy-editable-toolbar.c | 2 | ||||
| -rw-r--r-- | src/ephy-window.c | 5 | ||||
| -rw-r--r-- | src/window-commands.c | 19 | ||||
| -rw-r--r-- | src/window-commands.h | 3 |
6 files changed, 47 insertions, 1 deletions
@@ -1,5 +1,21 @@ 2003-02-08 Marco Pesenti Gritti <marco@it.gnome.org> + * data/ui/epiphany-toolbar.xml.in: + * lib/widgets/ephy-editable-toolbar.c: (add_action): + * src/ephy-window.c: + * src/window-commands.c: (window_cmd_load_location): + * src/window-commands.h: + + Add a go button to the toolbar editor. The icon is duped + with default favicon. Would be nice to find something better + for one of them (I'm not sure if the concept of jump to is good + for favicon actually). + + Rename FileNewWindow to FileNewBrowser also in toolbar configuration + file. + +2003-02-08 Marco Pesenti Gritti <marco@it.gnome.org> + * lib/egg/eggtoolbar.c: (egg_toolbar_init): * src/session.c: (crashed_resume_dialog): diff --git a/data/ui/epiphany-toolbar.xml.in b/data/ui/epiphany-toolbar.xml.in index bf9345fd5..afd5d1fea 100644 --- a/data/ui/epiphany-toolbar.xml.in +++ b/data/ui/epiphany-toolbar.xml.in @@ -9,7 +9,7 @@ <toolitem verb="GoHistory"/> <toolitem verb="GoBookmarks"/> <toolitem verb="FileNewTab"/> - <toolitem verb="FileNewWindow"/> + <toolitem verb="FileNewBrowser"/> <toolitem verb="FileOpen"/> <toolitem verb="FileSaveAs"/> <toolitem verb="FilePrint"/> @@ -19,6 +19,7 @@ <toolitem verb="Favicon"/> <toolitem verb="Location"/> <toolitem verb="Spinner"/> + <toolitem verb="LoadLocation"/> </available> <default> <toolbar> diff --git a/lib/widgets/ephy-editable-toolbar.c b/lib/widgets/ephy-editable-toolbar.c index 59f527476..86d19de15 100755 --- a/lib/widgets/ephy-editable-toolbar.c +++ b/lib/widgets/ephy-editable-toolbar.c @@ -224,6 +224,8 @@ add_action (EphyEditableToolbar *t, ItemNode *item; GNode *node; + LOG ("Add action, type %s, name %s", type, name) + separator = (strcmp (name, "separator") == 0); if (!separator) { diff --git a/src/ephy-window.c b/src/ephy-window.c index 60e1da07b..6cc3d3f6c 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -197,6 +197,11 @@ static EggActionGroupEntry ephy_menu_entries [] = { { "HelpAbout", N_("_About"), GNOME_STOCK_ABOUT, NULL, N_("Display credits for the web browser creators"), G_CALLBACK (window_cmd_help_about), NULL }, + + /* Toolbar only */ + { "LoadLocation", N_("_Go"), GTK_STOCK_JUMP_TO, NULL, + N_("Type a web address or a word in the field on the left, then click Go"), + G_CALLBACK (window_cmd_load_location), NULL }, }; static guint ephy_menu_n_entries = G_N_ELEMENTS (ephy_menu_entries); diff --git a/src/window-commands.c b/src/window-commands.c index 923bf4775..2201d169c 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -30,6 +30,7 @@ #include "ephy-new-bookmark.h" #include "egg-toggle-action.h" #include "ephy-editable-toolbar.h" +#include "toolbar.h" #include <string.h> #include <libgnomevfs/gnome-vfs-uri.h> @@ -768,3 +769,21 @@ window_cmd_tabs_detach (EggAction *action, ephy_tab_set_window (tab, new_win); gtk_widget_show (GTK_WIDGET (new_win)); } + +void +window_cmd_load_location (EggAction *action, + EphyWindow *window) +{ + Toolbar *toolbar; + char *location; + + toolbar = ephy_window_get_toolbar (window); + location = toolbar_get_location (toolbar); + + if (location) + { + ephy_window_load_url (window, location); + g_free (location); + } +} + diff --git a/src/window-commands.h b/src/window-commands.h index c6c5a333f..f7328113c 100644 --- a/src/window-commands.h +++ b/src/window-commands.h @@ -152,3 +152,6 @@ void window_cmd_tabs_move_right (EggAction *action, void window_cmd_tabs_detach (EggAction *action, EphyWindow *window); +void window_cmd_load_location (EggAction *action, + EphyWindow *window); + |