Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the bookmarks menu to the top level menubar.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@8327 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ramiro%netscape.com
1998-08-21 10:43:27 +00:00
parent fa3ec6839a
commit 933646ed20
12 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/cmd/xfe/resources
View File

@@ -3140,7 +3140,6 @@ Open the mail folders and discussion groups window
Open the address book
*menuBar*bookmarksSubmenu.labelString: Bookmarks
*menuBar*bookmarksSubmenu.mnemonic: B
*menuBar*toolsSubmenu.labelString: Tools
*menuBar*toolsSubmenu.mnemonic: T

1
mozilla/cmd/xfe/src/AddrBookFrame.cpp
View File

@@ -159,6 +159,7 @@ MenuSpec XFE_AddrBookFrame::menu_bar_spec[] = {
(MenuSpec*)&XFE_AddrBookFrame::view_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON,
(MenuSpec*)&XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON,
(MenuSpec*)&XFE_Frame::help_menu_spec },
{ NULL }

1
mozilla/cmd/xfe/src/BookmarkFrame.cpp
View File

@@ -109,6 +109,7 @@ MenuSpec XFE_BookmarkFrame::menu_bar_spec[] = {
{ xfeMenuEdit, CASCADEBUTTON, edit_menu_spec },
{ xfeMenuView, CASCADEBUTTON, view_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, XFE_Frame::help_menu_spec },
{ NULL }
};

1
mozilla/cmd/xfe/src/BrowserFrame.cpp
View File

@@ -192,6 +192,7 @@ MenuSpec XFE_BrowserFrame::menu_bar_spec[] = {
{ xfeMenuView, CASCADEBUTTON, (MenuSpec*)&XFE_BrowserFrame::view_menu_spec },
{ xfeMenuGo, CASCADEBUTTON, (MenuSpec*)&XFE_BrowserFrame::go_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec },
{ NULL }
};

2
mozilla/cmd/xfe/src/ComposeFrame.cpp
View File

@@ -193,6 +193,7 @@ MenuSpec XFE_ComposeFrame::menu_bar_spec[] = {
{ xfeMenuView, CASCADEBUTTON, (MenuSpec*)&XFE_ComposeFrame::view_menu_spec },
{ xfeMenuTools, CASCADEBUTTON, (MenuSpec*)&text_tools_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec},
{ NULL }
};
@@ -285,6 +286,7 @@ MenuSpec XFE_ComposeFrame::html_menu_bar_spec[] = {
{ xfeMenuTools, CASCADEBUTTON,
(MenuSpec*)&XFE_EditorFrame::tools_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec },
{ NULL }
};

1
mozilla/cmd/xfe/src/EditorFrame.cpp
View File

@@ -351,6 +351,7 @@ MenuSpec XFE_EditorFrame::menu_bar_spec[] = {
{ xfeMenuTools, CASCADEBUTTON,
(MenuSpec*)&XFE_EditorFrame::tools_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec },
{ NULL }
};

1
mozilla/cmd/xfe/src/FolderFrame.cpp
View File

@@ -117,6 +117,7 @@ MenuSpec XFE_FolderFrame::menu_bar_spec[] = {
{ xfeMenuEdit, CASCADEBUTTON, edit_menu_spec },
{ xfeMenuView, CASCADEBUTTON, view_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, XFE_Frame::help_menu_spec },
{ NULL }
};

4
mozilla/cmd/xfe/src/Frame.cpp
View File

@@ -53,6 +53,7 @@
#include "Minibuffer.h"
#include "Toolbox.h"
#include "Dashboard.h"
#include "URLBar.h"
#include "Logo.h"
#include "Netcaster.h"
#include "ViewGlue.h"
@@ -165,8 +166,10 @@ MenuSpec XFE_Frame::bookmark_submenu_spec[] = {
{ "fileBookmarksSubmenu", DYNA_FANCY_CASCADEBUTTON, NULL, NULL, False, (void*)True, XFE_BookmarkMenu::generate },
{ xfeCmdOpenBookmarks, PUSHBUTTON },
MENU_SEPARATOR,
#ifdef BULLSHIT
{ "placesSubmenu", CASCADEBUTTON, XFE_Frame::places_menu_spec},
MENU_SEPARATOR,
#endif
{ "bookmarkPlaceHolder", DYNA_MENUITEMS, NULL, NULL, False, (void*)False, XFE_BookmarkMenu::generate },
{ NULL }
};
@@ -239,7 +242,6 @@ MenuSpec XFE_Frame::window_menu_spec[] = {
{ xfeCmdOpenFolders, PUSHBUTTON },
{ xfeCmdOpenAddressBook, PUSHBUTTON },
#endif
{ "bookmarksSubmenu", CASCADEBUTTON, bookmark_submenu_spec },
{ xfeCmdOpenHistory, PUSHBUTTON },
#ifdef JAVA
{ xfeCmdJavaConsole, PUSHBUTTON },

1
mozilla/cmd/xfe/src/HistoryFrame.cpp
View File

@@ -101,6 +101,7 @@ MenuSpec XFE_HistoryFrame::menu_bar_spec[] = {
{ xfeMenuEdit, CASCADEBUTTON, edit_menu_spec },
{ xfeMenuView, CASCADEBUTTON, view_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, XFE_Frame::help_menu_spec },
{ NULL }
};

1
mozilla/cmd/xfe/src/MsgFrame.cpp
View File

@@ -209,6 +209,7 @@ MenuSpec XFE_MsgFrame::menu_bar_spec[] = {
{ xfeMenuGo, CASCADEBUTTON, XFE_ThreadFrame::go_menu_spec },
{ xfeMenuMessage, CASCADEBUTTON, message_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, XFE_Frame::help_menu_spec },
{ NULL }
};

1
mozilla/cmd/xfe/src/NavCenterFrame.cpp
View File

@@ -42,6 +42,7 @@ MenuSpec XFE_NavCenterFrame::file_menu_spec[] = {
MenuSpec XFE_NavCenterFrame::menu_bar_spec[] = {
{ xfeMenuFile, CASCADEBUTTON, (MenuSpec*)&XFE_NavCenterFrame::file_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec },
{ NULL }
};

1
mozilla/cmd/xfe/src/ThreadFrame.cpp
View File

@@ -319,6 +319,7 @@ MenuSpec XFE_ThreadFrame::menu_bar_spec[] = {
{ xfeMenuGo, CASCADEBUTTON, go_menu_spec },
{ xfeMenuMessage, CASCADEBUTTON, message_menu_spec },
{ xfeMenuWindow, CASCADEBUTTON, XFE_Frame::window_menu_spec },
{ "bookmarksSubmenu", CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
{ xfeMenuHelp, CASCADEBUTTON, XFE_Frame::help_menu_spec },
{ NULL }
};