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

Fix bug 167245: when opening tabs for GetURL events, or various Help menu items, always open the new tab in the front irrespective of the "load in background" pref. r=pinkerton

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@179008 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
smfr%smfr.org
2005-08-25 22:54:47 +00:00
parent 8a70ad16db
commit bb3d5e975a
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/camino/src/appleevents/GetURLCommand.mm
View File

@@ -52,7 +52,7 @@
// so we have to make sure that gecko has been initted
[mainController ensureGeckoInitted];
[mainController openNewWindowOrTabWithURL:[self directParameter] andReferrer:nil];
[mainController openNewWindowOrTabWithURL:[self directParameter] andReferrer:nil alwaysInFront:YES];
return nil;
}

2
mozilla/camino/src/application/MainController.h
View File

@@ -171,7 +171,7 @@ typedef enum EBookmarkOpenBehavior
- (BrowserWindowController*)openBrowserWindowWithURL:(NSString*)aURL andReferrer:(NSString*)aReferrer behind:(NSWindow*)window allowPopups:(BOOL)inAllowPopups;
- (BrowserWindowController*)openBrowserWindowWithURLs:(NSArray*)urlArray behind:(NSWindow*)window allowPopups:(BOOL)inAllowPopups;
- (void)openNewWindowOrTabWithURL:(NSString*)inURLString andReferrer:(NSString*)aReferrer;
- (void)openNewWindowOrTabWithURL:(NSString*)inURLString andReferrer:(NSString*)aReferrer alwaysInFront:(BOOL)forceFront;
- (void)adjustCloseWindowMenuItemKeyEquivalent:(BOOL)inHaveTabs;
- (void)adjustCloseTabMenuItemKeyEquivalent:(BOOL)inHaveTabs;

27
mozilla/camino/src/application/MainController.mm
View File

@@ -995,7 +995,7 @@ Otherwise, we return the URL we originally got. Right now this supports .url and
}
// open a new URL, observing the prefs on how to behave
- (void)openNewWindowOrTabWithURL:(NSString*)inURLString andReferrer: (NSString*)aReferrer
- (void)openNewWindowOrTabWithURL:(NSString*)inURLString andReferrer:(NSString*)aReferrer alwaysInFront:(BOOL)forceFront
{
// make sure we're initted
[PreferenceManager sharedInstance];
@@ -1006,7 +1006,8 @@ Otherwise, we return the URL we originally got. Right now this supports .url and
nsCOMPtr<nsIPref> prefService ( do_GetService(NS_PREF_CONTRACTID) );
if ( prefService ) {
prefService->GetIntPref("browser.reuse_window", &reuseWindow);
prefService->GetBoolPref("browser.tabs.loadInBackground", &loadInBackground);
if (!forceFront)
prefService->GetBoolPref("browser.tabs.loadInBackground", &loadInBackground);
}
// reuse the main window (if there is one) based on the pref in the
@@ -1141,7 +1142,7 @@ Otherwise, we return the URL we originally got. Right now this supports .url and
[self ensureGeckoInitted];
NSURL* urlToOpen = [MainController decodeLocalFileURL:[NSURL fileURLWithPath:filename]];
[self openNewWindowOrTabWithURL:[urlToOpen absoluteString] andReferrer:nil];
[self openNewWindowOrTabWithURL:[urlToOpen absoluteString] andReferrer:nil alwaysInFront:YES];
return YES;
}
@@ -1379,47 +1380,47 @@ Otherwise, we return the URL we originally got. Right now this supports .url and
{
NSString* pageToLoad = NSLocalizedStringFromTable(@"SupportPageDefault", @"WebsiteDefaults", nil);
if (![pageToLoad isEqualToString:@"SupportPageDefault"])
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil];
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil alwaysInFront:YES];
}
-(IBAction) infoLink:(id)aSender
{
NSString* pageToLoad = NSLocalizedStringFromTable(@"InfoPageDefault", @"WebsiteDefaults", nil);
if (![pageToLoad isEqualToString:@"InfoPageDefault"])
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil];
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil alwaysInFront:YES];
}
-(IBAction) feedbackLink:(id)aSender
{
NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil);
if (![pageToLoad isEqualToString:@"FeedbackPageDefault"])
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil];
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil alwaysInFront:YES];
}
-(IBAction) releaseNoteLink:(id)aSender
{
NSString *pageToLoad = NSLocalizedStringFromTable(@"ReleaseNotesDefault", @"WebsiteDefaults", nil);
if (![pageToLoad isEqualToString:@"ReleaseNotesDefault"])
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil];
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil alwaysInFront:YES];
}
-(IBAction) tipsTricksLink:(id)aSender
{
NSString *pageToLoad = NSLocalizedStringFromTable(@"TipsTricksPageDefault", @"WebsiteDefaults", nil);
if (![pageToLoad isEqualToString:@"TipsTricksPageDefault"])
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil];
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil alwaysInFront:YES];
}
-(IBAction) searchCustomizeLink:(id)aSender
{
NSString *pageToLoad = NSLocalizedStringFromTable(@"SearchCustomPageDefault", @"WebsiteDefaults", nil);
if (![pageToLoad isEqualToString:@"SearchCustomPageDefault"])
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil];
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil alwaysInFront:YES];
}
-(IBAction) aboutPlugins:(id)aSender
{
[self openNewWindowOrTabWithURL:@"about:plugins" andReferrer:nil];
[self openNewWindowOrTabWithURL:@"about:plugins" andReferrer:nil alwaysInFront:YES];
}
+ (NSImage*)createImageForDragging:(NSImage*)aIcon title:(NSString*)aTitle
@@ -1523,7 +1524,7 @@ Otherwise, we return the URL we originally got. Right now this supports .url and
[urlString appendString:tmpString];
}
[self openNewWindowOrTabWithURL:urlString andReferrer:nil];
[self openNewWindowOrTabWithURL:urlString andReferrer:nil alwaysInFront:YES];
}
//
@@ -1671,7 +1672,7 @@ static int SortByProtocolAndName(NSDictionary* item1, NSDictionary* item2, void
{
NSDictionary *dict = [note userInfo];
if ([dict objectForKey:NetworkServicesClientKey] == self)
[self openNewWindowOrTabWithURL:[dict objectForKey:NetworkServicesResolvedURLKey] andReferrer:nil];
[self openNewWindowOrTabWithURL:[dict objectForKey:NetworkServicesResolvedURLKey] andReferrer:nil alwaysInFront:YES];
}
//
@@ -1703,7 +1704,7 @@ static int SortByProtocolAndName(NSDictionary* item1, NSDictionary* item2, void
{
NSString *pageToLoad = NSLocalizedStringFromTable(@"RendezvousPageDefault", @"WebsiteDefaults", nil);
if (![pageToLoad isEqualToString:@"RendezvousPageDefault"])
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil];
[self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil alwaysInFront:YES];
}
@end

2
mozilla/camino/src/browser/GoMenu.mm
View File

@@ -442,7 +442,7 @@ static const unsigned int kMaxTitleLength = 50;
}
}
else
[(MainController *)[NSApp delegate] openNewWindowOrTabWithURL:itemURL andReferrer:nil];
[(MainController *)[NSApp delegate] openNewWindowOrTabWithURL:itemURL andReferrer:nil alwaysInFront:NO];
}
}