383934 Re-organize targets to allow preference panes to use -bundle_loader. Use aggregate targets to build the application; set bundle loader for preference panes. This is v2, which contains changes for compatibility with Xcode 2.5. r=smorgan sr=me

This commit is contained in:
mark%moxienet.com 2007-12-11 05:06:08 +00:00
Родитель dc4a8023c5
Коммит 3c4736e842
7 изменённых файлов: 727 добавлений и 1354 удалений

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,287 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Mozilla browser.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* william@dell.wisner.name (William Dell Wisner)
* josh@mozilla.com (Josh Aas)
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import <Carbon/Carbon.h>
#import <Cocoa/Cocoa.h>
#import <ApplicationServices/ApplicationServices.h>
#import <Sparkle/Sparkle.h>
#import "NSWorkspace+Utils.h"
#import "AppListMenuFactory.h"
#import "UserDefaults.h"
#import "Navigation.h"
const int kDefaultExpireDays = 9;
@interface OrgMozillaChimeraPreferenceNavigation(Private)
- (NSString*)currentHomePage;
- (void)updateDefaultBrowserMenu;
- (void)browserSelectionPanelDidEnd:(NSOpenPanel*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo;
- (void)feedSelectionPanelDidEnd:(NSOpenPanel*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo;
@end
@implementation OrgMozillaChimeraPreferenceNavigation
- (id)initWithBundle:(NSBundle *)bundle
{
if ((self = [super initWithBundle:bundle])) {
[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObject:[NSArray array]
forKey:kUserChosenBrowserUserDefaultsKey]];
[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObject:[NSArray array]
forKey:kUserChosenFeedViewerUserDefaultsKey]];
}
return self;
}
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
[super dealloc];
}
- (void)mainViewDidLoad
{
if (!mPrefService)
return;
BOOL gotPref;
// 0: blank page. 1: home page. 2: last page visited. Our behaviour here should
// match what the browser does when the prefs don't exist.
if (([self getIntPref:"browser.startup.page" withSuccess:&gotPref] == 1) || !gotPref)
[checkboxNewWindowBlank setState:NSOnState];
if (([self getIntPref:"browser.tabs.startPage" withSuccess:&gotPref] == 1))
[checkboxNewTabBlank setState:NSOnState];
if ([self getBooleanPref:"camino.check_default_browser" withSuccess:&gotPref] || !gotPref)
[checkboxCheckDefaultBrowserOnLaunch setState:NSOnState];
if ([self getBooleanPref:"camino.warn_when_closing" withSuccess:&gotPref])
[checkboxWarnWhenClosing setState:NSOnState];
if ([self getBooleanPref:"camino.remember_window_state" withSuccess:&gotPref])
[checkboxRememberWindowState setState:NSOnState];
if ([[NSUserDefaults standardUserDefaults] integerForKey:SUScheduledCheckIntervalKey] > 0)
[checkboxAutoUpdate setState:NSOnState];
[textFieldHomePage setStringValue:[self currentHomePage]];
// set up default browser menu
[self updateDefaultBrowserMenu];
// set up the feed viewer menu
[self updateDefaultFeedViewerMenu];
// register notification if the default feed viewer is changed in the FeedServiceController
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(updateDefaultFeedViewerMenu)
name:kDefaultFeedViewerChanged
object:nil];
}
- (void) didUnselect
{
if (!mPrefService)
return;
[self setPref:"browser.startup.homepage" toString:[textFieldHomePage stringValue]];
// ensure that the prefs exist
[self setPref:"browser.startup.page" toInt:[checkboxNewWindowBlank state] ? 1 : 0];
[self setPref:"browser.tabs.startPage" toInt:[checkboxNewTabBlank state] ? 1 : 0];
}
- (IBAction)checkboxStartPageClicked:(id)sender
{
if (!mPrefService)
return;
char *prefName = NULL;
if (sender == checkboxNewTabBlank)
prefName = "browser.tabs.startPage";
else if (sender == checkboxNewWindowBlank)
prefName = "browser.startup.page";
if (prefName)
[self setPref:prefName toInt: [sender state] ? 1 : 0];
}
- (IBAction)warningCheckboxClicked:(id)sender
{
if (sender == checkboxWarnWhenClosing)
[self setPref:"camino.warn_when_closing" toBoolean:([sender state] == NSOnState)];
}
- (IBAction)rememberWindowStateCheckboxClicked:(id)sender
{
if (sender == checkboxRememberWindowState)
[self setPref:"camino.remember_window_state" toBoolean:([sender state] == NSOnState)];
}
- (IBAction)checkDefaultBrowserOnLaunchClicked:(id)sender
{
if (sender == checkboxCheckDefaultBrowserOnLaunch)
[self setPref:"camino.check_default_browser" toBoolean:([sender state] == NSOnState)];
}
- (IBAction)autoUpdateCheckboxClicked:(id)sender
{
if (sender == checkboxAutoUpdate) {
NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
if ([sender state] == NSOnState) {
[defaults setInteger:USER_DEFAULTS_UPDATE_INTERVAL_DEFAULT
forKey:SUScheduledCheckIntervalKey];
}
else {
[defaults setInteger:0 forKey:SUScheduledCheckIntervalKey];
}
}
}
- (NSString*)currentHomePage
{
BOOL gotPref;
return [self getStringPref:"browser.startup.homepage" withSuccess:&gotPref];
}
// called when the users changes the selection in the default browser menu
- (IBAction)defaultBrowserChange:(id)sender
{
[[AppListMenuFactory sharedAppListMenuFactory] validateAndRegisterDefaultBrowser:[sender representedObject]];
[self updateDefaultBrowserMenu];
}
-(IBAction)defaultFeedViewerChange:(id)sender
{
[[AppListMenuFactory sharedAppListMenuFactory] validateAndRegisterDefaultFeedViewer:[sender representedObject]];
[self updateDefaultFeedViewerMenu];
}
-(IBAction)runOpenDialogToSelectBrowser:(id)sender
{
NSOpenPanel *op = [NSOpenPanel openPanel];
[op setCanChooseDirectories:NO];
[op setAllowsMultipleSelection:NO];
[op beginSheetForDirectory:nil
file:nil
types:[NSArray arrayWithObject:@"app"]
modalForWindow:[defaultBrowserPopUp window]
modalDelegate:self
didEndSelector:@selector(browserSelectionPanelDidEnd:returnCode:contextInfo:)
contextInfo:nil];
}
-(IBAction)runOpenDialogToSelectFeedViewer:(id)sender
{
NSOpenPanel *op = [NSOpenPanel openPanel];
[op setCanChooseDirectories:NO];
[op setAllowsMultipleSelection:NO];
[op beginSheetForDirectory:nil
file:nil
types:[NSArray arrayWithObject:@"app"]
modalForWindow:[defaultFeedViewerPopUp window]
modalDelegate:self
didEndSelector:@selector(feedSelectionPanelDidEnd:returnCode:contextInfo:)
contextInfo:nil];
}
- (void)browserSelectionPanelDidEnd:(NSOpenPanel*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo
{
if (returnCode == NSOKButton) {
NSString *chosenBundleID = [[NSWorkspace sharedWorkspace] identifierForBundle:[[sheet URLs] objectAtIndex:0]];
if (chosenBundleID) {
// add this browser to a list of apps we should always consider as browsers
NSMutableArray *userChosenBundleIDs = [NSMutableArray arrayWithCapacity:2];
[userChosenBundleIDs addObjectsFromArray:[[NSUserDefaults standardUserDefaults] objectForKey:kUserChosenBrowserUserDefaultsKey]];
if (![userChosenBundleIDs containsObject:chosenBundleID]) {
[userChosenBundleIDs addObject:chosenBundleID];
[[NSUserDefaults standardUserDefaults] setObject:userChosenBundleIDs forKey:kUserChosenBrowserUserDefaultsKey];
}
// make it the default browser
[[NSWorkspace sharedWorkspace] setDefaultBrowserWithIdentifier:chosenBundleID];
}
}
[self updateDefaultBrowserMenu];
}
- (void)feedSelectionPanelDidEnd:(NSOpenPanel*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo
{
if (returnCode == NSOKButton) {
NSString* chosenBundleID = [[NSWorkspace sharedWorkspace] identifierForBundle:[[sheet URLs] objectAtIndex:0]];
if (chosenBundleID) {
// add this browser to a list of apps we should always consider as browsers
NSMutableArray* userChosenBundleIDs = [NSMutableArray arrayWithCapacity:2];
[userChosenBundleIDs addObjectsFromArray:[[NSUserDefaults standardUserDefaults] objectForKey:kUserChosenFeedViewerUserDefaultsKey]];
if (![userChosenBundleIDs containsObject:chosenBundleID]) {
[userChosenBundleIDs addObject:chosenBundleID];
[[NSUserDefaults standardUserDefaults] setObject:userChosenBundleIDs forKey:kUserChosenFeedViewerUserDefaultsKey];
}
// set the default feed viewer
[[NSWorkspace sharedWorkspace] setDefaultFeedViewerWithIdentifier:chosenBundleID];
[self updateDefaultFeedViewerMenu];
}
}
// The open action was cancelled, re-select the default application
else
[defaultFeedViewerPopUp selectItemAtIndex:0];
}
-(void)updateDefaultBrowserMenu
{
[[AppListMenuFactory sharedAppListMenuFactory] buildBrowserAppsMenuForPopup:defaultBrowserPopUp
andAction:@selector(defaultBrowserChange:)
andSelectAction:@selector(runOpenDialogToSelectBrowser:)
andTarget:self];
}
-(void)updateDefaultFeedViewerMenu
{
[[AppListMenuFactory sharedAppListMenuFactory] buildFeedAppsMenuForPopup:defaultFeedViewerPopUp
andAction:@selector(defaultFeedViewerChange:)
andSelectAction:@selector(runOpenDialogToSelectFeedViewer:)
andTarget:self];
}
@end

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -3,17 +3,25 @@ INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"
GCC_PREFIX_HEADER = src/includes/ChimeraPrefix.h
// Most/all of this will be removed when pref panes switch to bundle linking
// rather than actually compiling any core code.
GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1
OTHER_LDFLAGS = -lpthread -lm
OTHER_CFLAGS = -fshort-wchar
LIBRARY_STYLE = BUNDLE
GCC_ENABLE_PASCAL_STRINGS = YES
GCC_ENABLE_CPP_EXCEPTIONS = NO
GCC_ENABLE_CPP_RTTI = NO
// Thes warning settings should be revisited once pref panes aren't tied to core
// Needed because some preference panes still use libxpcom_core.dylib and
// related headers as an internal Mozilla user.
GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1
OTHER_CFLAGS = -fshort-wchar
GCC_WARN_SIGN_COMPARE = YES
WARNING_CFLAGS = -Wall -Wno-four-char-constants
OTHER_CPLUSPLUSFLAGS = $(OTHER_CPLUSPLUSFLAGS) -Wno-non-virtual-dtor
CONFIGURATION_BUILD_DIR = $(BUILD_DIR)/$(CONFIGURATION)/Camino.app/Contents/PreferencePanes
BUNDLE_LOADER = $(BUILD_DIR)/$(CONFIGURATION)/Camino.app/Contents/MacOS/Camino
OTHER_LDFLAGS = -Wl,-executable_path,$(BUILD_DIR)/$(CONFIGURATION)/Camino.app/Contents/MacOS
// -bundle_loader and -dead_strip interact poorly with one another in the Xcode
// 2.5 cctools, causing pref pane linking to fail with:
// ld: warning internal error: output_flush(offset = w, size = x) overlaps with flushed block(offset = y, size = z)
// This is not a problem in Xcode 3.0. This can be removed once Xcode 3.0 is
// the minimum build requirement.
DEAD_CODE_STRIPPING = NO

Просмотреть файл

@ -0,0 +1,72 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2001
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Simon Fraser
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import <PreferencePanes/PreferencePanes.h>
class nsIPref;
// optional methods that our prefs panes can implement
@interface NSObject(CaminoPreferencePane)
// the prefs window was activated; pane should update its state
- (void)didActivate;
@end
@interface PreferencePaneBase : NSPreferencePane
{
nsIPref* mPrefService; // strong, but can't use a comptr here
}
- (NSString*)getStringPref: (const char*)prefName withSuccess:(BOOL*)outSuccess;
- (NSColor*)getColorPref: (const char*)prefName withSuccess:(BOOL*)outSuccess;
- (BOOL)getBooleanPref: (const char*)prefName withSuccess:(BOOL*)outSuccess;
- (int)getIntPref: (const char*)prefName withSuccess:(BOOL*)outSuccess;
- (void)setPref: (const char*)prefName toString:(NSString*)value;
- (void)setPref: (const char*)prefName toColor:(NSColor*)value;
- (void)setPref: (const char*)prefName toBoolean:(BOOL)value;
- (void)setPref: (const char*)prefName toInt:(int)value;
- (void)clearPref: (const char*)prefName;
- (NSString*)localizedStringForKey:(NSString*)key;
@end

Просмотреть файл

@ -0,0 +1,189 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2001
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Simon Fraser
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import "PreferencePaneBase.h"
#include "nsCOMPtr.h"
#include "nsIServiceManager.h"
#include "nsIPref.h"
@implementation PreferencePaneBase
- (void) dealloc
{
NS_IF_RELEASE(mPrefService);
[super dealloc];
}
- (id) initWithBundle:(NSBundle *) bundle
{
self = [super initWithBundle:bundle] ;
nsCOMPtr<nsIPref> prefService ( do_GetService(NS_PREF_CONTRACTID) );
NS_ASSERTION(prefService, "Could not get pref service, pref panel left uninitialized");
mPrefService = prefService.get();
NS_IF_ADDREF(mPrefService);
return self;
}
#pragma mark -
- (NSString*)getStringPref: (const char*)prefName withSuccess:(BOOL*)outSuccess
{
NSString *prefValue = @"";
char *buf = nsnull;
nsresult rv = mPrefService->GetCharPref(prefName, &buf);
if (NS_SUCCEEDED(rv) && buf) {
// prefs are UTF-8
prefValue = [NSString stringWithUTF8String:buf];
free(buf);
if (outSuccess) *outSuccess = YES;
} else {
if (outSuccess) *outSuccess = NO;
}
return prefValue;
}
- (NSColor*)getColorPref: (const char*)prefName withSuccess:(BOOL*)outSuccess
{
// colors are stored in HTML-like #FFFFFF strings
NSString* colorString = [self getStringPref:prefName withSuccess:outSuccess];
NSColor* returnColor = [NSColor blackColor];
if ([colorString hasPrefix:@"#"] && [colorString length] == 7)
{
unsigned int redInt, greenInt, blueInt;
sscanf([colorString cString], "#%02x%02x%02x", &redInt, &greenInt, &blueInt);
float redFloat = ((float)redInt / 255.0);
float greenFloat = ((float)greenInt / 255.0);
float blueFloat = ((float)blueInt / 255.0);
returnColor = [NSColor colorWithCalibratedRed:redFloat green:greenFloat blue:blueFloat alpha:1.0f];
}
else
{
*outSuccess = NO;
}
return returnColor;
}
- (BOOL)getBooleanPref: (const char*)prefName withSuccess:(BOOL*)outSuccess
{
PRBool boolPref = PR_FALSE;
nsresult rv = mPrefService->GetBoolPref(prefName, &boolPref);
if (outSuccess)
*outSuccess = NS_SUCCEEDED(rv);
return boolPref ? YES : NO;
}
- (int)getIntPref: (const char*)prefName withSuccess:(BOOL*)outSuccess
{
PRInt32 intPref = 0;
nsresult rv = mPrefService->GetIntPref(prefName, &intPref);
if (outSuccess)
*outSuccess = NS_SUCCEEDED(rv);
return intPref;
}
- (void)setPref: (const char*)prefName toString:(NSString*)value
{
// prefs are UTF-8
if (mPrefService) {
mPrefService->SetCharPref(prefName, [value UTF8String]);
}
}
- (void)setPref: (const char*)prefName toColor:(NSColor*)value
{
// make sure we have a color in the RGB colorspace
NSColor* rgbColor = [value colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
int redInt = (int)([rgbColor redComponent] * 255.0);
int greenInt = (int)([rgbColor greenComponent] * 255.0);
int blueInt = (int)([rgbColor blueComponent] * 255.0);
NSString* colorString = [NSString stringWithFormat:@"#%02x%02x%02x", redInt, greenInt, blueInt];
[self setPref:prefName toString:colorString];
}
- (void)setPref: (const char*)prefName toBoolean:(BOOL)value
{
if (mPrefService) {
mPrefService->SetBoolPref(prefName, value ? PR_TRUE : PR_FALSE);
}
}
- (void)setPref: (const char*)prefName toInt:(int)value
{
if (mPrefService) {
PRInt32 prefValue = value;
mPrefService->SetIntPref(prefName, prefValue);
}
}
- (void)clearPref: (const char*)prefName
{
if (mPrefService) {
mPrefService->ClearUserPref(prefName);
}
}
- (NSString*)localizedStringForKey:(NSString*)key
{
return NSLocalizedStringFromTableInBundle(key, nil, [NSBundle bundleForClass:[self class]], @"");
}
@end
// Compatibility wrappers for third-party pref panes that use methods that we
// have renamed or modified. Should not be used for any new development.
@implementation PreferencePaneBase (LegacyCompatibility)
- (NSString*)getLocalizedString:(NSString*)key
{
return [self localizedStringForKey:key];
}
@end