diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | data/art/Makefile.am | 5 | ||||
| -rw-r--r-- | data/epiphany.desktop.in | 2 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml.in | 20 | ||||
| -rw-r--r-- | embed/ephy-embed-popup.c | 21 | ||||
| -rw-r--r-- | src/ephy-main.c | 8 | ||||
| -rw-r--r-- | src/window-commands.c | 1 |
7 files changed, 56 insertions, 13 deletions
@@ -1,5 +1,17 @@ 2003-01-09 Marco Pesenti Gritti <marco@it.gnome.org> + * data/art/Makefile.am: + * data/epiphany.desktop.in: + * data/ui/epiphany-ui.xml.in: + * embed/ephy-embed-popup.c: (embed_popup_open_link_cmd): + * src/ephy-main.c: (main): + * src/window-commands.c: (window_cmd_set_charset): + + Rehash link context menu order to be hig compliant. + Set a desktop icon. + +2003-01-09 Marco Pesenti Gritti <marco@it.gnome.org> + * src/ephy-tab.c: (ephy_tab_location_cb): Reset link message when changing page. diff --git a/data/art/Makefile.am b/data/art/Makefile.am index 302d5eb3b..ca2595c24 100644 --- a/data/art/Makefile.am +++ b/data/art/Makefile.am @@ -3,6 +3,9 @@ art_DATA = \ epiphany-unsecure.png \ epiphany.png +appicon_DATA = epiphany.png +appicondir = $(datadir)/pixmaps + artdir = $(pkgdatadir)/art -EXTRA_DIST = $(art_DATA) +EXTRA_DIST = $(appicon_DATA) $(art_DATA) diff --git a/data/epiphany.desktop.in b/data/epiphany.desktop.in index cf28231d5..80c80feb5 100644 --- a/data/epiphany.desktop.in +++ b/data/epiphany.desktop.in @@ -4,6 +4,6 @@ _Comment=Browse the web Exec=epiphany Terminal=0 Type=Application -Icon= +Icon=epiphany.png X-GNOME-DocPath= Categories=Application;Network; diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in index cb966a4e4..0927957a5 100644 --- a/data/ui/epiphany-ui.xml.in +++ b/data/ui/epiphany-ui.xml.in @@ -79,6 +79,8 @@ <cmd name="GoGo" _label="_Go" _tip="Load the URL in the location entry"/> + + <cmd name="EPOpenLink" _label="Open"/> <cmd name="EPOpenInNewWindow" _label="Open in New Window"/> @@ -375,22 +377,24 @@ <popup name="EphyEmbedElementPopup"> <placeholder name="LinkItems"> - <menuitem name="EPOpenInNewWindow" + <menuitem name="EPOpenLink" pixtype="stock" pixname="gtk-open" verb=""/> - <menuitem name="EPOpenInNewTab" verb=""/> - - <menuitem name="EPCopyLinkLocation" - pixtype="stock" pixname="gtk-copy" - verb=""/> + <menuitem name="EPOpenInNewWindow" verb=""/> + <menuitem name="EPOpenInNewTab" verb=""/> + <menuitem name="EPDownloadLink" verb=""/> - + <menuitem name="EPAddBookmark" pixtype="stock" pixname="gtk-add" verb=""/> - </placeholder> + + <menuitem name="EPCopyLinkLocation" + pixtype="stock" pixname="gtk-copy" + verb=""/> + </placeholder> <placeholder name="EmailLinkItems"> <menuitem name="EPCopyEmail" pixtype="stock" pixname="gtk-copy" diff --git a/embed/ephy-embed-popup.c b/embed/ephy-embed-popup.c index 5f6eddf41..cf9c5fee0 100644 --- a/embed/ephy-embed-popup.c +++ b/embed/ephy-embed-popup.c @@ -65,6 +65,10 @@ embed_popup_copy_link_location_cmd (BonoboUIComponent *uic, EphyEmbedPopup *popup, const char* verbname); static void +embed_popup_open_link_cmd (BonoboUIComponent *uic, + EphyEmbedPopup *popup, + const char* verbname); +static void embed_popup_download_link_cmd (BonoboUIComponent *uic, EphyEmbedPopup *popup, const char* verbname); @@ -122,6 +126,7 @@ static GObjectClass *parent_class = NULL; BonoboUIVerb embed_popup_verbs [] = { BONOBO_UI_VERB ("EPCopyLinkLocation", (BonoboUIVerbFn)embed_popup_copy_link_location_cmd), BONOBO_UI_VERB ("EPDownloadLink", (BonoboUIVerbFn)embed_popup_download_link_cmd), + BONOBO_UI_VERB ("EPOpenLink", (BonoboUIVerbFn)embed_popup_open_link_cmd), BONOBO_UI_VERB ("EPOpenImage", (BonoboUIVerbFn)embed_popup_open_image_cmd), BONOBO_UI_VERB ("EPSaveImageAs", (BonoboUIVerbFn)embed_popup_save_image_as_cmd), BONOBO_UI_VERB ("EPSetImageAsBackground", (BonoboUIVerbFn)embed_popup_set_image_as_background_cmd), @@ -433,6 +438,22 @@ ephy_embed_popup_get_popup_path (EphyEmbedPopup *p) /* commands */ static void +embed_popup_open_link_cmd (BonoboUIComponent *uic, + EphyEmbedPopup *popup, + const char* verbname) +{ + EphyEmbedEvent *info; + const char *location; + GValue *value; + + info = ephy_embed_popup_get_event (popup); + ephy_embed_event_get_property (info, "link", &value); + location = g_value_get_string (value); + + ephy_embed_load_url (popup->priv->embed, location); +} + +static void embed_popup_download_link_cmd (BonoboUIComponent *uic, EphyEmbedPopup *popup, const char* verbname) diff --git a/src/ephy-main.c b/src/ephy-main.c index becc1d2e5..46fac6e6a 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -116,6 +116,7 @@ main (int argc, char *argv[]) poptContext context; GValue context_as_value = { 0 }; GnomeProgram *program; + char *file; #ifdef ENABLE_NLS /* Initialize the i18n stuff */ @@ -150,8 +151,11 @@ main (int argc, char *argv[]) ephy_shell_new (); - gtk_window_set_default_icon_from_file - (ephy_file ("epiphany.png"), NULL); + file = gnome_program_locate_file + (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, + "epiphany.png", TRUE, NULL); + gtk_window_set_default_icon_from_file (file, NULL); + g_free (file); g_idle_add ((GSourceFunc) ephy_main_start, NULL); diff --git a/src/window-commands.c b/src/window-commands.c index 84fabab15..67400748d 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -797,7 +797,6 @@ window_cmd_set_charset (BonoboUIComponent *uic, embed = ephy_window_get_active_embed (window); g_return_if_fail (embed != NULL); - g_print (data->encoding); ephy_embed_set_charset (embed, data->encoding); } |