From 2927156b3956b2d5f7b8057fa9ebbcdd9a34745b Mon Sep 17 00:00:00 2001
From: Diego Escalante Urrelo <diegoe@gnome.org>
Date: Tue, 5 Jun 2007 21:54:47 +0000
Subject: src/ephy-history-window.c src/bookmarks/ephy-bookmarks-editor.c

2007-06-05  Diego Escalante Urrelo  <diegoe@gnome.org>

	* src/ephy-history-window.c
	* src/bookmarks/ephy-bookmarks-editor.c
	* data/ui/epiphany-history-window-ui.xml
	* data/ui/epiphany-bookmark-editor-ui.xml:

	Assign control+T as default delete shortcut. Also move the Delete item
	to Edit menu. Bug #351100.


svn path=/trunk/; revision=7076
---
 ChangeLog                               | 10 ++++++++++
 data/ui/epiphany-bookmark-editor-ui.xml |  3 ++-
 data/ui/epiphany-history-window-ui.xml  |  5 +++--
 src/bookmarks/ephy-bookmarks-editor.c   |  6 +++---
 src/ephy-history-window.c               |  6 +++---
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14bc723a3..d1f28a783 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-05  Diego Escalante Urrelo  <diegoe@gnome.org>
+
+	* src/ephy-history-window.c
+	* src/bookmarks/ephy-bookmarks-editor.c
+	* data/ui/epiphany-history-window-ui.xml
+	* data/ui/epiphany-bookmark-editor-ui.xml:
+
+	Assign control+T as default delete shortcut. Also move the Delete item
+	to Edit menu. Bug #351100.
+
 2007-06-05  Diego Escalante Urrelo  <diegoe@gnome.org>
 
 	* embed/mozilla/EphyAboutModule.cpp:
diff --git a/data/ui/epiphany-bookmark-editor-ui.xml b/data/ui/epiphany-bookmark-editor-ui.xml
index b62b5b9c9..7475a79be 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml
+++ b/data/ui/epiphany-bookmark-editor-ui.xml
@@ -8,7 +8,6 @@
 	<menuitem action="OpenInTab"/>
 	<separator/>
 	<menuitem action="Rename"/>
-	<menuitem action="Delete"/>
 	<separator/>
 	<menuitem action="ShowOnToolbar"/>
 	<menuitem action="Properties"/>
@@ -23,6 +22,8 @@
 	<menuitem action="Cut"/>
 	<menuitem action="Copy"/>
 	<menuitem action="Paste"/>
+	<menuitem action="Delete"/>
+	<separator/>
 	<menuitem action="SelectAll"/>
 </menu>
 
diff --git a/data/ui/epiphany-history-window-ui.xml b/data/ui/epiphany-history-window-ui.xml
index e76158880..228afac62 100644
--- a/data/ui/epiphany-history-window-ui.xml
+++ b/data/ui/epiphany-history-window-ui.xml
@@ -6,7 +6,6 @@
         <menuitem name="FileOpenInWindow" action="OpenInWindow"/>
 	<separator name="FileSep1"/>
 	<menuitem name="FileBookmarkLink" action="BookmarkLink"/>
-	<menuitem name="FileDelete" action="Delete"/>
 	<separator name="FileSep2"/>
 	<menuitem name="FileClose" action="Close"/>
 </menu>
@@ -15,8 +14,10 @@
 	<menuitem name="EditCut" action="Cut"/>
 	<menuitem name="EditCopy" action="Copy"/>
 	<menuitem name="EditPaste" action="Paste"/>
-	<menuitem name="EditSelectAll" action="SelectAll"/>
+	<menuitem name="FileDelete" action="Delete"/>
 	<separator name="EditSep1"/>
+	<menuitem name="EditSelectAll" action="SelectAll"/>
+	<separator name="EditSep2"/>
 	<menuitem name="EditClear" action="Clear"/>
 </menu>
 
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 7620f4a40..7eb86e24c 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -196,9 +196,6 @@ static const GtkActionEntry ephy_bookmark_popup_entries [] = {
 	  G_CALLBACK (cmd_open_bookmarks_in_tabs) },
 	{ "Rename", NULL, N_("_Rename…"), "F2",
 	  N_("Rename the selected bookmark or topic"), G_CALLBACK (cmd_rename) },
-	{ "Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL,
-	  N_("Delete the selected bookmark or topic"), 
-	  G_CALLBACK (cmd_delete) },
 	{ "Properties", GTK_STOCK_PROPERTIES, N_("_Properties"), "<alt>Return",
 	  N_("View or modify the properties of the selected bookmark"), 
 	  G_CALLBACK (cmd_bookmark_properties) },
@@ -222,6 +219,9 @@ static const GtkActionEntry ephy_bookmark_popup_entries [] = {
 	{ "Paste", GTK_STOCK_PASTE, N_("_Paste"), "<control>V",
 	  N_("Paste the clipboard"), 
 	  G_CALLBACK (cmd_paste) },
+	{ "Delete", GTK_STOCK_DELETE, N_("_Delete"), "<control>T",
+	  N_("Delete the selected bookmark or topic"), 
+	  G_CALLBACK (cmd_delete) },
 	{ "SelectAll", NULL, N_("Select _All"), "<control>A",
 	  N_("Select all bookmarks or text"), 
 	  G_CALLBACK (cmd_select_all) },
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index e45c1aa63..9f7d955b1 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -175,9 +175,6 @@ static const GtkActionEntry ephy_history_ui_entries [] = {
 	{ "OpenInTab", STOCK_NEW_TAB, N_("Open in New _Tab"), "<shift><control>O",
 	  N_("Open the selected history link in a new tab"),
 	  G_CALLBACK (cmd_open_bookmarks_in_tabs) },
-	{ "Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL,
-	  N_("Delete the selected history link"),
-	  G_CALLBACK (cmd_delete) },
 	{ "BookmarkLink", STOCK_ADD_BOOKMARK, N_("Add _Bookmark…"), "<control>D",
 	  N_("Bookmark the selected history link"),
 	  G_CALLBACK (cmd_bookmark_link) },
@@ -195,6 +192,9 @@ static const GtkActionEntry ephy_history_ui_entries [] = {
 	{ "Paste", GTK_STOCK_PASTE, N_("_Paste"), "<control>V",
 	  N_("Paste the clipboard"),
 	  G_CALLBACK (cmd_paste) },
+	{ "Delete", GTK_STOCK_DELETE, N_("_Delete"), "<control>T",
+	  N_("Delete the selected history link"),
+	  G_CALLBACK (cmd_delete) },
 	{ "SelectAll", NULL, N_("Select _All"), "<control>A",
 	  N_("Select all history links or text"),
 	  G_CALLBACK (cmd_select_all) },
-- 
cgit