aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-01-10 03:40:18 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-01-10 03:40:18 +0800
commit237622044c96f0cfcba6d7fe21b908beb085b2e4 (patch)
tree06b0fb414cb8fb61020baa225106cbc267c2ce41 /data
parent8103e076a47bcf1f9b9cab2d3c64f0e1f319cccc (diff)
downloadgsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.tar.gz
gsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.tar.zst
gsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.zip
Rehash link context menu order to be hig compliant. Set a desktop icon.
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.
Diffstat (limited to 'data')
-rw-r--r--data/art/Makefile.am5
-rw-r--r--data/epiphany.desktop.in2
-rw-r--r--data/ui/epiphany-ui.xml.in20
3 files changed, 17 insertions, 10 deletions
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"