зеркало из https://github.com/mozilla/gecko-dev.git
More changes for bookmarks in tabs, bug 215235. r=pinkerton
This commit is contained in:
Родитель
b9914657b2
Коммит
95e0aef9d2
|
@ -45,6 +45,7 @@
|
|||
#import "KeychainService.h"
|
||||
#import "nsDownloadListener.h"
|
||||
#import "ProgressDlgController.h"
|
||||
#import "nsAboutBookmarks.h"
|
||||
|
||||
#include "nsIGenericFactory.h"
|
||||
|
||||
|
@ -192,6 +193,19 @@ static const nsModuleComponentInfo gAppComponents[] = {
|
|||
nsSimpleGlobalHistoryConstructor
|
||||
}
|
||||
#endif
|
||||
,
|
||||
{
|
||||
"About Bookmarks Module",
|
||||
NS_ABOUT_BOOKMARKS_MODULE_CID,
|
||||
NS_ABOUT_MODULE_CONTRACTID_PREFIX "bookmarks",
|
||||
nsAboutBookmarks::Create,
|
||||
},
|
||||
{
|
||||
"About Bookmarks Module",
|
||||
NS_ABOUT_BOOKMARKS_MODULE_CID,
|
||||
NS_ABOUT_MODULE_CONTRACTID_PREFIX "history",
|
||||
nsAboutBookmarks::Create,
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ typedef enum EBookmarkOpenBehavior
|
|||
// IBOutlet NSMenuItem* mOfflineMenuItem;
|
||||
IBOutlet NSMenuItem* mCloseWindowMenuItem;
|
||||
IBOutlet NSMenuItem* mCloseTabMenuItem;
|
||||
IBOutlet NSMenuItem* mToggleSidebarMenuItem;
|
||||
IBOutlet NSMenuItem* mShowAllBookmarksMenuItem;
|
||||
|
||||
IBOutlet NSMenu* mGoMenu;
|
||||
IBOutlet NSMenu* mBookmarksMenu;
|
||||
|
|
|
@ -725,25 +725,7 @@ Otherwise, we return the URL we originally got. Right now this supports .url and
|
|||
[mAddBookmarkMenuItem setEnabled:inBrowserWindowFrontmost];
|
||||
[mCreateBookmarksFolderMenuItem setEnabled:inBrowserWindowFrontmost];
|
||||
[mCreateBookmarksSeparatorMenuItem setEnabled:YES];
|
||||
[mToggleSidebarMenuItem setEnabled:YES]; // always enabled.
|
||||
|
||||
// We need the frontmost browser for the case of the dl/about window
|
||||
// is the main so we can ensure the "show/hide all bookmarks" has the correct
|
||||
// state for that window. Unfortunately, we can't rely on |-getFrontmostBrowserWindow| in all
|
||||
// cases, such as when a window has just been opened. As a result, first
|
||||
// try |-getMainWindowBrowserController| and if that fails use fFBW as a fallback.
|
||||
BrowserWindowController* browserController = [self getMainWindowBrowserController];
|
||||
if (!browserController)
|
||||
browserController = (BrowserWindowController*)[[self getFrontmostBrowserWindow] windowController];
|
||||
|
||||
if (browserController) {
|
||||
if ([browserController bookmarkManagerIsVisible])
|
||||
[mToggleSidebarMenuItem setTitle:NSLocalizedString(@"Hide All Bookmarks", @"")];
|
||||
else
|
||||
[mToggleSidebarMenuItem setTitle:NSLocalizedString(@"Show All Bookmarks", @"")];
|
||||
}
|
||||
else
|
||||
[mToggleSidebarMenuItem setTitle:NSLocalizedString(@"Show All Bookmarks", @"")];
|
||||
[mShowAllBookmarksMenuItem setEnabled:YES]; // always enabled.
|
||||
}
|
||||
|
||||
- (NSView*)getSavePanelView
|
||||
|
|
Загрузка…
Ссылка в новой задаче