From d5be47a8e46ac8a35e41f296a95bb5ddcf7365e8 Mon Sep 17 00:00:00 2001
From: David Bordoley <bordoley@msu.edu>
Date: Thu, 27 Mar 2003 13:39:33 +0000
Subject: Reorganize the menus a bit. Unifiy topic/bookmarks rename/delete
 items.

2003-03-27  David Bordoley <bordoley@msu.edu>

	* data/ui/epiphany-bookmark-editor-ui.xml.in:
	* src/bookmarks/ephy-bookmarks-editor.c: (cmd_rename),
	(cmd_delete), (cmd_cut), (cmd_copy), (cmd_paste),
	(cmd_select_all), (keyword_node_key_pressed_cb),
	(keyword_node_show_popup_cb), (ephy_bookmarks_editor_construct):
	Reorganize the menus a bit. Unifiy topic/bookmarks
	rename/delete items. Add text editting menu items
	to the edit menu. Add a topic context menu.

	* src/bookmarks/ephy-node-view.[c-h]: (ephy_node_view_select_all),
	(ephy_node_view_has_focus):
	New functions.

	* src/bookmarks/ephy-topics-selector.c: (set_sort_column_id),
	(topic_clicked), (ephy_topics_build_ui):
	Sort topics case insensitively. Add/remove topics using a single click.
---
 data/ui/epiphany-bookmark-editor-ui.xml.in | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'data')

diff --git a/data/ui/epiphany-bookmark-editor-ui.xml.in b/data/ui/epiphany-bookmark-editor-ui.xml.in
index a3f3c33cb..64232c111 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml.in
+++ b/data/ui/epiphany-bookmark-editor-ui.xml.in
@@ -6,17 +6,19 @@
 	<separator name="FileSep1"/>
         <menuitem name="FileOpenInWindow" verb="OpenInWindow"/>
 	<menuitem name="FileOpenInTab" verb="OpenInTab"/>
-	<separator name="FileSep3"/>
+	<separator name="FileSep2"/>
+	<menuitem name="FileRename" verb="Rename"/>
+	<menuitem name="FileDelete" verb="Delete"/>
 	<menuitem name="FileProperties" verb="Properties"/>
+	<separator name="FileSep3"/>
 	<menuitem name="FileClose" verb="Close"/>
 </submenu>
 
 <submenu name="EditMenu" verb="Edit">
-	<menuitem name="EditRenameBookmark" verb="RenameBookmark"/>
-	<menuitem name="EditRenameTopic" verb="RenameTopic"/>
-	<separator name="FileSep1"/>
-	<menuitem name="FileRemoveBookmark" verb="RemoveBookmark"/>
-	<menuitem name="FileRemoveTopic" verb="RemoveTopic"/>
+	<menuitem name="EditCut" verb="Cut"/>
+	<menuitem name="EditCopy" verb="Copy"/>
+	<menuitem name="EditPaste" verb="Paste"/>
+	<menuitem name="EditSelectAll" verb="SelectAll"/>
 </submenu>
 
 </menu>
@@ -27,11 +29,16 @@
 	<menuitem name="OpenInWindowBMK" verb="OpenInWindow"/>
 	<menuitem name="OpenInTabBMK" verb="OpenInTab"/>
 	<separator name="BookmarksPopupSep1"/>
-	<menuitem name="RemoveBMK" verb="RemoveBookmark"/>
-	<menuitem name="RenameBMK" verb="RenameBookmark"/>
+	<menuitem name="RenameBMK" verb="Rename"/>
+	<menuitem name="DeleteBMK" verb="Delete"/>
 	<separator name="BookmarksPopupSep2"/>
 	<menuitem name="BMKProperties" verb="Properties"/>
 </popup>
-	
+
+<popup name="EphyBookmarkKeywordPopup" verb="FakeToplevel">
+	<menuitem name="RenameTPC" verb="Rename"/>
+	<menuitem name="DeleteTPC" verb="Delete"/>
+</popup>
+
 </popups>
 </Root>
-- 
cgit v1.2.3