Backing out change to make bookmarks top-level menu. It's beyond me.

This commit is contained in:
hyatt%netscape.com 1998-10-08 21:06:36 +00:00
parent 383f3eb12c
commit 81a9f7a466

View File

@ -444,24 +444,6 @@ BEGIN
MENUITEM "&Home", ID_GO_HOME
MENUITEM SEPARATOR
END
POPUP "&Bookmarks"
BEGIN
MENUITEM "Ad&d Bookmark\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
#ifndef MOZ_COMMUNICATOR_NAME
POPUP "&Window"
#else
@ -481,7 +463,24 @@ BEGIN
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
#endif /* MOZ_MAIL_NEWS */
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
POPUP "&Bookmarks"
BEGIN
MENUITEM "Ad&d Bookmark\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
#ifdef MOZ_SECURITY
MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY
@ -636,22 +635,7 @@ BEGIN
// MENUITEM SEPARATOR
//leave#endif
END
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER" IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
#ifndef MOZ_COMMUNICATOR_NAME
POPUP "&Window"
#else
@ -676,7 +660,21 @@ BEGIN
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
#endif /* MOZ_MAIL_NEWS */
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER" IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
#if defined(JAVA) || defined(OJI)
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
@ -1919,7 +1917,19 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Stop Loading\tESC", ID_NAVIGATE_INTERRUPT
END
POPUP "&Bookmarks"
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX
MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR
MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL
MENUITEM SEPARATOR
#ifdef MOZ_TASKBAR
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
#endif // MOZ_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
@ -1937,19 +1947,6 @@ BEGIN
END
MENUITEM SEPARATOR
END
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX
MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR
MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL
MENUITEM SEPARATOR
#ifdef MOZ_TASKBAR
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
#endif // MOZ_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
MENUITEM "Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
#ifdef MOZ_SECURITY
@ -2040,24 +2037,6 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "My Address B&ook Card", ID_CREATE_CARD
END
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
@ -2068,7 +2047,24 @@ BEGIN
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
#ifdef MOZ_SECURITY
@ -2140,7 +2136,17 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Stop Searching\tESC", ID_NAVIGATE_INTERRUPT
END
POPUP "&Bookmarks"
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX
MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR
MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL
MENUITEM SEPARATOR
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
@ -2158,17 +2164,6 @@ BEGIN
END
MENUITEM SEPARATOR
END
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX
MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR
MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL
MENUITEM SEPARATOR
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
#ifdef MOZ_SECURITY
@ -2409,24 +2404,6 @@ BEGIN
MENUITEM "Ignor&e Thread\tK", ID_MESSAGE_KILL
MENUITEM "&Watch Thread\tW", ID_MESSAGE_WATCH
END
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
@ -2437,7 +2414,24 @@ BEGIN
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
#ifdef MOZ_SECURITY
@ -2714,7 +2708,17 @@ BEGIN
MENUITEM "Ignor&e Thread\tK", ID_MESSAGE_KILL
MENUITEM "&Watch Thread\tW", ID_MESSAGE_WATCH*/
END
POPUP "&Bookmarks"
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX
MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR
MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL
MENUITEM SEPARATOR
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
@ -2732,17 +2736,6 @@ BEGIN
END
MENUITEM SEPARATOR
END
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX
MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR
MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL
MENUITEM SEPARATOR
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
#ifdef MOZ_SECURITY
@ -3157,7 +3150,17 @@ BEGIN
BEGIN
MENUITEM "Check &Spelling...", ID_CHECK_SPELLING
END
POPUP "&Bookmarks"
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX
MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR
MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL
MENUITEM SEPARATOR
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
@ -3175,17 +3178,6 @@ BEGIN
END
MENUITEM SEPARATOR
END
POPUP "&Communicator"
BEGIN
MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB
MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX
MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR
MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL
MENUITEM SEPARATOR
MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
#ifdef MOZ_SECURITY
@ -3493,24 +3485,6 @@ BEGIN
MENUITEM "Set as &New Bookmarks Folder", ID_ITEM_SETTOFOLDER
MENUITEM "Set as Bookmark &Menu", ID_ITEM_SETTOMENU
END
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "First Place", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
#ifndef MOZ_COMMUNICATOR_NAME
POPUP "&Window"
#else
@ -3535,7 +3509,24 @@ BEGIN
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
#endif /* MOZ_MAIL_NEWS */
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "First Place", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
#ifdef MOZ_SECURITY
@ -3622,24 +3613,6 @@ BEGIN
MENUITEM "Sort &Ascending", ID_ASCENDING
MENUITEM "Sort &Descending", ID_DECENDING
END
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
#ifndef MOZ_COMMUNICATOR_NAME
POPUP "&Window"
#else
@ -3664,7 +3637,24 @@ BEGIN
MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL
MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK
#endif // MOZ_MAIL_NEWS
MENUITEM "&Bookmarks\tCtrl+B", ID_HOTLIST_VIEW
POPUP "&Bookmarks"
BEGIN
MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST
POPUP "&File Bookmark"
BEGIN
MENUITEM "Root", ID_BOOKMARKS_FILEROOT
END
MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW
MENUITEM SEPARATOR
POPUP "&Guide"
BEGIN
MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID
END
MENUITEM SEPARATOR
END
MENUITEM "&History\tCtrl+H", ID_GO_HISTORY
MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE
#ifdef MOZ_SECURITY