mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Pref code for internet config hooked up.

This commit is contained in:
hyatt%netscape.com 2002-04-29 09:15:53 +00:00
Родитель b3c3dbbf51
Коммит 692bcc3f39
24 изменённых файлов: 320 добавлений и 156 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
camino/CHPreferenceManager.h
Просмотреть файл

@ -1,5 +1,5 @@
//
// PreferenceManager.h
// CHPreferenceManager.h
// Chimera
//
// Created by William Dell Wisner on Wed Apr 17 2002.
@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import <Carbon/Carbon.h>
@interface PreferenceManager : NSObject {
@interface CHPreferenceManager : NSObject {
NSUserDefaults *defaults;
ICInstance internetConfig;
}

2
camino/CHPreferenceManager.mm
Просмотреть файл

@ -12,7 +12,7 @@
extern const char *prefContractID;
@implementation PreferenceManager
@implementation CHPreferenceManager
- (id) init
{

70
camino/Chimera.pbproj/project.pbxproj
Просмотреть файл

@ -14,6 +14,7 @@
F5DE10EB0209DC0601A967DF,
F51B70B7026EC98B01A80166,
F5AE04BA0206A4FE01A967DF,
F52D5CD8027D3D5001A80166,
F6BA6D4E01B2F8A601A962F7,
F56769FB0208F74A010001CA,
F507BA4C0213AFF701D93544,
@ -64,6 +65,9 @@
children = (
1058C7A1FEA54F0111CA2CBB,
F557193A022B4102010001CA,
F52D5CDB027D412A01A80166,
F52D5CDC027D412A01A80166,
F52D5CDD027D412A01A80166,
);
isa = PBXGroup;
name = "Linked Frameworks";
@ -256,7 +260,7 @@
);
buildSettings = {
DEBUGGING_SYMBOLS = NO;
FRAMEWORK_SEARCH_PATHS = ../embedding/browser/cocoa/src/build;
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "../dist/include/webbrwsr ../dist/include/dom ../dist/include/nspr ../dist/include/string ../dist/include/rdf ../dist/include/necko ../dist/include/find ../dist/include/embed_base ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/docshell ../dist/include/profile ../dist/include/layout ../dist/include/content ../dist/include/webbrowserpersist ../dist/include/pref ../dist/include/mimetype ../dist/include/shistory ../dist/include/view ../dist/include/gfx ../dist/include/xultmpl ../dist/include/xmlextras ../dist/include/htmlparser ../dist/include/locale ../dist/include/unicharutil ../dist/include/appcomps ../dist/include/xpcom";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util ../modules/zlib/src";
@ -395,6 +399,7 @@
F541496002711B0101A80166,
F52D5CD1027A887001A80166,
F52D5CD5027A88C601A80166,
F52D5CD9027D3D5001A80166,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@ -486,6 +491,7 @@
F541496102711B0101A80166,
F52D5CD2027A887001A80166,
F52D5CD6027A88C601A80166,
F52D5CDA027D3D5001A80166,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@ -506,6 +512,9 @@
F57F0F4A0209DF5301A967DF,
F557193B022B4103010001CA,
F5C2CDA802383CE701A967DF,
F52D5CDE027D412A01A80166,
F52D5CDF027D412A01A80166,
F52D5CE0027D412A01A80166,
);
isa = PBXFrameworksBuildPhase;
name = "Frameworks & Libraries";
@ -877,6 +886,7 @@
F5125A110202064D01FAFD9F,
F5AE04B20206A34801A967DF,
F5AE04B60206A37C01A967DF,
F52D5CD7027D3D5001A80166,
F507BA480213AD5F01D93544,
F57074B5026BA85F01A80166,
F57074B9026BFD0101A80166,
@ -1414,6 +1424,64 @@
settings = {
};
};
F52D5CD7027D3D5001A80166 = {
isa = PBXFileReference;
path = CHPreferenceManager.h;
refType = 4;
};
F52D5CD8027D3D5001A80166 = {
isa = PBXFileReference;
path = CHPreferenceManager.mm;
refType = 4;
};
F52D5CD9027D3D5001A80166 = {
fileRef = F52D5CD7027D3D5001A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDA027D3D5001A80166 = {
fileRef = F52D5CD8027D3D5001A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDB027D412A01A80166 = {
isa = PBXFrameworkReference;
name = Carbon.framework;
path = /System/Library/Frameworks/Carbon.framework;
refType = 0;
};
F52D5CDC027D412A01A80166 = {
isa = PBXFrameworkReference;
name = CoreFoundation.framework;
path = /System/Library/Frameworks/CoreFoundation.framework;
refType = 0;
};
F52D5CDD027D412A01A80166 = {
isa = PBXFrameworkReference;
name = SystemConfiguration.framework;
path = /System/Library/Frameworks/SystemConfiguration.framework;
refType = 0;
};
F52D5CDE027D412A01A80166 = {
fileRef = F52D5CDB027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDF027D412A01A80166 = {
fileRef = F52D5CDC027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CE0027D412A01A80166 = {
fileRef = F52D5CDD027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F538DFAE023B36A7010001CA = {
children = (
F538DFAF023B3739010001CA,

3
camino/MainController.h
Просмотреть файл

@ -40,6 +40,7 @@
#import "MVPreferencesController.h"
#import "CHSplashScreenWindow.h"
#import "FindDlgController.h"
#import "CHPreferenceManager.h"
class BookmarksService;
@ -60,6 +61,8 @@ class BookmarksService;
CHSplashScreenWindow *mSplashScreen;
CHPreferenceManager* mPreferenceManager;
BookmarksService *mMenuBookmarks;
FindDlgController* mFindDialog;

7
camino/MainController.mm
Просмотреть файл

@ -64,11 +64,14 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
{
[super dealloc];
[mFindDialog release];
[mPreferenceManager release];
printf("Main controller died.\n");
}
-(void)awakeFromNib
{
{
mPreferenceManager = [[CHPreferenceManager alloc] init];
[self newWindow: self];
[mSplashScreen close];
@ -104,7 +107,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
[[mainWindow windowController] autosaveWindowFrame];
// Now open the new window.
BrowserWindowController* controller = [self openBrowserWindowWithURLString:@"about:blank"];
BrowserWindowController* controller = [self openBrowserWindowWithURLString: [mPreferenceManager homePage]];
[controller focusURLBar];
}

33
camino/nsCocoaBrowserService.mm
Просмотреть файл

@ -74,15 +74,6 @@ nsCocoaBrowserService::InitEmbedding()
if (sSingleton)
return NS_OK;
// XXX Temporary hack to make sure we find the
// right executable directory
NSBundle* mainBundle = [NSBundle mainBundle];
NSString* path = [mainBundle bundlePath];
NSMutableString* mutablePath = [NSMutableString stringWithString:path];
[mutablePath appendString:@"/Contents/MacOS/"];
const char* cstr = [mutablePath cString];
setenv("MOZILLA_FIVE_HOME", cstr, 1);
sSingleton = new nsCocoaBrowserService();
if (!sSingleton) {
return NS_ERROR_OUT_OF_MEMORY;
@ -116,28 +107,6 @@ nsCocoaBrowserService::InitEmbedding()
watcher->SetWindowCreator(sSingleton);
// Set the profile which the control will use
nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv));
if (NS_FAILED(rv))
return rv;
// Make a new default profile for the control if none exists.
nsAutoString newProfileName(NS_LITERAL_STRING("Chimera"));
PRBool profileExists = PR_FALSE;
rv = profileService->ProfileExists(newProfileName.get(), &profileExists);
if (NS_FAILED(rv))
return rv;
if (!profileExists) {
rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
if (NS_FAILED(rv))
return rv;
}
rv = profileService->SetCurrentProfile(newProfileName.get());
if (NS_FAILED(rv))
return rv;
return NS_OK;
}
@ -148,8 +117,6 @@ nsCocoaBrowserService::BrowserClosed()
if (sCanTerminate && sNumBrowsers == 0) {
// The app is terminating *and* our count dropped to 0.
NS_IF_RELEASE(sSingleton);
nsCOMPtr<nsIPrefService> pref(do_GetService("@mozilla.org/preferences-service;1"));
pref->SavePrefFile(nsnull);
NS_TermEmbedding();
printf("Shutting down embedding!\n");
}

70
camino/projects/Chimera.pbproj/project.pbxproj
Просмотреть файл

@ -14,6 +14,7 @@
F5DE10EB0209DC0601A967DF,
F51B70B7026EC98B01A80166,
F5AE04BA0206A4FE01A967DF,
F52D5CD8027D3D5001A80166,
F6BA6D4E01B2F8A601A962F7,
F56769FB0208F74A010001CA,
F507BA4C0213AFF701D93544,
@ -64,6 +65,9 @@
children = (
1058C7A1FEA54F0111CA2CBB,
F557193A022B4102010001CA,
F52D5CDB027D412A01A80166,
F52D5CDC027D412A01A80166,
F52D5CDD027D412A01A80166,
);
isa = PBXGroup;
name = "Linked Frameworks";
@ -256,7 +260,7 @@
);
buildSettings = {
DEBUGGING_SYMBOLS = NO;
FRAMEWORK_SEARCH_PATHS = ../embedding/browser/cocoa/src/build;
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "../dist/include/webbrwsr ../dist/include/dom ../dist/include/nspr ../dist/include/string ../dist/include/rdf ../dist/include/necko ../dist/include/find ../dist/include/embed_base ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/docshell ../dist/include/profile ../dist/include/layout ../dist/include/content ../dist/include/webbrowserpersist ../dist/include/pref ../dist/include/mimetype ../dist/include/shistory ../dist/include/view ../dist/include/gfx ../dist/include/xultmpl ../dist/include/xmlextras ../dist/include/htmlparser ../dist/include/locale ../dist/include/unicharutil ../dist/include/appcomps ../dist/include/xpcom";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util ../modules/zlib/src";
@ -395,6 +399,7 @@
F541496002711B0101A80166,
F52D5CD1027A887001A80166,
F52D5CD5027A88C601A80166,
F52D5CD9027D3D5001A80166,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@ -486,6 +491,7 @@
F541496102711B0101A80166,
F52D5CD2027A887001A80166,
F52D5CD6027A88C601A80166,
F52D5CDA027D3D5001A80166,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@ -506,6 +512,9 @@
F57F0F4A0209DF5301A967DF,
F557193B022B4103010001CA,
F5C2CDA802383CE701A967DF,
F52D5CDE027D412A01A80166,
F52D5CDF027D412A01A80166,
F52D5CE0027D412A01A80166,
);
isa = PBXFrameworksBuildPhase;
name = "Frameworks & Libraries";
@ -877,6 +886,7 @@
F5125A110202064D01FAFD9F,
F5AE04B20206A34801A967DF,
F5AE04B60206A37C01A967DF,
F52D5CD7027D3D5001A80166,
F507BA480213AD5F01D93544,
F57074B5026BA85F01A80166,
F57074B9026BFD0101A80166,
@ -1414,6 +1424,64 @@
settings = {
};
};
F52D5CD7027D3D5001A80166 = {
isa = PBXFileReference;
path = CHPreferenceManager.h;
refType = 4;
};
F52D5CD8027D3D5001A80166 = {
isa = PBXFileReference;
path = CHPreferenceManager.mm;
refType = 4;
};
F52D5CD9027D3D5001A80166 = {
fileRef = F52D5CD7027D3D5001A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDA027D3D5001A80166 = {
fileRef = F52D5CD8027D3D5001A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDB027D412A01A80166 = {
isa = PBXFrameworkReference;
name = Carbon.framework;
path = /System/Library/Frameworks/Carbon.framework;
refType = 0;
};
F52D5CDC027D412A01A80166 = {
isa = PBXFrameworkReference;
name = CoreFoundation.framework;
path = /System/Library/Frameworks/CoreFoundation.framework;
refType = 0;
};
F52D5CDD027D412A01A80166 = {
isa = PBXFrameworkReference;
name = SystemConfiguration.framework;
path = /System/Library/Frameworks/SystemConfiguration.framework;
refType = 0;
};
F52D5CDE027D412A01A80166 = {
fileRef = F52D5CDB027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDF027D412A01A80166 = {
fileRef = F52D5CDC027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CE0027D412A01A80166 = {
fileRef = F52D5CDD027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F538DFAE023B36A7010001CA = {
children = (
F538DFAF023B3739010001CA,

3
camino/src/application/MainController.h
Просмотреть файл

@ -40,6 +40,7 @@
#import "MVPreferencesController.h"
#import "CHSplashScreenWindow.h"
#import "FindDlgController.h"
#import "CHPreferenceManager.h"
class BookmarksService;
@ -60,6 +61,8 @@ class BookmarksService;
CHSplashScreenWindow *mSplashScreen;
CHPreferenceManager* mPreferenceManager;
BookmarksService *mMenuBookmarks;
FindDlgController* mFindDialog;

7
camino/src/application/MainController.mm
Просмотреть файл

@ -64,11 +64,14 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
{
[super dealloc];
[mFindDialog release];
[mPreferenceManager release];
printf("Main controller died.\n");
}
-(void)awakeFromNib
{
{
mPreferenceManager = [[CHPreferenceManager alloc] init];
[self newWindow: self];
[mSplashScreen close];
@ -104,7 +107,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
[[mainWindow windowController] autosaveWindowFrame];
// Now open the new window.
BrowserWindowController* controller = [self openBrowserWindowWithURLString:@"about:blank"];
BrowserWindowController* controller = [self openBrowserWindowWithURLString: [mPreferenceManager homePage]];
[controller focusURLBar];
}

33
camino/src/embedding/CHBrowserService.mm
Просмотреть файл

@ -74,15 +74,6 @@ nsCocoaBrowserService::InitEmbedding()
if (sSingleton)
return NS_OK;
// XXX Temporary hack to make sure we find the
// right executable directory
NSBundle* mainBundle = [NSBundle mainBundle];
NSString* path = [mainBundle bundlePath];
NSMutableString* mutablePath = [NSMutableString stringWithString:path];
[mutablePath appendString:@"/Contents/MacOS/"];
const char* cstr = [mutablePath cString];
setenv("MOZILLA_FIVE_HOME", cstr, 1);
sSingleton = new nsCocoaBrowserService();
if (!sSingleton) {
return NS_ERROR_OUT_OF_MEMORY;
@ -116,28 +107,6 @@ nsCocoaBrowserService::InitEmbedding()
watcher->SetWindowCreator(sSingleton);
// Set the profile which the control will use
nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv));
if (NS_FAILED(rv))
return rv;
// Make a new default profile for the control if none exists.
nsAutoString newProfileName(NS_LITERAL_STRING("Chimera"));
PRBool profileExists = PR_FALSE;
rv = profileService->ProfileExists(newProfileName.get(), &profileExists);
if (NS_FAILED(rv))
return rv;
if (!profileExists) {
rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
if (NS_FAILED(rv))
return rv;
}
rv = profileService->SetCurrentProfile(newProfileName.get());
if (NS_FAILED(rv))
return rv;
return NS_OK;
}
@ -148,8 +117,6 @@ nsCocoaBrowserService::BrowserClosed()
if (sCanTerminate && sNumBrowsers == 0) {
// The app is terminating *and* our count dropped to 0.
NS_IF_RELEASE(sSingleton);
nsCOMPtr<nsIPrefService> pref(do_GetService("@mozilla.org/preferences-service;1"));
pref->SavePrefFile(nsnull);
NS_TermEmbedding();
printf("Shutting down embedding!\n");
}

4
camino/src/preferences/PreferenceManager.h
Просмотреть файл

@ -1,5 +1,5 @@
//
// PreferenceManager.h
// CHPreferenceManager.h
// Chimera
//
// Created by William Dell Wisner on Wed Apr 17 2002.
@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import <Carbon/Carbon.h>
@interface PreferenceManager : NSObject {
@interface CHPreferenceManager : NSObject {
NSUserDefaults *defaults;
ICInstance internetConfig;
}

2
camino/src/preferences/PreferenceManager.mm
Просмотреть файл

@ -12,7 +12,7 @@
extern const char *prefContractID;
@implementation PreferenceManager
@implementation CHPreferenceManager
- (id) init
{

4
chimera/CHPreferenceManager.h
Просмотреть файл

@ -1,5 +1,5 @@
//
// PreferenceManager.h
// CHPreferenceManager.h
// Chimera
//
// Created by William Dell Wisner on Wed Apr 17 2002.
@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import <Carbon/Carbon.h>
@interface PreferenceManager : NSObject {
@interface CHPreferenceManager : NSObject {
NSUserDefaults *defaults;
ICInstance internetConfig;
}

2
chimera/CHPreferenceManager.mm
Просмотреть файл

@ -12,7 +12,7 @@
extern const char *prefContractID;
@implementation PreferenceManager
@implementation CHPreferenceManager
- (id) init
{

70
chimera/Chimera.pbproj/project.pbxproj
Просмотреть файл

@ -14,6 +14,7 @@
F5DE10EB0209DC0601A967DF,
F51B70B7026EC98B01A80166,
F5AE04BA0206A4FE01A967DF,
F52D5CD8027D3D5001A80166,
F6BA6D4E01B2F8A601A962F7,
F56769FB0208F74A010001CA,
F507BA4C0213AFF701D93544,
@ -64,6 +65,9 @@
children = (
1058C7A1FEA54F0111CA2CBB,
F557193A022B4102010001CA,
F52D5CDB027D412A01A80166,
F52D5CDC027D412A01A80166,
F52D5CDD027D412A01A80166,
);
isa = PBXGroup;
name = "Linked Frameworks";
@ -256,7 +260,7 @@
);
buildSettings = {
DEBUGGING_SYMBOLS = NO;
FRAMEWORK_SEARCH_PATHS = ../embedding/browser/cocoa/src/build;
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "../dist/include/webbrwsr ../dist/include/dom ../dist/include/nspr ../dist/include/string ../dist/include/rdf ../dist/include/necko ../dist/include/find ../dist/include/embed_base ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/docshell ../dist/include/profile ../dist/include/layout ../dist/include/content ../dist/include/webbrowserpersist ../dist/include/pref ../dist/include/mimetype ../dist/include/shistory ../dist/include/view ../dist/include/gfx ../dist/include/xultmpl ../dist/include/xmlextras ../dist/include/htmlparser ../dist/include/locale ../dist/include/unicharutil ../dist/include/appcomps ../dist/include/xpcom";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util ../modules/zlib/src";
@ -395,6 +399,7 @@
F541496002711B0101A80166,
F52D5CD1027A887001A80166,
F52D5CD5027A88C601A80166,
F52D5CD9027D3D5001A80166,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@ -486,6 +491,7 @@
F541496102711B0101A80166,
F52D5CD2027A887001A80166,
F52D5CD6027A88C601A80166,
F52D5CDA027D3D5001A80166,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@ -506,6 +512,9 @@
F57F0F4A0209DF5301A967DF,
F557193B022B4103010001CA,
F5C2CDA802383CE701A967DF,
F52D5CDE027D412A01A80166,
F52D5CDF027D412A01A80166,
F52D5CE0027D412A01A80166,
);
isa = PBXFrameworksBuildPhase;
name = "Frameworks & Libraries";
@ -877,6 +886,7 @@
F5125A110202064D01FAFD9F,
F5AE04B20206A34801A967DF,
F5AE04B60206A37C01A967DF,
F52D5CD7027D3D5001A80166,
F507BA480213AD5F01D93544,
F57074B5026BA85F01A80166,
F57074B9026BFD0101A80166,
@ -1414,6 +1424,64 @@
settings = {
};
};
F52D5CD7027D3D5001A80166 = {
isa = PBXFileReference;
path = CHPreferenceManager.h;
refType = 4;
};
F52D5CD8027D3D5001A80166 = {
isa = PBXFileReference;
path = CHPreferenceManager.mm;
refType = 4;
};
F52D5CD9027D3D5001A80166 = {
fileRef = F52D5CD7027D3D5001A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDA027D3D5001A80166 = {
fileRef = F52D5CD8027D3D5001A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDB027D412A01A80166 = {
isa = PBXFrameworkReference;
name = Carbon.framework;
path = /System/Library/Frameworks/Carbon.framework;
refType = 0;
};
F52D5CDC027D412A01A80166 = {
isa = PBXFrameworkReference;
name = CoreFoundation.framework;
path = /System/Library/Frameworks/CoreFoundation.framework;
refType = 0;
};
F52D5CDD027D412A01A80166 = {
isa = PBXFrameworkReference;
name = SystemConfiguration.framework;
path = /System/Library/Frameworks/SystemConfiguration.framework;
refType = 0;
};
F52D5CDE027D412A01A80166 = {
fileRef = F52D5CDB027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDF027D412A01A80166 = {
fileRef = F52D5CDC027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CE0027D412A01A80166 = {
fileRef = F52D5CDD027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F538DFAE023B36A7010001CA = {
children = (
F538DFAF023B3739010001CA,

3
chimera/MainController.h
Просмотреть файл

@ -40,6 +40,7 @@
#import "MVPreferencesController.h"
#import "CHSplashScreenWindow.h"
#import "FindDlgController.h"
#import "CHPreferenceManager.h"
class BookmarksService;
@ -60,6 +61,8 @@ class BookmarksService;
CHSplashScreenWindow *mSplashScreen;
CHPreferenceManager* mPreferenceManager;
BookmarksService *mMenuBookmarks;
FindDlgController* mFindDialog;

7
chimera/MainController.mm
Просмотреть файл

@ -64,11 +64,14 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
{
[super dealloc];
[mFindDialog release];
[mPreferenceManager release];
printf("Main controller died.\n");
}
-(void)awakeFromNib
{
{
mPreferenceManager = [[CHPreferenceManager alloc] init];
[self newWindow: self];
[mSplashScreen close];
@ -104,7 +107,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
[[mainWindow windowController] autosaveWindowFrame];
// Now open the new window.
BrowserWindowController* controller = [self openBrowserWindowWithURLString:@"about:blank"];
BrowserWindowController* controller = [self openBrowserWindowWithURLString: [mPreferenceManager homePage]];
[controller focusURLBar];
}

33
chimera/nsCocoaBrowserService.mm
Просмотреть файл

@ -74,15 +74,6 @@ nsCocoaBrowserService::InitEmbedding()
if (sSingleton)
return NS_OK;
// XXX Temporary hack to make sure we find the
// right executable directory
NSBundle* mainBundle = [NSBundle mainBundle];
NSString* path = [mainBundle bundlePath];
NSMutableString* mutablePath = [NSMutableString stringWithString:path];
[mutablePath appendString:@"/Contents/MacOS/"];
const char* cstr = [mutablePath cString];
setenv("MOZILLA_FIVE_HOME", cstr, 1);
sSingleton = new nsCocoaBrowserService();
if (!sSingleton) {
return NS_ERROR_OUT_OF_MEMORY;
@ -116,28 +107,6 @@ nsCocoaBrowserService::InitEmbedding()
watcher->SetWindowCreator(sSingleton);
// Set the profile which the control will use
nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv));
if (NS_FAILED(rv))
return rv;
// Make a new default profile for the control if none exists.
nsAutoString newProfileName(NS_LITERAL_STRING("Chimera"));
PRBool profileExists = PR_FALSE;
rv = profileService->ProfileExists(newProfileName.get(), &profileExists);
if (NS_FAILED(rv))
return rv;
if (!profileExists) {
rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
if (NS_FAILED(rv))
return rv;
}
rv = profileService->SetCurrentProfile(newProfileName.get());
if (NS_FAILED(rv))
return rv;
return NS_OK;
}
@ -148,8 +117,6 @@ nsCocoaBrowserService::BrowserClosed()
if (sCanTerminate && sNumBrowsers == 0) {
// The app is terminating *and* our count dropped to 0.
NS_IF_RELEASE(sSingleton);
nsCOMPtr<nsIPrefService> pref(do_GetService("@mozilla.org/preferences-service;1"));
pref->SavePrefFile(nsnull);
NS_TermEmbedding();
printf("Shutting down embedding!\n");
}

70
chimera/projects/Chimera.pbproj/project.pbxproj
Просмотреть файл

@ -14,6 +14,7 @@
F5DE10EB0209DC0601A967DF,
F51B70B7026EC98B01A80166,
F5AE04BA0206A4FE01A967DF,
F52D5CD8027D3D5001A80166,
F6BA6D4E01B2F8A601A962F7,
F56769FB0208F74A010001CA,
F507BA4C0213AFF701D93544,
@ -64,6 +65,9 @@
children = (
1058C7A1FEA54F0111CA2CBB,
F557193A022B4102010001CA,
F52D5CDB027D412A01A80166,
F52D5CDC027D412A01A80166,
F52D5CDD027D412A01A80166,
);
isa = PBXGroup;
name = "Linked Frameworks";
@ -256,7 +260,7 @@
);
buildSettings = {
DEBUGGING_SYMBOLS = NO;
FRAMEWORK_SEARCH_PATHS = ../embedding/browser/cocoa/src/build;
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "../dist/include/webbrwsr ../dist/include/dom ../dist/include/nspr ../dist/include/string ../dist/include/rdf ../dist/include/necko ../dist/include/find ../dist/include/embed_base ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/docshell ../dist/include/profile ../dist/include/layout ../dist/include/content ../dist/include/webbrowserpersist ../dist/include/pref ../dist/include/mimetype ../dist/include/shistory ../dist/include/view ../dist/include/gfx ../dist/include/xultmpl ../dist/include/xmlextras ../dist/include/htmlparser ../dist/include/locale ../dist/include/unicharutil ../dist/include/appcomps ../dist/include/xpcom";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util ../modules/zlib/src";
@ -395,6 +399,7 @@
F541496002711B0101A80166,
F52D5CD1027A887001A80166,
F52D5CD5027A88C601A80166,
F52D5CD9027D3D5001A80166,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@ -486,6 +491,7 @@
F541496102711B0101A80166,
F52D5CD2027A887001A80166,
F52D5CD6027A88C601A80166,
F52D5CDA027D3D5001A80166,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@ -506,6 +512,9 @@
F57F0F4A0209DF5301A967DF,
F557193B022B4103010001CA,
F5C2CDA802383CE701A967DF,
F52D5CDE027D412A01A80166,
F52D5CDF027D412A01A80166,
F52D5CE0027D412A01A80166,
);
isa = PBXFrameworksBuildPhase;
name = "Frameworks & Libraries";
@ -877,6 +886,7 @@
F5125A110202064D01FAFD9F,
F5AE04B20206A34801A967DF,
F5AE04B60206A37C01A967DF,
F52D5CD7027D3D5001A80166,
F507BA480213AD5F01D93544,
F57074B5026BA85F01A80166,
F57074B9026BFD0101A80166,
@ -1414,6 +1424,64 @@
settings = {
};
};
F52D5CD7027D3D5001A80166 = {
isa = PBXFileReference;
path = CHPreferenceManager.h;
refType = 4;
};
F52D5CD8027D3D5001A80166 = {
isa = PBXFileReference;
path = CHPreferenceManager.mm;
refType = 4;
};
F52D5CD9027D3D5001A80166 = {
fileRef = F52D5CD7027D3D5001A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDA027D3D5001A80166 = {
fileRef = F52D5CD8027D3D5001A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDB027D412A01A80166 = {
isa = PBXFrameworkReference;
name = Carbon.framework;
path = /System/Library/Frameworks/Carbon.framework;
refType = 0;
};
F52D5CDC027D412A01A80166 = {
isa = PBXFrameworkReference;
name = CoreFoundation.framework;
path = /System/Library/Frameworks/CoreFoundation.framework;
refType = 0;
};
F52D5CDD027D412A01A80166 = {
isa = PBXFrameworkReference;
name = SystemConfiguration.framework;
path = /System/Library/Frameworks/SystemConfiguration.framework;
refType = 0;
};
F52D5CDE027D412A01A80166 = {
fileRef = F52D5CDB027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CDF027D412A01A80166 = {
fileRef = F52D5CDC027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F52D5CE0027D412A01A80166 = {
fileRef = F52D5CDD027D412A01A80166;
isa = PBXBuildFile;
settings = {
};
};
F538DFAE023B36A7010001CA = {
children = (
F538DFAF023B3739010001CA,

3
chimera/src/application/MainController.h
Просмотреть файл

@ -40,6 +40,7 @@
#import "MVPreferencesController.h"
#import "CHSplashScreenWindow.h"
#import "FindDlgController.h"
#import "CHPreferenceManager.h"
class BookmarksService;
@ -60,6 +61,8 @@ class BookmarksService;
CHSplashScreenWindow *mSplashScreen;
CHPreferenceManager* mPreferenceManager;
BookmarksService *mMenuBookmarks;
FindDlgController* mFindDialog;

7
chimera/src/application/MainController.mm
Просмотреть файл

@ -64,11 +64,14 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
{
[super dealloc];
[mFindDialog release];
[mPreferenceManager release];
printf("Main controller died.\n");
}
-(void)awakeFromNib
{
{
mPreferenceManager = [[CHPreferenceManager alloc] init];
[self newWindow: self];
[mSplashScreen close];
@ -104,7 +107,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
[[mainWindow windowController] autosaveWindowFrame];
// Now open the new window.
BrowserWindowController* controller = [self openBrowserWindowWithURLString:@"about:blank"];
BrowserWindowController* controller = [self openBrowserWindowWithURLString: [mPreferenceManager homePage]];
[controller focusURLBar];
}

33
chimera/src/embedding/CHBrowserService.mm
Просмотреть файл

@ -74,15 +74,6 @@ nsCocoaBrowserService::InitEmbedding()
if (sSingleton)
return NS_OK;
// XXX Temporary hack to make sure we find the
// right executable directory
NSBundle* mainBundle = [NSBundle mainBundle];
NSString* path = [mainBundle bundlePath];
NSMutableString* mutablePath = [NSMutableString stringWithString:path];
[mutablePath appendString:@"/Contents/MacOS/"];
const char* cstr = [mutablePath cString];
setenv("MOZILLA_FIVE_HOME", cstr, 1);
sSingleton = new nsCocoaBrowserService();
if (!sSingleton) {
return NS_ERROR_OUT_OF_MEMORY;
@ -116,28 +107,6 @@ nsCocoaBrowserService::InitEmbedding()
watcher->SetWindowCreator(sSingleton);
// Set the profile which the control will use
nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv));
if (NS_FAILED(rv))
return rv;
// Make a new default profile for the control if none exists.
nsAutoString newProfileName(NS_LITERAL_STRING("Chimera"));
PRBool profileExists = PR_FALSE;
rv = profileService->ProfileExists(newProfileName.get(), &profileExists);
if (NS_FAILED(rv))
return rv;
if (!profileExists) {
rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
if (NS_FAILED(rv))
return rv;
}
rv = profileService->SetCurrentProfile(newProfileName.get());
if (NS_FAILED(rv))
return rv;
return NS_OK;
}
@ -148,8 +117,6 @@ nsCocoaBrowserService::BrowserClosed()
if (sCanTerminate && sNumBrowsers == 0) {
// The app is terminating *and* our count dropped to 0.
NS_IF_RELEASE(sSingleton);
nsCOMPtr<nsIPrefService> pref(do_GetService("@mozilla.org/preferences-service;1"));
pref->SavePrefFile(nsnull);
NS_TermEmbedding();
printf("Shutting down embedding!\n");
}

4
chimera/src/preferences/PreferenceManager.h
Просмотреть файл

@ -1,5 +1,5 @@
//
// PreferenceManager.h
// CHPreferenceManager.h
// Chimera
//
// Created by William Dell Wisner on Wed Apr 17 2002.
@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import <Carbon/Carbon.h>
@interface PreferenceManager : NSObject {
@interface CHPreferenceManager : NSObject {
NSUserDefaults *defaults;
ICInstance internetConfig;
}

2
chimera/src/preferences/PreferenceManager.mm
Просмотреть файл

@ -12,7 +12,7 @@
extern const char *prefContractID;
@implementation PreferenceManager
@implementation CHPreferenceManager
- (id) init
{