aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--data/art/Makefile.am4
-rw-r--r--data/art/epiphany-fullscreen.pngbin563 -> 674 bytes
-rw-r--r--data/art/epiphany-history.pngbin2108 -> 1513 bytes
-rw-r--r--data/art/epiphany-send-link.pngbin0 -> 363 bytes
-rw-r--r--data/art/epiphany-viewsource.pngbin0 -> 147 bytes
-rw-r--r--embed/mozilla/EphyWrapper.cpp1
-rw-r--r--lib/ephy-stock-icons.c4
-rw-r--r--lib/ephy-stock-icons.h2
-rw-r--r--src/ephy-window.c6
10 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 045bcd253..9a97463d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-02 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * lib/ephy-stock-icons.c: Add some icons, thanks
+ to jorn to provide them.
+ * embed/EphyWrapper.cpp: last api change seem to have
+ been reverted ?!
+
2003-02-02 German Poo-Caaman~o <gpoo@ubiobio.cl>
* configure.in: Added es (Spanish) to ALL_LINGUAS.
diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index fa7538802..b92119de8 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -5,7 +5,9 @@ art_DATA = \
epiphany-fullscreen.png \
epiphany-bookmarks.png \
epiphany-history.png \
- epiphany-new-tab.png
+ epiphany-new-tab.png \
+ epiphany-viewsource.png \
+ epiphany-send-link.png
appicon_DATA = epiphany.png
appicondir = $(datadir)/pixmaps
diff --git a/data/art/epiphany-fullscreen.png b/data/art/epiphany-fullscreen.png
index a2864d15b..c39ed8ae0 100644
--- a/data/art/epiphany-fullscreen.png
+++ b/data/art/epiphany-fullscreen.png
Binary files differ
diff --git a/data/art/epiphany-history.png b/data/art/epiphany-history.png
index fdd77a138..ea81e486e 100644
--- a/data/art/epiphany-history.png
+++ b/data/art/epiphany-history.png
Binary files differ
diff --git a/data/art/epiphany-send-link.png b/data/art/epiphany-send-link.png
new file mode 100644
index 000000000..bea67c987
--- /dev/null
+++ b/data/art/epiphany-send-link.png
Binary files differ
diff --git a/data/art/epiphany-viewsource.png b/data/art/epiphany-viewsource.png
new file mode 100644
index 000000000..9099da0f9
--- /dev/null
+++ b/data/art/epiphany-viewsource.png
Binary files differ
diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp
index ce89557da..3635b3649 100644
--- a/embed/mozilla/EphyWrapper.cpp
+++ b/embed/mozilla/EphyWrapper.cpp
@@ -42,7 +42,6 @@
#include "nsIComponentManager.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptContext.h"
-#include "nsToolkitCompsCID.h"
#include "nsIDOMWindowInternal.h"
#include "nsIInterfaceRequestor.h"
#include "nsIFocusController.h"
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 26b3d7e90..debd960f5 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -39,7 +39,9 @@ ephy_stock_icons_init (void)
EPHY_STOCK_HISTORY,
EPHY_STOCK_BOOKMARKS,
EPHY_STOCK_FULLSCREEN,
- EPHY_STOCK_NEW_TAB
+ EPHY_STOCK_NEW_TAB,
+ EPHY_STOCK_VIEWSOURCE,
+ EPHY_STOCK_SEND_LINK
};
factory = gtk_icon_factory_new ();
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index e5d85d19c..8c24fc154 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -29,6 +29,8 @@ G_BEGIN_DECLS
#define EPHY_STOCK_BOOKMARKS "epiphany-bookmarks"
#define EPHY_STOCK_NEW_TAB "epiphany-new-tab"
#define EPHY_STOCK_FULLSCREEN "epiphany-fullscreen"
+#define EPHY_STOCK_VIEWSOURCE "epiphany-viewsource"
+#define EPHY_STOCK_SEND_LINK "epiphany-send-link"
void ephy_stock_icons_init (void);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 6c0516d54..97d3900ef 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -66,7 +66,7 @@ static EggActionGroupEntry ephy_menu_entries [] = {
{ "FileNewWindow", N_("_New Window"), GTK_STOCK_NEW, "<control>N",
N_("Create a new window"),
G_CALLBACK (window_cmd_file_new_window), NULL },
- { "FileNewTab", N_("New _Tab"), EPHY_STOCK_NEW_TAB, "<shift><control>N",
+ { "FileNewTab", N_("New _Tab"), EPHY_STOCK_NEW_TAB, "<control>T",
N_("Create a new tab"),
G_CALLBACK (window_cmd_file_new_tab), NULL },
{ "FileOpen", N_("_Open..."), GTK_STOCK_OPEN, "<control>O",
@@ -78,7 +78,7 @@ static EggActionGroupEntry ephy_menu_entries [] = {
{ "FilePrint", N_("_Print..."), GTK_STOCK_PRINT, "<control>P",
N_("Print the current page"),
G_CALLBACK (window_cmd_file_print), NULL },
- { "FileSendTo", N_("S_end To..."), NULL, NULL,
+ { "FileSendTo", N_("S_end To..."), EPHY_STOCK_SEND_LINK, NULL,
N_("Send a link of the current page"),
G_CALLBACK (window_cmd_file_send_to), NULL },
{ "FileAddBookmark", N_("_Add Bookmark..."), GTK_STOCK_ADD, "<control>D",
@@ -149,7 +149,7 @@ static EggActionGroupEntry ephy_menu_entries [] = {
N_("Show the contents at the normal size"),
G_CALLBACK (window_cmd_view_zoom_normal), NULL },
{ "ViewEncoding", N_("_Encoding"), NULL, NULL, NULL, NULL, NULL },
- { "ViewPageSource", N_("_Page Source"), NULL, NULL,
+ { "ViewPageSource", N_("_Page Source"), EPHY_STOCK_VIEWSOURCE, NULL,
N_("View the source code of the page"),
G_CALLBACK (window_cmd_view_page_source), NULL },