зеркало из https://github.com/mozilla/gecko-dev.git
Fixing bug 352078, RSS selection menu looks weird when there's no default app inserted. <Camino only>. r=stuart.morgan, sr=pinkerton
This commit is contained in:
Родитель
c39a9c437d
Коммит
ed759cfdd1
|
@ -114,6 +114,7 @@ static AppListMenuFactory* sAppListMenuFactoryInstance = nil;
|
||||||
[menu addItem:[NSMenuItem separatorItem]];
|
[menu addItem:[NSMenuItem separatorItem]];
|
||||||
|
|
||||||
BOOL insertedDefaultApp = NO;
|
BOOL insertedDefaultApp = NO;
|
||||||
|
BOOL shouldInsertSeperatorAtEnd = NO;
|
||||||
NSEnumerator* feedAppsEnum = [feedApps objectEnumerator];
|
NSEnumerator* feedAppsEnum = [feedApps objectEnumerator];
|
||||||
NSString* curBundleID = nil;
|
NSString* curBundleID = nil;
|
||||||
while ((curBundleID = [feedAppsEnum nextObject])) {
|
while ((curBundleID = [feedAppsEnum nextObject])) {
|
||||||
|
@ -135,8 +136,10 @@ static AppListMenuFactory* sAppListMenuFactoryInstance = nil;
|
||||||
[menu insertItem:menuItem atIndex:0];
|
[menu insertItem:menuItem atIndex:0];
|
||||||
insertedDefaultApp = YES;
|
insertedDefaultApp = YES;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
[menu addItem:menuItem];
|
[menu addItem:menuItem];
|
||||||
|
shouldInsertSeperatorAtEnd = YES;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The user selected an application that is not registered for "feed://".
|
// The user selected an application that is not registered for "feed://".
|
||||||
|
@ -147,19 +150,20 @@ static AppListMenuFactory* sAppListMenuFactoryInstance = nil;
|
||||||
withBundleID:defaultFeedViewerID
|
withBundleID:defaultFeedViewerID
|
||||||
andAction:nil
|
andAction:nil
|
||||||
andTarget:inTarget];
|
andTarget:inTarget];
|
||||||
[[inPopupButton menu] insertItem:menuItem atIndex:0];
|
[menu insertItem:menuItem atIndex:0];
|
||||||
}
|
}
|
||||||
// Since we couldn't find a default application, add a blank menu item.
|
// Since we couldn't find a default application, add a blank menu item.
|
||||||
else {
|
else {
|
||||||
NSMenuItem* dummyItem = [[NSMenuItem alloc] init];
|
NSMenuItem* dummyItem = [[NSMenuItem alloc] init];
|
||||||
[dummyItem setTitle:@""];
|
[dummyItem setTitle:@""];
|
||||||
[[inPopupButton menu] insertItem:dummyItem atIndex:0];
|
[menu insertItem:dummyItem atIndex:0];
|
||||||
[dummyItem release];
|
[dummyItem release];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// allow the user to select a feed application
|
// allow the user to select a feed application
|
||||||
[menu addItem:[NSMenuItem separatorItem]];
|
if (shouldInsertSeperatorAtEnd)
|
||||||
|
[menu addItem:[NSMenuItem separatorItem]];
|
||||||
NSMenuItem* selectItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Select...", nil)
|
NSMenuItem* selectItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Select...", nil)
|
||||||
action:inSelectAction
|
action:inSelectAction
|
||||||
keyEquivalent:@""];
|
keyEquivalent:@""];
|
||||||
|
|
Загрузка…
Ссылка в новой задаче