From 1039b9d52339a67ecdb9f2cf0329b4b01adfd4e2 Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Wed, 21 Aug 2002 02:06:38 +0000 Subject: [PATCH] Updating files for the new class names ('CH' for Gecko-embedding wrapper, all other classes have no prefix). git-svn-id: svn://10.0.0.236/trunk@127745 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/Chimera.pbproj/project.pbxproj | 2208 ++++++++--------- .../BrowserWindow.nib/classes.nib | 71 +- .../English.lproj/BrowserWindow.nib/info.nib | 8 +- .../BrowserWindow.nib/objects.nib | Bin 14687 -> 14664 bytes .../English.lproj/MainMenu.nib/classes.nib | 2 +- .../English.lproj/MainMenu.nib/objects.nib | Bin 9885 -> 9928 bytes .../PreferencePanes/Navigation/Navigation.mm | 2 +- .../PreferencePanes/Privacy/PrivacyPane.mm | 2 +- .../application/Navigator.scriptSuite | 4 +- .../BrowserWindow.nib/classes.nib | 71 +- .../English.lproj/BrowserWindow.nib/info.nib | 8 +- .../BrowserWindow.nib/objects.nib | Bin 14687 -> 14664 bytes .../English.lproj/MainMenu.nib/classes.nib | 2 +- .../English.lproj/MainMenu.nib/objects.nib | Bin 9885 -> 9928 bytes .../camino/src/appleevents/GetURLCommand.h | 2 +- .../camino/src/appleevents/GetURLCommand.mm | 4 +- mozilla/camino/src/application/AboutBox.h | 4 +- mozilla/camino/src/application/AboutBox.m | 10 +- .../camino/src/application/MainController.h | 10 +- .../camino/src/application/MainController.mm | 16 +- .../src/application/SplashScreenWindow.h | 2 +- .../src/application/SplashScreenWindow.m | 6 +- .../camino/src/bookmarks/BookmarksButton.h | 2 +- .../camino/src/bookmarks/BookmarksButton.mm | 6 +- .../src/bookmarks/BookmarksDataSource.h | 4 +- .../src/bookmarks/BookmarksOutlineView.h | 4 +- .../src/bookmarks/BookmarksOutlineView.mm | 4 +- .../camino/src/bookmarks/BookmarksService.h | 8 +- .../camino/src/bookmarks/BookmarksService.mm | 8 +- .../camino/src/bookmarks/BookmarksToolbar.h | 6 +- .../camino/src/bookmarks/BookmarksToolbar.mm | 30 +- .../src/browser/AutoCompleteDataSource.h | 6 +- .../src/browser/AutoCompleteDataSource.mm | 4 +- .../src/browser/AutoCompleteTextField.h | 10 +- .../src/browser/AutoCompleteTextField.mm | 14 +- mozilla/camino/src/browser/BrowserTabView.mm | 2 +- .../camino/src/browser/BrowserTabViewItem.h | 6 +- mozilla/camino/src/browser/BrowserWindow.mm | 2 +- .../src/browser/BrowserWindowController.h | 28 +- .../src/browser/BrowserWindowController.mm | 52 +- mozilla/camino/src/browser/BrowserWrapper.h | 2 +- mozilla/camino/src/browser/BrowserWrapper.mm | 18 +- .../camino/src/browser/CocoaPromptService.mm | 18 +- .../src/browser/ContentClickListener.mm | 6 +- mozilla/camino/src/browser/GoMenu.h | 2 +- mozilla/camino/src/browser/GoMenu.mm | 8 +- mozilla/camino/src/browser/LocationBar.h | 2 +- mozilla/camino/src/browser/LocationBar.mm | 4 +- mozilla/camino/src/browser/PageProxyIcon.h | 2 +- mozilla/camino/src/browser/PageProxyIcon.mm | 4 +- mozilla/camino/src/browser/SecurityDialogs.mm | 10 +- .../camino/src/browser/nsAlertController.mm | 4 +- .../src/download/ProgressDlgController.h | 4 +- .../src/download/ProgressDlgController.mm | 8 +- .../camino/src/download/nsDownloadListener.h | 2 +- .../camino/src/embedding/CHBrowserListener.h | 8 +- .../camino/src/embedding/CHBrowserListener.mm | 76 +- .../camino/src/embedding/CHBrowserService.h | 8 +- .../camino/src/embedding/CHBrowserService.mm | 46 +- mozilla/camino/src/embedding/CHBrowserView.h | 6 +- mozilla/camino/src/embedding/CHBrowserView.mm | 14 +- .../src/embedding/CHDownloadFactories.mm | 4 +- .../src/embedding/CHDownloadProgressDisplay.h | 10 +- .../embedding/CHDownloadProgressDisplay.mm | 4 +- .../src/extensions/ExtendedOutlineView.h | 2 +- .../src/extensions/ExtendedOutlineView.mm | 8 +- mozilla/camino/src/extensions/GeckoUtils.h | 2 +- .../camino/src/extensions/IconTabViewItem.h | 2 +- .../camino/src/extensions/IconTabViewItem.mm | 6 +- .../camino/src/extensions/ImageAdditions.h | 2 +- .../camino/src/extensions/ImageAdditions.m | 4 +- .../src/extensions/RDFOutlineViewDataSource.h | 2 +- .../extensions/RDFOutlineViewDataSource.mm | 4 +- .../camino/src/extensions/ToolbarAdditions.m | 2 +- mozilla/camino/src/find/Find.h | 4 +- mozilla/camino/src/find/FindDlgController.mm | 10 +- .../camino/src/history/HistoryDataSource.h | 6 +- .../camino/src/history/HistoryDataSource.mm | 6 +- .../preferences/MVPreferencesController.mm | 8 +- .../MVPreferencesMultipleIconView.m | 2 +- .../src/preferences/PreferenceManager.h | 4 +- .../src/preferences/PreferenceManager.mm | 12 +- .../chimera/Chimera.pbproj/project.pbxproj | 2208 ++++++++--------- .../BrowserWindow.nib/classes.nib | 71 +- .../English.lproj/BrowserWindow.nib/info.nib | 8 +- .../BrowserWindow.nib/objects.nib | Bin 14687 -> 14664 bytes .../English.lproj/MainMenu.nib/classes.nib | 2 +- .../English.lproj/MainMenu.nib/objects.nib | Bin 9885 -> 9928 bytes .../PreferencePanes/Navigation/Navigation.mm | 2 +- .../PreferencePanes/Privacy/PrivacyPane.mm | 2 +- .../application/Navigator.scriptSuite | 4 +- .../BrowserWindow.nib/classes.nib | 71 +- .../English.lproj/BrowserWindow.nib/info.nib | 8 +- .../BrowserWindow.nib/objects.nib | Bin 14687 -> 14664 bytes .../English.lproj/MainMenu.nib/classes.nib | 2 +- .../English.lproj/MainMenu.nib/objects.nib | Bin 9885 -> 9928 bytes .../chimera/src/appleevents/GetURLCommand.h | 2 +- .../chimera/src/appleevents/GetURLCommand.mm | 4 +- mozilla/chimera/src/application/AboutBox.h | 4 +- mozilla/chimera/src/application/AboutBox.m | 10 +- .../chimera/src/application/MainController.h | 10 +- .../chimera/src/application/MainController.mm | 16 +- .../src/application/SplashScreenWindow.h | 2 +- .../src/application/SplashScreenWindow.m | 6 +- .../chimera/src/bookmarks/BookmarksButton.h | 2 +- .../chimera/src/bookmarks/BookmarksButton.mm | 6 +- .../src/bookmarks/BookmarksDataSource.h | 4 +- .../src/bookmarks/BookmarksOutlineView.h | 4 +- .../src/bookmarks/BookmarksOutlineView.mm | 4 +- .../chimera/src/bookmarks/BookmarksService.h | 8 +- .../chimera/src/bookmarks/BookmarksService.mm | 8 +- .../chimera/src/bookmarks/BookmarksToolbar.h | 6 +- .../chimera/src/bookmarks/BookmarksToolbar.mm | 30 +- .../src/browser/AutoCompleteDataSource.h | 6 +- .../src/browser/AutoCompleteDataSource.mm | 4 +- .../src/browser/AutoCompleteTextField.h | 10 +- .../src/browser/AutoCompleteTextField.mm | 14 +- mozilla/chimera/src/browser/BrowserTabView.mm | 2 +- .../chimera/src/browser/BrowserTabViewItem.h | 6 +- mozilla/chimera/src/browser/BrowserWindow.mm | 2 +- .../src/browser/BrowserWindowController.h | 28 +- .../src/browser/BrowserWindowController.mm | 52 +- mozilla/chimera/src/browser/BrowserWrapper.h | 2 +- mozilla/chimera/src/browser/BrowserWrapper.mm | 18 +- .../chimera/src/browser/CocoaPromptService.mm | 18 +- .../src/browser/ContentClickListener.mm | 6 +- mozilla/chimera/src/browser/GoMenu.h | 2 +- mozilla/chimera/src/browser/GoMenu.mm | 8 +- mozilla/chimera/src/browser/LocationBar.h | 2 +- mozilla/chimera/src/browser/LocationBar.mm | 4 +- mozilla/chimera/src/browser/PageProxyIcon.h | 2 +- mozilla/chimera/src/browser/PageProxyIcon.mm | 4 +- .../chimera/src/browser/SecurityDialogs.mm | 10 +- .../chimera/src/browser/nsAlertController.mm | 4 +- .../src/download/ProgressDlgController.h | 4 +- .../src/download/ProgressDlgController.mm | 8 +- .../chimera/src/download/nsDownloadListener.h | 2 +- .../chimera/src/embedding/CHBrowserListener.h | 8 +- .../src/embedding/CHBrowserListener.mm | 76 +- .../chimera/src/embedding/CHBrowserService.h | 8 +- .../chimera/src/embedding/CHBrowserService.mm | 46 +- mozilla/chimera/src/embedding/CHBrowserView.h | 6 +- .../chimera/src/embedding/CHBrowserView.mm | 14 +- .../src/embedding/CHDownloadFactories.mm | 4 +- .../src/embedding/CHDownloadProgressDisplay.h | 10 +- .../embedding/CHDownloadProgressDisplay.mm | 4 +- .../src/extensions/ExtendedOutlineView.h | 2 +- .../src/extensions/ExtendedOutlineView.mm | 8 +- mozilla/chimera/src/extensions/GeckoUtils.h | 2 +- .../chimera/src/extensions/IconTabViewItem.h | 2 +- .../chimera/src/extensions/IconTabViewItem.mm | 6 +- .../chimera/src/extensions/ImageAdditions.h | 2 +- .../chimera/src/extensions/ImageAdditions.m | 4 +- .../src/extensions/RDFOutlineViewDataSource.h | 2 +- .../extensions/RDFOutlineViewDataSource.mm | 4 +- .../chimera/src/extensions/ToolbarAdditions.m | 2 +- mozilla/chimera/src/find/Find.h | 4 +- mozilla/chimera/src/find/FindDlgController.mm | 10 +- .../chimera/src/history/HistoryDataSource.h | 6 +- .../chimera/src/history/HistoryDataSource.mm | 6 +- .../preferences/MVPreferencesController.mm | 8 +- .../MVPreferencesMultipleIconView.m | 2 +- .../src/preferences/PreferenceManager.h | 4 +- .../src/preferences/PreferenceManager.mm | 12 +- 164 files changed, 2850 insertions(+), 3118 deletions(-) diff --git a/mozilla/camino/Chimera.pbproj/project.pbxproj b/mozilla/camino/Chimera.pbproj/project.pbxproj index dfd250ed5f9..6ff2de3c10f 100644 --- a/mozilla/camino/Chimera.pbproj/project.pbxproj +++ b/mozilla/camino/Chimera.pbproj/project.pbxproj @@ -36,8 +36,8 @@ fileEncoding = 10; isa = PBXFileReference; name = English; - path = English.lproj/InfoPlist.strings; - refType = 4; + path = ../English.lproj/InfoPlist.strings; + refType = 2; }; 089C165EFE840E0CC02AAC07 = { fileRef = 089C165CFE840E0CC02AAC07; @@ -177,7 +177,6 @@ 29B97323FDCFA39411CA2CEA, 19C28FACFE9D520D11CA2CBB, F6BD637A01B30E0F01A962F7, - F50E1BA70207EB8201F281DF, ); isa = PBXGroup; name = Chimera; @@ -196,8 +195,9 @@ }; 29B97316FDCFA39411CA2CEA = { isa = PBXFileReference; - path = main.m; - refType = 4; + name = main.m; + path = ../src/application/main.m; + refType = 2; }; 29B97317FDCFA39411CA2CEA = { children = ( @@ -222,8 +222,9 @@ }; 29B97319FDCFA39411CA2CEA = { isa = PBXFileReference; - path = MainMenu.nib; - refType = 4; + name = English; + path = ../English.lproj/MainMenu.nib; + refType = 2; }; 29B97323FDCFA39411CA2CEA = { children = ( @@ -269,9 +270,9 @@ buildSettings = { DEBUGGING_SYMBOLS = NO; FRAMEWORK_SEARCH_PATHS = ""; - HEADER_SEARCH_PATHS = "../dist/include/exthandler ../dist/include/helperAppDlg ../dist/include/intl ../dist/include/pipboot ../dist/include/pipnss ../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/commandhandler ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/nkcache ../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/chrome ../dist/include/xpcom ../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\""; + HEADER_SEARCH_PATHS = "../../dist/include/exthandler ../../dist/include/helperAppDlg ../../dist/include/intl ../../dist/include/pipboot ../../dist/include/pipnss ../../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/commandhandler ../../dist/include/windowwatcher ../../dist/include/webshell ../../dist/include/widget ../../dist/include/uriloader ../../dist/include/nkcache ../../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/chrome ../../dist/include/xpcom ../../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\""; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../dist/Embed/components ../intl/unicharutil/util ../modules/zlib/src"; + LIBRARY_SEARCH_PATHS = "../../dist/bin ../../dist/lib ../../dist/Embed/components ../../intl/unicharutil/util ../../modules/zlib/src"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = "-fno-rtti -DOSTYPE=\\\"Darwin1.4\\\" -DOSARCH=\\\"Darwin\\\""; OTHER_LDFLAGS = "-lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -lm"; @@ -469,7 +470,6 @@ 2EEC3E63028138724B000102, 2E748B74029A448D4B000102, F53E012A02AEE91D01A967F3, - F53E013302AEEA2901A967F3, F632AF8502B9AEBB01000103, F59236C202C89ACA0100012B, F5A3669802CCFAF601DC3354, @@ -494,16 +494,16 @@ 29B97328FDCFA39411CA2CEA = { buildActionMask = 2147483647; files = ( - F518430702063A9001A966FE, + F507A84203116E1D01026D5D, 089C165EFE840E0CC02AAC07, F5555C8602022F070164C72B, F5555C8702022F070164C72B, F5555C8802022F070164C72B, F5555C8902022F070164C72B, F5547D61020333DA01F448B0, - F518430602063A8A01A966FE, + F507A84503116E5501026D5D, F51842FF020629B701A966FE, - F5173959020CE1E50189DA0C, + F507A84B03116E6E01026D5D, F5264FD4020D4C25010001CA, F5264FD5020D4C25010001CA, F5264FD6020D4C25010001CA, @@ -512,15 +512,15 @@ F5264FD9020D4C25010001CA, F5264FDA020D4C25010001CA, F55CCFD3020E98EA010001CA, - F528E217020FD5D80168DE43, + F507A84E03116E7401026D5D, F5568A8F0217C7F5010001CA, F5568A910217CA82010001CA, - F5247C2E02289FD9013DD99A, + F507A84803116E6901026D5D, F53F2206022B7C78010001CA, F53F2207022B7C78010001CA, - F53F2208022B7C78010001CA, - F585677E02382E97010001CA, - F568C3CE023A49C0010001CA, + F507A86203128A3D01026D5D, + F507A85403116EA401026D5D, + F507A85703116EBB01026D5D, F568C3D4023A4F71010001CA, F538DFB3023B3739010001CA, F538DFB4023B3739010001CA, @@ -545,7 +545,7 @@ F5179423028275B901A967DF, F540BD1B029ED15301026D5D, F540BD1D029ED17901026D5D, - F53E013002AEE9BD01A967F3, + F507A85103116E7901026D5D, F50EA34502BAAAB701000103, F50EA34602BAAAB701000103, F50EA34702BAAAB701000103, @@ -656,13 +656,15 @@ //2E4 2E2939FF027F33604B000102 = { isa = PBXFileReference; - path = CHPageProxyIcon.mm; - refType = 4; + name = PageProxyIcon.mm; + path = ../src/browser/PageProxyIcon.mm; + refType = 2; }; 2E293A00027F33604B000102 = { isa = PBXFileReference; - path = CHPageProxyIcon.h; - refType = 4; + name = PageProxyIcon.h; + path = ../src/browser/PageProxyIcon.h; + refType = 2; }; 2E293A01027F33604B000102 = { fileRef = 2E293A00027F33604B000102; @@ -678,13 +680,15 @@ }; 2E748B72029A448D4B000102 = { isa = PBXFileReference; - path = CHGoMenu.h; - refType = 4; + name = GoMenu.h; + path = ../src/browser/GoMenu.h; + refType = 2; }; 2E748B73029A448D4B000102 = { isa = PBXFileReference; - path = CHGoMenu.mm; - refType = 4; + name = GoMenu.mm; + path = ../src/browser/GoMenu.mm; + refType = 2; }; 2E748B74029A448D4B000102 = { fileRef = 2E748B72029A448D4B000102; @@ -700,13 +704,15 @@ }; 2EEC3E61028138714B000102 = { isa = PBXFileReference; - path = CHBookmarksOutlineView.h; - refType = 4; + name = BookmarksOutlineView.h; + path = ../src/bookmarks/BookmarksOutlineView.h; + refType = 2; }; 2EEC3E62028138714B000102 = { isa = PBXFileReference; - path = CHBookmarksOutlineView.mm; - refType = 4; + name = BookmarksOutlineView.mm; + path = ../src/bookmarks/BookmarksOutlineView.mm; + refType = 2; }; 2EEC3E63028138724B000102 = { fileRef = 2EEC3E61028138714B000102; @@ -764,7 +770,7 @@ F506477602AD7E2701A967F3 = { isa = PBXFileReference; name = libunicharutil.a; - path = ../intl/unicharutil/src/libunicharutil.a; + path = ../../intl/unicharutil/src/libunicharutil.a; refType = 2; }; F506477702AD7E2801A967F3 = { @@ -786,7 +792,7 @@ F507423C02AD808201A967F3 = { isa = PBXFileReference; name = libcrmf.a; - path = ../dist/lib/libcrmf.a; + path = ../../dist/lib/libcrmf.a; refType = 2; }; F507423D02AD808301A967F3 = { @@ -798,7 +804,7 @@ F507A82C030BFB7901026D5D = { isa = PBXFileReference; name = libuniversalchardet.dylib; - path = ../dist/Embed/components/libuniversalchardet.dylib; + path = ../../dist/Embed/components/libuniversalchardet.dylib; refType = 2; }; F507A82E030BFBB201026D5D = { @@ -813,10 +819,250 @@ settings = { }; }; + F507A84103116E1D01026D5D = { + children = ( + 29B97319FDCFA39411CA2CEA, + ); + isa = PBXVariantGroup; + name = MainMenu.nib; + refType = 4; + }; + F507A84203116E1D01026D5D = { + fileRef = F507A84103116E1D01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84303116E1D01026D5D = { + fileRef = F507A84103116E1D01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84403116E5501026D5D = { + children = ( + F51842FC0206176901A966FE, + ); + isa = PBXVariantGroup; + name = BrowserWindow.nib; + refType = 4; + }; + F507A84503116E5501026D5D = { + fileRef = F507A84403116E5501026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84603116E5501026D5D = { + fileRef = F507A84403116E5501026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84703116E6901026D5D = { + children = ( + F5247C2D02289FD9013DD99A, + ); + isa = PBXVariantGroup; + name = alert.nib; + refType = 4; + }; + F507A84803116E6901026D5D = { + fileRef = F507A84703116E6901026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84903116E6901026D5D = { + fileRef = F507A84703116E6901026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84A03116E6E01026D5D = { + children = ( + F5173958020CE1E50189DA0C, + ); + isa = PBXVariantGroup; + name = ProgressDialog.nib; + refType = 4; + }; + F507A84B03116E6E01026D5D = { + fileRef = F507A84A03116E6E01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84C03116E6E01026D5D = { + fileRef = F507A84A03116E6E01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84D03116E7401026D5D = { + children = ( + F528E216020FD5D80168DE43, + ); + isa = PBXVariantGroup; + name = FindDialog.nib; + refType = 4; + }; + F507A84E03116E7401026D5D = { + fileRef = F507A84D03116E7401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84F03116E7401026D5D = { + fileRef = F507A84D03116E7401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85003116E7901026D5D = { + children = ( + F53E012F02AEE9BD01A967F3, + ); + isa = PBXVariantGroup; + name = BookmarkInfoPanel.nib; + refType = 4; + }; + F507A85103116E7901026D5D = { + fileRef = F507A85003116E7901026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85203116E7901026D5D = { + fileRef = F507A85003116E7901026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85303116EA401026D5D = { + children = ( + F585677D02382E97010001CA, + ); + isa = PBXVariantGroup; + name = MVPreferences.nib; + refType = 4; + }; + F507A85403116EA401026D5D = { + fileRef = F507A85303116EA401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85503116EA401026D5D = { + fileRef = F507A85303116EA401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85603116EBB01026D5D = { + children = ( + F568C3CD023A49C0010001CA, + ); + isa = PBXVariantGroup; + name = AboutBox.nib; + refType = 4; + }; + F507A85703116EBB01026D5D = { + fileRef = F507A85603116EBB01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85803116EBC01026D5D = { + fileRef = F507A85603116EBB01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85903116FF301026D5D = { + children = ( + F5A8CE5002DFF167013CA8EC, + ); + isa = PBXVariantGroup; + name = Appearance.nib; + path = ../PreferencePanes/Appearance; + refType = 2; + }; + F507A85A03116FF301026D5D = { + fileRef = F507A85903116FF301026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85B0311895401026D5D = { + children = ( + F52627DA027E98A401000102, + ); + isa = PBXVariantGroup; + name = Navigation.nib; + refType = 4; + }; + F507A85C0311895401026D5D = { + fileRef = F507A85B0311895401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85D0311948201026D5D = { + children = ( + F57F205E029997E701000106, + ); + isa = PBXVariantGroup; + name = Privacy.nib; + path = ../PreferencePanes/Privacy; + refType = 2; + }; + F507A85E0311948201026D5D = { + fileRef = F507A85D0311948201026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85F031194B101026D5D = { + children = ( + F53F21FD022B7C77010001CA, + ); + isa = PBXVariantGroup; + name = Personal.nib; + path = ../PreferencePanes/Personal; + refType = 2; + }; + F507A860031194B101026D5D = { + fileRef = F507A85F031194B101026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A86103128A3D01026D5D = { + children = ( + F53F21EE022B7C77010001CA, + ); + isa = PBXVariantGroup; + name = MVPreferencePaneGroups.strings; + refType = 4; + }; + F507A86203128A3D01026D5D = { + fileRef = F507A86103128A3D01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A86303128A3D01026D5D = { + fileRef = F507A86103128A3D01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; F507BA480213AD5F01D93544 = { isa = PBXFileReference; - path = BookmarksService.h; - refType = 4; + name = BookmarksService.h; + path = ../src/bookmarks/BookmarksService.h; + refType = 2; }; F507BA4A0213AD5F01D93544 = { fileRef = F507BA480213AD5F01D93544; @@ -826,8 +1072,9 @@ }; F507BA4C0213AFF701D93544 = { isa = PBXFileReference; - path = BookmarksService.mm; - refType = 4; + name = BookmarksService.mm; + path = ../src/bookmarks/BookmarksService.mm; + refType = 2; }; F507BA4D0213AFF701D93544 = { fileRef = F507BA4C0213AFF701D93544; @@ -838,7 +1085,7 @@ F507BA4E0213BAC401D93544 = { isa = PBXFileReference; name = libxmlextras.dylib; - path = ../extensions/xmlextras/build/src/libxmlextras.dylib; + path = ../../extensions/xmlextras/build/src/libxmlextras.dylib; refType = 2; }; F507BA500213BB0B01D93544 = { @@ -868,7 +1115,8 @@ }; F507BA540213C29E01D93544 = { isa = PBXFileReference; - path = bookmarks.xml; + name = bookmarks.xml; + path = ../resources/application/bookmarks.xml; refType = 2; }; F507BA560213C29E01D93544 = { @@ -892,13 +1140,15 @@ }; F50D9DE202ECC2C601BB4219 = { isa = PBXFileReference; - path = nsDownloadListener.h; - refType = 4; + name = nsDownloadListener.h; + path = ../src/download/nsDownloadListener.h; + refType = 2; }; F50D9DE302ECC2C601BB4219 = { isa = PBXFileReference; - path = nsDownloadListener.mm; - refType = 4; + name = nsDownloadListener.mm; + path = ../src/download/nsDownloadListener.mm; + refType = 2; }; F50D9DE402ECC2C601BB4219 = { fileRef = F50D9DE202ECC2C601BB4219; @@ -942,13 +1192,15 @@ }; F50D9DED02EE0AB101BB4219 = { isa = PBXFileReference; - path = DownloadProgressDisplay.h; - refType = 4; + name = CHDownloadProgressDisplay.h; + path = ../src/embedding/CHDownloadProgressDisplay.h; + refType = 2; }; F50D9DEE02EE0AB101BB4219 = { isa = PBXFileReference; - path = DownloadProgressDisplay.mm; - refType = 4; + name = CHDownloadProgressDisplay.mm; + path = ../src/embedding/CHDownloadProgressDisplay.mm; + refType = 2; }; F50D9DEF02EE0AB101BB4219 = { fileRef = F50D9DED02EE0AB101BB4219; @@ -964,13 +1216,15 @@ }; F50D9DF102EE194001BB4219 = { isa = PBXFileReference; - path = DownloadFactories.h; - refType = 4; + name = CHDownloadFactories.h; + path = ../src/embedding/CHDownloadFactories.h; + refType = 2; }; F50D9DF202EE194001BB4219 = { isa = PBXFileReference; - path = DownloadFactories.mm; - refType = 4; + name = CHDownloadFactories.mm; + path = ../src/embedding/CHDownloadFactories.mm; + refType = 2; }; F50D9DF302EE194001BB4219 = { fileRef = F50D9DF102EE194001BB4219; @@ -986,13 +1240,15 @@ }; F50D9DF502EE2B9A01BB4219 = { isa = PBXFileReference; - path = SaveHeaderSniffer.h; - refType = 4; + name = SaveHeaderSniffer.h; + path = ../src/download/SaveHeaderSniffer.h; + refType = 2; }; F50D9DF602EE2B9A01BB4219 = { isa = PBXFileReference; - path = SaveHeaderSniffer.mm; - refType = 4; + name = SaveHeaderSniffer.mm; + path = ../src/download/SaveHeaderSniffer.mm; + refType = 2; }; F50D9DF702EE2B9B01BB4219 = { fileRef = F50D9DF502EE2B9A01BB4219; @@ -1032,7 +1288,7 @@ F50DCB4302C2856001A967F3 = { isa = PBXFileReference; name = libjsj.dylib; - path = ../js/src/liveconnect/libjsj.dylib; + path = ../../js/src/liveconnect/libjsj.dylib; refType = 2; }; F50DCB4402C2856101A967F3 = { @@ -1041,143 +1297,6 @@ settings = { }; }; - F50E1BA70207EB8201F281DF = { - children = ( - F5EA337802EF886D01A96654, - F5948A48029EB9C801000102, - F50E1BC90207F99201F281DF, - F50E1BBC0207F27B01F281DF, - F50E1BAE0207EE5F01F281DF, - ); - isa = PBXGroup; - name = "Mozilla Source Tree"; - refType = 4; - }; - F50E1BAE0207EE5F01F281DF = { - children = ( - F50E1BB20207EE9F01F281DF, - F50E1BAF0207EE5F01F281DF, - ); - isa = PBXGroup; - name = layout; - path = ""; - refType = 4; - }; - F50E1BAF0207EE5F01F281DF = { - children = ( - F50E1BB00207EE5F01F281DF, - ); - isa = PBXGroup; - name = html; - refType = 4; - }; - F50E1BB00207EE5F01F281DF = { - children = ( - F50E1BB10207EE5F01F281DF, - ); - isa = PBXGroup; - name = base; - refType = 4; - }; - F50E1BB10207EE5F01F281DF = { - children = ( - F50E1BB40207EE9F01F281DF, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F50E1BB20207EE9F01F281DF = { - children = ( - F50E1BB30207EE9F01F281DF, - ); - isa = PBXGroup; - name = base; - refType = 4; - }; - F50E1BB30207EE9F01F281DF = { - children = ( - F50E1BB50207EEDC01F281DF, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F50E1BB40207EE9F01F281DF = { - isa = PBXFileReference; - name = nsPresShell.cpp; - path = ../layout/html/base/src/nsPresShell.cpp; - refType = 2; - }; - F50E1BB50207EEDC01F281DF = { - isa = PBXFileReference; - name = nsPresContext.cpp; - path = ../layout/base/src/nsPresContext.cpp; - refType = 2; - }; - F50E1BBC0207F27B01F281DF = { - children = ( - F50E1BBD0207F27B01F281DF, - ); - isa = PBXGroup; - name = intl; - refType = 4; - }; - F50E1BBD0207F27B01F281DF = { - children = ( - F50E1BBE0207F27B01F281DF, - ); - isa = PBXGroup; - name = locale; - refType = 4; - }; - F50E1BBE0207F27B01F281DF = { - children = ( - F50E1BBF0207F2B701F281DF, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F50E1BBF0207F2B701F281DF = { - isa = PBXFileReference; - name = nsLanguageAtomService.cpp; - path = ../intl/locale/src/nsLanguageAtomService.cpp; - refType = 2; - }; - F50E1BC90207F99201F281DF = { - children = ( - F5C321D402CBD01C014E7D56, - F5C321D002CBCEF7014E7D56, - F50E1BCA0207F99201F281DF, - F51D9B0A020940C101A80166, - ); - isa = PBXGroup; - name = content; - refType = 4; - }; - F50E1BCA0207F99201F281DF = { - children = ( - F50E1BCB0207F99201F281DF, - ); - isa = PBXGroup; - name = base; - refType = 4; - }; - F50E1BCB0207F99201F281DF = { - children = ( - F50E1BCC0207F9B101F281DF, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F50E1BCC0207F9B101F281DF = { - isa = PBXFileReference; - name = nsRuleNode.cpp; - path = ../content/base/src/nsRuleNode.cpp; - refType = 2; - }; F50EA33D02BAAAB701000103 = { children = ( F50EA33E02BAAAB701000103, @@ -1189,43 +1308,51 @@ F50EA34402BAAAB701000103, ); isa = PBXGroup; - path = throbber; - refType = 4; + name = throbber; + path = ../resources/images/throbber; + refType = 2; }; F50EA33E02BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-01.gif"; - refType = 4; + name = "throbber-01.gif"; + path = "../resources/images/throbber/throbber-01.gif"; + refType = 2; }; F50EA33F02BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-02.gif"; - refType = 4; + name = "throbber-02.gif"; + path = "../resources/images/throbber/throbber-02.gif"; + refType = 2; }; F50EA34002BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-03.gif"; - refType = 4; + name = "throbber-03.gif"; + path = "../resources/images/throbber/throbber-03.gif"; + refType = 2; }; F50EA34102BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-04.gif"; - refType = 4; + name = "throbber-04.gif"; + path = "../resources/images/throbber/throbber-04.gif"; + refType = 2; }; F50EA34202BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-05.gif"; - refType = 4; + name = "throbber-05.gif"; + path = "../resources/images/throbber/throbber-05.gif"; + refType = 2; }; F50EA34302BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-06.gif"; - refType = 4; + name = "throbber-06.gif"; + path = "../resources/images/throbber/throbber-06.gif"; + refType = 2; }; F50EA34402BAAAB701000103 = { isa = PBXFileReference; - path = throbber.gif; - refType = 4; + name = throbber.gif; + path = ../resources/images/throbber/throbber.gif; + refType = 2; }; F50EA34502BAAAB701000103 = { fileRef = F50EA33E02BAAAB701000103; @@ -1313,8 +1440,9 @@ }; F5125A110202064D01FAFD9F = { isa = PBXFileReference; - path = CHBrowserWrapper.h; - refType = 4; + name = BrowserWrapper.h; + path = ../src/browser/BrowserWrapper.h; + refType = 2; }; F5125A140202064D01FAFD9F = { fileRef = F5125A110202064D01FAFD9F; @@ -1381,31 +1509,31 @@ F513437402DA286001A967F3 = { isa = PBXFileReference; name = libucvcn.a; - path = ../intl/uconv/ucvcn/libucvcn.a; + path = ../../intl/uconv/ucvcn/libucvcn.a; refType = 2; }; F513437502DA286001A967F3 = { isa = PBXFileReference; name = libucvja.a; - path = ../intl/uconv/ucvja/libucvja.a; + path = ../../intl/uconv/ucvja/libucvja.a; refType = 2; }; F513437602DA286001A967F3 = { isa = PBXFileReference; name = libucvko.a; - path = ../intl/uconv/ucvko/libucvko.a; + path = ../../intl/uconv/ucvko/libucvko.a; refType = 2; }; F513437702DA286001A967F3 = { isa = PBXFileReference; name = libucvtw.a; - path = ../intl/uconv/ucvtw/libucvtw.a; + path = ../../intl/uconv/ucvtw/libucvtw.a; refType = 2; }; F513437802DA286001A967F3 = { isa = PBXFileReference; name = libucvtw2.a; - path = ../intl/uconv/ucvtw2/libucvtw2.a; + path = ../../intl/uconv/ucvtw2/libucvtw2.a; refType = 2; }; F513437902DA286101A967F3 = { @@ -1440,8 +1568,9 @@ }; F5137A1102676B9101026D05 = { isa = PBXFileReference; - path = CHFind.h; - refType = 4; + name = Find.h; + path = ../src/find/Find.h; + refType = 2; }; F5137A1202676B9101026D05 = { fileRef = F5137A1102676B9101026D05; @@ -1451,24 +1580,21 @@ }; F5173958020CE1E50189DA0C = { isa = PBXFileReference; - path = ProgressDialog.nib; - refType = 4; - }; - F5173959020CE1E50189DA0C = { - fileRef = F5173958020CE1E50189DA0C; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/ProgressDialog.nib; + refType = 2; }; F517395A020CE3740189DA0C = { isa = PBXFileReference; - path = ProgressDlgController.h; - refType = 4; + name = ProgressDlgController.h; + path = ../src/download/ProgressDlgController.h; + refType = 2; }; F517395B020CE3740189DA0C = { isa = PBXFileReference; - path = ProgressDlgController.mm; - refType = 4; + name = ProgressDlgController.mm; + path = ../src/download/ProgressDlgController.mm; + refType = 2; }; F517395C020CE3750189DA0C = { fileRef = F517395A020CE3740189DA0C; @@ -1485,7 +1611,7 @@ F517941F027F3F2901A967DF = { isa = PBXFileReference; name = xuldoc.xpt; - path = ../content/xul/document/public/_xpidlgen/xuldoc.xpt; + path = ../../content/xul/document/public/_xpidlgen/xuldoc.xpt; refType = 2; }; F5179421027F3FD301A967DF = { @@ -1496,8 +1622,9 @@ }; F5179422028275B801A967DF = { isa = PBXFileReference; - path = globe_ico.tif; - refType = 4; + name = globe_ico.tif; + path = ../resources/images/chrome/globe_ico.tif; + refType = 2; }; F5179423028275B901A967DF = { fileRef = F5179422028275B801A967DF; @@ -1534,7 +1661,6 @@ F52F87CC027D75C301A80165, 2E748B72029A448D4B000102, F53E012902AEE91C01A967F3, - F53E013202AEEA2801A967F3, F5A3669302CCFAF601DC3354, F59236C102C89AC90100012B, F50D9DE202ECC2C601BB4219, @@ -1554,13 +1680,15 @@ }; F51842FC0206176901A966FE = { isa = PBXFileReference; - path = BrowserWindow.nib; - refType = 4; + name = English; + path = ../English.lproj/BrowserWindow.nib; + refType = 2; }; F51842FE020629B701A966FE = { isa = PBXFileReference; - path = sidebar.tif; - refType = 4; + name = sidebar.tif; + path = ../resources/images/toolbar/sidebar.tif; + refType = 2; }; F51842FF020629B701A966FE = { fileRef = F51842FE020629B701A966FE; @@ -1568,22 +1696,11 @@ settings = { }; }; - F518430602063A8A01A966FE = { - fileRef = F51842FC0206176901A966FE; - isa = PBXBuildFile; - settings = { - }; - }; - F518430702063A9001A966FE = { - fileRef = 29B97319FDCFA39411CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; F51B70B4026EC8A601A80166 = { isa = PBXFileReference; - path = Navigator.scriptSuite; - refType = 4; + name = Navigator.scriptSuite; + path = ../resources/application/Navigator.scriptSuite; + refType = 2; }; F51B70B5026EC8A601A80166 = { fileRef = F51B70B4026EC8A601A80166; @@ -1593,13 +1710,15 @@ }; F51B70B6026EC98B01A80166 = { isa = PBXFileReference; - path = CHGetURLCommand.h; - refType = 4; + name = GetURLCommand.h; + path = ../src/appleevents/GetURLCommand.h; + refType = 2; }; F51B70B7026EC98B01A80166 = { isa = PBXFileReference; - path = CHGetURLCommand.mm; - refType = 4; + name = GetURLCommand.mm; + path = ../src/appleevents/GetURLCommand.mm; + refType = 2; }; F51B70B8026EC98B01A80166 = { fileRef = F51B70B6026EC98B01A80166; @@ -1613,54 +1732,6 @@ settings = { }; }; - F51D9B0A020940C101A80166 = { - children = ( - F51D9B0B020940C101A80166, - F51D9B0D0209421401A80166, - F5C321D702CBD0CE014E7D56, - ); - isa = PBXGroup; - name = xul; - refType = 4; - }; - F51D9B0B020940C101A80166 = { - children = ( - F51D9B0C020940C101A80166, - ); - isa = PBXGroup; - name = document; - refType = 4; - }; - F51D9B0C020940C101A80166 = { - children = ( - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F51D9B0D0209421401A80166 = { - children = ( - F51D9B0E0209421401A80166, - ); - isa = PBXGroup; - name = templates; - path = ""; - refType = 4; - }; - F51D9B0E0209421401A80166 = { - children = ( - F51D9B0F020942AE01A80166, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F51D9B0F020942AE01A80166 = { - isa = PBXFileReference; - name = nsXULTemplateBuilder.cpp; - path = ../content/xul/templates/src/nsXULTemplateBuilder.cpp; - refType = 2; - }; F51D9B1402094BB501A80166 = { children = ( F51D9B2D0209573701A80166, @@ -1674,7 +1745,7 @@ F51D9B2D0209573701A80166 = { isa = PBXFileReference; name = libembed_base_s.a; - path = ../embedding/base/libembed_base_s.a; + path = ../../embedding/base/libembed_base_s.a; refType = 4; }; F51D9B2E0209573701A80166 = { @@ -1683,58 +1754,11 @@ settings = { }; }; - F522EFC502F73CF901A96654 = { - isa = PBXFileReference; - name = nsBaseClipboard.cpp; - path = ../widget/src/xpwidgets/nsBaseClipboard.cpp; - refType = 2; - }; - F522EFC602F73CF901A96654 = { - isa = PBXFileReference; - name = nsBaseDragService.cpp; - path = ../widget/src/xpwidgets/nsBaseDragService.cpp; - refType = 2; - }; - F522EFC702F73CF901A96654 = { - isa = PBXFileReference; - name = nsBaseWidget.cpp; - path = ../widget/src/xpwidgets/nsBaseWidget.cpp; - refType = 2; - }; - F522EFC802F73CF901A96654 = { - isa = PBXFileReference; - name = nsClipboardHelper.cpp; - path = ../widget/src/xpwidgets/nsClipboardHelper.cpp; - refType = 2; - }; - F522EFC902F73CF901A96654 = { - isa = PBXFileReference; - name = nsDataFlavor.cpp; - path = ../widget/src/xpwidgets/nsDataFlavor.cpp; - refType = 2; - }; - F522EFCA02F73CF901A96654 = { - isa = PBXFileReference; - name = nsPrimitiveHelpers.cpp; - path = ../widget/src/xpwidgets/nsPrimitiveHelpers.cpp; - refType = 2; - }; - F522EFCB02F73CF901A96654 = { - isa = PBXFileReference; - name = nsTransferable.cpp; - path = ../widget/src/xpwidgets/nsTransferable.cpp; - refType = 2; - }; F5247C2D02289FD9013DD99A = { isa = PBXFileReference; - path = alert.nib; - refType = 4; - }; - F5247C2E02289FD9013DD99A = { - fileRef = F5247C2D02289FD9013DD99A; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/alert.nib; + refType = 2; }; F5247C2F0228B5E7013DD99A = { children = ( @@ -1772,43 +1796,43 @@ F5247C320228B91F013DD99A = { isa = PBXFileReference; name = libnss3.dylib; - path = ../dist/Embed/libnss3.dylib; + path = ../../dist/Embed/libnss3.dylib; refType = 2; }; F5247C330228B91F013DD99A = { isa = PBXFileReference; name = libnssckbi.dylib; - path = ../dist/Embed/libnssckbi.dylib; + path = ../../dist/Embed/libnssckbi.dylib; refType = 2; }; F5247C340228B91F013DD99A = { isa = PBXFileReference; name = libsmime3.dylib; - path = ../dist/Embed/libsmime3.dylib; + path = ../../dist/Embed/libsmime3.dylib; refType = 2; }; F5247C350228B91F013DD99A = { isa = PBXFileReference; name = libsoftokn3.dylib; - path = ../dist/Embed/libsoftokn3.dylib; + path = ../../dist/Embed/libsoftokn3.dylib; refType = 2; }; F5247C360228B91F013DD99A = { isa = PBXFileReference; name = libssl3.dylib; - path = ../dist/Embed/libssl3.dylib; + path = ../../dist/Embed/libssl3.dylib; refType = 2; }; F5247C3C0228B990013DD99A = { isa = PBXFileReference; name = libpipboot.dylib; - path = ../dist/Embed/components/libpipboot.dylib; + path = ../../dist/Embed/components/libpipboot.dylib; refType = 2; }; F5247C3D0228B990013DD99A = { isa = PBXFileReference; name = libpipnss.dylib; - path = ../dist/Embed/components/libpipnss.dylib; + path = ../../dist/Embed/components/libpipnss.dylib; refType = 2; }; F5247C420228B9D7013DD99A = { @@ -1883,13 +1907,13 @@ F5247C4C0228BBB2013DD99A = { isa = PBXFileReference; name = pipboot.xpt; - path = ../dist/Embed/components/pipboot.xpt; + path = ../../dist/Embed/components/pipboot.xpt; refType = 2; }; F5247C4D0228BBB2013DD99A = { isa = PBXFileReference; name = pipnss.xpt; - path = ../dist/Embed/components/pipnss.xpt; + path = ../../dist/Embed/components/pipnss.xpt; refType = 2; }; F5247C520228BBB3013DD99A = { @@ -1907,7 +1931,7 @@ F524EF6702AD8B9301A967F3 = { isa = PBXFileReference; name = libgkgfx.a; - path = ../gfx/src/libgkgfx.a; + path = ../../gfx/src/libgkgfx.a; refType = 2; }; F524EF6802AD8B9401A967F3 = { @@ -1921,11 +1945,12 @@ F52627D4027E982201000102, F52627D5027E982201000102, F52627D8027E984501000102, - F52627DA027E98A401000102, + F507A85B0311895401026D5D, ); isa = PBXGroup; - path = Navigation; - refType = 4; + name = Navigation; + path = ../PreferencePanes/Navigation; + refType = 2; }; F52627CD027E976B01000102 = { isa = PBXBundleReference; @@ -1943,8 +1968,8 @@ ); buildSettings = { DEBUGGING_SYMBOLS = NO; - HEADER_SEARCH_PATHS = "../dist/include/nkcache ../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"; - LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util ../modules/zlib/src"; + HEADER_SEARCH_PATHS = "../../dist/include/nkcache ../../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"; + LIBRARY_SEARCH_PATHS = "../../dist/bin ../../dist/lib ../../intl/unicharutil/util ../../modules/zlib/src"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-bundle -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -lm"; @@ -2009,7 +2034,7 @@ buildActionMask = 2147483647; files = ( F52627D9027E984601000102, - F52627DB027E98A401000102, + F507A85C0311895401026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -2044,15 +2069,17 @@ F52627D4027E982201000102 = { indentWidth = 2; isa = PBXFileReference; - path = Navigation.h; - refType = 4; + name = Navigation.h; + path = ../PreferencePanes/Navigation/Navigation.h; + refType = 2; tabWidth = 2; }; F52627D5027E982201000102 = { indentWidth = 2; isa = PBXFileReference; - path = Navigation.mm; - refType = 4; + name = Navigation.mm; + path = ../PreferencePanes/Navigation/Navigation.mm; + refType = 2; tabWidth = 2; }; F52627D6027E982201000102 = { @@ -2069,8 +2096,9 @@ }; F52627D8027E984501000102 = { isa = PBXFileReference; - path = Navigation.tiff; - refType = 4; + name = Navigation.tiff; + path = ../PreferencePanes/Navigation/Navigation.tiff; + refType = 2; }; F52627D9027E984601000102 = { fileRef = F52627D8027E984501000102; @@ -2080,14 +2108,9 @@ }; F52627DA027E98A401000102 = { isa = PBXFileReference; - path = Navigation.nib; - refType = 4; - }; - F52627DB027E98A401000102 = { - fileRef = F52627DA027E98A401000102; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../PreferencePanes/Navigation/English.lproj/Navigation.nib; + refType = 2; }; F52627DC027E9CCD01000102 = { fileRef = F557193A022B4102010001CA; @@ -2109,8 +2132,16 @@ }; F5264FCB020D4C25010001CA = { children = ( - F5E1196C022CDCA7010001CA, - F5E1196D022CDCA7010001CA, + F5555C8202022F070164C72B, + F5555C8302022F070164C72B, + F5555C8402022F070164C72B, + F5555C8502022F070164C72B, + F5547D60020333DA01F448B0, + F51842FE020629B701A966FE, + F53F5AE902448BC8010001CA, + F53F5AEA02448BC8010001CA, + F55CCFD2020E98EA010001CA, + F5EB9376030C92450100010C, ); isa = PBXGroup; name = "Toolbar-Browser"; @@ -2119,8 +2150,13 @@ }; F5264FCC020D4C25010001CA = { children = ( - F5E1196E022CDCA7010001CA, - F5E1196F022CDCA7010001CA, + F5264FCD020D4C25010001CA, + F5264FCE020D4C25010001CA, + F5264FCF020D4C25010001CA, + F5264FD0020D4C25010001CA, + F5264FD1020D4C25010001CA, + F5264FD2020D4C25010001CA, + F5264FD3020D4C25010001CA, ); isa = PBXGroup; name = "Toolbar-SaveDialog"; @@ -2128,38 +2164,45 @@ }; F5264FCD020D4C25010001CA = { isa = PBXFileReference; - path = saveCancel.tif; - refType = 4; + name = saveCancel.tif; + path = ../resources/images/toolbar/saveCancel.tif; + refType = 2; }; F5264FCE020D4C25010001CA = { isa = PBXFileReference; - path = saveLeaveOpenNO.tif; - refType = 4; + name = saveLeaveOpenNO.tif; + path = ../resources/images/toolbar/saveLeaveOpenNO.tif; + refType = 2; }; F5264FCF020D4C25010001CA = { isa = PBXFileReference; - path = saveLeaveOpenYES.tif; - refType = 4; + name = saveLeaveOpenYES.tif; + path = ../resources/images/toolbar/saveLeaveOpenYES.tif; + refType = 2; }; F5264FD0020D4C25010001CA = { isa = PBXFileReference; - path = saveOpenFile.tif; - refType = 4; + name = saveOpenFile.tif; + path = ../resources/images/toolbar/saveOpenFile.tif; + refType = 2; }; F5264FD1020D4C25010001CA = { isa = PBXFileReference; - path = savePause.tif; - refType = 4; + name = savePause.tif; + path = ../resources/images/toolbar/savePause.tif; + refType = 2; }; F5264FD2020D4C25010001CA = { isa = PBXFileReference; - path = saveResume.tif; - refType = 4; + name = saveResume.tif; + path = ../resources/images/toolbar/saveResume.tif; + refType = 2; }; F5264FD3020D4C25010001CA = { isa = PBXFileReference; - path = saveShowFile.tif; - refType = 4; + name = saveShowFile.tif; + path = ../resources/images/toolbar/saveShowFile.tif; + refType = 2; }; F5264FD4020D4C25010001CA = { fileRef = F5264FCD020D4C25010001CA; @@ -2205,19 +2248,15 @@ }; F528E216020FD5D80168DE43 = { isa = PBXFileReference; - path = FindDialog.nib; - refType = 4; - }; - F528E217020FD5D80168DE43 = { - fileRef = F528E216020FD5D80168DE43; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/FindDialog.nib; + refType = 2; }; F528E218020FD8400168DE43 = { isa = PBXFileReference; - path = FindDlgController.h; - refType = 4; + name = FindDlgController.h; + path = ../src/find/FindDlgController.h; + refType = 2; }; F528E219020FD8400168DE43 = { fileRef = F528E218020FD8400168DE43; @@ -2227,8 +2266,9 @@ }; F528E21A020FD9620168DE43 = { isa = PBXFileReference; - path = FindDlgController.mm; - refType = 4; + name = FindDlgController.mm; + path = ../src/find/FindDlgController.mm; + refType = 2; }; F528E21B020FD9620168DE43 = { fileRef = F528E21A020FD9620168DE43; @@ -2239,8 +2279,8 @@ F52CE65902BFA88701026D5D = { isa = PBXFileReference; name = English; - path = English.lproj/Localizable.strings; - refType = 4; + path = ../English.lproj/Localizable.strings; + refType = 2; }; F52CE65C02BFA8B701026D5D = { children = ( @@ -2266,7 +2306,7 @@ F52CE65F02BFBC7101026D5D = { isa = PBXFileReference; name = "broken-image.gif"; - path = "../dist/Embed/res/broken-image.gif"; + path = "../../dist/Embed/res/broken-image.gif"; refType = 2; }; F52CE66502BFBCE901026D5D = { @@ -2283,13 +2323,15 @@ }; F52D5CCF027A887001A80166 = { isa = PBXFileReference; - path = CHAutoCompleteTextField.h; - refType = 4; + name = AutoCompleteTextField.h; + path = ../src/browser/AutoCompleteTextField.h; + refType = 2; }; F52D5CD0027A887001A80166 = { isa = PBXFileReference; - path = CHAutoCompleteTextField.mm; - refType = 4; + name = AutoCompleteTextField.mm; + path = ../src/browser/AutoCompleteTextField.mm; + refType = 2; }; F52D5CD1027A887001A80166 = { fileRef = F52D5CCF027A887001A80166; @@ -2305,13 +2347,15 @@ }; F52D5CD3027A88C601A80166 = { isa = PBXFileReference; - path = CHAutoCompleteDataSource.h; - refType = 4; + name = AutoCompleteDataSource.h; + path = ../src/browser/AutoCompleteDataSource.h; + refType = 2; }; F52D5CD4027A88C601A80166 = { isa = PBXFileReference; - path = CHAutoCompleteDataSource.mm; - refType = 4; + name = AutoCompleteDataSource.mm; + path = ../src/browser/AutoCompleteDataSource.mm; + refType = 2; }; F52D5CD5027A88C601A80166 = { fileRef = F52D5CD3027A88C601A80166; @@ -2327,14 +2371,16 @@ }; F52D5CD7027D3D5001A80166 = { isa = PBXFileReference; - path = CHPreferenceManager.h; - refType = 4; + name = PreferenceManager.h; + path = ../src/preferences/PreferenceManager.h; + refType = 2; }; F52D5CD8027D3D5001A80166 = { indentWidth = 2; isa = PBXFileReference; - path = CHPreferenceManager.mm; - refType = 4; + name = PreferenceManager.mm; + path = ../src/preferences/PreferenceManager.mm; + refType = 2; }; F52D5CD9027D3D5001A80166 = { fileRef = F52D5CD7027D3D5001A80166; @@ -2386,22 +2432,26 @@ }; F52F87CB027D75C301A80165 = { isa = PBXFileReference; - path = CHHistoryDataSource.h; - refType = 4; + name = HistoryDataSource; + path = ../src/history/HistoryDataSource.h; + refType = 2; }; F52F87CC027D75C301A80165 = { isa = PBXFileReference; - path = CHRDFOutlineViewDataSource.h; - refType = 4; + name = RDFOutlineViewDataSource.h; + path = ../src/extensions/RDFOutlineViewDataSource.h; + refType = 2; }; F52F87CD027D75C301A80165 = { isa = PBXFileReference; - path = CHHistoryDataSource.mm; + name = HistoryDataSource.mm; + path = ../src/history/HistoryDataSource.mm; refType = 4; }; F52F87CE027D75C301A80165 = { isa = PBXFileReference; - path = CHRDFOutlineViewDataSource.mm; + name = RDFOutlineViewDataSource.mm; + path = ../src/extensions/RDFOutlineViewDataSource.mm; refType = 4; }; F52F87CF027D75C301A80165 = { @@ -2442,23 +2492,27 @@ }; F538DFAF023B3739010001CA = { isa = PBXFileReference; - path = fileHtml.icns; - refType = 4; + name = fileHtml.icns; + path = ../resources/images/app/fileHtml.icns; + refType = 2; }; F538DFB0023B3739010001CA = { isa = PBXFileReference; - path = filePreferences.icns; - refType = 4; + name = filePreferences.icns; + path = ../resources/images/app/filePreferences.icns; + refType = 2; }; F538DFB1023B3739010001CA = { isa = PBXFileReference; - path = appicon.icns; - refType = 4; + name = appicon.icns; + path = ../resources/images/app/appicon.icns; + refType = 2; }; F538DFB2023B3739010001CA = { isa = PBXFileReference; - path = fileBookmark.icns; - refType = 4; + name = fileBookmark.icns; + path = ../resources/images/app/fileBookmark.icns; + refType = 2; }; F538DFB3023B3739010001CA = { fileRef = F538DFAF023B3739010001CA; @@ -2487,7 +2541,7 @@ F53A902202C1127A01A967F3 = { isa = PBXFileReference; name = liboji.dylib; - path = ../modules/oji/src/liboji.dylib; + path = ../../modules/oji/src/liboji.dylib; refType = 2; }; F53A902402C1137901A967F3 = { @@ -2498,7 +2552,8 @@ }; F53E012902AEE91C01A967F3 = { isa = PBXFileReference; - path = BookmarkInfoController.h; + name = BookmarkInfoController.h; + path = ../src/bookmarks/BookmarkInfoController.h; refType = 2; }; F53E012A02AEE91D01A967F3 = { @@ -2515,7 +2570,8 @@ }; F53E012C02AEE93601A967F3 = { isa = PBXFileReference; - path = BookmarkInfoController.mm; + name = BookmarkInfoController.mm; + path = ../src/bookmarks/BookmarkInfoController.mm; refType = 2; }; F53E012D02AEE93701A967F3 = { @@ -2532,46 +2588,19 @@ }; F53E012F02AEE9BD01A967F3 = { isa = PBXFileReference; - path = BookmarkInfoPanel.nib; + name = English; + path = ../English.lproj/BookmarkInfoPanel.nib; refType = 2; }; - F53E013002AEE9BD01A967F3 = { - fileRef = F53E012F02AEE9BD01A967F3; - isa = PBXBuildFile; - settings = { - }; - }; - F53E013102AEE9BD01A967F3 = { - fileRef = F53E012F02AEE9BD01A967F3; - isa = PBXBuildFile; - settings = { - }; - }; - F53E013202AEEA2801A967F3 = { - isa = PBXFileReference; - path = StringUtils.h; - refType = 2; - }; - F53E013302AEEA2901A967F3 = { - fileRef = F53E013202AEEA2801A967F3; - isa = PBXBuildFile; - settings = { - }; - }; - F53E013402AEEA2901A967F3 = { - fileRef = F53E013202AEEA2801A967F3; - isa = PBXBuildFile; - settings = { - }; - }; F53EAB79027EBDE801000102 = { isa = PBXTargetDependency; target = F52627CE027E976B01000102; }; F53EB4800269861601A80166 = { isa = PBXFileReference; - path = panel_icon.tif; - refType = 4; + name = panel_icon.tif; + path = ../resources/images/toolbar/panel_icon.tif; + refType = 2; }; F53EB4810269861601A80166 = { fileRef = F53EB4800269861601A80166; @@ -2589,68 +2618,80 @@ F53F21F5022B7C77010001CA, ); isa = PBXGroup; - path = PreferencePanes; - refType = 4; + name = PreferencePanes; + path = ../src/preferences; + refType = 2; }; F53F21EC022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencePaneDefaults.plist; - refType = 4; + name = MVPreferencePaneDefaults.plist; + path = ../src/preferences/MVPreferencePaneDefaults.plist; + refType = 2; }; F53F21ED022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencePaneGroups.plist; - refType = 4; + name = MVPreferencePaneGroups.plist; + path = ../src/preferences/MVPreferencePaneGroups.plist; + refType = 2; }; F53F21EE022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencePaneGroups.strings; - refType = 4; + name = English; + path = ../English.lproj/MVPreferencePaneGroups.strings; + refType = 2; }; F53F21EF022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesController.h; - refType = 4; + name = MVPreferencesController.h; + path = ../src/preferences/MVPreferencesController.h; + refType = 2; }; F53F21F0022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesController.mm; - refType = 4; + name = MVPreferencesController.mm; + path = ../src/preferences/MVPreferencesController.mm; + refType = 2; }; F53F21F1022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesGroupedIconView.h; - refType = 4; + name = MVPreferencesGroupedIconView.h; + path = ../src/preferences/MVPreferencesGroupedIconView.h; + refType = 2; }; F53F21F2022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesGroupedIconView.m; - refType = 4; + name = MVPreferencesGroupedIconView.m; + path = ../src/preferences/MVPreferencesGroupedIconView.m; + refType = 2; }; F53F21F3022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesMultipleIconView.h; - refType = 4; + name = MVPreferencesMultipleIconView.h; + path = ../src/preferences/MVPreferencesMultipleIconView.h; + refType = 2; }; F53F21F4022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesMultipleIconView.m; - refType = 4; + name = MVPreferencesMultipleIconView.m; + path = ../src/preferences/MVPreferencesMultipleIconView.m; + refType = 2; }; F53F21F5022B7C77010001CA = { children = ( - F53F21FD022B7C77010001CA, + F507A85F031194B101026D5D, F53F21FE022B7C77010001CA, F53F2200022B7C77010001CA, F53F21FF022B7C77010001CA, ); isa = PBXGroup; - path = Personal; - refType = 4; + name = Personal; + path = ../PreferencePanes/Personal; + refType = 2; }; F53F21FD022B7C77010001CA = { isa = PBXFileReference; - path = Personal.nib; + name = English; + path = English.lproj/Personal.nib; refType = 4; }; F53F21FE022B7C77010001CA = { @@ -2698,12 +2739,6 @@ settings = { }; }; - F53F2208022B7C78010001CA = { - fileRef = F53F21EE022B7C77010001CA; - isa = PBXBuildFile; - settings = { - }; - }; F53F220E022B7C78010001CA = { fileRef = F53F21F0022B7C77010001CA; isa = PBXBuildFile; @@ -2724,13 +2759,15 @@ }; F53F5AE902448BC8010001CA = { isa = PBXFileReference; - path = sidebarOpened.tif; - refType = 4; + name = sidebarOpened.tif; + path = ../resources/images/toolbar/sidebarOpened.tif; + refType = 2; }; F53F5AEA02448BC8010001CA = { isa = PBXFileReference; - path = sidebarClosed.tif; - refType = 4; + name = sidebarClosed.tif; + path = ../resources/images/toolbar/sidebarClosed.tif; + refType = 2; }; F53F5AEB02448BC9010001CA = { fileRef = F53F5AE902448BC8010001CA; @@ -2746,8 +2783,9 @@ }; F540BD1A029ED15301026D5D = { isa = PBXFileReference; - path = security_lock.tif; - refType = 4; + name = security_lock.tif; + path = ../resources/images/chrome/security_lock.tif; + refType = 2; }; F540BD1B029ED15301026D5D = { fileRef = F540BD1A029ED15301026D5D; @@ -2757,8 +2795,9 @@ }; F540BD1C029ED17901026D5D = { isa = PBXFileReference; - path = security_broken.tif; - refType = 4; + name = security_broken.tif; + path = ../resources/images/chrome/security_broken.tif; + refType = 2; }; F540BD1D029ED17901026D5D = { fileRef = F540BD1C029ED17901026D5D; @@ -2780,13 +2819,15 @@ }; F541495A02711A8301A80166 = { isa = PBXFileReference; - path = CHToolbarAdditions.h; - refType = 4; + name = CHToolbarAdditions.h; + path = ../src/extensions/ToolbarAdditions.h; + refType = 2; }; F541495B02711A8301A80166 = { isa = PBXFileReference; - path = CHToolbarAdditions.m; - refType = 4; + name = CHToolbarAdditions.m; + path = ../src/extensions/ToolbarAdditions.m; + refType = 2; }; F541495C02711A8301A80166 = { fileRef = F541495A02711A8301A80166; @@ -2802,12 +2843,14 @@ }; F541495E02711B0001A80166 = { isa = PBXFileReference; - path = CHImageAdditions.h; + name = CHImageAdditions.h; + path = ../src/extensions/ImageAdditions.h; refType = 2; }; F541495F02711B0001A80166 = { isa = PBXFileReference; - path = CHImageAdditions.m; + name = CHImageAdditions.m; + path = ../src/extensions/ImageAdditions.m; refType = 2; }; F541496002711B0101A80166 = { @@ -2824,13 +2867,15 @@ }; F541496202714F9A01A80166 = { isa = PBXFileReference; - path = groupbookmark.tif; - refType = 4; + name = groupbookmark.tif; + path = ../resources/images/chrome/groupbookmark.tif; + refType = 2; }; F541496302714F9A01A80166 = { isa = PBXFileReference; - path = separator_on.tif; - refType = 4; + name = separator_on.tif; + path = ../resources/images/toolbar/separator_on.tif; + refType = 2; }; F541496402714F9A01A80166 = { fileRef = F541496202714F9A01A80166; @@ -2852,13 +2897,15 @@ }; F549ACDE0302DE6001026D5D = { isa = PBXFileReference; - path = ToolTip.mm; - refType = 4; + name = ToolTip.mm; + path = ../src/browser/ToolTip.mm; + refType = 2; }; F549ACDF0302DE6001026D5D = { isa = PBXFileReference; - path = "NSScreen+Utils.m"; - refType = 4; + name = "NSScreen+Utils.m"; + path = "../src/extensions/NSScreen+Utils.m"; + refType = 2; }; F549ACE00302DE6101026D5D = { fileRef = F549ACDE0302DE6001026D5D; @@ -2886,8 +2933,9 @@ }; F549ACE40302DEBB01026D5D = { isa = PBXFileReference; - path = "NSScreen+Utils.h"; - refType = 4; + name = "NSScreen+Utils.h"; + path = "../src/extensions/NSScreen+Utils.h"; + refType = 2; }; F549ACE50302DEBB01026D5D = { fileRef = F549ACE40302DEBB01026D5D; @@ -2903,8 +2951,9 @@ }; F549ACE70302DEF001026D5D = { isa = PBXFileReference; - path = ToolTip.h; - refType = 4; + name = ToolTip.h; + path = ../src/browser/ToolTip.h; + refType = 2; }; F549ACE80302DEF001026D5D = { fileRef = F549ACE70302DEF001026D5D; @@ -2921,7 +2970,7 @@ F54AD84402C115D901A967F3 = { isa = PBXFileReference; name = liboji.a; - path = ../modules/oji/src/liboji.a; + path = ../../modules/oji/src/liboji.a; refType = 2; }; F54AD84502C115DA01A967F3 = { @@ -2933,13 +2982,13 @@ F54EF7ED022A2F9C01A80165 = { isa = PBXFileReference; name = pipnss.jar; - path = ../dist/Embed/chrome/pipnss.jar; + path = ../../dist/Embed/chrome/pipnss.jar; refType = 2; }; F54EF7EE022A2F9C01A80165 = { isa = PBXFileReference; name = pippki.jar; - path = ../dist/Embed/chrome/pippki.jar; + path = ../../dist/Embed/chrome/pippki.jar; refType = 2; }; F54EF7EF022A2F9D01A80165 = { @@ -2967,8 +3016,9 @@ }; F5547D60020333DA01F448B0 = { isa = PBXFileReference; - path = home.tif; - refType = 4; + name = home.tif; + path = ../resources/images/toolbar/home.tif; + refType = 2; }; F5547D61020333DA01F448B0 = { fileRef = F5547D60020333DA01F448B0; @@ -2978,23 +3028,27 @@ }; F5555C8202022F070164C72B = { isa = PBXFileReference; - path = back.tif; - refType = 4; + name = back.tif; + path = ../resources/images/toolbar/back.tif; + refType = 2; }; F5555C8302022F070164C72B = { isa = PBXFileReference; - path = forward.tif; - refType = 4; + name = forward.tif; + path = ../resources/images/toolbar/forward.tif; + refType = 2; }; F5555C8402022F070164C72B = { isa = PBXFileReference; - path = reload.tif; - refType = 4; + name = reload.tif; + path = ../resources/images/toolbar/reload.tif; + refType = 2; }; F5555C8502022F070164C72B = { isa = PBXFileReference; - path = stop.tif; - refType = 4; + name = stop.tif; + path = ../resources/images/toolbar/stop.tif; + refType = 2; }; F5555C8602022F070164C72B = { fileRef = F5555C8202022F070164C72B; @@ -3022,8 +3076,9 @@ }; F5568A8E0217C7F5010001CA = { isa = PBXFileReference; - path = smallDocument.tiff; - refType = 4; + name = smallDocument.tiff; + path = ../resources/images/chrome/smallDocument.tiff; + refType = 2; }; F5568A8F0217C7F5010001CA = { fileRef = F5568A8E0217C7F5010001CA; @@ -3033,8 +3088,9 @@ }; F5568A900217CA82010001CA = { isa = PBXFileReference; - path = folder.tiff; - refType = 4; + name = folder.tiff; + path = ../resources/images/chrome/folder.tiff; + refType = 2; }; F5568A910217CA82010001CA = { fileRef = F5568A900217CA82010001CA; @@ -3044,13 +3100,15 @@ }; F557149D023B46BF010001CA = { isa = PBXFileReference; - path = splash.tif; - refType = 4; + name = splash.tif; + path = ../resources/images/app/splash.tif; + refType = 2; }; F557149E023B46BF010001CA = { isa = PBXFileReference; - path = about.tif; - refType = 4; + name = about.tif; + path = ../resources/images/app/about.tif; + refType = 2; }; F557149F023B46C0010001CA = { fileRef = F557149D023B46BF010001CA; @@ -3066,8 +3124,9 @@ }; F55714A1023B4898010001CA = { isa = PBXFileReference; - path = smallbookmark.tif; - refType = 4; + name = smallbookmark.tif; + path = ../resources/images/chrome/smallbookmark.tif; + refType = 2; }; F55714A2023B4899010001CA = { fileRef = F55714A1023B4898010001CA; @@ -3099,13 +3158,15 @@ }; F558099D02F22168015DF512 = { isa = PBXFileReference; - path = "NSString+Utils.h"; - refType = 4; + name = "NSString+Utils.h"; + path = "../src/extensions/NSString+Utils.h"; + refType = 2; }; F558099E02F22168015DF512 = { isa = PBXFileReference; - path = "NSString+Utils.mm"; - refType = 4; + name = "NSString+Utils.mm"; + path = "../src/extensions/NSString+Utils.mm"; + refType = 2; }; F558099F02F22169015DF512 = { fileRef = F558099D02F22168015DF512; @@ -3127,13 +3188,15 @@ }; F5581379030AEF9B0176F207 = { isa = PBXFileReference; - path = RemoteDataProvider.h; - refType = 4; + name = RemoteDataProvider.h; + path = ../src/browser/RemoteDataProvider.h; + refType = 2; }; F558137A030AEF9B0176F207 = { isa = PBXFileReference; - path = SiteIconProvider.h; - refType = 4; + name = SiteIconProvider.h; + path = ../src/browser/SiteIconProvider.h; + refType = 2; }; F558137B030AEF9B0176F207 = { children = ( @@ -3147,13 +3210,15 @@ }; F558137C030AEF9B0176F207 = { isa = PBXFileReference; - path = RemoteDataProvider.mm; - refType = 4; + name = RemoteDataProvider.mm; + path = ../src/browser/RemoteDataProvider.mm; + refType = 2; }; F558137D030AEF9B0176F207 = { isa = PBXFileReference; - path = SiteIconProvider.mm; - refType = 4; + name = SiteIconProvider.mm; + path = ../src/browser/SiteIconProvider.mm; + refType = 2; }; F558137E030AEF9C0176F207 = { fileRef = F5581379030AEF9B0176F207; @@ -3205,13 +3270,15 @@ }; F558B1F0030F6E470166970F = { isa = PBXFileReference; - path = nsCocoaBrowserListener.h; - refType = 4; + name = CHBrowserListener.h; + path = ../src/embedding/CHBrowserListener.h; + refType = 2; }; F558B1F1030F6E470166970F = { isa = PBXFileReference; - path = nsCocoaBrowserListener.mm; - refType = 4; + name = CHBrowserListener.mm; + path = ../src/embedding/CHBrowserListener.mm; + refType = 2; }; F558B1F2030F6E470166970F = { fileRef = F558B1F0030F6E470166970F; @@ -3252,7 +3319,7 @@ F55A9BC60228CCE101DAE4DB = { isa = PBXFileReference; name = "security-prefs.js"; - path = "../dist/Embed/defaults/pref/security-prefs.js"; + path = "../../dist/Embed/defaults/pref/security-prefs.js"; refType = 2; }; F55A9BC70228CCE201DAE4DB = { @@ -3263,8 +3330,9 @@ }; F55B6BF402EF1F7E01026D5D = { isa = PBXFileReference; - path = "broken-image.gif"; - refType = 4; + name = "broken-image.gif"; + path = "../resources/images/gecko/broken-image.gif"; + refType = 2; }; F55B6BF702EF1FD901026D5D = { fileRef = F55B6BF402EF1F7E01026D5D; @@ -3280,8 +3348,9 @@ }; F55C4DD302D2864D0130B065 = { isa = PBXFileReference; - path = CHUserDefaults.h; - refType = 4; + name = UserDefaults.h; + path = ../src/application/UserDefaults.h; + refType = 2; }; F55C4DD402D2864E0130B065 = { fileRef = F55C4DD302D2864D0130B065; @@ -3291,8 +3360,9 @@ }; F55CCFD2020E98EA010001CA = { isa = PBXFileReference; - path = print.tif; - refType = 4; + name = print.tif; + path = ../resources/images/toolbar/print.tif; + refType = 2; }; F55CCFD3020E98EA010001CA = { fileRef = F55CCFD2020E98EA010001CA; @@ -3302,7 +3372,8 @@ }; F5607CB5023944AD01A967DF = { isa = PBXFileReference; - path = CHGeckoUtils.h; + name = GeckoUtils.h; + path = ../src/extensions/GeckoUtils.h; refType = 2; }; F5607CB6023944AE01A967DF = { @@ -3334,18 +3405,21 @@ }; F564872F023B957F010001CA = { isa = PBXFileReference; - path = historyicon.tif; - refType = 4; + name = historyicon.tif; + path = ../resources/images/toolbar/historyicon.tif; + refType = 2; }; F5648730023B957F010001CA = { isa = PBXFileReference; - path = searchicon.tif; - refType = 4; + name = searchicon.tif; + path = ../resources/images/toolbar/searchicon.tif; + refType = 2; }; F5648731023B957F010001CA = { isa = PBXFileReference; - path = bookicon.tif; - refType = 4; + name = bookicon.tif; + path = ../resources/images/toolbar/bookicon.tif; + refType = 2; }; F5648732023B957F010001CA = { fileRef = F564872F023B957F010001CA; @@ -3367,13 +3441,15 @@ }; F5648739023C3857010001CA = { isa = PBXFileReference; - path = CHIconTabViewItem.h; - refType = 4; + name = IconTabViewItem.h; + path = ../src/extensions/IconTabViewItem.h; + refType = 2; }; F564873A023C3857010001CA = { isa = PBXFileReference; - path = CHIconTabViewItem.mm; - refType = 4; + name = IconTabViewItem.mm; + path = ../src/extensions/IconTabViewItem.mm; + refType = 2; }; F564873B023C3857010001CA = { fileRef = F5648739023C3857010001CA; @@ -3395,12 +3471,14 @@ }; F566BD1202EFA9AD01A967F3 = { isa = PBXFileReference; - path = CocoaPromptService.h; + name = CocoaPromptService.h; + path = ../src/browser/CocoaPromptService.h; refType = 2; }; F566BD1302EFA9AD01A967F3 = { isa = PBXFileReference; - path = CocoaPromptService.mm; + name = CocoaPromptService.mm; + path = ../src/browser/CocoaPromptService.mm; refType = 2; }; F566BD1402EFA9AD01A967F3 = { @@ -3429,8 +3507,9 @@ }; F56769FB0208F74A010001CA = { isa = PBXFileReference; - path = BrowserWindowController.mm; - refType = 4; + name = BrowserWindowController.mm; + path = ../src/browser/BrowserWindowController.mm; + refType = 2; }; F56769FC0208F74A010001CA = { fileRef = F56769FB0208F74A010001CA; @@ -3440,24 +3519,21 @@ }; F568C3CD023A49C0010001CA = { isa = PBXFileReference; - path = AboutBox.nib; - refType = 4; - }; - F568C3CE023A49C0010001CA = { - fileRef = F568C3CD023A49C0010001CA; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/AboutBox.nib; + refType = 2; }; F568C3CF023A4A5A010001CA = { isa = PBXFileReference; - path = CHAboutBox.h; - refType = 4; + name = AboutBox.h; + path = ../src/application/AboutBox.h; + refType = 2; }; F568C3D0023A4A5A010001CA = { isa = PBXFileReference; - path = CHAboutBox.m; - refType = 4; + name = AboutBox.m; + path = ../src/application/AboutBox.m; + refType = 2; }; F568C3D1023A4A5B010001CA = { fileRef = F568C3CF023A4A5A010001CA; @@ -3473,8 +3549,9 @@ }; F568C3D3023A4F71010001CA = { isa = PBXFileReference; - path = Credits.rtf; - refType = 4; + name = Credits.rtf; + path = ../resources/application/Credits.rtf; + refType = 2; }; F568C3D4023A4F71010001CA = { fileRef = F568C3D3023A4F71010001CA; @@ -3485,7 +3562,7 @@ F56DEF11020802A501FF5ADC = { isa = PBXFileReference; name = urlbarhistory.xpt; - path = ../xpfe/components/urlbarhistory/public/_xpidlgen/urlbarhistory.xpt; + path = ../../xpfe/components/urlbarhistory/public/_xpidlgen/urlbarhistory.xpt; refType = 2; }; F56DEF130208030601FF5ADC = { @@ -3496,7 +3573,8 @@ }; F56F241F02AC6D0401A967F3 = { isa = PBXFileReference; - path = nsStaticComponents.cpp; + name = nsStaticComponents.cpp; + path = ../src/application/nsStaticComponents.cpp; refType = 2; }; F56F242102AC6D0401A967F3 = { @@ -3568,67 +3646,67 @@ F56F242302AC706801A967F3 = { isa = PBXFileReference; name = libchardet.a; - path = ../intl/chardet/src/libchardet.a; + path = ../../intl/chardet/src/libchardet.a; refType = 2; }; F56F242502AC706801A967F3 = { isa = PBXFileReference; name = liblwbrk.a; - path = ../intl/lwbrk/src/liblwbrk.a; + path = ../../intl/lwbrk/src/liblwbrk.a; refType = 2; }; F56F242602AC706801A967F3 = { isa = PBXFileReference; name = libnecko.a; - path = ../netwerk/build/libnecko.a; + path = ../../netwerk/build/libnecko.a; refType = 2; }; F56F242702AC706801A967F3 = { isa = PBXFileReference; name = libnecko2.a; - path = ../netwerk/build2/libnecko2.a; + path = ../../netwerk/build2/libnecko2.a; refType = 2; }; F56F242802AC706801A967F3 = { isa = PBXFileReference; name = libnkcache.a; - path = ../netwerk/cache/src/libnkcache.a; + path = ../../netwerk/cache/src/libnkcache.a; refType = 2; }; F56F242902AC706801A967F3 = { isa = PBXFileReference; name = libnslocale.a; - path = ../intl/locale/src/unix/libnslocale.a; + path = ../../intl/locale/src/unix/libnslocale.a; refType = 2; }; F56F242A02AC706801A967F3 = { isa = PBXFileReference; name = libstrres.a; - path = ../intl/strres/src/libstrres.a; + path = ../../intl/strres/src/libstrres.a; refType = 2; }; F56F242B02AC706801A967F3 = { isa = PBXFileReference; name = libuconv.a; - path = ../intl/uconv/src/libuconv.a; + path = ../../intl/uconv/src/libuconv.a; refType = 2; }; F56F243002AC706801A967F3 = { isa = PBXFileReference; name = libucvlatin.a; - path = ../intl/uconv/ucvlatin/libucvlatin.a; + path = ../../intl/uconv/ucvlatin/libucvlatin.a; refType = 2; }; F56F243202AC706801A967F3 = { isa = PBXFileReference; name = liburiloader.a; - path = ../uriloader/build/liburiloader.a; + path = ../../uriloader/build/liburiloader.a; refType = 2; }; F56F243302AC706801A967F3 = { isa = PBXFileReference; name = libxpconnect.a; - path = ../js/src/xpconnect/src/libxpconnect.a; + path = ../../js/src/xpconnect/src/libxpconnect.a; refType = 2; }; F56F243402AC706801A967F3 = { @@ -3700,67 +3778,67 @@ F56F244502AC714601A967F3 = { isa = PBXFileReference; name = libcaps.a; - path = ../caps/src/libcaps.a; + path = ../../caps/src/libcaps.a; refType = 2; }; F56F244602AC714601A967F3 = { isa = PBXFileReference; name = libchrome.a; - path = ../rdf/chrome/build/libchrome.a; + path = ../../rdf/chrome/build/libchrome.a; refType = 2; }; F56F244702AC714601A967F3 = { isa = PBXFileReference; name = libgfx_mac.a; - path = ../gfx/src/mac/libgfx_mac.a; + path = ../../gfx/src/mac/libgfx_mac.a; refType = 2; }; F56F244802AC714601A967F3 = { isa = PBXFileReference; name = libgfx2.a; - path = ../gfx2/src/libgfx2.a; + path = ../../gfx2/src/libgfx2.a; refType = 2; }; F56F244902AC714601A967F3 = { isa = PBXFileReference; name = libhtmlpars.a; - path = ../htmlparser/src/libhtmlpars.a; + path = ../../htmlparser/src/libhtmlpars.a; refType = 2; }; F56F244B02AC714601A967F3 = { isa = PBXFileReference; name = libimggif.a; - path = ../modules/libpr0n/decoders/gif/libimggif.a; + path = ../../modules/libpr0n/decoders/gif/libimggif.a; refType = 2; }; F56F244C02AC714601A967F3 = { isa = PBXFileReference; name = libimgjpeg.a; - path = ../modules/libpr0n/decoders/jpeg/libimgjpeg.a; + path = ../../modules/libpr0n/decoders/jpeg/libimgjpeg.a; refType = 2; }; F56F244D02AC714601A967F3 = { isa = PBXFileReference; name = libimglib2.a; - path = ../modules/libpr0n/src/libimglib2.a; + path = ../../modules/libpr0n/src/libimglib2.a; refType = 2; }; F56F244E02AC714601A967F3 = { isa = PBXFileReference; name = libimgpng.a; - path = ../modules/libpr0n/decoders/png/libimgpng.a; + path = ../../modules/libpr0n/decoders/png/libimgpng.a; refType = 2; }; F56F245002AC714601A967F3 = { isa = PBXFileReference; name = libpref.a; - path = ../modules/libpref/src/libpref.a; + path = ../../modules/libpref/src/libpref.a; refType = 2; }; F56F245102AC714601A967F3 = { isa = PBXFileReference; name = librdf.a; - path = ../rdf/build/librdf.a; + path = ../../rdf/build/librdf.a; refType = 2; }; F56F245202AC714701A967F3 = { @@ -3832,91 +3910,91 @@ F56F246002AC723001A967F3 = { isa = PBXFileReference; name = libdocshell.a; - path = ../docshell/build/libdocshell.a; + path = ../../docshell/build/libdocshell.a; refType = 2; }; F56F246102AC723001A967F3 = { isa = PBXFileReference; name = libeditor.a; - path = ../editor/libeditor/build/libeditor.a; + path = ../../editor/libeditor/build/libeditor.a; refType = 2; }; F56F246202AC723001A967F3 = { isa = PBXFileReference; name = libembedcomponents.a; - path = ../embedding/components/build/libembedcomponents.a; + path = ../../embedding/components/build/libembedcomponents.a; refType = 2; }; F56F246302AC723001A967F3 = { isa = PBXFileReference; name = libgkcontent.a; - path = ../content/build/libgkcontent.a; + path = ../../content/build/libgkcontent.a; refType = 2; }; F56F246402AC723001A967F3 = { isa = PBXFileReference; name = libgklayout.a; - path = ../layout/build/libgklayout.a; + path = ../../layout/build/libgklayout.a; refType = 2; }; F56F246502AC723001A967F3 = { isa = PBXFileReference; name = libgkplugin.a; - path = ../modules/plugin/base/src/libgkplugin.a; + path = ../../modules/plugin/base/src/libgkplugin.a; refType = 2; }; F56F246602AC723001A967F3 = { isa = PBXFileReference; name = libgkview.a; - path = ../view/src/libgkview.a; + path = ../../view/src/libgkview.a; refType = 2; }; F56F246902AC723001A967F3 = { isa = PBXFileReference; name = libjsdom.a; - path = ../dom/src/build/libjsdom.a; + path = ../../dom/src/build/libjsdom.a; refType = 2; }; F56F246A02AC723001A967F3 = { isa = PBXFileReference; name = libjsurl.a; - path = ../dom/src/jsurl/libjsurl.a; + path = ../../dom/src/jsurl/libjsurl.a; refType = 2; }; F56F246B02AC723001A967F3 = { isa = PBXFileReference; name = libmork.a; - path = ../db/mork/build/libmork.a; + path = ../../db/mork/build/libmork.a; refType = 2; }; F56F246F02AC723001A967F3 = { isa = PBXFileReference; name = libprofile.a; - path = ../profile/src/libprofile.a; + path = ../../profile/src/libprofile.a; refType = 2; }; F56F247002AC723001A967F3 = { isa = PBXFileReference; name = libtxmgr.a; - path = ../editor/txmgr/src/libtxmgr.a; + path = ../../editor/txmgr/src/libtxmgr.a; refType = 2; }; F56F247102AC723001A967F3 = { isa = PBXFileReference; name = libtxtsvc.a; - path = ../editor/txtsvc/src/libtxtsvc.a; + path = ../../editor/txtsvc/src/libtxtsvc.a; refType = 2; }; F56F247302AC723001A967F3 = { isa = PBXFileReference; name = libwebbrwsr.a; - path = ../embedding/browser/build/libwebbrwsr.a; + path = ../../embedding/browser/build/libwebbrwsr.a; refType = 2; }; F56F247402AC723001A967F3 = { isa = PBXFileReference; name = libwidget_mac.a; - path = ../widget/src/cocoa/libwidget_mac.a; + path = ../../widget/src/cocoa/libwidget_mac.a; refType = 2; }; F56F247602AC723101A967F3 = { @@ -4012,37 +4090,37 @@ F56F248B02AC729901A967F3 = { isa = PBXFileReference; name = libappcomps.a; - path = ../xpfe/components/build/libappcomps.a; + path = ../../xpfe/components/build/libappcomps.a; refType = 2; }; F56F248C02AC729901A967F3 = { isa = PBXFileReference; name = libcookie.a; - path = ../extensions/cookie/libcookie.a; + path = ../../extensions/cookie/libcookie.a; refType = 2; }; F56F248F02AC729901A967F3 = { isa = PBXFileReference; name = libpipboot.a; - path = ../security/manager/boot/src/libpipboot.a; + path = ../../security/manager/boot/src/libpipboot.a; refType = 2; }; F56F249002AC729901A967F3 = { isa = PBXFileReference; name = libpipnss.a; - path = ../security/manager/ssl/src/libpipnss.a; + path = ../../security/manager/ssl/src/libpipnss.a; refType = 2; }; F56F249302AC729901A967F3 = { isa = PBXFileReference; name = libshistory.a; - path = ../xpfe/components/shistory/src/libshistory.a; + path = ../../xpfe/components/shistory/src/libshistory.a; refType = 2; }; F56F249402AC729901A967F3 = { isa = PBXFileReference; name = libxmlextras.a; - path = ../extensions/xmlextras/build/src/libxmlextras.a; + path = ../../extensions/xmlextras/build/src/libxmlextras.a; refType = 2; }; F56F249502AC729901A967F3 = { @@ -4100,8 +4178,8 @@ F56F837202E47CCD01EF35C9 = { isa = PBXFileReference; name = RegionNames.strings; - path = English.lproj/RegionNames.strings; - refType = 4; + path = ../PreferencePanes/Appearance/English.lproj/RegionNames.strings; + refType = 2; }; F56F837402E47DB401EF35C9 = { children = ( @@ -4109,7 +4187,8 @@ ); isa = PBXVariantGroup; name = RegionNames.strings; - refType = 4; + path = ../PreferencePanes/Appearance; + refType = 2; }; F56F837502E47DB501EF35C9 = { fileRef = F56F837402E47DB401EF35C9; @@ -4119,13 +4198,15 @@ }; F57074B5026BA85F01A80166 = { isa = PBXFileReference; - path = CHBookmarksToolbar.h; - refType = 4; + name = BookmarksToolbar.h; + path = ../src/bookmarks/BookmarksToolbar.h; + refType = 2; }; F57074B6026BA85F01A80166 = { isa = PBXFileReference; - path = CHBookmarksToolbar.mm; - refType = 4; + name = BookmarksToolbar.mm; + path = ../src/bookmarks/BookmarksToolbar.mm; + refType = 2; }; F57074B7026BA85F01A80166 = { fileRef = F57074B5026BA85F01A80166; @@ -4141,13 +4222,15 @@ }; F57074B9026BFD0101A80166 = { isa = PBXFileReference; - path = CHBookmarksButton.h; - refType = 4; + name = BookmarksButton.h; + path = ../src/bookmarks/BookmarksButton.h; + refType = 2; }; F57074BA026BFD0101A80166 = { isa = PBXFileReference; - path = CHBookmarksButton.mm; - refType = 4; + name = BookmarksButton.mm; + path = ../src/bookmarks/BookmarksButton.mm; + refType = 2; }; F57074BB026BFD0201A80166 = { fileRef = F57074B9026BFD0101A80166; @@ -4163,13 +4246,15 @@ }; F57074BD026D80DF01A80166 = { isa = PBXFileReference; - path = CHLocationBar.h; - refType = 4; + name = LocationBar.h; + path = ../src/browser/LocationBar.h; + refType = 2; }; F57074BE026D80DF01A80166 = { isa = PBXFileReference; - path = CHLocationBar.mm; - refType = 4; + name = LocationBar.mm; + path = ../src/browser/LocationBar.mm; + refType = 2; }; F57074BF026D80DF01A80166 = { fileRef = F57074BD026D80DF01A80166; @@ -4186,31 +4271,31 @@ F57BBFDB02DA02C401026D5D = { isa = PBXFileReference; name = libucvcn.dylib; - path = ../dist/Embed/components/libucvcn.dylib; + path = ../../dist/Embed/components/libucvcn.dylib; refType = 2; }; F57BBFDC02DA02C401026D5D = { isa = PBXFileReference; name = libucvja.dylib; - path = ../dist/Embed/components/libucvja.dylib; + path = ../../dist/Embed/components/libucvja.dylib; refType = 2; }; F57BBFDD02DA02C401026D5D = { isa = PBXFileReference; name = libucvko.dylib; - path = ../dist/Embed/components/libucvko.dylib; + path = ../../dist/Embed/components/libucvko.dylib; refType = 2; }; F57BBFDE02DA02C401026D5D = { isa = PBXFileReference; name = libucvtw.dylib; - path = ../dist/Embed/components/libucvtw.dylib; + path = ../../dist/Embed/components/libucvtw.dylib; refType = 2; }; F57BBFDF02DA02C401026D5D = { isa = PBXFileReference; name = libucvtw2.dylib; - path = ../dist/Embed/components/libucvtw2.dylib; + path = ../../dist/Embed/components/libucvtw2.dylib; refType = 2; }; F57BBFEA02DA034601026D5D = { @@ -4246,7 +4331,7 @@ F57F0F470209DF5301A967DF = { isa = PBXFileReference; name = libxpcom.dylib; - path = ../dist/Embed/libxpcom.dylib; + path = ../../dist/Embed/libxpcom.dylib; refType = 2; }; F57F0F480209DF5301A967DF = { @@ -4272,8 +4357,8 @@ buildSettings = { DEBUGGING_SYMBOLS = NO; FRAMEWORK_SEARCH_PATHS = ""; - HEADER_SEARCH_PATHS = "../dist/include/pref ../dist/include/nspr ../dist/include/cookie ../dist/include/nkcache ../dist/include/xpcom"; - LIBRARY_SEARCH_PATHS = "../dist/Embed ../embedding/base ../string/obsolete ../intl/unicharutil/util ../js/src ../dist/Embed/components"; + HEADER_SEARCH_PATHS = "../../dist/include/pref ../../dist/include/nspr ../../dist/include/cookie ../../dist/include/nkcache ../../dist/include/xpcom"; + LIBRARY_SEARCH_PATHS = "../../dist/Embed ../../embedding/base ../../string/obsolete ../../intl/unicharutil/util ../../js/src ../../dist/Embed/components"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-bundle"; @@ -4327,45 +4412,45 @@ }; F57F205D029997E701000106 = { children = ( - F57F205E029997E701000106, + F507A85D0311948201026D5D, F57F205F029997E701000106, F57F2060029997E701000106, F57F2061029997E701000106, ); isa = PBXGroup; name = Privacy; - path = Personal; - refType = 4; + path = ../PreferencePanes/Privacy; + refType = 2; }; F57F205E029997E701000106 = { isa = PBXFileReference; - name = Privacy.nib; - path = PreferencePanes/Privacy/Privacy.nib; + name = English; + path = ../PreferencePanes/Privacy/English.lproj/Privacy.nib; refType = 2; }; F57F205F029997E701000106 = { isa = PBXFileReference; name = Privacy.tiff; - path = PreferencePanes/Privacy/Privacy.tiff; + path = ../PreferencePanes/Privacy/Privacy.tiff; refType = 2; }; F57F2060029997E701000106 = { isa = PBXFileReference; name = PrivacyPane.h; - path = PreferencePanes/Privacy/PrivacyPane.h; + path = ../PreferencePanes/Privacy/PrivacyPane.h; refType = 2; }; F57F2061029997E701000106 = { isa = PBXFileReference; name = PrivacyPane.mm; - path = PreferencePanes/Privacy/PrivacyPane.mm; + path = ../PreferencePanes/Privacy/PrivacyPane.mm; refType = 2; }; F57F2062029997E701000106 = { isa = PBXBundleReference; name = Privacy.prefPane; path = build/Privacy.prefPane; - refType = 4; + refType = 2; }; F57F2064029997E701000106 = { buildActionMask = 2147483647; @@ -4384,18 +4469,12 @@ F57F2066029997E701000106 = { buildActionMask = 2147483647; files = ( - F57F2067029997E701000106, + F507A85E0311948201026D5D, F57F2068029997E701000106, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; }; - F57F2067029997E701000106 = { - fileRef = F57F205E029997E701000106; - isa = PBXBuildFile; - settings = { - }; - }; F57F2068029997E701000106 = { fileRef = F57F205F029997E701000106; isa = PBXBuildFile; @@ -4523,18 +4602,20 @@ }; F5807369023A1514010001CA = { isa = PBXFileReference; - path = CHSplashScreenWindow.h; - refType = 4; + name = SplashScreenWindow.h; + path = ../src/application/SplashScreenWindow.h; + refType = 2; }; F580736A023A1514010001CA = { isa = PBXFileReference; - path = CHSplashScreenWindow.m; + name = SplashScreenWindow.m; + path = ../src/application/SplashScreenWindow.m; refType = 4; }; F580736B023A1514010001CA = { children = ( F568C3D3023A4F71010001CA, - F568C3CD023A49C0010001CA, + F507A85603116EBB01026D5D, F568C3CF023A4A5A010001CA, F568C3D0023A4A5A010001CA, ); @@ -4599,20 +4680,15 @@ }; F585677D02382E97010001CA = { isa = PBXFileReference; - path = MVPreferences.nib; - refType = 4; - }; - F585677E02382E97010001CA = { - fileRef = F585677D02382E97010001CA; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/MVPreferences.nib; + refType = 2; }; F58581AD022B8D61010001CA = { isa = PBXBundleReference; name = Personal.prefPane; path = build/Personal.prefPane; - refType = 4; + refType = 2; }; F58581AE022B8D62010001CA = { buildPhases = ( @@ -4688,7 +4764,7 @@ F58581B0022B8D62010001CA = { buildActionMask = 2147483647; files = ( - F58581B5022B8E0D010001CA, + F507A860031194B101026D5D, F58581B6022B8E0D010001CA, ); isa = PBXResourcesBuildPhase; @@ -4724,12 +4800,6 @@ settings = { }; }; - F58581B5022B8E0D010001CA = { - fileRef = F53F21FD022B7C77010001CA; - isa = PBXBuildFile; - settings = { - }; - }; F58581B6022B8E0D010001CA = { fileRef = F53F21FE022B7C77010001CA; isa = PBXBuildFile; @@ -4766,12 +4836,12 @@ }; F58A94F2023F10CA010001CA = { children = ( - 29B97319FDCFA39411CA2CEA, - F51842FC0206176901A966FE, - F5247C2D02289FD9013DD99A, - F5173958020CE1E50189DA0C, - F528E216020FD5D80168DE43, - F53E012F02AEE9BD01A967F3, + F507A84103116E1D01026D5D, + F507A84403116E5501026D5D, + F507A84703116E6901026D5D, + F507A84A03116E6E01026D5D, + F507A84D03116E7401026D5D, + F507A85003116E7901026D5D, ); isa = PBXGroup; name = Nibs; @@ -4779,13 +4849,15 @@ }; F59236C002C89AC90100012B = { isa = PBXFileReference; - path = AppDirServiceProvider.cpp; - refType = 4; + name = AppDirServiceProvider.cpp; + path = ../src/application/AppDirServiceProvider.cpp; + refType = 2; }; F59236C102C89AC90100012B = { isa = PBXFileReference; - path = AppDirServiceProvider.h; - refType = 4; + name = AppDirServiceProvider.h; + path = ../src/application/AppDirServiceProvider.h; + refType = 2; }; F59236C202C89ACA0100012B = { fileRef = F59236C102C89AC90100012B; @@ -4811,28 +4883,6 @@ settings = { }; }; - F5948A48029EB9C801000102 = { - children = ( - F5948A49029EB9E301000102, - ); - isa = PBXGroup; - name = xpcom; - refType = 4; - }; - F5948A49029EB9E301000102 = { - children = ( - F5948A4A029EBA3701000102, - ); - isa = PBXGroup; - name = components; - refType = 4; - }; - F5948A4A029EBA3701000102 = { - isa = PBXFileReference; - name = nsComponentManager.cpp; - path = ../xpcom/components/nsComponentManager.cpp; - refType = 2; - }; F5960E9C02BA686001000103 = { fileRef = F5FEDBCB02AD8DD101A967F3; isa = PBXBuildFile; @@ -4841,7 +4891,8 @@ }; F59A0E320307635401A967F3 = { isa = PBXFileReference; - path = chimera.js; + name = chimera.js; + path = ../resources/application/chimera.js; refType = 2; }; F59A0E350307639801A967F3 = { @@ -4858,7 +4909,8 @@ }; F59E9F3D0237E28401A967DF = { isa = PBXFileReference; - path = ContentClickListener.h; + name = ContentClickListener.h; + path = ../src/browser/ContentClickListener.h; refType = 2; }; F59E9F3E0237E28401A967DF = { @@ -4869,7 +4921,8 @@ }; F59E9F3F0237E43401A967DF = { isa = PBXFileReference; - path = ContentClickListener.mm; + name = ContentClickListener.mm; + path = ../src/browser/ContentClickListener.mm; refType = 2; }; F59E9F400237E43401A967DF = { @@ -4880,7 +4933,8 @@ }; F5A112C902DF270F01026D5D = { isa = PBXFileReference; - path = "loading-image.gif"; + name = "loading-image.gif"; + path = "../resources/images/gecko/loading-image.gif"; refType = 2; }; F5A112CA02DF270F01026D5D = { @@ -4897,8 +4951,9 @@ }; F5A3669302CCFAF601DC3354 = { isa = PBXFileReference; - path = BookmarksDataSource.h; - refType = 4; + name = BookmarksDataSource.h; + path = ../src/bookmarks/BookmarksDataSource.h; + refType = 2; }; F5A3669402CCFAF601DC3354 = { children = ( @@ -4915,8 +4970,9 @@ }; F5A3669502CCFAF601DC3354 = { isa = PBXFileReference; - path = BookmarksDataSource.mm; - refType = 4; + name = BookmarksDataSource.mm; + path = ../src/bookmarks/BookmarksDataSource.mm; + refType = 2; }; F5A3669602CCFAF601DC3354 = { children = ( @@ -4986,14 +5042,14 @@ F5A8CE4102DFEF4C013CA8EC = { isa = PBXFileReference; name = PreferencePaneBase.h; - path = Shared/PreferencePaneBase.h; - refType = 4; + path = ../PreferencePanes/Shared/PreferencePaneBase.h; + refType = 2; }; F5A8CE4202DFEF4C013CA8EC = { isa = PBXFileReference; name = PreferencePaneBase.mm; - path = Shared/PreferencePaneBase.mm; - refType = 4; + path = ../PreferencePanes/Shared/PreferencePaneBase.mm; + refType = 2; }; F5A8CE4302DFEF4C013CA8EC = { fileRef = F5A8CE4102DFEF4C013CA8EC; @@ -5023,8 +5079,8 @@ ); buildSettings = { DEBUGGING_SYMBOLS = NO; - 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"; - LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util ../modules/zlib/src"; + 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"; + LIBRARY_SEARCH_PATHS = "../../dist/bin ../../dist/lib ../../intl/unicharutil/util ../../modules/zlib/src"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-bundle -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -lm"; @@ -5088,7 +5144,7 @@ F5A8CE4902DFF039013CA8EC = { buildActionMask = 2147483647; files = ( - F5A8CE5402DFF167013CA8EC, + F507A85A03116FF301026D5D, F5A8CE5502DFF167013CA8EC, F5F9FBDD02E1414C012B5DB7, F56F837502E47DB501EF35C9, @@ -5127,34 +5183,39 @@ children = ( F5A8CE4E02DFF167013CA8EC, F5A8CE4F02DFF167013CA8EC, - F5A8CE5002DFF167013CA8EC, + F507A85903116FF301026D5D, F5A8CE5102DFF167013CA8EC, F5F9FBD902E13767012B5DB7, F56F837402E47DB401EF35C9, ); isa = PBXGroup; - path = Appearance; - refType = 4; + name = Appearance; + path = ../PreferencePanes/Appearance; + refType = 2; }; F5A8CE4E02DFF167013CA8EC = { isa = PBXFileReference; - path = Appearance.h; - refType = 4; + name = Appearance.h; + path = ../PreferencePanes/Appearance/Appearance.h; + refType = 2; }; F5A8CE4F02DFF167013CA8EC = { isa = PBXFileReference; - path = Appearance.mm; - refType = 4; + name = Appearance.mm; + path = ../PreferencePanes/Appearance/Appearance.mm; + refType = 2; }; F5A8CE5002DFF167013CA8EC = { isa = PBXFileReference; - path = Appearance.nib; - refType = 4; + name = English; + path = ../PreferencePanes/Appearance/English.lproj/Appearance.nib; + refType = 2; }; F5A8CE5102DFF167013CA8EC = { isa = PBXFileReference; - path = Appearance.tiff; - refType = 4; + name = Appearance.tiff; + path = ../PreferencePanes/Appearance/Appearance.tiff; + refType = 2; }; F5A8CE5202DFF167013CA8EC = { fileRef = F5A8CE4E02DFF167013CA8EC; @@ -5168,12 +5229,6 @@ settings = { }; }; - F5A8CE5402DFF167013CA8EC = { - fileRef = F5A8CE5002DFF167013CA8EC; - isa = PBXBuildFile; - settings = { - }; - }; F5A8CE5502DFF167013CA8EC = { fileRef = F5A8CE5102DFF167013CA8EC; isa = PBXBuildFile; @@ -5224,8 +5279,9 @@ }; F5AE04B20206A34801A967DF = { isa = PBXFileReference; - path = BrowserWindowController.h; - refType = 4; + name = BrowserWindowController.h; + path = ../src/browser/BrowserWindowController.h; + refType = 2; }; F5AE04B40206A34801A967DF = { fileRef = F5AE04B20206A34801A967DF; @@ -5235,8 +5291,9 @@ }; F5AE04B60206A37C01A967DF = { isa = PBXFileReference; - path = MainController.h; - refType = 4; + name = MainController.h; + path = ../src/application/MainController.h; + refType = 2; }; F5AE04B80206A37C01A967DF = { fileRef = F5AE04B60206A37C01A967DF; @@ -5246,8 +5303,9 @@ }; F5AE04BA0206A4FE01A967DF = { isa = PBXFileReference; - path = MainController.mm; - refType = 4; + name = MainController.mm; + path = ../src/application/MainController.mm; + refType = 2; }; F5AE04BB0206A4FE01A967DF = { fileRef = F5AE04BA0206A4FE01A967DF; @@ -5258,7 +5316,7 @@ F5B8CC460209D1B601A967DF = { isa = PBXFileReference; name = libstring_obsolete_s.a; - path = ../string/obsolete/libstring_obsolete_s.a; + path = ../../string/obsolete/libstring_obsolete_s.a; refType = 2; }; F5B950BA030C833301A96654 = { @@ -5290,13 +5348,15 @@ }; F5B950BC030C83B601A96654 = { isa = PBXFileReference; - path = BrowserTabViewItem.h; - refType = 4; + name = BrowserTabViewItem.h; + path = ../src/browser/BrowserTabViewItem.h; + refType = 2; }; F5B950BD030C83B601A96654 = { isa = PBXFileReference; - path = BrowserTabViewItem.mm; - refType = 4; + name = BrowserTabViewItem.mm; + path = ../src/browser/BrowserTabViewItem.mm; + refType = 2; }; F5B950BE030C83B601A96654 = { fileRef = F5B950BC030C83B601A96654; @@ -5349,9 +5409,9 @@ buildSettings = { DEBUGGING_SYMBOLS = NO; FRAMEWORK_SEARCH_PATHS = ""; - HEADER_SEARCH_PATHS = "../dist/include/helperAppDlg ../dist/include/exthandler ../dist/include/intl ../dist/include/pipboot ../dist/include/pipnss ../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/commandhandler ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/nkcache ../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/chrome ../dist/include/xpcom ../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\""; + HEADER_SEARCH_PATHS = "../../dist/include/helperAppDlg ../../dist/include/exthandler ../../dist/include/intl ../../dist/include/pipboot ../../dist/include/pipnss ../../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/commandhandler ../../dist/include/windowwatcher ../../dist/include/webshell ../../dist/include/widget ../../dist/include/uriloader ../../dist/include/nkcache ../../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/chrome ../../dist/include/xpcom ../../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\""; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../dist/lib/components ../intl/unicharutil/src ../gfx/src ../js/src/liveconnect ../intl/unicharutil/util"; + LIBRARY_SEARCH_PATHS = "../../dist/bin ../../dist/lib ../../dist/lib/components ../../intl/unicharutil/src ../../gfx/src ../../js/src/liveconnect ../../intl/unicharutil/util"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = "-fno-rtti -DOSTYPE=\\\"Darwin1.4\\\" -DOSARCH=\\\"Darwin\\\" -D_BUILD_STATIC_BIN"; OTHER_LDFLAGS = "-lxpcom -lplds4 -lplc4 -lnspr4 -lsmime3 -lssl3 -lnss3 -lsoftokn3 -lmozjs -lmozjpeg -ljsj -lmozpng -lmozmng -lpthread -lz -lm"; @@ -5548,7 +5608,6 @@ F5BAAB4002AC4A2E01A967F3, F5BAAB4102AC4A2E01A967F3, F53E012B02AEE91D01A967F3, - F53E013402AEEA2901A967F3, F59236C402C89ACA0100012B, F5A3669A02CCFB7A01DC3354, F50D9DE702ECC36201BB4219, @@ -5573,16 +5632,16 @@ F5BAAB1B02AC45D301A967F3 = { buildActionMask = 2147483647; files = ( - F5BAAB4202AC4A5301A967F3, + F507A84303116E1D01026D5D, F5BAAB4302AC4A5301A967F3, F5BAAB4402AC4A5301A967F3, F5BAAB4502AC4A5301A967F3, F5BAAB4602AC4A5301A967F3, F5BAAB4702AC4A5301A967F3, F5BAAB4802AC4A5301A967F3, - F5BAAB4902AC4A5301A967F3, + F507A84603116E5501026D5D, F5BAAB4A02AC4A5301A967F3, - F5BAAB4B02AC4A5301A967F3, + F507A84C03116E6E01026D5D, F5BAAB4C02AC4A5301A967F3, F5BAAB4D02AC4A5301A967F3, F5BAAB4E02AC4A5301A967F3, @@ -5591,15 +5650,15 @@ F5BAAB5102AC4A5301A967F3, F5BAAB5202AC4A5301A967F3, F5BAAB5302AC4A5301A967F3, - F5BAAB5402AC4A5301A967F3, + F507A84F03116E7401026D5D, F5BAAB5602AC4A5301A967F3, F5BAAB5702AC4A5301A967F3, - F5BAAB5802AC4A5301A967F3, + F507A84903116E6901026D5D, F5BAAB5902AC4A5301A967F3, F5BAAB5A02AC4A5301A967F3, - F5BAAB5B02AC4A5301A967F3, - F5BAAB5C02AC4A5301A967F3, - F5BAAB5D02AC4A5301A967F3, + F507A86303128A3D01026D5D, + F507A85503116EA401026D5D, + F507A85803116EBC01026D5D, F5BAAB5E02AC4A5301A967F3, F5BAAB5F02AC4A5301A967F3, F5BAAB6002AC4A5301A967F3, @@ -5624,7 +5683,7 @@ F5BAAB7502AC4A5301A967F3, F5BAAB7702AC4A5301A967F3, F5BAAB7802AC4A5301A967F3, - F53E013102AEE9BD01A967F3, + F507A85203116E7901026D5D, F50EA34C02BAB1E401000103, F50EA34D02BAB1E401000103, F50EA34E02BAB1E401000103, @@ -5973,12 +6032,6 @@ settings = { }; }; - F5BAAB4202AC4A5301A967F3 = { - fileRef = 29B97319FDCFA39411CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB4302AC4A5301A967F3 = { fileRef = 089C165CFE840E0CC02AAC07; isa = PBXBuildFile; @@ -6015,24 +6068,12 @@ settings = { }; }; - F5BAAB4902AC4A5301A967F3 = { - fileRef = F51842FC0206176901A966FE; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB4A02AC4A5301A967F3 = { fileRef = F51842FE020629B701A966FE; isa = PBXBuildFile; settings = { }; }; - F5BAAB4B02AC4A5301A967F3 = { - fileRef = F5173958020CE1E50189DA0C; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB4C02AC4A5301A967F3 = { fileRef = F5264FCD020D4C25010001CA; isa = PBXBuildFile; @@ -6081,12 +6122,6 @@ settings = { }; }; - F5BAAB5402AC4A5301A967F3 = { - fileRef = F528E216020FD5D80168DE43; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB5602AC4A5301A967F3 = { fileRef = F5568A8E0217C7F5010001CA; isa = PBXBuildFile; @@ -6099,12 +6134,6 @@ settings = { }; }; - F5BAAB5802AC4A5301A967F3 = { - fileRef = F5247C2D02289FD9013DD99A; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB5902AC4A5301A967F3 = { fileRef = F53F21EC022B7C77010001CA; isa = PBXBuildFile; @@ -6117,24 +6146,6 @@ settings = { }; }; - F5BAAB5B02AC4A5301A967F3 = { - fileRef = F53F21EE022B7C77010001CA; - isa = PBXBuildFile; - settings = { - }; - }; - F5BAAB5C02AC4A5301A967F3 = { - fileRef = F585677D02382E97010001CA; - isa = PBXBuildFile; - settings = { - }; - }; - F5BAAB5D02AC4A5301A967F3 = { - fileRef = F568C3CD023A49C0010001CA; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB5E02AC4A5301A967F3 = { fileRef = F568C3D3023A4F71010001CA; isa = PBXBuildFile; @@ -7338,13 +7349,15 @@ }; F5BF71450231B8BC010001CA = { isa = PBXFileReference; - path = BrowserTabView.h; - refType = 4; + name = BrowserTabView.h; + path = ../src/browser/BrowserTabView.h; + refType = 2; }; F5BF71460231B8BC010001CA = { isa = PBXFileReference; - path = BrowserTabView.mm; - refType = 4; + name = BrowserTabView.mm; + path = ../src/browser/BrowserTabView.mm; + refType = 2; }; F5BF71510231DC5D010001CA = { fileRef = F5BF71450231B8BC010001CA; @@ -7361,13 +7374,13 @@ F5C2793102C514FF010000E1 = { isa = PBXFileReference; name = initpref.js; - path = ../dist/Embed/defaults/pref/initpref.js; + path = ../../dist/Embed/defaults/pref/initpref.js; refType = 2; }; F5C2793202C514FF010000E1 = { isa = PBXFileReference; name = macprefs.js; - path = ../dist/Embed/defaults/pref/macprefs.js; + path = ../../dist/Embed/defaults/pref/macprefs.js; refType = 2; }; F5C2793702C5158B010000E1 = { @@ -7397,7 +7410,7 @@ F5C2CDA702383CE601A967DF = { isa = PBXFileReference; name = libunicharutil_s.a; - path = ../intl/unicharutil/util/libunicharutil_s.a; + path = ../../intl/unicharutil/util/libunicharutil_s.a; refType = 2; }; F5C2CDA802383CE701A967DF = { @@ -7406,33 +7419,17 @@ settings = { }; }; - F5C321D002CBCEF7014E7D56 = { - isa = PBXFileReference; - name = nsXBLService.cpp; - path = /Volumes/Development/Projects/Mozilla/Chimera/mozilla/content/xbl/src/nsXBLService.cpp; - refType = 0; - }; - F5C321D402CBD01C014E7D56 = { - isa = PBXFileReference; - name = xmlparse.c; - path = /Volumes/Development/Projects/Mozilla/Chimera/mozilla/expat/xmlparse/xmlparse.c; - refType = 0; - }; - F5C321D702CBD0CE014E7D56 = { - isa = PBXFileReference; - name = nsXMLContentSink.cpp; - path = /Volumes/Development/Projects/Mozilla/Chimera/mozilla/content/xml/document/src/nsXMLContentSink.cpp; - refType = 0; - }; F5C3AB810270072A01A80166 = { isa = PBXFileReference; - path = CHExtendedOutlineView.h; - refType = 4; + name = ExtendedOutlineView.h; + path = ../src/extensions/ExtendedOutlineView.h; + refType = 2; }; F5C3AB820270072A01A80166 = { isa = PBXFileReference; - path = CHExtendedOutlineView.mm; - refType = 4; + name = ExtendedOutlineView.mm; + path = ../src/extensions/ExtendedOutlineView.mm; + refType = 2; }; F5C3AB830270072A01A80166 = { fileRef = F5C3AB810270072A01A80166; @@ -7458,8 +7455,8 @@ F5CA1A1A02D3956F01F34900 = { isa = PBXFileReference; name = English; - path = English.lproj/Navigator.scriptTerminology; - refType = 4; + path = ../English.lproj/Navigator.scriptTerminology; + refType = 2; }; F5CA1A1B02D3957001F34900 = { fileRef = F5CA1A1902D3956F01F34900; @@ -7475,10 +7472,10 @@ }; F5CA1A1D02D4ECDA01F34900 = { children = ( - F585677D02382E97010001CA, + F507A85303116EA401026D5D, F53F21EC022B7C77010001CA, F53F21ED022B7C77010001CA, - F53F21EE022B7C77010001CA, + F507A86103128A3D01026D5D, F53F21EF022B7C77010001CA, F53F21F0022B7C77010001CA, F53F21F1022B7C77010001CA, @@ -7503,17 +7500,20 @@ }; F5D33CBC02EF61A901A967F3 = { isa = PBXFileReference; - path = SecurityDialogs.h; + name = SecurityDialogs.h; + path = ../src/browser/SecurityDialogs.h; refType = 2; }; F5D33CBD02EF61A901A967F3 = { isa = PBXFileReference; - path = AppComponents.mm; + name = AppComponents.mm; + path = ../src/application/AppComponents.mm; refType = 2; }; F5D33CBE02EF61A901A967F3 = { isa = PBXFileReference; - path = SecurityDialogs.mm; + name = SecurityDialogs.mm; + path = ../src/browser/SecurityDialogs.mm; refType = 2; }; F5D33CBF02EF61AA01A967F3 = { @@ -7555,7 +7555,7 @@ F5D3F1CE0209235A014E447F = { isa = PBXFileReference; name = libmork.dylib; - path = ../db/mork/build/libmork.dylib; + path = ../../db/mork/build/libmork.dylib; refType = 2; }; F5D3F1D002092373014E447F = { @@ -7567,7 +7567,7 @@ F5DA444A027DD5AA01A80166 = { isa = PBXFileReference; name = "installed-chrome.txt"; - path = "../dist/Embed/chrome/installed-chrome.txt"; + path = "../../dist/Embed/chrome/installed-chrome.txt"; refType = 2; }; F5DA444C027DD5AA01A80166 = { @@ -7578,8 +7578,9 @@ }; F5DAB15002698C0D01A80166 = { isa = PBXFileReference; - path = bookmark_on.tif; - refType = 4; + name = bookmark_on.tif; + path = ../resources/images/toolbar/bookmark_on.tif; + refType = 2; }; F5DAB15102698C0D01A80166 = { fileRef = F5DAB15002698C0D01A80166; @@ -7589,18 +7590,21 @@ }; F5DAB15202698D5401A80166 = { isa = PBXFileReference; - path = delete_on.tif; - refType = 4; + name = delete_on.tif; + path = ../resources/images/toolbar/delete_on.tif; + refType = 2; }; F5DAB15302698D5401A80166 = { isa = PBXFileReference; - path = edit_on.tif; - refType = 4; + name = edit_on.tif; + path = ../resources/images/toolbar/edit_on.tif; + refType = 2; }; F5DAB15402698D5401A80166 = { isa = PBXFileReference; - path = folder_on.tif; - refType = 4; + name = folder_on.tif; + path = ../resources/images/toolbar/folder_on.tif; + refType = 2; }; F5DAB15502698D5401A80166 = { fileRef = F5DAB15202698D5401A80166; @@ -7622,33 +7626,39 @@ }; F5DE10E60209DC0601A967DF = { isa = PBXFileReference; - path = nsAlertController.h; - refType = 4; + name = nsAlertController.h; + path = ../src/browser/nsAlertController.h; + refType = 2; }; F5DE10E70209DC0601A967DF = { isa = PBXFileReference; - path = CHBrowserView.h; - refType = 4; + name = CHBrowserView.h; + path = ../src/embedding/CHBrowserView.h; + refType = 2; }; F5DE10E80209DC0601A967DF = { isa = PBXFileReference; - path = nsCocoaBrowserService.h; - refType = 4; + name = CHBrowserService.h; + path = ../src/embedding/CHBrowserService.h; + refType = 2; }; F5DE10E90209DC0601A967DF = { isa = PBXFileReference; - path = nsAlertController.mm; - refType = 4; + name = nsAlertController.mm; + path = ../src/browser/nsAlertController.mm; + refType = 2; }; F5DE10EA0209DC0601A967DF = { isa = PBXFileReference; - path = CHBrowserView.mm; - refType = 4; + name = CHBrowserView.mm; + path = ../src/embedding/CHBrowserView.mm; + refType = 2; }; F5DE10EB0209DC0601A967DF = { isa = PBXFileReference; - path = nsCocoaBrowserService.mm; - refType = 4; + name = CHBrowserService.mm; + path = ../src/embedding/CHBrowserService.mm; + refType = 2; }; F5DE10EC0209DC0601A967DF = { fileRef = F5DE10E60209DC0601A967DF; @@ -7686,51 +7696,6 @@ settings = { }; }; - F5E1196C022CDCA7010001CA = { - children = ( - F5555C8202022F070164C72B, - F5555C8302022F070164C72B, - F5555C8402022F070164C72B, - F5555C8502022F070164C72B, - F5547D60020333DA01F448B0, - F51842FE020629B701A966FE, - F53F5AE902448BC8010001CA, - F53F5AEA02448BC8010001CA, - F55CCFD2020E98EA010001CA, - F5EB9376030C92450100010C, - ); - isa = PBXGroup; - name = "Purple Images"; - refType = 4; - }; - F5E1196D022CDCA7010001CA = { - children = ( - ); - isa = PBXGroup; - name = "Gray Images"; - refType = 4; - }; - F5E1196E022CDCA7010001CA = { - children = ( - F5264FCD020D4C25010001CA, - F5264FCE020D4C25010001CA, - F5264FCF020D4C25010001CA, - F5264FD0020D4C25010001CA, - F5264FD1020D4C25010001CA, - F5264FD2020D4C25010001CA, - F5264FD3020D4C25010001CA, - ); - isa = PBXGroup; - name = "Purple Images"; - refType = 4; - }; - F5E1196F022CDCA7010001CA = { - children = ( - ); - isa = PBXGroup; - name = "Gray Images"; - refType = 4; - }; F5E37B0C02EE959601A967F3 = { fileRef = F55C4DD302D2864D0130B065; isa = PBXBuildFile; @@ -7776,7 +7741,7 @@ F5E47654030C5FD501A967F3 = { isa = PBXFileReference; name = libuniversalchardet.a; - path = ../extensions/universalchardet/src/libuniversalchardet.a; + path = ../../extensions/universalchardet/src/libuniversalchardet.a; refType = 2; }; F5E47655030C5FD501A967F3 = { @@ -7785,65 +7750,10 @@ settings = { }; }; - F5EA337802EF886D01A96654 = { - children = ( - F5EA337902EF889001A96654, - F5EA337A02EF889001A96654, - F5EA337B02EF889001A96654, - F5EA337C02EF889001A96654, - F5EA337D02EF889001A96654, - F5EA337E02EF889001A96654, - F522EFC502F73CF901A96654, - F522EFC602F73CF901A96654, - F522EFC702F73CF901A96654, - F522EFC802F73CF901A96654, - F522EFC902F73CF901A96654, - F522EFCA02F73CF901A96654, - F522EFCB02F73CF901A96654, - ); - isa = PBXGroup; - name = widget; - refType = 4; - }; - F5EA337902EF889001A96654 = { - isa = PBXFileReference; - name = nsAppShellCocoa.mm; - path = ../widget/src/cocoa/nsAppShellCocoa.mm; - refType = 2; - }; - F5EA337A02EF889001A96654 = { - isa = PBXFileReference; - name = nsChildView.mm; - path = ../widget/src/cocoa/nsChildView.mm; - refType = 2; - }; - F5EA337B02EF889001A96654 = { - isa = PBXFileReference; - name = nsCocoaWindow.mm; - path = ../widget/src/cocoa/nsCocoaWindow.mm; - refType = 2; - }; - F5EA337C02EF889001A96654 = { - isa = PBXFileReference; - name = nsDragHelperService.cpp; - path = ../widget/src/cocoa/nsDragHelperService.cpp; - refType = 2; - }; - F5EA337D02EF889001A96654 = { - isa = PBXFileReference; - name = nsDragService.cpp; - path = ../widget/src/cocoa/nsDragService.cpp; - refType = 2; - }; - F5EA337E02EF889001A96654 = { - isa = PBXFileReference; - name = nsToolkit.mm; - path = ../widget/src/cocoa/nsToolkit.mm; - refType = 2; - }; F5EB9376030C92450100010C = { isa = PBXFileReference; - path = showsource.tif; + name = showsource.tif; + path = ../resources/images/toolbar/showsource.tif; refType = 2; }; F5EB9377030C92450100010C = { @@ -7861,7 +7771,7 @@ F5F14E9602A5A43A01A967F3 = { isa = PBXFileReference; name = libwidget.rsrc; - path = ../dist/Embed/libwidget.rsrc; + path = ../../dist/Embed/libwidget.rsrc; refType = 2; }; F5F14E9802A5A43A01A967F3 = { @@ -7873,31 +7783,32 @@ F5F181C50208006F0124611D = { isa = PBXFileReference; name = history.xpt; - path = ../xpfe/components/history/public/_xpidlgen/history.xpt; + path = ../../xpfe/components/history/public/_xpidlgen/history.xpt; refType = 2; }; F5F181C60208006F0124611D = { isa = PBXFileReference; name = search.xpt; - path = ../xpfe/components/search/public/_xpidlgen/search.xpt; + path = ../../xpfe/components/search/public/_xpidlgen/search.xpt; refType = 2; }; F5F181C80208006F0124611D = { isa = PBXFileReference; name = autocomplete.xpt; - path = ../xpfe/components/autocomplete/public/_xpidlgen/autocomplete.xpt; + path = ../../xpfe/components/autocomplete/public/_xpidlgen/autocomplete.xpt; refType = 2; }; F5F181C90208006F0124611D = { isa = PBXFileReference; name = libappcomps.dylib; - path = ../xpfe/components/build/libappcomps.dylib; + path = ../../xpfe/components/build/libappcomps.dylib; refType = 2; }; F5F190BB02D1F81A01026D5D = { isa = PBXFileReference; - path = ToolbarDefaults.plist; - refType = 4; + name = ToolbarDefaults.plist; + path = ../resources/application/ToolbarDefaults.plist; + refType = 2; }; F5F190BC02D1F81A01026D5D = { fileRef = F5F190BB02D1F81A01026D5D; @@ -7913,8 +7824,9 @@ }; F5F190BE02D217C201026D5D = { isa = PBXFileReference; - path = WebsiteDefaults.strings; - refType = 4; + name = WebsiteDefaults.strings; + path = ../resources/application/WebsiteDefaults.strings; + refType = 2; }; F5F190BF02D217C201026D5D = { fileRef = F5F190BE02D217C201026D5D; @@ -7944,7 +7856,7 @@ F5F59320020F4CD201ACA690 = { isa = PBXFileReference; name = libtxmgr.dylib; - path = ../editor/txmgr/src/libtxmgr.dylib; + path = ../../editor/txmgr/src/libtxmgr.dylib; refType = 2; }; F5F59322020F4D0201ACA690 = { @@ -7965,8 +7877,9 @@ }; F5F9FBD902E13767012B5DB7 = { isa = PBXFileReference; - path = RegionMapping.plist; - refType = 4; + name = RegionMapping.plist; + path = ../PreferencePanes/Appearance/RegionMapping.plist; + refType = 2; }; F5F9FBDD02E1414C012B5DB7 = { fileRef = F5F9FBD902E13767012B5DB7; @@ -8022,13 +7935,15 @@ //F64 F632AF8302B9AEBB01000103 = { isa = PBXFileReference; - path = BrowserWindow.h; - refType = 4; + name = BrowserWindow.h; + path = ../src/browser/BrowserWindow.h; + refType = 2; }; F632AF8402B9AEBB01000103 = { isa = PBXFileReference; - path = BrowserWindow.mm; - refType = 4; + name = BrowserWindow.mm; + path = ../src/browser/BrowserWindow.mm; + refType = 2; }; F632AF8502B9AEBB01000103 = { fileRef = F632AF8302B9AEBB01000103; @@ -8045,7 +7960,7 @@ F655020201B480F201A962F7 = { isa = PBXFileReference; name = libnkcache.dylib; - path = ../netwerk/cache/src/libnkcache.dylib; + path = ../../netwerk/cache/src/libnkcache.dylib; refType = 2; }; F655020401B4812301A962F7 = { @@ -8056,7 +7971,8 @@ }; F6BA6D4E01B2F8A601A962F7 = { isa = PBXFileReference; - path = CHBrowserWrapper.mm; + name = BrowserWrapper.mm; + path = ../src/browser/BrowserWrapper.mm; refType = 2; }; F6BA6D4F01B2F8A601A962F7 = { @@ -8108,31 +8024,31 @@ F6BD637F01B30EA301A962F7 = { isa = PBXFileReference; name = libmozjs.dylib; - path = ../dist/Embed/libmozjs.dylib; + path = ../../dist/Embed/libmozjs.dylib; refType = 2; }; F6BD638001B30EA301A962F7 = { isa = PBXFileReference; name = libnspr4.dylib; - path = ../dist/Embed/libnspr4.dylib; + path = ../../dist/Embed/libnspr4.dylib; refType = 2; }; F6BD638101B30EA301A962F7 = { isa = PBXFileReference; name = libplc4.dylib; - path = ../dist/Embed/libplc4.dylib; + path = ../../dist/Embed/libplc4.dylib; refType = 2; }; F6BD638201B30EA301A962F7 = { isa = PBXFileReference; name = libplds4.dylib; - path = ../dist/Embed/libplds4.dylib; + path = ../../dist/Embed/libplds4.dylib; refType = 2; }; F6BD638701B30F5301A962F7 = { isa = PBXFileReference; name = libgkgfx.dylib; - path = ../dist/Embed/libgkgfx.dylib; + path = ../../dist/Embed/libgkgfx.dylib; refType = 2; }; F6BD638901B30F5301A962F7 = { @@ -8403,553 +8319,553 @@ F6BD639401B3131201A962F7 = { isa = PBXFileReference; name = caps.xpt; - path = ../dist/Embed/components/caps.xpt; + path = ../../dist/Embed/components/caps.xpt; refType = 2; }; F6BD639501B3131201A962F7 = { isa = PBXFileReference; name = chrome.xpt; - path = ../dist/Embed/components/chrome.xpt; + path = ../../dist/Embed/components/chrome.xpt; refType = 2; }; F6BD639601B3131201A962F7 = { isa = PBXFileReference; name = docshell.xpt; - path = ../dist/Embed/components/docshell.xpt; + path = ../../dist/Embed/components/docshell.xpt; refType = 2; }; F6BD639701B3131201A962F7 = { isa = PBXFileReference; name = dom_base.xpt; - path = ../dist/Embed/components/dom_base.xpt; + path = ../../dist/Embed/components/dom_base.xpt; refType = 2; }; F6BD639801B3131201A962F7 = { isa = PBXFileReference; name = dom_core.xpt; - path = ../dist/Embed/components/dom_core.xpt; + path = ../../dist/Embed/components/dom_core.xpt; refType = 2; }; F6BD639901B3131201A962F7 = { isa = PBXFileReference; name = dom_css.xpt; - path = ../dist/Embed/components/dom_css.xpt; + path = ../../dist/Embed/components/dom_css.xpt; refType = 2; }; F6BD639A01B3131201A962F7 = { isa = PBXFileReference; name = dom_events.xpt; - path = ../dist/Embed/components/dom_events.xpt; + path = ../../dist/Embed/components/dom_events.xpt; refType = 2; }; F6BD639B01B3131201A962F7 = { isa = PBXFileReference; name = dom_html.xpt; - path = ../dist/Embed/components/dom_html.xpt; + path = ../../dist/Embed/components/dom_html.xpt; refType = 2; }; F6BD639C01B3131201A962F7 = { isa = PBXFileReference; name = dom_range.xpt; - path = ../dist/Embed/components/dom_range.xpt; + path = ../../dist/Embed/components/dom_range.xpt; refType = 2; }; F6BD639D01B3131201A962F7 = { isa = PBXFileReference; name = dom_stylesheets.xpt; - path = ../dist/Embed/components/dom_stylesheets.xpt; + path = ../../dist/Embed/components/dom_stylesheets.xpt; refType = 2; }; F6BD639E01B3131201A962F7 = { isa = PBXFileReference; name = dom_traversal.xpt; - path = ../dist/Embed/components/dom_traversal.xpt; + path = ../../dist/Embed/components/dom_traversal.xpt; refType = 2; }; F6BD639F01B3131201A962F7 = { isa = PBXFileReference; name = dom_views.xpt; - path = ../dist/Embed/components/dom_views.xpt; + path = ../../dist/Embed/components/dom_views.xpt; refType = 2; }; F6BD63A001B3131201A962F7 = { isa = PBXFileReference; name = dom_xbl.xpt; - path = ../dist/Embed/components/dom_xbl.xpt; + path = ../../dist/Embed/components/dom_xbl.xpt; refType = 2; }; F6BD63A101B3131201A962F7 = { isa = PBXFileReference; name = dom_xul.xpt; - path = ../dist/Embed/components/dom_xul.xpt; + path = ../../dist/Embed/components/dom_xul.xpt; refType = 2; }; F6BD63A201B3131201A962F7 = { isa = PBXFileReference; name = dom.xpt; - path = ../dist/Embed/components/dom.xpt; + path = ../../dist/Embed/components/dom.xpt; refType = 2; }; F6BD63A401B3131201A962F7 = { isa = PBXFileReference; name = gfx.xpt; - path = ../dist/Embed/components/gfx.xpt; + path = ../../dist/Embed/components/gfx.xpt; refType = 2; }; F6BD63A501B3131201A962F7 = { isa = PBXFileReference; name = gfx2.xpt; - path = ../dist/Embed/components/gfx2.xpt; + path = ../../dist/Embed/components/gfx2.xpt; refType = 2; }; F6BD63A601B3131201A962F7 = { isa = PBXFileReference; name = libcaps.dylib; - path = ../dist/Embed/components/libcaps.dylib; + path = ../../dist/Embed/components/libcaps.dylib; refType = 2; }; F6BD63A701B3131201A962F7 = { isa = PBXFileReference; name = libchrome.dylib; - path = ../dist/Embed/components/libchrome.dylib; + path = ../../dist/Embed/components/libchrome.dylib; refType = 2; }; F6BD63A801B3131201A962F7 = { isa = PBXFileReference; name = libcookie.dylib; - path = ../dist/Embed/components/libcookie.dylib; + path = ../../dist/Embed/components/libcookie.dylib; refType = 2; }; F6BD63A901B3131201A962F7 = { isa = PBXFileReference; name = libdocshell.dylib; - path = ../dist/Embed/components/libdocshell.dylib; + path = ../../dist/Embed/components/libdocshell.dylib; refType = 2; }; F6BD63AA01B3131201A962F7 = { isa = PBXFileReference; name = libeditor.dylib; - path = ../dist/Embed/components/libeditor.dylib; + path = ../../dist/Embed/components/libeditor.dylib; refType = 2; }; F6BD63AB01B3131201A962F7 = { isa = PBXFileReference; name = libembedcomponents.dylib; - path = ../dist/Embed/components/libembedcomponents.dylib; + path = ../../dist/Embed/components/libembedcomponents.dylib; refType = 2; }; F6BD63AC01B3131201A962F7 = { isa = PBXFileReference; name = libgfx_mac.dylib; - path = ../dist/Embed/components/libgfx_mac.dylib; + path = ../../dist/Embed/components/libgfx_mac.dylib; refType = 2; }; F6BD63AD01B3131201A962F7 = { isa = PBXFileReference; name = libgfx2.dylib; - path = ../dist/Embed/components/libgfx2.dylib; + path = ../../dist/Embed/components/libgfx2.dylib; refType = 2; }; F6BD63B001B3131201A962F7 = { isa = PBXFileReference; name = libtxtsvc.dylib; - path = ../dist/Embed/components/libtxtsvc.dylib; + path = ../../dist/Embed/components/libtxtsvc.dylib; refType = 2; }; F6BD63B101B3131201A962F7 = { isa = PBXFileReference; name = libwebbrwsr.dylib; - path = ../dist/Embed/components/libwebbrwsr.dylib; + path = ../../dist/Embed/components/libwebbrwsr.dylib; refType = 2; }; F6BD63B201B3131201A962F7 = { isa = PBXFileReference; name = mimetype.xpt; - path = ../netwerk/mime/public/_xpidlgen/mimetype.xpt; + path = ../../netwerk/mime/public/_xpidlgen/mimetype.xpt; refType = 2; }; F6BD63B301B3131201A962F7 = { isa = PBXFileReference; name = txtsvc.xpt; - path = ../dist/Embed/components/txtsvc.xpt; + path = ../../dist/Embed/components/txtsvc.xpt; refType = 2; }; F6BD63B401B3131201A962F7 = { isa = PBXFileReference; name = webBrowser_core.xpt; - path = ../dist/Embed/components/webBrowser_core.xpt; + path = ../../dist/Embed/components/webBrowser_core.xpt; refType = 2; }; F6BD63B501B3131201A962F7 = { isa = PBXFileReference; name = windowwatcher.xpt; - path = ../dist/Embed/components/windowwatcher.xpt; + path = ../../dist/Embed/components/windowwatcher.xpt; refType = 2; }; F6BD63D901B313EE01A962F7 = { isa = PBXFileReference; name = content_base.xpt; - path = ../dist/Embed/components/content_base.xpt; + path = ../../dist/Embed/components/content_base.xpt; refType = 2; }; F6BD63DA01B313EE01A962F7 = { isa = PBXFileReference; name = jar.xpt; - path = ../dist/Embed/components/jar.xpt; + path = ../../dist/Embed/components/jar.xpt; refType = 2; }; F6BD63DB01B313EE01A962F7 = { isa = PBXFileReference; name = jsurl.xpt; - path = ../dist/Embed/components/jsurl.xpt; + path = ../../dist/Embed/components/jsurl.xpt; refType = 2; }; F6BD63DC01B313EE01A962F7 = { isa = PBXFileReference; name = layout_base.xpt; - path = ../dist/Embed/components/layout_base.xpt; + path = ../../dist/Embed/components/layout_base.xpt; refType = 2; }; F6BD63DD01B313EE01A962F7 = { isa = PBXFileReference; name = layout_xul.xpt; - path = ../dist/Embed/components/layout_xul.xpt; + path = ../../dist/Embed/components/layout_xul.xpt; refType = 2; }; F6BD63DE01B313EE01A962F7 = { isa = PBXFileReference; name = libgkcontent.dylib; - path = ../dist/Embed/components/libgkcontent.dylib; + path = ../../dist/Embed/components/libgkcontent.dylib; refType = 2; }; F6BD63DF01B313EE01A962F7 = { isa = PBXFileReference; name = libgklayout.dylib; - path = ../dist/Embed/components/libgklayout.dylib; + path = ../../dist/Embed/components/libgklayout.dylib; refType = 2; }; F6BD63E001B313EE01A962F7 = { isa = PBXFileReference; name = libgkview.dylib; - path = ../dist/Embed/components/libgkview.dylib; + path = ../../dist/Embed/components/libgkview.dylib; refType = 2; }; F6BD63E101B313EE01A962F7 = { isa = PBXFileReference; name = libhtmlpars.dylib; - path = ../dist/Embed/components/libhtmlpars.dylib; + path = ../../dist/Embed/components/libhtmlpars.dylib; refType = 2; }; F6BD63E201B313EE01A962F7 = { isa = PBXFileReference; name = libjar50.dylib; - path = ../dist/Embed/components/libjar50.dylib; + path = ../../dist/Embed/components/libjar50.dylib; refType = 2; }; F6BD63E301B313EE01A962F7 = { isa = PBXFileReference; name = libjsurl.dylib; - path = ../dist/Embed/components/libjsurl.dylib; + path = ../../dist/Embed/components/libjsurl.dylib; refType = 2; }; F6BD63E401B313EE01A962F7 = { isa = PBXFileReference; name = libnecko.dylib; - path = ../dist/Embed/components/libnecko.dylib; + path = ../../dist/Embed/components/libnecko.dylib; refType = 2; }; F6BD63E501B313EE01A962F7 = { isa = PBXFileReference; name = libnecko2.dylib; - path = ../dist/Embed/components/libnecko2.dylib; + path = ../../dist/Embed/components/libnecko2.dylib; refType = 2; }; F6BD63E601B313EE01A962F7 = { isa = PBXFileReference; name = necko_about.xpt; - path = ../dist/Embed/components/necko_about.xpt; + path = ../../dist/Embed/components/necko_about.xpt; refType = 2; }; F6BD63E701B313EE01A962F7 = { isa = PBXFileReference; name = necko_cache.xpt; - path = ../dist/Embed/components/necko_cache.xpt; + path = ../../dist/Embed/components/necko_cache.xpt; refType = 2; }; F6BD63E801B313EE01A962F7 = { isa = PBXFileReference; name = necko_data.xpt; - path = ../dist/Embed/components/necko_data.xpt; + path = ../../dist/Embed/components/necko_data.xpt; refType = 2; }; F6BD63E901B313EE01A962F7 = { isa = PBXFileReference; name = necko_dns.xpt; - path = ../dist/Embed/components/necko_dns.xpt; + path = ../../dist/Embed/components/necko_dns.xpt; refType = 2; }; F6BD63EA01B313EE01A962F7 = { isa = PBXFileReference; name = necko_ftp.xpt; - path = ../dist/Embed/components/necko_ftp.xpt; + path = ../../dist/Embed/components/necko_ftp.xpt; refType = 2; }; F6BD63EB01B313EE01A962F7 = { isa = PBXFileReference; name = necko_http.xpt; - path = ../dist/Embed/components/necko_http.xpt; + path = ../../dist/Embed/components/necko_http.xpt; refType = 2; }; F6BD63EC01B313EE01A962F7 = { isa = PBXFileReference; name = necko_jar.xpt; - path = ../dist/Embed/components/necko_jar.xpt; + path = ../../dist/Embed/components/necko_jar.xpt; refType = 2; }; F6BD63ED01B313EE01A962F7 = { isa = PBXFileReference; name = necko_res.xpt; - path = ../dist/Embed/components/necko_res.xpt; + path = ../../dist/Embed/components/necko_res.xpt; refType = 2; }; F6BD63EE01B313EE01A962F7 = { isa = PBXFileReference; name = necko_socket.xpt; - path = ../netwerk/socket/base/_xpidlgen/necko_socket.xpt; + path = ../../netwerk/socket/base/_xpidlgen/necko_socket.xpt; refType = 2; }; F6BD63EF01B313EE01A962F7 = { isa = PBXFileReference; name = necko_strconv.xpt; - path = ../dist/Embed/components/necko_strconv.xpt; + path = ../../dist/Embed/components/necko_strconv.xpt; refType = 2; }; F6BD63F001B313EE01A962F7 = { isa = PBXFileReference; name = necko_viewsource.xpt; - path = ../netwerk/protocol/viewsource/public/_xpidlgen/necko_viewsource.xpt; + path = ../../netwerk/protocol/viewsource/public/_xpidlgen/necko_viewsource.xpt; refType = 2; }; F6BD63F101B313EE01A962F7 = { isa = PBXFileReference; name = necko.xpt; - path = ../dist/Embed/components/necko.xpt; + path = ../../dist/Embed/components/necko.xpt; refType = 2; }; F6BD640B01B3156701A962F7 = { isa = PBXFileReference; name = libchardet.dylib; - path = ../dist/Embed/components/libchardet.dylib; + path = ../../dist/Embed/components/libchardet.dylib; refType = 2; }; F6BD640C01B3156701A962F7 = { isa = PBXFileReference; name = libimggif.dylib; - path = ../dist/Embed/components/libimggif.dylib; + path = ../../dist/Embed/components/libimggif.dylib; refType = 2; }; F6BD640D01B3156701A962F7 = { isa = PBXFileReference; name = libimgjpeg.dylib; - path = ../dist/Embed/components/libimgjpeg.dylib; + path = ../../dist/Embed/components/libimgjpeg.dylib; refType = 2; }; F6BD640E01B3156701A962F7 = { isa = PBXFileReference; name = libimglib2.dylib; - path = ../dist/Embed/components/libimglib2.dylib; + path = ../../dist/Embed/components/libimglib2.dylib; refType = 2; }; F6BD640F01B3156701A962F7 = { isa = PBXFileReference; name = libimgpng.dylib; - path = ../dist/Embed/components/libimgpng.dylib; + path = ../../dist/Embed/components/libimgpng.dylib; refType = 2; }; F6BD641001B3156701A962F7 = { isa = PBXFileReference; name = liblwbrk.dylib; - path = ../dist/Embed/components/liblwbrk.dylib; + path = ../../dist/Embed/components/liblwbrk.dylib; refType = 2; }; F6BD641101B3156701A962F7 = { isa = PBXFileReference; name = libnslocale.dylib; - path = ../dist/Embed/components/libnslocale.dylib; + path = ../../dist/Embed/components/libnslocale.dylib; refType = 2; }; F6BD641201B3156701A962F7 = { isa = PBXFileReference; name = libpref.dylib; - path = ../dist/Embed/components/libpref.dylib; + path = ../../dist/Embed/components/libpref.dylib; refType = 2; }; F6BD641301B3156701A962F7 = { isa = PBXFileReference; name = libprofile.dylib; - path = ../dist/Embed/components/libprofile.dylib; + path = ../../dist/Embed/components/libprofile.dylib; refType = 2; }; F6BD641401B3156701A962F7 = { isa = PBXFileReference; name = librdf.dylib; - path = ../dist/Embed/components/librdf.dylib; + path = ../../dist/Embed/components/librdf.dylib; refType = 2; }; F6BD641501B3156701A962F7 = { isa = PBXFileReference; name = libshistory.dylib; - path = ../dist/Embed/components/libshistory.dylib; + path = ../../dist/Embed/components/libshistory.dylib; refType = 2; }; F6BD641601B3156701A962F7 = { isa = PBXFileReference; name = libstrres.dylib; - path = ../dist/Embed/components/libstrres.dylib; + path = ../../dist/Embed/components/libstrres.dylib; refType = 2; }; F6BD641701B3156701A962F7 = { isa = PBXFileReference; name = libuconv.dylib; - path = ../dist/Embed/components/libuconv.dylib; + path = ../../dist/Embed/components/libuconv.dylib; refType = 2; }; F6BD641801B3156701A962F7 = { isa = PBXFileReference; name = libucvlatin.dylib; - path = ../dist/Embed/components/libucvlatin.dylib; + path = ../../dist/Embed/components/libucvlatin.dylib; refType = 2; }; F6BD641901B3156701A962F7 = { isa = PBXFileReference; name = libunicharutil.dylib; - path = ../dist/Embed/components/libunicharutil.dylib; + path = ../../dist/Embed/components/libunicharutil.dylib; refType = 2; }; F6BD641A01B3156701A962F7 = { isa = PBXFileReference; name = liburiloader.dylib; - path = ../dist/Embed/components/liburiloader.dylib; + path = ../../dist/Embed/components/liburiloader.dylib; refType = 2; }; F6BD641B01B3156701A962F7 = { isa = PBXFileReference; name = libwidget_mac.dylib; - path = ../dist/Embed/components/libwidget_mac.dylib; + path = ../../dist/Embed/components/libwidget_mac.dylib; refType = 2; }; F6BD641C01B3156701A962F7 = { isa = PBXFileReference; name = libxpconnect.dylib; - path = ../dist/Embed/components/libxpconnect.dylib; + path = ../../dist/Embed/components/libxpconnect.dylib; refType = 2; }; F6BD641D01B3156701A962F7 = { isa = PBXFileReference; name = pref.xpt; - path = ../dist/Embed/components/pref.xpt; + path = ../../dist/Embed/components/pref.xpt; refType = 2; }; F6BD641E01B3156701A962F7 = { isa = PBXFileReference; name = profile.xpt; - path = ../dist/Embed/components/profile.xpt; + path = ../../dist/Embed/components/profile.xpt; refType = 2; }; F6BD641F01B3156701A962F7 = { isa = PBXFileReference; name = rdf.xpt; - path = ../dist/Embed/components/rdf.xpt; + path = ../../dist/Embed/components/rdf.xpt; refType = 2; }; F6BD642001B3156701A962F7 = { isa = PBXFileReference; name = shistory.xpt; - path = ../dist/Embed/components/shistory.xpt; + path = ../../dist/Embed/components/shistory.xpt; refType = 2; }; F6BD642101B3156701A962F7 = { isa = PBXFileReference; name = uconv.xpt; - path = ../dist/Embed/components/uconv.xpt; + path = ../../dist/Embed/components/uconv.xpt; refType = 2; }; F6BD642201B3156701A962F7 = { isa = PBXFileReference; name = unicharutil.xpt; - path = ../dist/Embed/components/unicharutil.xpt; + path = ../../dist/Embed/components/unicharutil.xpt; refType = 2; }; F6BD642301B3156701A962F7 = { isa = PBXFileReference; name = uriloader.xpt; - path = ../dist/Embed/components/uriloader.xpt; + path = ../../dist/Embed/components/uriloader.xpt; refType = 2; }; F6BD642501B3156701A962F7 = { isa = PBXFileReference; name = xpcom_base.xpt; - path = ../dist/Embed/components/xpcom_base.xpt; + path = ../../dist/Embed/components/xpcom_base.xpt; refType = 2; }; F6BD642601B3156701A962F7 = { isa = PBXFileReference; name = xpcom_components.xpt; - path = ../dist/Embed/components/xpcom_components.xpt; + path = ../../dist/Embed/components/xpcom_components.xpt; refType = 2; }; F6BD642701B3156701A962F7 = { isa = PBXFileReference; name = xpcom_ds.xpt; - path = ../dist/Embed/components/xpcom_ds.xpt; + path = ../../dist/Embed/components/xpcom_ds.xpt; refType = 2; }; F6BD642801B3156701A962F7 = { isa = PBXFileReference; name = xpcom_io.xpt; - path = ../dist/Embed/components/xpcom_io.xpt; + path = ../../dist/Embed/components/xpcom_io.xpt; refType = 2; }; F6BD642901B3156701A962F7 = { isa = PBXFileReference; name = xpcom_threads.xpt; - path = ../dist/Embed/components/xpcom_threads.xpt; + path = ../../dist/Embed/components/xpcom_threads.xpt; refType = 2; }; F6BD642A01B3156701A962F7 = { isa = PBXFileReference; name = xpcom_xpti.xpt; - path = ../dist/Embed/components/xpcom_xpti.xpt; + path = ../../dist/Embed/components/xpcom_xpti.xpt; refType = 2; }; F6BD642B01B3156701A962F7 = { isa = PBXFileReference; name = xpconnect.xpt; - path = ../dist/Embed/components/xpconnect.xpt; + path = ../../dist/Embed/components/xpconnect.xpt; refType = 2; }; F6BD644D01B315FA01A962F7 = { isa = PBXFileReference; name = embed_base.xpt; - path = ../embedding/base/_xpidlgen/embed_base.xpt; + path = ../../embedding/base/_xpidlgen/embed_base.xpt; refType = 2; }; F6BD644E01B315FA01A962F7 = { isa = PBXFileReference; name = imglib2.xpt; - path = ../dist/Embed/components/imglib2.xpt; + path = ../../dist/Embed/components/imglib2.xpt; refType = 2; }; F6BD644F01B315FA01A962F7 = { isa = PBXFileReference; name = libgkplugin.dylib; - path = ../modules/plugin/base/src/libgkplugin.dylib; + path = ../../modules/plugin/base/src/libgkplugin.dylib; refType = 2; }; F6BD645001B315FA01A962F7 = { isa = PBXFileReference; name = libjsdom.dylib; - path = ../dist/Embed/components/libjsdom.dylib; + path = ../../dist/Embed/components/libjsdom.dylib; refType = 2; }; F6BD645501B3167601A962F7 = { @@ -9552,31 +9468,31 @@ F6BD64B801B316DA01A962F7 = { isa = PBXFileReference; name = charsetalias.properties; - path = ../dist/Embed/res/charsetalias.properties; + path = ../../dist/Embed/res/charsetalias.properties; refType = 2; }; F6BD64B901B316DA01A962F7 = { isa = PBXFileReference; name = charsetData.properties; - path = ../dist/Embed/res/charsetData.properties; + path = ../../dist/Embed/res/charsetData.properties; refType = 2; }; F6BD64BA01B316DA01A962F7 = { isa = PBXFileReference; name = langGroups.properties; - path = ../dist/Embed/res/langGroups.properties; + path = ../../dist/Embed/res/langGroups.properties; refType = 2; }; F6BD64BB01B316DA01A962F7 = { isa = PBXFileReference; name = language.properties; - path = ../dist/Embed/res/language.properties; + path = ../../dist/Embed/res/language.properties; refType = 2; }; F6BD64BC01B316DA01A962F7 = { isa = PBXFileReference; name = unixcharset.properties; - path = ../dist/Embed/res/unixcharset.properties; + path = ../../dist/Embed/res/unixcharset.properties; refType = 2; }; F6BD64C201B316DA01A962F7 = { @@ -9612,7 +9528,7 @@ F6BD64C701B3172601A962F7 = { isa = PBXFileReference; name = arrow.gif; - path = ../dist/Embed/res/arrow.gif; + path = ../../dist/Embed/res/arrow.gif; refType = 2; }; F6BD64C801B3172601A962F7 = { @@ -9628,13 +9544,13 @@ F6BD64D301B3172601A962F7 = { isa = PBXFileReference; name = htmlBindings.xml; - path = ../dist/Embed/res/builtin/htmlBindings.xml; + path = ../../dist/Embed/res/builtin/htmlBindings.xml; refType = 2; }; F6BD64D501B3172601A962F7 = { isa = PBXFileReference; name = platformHTMLBindings.xml; - path = ../dist/Embed/res/builtin/platformHTMLBindings.xml; + path = ../../dist/Embed/res/builtin/platformHTMLBindings.xml; refType = 2; }; F6BD64D701B3172601A962F7 = { @@ -9653,61 +9569,61 @@ F6BD64D801B3172601A962F7 = { isa = PBXFileReference; name = html40Latin1.properties; - path = ../dist/Embed/res/entityTables/html40Latin1.properties; + path = ../../dist/Embed/res/entityTables/html40Latin1.properties; refType = 2; }; F6BD64D901B3172601A962F7 = { isa = PBXFileReference; name = html40Special.properties; - path = ../dist/Embed/res/entityTables/html40Special.properties; + path = ../../dist/Embed/res/entityTables/html40Special.properties; refType = 2; }; F6BD64DA01B3172601A962F7 = { isa = PBXFileReference; name = html40Symbols.properties; - path = ../dist/Embed/res/entityTables/html40Symbols.properties; + path = ../../dist/Embed/res/entityTables/html40Symbols.properties; refType = 2; }; F6BD64DB01B3172601A962F7 = { isa = PBXFileReference; name = htmlEntityVersions.properties; - path = ../dist/Embed/res/entityTables/htmlEntityVersions.properties; + path = ../../dist/Embed/res/entityTables/htmlEntityVersions.properties; refType = 2; }; F6BD64DC01B3172601A962F7 = { isa = PBXFileReference; name = transliterate.properties; - path = ../dist/Embed/res/entityTables/transliterate.properties; + path = ../../dist/Embed/res/entityTables/transliterate.properties; refType = 2; }; F6BD64DD01B3172601A962F7 = { isa = PBXFileReference; name = forms.css; - path = ../dist/Embed/res/forms.css; + path = ../../dist/Embed/res/forms.css; refType = 2; }; F6BD64DE01B3172601A962F7 = { isa = PBXFileReference; name = html.css; - path = ../dist/Embed/res/html.css; + path = ../../dist/Embed/res/html.css; refType = 2; }; F6BD64DF01B3172601A962F7 = { isa = PBXFileReference; name = quirk.css; - path = ../dist/Embed/res/quirk.css; + path = ../../dist/Embed/res/quirk.css; refType = 2; }; F6BD64E001B3172601A962F7 = { isa = PBXFileReference; name = ua.css; - path = ../dist/Embed/res/ua.css; + path = ../../dist/Embed/res/ua.css; refType = 2; }; F6BD64E101B3172601A962F7 = { isa = PBXFileReference; name = viewsource.css; - path = ../dist/Embed/res/viewsource.css; + path = ../../dist/Embed/res/viewsource.css; refType = 2; }; F6BD64FB01B3184301A962F7 = { @@ -9726,7 +9642,7 @@ F6BD64FC01B3184301A962F7 = { isa = PBXFileReference; name = all.js; - path = ../dist/Embed/defaults/pref/all.js; + path = ../../dist/Embed/defaults/pref/all.js; refType = 2; }; F6BD64FF01B3184301A962F7 = { @@ -9743,7 +9659,7 @@ F6BD650001B3184301A962F7 = { isa = PBXFileReference; name = embed.jar; - path = ../dist/Embed/chrome/embed.jar; + path = ../../dist/Embed/chrome/embed.jar; refType = 2; }; F6BD650401B3184301A962F7 = { diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib index 8802bdedcfd..9d9409b58ee 100644 --- a/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib +++ b/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib @@ -1,5 +1,13 @@ { IBClasses = ( + {CLASS = AutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + { + ACTIONS = {onBlur = id; onResize = id; }; + CLASS = AutoCompleteTextField; + LANGUAGE = ObjC; + OUTLETS = {mProxyIcon = PageProxyIcon; }; + SUPERCLASS = NSTextField; + }, {CLASS = BookmarkItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { ACTIONS = { @@ -20,6 +28,11 @@ }; SUPERCLASS = NSObject; }, + { + CLASS = BookmarksOutlineView; + LANGUAGE = ObjC; + SUPERCLASS = ExtendedOutlineView; + }, {CLASS = BookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = BrowserTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, { @@ -65,7 +78,7 @@ mBackItem = NSMenuItem; mCachedBMDS = id; mForwardItem = NSMenuItem; - mHistoryDataSource = CHHistoryDataSource; + mHistoryDataSource = HistoryDataSource; mImageLinkMenu = NSMenu; mImageMenu = NSMenu; mInputMenu = NSMenu; @@ -75,7 +88,7 @@ mLocationToolbarView = NSView; mLock = NSImageView; mPageMenu = NSMenu; - mPersonalToolbar = CHBookmarksToolbar; + mPersonalToolbar = BookmarksToolbar; mProgress = NSProgressIndicator; mProxyIcon = NSImageView; mSidebarBookmarksDataSource = BookmarksDataSource; @@ -85,28 +98,14 @@ mSidebarTabView = NSTabView; mStatus = NSTextField; mStatusBar = NSView; - mTabBrowser = CHExtendedTabView; + mTabBrowser = BrowserTabView; mURLBar = NSTextField; }; SUPERCLASS = NSWindowController; }, - {CLASS = CHAutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {onBlur = id; onResize = id; }; - CLASS = CHAutoCompleteTextField; - LANGUAGE = ObjC; - OUTLETS = {mProxyIcon = CHPageProxyIcon; }; - SUPERCLASS = NSTextField; - }, - { - CLASS = CHBookmarksOutlineView; - LANGUAGE = ObjC; - SUPERCLASS = CHExtendedOutlineView; - }, - {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { ACTIONS = {load = id; }; - CLASS = CHBrowserWrapper; + CLASS = BrowserWrapper; LANGUAGE = ObjC; OUTLETS = { mLockIcon = id; @@ -118,43 +117,23 @@ }; SUPERCLASS = NSView; }, - {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, + {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - CLASS = CHHistoryDataSource; + CLASS = HistoryDataSource; LANGUAGE = ObjC; OUTLETS = {mBrowserWindowController = id; }; - SUPERCLASS = CHRDFOutlineViewDataSource; + SUPERCLASS = RDFOutlineViewDataSource; }, - {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = CHPageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, + {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + {CLASS = MainController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = PageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, { - CLASS = CHRDFOutlineViewDataSource; + CLASS = RDFOutlineViewDataSource; LANGUAGE = ObjC; OUTLETS = {mOutlineView = id; }; SUPERCLASS = NSObject; }, - {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = MainController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {load = id; }; - CLASS = MyBrowserView; - LANGUAGE = ObjC; - OUTLETS = { - mImageLinkMenu = id; - mImageMenu = id; - mInputMenu = id; - mLinkMenu = id; - mPageMenu = id; - mWindowController = id; - progress = id; - progressSuper = id; - status = id; - urlbar = id; - }; - SUPERCLASS = NSView; - }, {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib index 667fcc69e64..82fa1b33249 100644 --- a/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 176 79 632 495 0 0 1280 1002 + 208 152 630 599 0 0 1280 1002 IBEditorPositions 124 @@ -39,11 +39,7 @@ 4 IBLockedObjects - IBOpenObjects - - 10 - IBSystem Version - 5S60 + 5S66 diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/objects.nib index d775c7ae2dba6c102cff6d416dc9fb80155a79f1..9fb6b7c29592f028f0572eb0cfdd7cbd63aa02f3 100644 GIT binary patch literal 14664 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 MmqPtI{d>Uw2gQS!I{*Lx diff --git a/mozilla/camino/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/English.lproj/MainMenu.nib/classes.nib index fae3aa7579e..f4d1aa2760b 100644 --- a/mozilla/camino/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/camino/English.lproj/MainMenu.nib/classes.nib @@ -5,8 +5,8 @@ LANGUAGE = ObjC; SUPERCLASS = ToolbarController; }, - {CLASS = CHGoMenu; LANGUAGE = ObjC; SUPERCLASS = NSMenu; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = GoMenu; LANGUAGE = ObjC; SUPERCLASS = NSMenu; }, { ACTIONS = { addBookmark = id; diff --git a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib index 3eb3a4600a89cc048d32ccdf7e6149915a22fdac..2ad295b96c9eaffb8916ee5ee27d5b421113d191 100644 GIT binary patch literal 9928 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 VrmmeGPQ)=gQ)b*ch?99f|NrKi=ym`A literal 9885 zcmbVS4Rl<^b)K=-vi^Ut!7)9M&A}1i5L}Z(3oZu9GO|@H$?@8O;_AR^_ep;7?!N8r zlZBJE$tb&fa!%TlRJA4`L~tM`PTXTVbxU32+HU9%(@;tSEv;Khtkwtz7fRF65{ljL z&b)p5Bzae&@0Z^S@Ye$0?`4rg5_X@EEG%`Ivt*5=+w&#)UENLUd!W2c6==JdYz=J+QX zdm|m`bi$5BUE4_&@`W6?2PHV`z-gt1yIm_O_BW6uot*kSgiCH)9l^}%F?qqbxA|_fMl{L8#r@~v{)~PQ(r4=5mESoG{r};XDqIOEN43%R+SQ~$L zI_W){G**suQo`6KnmZHGY&J3yO{cBQD%w!jVa}S)O&cAGtiofDkq(PC!W8=^s>!3u zOtQ&I!b8PCo)sg8raodtGqIg|!CIfLa{3s#qw`wQn|pmUwo41#QCT3VzNE{^j6^eW zP2XRZ{yDN<83jc1KC`Ek%#l4Fek8QXN~Fmmi%9b`+9FN8(cSh?)O9i@bSj0J;kcs2 z(Pdfj0a{f#F3MSOnQ=!=4}w9v2P)K%3R7BzT3_HCIk~3n@IVqC?TAqdT&uGLiF+L) z>Pf`37SY@>;0(Lr@`8dXW4fHh0y)TtZQ7Et2Ca;hidos4Z@zhsdjCJEH4!Vb+lI(F z^1kJ-58f(~VXce;q4|N{NRe0Dv7qzihgi=hJ8lK61etti+2Hc6Td&#r+?`ftuFf-U zK(SjB+3Aev$jN{70?OZQ>de{#7mbCu0a$1v}8ek_nIIVz@OsIvr?8Mv*T{3$W zOs$W@kPfT5UTY+LFA|_LqBmly+^n=9!?J`}wnYaty<3@neghbp4Si`V6(-e-3D~JD zn7q)UnKnD7cqlR^Dl;xvqt1krwSuM@sVtZ@sx?exoJxTaTEO=7+!KlJw!$6R;^MNE zby(=)8tJGDM=W^Ch_8JQ3s(ng@FF)#cV( zQtm3P+VO*v&sn%MCtRFk5Uzg z(pulCbDUWU)w>a@RTK?fI#fT>5jQ3eyH42Wr|_e2ikDNYB%q}ynxZZ0^Om1`^ouBS zH)H;4V(-!Oub35$C~kxCJWxr2o&_W)GfQhH?ujl=TNuB~NyIJe$})AQVOSPmh*;@p zhKjNZJoEeC$X(iiWyABv4}*kqxNycH7P{a+7yJB7Iw|jJldqkTZ%xZpH1UE0GY3*65}m z?KL9TF!sY-uAw(lqPk1}ZA1}8t8UQIR|lFEwmq8bxX4Cpa5m*a?f9XV8ajAg*z8yC zomiP$yyH{95bLi7{%ZVp@eF_Zv)_-V0CmBv;eAnx@;>EUm@5NV}k9UV8`jZoB;An`$R;-<|-$T-=^|sR5x`JSj<@4Xusa&uFxvCg7J#}ZZ z(@8i`{YZ7L3hIHYI@EhL~BhrYYnEJ9MNfw`g$iOLwjM?m=EKkm{3y9R_iW zM@(7;8BQ@!7N9&|i=L%mkHheJ#sud-Z+@G#jpZdS@^CEKO(*4mX$u9(QYj;@)51|1lsmNYujP7e0Vtv#}HN^a_sH?+xnd%$;s6nkb;-q9x8 z+hn9i9-NdrNZ{k7>h>P_ijpg*WM7XwF)3eE^4O$&=WUtnm$$WnXq>q3>yc~P0!OXx z(9gD#Upo6ot!d=%o2a9-EZFz=Q6>+S>Cew$(F8A^oE4kkzEU5e4UXgS{;r8Dk?!?5uuuMt&C1V06h-S%yWSVPtTQh0wByVV zU`V{D=nSEmy~i=jMOt4>txuQXS*#n03Mb8-M0I6vq}LwsG69AZo>d%({2P5n8f92AQ36hQ!A!Gc z$f5TefA(8EaNMB|kPp7qfNSH9Y47-m3kIUWsT(D}1AOrjgRg_%OmD)+Y&V!jVEiV8kGz4Lw$ycoh7y+NH|nLN ze1g@6d$}R;=k;iPvim&sY~7jg$$Wgf!PoCb*<|VuA60Eobt!9PmeXntW(hDsGdCJ= zt%DvqeAE>4shwc zuo`?TN_)XGNik~{)6fwTABqKpP7q{q43DG!JVyysouu@d@tP6ZIOshMZnjgU z4YZ6n8oflKUjuw$%MD*`j2;$B{?n#g2CijEO>cZY(`uS#IcQo94Y)5uut^I+>#-Pa zm!XM(=Gvs`!xhQ0W`kUYdON5;Hk;btG&31~a`IJgfi@oKXBg#04}mPEAD%sv=vCc> zDXvOx(;Lp~QO=folVNW%Th1f$&5DYZPLd@J=f39v2{BiYD z!M>)Zu2D$mm(;a_e@ERb_$x~AKEZ#eK0xWJjtc&lszvbM2ee!87clG){9jZ|@H_GS zD}ukO&fTU41^+z$bOir*wOa6R;=5DuQ|f)eq`FS<)9P)(zNB_61!9-r=T)0vuj9Kz z@IS%uaa?iKLBU^Ag8i>xj{vkz@MqM^g73ul8o~Fg`vm_MzCR`SQ=ocRu&>~+UlRN{ zhEE7Ssa_I%NWF;)3;^ixB!+7Q|4j@~b_zV>f;X#0f`41#N_C%lPq5zsbid$rp!ula zU%+4gc|E@G5&T6AFvdS(_@v7$y1pi%i zTJUE9ctG$ULD>JGHd8AE|7Uf6t=b^i2MUHAS4RZ@Gj&4nHx-VoAFDH;1;>?w$1yYu z{;L?Gf}h23tKdgft>8!ST`%}AtL=i5Z5pAXx?S+ED13cSy(QRJ)l$Kq#+1heZ&A>H zOuZ)fKd6<0ol~y}ZiDOR1b0Dk0J79gg1>?9p9%J`8s}=6;AimXnBWcSkl=rz-Vtn6 zbqRJ6e7`98AE;La|2KSZ6#TDMwcv+9jTG~w!ua3n4#9s5NT?7~IGoR`X9WK%0BQwq z$1o)LISjVo(;&yfDGIQZzsHai{KqOJ_yIL3_@62q)dJA#1(z6Z6#P+jOz`K_{erIr zFDjw`P}8>q1*>LNa!M3H5~F-&YnKgo__< zQdO_z#Tku~8mZQ{E2*y9ccNK^g#QiqD?-u-d z^_<`o0iPE9Weia5@6;N>-cShf0`}@#6R^b(#!#!Zbg%DpVotOx6HQtpXuK5){|7Iy B;&}i7 diff --git a/mozilla/camino/PreferencePanes/Navigation/Navigation.mm b/mozilla/camino/PreferencePanes/Navigation/Navigation.mm index f1b026b77be..c6a91c2c96e 100644 --- a/mozilla/camino/PreferencePanes/Navigation/Navigation.mm +++ b/mozilla/camino/PreferencePanes/Navigation/Navigation.mm @@ -184,7 +184,7 @@ const int kDefaultExpireDays = 9; ICInstance icInstance = NULL; OSStatus error; - // it would be nice to use CHPreferenceManager, but I don't want to drag + // it would be nice to use PreferenceManager, but I don't want to drag // all that code into the plugin error = ICStart(&icInstance, 'CHIM'); if (error != noErr) { diff --git a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm index 1b24b39d550..b85903fa8dd 100644 --- a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm +++ b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm @@ -26,7 +26,7 @@ // Hookup cookie prefs. Relies on the tags of the radio buttons in the matrix being // set such that "enable all" is 0 and "disable all" is 2. If mozilla has other prefs - // that we don't quite know about, we assume they were remapped by the CHPreferenceManager + // that we don't quite know about, we assume they were remapped by the PreferenceManager // at startup. PRInt32 acceptCookies = 0; mPrefService->GetIntPref("network.cookie.cookieBehavior", &acceptCookies); diff --git a/mozilla/camino/resources/application/Navigator.scriptSuite b/mozilla/camino/resources/application/Navigator.scriptSuite index 6d790279fd3..d4fadc53ea5 100644 --- a/mozilla/camino/resources/application/Navigator.scriptSuite +++ b/mozilla/camino/resources/application/Navigator.scriptSuite @@ -13,7 +13,7 @@ AppleEventCode GURL CommandClass - CHGetURLCommand + GetURLCommand OpenURL @@ -22,7 +22,7 @@ AppleEventCode OURL CommandClass - CHGetURLCommand + GetURLCommand Name diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib index 8802bdedcfd..9d9409b58ee 100644 --- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib +++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib @@ -1,5 +1,13 @@ { IBClasses = ( + {CLASS = AutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + { + ACTIONS = {onBlur = id; onResize = id; }; + CLASS = AutoCompleteTextField; + LANGUAGE = ObjC; + OUTLETS = {mProxyIcon = PageProxyIcon; }; + SUPERCLASS = NSTextField; + }, {CLASS = BookmarkItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { ACTIONS = { @@ -20,6 +28,11 @@ }; SUPERCLASS = NSObject; }, + { + CLASS = BookmarksOutlineView; + LANGUAGE = ObjC; + SUPERCLASS = ExtendedOutlineView; + }, {CLASS = BookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = BrowserTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, { @@ -65,7 +78,7 @@ mBackItem = NSMenuItem; mCachedBMDS = id; mForwardItem = NSMenuItem; - mHistoryDataSource = CHHistoryDataSource; + mHistoryDataSource = HistoryDataSource; mImageLinkMenu = NSMenu; mImageMenu = NSMenu; mInputMenu = NSMenu; @@ -75,7 +88,7 @@ mLocationToolbarView = NSView; mLock = NSImageView; mPageMenu = NSMenu; - mPersonalToolbar = CHBookmarksToolbar; + mPersonalToolbar = BookmarksToolbar; mProgress = NSProgressIndicator; mProxyIcon = NSImageView; mSidebarBookmarksDataSource = BookmarksDataSource; @@ -85,28 +98,14 @@ mSidebarTabView = NSTabView; mStatus = NSTextField; mStatusBar = NSView; - mTabBrowser = CHExtendedTabView; + mTabBrowser = BrowserTabView; mURLBar = NSTextField; }; SUPERCLASS = NSWindowController; }, - {CLASS = CHAutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {onBlur = id; onResize = id; }; - CLASS = CHAutoCompleteTextField; - LANGUAGE = ObjC; - OUTLETS = {mProxyIcon = CHPageProxyIcon; }; - SUPERCLASS = NSTextField; - }, - { - CLASS = CHBookmarksOutlineView; - LANGUAGE = ObjC; - SUPERCLASS = CHExtendedOutlineView; - }, - {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { ACTIONS = {load = id; }; - CLASS = CHBrowserWrapper; + CLASS = BrowserWrapper; LANGUAGE = ObjC; OUTLETS = { mLockIcon = id; @@ -118,43 +117,23 @@ }; SUPERCLASS = NSView; }, - {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, + {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - CLASS = CHHistoryDataSource; + CLASS = HistoryDataSource; LANGUAGE = ObjC; OUTLETS = {mBrowserWindowController = id; }; - SUPERCLASS = CHRDFOutlineViewDataSource; + SUPERCLASS = RDFOutlineViewDataSource; }, - {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = CHPageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, + {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + {CLASS = MainController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = PageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, { - CLASS = CHRDFOutlineViewDataSource; + CLASS = RDFOutlineViewDataSource; LANGUAGE = ObjC; OUTLETS = {mOutlineView = id; }; SUPERCLASS = NSObject; }, - {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = MainController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {load = id; }; - CLASS = MyBrowserView; - LANGUAGE = ObjC; - OUTLETS = { - mImageLinkMenu = id; - mImageMenu = id; - mInputMenu = id; - mLinkMenu = id; - mPageMenu = id; - mWindowController = id; - progress = id; - progressSuper = id; - status = id; - urlbar = id; - }; - SUPERCLASS = NSView; - }, {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib index 667fcc69e64..82fa1b33249 100644 --- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 176 79 632 495 0 0 1280 1002 + 208 152 630 599 0 0 1280 1002 IBEditorPositions 124 @@ -39,11 +39,7 @@ 4 IBLockedObjects - IBOpenObjects - - 10 - IBSystem Version - 5S60 + 5S66 diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index d775c7ae2dba6c102cff6d416dc9fb80155a79f1..9fb6b7c29592f028f0572eb0cfdd7cbd63aa02f3 100644 GIT binary patch literal 14664 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 MmqPtI{d>Uw2gQS!I{*Lx diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib index fae3aa7579e..f4d1aa2760b 100644 --- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib @@ -5,8 +5,8 @@ LANGUAGE = ObjC; SUPERCLASS = ToolbarController; }, - {CLASS = CHGoMenu; LANGUAGE = ObjC; SUPERCLASS = NSMenu; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = GoMenu; LANGUAGE = ObjC; SUPERCLASS = NSMenu; }, { ACTIONS = { addBookmark = id; diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib index 3eb3a4600a89cc048d32ccdf7e6149915a22fdac..2ad295b96c9eaffb8916ee5ee27d5b421113d191 100644 GIT binary patch literal 9928 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 VrmmeGPQ)=gQ)b*ch?99f|NrKi=ym`A literal 9885 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 B;&}i7 diff --git a/mozilla/camino/src/appleevents/GetURLCommand.h b/mozilla/camino/src/appleevents/GetURLCommand.h index b5f907bfcb2..e00e65b6674 100644 --- a/mozilla/camino/src/appleevents/GetURLCommand.h +++ b/mozilla/camino/src/appleevents/GetURLCommand.h @@ -23,7 +23,7 @@ #import -@interface CHGetURLCommand : NSScriptCommand {} +@interface GetURLCommand : NSScriptCommand {} - (id)performDefaultImplementation; diff --git a/mozilla/camino/src/appleevents/GetURLCommand.mm b/mozilla/camino/src/appleevents/GetURLCommand.mm index 6c4558ea2fb..5e452527ac5 100644 --- a/mozilla/camino/src/appleevents/GetURLCommand.mm +++ b/mozilla/camino/src/appleevents/GetURLCommand.mm @@ -21,12 +21,12 @@ * David Hyatt (Original Author) */ -#import "CHGetURLCommand.h" +#import "GetURLCommand.h" #import #import "MainController.h" -@implementation CHGetURLCommand +@implementation GetURLCommand - (id)performDefaultImplementation { diff --git a/mozilla/camino/src/application/AboutBox.h b/mozilla/camino/src/application/AboutBox.h index 2068306e703..20990f387ae 100644 --- a/mozilla/camino/src/application/AboutBox.h +++ b/mozilla/camino/src/application/AboutBox.h @@ -38,7 +38,7 @@ #include -@interface CHAboutBox : NSObject +@interface AboutBox : NSObject { IBOutlet NSTextView* creditsField; IBOutlet NSTextField* buildNumberField; @@ -50,7 +50,7 @@ BOOL restartAtTop; } -+ (CHAboutBox *)sharedInstance; ++ (AboutBox *)sharedInstance; - (IBAction)showPanel:(id)sender; @end diff --git a/mozilla/camino/src/application/AboutBox.m b/mozilla/camino/src/application/AboutBox.m index ec983bb4c99..be381c08373 100644 --- a/mozilla/camino/src/application/AboutBox.m +++ b/mozilla/camino/src/application/AboutBox.m @@ -37,19 +37,19 @@ * * ***** END LICENSE BLOCK ***** */ -#import "CHAboutBox.h" +#import "AboutBox.h" #include "nsBuildID.h" -@interface CHAboutBox(Private) +@interface AboutBox(Private) - (void)loadWindow; @end -@implementation CHAboutBox +@implementation AboutBox -static CHAboutBox *sharedInstance = nil; +static AboutBox *sharedInstance = nil; -+ (CHAboutBox *)sharedInstance ++ (AboutBox *)sharedInstance { return sharedInstance ? sharedInstance : [[self alloc] init]; } diff --git a/mozilla/camino/src/application/MainController.h b/mozilla/camino/src/application/MainController.h index a88c3abbfae..48eee9306f9 100644 --- a/mozilla/camino/src/application/MainController.h +++ b/mozilla/camino/src/application/MainController.h @@ -38,9 +38,9 @@ #import #import "BrowserWindowController.h" #import "MVPreferencesController.h" -#import "CHSplashScreenWindow.h" +#import "SplashScreenWindow.h" #import "FindDlgController.h" -#import "CHPreferenceManager.h" +#import "PreferenceManager.h" class BookmarksService; @@ -67,9 +67,9 @@ class BookmarksService; BOOL mOffline; - CHSplashScreenWindow* mSplashScreen; + SplashScreenWindow* mSplashScreen; - CHPreferenceManager* mPreferenceManager; + PreferenceManager* mPreferenceManager; BookmarksService* mMenuBookmarks; @@ -142,7 +142,7 @@ class BookmarksService; - (MVPreferencesController *)preferencesController; - (void)displayPreferencesWindow:sender; -- (CHPreferenceManager *)preferenceManager; +- (PreferenceManager *)preferenceManager; - (BOOL)isMainWindowABrowserWindow; // if the main window is a browser window, return its controller, otherwise nil diff --git a/mozilla/camino/src/application/MainController.mm b/mozilla/camino/src/application/MainController.mm index b30ac343a96..1787848f707 100644 --- a/mozilla/camino/src/application/MainController.mm +++ b/mozilla/camino/src/application/MainController.mm @@ -41,9 +41,9 @@ #import "MainController.h" #import "BrowserWindowController.h" #import "BookmarksService.h" -#import "nsCocoaBrowserService.h" -#import "CHAboutBox.h" -#import "CHUserDefaults.h" +#import "CHBrowserService.h" +#import "AboutBox.h" +#import "UserDefaults.h" #include "nsCOMPtr.h" #include "nsEmbedAPI.h" @@ -94,7 +94,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; NSString* url = [defaults stringForKey:USER_DEFAULTS_URL_KEY]; mStartURL = url ? [url retain] : nil; - mSplashScreen = [[CHSplashScreenWindow alloc] splashImage:nil withFade:NO withStatusRect:NSMakeRect(0,0,0,0)]; + mSplashScreen = [[SplashScreenWindow alloc] splashImage:nil withFade:NO withStatusRect:NSMakeRect(0,0,0,0)]; mFindDialog = nil; mMenuBookmarks = nil; @@ -170,7 +170,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [mPreferencesController release]; [mPreferenceManager release]; - nsCocoaBrowserService::TermEmbedding(); + CHBrowserService::TermEmbedding(); [self autorelease]; } @@ -556,10 +556,10 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [[browserWindow windowController] manageBookmarks: aSender]; } -- (CHPreferenceManager *)preferenceManager +- (PreferenceManager *)preferenceManager { if (!mPreferenceManager) - mPreferenceManager = [[CHPreferenceManager sharedInstance] retain]; + mPreferenceManager = [[PreferenceManager sharedInstance] retain]; return mPreferenceManager; } @@ -578,7 +578,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; - (IBAction)showAboutBox:(id)sender { - [[CHAboutBox sharedInstance] showPanel:sender]; + [[AboutBox sharedInstance] showPanel:sender]; } - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename diff --git a/mozilla/camino/src/application/SplashScreenWindow.h b/mozilla/camino/src/application/SplashScreenWindow.h index df82c005af8..dd5348e54ad 100644 --- a/mozilla/camino/src/application/SplashScreenWindow.h +++ b/mozilla/camino/src/application/SplashScreenWindow.h @@ -17,7 +17,7 @@ #import -@interface CHSplashScreenWindow : NSWindow { +@interface SplashScreenWindow : NSWindow { BOOL _fades; BOOL __didFadeIn; int _fadeIndex; diff --git a/mozilla/camino/src/application/SplashScreenWindow.m b/mozilla/camino/src/application/SplashScreenWindow.m index 0cac643da15..e3c9a09a1be 100644 --- a/mozilla/camino/src/application/SplashScreenWindow.m +++ b/mozilla/camino/src/application/SplashScreenWindow.m @@ -16,16 +16,16 @@ * */ -#import "CHSplashScreenWindow.h" +#import "SplashScreenWindow.h" -@interface CHSplashScreenWindow (Private) +@interface SplashScreenWindow (Private) -(void)fadeIn; -(void)fadeInThread; -(void)fadeOut; -(void)fadeOutThread; @end -@implementation CHSplashScreenWindow +@implementation SplashScreenWindow -(id)splashImage:(NSImage *)splashImage withFade:(BOOL)shouldFade withStatusRect:(NSRect)statusRect { diff --git a/mozilla/camino/src/bookmarks/BookmarksButton.h b/mozilla/camino/src/bookmarks/BookmarksButton.h index 27d5623352e..59620995367 100644 --- a/mozilla/camino/src/bookmarks/BookmarksButton.h +++ b/mozilla/camino/src/bookmarks/BookmarksButton.h @@ -29,7 +29,7 @@ class BookmarksService; @class BookmarkItem; -@interface CHBookmarksButton : NSButton +@interface BookmarksButton : NSButton { nsIDOMElement* mElement; BookmarkItem* mBookmarkItem; diff --git a/mozilla/camino/src/bookmarks/BookmarksButton.mm b/mozilla/camino/src/bookmarks/BookmarksButton.mm index abf785435fd..58ce77cb8e6 100644 --- a/mozilla/camino/src/bookmarks/BookmarksButton.mm +++ b/mozilla/camino/src/bookmarks/BookmarksButton.mm @@ -22,7 +22,7 @@ */ #import "NSString+Utils.h" -#import "CHBookmarksButton.h" +#import "BookmarksButton.h" #include "nsCOMPtr.h" #include "nsIContent.h" @@ -37,7 +37,7 @@ #import "BookmarksDataSource.h" #import "BookmarksService.h" -@implementation CHBookmarksButton +@implementation BookmarksButton - (id)initWithFrame:(NSRect)frame { @@ -163,7 +163,7 @@ // Make a copy of the context menu but change it to target us // FIXME - this will stop to work as soon as we add items to the context menu // that have different targets. In that case, we probably should add code to - // CHBookmarksToolbar that manages the context menu for the CHBookmarksButtons. + // BookmarksToolbar that manages the context menu for the CHBookmarksButtons. NSMenu* myMenu = [[[self superview] menu] copy]; [[myMenu itemArray] makeObjectsPerformSelector:@selector(setTarget:) withObject: self]; diff --git a/mozilla/camino/src/bookmarks/BookmarksDataSource.h b/mozilla/camino/src/bookmarks/BookmarksDataSource.h index 3b0c373041f..a18f17d7ccd 100644 --- a/mozilla/camino/src/bookmarks/BookmarksDataSource.h +++ b/mozilla/camino/src/bookmarks/BookmarksDataSource.h @@ -41,8 +41,8 @@ #import #import "MainController.h" -#import "CHBookmarksToolbar.h" -#import "CHExtendedOutlineView.h" +#import "BookmarksToolbar.h" +#import "ExtendedOutlineView.h" class nsIContent; class BookmarksService; diff --git a/mozilla/camino/src/bookmarks/BookmarksOutlineView.h b/mozilla/camino/src/bookmarks/BookmarksOutlineView.h index 2c01061c074..9df77d51119 100644 --- a/mozilla/camino/src/bookmarks/BookmarksOutlineView.h +++ b/mozilla/camino/src/bookmarks/BookmarksOutlineView.h @@ -22,9 +22,9 @@ */ #import -#import "CHExtendedOutlineView.h" +#import "ExtendedOutlineView.h" -@interface CHBookmarksOutlineView : CHExtendedOutlineView { +@interface BookmarksOutlineView : ExtendedOutlineView { } diff --git a/mozilla/camino/src/bookmarks/BookmarksOutlineView.mm b/mozilla/camino/src/bookmarks/BookmarksOutlineView.mm index f3a8942e9fe..7e1abf3f36e 100644 --- a/mozilla/camino/src/bookmarks/BookmarksOutlineView.mm +++ b/mozilla/camino/src/bookmarks/BookmarksOutlineView.mm @@ -21,7 +21,7 @@ * Joe Hewitt (Original Author) */ -#import "CHBookmarksOutlineView.h" +#import "BookmarksOutlineView.h" #import "BookmarksService.h" #import "BookmarksDataSource.h" @@ -30,7 +30,7 @@ #include "nsIContent.h" #include "nsIDOMNode.h" -@implementation CHBookmarksOutlineView +@implementation BookmarksOutlineView - (void)awakeFromNib { diff --git a/mozilla/camino/src/bookmarks/BookmarksService.h b/mozilla/camino/src/bookmarks/BookmarksService.h index 411935e2517..a3103091d56 100644 --- a/mozilla/camino/src/bookmarks/BookmarksService.h +++ b/mozilla/camino/src/bookmarks/BookmarksService.h @@ -44,8 +44,8 @@ #include "nsVoidArray.h" #import "MainController.h" -#import "CHBookmarksToolbar.h" -#import "CHExtendedOutlineView.h" +#import "BookmarksToolbar.h" +#import "ExtendedOutlineView.h" class nsIAtom; class nsIDOMHTMLDocument; @@ -60,7 +60,7 @@ class BookmarksService { public: BookmarksService(BookmarksDataSource* aDataSource); - BookmarksService(CHBookmarksToolbar* aToolbar); + BookmarksService(BookmarksToolbar* aToolbar); virtual ~BookmarksService(); void AddObserver(); @@ -139,7 +139,7 @@ private: // There are three kinds of bookmarks data sources: // tree views (mDataSource), the personal toolbar (mToolbar) // and menus (gBookmarksMenu). - CHBookmarksToolbar* mToolbar; + BookmarksToolbar* mToolbar; BookmarksDataSource* mDataSource; }; diff --git a/mozilla/camino/src/bookmarks/BookmarksService.mm b/mozilla/camino/src/bookmarks/BookmarksService.mm index 2f3b7c8d57a..7825d49c40f 100644 --- a/mozilla/camino/src/bookmarks/BookmarksService.mm +++ b/mozilla/camino/src/bookmarks/BookmarksService.mm @@ -37,7 +37,7 @@ #import "NSString+Utils.h" -#import "CHPreferenceManager.h" +#import "PreferenceManager.h" #import "CHBrowserView.h" #import "BookmarksService.h" #import "BookmarksDataSource.h" @@ -132,7 +132,7 @@ BookmarksService::BookmarksService(BookmarksDataSource* aDataSource) mToolbar = nil; } -BookmarksService::BookmarksService(CHBookmarksToolbar* aToolbar) +BookmarksService::BookmarksService(BookmarksToolbar* aToolbar) { mDataSource = nil; mToolbar = aToolbar; @@ -629,7 +629,7 @@ BookmarksService::CreateIconForBookmark(nsIDOMElement* aElement) return [NSImage imageNamed:@"folder"]; // fire off a proxy icon load - if ([[CHPreferenceManager sharedInstance] getBooleanPref:"browser.chrome.site_icons" withSuccess:NULL]) + if ([[PreferenceManager sharedInstance] getBooleanPref:"browser.chrome.site_icons" withSuccess:NULL]) { nsAutoString href; content->GetAttr(kNameSpaceID_None, gHrefAtom, href); @@ -1109,7 +1109,7 @@ BookmarksService::OpenBookmarkGroup(id aTabView, nsIDOMElement* aFolder) // XXX this needs fixing to not max out the number of tabs in a browser window. // See [BrowserWindowController newTabsAllowed]; tabViewItem = [BrowserTabView makeNewTabItem]; - CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: tabViewItem andWindow: [aTabView window]] autorelease]; + BrowserWrapper* newView = [[[BrowserWrapper alloc] initWithTab: tabViewItem andWindow: [aTabView window]] autorelease]; [tabViewItem setLabel: NSLocalizedString(@"UntitledPageTitle", @"")]; [tabViewItem setView: newView]; [aTabView addTabViewItem: tabViewItem]; diff --git a/mozilla/camino/src/bookmarks/BookmarksToolbar.h b/mozilla/camino/src/bookmarks/BookmarksToolbar.h index 8f164fdaf8a..4ca6e67bdae 100644 --- a/mozilla/camino/src/bookmarks/BookmarksToolbar.h +++ b/mozilla/camino/src/bookmarks/BookmarksToolbar.h @@ -26,13 +26,13 @@ class nsIDOMElement; class BookmarksService; -class CHBookmarksButton; +class BookmarksButton; -@interface CHBookmarksToolbar : NSView +@interface BookmarksToolbar : NSView { BookmarksService* mBookmarks; NSMutableArray* mButtons; - CHBookmarksButton* mDragInsertionButton; + BookmarksButton* mDragInsertionButton; int mDragInsertionPosition; BOOL mIsShowing; } diff --git a/mozilla/camino/src/bookmarks/BookmarksToolbar.mm b/mozilla/camino/src/bookmarks/BookmarksToolbar.mm index c65d4d90c18..1cfff2c885e 100644 --- a/mozilla/camino/src/bookmarks/BookmarksToolbar.mm +++ b/mozilla/camino/src/bookmarks/BookmarksToolbar.mm @@ -23,19 +23,19 @@ * David Haas */ -#import "CHBookmarksButton.h" -#import "CHBookmarksToolbar.h" +#import "BookmarksButton.h" +#import "BookmarksToolbar.h" #import "BookmarksService.h" #import "BookmarksDataSource.h" #include "nsIDOMElement.h" #include "nsIContent.h" -@interface CHBookmarksToolbar(Private) -- (CHBookmarksButton*)makeNewButtonWithElement:(nsIDOMElement*)element; +@interface BookmarksToolbar(Private) +- (BookmarksButton*)makeNewButtonWithElement:(nsIDOMElement*)element; @end -@implementation CHBookmarksToolbar +@implementation BookmarksToolbar - (id)initWithFrame:(NSRect)frame { @@ -100,7 +100,7 @@ while (child) { nsCOMPtr childElt(do_QueryInterface(child)); if (childElt) { - CHBookmarksButton* button = [self makeNewButtonWithElement:childElt]; + BookmarksButton* button = [self makeNewButtonWithElement:childElt]; [self addSubview: button]; [mButtons addObject: button]; } @@ -115,7 +115,7 @@ -(void)addButton: (nsIDOMElement*)aElt atIndex: (int)aIndex { - CHBookmarksButton* button = [self makeNewButtonWithElement:aElt]; + BookmarksButton* button = [self makeNewButtonWithElement:aElt]; [self addSubview: button]; [mButtons insertObject: button atIndex: aIndex]; if ([self isShown]) @@ -126,7 +126,7 @@ { int count = [mButtons count]; for (int i = 0; i < count; i++) { - CHBookmarksButton* button = [mButtons objectAtIndex: i]; + BookmarksButton* button = [mButtons objectAtIndex: i]; if ([button element] == aElt) { [button setElement: aElt]; if (count > i && [self isShown]) @@ -142,7 +142,7 @@ { int count = [mButtons count]; for (int i = 0; i < count; i++) { - CHBookmarksButton* button = [mButtons objectAtIndex: i]; + BookmarksButton* button = [mButtons objectAtIndex: i]; if ([button element] == aElt) { [mButtons removeObjectAtIndex: i]; [button removeFromSuperview]; @@ -168,12 +168,12 @@ float currY = 1.0; float prevX = 2.0; if (aIndex > 0) { - CHBookmarksButton* prevButton = [mButtons objectAtIndex: (aIndex-1)]; + BookmarksButton* prevButton = [mButtons objectAtIndex: (aIndex-1)]; prevX += [prevButton frame].origin.x + [prevButton frame].size.width; currY = [prevButton frame].origin.y; } for (int i = aIndex; i < count; i++) { - CHBookmarksButton* button = [mButtons objectAtIndex: i]; + BookmarksButton* button = [mButtons objectAtIndex: i]; [button sizeToFit]; float width = [button frame].size.width; float height = [button frame].size.height; @@ -240,7 +240,7 @@ else { // We got smaller. Just go to the last button and see if it is outside // our bounds. - CHBookmarksButton* button = [mButtons objectAtIndex:(count-1)]; + BookmarksButton* button = [mButtons objectAtIndex:(count-1)]; if ([button frame].origin.x + [button frame].size.width > [self bounds].size.width - 2) { // The button doesn't fit any more. Reflow starting at this index. @@ -285,7 +285,7 @@ mDragInsertionPosition = BookmarksService::CHInsertAfter; for (int i = 0; i < count; ++i) { - CHBookmarksButton* button = [mButtons objectAtIndex: i]; + BookmarksButton* button = [mButtons objectAtIndex: i]; //NSLog(@"check %d - %d,%d %d,%d\n", i, [button frame].origin.x, [button frame].origin.y, aPoint.x, aPoint.y); // XXX origin.y is coming up zero here! Need that to check the row we're dragging in :( @@ -456,9 +456,9 @@ } } -- (CHBookmarksButton*)makeNewButtonWithElement:(nsIDOMElement*)element +- (BookmarksButton*)makeNewButtonWithElement:(nsIDOMElement*)element { - return [[[CHBookmarksButton alloc] initWithFrame: NSMakeRect(2, 1, 100, 17) element:element bookmarksService:mBookmarks] autorelease]; + return [[[BookmarksButton alloc] initWithFrame: NSMakeRect(2, 1, 100, 17) element:element bookmarksService:mBookmarks] autorelease]; } @end diff --git a/mozilla/camino/src/browser/AutoCompleteDataSource.h b/mozilla/camino/src/browser/AutoCompleteDataSource.h index 539ed560d87..2cd28fd356a 100644 --- a/mozilla/camino/src/browser/AutoCompleteDataSource.h +++ b/mozilla/camino/src/browser/AutoCompleteDataSource.h @@ -22,12 +22,12 @@ */ #import -#import "CHAutoCompleteTextField.h" +#import "AutoCompleteTextField.h" #include "nsIAutoCompleteResults.h" -@class CHAutoCompleteTextField; +@class AutoCompleteTextField; -@interface CHAutoCompleteDataSource : NSObject +@interface AutoCompleteDataSource : NSObject { NSImage *mIconImage; diff --git a/mozilla/camino/src/browser/AutoCompleteDataSource.mm b/mozilla/camino/src/browser/AutoCompleteDataSource.mm index 0071afa0f07..16dec72ddc2 100644 --- a/mozilla/camino/src/browser/AutoCompleteDataSource.mm +++ b/mozilla/camino/src/browser/AutoCompleteDataSource.mm @@ -25,11 +25,11 @@ #import "NSString+Utils.h" #import -#import "CHAutoCompleteTextField.h" +#import "AutoCompleteTextField.h" #include "nsString.h" #include "nsCRT.h" -@implementation CHAutoCompleteDataSource +@implementation AutoCompleteDataSource -(id)init { diff --git a/mozilla/camino/src/browser/AutoCompleteTextField.h b/mozilla/camino/src/browser/AutoCompleteTextField.h index 847b86d16a7..a6ea7a66aaf 100644 --- a/mozilla/camino/src/browser/AutoCompleteTextField.h +++ b/mozilla/camino/src/browser/AutoCompleteTextField.h @@ -23,20 +23,20 @@ */ #import -#import "CHAutoCompleteDataSource.h" +#import "AutoCompleteDataSource.h" #include "nsIAutoCompleteSession.h" #include "nsIAutoCompleteResults.h" #include "nsIAutoCompleteListener.h" -@class CHAutoCompleteDataSource, CHPageProxyIcon; +@class BookmarksOutlineView, PageProxyIcon; -@interface CHAutoCompleteTextField : NSTextField +@interface AutoCompleteTextField : NSTextField { - IBOutlet CHPageProxyIcon *mProxyIcon; + IBOutlet PageProxyIcon *mProxyIcon; NSWindow *mPopupWin; NSTableView *mTableView; - CHAutoCompleteDataSource *mDataSource; + AutoCompleteDataSource *mDataSource; nsIAutoCompleteSession *mSession; nsIAutoCompleteResults *mResults; diff --git a/mozilla/camino/src/browser/AutoCompleteTextField.mm b/mozilla/camino/src/browser/AutoCompleteTextField.mm index 9fd20c4a4c4..c3936bb573d 100644 --- a/mozilla/camino/src/browser/AutoCompleteTextField.mm +++ b/mozilla/camino/src/browser/AutoCompleteTextField.mm @@ -22,13 +22,13 @@ * David Haas */ -#import "CHAutoCompleteTextField.h" +#import "AutoCompleteTextField.h" #import "BrowserWindowController.h" -#import "CHPageProxyIcon.h" +#import "PageProxyIcon.h" #include "nsIServiceManager.h" #include "nsMemory.h" #include "nsString.h" -#include "CHUserDefaults.h" +#include "UserDefaults.h" static const int kMaxRows = 6; static const int kFrameMargin = 1; @@ -47,7 +47,7 @@ static const int kFrameMargin = 1; class AutoCompleteListener : public nsIAutoCompleteListener { public: - AutoCompleteListener(CHAutoCompleteTextField* aTextField) + AutoCompleteListener(AutoCompleteTextField* aTextField) { NS_INIT_REFCNT(); mTextField = aTextField; @@ -66,14 +66,14 @@ public: } private: - CHAutoCompleteTextField *mTextField; + AutoCompleteTextField *mTextField; }; NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) //////////////////////////////////////////////////////////////////////// -@implementation CHAutoCompleteTextField +@implementation AutoCompleteTextField - (void) awakeFromNib { @@ -137,7 +137,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [scrollView setDocumentView: mTableView]; // construct the datasource - mDataSource = [[CHAutoCompleteDataSource alloc] init]; + mDataSource = [[AutoCompleteDataSource alloc] init]; [mTableView setDataSource: mDataSource]; [mPopupWin setContentView:scrollView]; diff --git a/mozilla/camino/src/browser/BrowserTabView.mm b/mozilla/camino/src/browser/BrowserTabView.mm index a0993900829..0604b10d8eb 100644 --- a/mozilla/camino/src/browser/BrowserTabView.mm +++ b/mozilla/camino/src/browser/BrowserTabView.mm @@ -384,7 +384,7 @@ { // We need to make a new tab. BrowserTabViewItem *tabViewItem= [BrowserTabView makeNewTabItem]; - CHBrowserWrapper *newView = [[[CHBrowserWrapper alloc] initWithTab: tabViewItem andWindow: [self window]] autorelease]; + BrowserWrapper *newView = [[[BrowserWrapper alloc] initWithTab: tabViewItem andWindow: [self window]] autorelease]; [tabViewItem setLabel: NSLocalizedString(@"UntitledPageTitle", @"")]; [tabViewItem setView: newView]; [self addTabViewItem: tabViewItem]; diff --git a/mozilla/camino/src/browser/BrowserTabViewItem.h b/mozilla/camino/src/browser/BrowserTabViewItem.h index ae4787b7ff8..877500ad605 100644 --- a/mozilla/camino/src/browser/BrowserTabViewItem.h +++ b/mozilla/camino/src/browser/BrowserTabViewItem.h @@ -38,12 +38,12 @@ #import -#import "CHIconTabViewItem.h" +#import "IconTabViewItem.h" -// a subclass of CHIconTabViewItem that handles dragging of site icons +// a subclass of IconTabViewItem that handles dragging of site icons @class BrowserTabItemContainerView; -@interface BrowserTabViewItem : CHIconTabViewItem +@interface BrowserTabViewItem : IconTabViewItem { NSRect mLastDrawRect; // cached draw rect, used for dragging location BrowserTabItemContainerView* mTabContentsView; diff --git a/mozilla/camino/src/browser/BrowserWindow.mm b/mozilla/camino/src/browser/BrowserWindow.mm index 35f409d4ee6..94e1caf8595 100644 --- a/mozilla/camino/src/browser/BrowserWindow.mm +++ b/mozilla/camino/src/browser/BrowserWindow.mm @@ -37,7 +37,7 @@ #import "BrowserWindow.h" #import "BrowserWindowController.h" -#import "CHAutoCompleteTextField.h" +#import "AutoCompleteTextField.h" static const int kEscapeKeyCode = 53; diff --git a/mozilla/camino/src/browser/BrowserWindowController.h b/mozilla/camino/src/browser/BrowserWindowController.h index 1a1c3dd4d29..3f4d8921433 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.h +++ b/mozilla/camino/src/browser/BrowserWindowController.h @@ -36,9 +36,9 @@ * ***** END LICENSE BLOCK ***** */ #import -#import "CHBrowserWrapper.h" -#import "CHFind.h" -#import "CHBookmarksToolbar.h" +#import "BrowserWrapper.h" +#import "Find.h" +#import "BookmarksToolbar.h" class nsIDOMEvent; class nsIDOMNode; @@ -76,13 +76,13 @@ class nsIDOMNode; @class BookmarksDataSource; -@class CHHistoryDataSource; +@class HistoryDataSource; @class BrowserTabView; -@class CHPageProxyIcon; +@class PageProxyIcon; -@interface BrowserWindowController : NSWindowController +@interface BrowserWindowController : NSWindowController { - IBOutlet BrowserTabView* mTabBrowser; + IBOutlet BrowserTabView* mTabBrowser; IBOutlet NSDrawer* mSidebarDrawer; IBOutlet NSTabView* mSidebarTabView; IBOutlet NSTabView* mSidebarSourceTabView; @@ -94,13 +94,13 @@ class nsIDOMNode; IBOutlet NSWindow* mLocationSheetWindow; IBOutlet NSTextField* mLocationSheetURLField; IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock - IBOutlet CHPageProxyIcon* mProxyIcon; + IBOutlet PageProxyIcon* mProxyIcon; IBOutlet id mSidebarBrowserView; // currently unused IBOutlet BookmarksDataSource* mSidebarBookmarksDataSource; - IBOutlet CHHistoryDataSource* mHistoryDataSource; + IBOutlet HistoryDataSource* mHistoryDataSource; - IBOutlet CHBookmarksToolbar* mPersonalToolbar; + IBOutlet BookmarksToolbar* mPersonalToolbar; IBOutlet NSWindow* mAddBookmarkSheetWindow; IBOutlet NSTextField* mAddBookmarkTitleField; @@ -125,7 +125,7 @@ class nsIDOMNode; NSString* mPendingReferrer; BOOL mPendingActivate; - CHBrowserWrapper* mBrowserView; + BrowserWrapper* mBrowserView; BOOL mMoveReentrant; NSModalSession mModalSession; @@ -160,7 +160,7 @@ class nsIDOMNode; - (id)getTabBrowser; - (BOOL)newTabsAllowed; -- (CHBrowserWrapper*)getBrowserWrapper; +- (BrowserWrapper*)getBrowserWrapper; - (void)loadURL:(NSString*)aURLSpec referrer:(NSString*)aReferrer activate:(BOOL)activate; - (void)updateLocationFields:(NSString *)locationString; @@ -259,7 +259,7 @@ class nsIDOMNode; - (IBAction)viewOnlyThisImage:(id)aSender; -- (CHBookmarksToolbar*) bookmarksToolbar; +- (BookmarksToolbar*) bookmarksToolbar; - (BOOL) isResponderGeckoView:(NSResponder*) responder; @@ -279,7 +279,7 @@ class nsIDOMNode; - (NSDrawer *)sidebarDrawer; // Accessor to get the proxy icon view -- (CHPageProxyIcon *)proxyIconView; +- (PageProxyIcon *)proxyIconView; @end diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm index 2005de8af26..0b8cb0818b7 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.mm +++ b/mozilla/camino/src/browser/BrowserWindowController.mm @@ -39,13 +39,13 @@ #import "BrowserWindowController.h" -#import "CHBrowserWrapper.h" -#import "CHPreferenceManager.h" +#import "BrowserWrapper.h" +#import "PreferenceManager.h" #import "BookmarksDataSource.h" -#import "CHHistoryDataSource.h" +#import "HistoryDataSource.h" #import "BrowserTabView.h" -#import "CHUserDefaults.h" -#import "CHPageProxyIcon.h" +#import "UserDefaults.h" +#import "PageProxyIcon.h" #include "nsIWebNavigation.h" #include "nsIDOMElement.h" @@ -57,10 +57,10 @@ #include "nsIDocShell.h" #include "nsIMarkupDocumentViewer.h" #include "nsIContentViewer.h" -#include "nsCocoaBrowserService.h" +#include "CHBrowserService.h" #include "nsString.h" #include "nsCRT.h" -#include "CHGeckoUtils.h" +#include "GeckoUtils.h" #include "nsIWebProgressListener.h" #include "nsIWebBrowserChrome.h" @@ -186,7 +186,7 @@ static NSArray* sToolbarDefaults = nil; if ( (self = [super initWithWindowNibName:(NSString *)windowNibName]) ) { // this won't correctly cascade windows on multiple monitors. RADAR bug 2972893 // filed since it also happens in Terminal.app - if ( nsCocoaBrowserService::sNumBrowsers == 0 ) + if ( CHBrowserService::sNumBrowsers == 0 ) [self setShouldCascadeWindows:NO]; else [self setShouldCascadeWindows:YES]; @@ -725,7 +725,7 @@ static NSArray* sToolbarDefaults = nil; [self manageBookmarks: self]; // Now do the importing. - CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: nil andWindow: [self window]] autorelease]; + BrowserWrapper* newView = [[[BrowserWrapper alloc] initWithTab: nil andWindow: [self window]] autorelease]; [newView setFrame: NSZeroRect]; [newView setIsBookmarksImport: YES]; [[[self window] contentView] addSubview: newView]; @@ -786,7 +786,7 @@ static NSArray* sToolbarDefaults = nil; // Get the users preferred search engine from IC if (!searchEngine || [searchEngine isEqualToString:@"SearchPageDefault"]) { - searchEngine = [[CHPreferenceManager sharedInstance] getICStringPref:kICWebSearchPagePrefs]; + searchEngine = [[PreferenceManager sharedInstance] getICStringPref:kICWebSearchPagePrefs]; if (!searchEngine || ([searchEngine length] == 0)) searchEngine = @"http://dmoz.org/"; } @@ -897,9 +897,9 @@ static NSArray* sToolbarDefaults = nil; { nsCOMPtr linkContent; nsAutoString href; - CHGeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); + GeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); nsAutoString linkText; - CHGeckoUtils::GatherTextUnder(linkContent, linkText); + GeckoUtils::GatherTextUnder(linkContent, linkText); NSString* urlStr = [NSString stringWith_nsAString:href]; NSString* titleStr = [NSString stringWith_nsAString:linkText]; [self addBookmarkExtended:YES isFolder:NO URL:urlStr title:titleStr]; @@ -927,7 +927,7 @@ static NSArray* sToolbarDefaults = nil; - (IBAction)home:(id)aSender { - [mBrowserView loadURI:[[CHPreferenceManager sharedInstance] homePage:NO] referrer: nil flags:NSLoadFlagsNone activate:NO]; + [mBrowserView loadURI:[[PreferenceManager sharedInstance] homePage:NO] referrer: nil flags:NSLoadFlagsNone activate:NO]; } - (IBAction)toggleSidebar:(id)aSender @@ -979,7 +979,7 @@ static NSArray* sToolbarDefaults = nil; -(void)newTab:(BOOL)allowHomepage { BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem]; - CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; + BrowserWrapper* newView = [[[BrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; PRInt32 newTabPage = 0; if (allowHomepage) { @@ -999,7 +999,7 @@ static NSArray* sToolbarDefaults = nil; newTabPage != 1 && allowHomepage); if (allowHomepage) - [newView loadURI: ((newTabPage == 1) ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") referrer:nil flags:NSLoadFlagsNone activate:!focusURLBar]; + [newView loadURI: ((newTabPage == 1) ? [[PreferenceManager sharedInstance] homePage: NO] : @"about:blank") referrer:nil flags:NSLoadFlagsNone activate:!focusURLBar]; [mTabBrowser selectLastTabViewItem: self]; @@ -1061,7 +1061,7 @@ static NSArray* sToolbarDefaults = nil; return [mTabBrowser canMakeNewTabs]; } --(CHBrowserWrapper*)getBrowserWrapper +-(BrowserWrapper*)getBrowserWrapper { return mBrowserView; } @@ -1111,7 +1111,7 @@ static NSArray* sToolbarDefaults = nil; [mTabBrowser addTabViewItem: newTab]; #endif - CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; + BrowserWrapper* newView = [[[BrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; [newView setTab: newTab]; [newTab setLabel: NSLocalizedString(@"TabLoading", @"")]; @@ -1125,16 +1125,16 @@ static NSArray* sToolbarDefaults = nil; -(void)setupSidebarTabs { - CHIconTabViewItem *bookItem = [[CHIconTabViewItem alloc] initWithIdentifier:@"bookmarkSidebarCHIconTabViewItem" + IconTabViewItem *bookItem = [[IconTabViewItem alloc] initWithIdentifier:@"bookmarkSidebarCHIconTabViewItem" withTabIcon:[NSImage imageNamed:@"bookicon"]]; - CHIconTabViewItem *histItem = [[CHIconTabViewItem alloc] initWithIdentifier:@"historySidebarCHIconTabViewItem" + IconTabViewItem *histItem = [[IconTabViewItem alloc] initWithIdentifier:@"historySidebarCHIconTabViewItem" withTabIcon:[NSImage imageNamed:@"historyicon"]]; #if USE_SEARCH_ITEM - CHIconTabViewItem *searchItem = [[CHIconTabViewItem alloc] initWithIdentifier:@"searchSidebarCHIconTabViewItem" + IconTabViewItem *searchItem = [[IconTabViewItem alloc] initWithIdentifier:@"searchSidebarCHIconTabViewItem" withTabIcon:[NSImage imageNamed:@"searchicon"]]; #endif #if USE_PANELS_ITEM - CHIconTabViewItem *panelsItem = [[CHIconTabViewItem alloc] initWithIdentifier:@"myPanelsCHIconTabViewItem" + IconTabViewItem *panelsItem = [[IconTabViewItem alloc] initWithIdentifier:@"myPanelsCHIconTabViewItem" withTabIcon:[NSImage imageNamed:@"panel_icon"]]; #endif @@ -1327,7 +1327,7 @@ static NSArray* sToolbarDefaults = nil; { nsCOMPtr linkContent; nsAutoString href; - CHGeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); + GeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); // XXXdwh Handle simple XLINKs if we want to be compatible with Mozilla, but who // really uses these anyway? :) @@ -1360,7 +1360,7 @@ static NSArray* sToolbarDefaults = nil; { nsCOMPtr linkContent; nsAutoString href; - CHGeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); + GeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); // XXXdwh Handle simple XLINKs if we want to be compatible with Mozilla, but who // really uses these anyway? :) @@ -1371,7 +1371,7 @@ static NSArray* sToolbarDefaults = nil; // The user wants to save this link. nsAutoString text; - CHGeckoUtils::GatherTextUnder(mContextMenuNode, text); + GeckoUtils::GatherTextUnder(mContextMenuNode, text); [self saveURL: nil filterList: nil url: hrefStr suggestedFilename: [NSString stringWith_nsAString: text]]; @@ -1422,7 +1422,7 @@ static NSArray* sToolbarDefaults = nil; } } -- (CHBookmarksToolbar*) bookmarksToolbar +- (BookmarksToolbar*) bookmarksToolbar { return mPersonalToolbar; } @@ -1486,7 +1486,7 @@ static NSArray* sToolbarDefaults = nil; return mSidebarDrawer; } -- (CHPageProxyIcon *)proxyIconView +- (PageProxyIcon *)proxyIconView { return mProxyIcon; } diff --git a/mozilla/camino/src/browser/BrowserWrapper.h b/mozilla/camino/src/browser/BrowserWrapper.h index c50f9c2a942..486e416fd91 100644 --- a/mozilla/camino/src/browser/BrowserWrapper.h +++ b/mozilla/camino/src/browser/BrowserWrapper.h @@ -41,7 +41,7 @@ @class BrowserWindowController; @class ToolTip; -@interface CHBrowserWrapper : NSView +@interface BrowserWrapper : NSView { NSTextField* mUrlbar; NSTextField* mStatus; diff --git a/mozilla/camino/src/browser/BrowserWrapper.mm b/mozilla/camino/src/browser/BrowserWrapper.mm index e84899836a4..ff05eecc082 100644 --- a/mozilla/camino/src/browser/BrowserWrapper.mm +++ b/mozilla/camino/src/browser/BrowserWrapper.mm @@ -37,14 +37,14 @@ #import "NSString+Utils.h" -#import "CHPreferenceManager.h" -#import "CHBrowserWrapper.h" +#import "PreferenceManager.h" +#import "BrowserWrapper.h" #import "BrowserWindowController.h" #import "BookmarksService.h" #import "SiteIconProvider.h" #import "BrowserTabViewItem.h" #import "ToolTip.h" -#import "CHPageProxyIcon.h" +#import "PageProxyIcon.h" #include "nsCOMPtr.h" #include "nsIServiceManager.h" @@ -59,7 +59,7 @@ #include "nsIDOMEventReceiver.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" -#include "nsCocoaBrowserService.h" +#include "CHBrowserService.h" #include "nsIWebProgressListener.h" #include @@ -70,7 +70,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; const NSString* kOfflineNotificationName = @"offlineModeChanged"; -@interface CHBrowserWrapper(Private) +@interface BrowserWrapper(Private) - (void)setPendingActive:(BOOL)active; - (void)registerNotificationListener; @@ -82,7 +82,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged"; @end -@implementation CHBrowserWrapper +@implementation BrowserWrapper - (id)initWithTab:(NSTabViewItem*)aTab andWindow:(NSWindow*)aWindow { @@ -340,7 +340,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged"; - (void)onLocationChange:(NSString*)urlSpec { - BOOL useSiteIcons = [[CHPreferenceManager sharedInstance] getBooleanPref:"browser.chrome.site_icons" withSuccess:NULL]; + BOOL useSiteIcons = [[PreferenceManager sharedInstance] getBooleanPref:"browser.chrome.site_icons" withSuccess:NULL]; BOOL siteIconLoadInitiated = NO; SiteIconProvider* faviconProvider = [SiteIconProvider sharedFavoriteIconProvider]; @@ -573,7 +573,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged"; if (isUnrequested) { // A popup is being opened while the page is currently loading. Offer to block the // popup. - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); BOOL confirm = [controller confirm: [self window] title: @"Unrequested Popup Detected" text: [NSString stringWithFormat: NSLocalizedString(@"PopupBlockMsg", @""), NSLocalizedStringFromTable(@"CFBundleName", @"InfoPlist", nil)]]; @@ -680,7 +680,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged"; NSImage* iconImage = [userInfo objectForKey:SiteIconLoadImageKey]; NSString* siteIconURI = [userInfo objectForKey:SiteIconLoadURIKey]; - // NSLog(@"CHBrowserWrapper imageLoadedNotification got image %@ and uri %@", iconImage, proxyImageURI); + // NSLog(@"BrowserWrapper imageLoadedNotification got image %@ and uri %@", iconImage, proxyImageURI); if (iconImage == nil) siteIconURI = @""; // go back to default image diff --git a/mozilla/camino/src/browser/CocoaPromptService.mm b/mozilla/camino/src/browser/CocoaPromptService.mm index 796762d02b8..efc42afe877 100644 --- a/mozilla/camino/src/browser/CocoaPromptService.mm +++ b/mozilla/camino/src/browser/CocoaPromptService.mm @@ -38,7 +38,7 @@ #import "NSString+Utils.h" -#import "nsCocoaBrowserService.h" +#import "CHBrowserService.h" #import "CocoaPromptService.h" #include "nsCRT.h" @@ -65,7 +65,7 @@ CocoaPromptService::Alert(nsIDOMWindow *parent, const PRUnichar *dialogTitle, const PRUnichar *text) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -89,7 +89,7 @@ CocoaPromptService::AlertCheck(nsIDOMWindow *parent, const PRUnichar *checkMsg, PRBool *checkValue) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -120,7 +120,7 @@ CocoaPromptService::Confirm(nsIDOMWindow *parent, const PRUnichar *text, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -142,7 +142,7 @@ CocoaPromptService::ConfirmCheck(nsIDOMWindow *parent, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -185,7 +185,7 @@ CocoaPromptService::ConfirmEx(nsIDOMWindow *parent, const PRUnichar *checkMsg, PRBool *checkValue, PRInt32 *buttonPressed) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -228,7 +228,7 @@ CocoaPromptService::Prompt(nsIDOMWindow *parent, PRBool *checkValue, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -270,7 +270,7 @@ CocoaPromptService::PromptUsernameAndPassword(nsIDOMWindow *parent, PRBool *checkValue, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -318,7 +318,7 @@ CocoaPromptService::PromptPassword(nsIDOMWindow *parent, PRBool *checkValue, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } diff --git a/mozilla/camino/src/browser/ContentClickListener.mm b/mozilla/camino/src/browser/ContentClickListener.mm index 3e9d997e30c..9ed723eec1f 100644 --- a/mozilla/camino/src/browser/ContentClickListener.mm +++ b/mozilla/camino/src/browser/ContentClickListener.mm @@ -69,7 +69,7 @@ #include "nsNetUtil.h" // Common helper routines (also used by the context menu code) -#include "CHGeckoUtils.h" +#include "GeckoUtils.h" #import "CHBrowserView.h" @@ -261,7 +261,7 @@ ContentClickListener::MouseClick(nsIDOMEvent* aEvent) nsCOMPtr linkContent; nsAutoString href; - CHGeckoUtils::GetEnclosingLinkElementAndHref(content, getter_AddRefs(linkContent), href); + GeckoUtils::GetEnclosingLinkElementAndHref(content, getter_AddRefs(linkContent), href); // XXXdwh Handle simple XLINKs if we want to be compatible with Mozilla, but who // really uses these anyway? :) @@ -301,7 +301,7 @@ ContentClickListener::MouseClick(nsIDOMEvent* aEvent) else if (altKey) { // The user wants to save this link. nsAutoString text; - CHGeckoUtils::GatherTextUnder(content, text); + GeckoUtils::GatherTextUnder(content, text); [mBrowserController saveURL: nil filterList: nil url: hrefStr suggestedFilename: [NSString stringWith_nsAString: text]]; diff --git a/mozilla/camino/src/browser/GoMenu.h b/mozilla/camino/src/browser/GoMenu.h index 17e614302d8..b9ea77347de 100644 --- a/mozilla/camino/src/browser/GoMenu.h +++ b/mozilla/camino/src/browser/GoMenu.h @@ -23,7 +23,7 @@ #import -@interface CHGoMenu : NSMenu { +@interface GoMenu : NSMenu { } diff --git a/mozilla/camino/src/browser/GoMenu.mm b/mozilla/camino/src/browser/GoMenu.mm index e160c8dd15e..3f1efd6ce47 100644 --- a/mozilla/camino/src/browser/GoMenu.mm +++ b/mozilla/camino/src/browser/GoMenu.mm @@ -23,10 +23,10 @@ #import "NSString+Utils.h" -#import "CHGoMenu.h" +#import "GoMenu.h" #import "MainController.h" #import "BrowserWindowController.h" -#import "CHBrowserWrapper.h" +#import "BrowserWrapper.h" #import "CHBrowserView.h" #include "nsCOMPtr.h" #include "nsString.h" @@ -43,7 +43,7 @@ static const int kMaxItems = 15; // the maximum number of characters in a menu title before cropping it static const unsigned int kMaxTitleLength = 80; -@implementation CHGoMenu +@implementation GoMenu - (void) update { @@ -60,7 +60,7 @@ static const unsigned int kMaxTitleLength = 80; if (!controller) return nsnull; // get web navigation for current browser - CHBrowserWrapper* wrapper = [controller getBrowserWrapper]; + BrowserWrapper* wrapper = [controller getBrowserWrapper]; if (!wrapper) return nsnull; CHBrowserView* view = [wrapper getBrowserView]; if (!view) return nsnull; diff --git a/mozilla/camino/src/browser/LocationBar.h b/mozilla/camino/src/browser/LocationBar.h index f2700e473f6..5fe9e3a4a4c 100644 --- a/mozilla/camino/src/browser/LocationBar.h +++ b/mozilla/camino/src/browser/LocationBar.h @@ -23,7 +23,7 @@ #import -@interface CHLocationBar : NSView { +@interface LocationBar : NSView { } diff --git a/mozilla/camino/src/browser/LocationBar.mm b/mozilla/camino/src/browser/LocationBar.mm index 6056d1c7977..9504fdfdeef 100644 --- a/mozilla/camino/src/browser/LocationBar.mm +++ b/mozilla/camino/src/browser/LocationBar.mm @@ -36,9 +36,9 @@ * * ***** END LICENSE BLOCK ***** */ -#import "CHLocationBar.h" +#import "LocationBar.h" -@implementation CHLocationBar +@implementation LocationBar - (void)drawRect:(NSRect)aRect { // Frame the border. diff --git a/mozilla/camino/src/browser/PageProxyIcon.h b/mozilla/camino/src/browser/PageProxyIcon.h index 4e8b1e17ce8..62cac205565 100644 --- a/mozilla/camino/src/browser/PageProxyIcon.h +++ b/mozilla/camino/src/browser/PageProxyIcon.h @@ -23,7 +23,7 @@ #import -@interface CHPageProxyIcon : NSImageView +@interface PageProxyIcon : NSImageView { } diff --git a/mozilla/camino/src/browser/PageProxyIcon.mm b/mozilla/camino/src/browser/PageProxyIcon.mm index 51ab9d59f31..41e382ae903 100644 --- a/mozilla/camino/src/browser/PageProxyIcon.mm +++ b/mozilla/camino/src/browser/PageProxyIcon.mm @@ -23,7 +23,7 @@ #import "NSString+Utils.h" -#import "CHPageProxyIcon.h" +#import "PageProxyIcon.h" #import "BookmarksService.h" #import "MainController.h" @@ -32,7 +32,7 @@ #include "nsNetUtil.h" #include "nsString.h" -@implementation CHPageProxyIcon +@implementation PageProxyIcon - (void)awakeFromNib { diff --git a/mozilla/camino/src/browser/SecurityDialogs.mm b/mozilla/camino/src/browser/SecurityDialogs.mm index a07700a153b..83d9e1adc11 100644 --- a/mozilla/camino/src/browser/SecurityDialogs.mm +++ b/mozilla/camino/src/browser/SecurityDialogs.mm @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #import "nsAlertController.h" -#import "nsCocoaBrowserService.h" +#import "CHBrowserService.h" #import "SecurityDialogs.h" #import "MainController.h" @@ -71,7 +71,7 @@ SecurityDialogs::UnknownIssuer(nsITransportSecurityInfo *socketInfo, *_retval = PR_TRUE; *outAddType = ADD_TRUSTED_FOR_SESSION; - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) return NS_ERROR_FAILURE; @@ -99,7 +99,7 @@ SecurityDialogs::MismatchDomain(nsITransportSecurityInfo *socketInfo, const PRUnichar *targetURL, nsIX509Cert *cert, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) return NS_ERROR_FAILURE; @@ -118,7 +118,7 @@ NS_IMETHODIMP SecurityDialogs::CertExpired(nsITransportSecurityInfo *socketInfo, nsIX509Cert *cert, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) return NS_ERROR_FAILURE; @@ -199,7 +199,7 @@ NS_IMETHODIMP SecurityDialogs::ConfirmPostToInsecureFromSecure(nsIInterfaceRequestor *ctx, PRBool* _result) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) return NS_ERROR_FAILURE; diff --git a/mozilla/camino/src/browser/nsAlertController.mm b/mozilla/camino/src/browser/nsAlertController.mm index 27225a524fc..9f0127af5e8 100644 --- a/mozilla/camino/src/browser/nsAlertController.mm +++ b/mozilla/camino/src/browser/nsAlertController.mm @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #import "nsAlertController.h" -#import "nsCocoaBrowserService.h" +#import "CHBrowserService.h" #include "nsIBadCertListener.h" @@ -62,7 +62,7 @@ enum { kOKButton = 0, kCancelButton = 1, kOtherButton = 2 }; - (void)awakeFromNib { - nsCocoaBrowserService::SetAlertController(self); + CHBrowserService::SetAlertController(self); } - (void)alert:(NSWindow*)parent title:(NSString*)title text:(NSString*)text diff --git a/mozilla/camino/src/download/ProgressDlgController.h b/mozilla/camino/src/download/ProgressDlgController.h index 422a3fc70e5..bfd05ace6c0 100644 --- a/mozilla/camino/src/download/ProgressDlgController.h +++ b/mozilla/camino/src/download/ProgressDlgController.h @@ -37,7 +37,7 @@ #import -#import "DownloadProgressDisplay.h" +#import "CHDownloadProgressDisplay.h" #include "nscore.h" @@ -51,7 +51,7 @@ class nsDownloadListener; @end -@interface ProgressDlgController : NSWindowController +@interface ProgressDlgController : NSWindowController { IBOutlet NSTextField *mElapsedTimeLabel; IBOutlet NSTextField *mFromField; diff --git a/mozilla/camino/src/download/ProgressDlgController.mm b/mozilla/camino/src/download/ProgressDlgController.mm index 55f5e8897d5..a9b304cc93d 100644 --- a/mozilla/camino/src/download/ProgressDlgController.mm +++ b/mozilla/camino/src/download/ProgressDlgController.mm @@ -60,11 +60,11 @@ static NSString *ProgressWindowFrameSaveName = @"ProgressWindow"; @implementation ChimeraDownloadControllerFactory : DownloadControllerFactory -- (NSWindowController *)createDownloadController +- (NSWindowController *)createDownloadController { NSWindowController* progressController = [[ProgressDlgController alloc] initWithWindowNibName: @"ProgressDialog"]; - NSAssert([progressController conformsToProtocol:@protocol(DownloadProgressDisplay)], - @"progressController should conform to DownloadProgressDisplay protocol"); + NSAssert([progressController conformsToProtocol:@protocol(CHDownloadProgressDisplay)], + @"progressController should conform to CHDownloadProgressDisplay protocol"); return progressController; } @@ -434,7 +434,7 @@ static NSString *ProgressWindowFrameSaveName = @"ProgressWindow"; #pragma mark - -// DownloadProgressDisplay protocol methods +// CHDownloadProgressDisplay protocol methods - (void)onStartDownload:(BOOL)isFileSave; { diff --git a/mozilla/camino/src/download/nsDownloadListener.h b/mozilla/camino/src/download/nsDownloadListener.h index cd15b3626cd..771708f54eb 100644 --- a/mozilla/camino/src/download/nsDownloadListener.h +++ b/mozilla/camino/src/download/nsDownloadListener.h @@ -41,7 +41,7 @@ #import #import -#import "DownloadProgressDisplay.h" +#import "CHDownloadProgressDisplay.h" #include "nsString.h" #include "nsIDownload.h" diff --git a/mozilla/camino/src/embedding/CHBrowserListener.h b/mozilla/camino/src/embedding/CHBrowserListener.h index 0f4880be093..58843686dcc 100644 --- a/mozilla/camino/src/embedding/CHBrowserListener.h +++ b/mozilla/camino/src/embedding/CHBrowserListener.h @@ -1,5 +1,5 @@ // -// nsCocoaBrowserListener.h +// CHBrowserListener.h // Chimera // // Created by Simon Fraser on Sat Aug 17 2002. @@ -23,7 +23,7 @@ @class CHBrowserView; -class nsCocoaBrowserListener : public nsSupportsWeakReference, +class CHBrowserListener : public nsSupportsWeakReference, public nsIInterfaceRequestor, public nsIWebBrowserChrome, public nsIWindowCreator, @@ -33,8 +33,8 @@ class nsCocoaBrowserListener : public nsSupportsWeakReference, public nsITooltipListener { public: - nsCocoaBrowserListener(CHBrowserView* aView); - virtual ~nsCocoaBrowserListener(); + CHBrowserListener(CHBrowserView* aView); + virtual ~CHBrowserListener(); NS_DECL_ISUPPORTS NS_DECL_NSIINTERFACEREQUESTOR diff --git a/mozilla/camino/src/embedding/CHBrowserListener.mm b/mozilla/camino/src/embedding/CHBrowserListener.mm index d9406ce59ea..2d15cdf65d7 100644 --- a/mozilla/camino/src/embedding/CHBrowserListener.mm +++ b/mozilla/camino/src/embedding/CHBrowserListener.mm @@ -53,17 +53,17 @@ #import "CHBrowserView.h" -#include "nsCocoaBrowserListener.h" +#include "CHBrowserListener.h" -nsCocoaBrowserListener::nsCocoaBrowserListener(CHBrowserView* aView) +CHBrowserListener::CHBrowserListener(CHBrowserView* aView) : mView(aView), mContainer(nsnull), mIsModal(PR_FALSE), mChromeFlags(0) { NS_INIT_ISUPPORTS(); mListeners = [[NSMutableArray alloc] init]; } -nsCocoaBrowserListener::~nsCocoaBrowserListener() +CHBrowserListener::~CHBrowserListener() { [mListeners release]; mView = nsnull; @@ -72,7 +72,7 @@ nsCocoaBrowserListener::~nsCocoaBrowserListener() } } -NS_IMPL_ISUPPORTS9(nsCocoaBrowserListener, +NS_IMPL_ISUPPORTS9(CHBrowserListener, nsIInterfaceRequestor, nsIWebBrowserChrome, nsIWindowCreator, @@ -85,7 +85,7 @@ NS_IMPL_ISUPPORTS9(nsCocoaBrowserListener, // Implementation of nsIInterfaceRequestor NS_IMETHODIMP -nsCocoaBrowserListener::GetInterface(const nsIID &aIID, void** aInstancePtr) +CHBrowserListener::GetInterface(const nsIID &aIID, void** aInstancePtr) { if (aIID.Equals(NS_GET_IID(nsIDOMWindow))) { nsCOMPtr browser = dont_AddRef([mView getWebBrowser]); @@ -100,13 +100,13 @@ nsCocoaBrowserListener::GetInterface(const nsIID &aIID, void** aInstancePtr) // for a new window that have a parent to us, and we take over from there. /* nsIWebBrowserChrome createChromeWindow (in nsIWebBrowserChrome parent, in PRUint32 chromeFlags); */ NS_IMETHODIMP -nsCocoaBrowserListener::CreateChromeWindow(nsIWebBrowserChrome *parent, +CHBrowserListener::CreateChromeWindow(nsIWebBrowserChrome *parent, PRUint32 chromeFlags, nsIWebBrowserChrome **_retval) { if (parent != this) { #if DEBUG - NSLog(@"Mismatch in nsCocoaBrowserListener::CreateChromeWindow. We should be the owning parent."); + NSLog(@"Mismatch in CHBrowserListener::CreateChromeWindow. We should be the owning parent."); #endif return NS_ERROR_FAILURE; } @@ -119,7 +119,7 @@ nsCocoaBrowserListener::CreateChromeWindow(nsIWebBrowserChrome *parent, return NS_ERROR_FAILURE; } - nsCocoaBrowserListener* listener = [childView getCocoaBrowserListener]; + CHBrowserListener* listener = [childView getCocoaBrowserListener]; if (!listener) { #if DEBUG NSLog(@"Uh-oh! No listener yet for a newly created window (nsCocoaBrowserlistener)"); @@ -138,7 +138,7 @@ nsCocoaBrowserListener::CreateChromeWindow(nsIWebBrowserChrome *parent, // Implementation of nsIContextMenuListener NS_IMETHODIMP -nsCocoaBrowserListener::OnShowContextMenu(PRUint32 aContextFlags, nsIDOMEvent* aEvent, nsIDOMNode* aNode) +CHBrowserListener::OnShowContextMenu(PRUint32 aContextFlags, nsIDOMEvent* aEvent, nsIDOMNode* aNode) { [mContainer onShowContextMenu: aContextFlags domEvent: aEvent domNode: aNode]; return NS_OK; @@ -146,7 +146,7 @@ nsCocoaBrowserListener::OnShowContextMenu(PRUint32 aContextFlags, nsIDOMEvent* a // Implementation of nsITooltipListener NS_IMETHODIMP -nsCocoaBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText) +CHBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText) { NSPoint where; where.x = aXCoords; where.y = aYCoords; @@ -155,7 +155,7 @@ nsCocoaBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const } NS_IMETHODIMP -nsCocoaBrowserListener::OnHideTooltip() +CHBrowserListener::OnHideTooltip() { [mContainer onHideTooltip]; return NS_OK; @@ -164,7 +164,7 @@ nsCocoaBrowserListener::OnHideTooltip() // Implementation of nsIWebBrowserChrome /* void setStatus (in unsigned long statusType, in wstring status); */ NS_IMETHODIMP -nsCocoaBrowserListener::SetStatus(PRUint32 statusType, const PRUnichar *status) +CHBrowserListener::SetStatus(PRUint32 statusType, const PRUnichar *status) { if (!mContainer) { return NS_ERROR_FAILURE; @@ -182,7 +182,7 @@ nsCocoaBrowserListener::SetStatus(PRUint32 statusType, const PRUnichar *status) /* attribute nsIWebBrowser webBrowser; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetWebBrowser(nsIWebBrowser * *aWebBrowser) +CHBrowserListener::GetWebBrowser(nsIWebBrowser * *aWebBrowser) { NS_ENSURE_ARG_POINTER(aWebBrowser); if (!mView) { @@ -193,7 +193,7 @@ nsCocoaBrowserListener::GetWebBrowser(nsIWebBrowser * *aWebBrowser) return NS_OK; } NS_IMETHODIMP -nsCocoaBrowserListener::SetWebBrowser(nsIWebBrowser * aWebBrowser) +CHBrowserListener::SetWebBrowser(nsIWebBrowser * aWebBrowser) { if (!mView) { return NS_ERROR_FAILURE; @@ -206,14 +206,14 @@ nsCocoaBrowserListener::SetWebBrowser(nsIWebBrowser * aWebBrowser) /* attribute unsigned long chromeFlags; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetChromeFlags(PRUint32 *aChromeFlags) +CHBrowserListener::GetChromeFlags(PRUint32 *aChromeFlags) { NS_ENSURE_ARG_POINTER(aChromeFlags); *aChromeFlags = mChromeFlags; return NS_OK; } NS_IMETHODIMP -nsCocoaBrowserListener::SetChromeFlags(PRUint32 aChromeFlags) +CHBrowserListener::SetChromeFlags(PRUint32 aChromeFlags) { // XXX Do nothing with them for now mChromeFlags = aChromeFlags; @@ -222,7 +222,7 @@ nsCocoaBrowserListener::SetChromeFlags(PRUint32 aChromeFlags) /* void destroyBrowserWindow (); */ NS_IMETHODIMP -nsCocoaBrowserListener::DestroyBrowserWindow() +CHBrowserListener::DestroyBrowserWindow() { // XXX Could send this up to the container, but for now, // we just destroy the enclosing window. @@ -237,7 +237,7 @@ nsCocoaBrowserListener::DestroyBrowserWindow() /* void sizeBrowserTo (in long aCX, in long aCY); */ NS_IMETHODIMP -nsCocoaBrowserListener::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY) +CHBrowserListener::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY) { if (mContainer) { NSSize size; @@ -253,7 +253,7 @@ nsCocoaBrowserListener::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY) /* void showAsModal (); */ NS_IMETHODIMP -nsCocoaBrowserListener::ShowAsModal() +CHBrowserListener::ShowAsModal() { if (!mView) { return NS_ERROR_FAILURE; @@ -274,7 +274,7 @@ nsCocoaBrowserListener::ShowAsModal() /* boolean isWindowModal (); */ NS_IMETHODIMP -nsCocoaBrowserListener::IsWindowModal(PRBool *_retval) +CHBrowserListener::IsWindowModal(PRBool *_retval) { NS_ENSURE_ARG_POINTER(_retval); @@ -285,7 +285,7 @@ nsCocoaBrowserListener::IsWindowModal(PRBool *_retval) /* void exitModalEventLoop (in nsresult aStatus); */ NS_IMETHODIMP -nsCocoaBrowserListener::ExitModalEventLoop(nsresult aStatus) +CHBrowserListener::ExitModalEventLoop(nsresult aStatus) { // [NSApp stopModalWithCode:(int)aStatus]; @@ -294,7 +294,7 @@ nsCocoaBrowserListener::ExitModalEventLoop(nsresult aStatus) // Implementation of nsIEmbeddingSiteWindow2 NS_IMETHODIMP -nsCocoaBrowserListener::Blur() +CHBrowserListener::Blur() { return NS_OK; } @@ -302,7 +302,7 @@ nsCocoaBrowserListener::Blur() // Implementation of nsIEmbeddingSiteWindow /* void setDimensions (in unsigned long flags, in long x, in long y, in long cx, in long cy); */ NS_IMETHODIMP -nsCocoaBrowserListener::SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) +CHBrowserListener::SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) { if (!mView) return NS_ERROR_FAILURE; @@ -344,7 +344,7 @@ nsCocoaBrowserListener::SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRIn /* void getDimensions (in unsigned long flags, out long x, out long y, out long cx, out long cy); */ NS_IMETHODIMP -nsCocoaBrowserListener::GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) +CHBrowserListener::GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) { if (!mView) return NS_ERROR_FAILURE; @@ -380,7 +380,7 @@ nsCocoaBrowserListener::GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, /* void setFocus (); */ NS_IMETHODIMP -nsCocoaBrowserListener::SetFocus() +CHBrowserListener::SetFocus() { if (!mView) { return NS_ERROR_FAILURE; @@ -398,7 +398,7 @@ nsCocoaBrowserListener::SetFocus() /* attribute boolean visibility; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetVisibility(PRBool *aVisibility) +CHBrowserListener::GetVisibility(PRBool *aVisibility) { NS_ENSURE_ARG_POINTER(aVisibility); @@ -416,7 +416,7 @@ nsCocoaBrowserListener::GetVisibility(PRBool *aVisibility) return NS_OK; } NS_IMETHODIMP -nsCocoaBrowserListener::SetVisibility(PRBool aVisibility) +CHBrowserListener::SetVisibility(PRBool aVisibility) { if (!mView) { return NS_ERROR_FAILURE; @@ -439,7 +439,7 @@ nsCocoaBrowserListener::SetVisibility(PRBool aVisibility) /* attribute wstring title; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetTitle(PRUnichar * *aTitle) +CHBrowserListener::GetTitle(PRUnichar * *aTitle) { NS_ENSURE_ARG_POINTER(aTitle); @@ -463,7 +463,7 @@ nsCocoaBrowserListener::GetTitle(PRUnichar * *aTitle) return NS_OK; } NS_IMETHODIMP -nsCocoaBrowserListener::SetTitle(const PRUnichar * aTitle) +CHBrowserListener::SetTitle(const PRUnichar * aTitle) { NS_ENSURE_ARG(aTitle); @@ -479,7 +479,7 @@ nsCocoaBrowserListener::SetTitle(const PRUnichar * aTitle) /* [noscript] readonly attribute voidPtr siteWindow; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetSiteWindow(void * *aSiteWindow) +CHBrowserListener::GetSiteWindow(void * *aSiteWindow) { NS_ENSURE_ARG_POINTER(aSiteWindow); *aSiteWindow = nsnull; @@ -504,7 +504,7 @@ nsCocoaBrowserListener::GetSiteWindow(void * *aSiteWindow) /* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in unsigned long aStatus); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, +CHBrowserListener::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 aStateFlags, PRUint32 aStatus) { NSEnumerator* enumerator = [mListeners objectEnumerator]; @@ -526,7 +526,7 @@ nsCocoaBrowserListener::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest * /* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, +CHBrowserListener::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress, PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress) { @@ -540,7 +540,7 @@ nsCocoaBrowserListener::OnProgressChange(nsIWebProgress *aWebProgress, nsIReques /* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, +CHBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location) { if (!location) @@ -560,7 +560,7 @@ nsCocoaBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIReques /* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, +CHBrowserListener::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const PRUnichar *aMessage) { NSString* str = [NSString stringWithPRUnichars:aMessage]; @@ -575,7 +575,7 @@ nsCocoaBrowserListener::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest /* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 state) +CHBrowserListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 state) { NSEnumerator* enumerator = [mListeners objectEnumerator]; id obj; @@ -586,19 +586,19 @@ nsCocoaBrowserListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIReques } void -nsCocoaBrowserListener::AddListener(id aListener) +CHBrowserListener::AddListener(id aListener) { [mListeners addObject:aListener]; } void -nsCocoaBrowserListener::RemoveListener(id aListener) +CHBrowserListener::RemoveListener(id aListener) { [mListeners removeObject:aListener]; } void -nsCocoaBrowserListener::SetContainer(id aContainer) +CHBrowserListener::SetContainer(id aContainer) { [mContainer autorelease]; diff --git a/mozilla/camino/src/embedding/CHBrowserService.h b/mozilla/camino/src/embedding/CHBrowserService.h index e72518cf66e..00c903eaabd 100644 --- a/mozilla/camino/src/embedding/CHBrowserService.h +++ b/mozilla/camino/src/embedding/CHBrowserService.h @@ -44,13 +44,13 @@ #include "nsIHelperAppLauncherDialog.h" #include "nsIFactory.h" -class nsCocoaBrowserService : public nsIWindowCreator, +class CHBrowserService : public nsIWindowCreator, public nsIFactory, public nsIHelperAppLauncherDialog { public: - nsCocoaBrowserService(); - virtual ~nsCocoaBrowserService(); + CHBrowserService(); + virtual ~CHBrowserService(); NS_DECL_ISUPPORTS NS_DECL_NSIWINDOWCREATOR @@ -68,7 +68,7 @@ public: static PRUint32 sNumBrowsers; private: - static nsCocoaBrowserService* sSingleton; + static CHBrowserService* sSingleton; static nsAlertController* sController; static PRBool sCanTerminate; }; diff --git a/mozilla/camino/src/embedding/CHBrowserService.mm b/mozilla/camino/src/embedding/CHBrowserService.mm index b6a20a40415..fb4ed9ae9de 100644 --- a/mozilla/camino/src/embedding/CHBrowserService.mm +++ b/mozilla/camino/src/embedding/CHBrowserService.mm @@ -37,8 +37,8 @@ #import "NSString+Utils.h" -#import "nsCocoaBrowserService.h" -#import "DownloadFactories.h" +#import "CHBrowserService.h" +#import "CHDownloadFactories.h" #import "CHBrowserView.h" #include "nsIWindowWatcher.h" @@ -51,41 +51,41 @@ #include "nsIDownload.h" #include "nsIExternalHelperAppService.h" -nsAlertController* nsCocoaBrowserService::sController = nsnull; -nsCocoaBrowserService* nsCocoaBrowserService::sSingleton = nsnull; -PRUint32 nsCocoaBrowserService::sNumBrowsers = 0; -PRBool nsCocoaBrowserService::sCanTerminate = PR_FALSE; +nsAlertController* CHBrowserService::sController = nsnull; +CHBrowserService* CHBrowserService::sSingleton = nsnull; +PRUint32 CHBrowserService::sNumBrowsers = 0; +PRBool CHBrowserService::sCanTerminate = PR_FALSE; // This method should return a nsModuleComponentInfo array of // application-provided XPCOM components to register. The implementation // is in AppComponents.mm. extern const nsModuleComponentInfo* GetAppModuleComponentInfo(int* outNumComponents); -// nsCocoaBrowserService implementation -nsCocoaBrowserService::nsCocoaBrowserService() +// CHBrowserService implementation +CHBrowserService::CHBrowserService() { NS_INIT_ISUPPORTS(); } -nsCocoaBrowserService::~nsCocoaBrowserService() +CHBrowserService::~CHBrowserService() { } -NS_IMPL_ISUPPORTS3(nsCocoaBrowserService, +NS_IMPL_ISUPPORTS3(CHBrowserService, nsIWindowCreator, nsIFactory, nsIHelperAppLauncherDialog) /* static */ nsresult -nsCocoaBrowserService::InitEmbedding() +CHBrowserService::InitEmbedding() { sNumBrowsers++; if (sSingleton) return NS_OK; - sSingleton = new nsCocoaBrowserService(); + sSingleton = new CHBrowserService(); if (!sSingleton) return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(sSingleton); @@ -141,7 +141,7 @@ nsCocoaBrowserService::InitEmbedding() /* static */ void -nsCocoaBrowserService::BrowserClosed() +CHBrowserService::BrowserClosed() { sNumBrowsers--; if (sCanTerminate && sNumBrowsers == 0) { @@ -156,7 +156,7 @@ nsCocoaBrowserService::BrowserClosed() /* static */ void -nsCocoaBrowserService::TermEmbedding() +CHBrowserService::TermEmbedding() { sCanTerminate = PR_TRUE; if (sNumBrowsers == 0) { @@ -178,7 +178,7 @@ nsCocoaBrowserService::TermEmbedding() #define NS_ALERT_NIB_NAME "alert" nsAlertController* -nsCocoaBrowserService::GetAlertController() +CHBrowserService::GetAlertController() { if (!sController) { NSBundle* bundle = [NSBundle bundleForClass:[CHBrowserView class]]; @@ -188,7 +188,7 @@ nsCocoaBrowserService::GetAlertController() } void -nsCocoaBrowserService::SetAlertController(nsAlertController* aController) +CHBrowserService::SetAlertController(nsAlertController* aController) { // XXX When should the controller be released? sController = aController; @@ -197,7 +197,7 @@ nsCocoaBrowserService::SetAlertController(nsAlertController* aController) // nsIFactory implementation NS_IMETHODIMP -nsCocoaBrowserService::CreateInstance(nsISupports *aOuter, +CHBrowserService::CreateInstance(nsISupports *aOuter, const nsIID & aIID, void **aResult) { @@ -214,7 +214,7 @@ nsCocoaBrowserService::CreateInstance(nsISupports *aOuter, } NS_IMETHODIMP -nsCocoaBrowserService::LockFactory(PRBool lock) +CHBrowserService::LockFactory(PRBool lock) { return NS_OK; } @@ -223,7 +223,7 @@ nsCocoaBrowserService::LockFactory(PRBool lock) // Implementation of nsIWindowCreator /* nsIWebBrowserChrome createChromeWindow (in nsIWebBrowserChrome parent, in PRUint32 chromeFlags); */ NS_IMETHODIMP -nsCocoaBrowserService::CreateChromeWindow(nsIWebBrowserChrome *parent, +CHBrowserService::CreateChromeWindow(nsIWebBrowserChrome *parent, PRUint32 chromeFlags, nsIWebBrowserChrome **_retval) { @@ -241,13 +241,13 @@ nsCocoaBrowserService::CreateChromeWindow(nsIWebBrowserChrome *parent, // void show( in nsIHelperAppLauncher aLauncher, in nsISupports aContext ); NS_IMETHODIMP -nsCocoaBrowserService::Show(nsIHelperAppLauncher* inLauncher, nsISupports* inContext) +CHBrowserService::Show(nsIHelperAppLauncher* inLauncher, nsISupports* inContext) { return inLauncher->SaveToDisk(nsnull, PR_FALSE); } NS_IMETHODIMP -nsCocoaBrowserService::PromptForSaveToFile(nsISupports *aWindowContext, const PRUnichar *aDefaultFile, const PRUnichar *aSuggestedFileExtension, nsILocalFile **_retval) +CHBrowserService::PromptForSaveToFile(nsISupports *aWindowContext, const PRUnichar *aDefaultFile, const PRUnichar *aSuggestedFileExtension, nsILocalFile **_retval) { NSString* filename = [NSString stringWithPRUnichars:aDefaultFile]; NSSavePanel *thePanel = [NSSavePanel savePanel]; @@ -267,8 +267,8 @@ nsCocoaBrowserService::PromptForSaveToFile(nsISupports *aWindowContext, const PR /* void showProgressDialog (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */ NS_IMETHODIMP -nsCocoaBrowserService::ShowProgressDialog(nsIHelperAppLauncher *aLauncher, nsISupports *aContext) +CHBrowserService::ShowProgressDialog(nsIHelperAppLauncher *aLauncher, nsISupports *aContext) { - NSLog(@"nsCocoaBrowserService::ShowProgressDialog"); + NSLog(@"CHBrowserService::ShowProgressDialog"); return NS_OK; } diff --git a/mozilla/camino/src/embedding/CHBrowserView.h b/mozilla/camino/src/embedding/CHBrowserView.h index ccf88cdd477..8c568d7de30 100644 --- a/mozilla/camino/src/embedding/CHBrowserView.h +++ b/mozilla/camino/src/embedding/CHBrowserView.h @@ -42,7 +42,7 @@ #import @class CHBrowserView; -class nsCocoaBrowserListener; +class CHBrowserListener; class nsIDOMWindow; class nsIWebBrowser; class nsIDOMNode; @@ -118,7 +118,7 @@ enum { @interface CHBrowserView : NSView { nsIWebBrowser* _webBrowser; - nsCocoaBrowserListener* _listener; + CHBrowserListener* _listener; NSWindow* mWindow; nsIDragHelperService* mDragHelper; @@ -186,7 +186,7 @@ enum { - (void)destroyWebBrowser; - (nsIWebBrowser*)getWebBrowser; -- (nsCocoaBrowserListener*)getCocoaBrowserListener; +- (CHBrowserListener*)getCocoaBrowserListener; - (void)setWebBrowser:(nsIWebBrowser*)browser; - (NSString*)getFocusedURLString; diff --git a/mozilla/camino/src/embedding/CHBrowserView.mm b/mozilla/camino/src/embedding/CHBrowserView.mm index 3006c0304d1..044758a0607 100644 --- a/mozilla/camino/src/embedding/CHBrowserView.mm +++ b/mozilla/camino/src/embedding/CHBrowserView.mm @@ -64,12 +64,12 @@ #include "nsNetUtil.h" #include "SaveHeaderSniffer.h" -#import "CHBrowserWrapper.h" +#import "BrowserWrapper.h" #import "CHBrowserView.h" #import "FindDlgController.h" -#import "nsCocoaBrowserService.h" -#import "nsCocoaBrowserListener.h" +#import "CHBrowserService.h" +#import "CHBrowserListener.h" #import "mozView.h" @@ -100,12 +100,12 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; { if ( (self = [super initWithFrame:frame]) ) { - nsresult rv = nsCocoaBrowserService::InitEmbedding(); + nsresult rv = CHBrowserService::InitEmbedding(); if (NS_FAILED(rv)) { // XXX need to throw } - _listener = new nsCocoaBrowserListener(self); + _listener = new CHBrowserListener(self); NS_ADDREF(_listener); // Create the web browser instance @@ -148,7 +148,7 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; NS_RELEASE(_listener); NS_IF_RELEASE(_webBrowser); - nsCocoaBrowserService::BrowserClosed(); + CHBrowserService::BrowserClosed(); #if DEBUG NSLog(@"CHBrowserView died."); @@ -321,7 +321,7 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; return str; } -- (nsCocoaBrowserListener*)getCocoaBrowserListener +- (CHBrowserListener*)getCocoaBrowserListener { return _listener; } diff --git a/mozilla/camino/src/embedding/CHDownloadFactories.mm b/mozilla/camino/src/embedding/CHDownloadFactories.mm index e68a8d369a5..b14fd7ffbcd 100644 --- a/mozilla/camino/src/embedding/CHDownloadFactories.mm +++ b/mozilla/camino/src/embedding/CHDownloadFactories.mm @@ -38,14 +38,14 @@ // This file contains implementations of factories for various // downloading-related interfaces. -#import "DownloadProgressDisplay.h" +#import "CHDownloadProgressDisplay.h" #import "ProgressDlgController.h" #include "nsCOMPtr.h" #include "nsIFactory.h" #include "nsDownloadListener.h" -#include "DownloadFactories.h" +#include "CHDownloadFactories.h" // factory for nsIDownload objects // XXX replace with generic factory stuff diff --git a/mozilla/camino/src/embedding/CHDownloadProgressDisplay.h b/mozilla/camino/src/embedding/CHDownloadProgressDisplay.h index fc1fe6ce074..03b8e659354 100644 --- a/mozilla/camino/src/embedding/CHDownloadProgressDisplay.h +++ b/mozilla/camino/src/embedding/CHDownloadProgressDisplay.h @@ -42,7 +42,7 @@ There are three things here: - 1. The DownloadProgressDisplay protocol. + 1. The CHDownloadProgressDisplay protocol. This is a formal protocol that needs to be implemented by a window controller for your progress window. Its methods @@ -53,7 +53,7 @@ This class should be subclassed by an embedder, with an implementation of 'createDownloadController' that hands back a new instance of an NSWindowController that implements the - protocol. + protocol. The underlying C++ classes use this factory to create the progress window controller. @@ -108,7 +108,7 @@ class CHDownloader; // a formal protocol for something that implements progress display // Embedders can make a window controller that conforms to this // protocol, and reuse nsDownloadListener to get download UI. -@protocol DownloadProgressDisplay +@protocol CHDownloadProgressDisplay - (void)onStartDownload:(BOOL)isFileSave; - (void)onEndDownload; @@ -127,7 +127,7 @@ class CHDownloader; { } -- (NSWindowController *)createDownloadController; +- (NSWindowController *)createDownloadController; @end @@ -161,7 +161,7 @@ protected: protected: DownloadControllerFactory* mControllerFactory; - id mDownloadDisplay; // something that implements the DownloadProgressDisplay protocol + id mDownloadDisplay; // something that implements the CHDownloadProgressDisplay protocol PRBool mIsFileSave; // true if we're doing a save, rather than a download }; diff --git a/mozilla/camino/src/embedding/CHDownloadProgressDisplay.mm b/mozilla/camino/src/embedding/CHDownloadProgressDisplay.mm index 4dac500c85b..3f384b9fa90 100644 --- a/mozilla/camino/src/embedding/CHDownloadProgressDisplay.mm +++ b/mozilla/camino/src/embedding/CHDownloadProgressDisplay.mm @@ -35,12 +35,12 @@ * * ***** END LICENSE BLOCK ***** */ -#import "DownloadProgressDisplay.h" +#import "CHDownloadProgressDisplay.h" @implementation DownloadControllerFactory -- (NSWindowController *)createDownloadController +- (NSWindowController *)createDownloadController { // a dummy implementation. You should provide a subclass that // returns an instance of your progress dialog controller. diff --git a/mozilla/camino/src/extensions/ExtendedOutlineView.h b/mozilla/camino/src/extensions/ExtendedOutlineView.h index 8b90a2820cf..edbde3aaffa 100644 --- a/mozilla/camino/src/extensions/ExtendedOutlineView.h +++ b/mozilla/camino/src/extensions/ExtendedOutlineView.h @@ -24,7 +24,7 @@ #import -@interface CHExtendedOutlineView : NSOutlineView { +@interface ExtendedOutlineView : NSOutlineView { SEL mDeleteAction; NSRect mOldFrameRect; diff --git a/mozilla/camino/src/extensions/ExtendedOutlineView.mm b/mozilla/camino/src/extensions/ExtendedOutlineView.mm index 6d40efb013c..83e68278b1f 100644 --- a/mozilla/camino/src/extensions/ExtendedOutlineView.mm +++ b/mozilla/camino/src/extensions/ExtendedOutlineView.mm @@ -22,13 +22,13 @@ * Max Horn (Context menu & tooltip code) */ -#import "CHExtendedOutlineView.h" +#import "ExtendedOutlineView.h" -@interface CHExtendedOutlineView (Private) +@interface ExtendedOutlineView (Private) - (void)_updateToolTipRect; @end -@implementation CHExtendedOutlineView +@implementation ExtendedOutlineView - (id)initWithFrame:(NSRect)frame { @@ -191,7 +191,7 @@ @end -@implementation CHExtendedOutlineView (Private) +@implementation ExtendedOutlineView (Private) /* * Set up tooltip rects for every row, but only if the frame size or diff --git a/mozilla/camino/src/extensions/GeckoUtils.h b/mozilla/camino/src/extensions/GeckoUtils.h index dfa225a2ff0..85fc3860fbf 100644 --- a/mozilla/camino/src/extensions/GeckoUtils.h +++ b/mozilla/camino/src/extensions/GeckoUtils.h @@ -44,7 +44,7 @@ #include "nsIDOMHTMLImageElement.h" #include "nsIDOMCharacterData.h" -class CHGeckoUtils +class GeckoUtils { public: static void GatherTextUnder(nsIDOMNode* aNode, nsString& aResult) { diff --git a/mozilla/camino/src/extensions/IconTabViewItem.h b/mozilla/camino/src/extensions/IconTabViewItem.h index f56f0635483..7f94e61b861 100644 --- a/mozilla/camino/src/extensions/IconTabViewItem.h +++ b/mozilla/camino/src/extensions/IconTabViewItem.h @@ -40,7 +40,7 @@ #import -@interface CHIconTabViewItem : NSTabViewItem +@interface IconTabViewItem : NSTabViewItem { NSImage *mTabIcon; NSDictionary *mLabelAttributes; diff --git a/mozilla/camino/src/extensions/IconTabViewItem.mm b/mozilla/camino/src/extensions/IconTabViewItem.mm index dc58171d306..5439e1da760 100644 --- a/mozilla/camino/src/extensions/IconTabViewItem.mm +++ b/mozilla/camino/src/extensions/IconTabViewItem.mm @@ -41,7 +41,7 @@ #import "NSString+Utils.h" -#import "CHIconTabViewItem.h" +#import "IconTabViewItem.h" #import "NSString+Utils.h" // @@ -53,11 +53,11 @@ static const int kMinTabsForSpacing = 4; // with 1-4 tabs, each tab is 1/4 the tab view width -@interface CHIconTabViewItem(Private) +@interface IconTabViewItem(Private) - (void)setupLabelAttributes; @end; -@implementation CHIconTabViewItem +@implementation IconTabViewItem -(id)initWithIdentifier:(id)identifier withTabIcon:(NSImage *)tabIcon { diff --git a/mozilla/camino/src/extensions/ImageAdditions.h b/mozilla/camino/src/extensions/ImageAdditions.h index 54c5e8cd1a5..ffdc35eca9c 100644 --- a/mozilla/camino/src/extensions/ImageAdditions.h +++ b/mozilla/camino/src/extensions/ImageAdditions.h @@ -1,6 +1,6 @@ #import -@interface NSImage (CHImageAdditions) +@interface NSImage (ImageAdditions) - (void) drawFlippedInRect:(NSRect) rect operation:(NSCompositingOperation) op fraction:(float) delta; - (void) drawFlippedInRect:(NSRect) rect operation:(NSCompositingOperation) op; - (void)applyBadge:(NSImage*)badge withAlpha:(float)alpha scale:(float)scale; diff --git a/mozilla/camino/src/extensions/ImageAdditions.m b/mozilla/camino/src/extensions/ImageAdditions.m index 81362fda06e..173918ec057 100644 --- a/mozilla/camino/src/extensions/ImageAdditions.m +++ b/mozilla/camino/src/extensions/ImageAdditions.m @@ -1,7 +1,7 @@ -#import "CHImageAdditions.h" +#import "ImageAdditions.h" #import -@implementation NSImage (CHImageAdditions) +@implementation NSImage (ImageAdditions) - (void) drawFlippedInRect:(NSRect) rect operation:(NSCompositingOperation) op fraction:(float) delta { CGContextRef context; diff --git a/mozilla/camino/src/extensions/RDFOutlineViewDataSource.h b/mozilla/camino/src/extensions/RDFOutlineViewDataSource.h index 2d66e0ef490..dd6bc273a2c 100644 --- a/mozilla/camino/src/extensions/RDFOutlineViewDataSource.h +++ b/mozilla/camino/src/extensions/RDFOutlineViewDataSource.h @@ -45,7 +45,7 @@ class nsIRDFContainerUtils; class nsIRDFResource; class nsIRDFService; -@interface CHRDFOutlineViewDataSource : NSObject { +@interface RDFOutlineViewDataSource : NSObject { nsIRDFDataSource* mDataSource; nsIRDFContainer* mContainer; nsIRDFContainerUtils* mContainerUtils; diff --git a/mozilla/camino/src/extensions/RDFOutlineViewDataSource.mm b/mozilla/camino/src/extensions/RDFOutlineViewDataSource.mm index c39c8263299..8082b634f7c 100644 --- a/mozilla/camino/src/extensions/RDFOutlineViewDataSource.mm +++ b/mozilla/camino/src/extensions/RDFOutlineViewDataSource.mm @@ -38,7 +38,7 @@ #import "NSString+Utils.h" -#import "CHRDFOutlineViewDataSource.h" +#import "RDFOutlineViewDataSource.h" #include "nsIRDFDataSource.h" #include "nsIRDFService.h" @@ -56,7 +56,7 @@ -@implementation CHRDFOutlineViewDataSource +@implementation RDFOutlineViewDataSource - (void) ensureDataSourceLoaded { diff --git a/mozilla/camino/src/extensions/ToolbarAdditions.m b/mozilla/camino/src/extensions/ToolbarAdditions.m index 62e3c6f1bc8..363bb2711d4 100644 --- a/mozilla/camino/src/extensions/ToolbarAdditions.m +++ b/mozilla/camino/src/extensions/ToolbarAdditions.m @@ -1,4 +1,4 @@ -#import "CHToolbarAdditions.h" +#import "ToolbarAdditions.h" #import @implementation NSToolbar (CHToolbarCustomizableAdditions) diff --git a/mozilla/camino/src/find/Find.h b/mozilla/camino/src/find/Find.h index 588a815c0c5..21d79118f1b 100644 --- a/mozilla/camino/src/find/Find.h +++ b/mozilla/camino/src/find/Find.h @@ -24,13 +24,13 @@ #import // -// protocol CHFind +// protocol Find // // Any window who wants to be able to work with the Find dialog should implement // this protocol. // -@protocol CHFind +@protocol Find - (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive wrap:(BOOL)inWrap backwards:(BOOL)inBackwards; diff --git a/mozilla/camino/src/find/FindDlgController.mm b/mozilla/camino/src/find/FindDlgController.mm index 23de3042d6d..edf9fa9fe20 100644 --- a/mozilla/camino/src/find/FindDlgController.mm +++ b/mozilla/camino/src/find/FindDlgController.mm @@ -37,7 +37,7 @@ #import "FindDlgController.h" #import "BrowserWindowController.h" -#import "CHFind.h" +#import "Find.h" #include "nsCOMPtr.h" @@ -70,8 +70,8 @@ -(IBAction) find: (id)aSender { NSWindowController* controller = [[NSApp mainWindow] windowController]; - if ( [controller conformsToProtocol:@protocol(CHFind)] ) { - id browserController = controller; + if ( [controller conformsToProtocol:@protocol(Find)] ) { + id browserController = controller; BOOL ignoreCase = [mIgnoreCaseBox state]; BOOL wrapSearch = [mWrapAroundBox state]; BOOL searchBack = [mSearchBackwardsBox state]; @@ -99,8 +99,8 @@ -(IBAction) findAgain: (id)aSender { NSWindowController* controller = [[NSApp mainWindow] windowController]; - if ( [controller conformsToProtocol:@protocol(CHFind)] ) { - id browserController = controller; + if ( [controller conformsToProtocol:@protocol(Find)] ) { + id browserController = controller; BOOL ignoreCase = [mIgnoreCaseBox state]; BOOL wrapSearch = [mWrapAroundBox state]; BOOL searchBack = [mSearchBackwardsBox state]; diff --git a/mozilla/camino/src/history/HistoryDataSource.h b/mozilla/camino/src/history/HistoryDataSource.h index cb2259e98bd..db46cba67d1 100644 --- a/mozilla/camino/src/history/HistoryDataSource.h +++ b/mozilla/camino/src/history/HistoryDataSource.h @@ -1,5 +1,5 @@ // -// CHHistoryDataSource.h +// HistoryDataSource.h // Chimera // // Created by Ben Goodger on Sun Apr 28 2002. @@ -8,11 +8,11 @@ #import -#import "CHRDFOutlineViewDataSource.h" +#import "RDFOutlineViewDataSource.h" @class BrowserWindowController; -@interface CHHistoryDataSource : CHRDFOutlineViewDataSource +@interface HistoryDataSource : RDFOutlineViewDataSource { IBOutlet BrowserWindowController* mBrowserWindowController; diff --git a/mozilla/camino/src/history/HistoryDataSource.mm b/mozilla/camino/src/history/HistoryDataSource.mm index 932676ef92d..976dc340c69 100644 --- a/mozilla/camino/src/history/HistoryDataSource.mm +++ b/mozilla/camino/src/history/HistoryDataSource.mm @@ -1,5 +1,5 @@ // -// CHHistoryDataSource.mm +// HistoryDataSource.mm // Chimera // // Created by Ben Goodger on Sun Apr 28 2002. @@ -9,7 +9,7 @@ #import "NSString+Utils.h" #import "BrowserWindowController.h" -#import "CHHistoryDataSource.h" +#import "HistoryDataSource.h" #import "CHBrowserView.h" #include "nsIRDFService.h" @@ -21,7 +21,7 @@ #include "nsComponentManagerUtils.h" -@implementation CHHistoryDataSource +@implementation HistoryDataSource - (void) ensureDataSourceLoaded { diff --git a/mozilla/camino/src/preferences/MVPreferencesController.mm b/mozilla/camino/src/preferences/MVPreferencesController.mm index 6719b1ff9aa..3d83175c672 100644 --- a/mozilla/camino/src/preferences/MVPreferencesController.mm +++ b/mozilla/camino/src/preferences/MVPreferencesController.mm @@ -2,12 +2,12 @@ #import "MVPreferencesController.h" #import "MVPreferencesMultipleIconView.h" #import "MVPreferencesGroupedIconView.h" -#import "CHToolbarAdditions.h" +#import "ToolbarAdditions.h" #include "nsCOMPtr.h" #include "nsIServiceManager.h" #include "nsIPref.h" -#include "nsCocoaBrowserService.h" +#include "CHBrowserService.h" // #import "Defines.h" @@ -114,7 +114,7 @@ NSString *MVPreferencesWindowNotification = @"MVPreferencesWindowNotification"; // with it in |windowDidClose()|. Need to ensure this is exactly balanced with |BrowserClosed()| // calls as it increments a refcount. As a result, we can only call it when we're making // the window visible. Too bad cocoa doesn't give us any notifications of this. - nsCocoaBrowserService::InitEmbedding(); + CHBrowserService::InitEmbedding(); } [self showAll:nil]; [window makeKeyAndOrderFront:nil]; @@ -236,7 +236,7 @@ NSString *MVPreferencesWindowNotification = @"MVPreferencesWindowNotification"; [[NSUserDefaults standardUserDefaults] synchronize]; // tell gecko that this window no longer needs it around. - nsCocoaBrowserService::BrowserClosed(); + CHBrowserService::BrowserClosed(); } - (NSToolbarItem *) toolbar:(NSToolbar *) toolbar diff --git a/mozilla/camino/src/preferences/MVPreferencesMultipleIconView.m b/mozilla/camino/src/preferences/MVPreferencesMultipleIconView.m index 571f1f80192..c79db49f8d0 100644 --- a/mozilla/camino/src/preferences/MVPreferencesMultipleIconView.m +++ b/mozilla/camino/src/preferences/MVPreferencesMultipleIconView.m @@ -1,7 +1,7 @@ #import #import "MVPreferencesMultipleIconView.h" #import "MVPreferencesController.h" -#import "CHImageAdditions.h" +#import "ImageAdditions.h" @interface MVPreferencesMultipleIconView (MVPreferencesMultipleIconViewPrivate) - (void) _focusFirst; diff --git a/mozilla/camino/src/preferences/PreferenceManager.h b/mozilla/camino/src/preferences/PreferenceManager.h index a682a4c80e4..75f9ebc137c 100644 --- a/mozilla/camino/src/preferences/PreferenceManager.h +++ b/mozilla/camino/src/preferences/PreferenceManager.h @@ -40,14 +40,14 @@ class nsIPref; -@interface CHPreferenceManager : NSObject +@interface PreferenceManager : NSObject { NSUserDefaults* mDefaults; ICInstance mInternetConfig; nsIPref* mPrefs; } -+ (CHPreferenceManager *)sharedInstance; ++ (PreferenceManager *)sharedInstance; - (id) init; - (void) dealloc; diff --git a/mozilla/camino/src/preferences/PreferenceManager.mm b/mozilla/camino/src/preferences/PreferenceManager.mm index 1fcdece52f9..8b5b5470f8b 100644 --- a/mozilla/camino/src/preferences/PreferenceManager.mm +++ b/mozilla/camino/src/preferences/PreferenceManager.mm @@ -39,8 +39,8 @@ #import #import -#import "CHPreferenceManager.h" -#import "CHUserDefaults.h" +#import "PreferenceManager.h" +#import "UserDefaults.h" #include "nsIServiceManager.h" #include "nsIProfile.h" @@ -58,12 +58,12 @@ nsresult PR_CALLBACK app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); #endif -@implementation CHPreferenceManager +@implementation PreferenceManager -+ (CHPreferenceManager *) sharedInstance { - static CHPreferenceManager *sSharedInstance = nil; - return ( sSharedInstance ? sSharedInstance : (sSharedInstance = [[[CHPreferenceManager alloc] init] autorelease] )); ++ (PreferenceManager *) sharedInstance { + static PreferenceManager *sSharedInstance = nil; + return ( sSharedInstance ? sSharedInstance : (sSharedInstance = [[[PreferenceManager alloc] init] autorelease] )); } diff --git a/mozilla/chimera/Chimera.pbproj/project.pbxproj b/mozilla/chimera/Chimera.pbproj/project.pbxproj index dfd250ed5f9..6ff2de3c10f 100644 --- a/mozilla/chimera/Chimera.pbproj/project.pbxproj +++ b/mozilla/chimera/Chimera.pbproj/project.pbxproj @@ -36,8 +36,8 @@ fileEncoding = 10; isa = PBXFileReference; name = English; - path = English.lproj/InfoPlist.strings; - refType = 4; + path = ../English.lproj/InfoPlist.strings; + refType = 2; }; 089C165EFE840E0CC02AAC07 = { fileRef = 089C165CFE840E0CC02AAC07; @@ -177,7 +177,6 @@ 29B97323FDCFA39411CA2CEA, 19C28FACFE9D520D11CA2CBB, F6BD637A01B30E0F01A962F7, - F50E1BA70207EB8201F281DF, ); isa = PBXGroup; name = Chimera; @@ -196,8 +195,9 @@ }; 29B97316FDCFA39411CA2CEA = { isa = PBXFileReference; - path = main.m; - refType = 4; + name = main.m; + path = ../src/application/main.m; + refType = 2; }; 29B97317FDCFA39411CA2CEA = { children = ( @@ -222,8 +222,9 @@ }; 29B97319FDCFA39411CA2CEA = { isa = PBXFileReference; - path = MainMenu.nib; - refType = 4; + name = English; + path = ../English.lproj/MainMenu.nib; + refType = 2; }; 29B97323FDCFA39411CA2CEA = { children = ( @@ -269,9 +270,9 @@ buildSettings = { DEBUGGING_SYMBOLS = NO; FRAMEWORK_SEARCH_PATHS = ""; - HEADER_SEARCH_PATHS = "../dist/include/exthandler ../dist/include/helperAppDlg ../dist/include/intl ../dist/include/pipboot ../dist/include/pipnss ../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/commandhandler ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/nkcache ../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/chrome ../dist/include/xpcom ../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\""; + HEADER_SEARCH_PATHS = "../../dist/include/exthandler ../../dist/include/helperAppDlg ../../dist/include/intl ../../dist/include/pipboot ../../dist/include/pipnss ../../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/commandhandler ../../dist/include/windowwatcher ../../dist/include/webshell ../../dist/include/widget ../../dist/include/uriloader ../../dist/include/nkcache ../../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/chrome ../../dist/include/xpcom ../../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\""; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../dist/Embed/components ../intl/unicharutil/util ../modules/zlib/src"; + LIBRARY_SEARCH_PATHS = "../../dist/bin ../../dist/lib ../../dist/Embed/components ../../intl/unicharutil/util ../../modules/zlib/src"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = "-fno-rtti -DOSTYPE=\\\"Darwin1.4\\\" -DOSARCH=\\\"Darwin\\\""; OTHER_LDFLAGS = "-lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -lm"; @@ -469,7 +470,6 @@ 2EEC3E63028138724B000102, 2E748B74029A448D4B000102, F53E012A02AEE91D01A967F3, - F53E013302AEEA2901A967F3, F632AF8502B9AEBB01000103, F59236C202C89ACA0100012B, F5A3669802CCFAF601DC3354, @@ -494,16 +494,16 @@ 29B97328FDCFA39411CA2CEA = { buildActionMask = 2147483647; files = ( - F518430702063A9001A966FE, + F507A84203116E1D01026D5D, 089C165EFE840E0CC02AAC07, F5555C8602022F070164C72B, F5555C8702022F070164C72B, F5555C8802022F070164C72B, F5555C8902022F070164C72B, F5547D61020333DA01F448B0, - F518430602063A8A01A966FE, + F507A84503116E5501026D5D, F51842FF020629B701A966FE, - F5173959020CE1E50189DA0C, + F507A84B03116E6E01026D5D, F5264FD4020D4C25010001CA, F5264FD5020D4C25010001CA, F5264FD6020D4C25010001CA, @@ -512,15 +512,15 @@ F5264FD9020D4C25010001CA, F5264FDA020D4C25010001CA, F55CCFD3020E98EA010001CA, - F528E217020FD5D80168DE43, + F507A84E03116E7401026D5D, F5568A8F0217C7F5010001CA, F5568A910217CA82010001CA, - F5247C2E02289FD9013DD99A, + F507A84803116E6901026D5D, F53F2206022B7C78010001CA, F53F2207022B7C78010001CA, - F53F2208022B7C78010001CA, - F585677E02382E97010001CA, - F568C3CE023A49C0010001CA, + F507A86203128A3D01026D5D, + F507A85403116EA401026D5D, + F507A85703116EBB01026D5D, F568C3D4023A4F71010001CA, F538DFB3023B3739010001CA, F538DFB4023B3739010001CA, @@ -545,7 +545,7 @@ F5179423028275B901A967DF, F540BD1B029ED15301026D5D, F540BD1D029ED17901026D5D, - F53E013002AEE9BD01A967F3, + F507A85103116E7901026D5D, F50EA34502BAAAB701000103, F50EA34602BAAAB701000103, F50EA34702BAAAB701000103, @@ -656,13 +656,15 @@ //2E4 2E2939FF027F33604B000102 = { isa = PBXFileReference; - path = CHPageProxyIcon.mm; - refType = 4; + name = PageProxyIcon.mm; + path = ../src/browser/PageProxyIcon.mm; + refType = 2; }; 2E293A00027F33604B000102 = { isa = PBXFileReference; - path = CHPageProxyIcon.h; - refType = 4; + name = PageProxyIcon.h; + path = ../src/browser/PageProxyIcon.h; + refType = 2; }; 2E293A01027F33604B000102 = { fileRef = 2E293A00027F33604B000102; @@ -678,13 +680,15 @@ }; 2E748B72029A448D4B000102 = { isa = PBXFileReference; - path = CHGoMenu.h; - refType = 4; + name = GoMenu.h; + path = ../src/browser/GoMenu.h; + refType = 2; }; 2E748B73029A448D4B000102 = { isa = PBXFileReference; - path = CHGoMenu.mm; - refType = 4; + name = GoMenu.mm; + path = ../src/browser/GoMenu.mm; + refType = 2; }; 2E748B74029A448D4B000102 = { fileRef = 2E748B72029A448D4B000102; @@ -700,13 +704,15 @@ }; 2EEC3E61028138714B000102 = { isa = PBXFileReference; - path = CHBookmarksOutlineView.h; - refType = 4; + name = BookmarksOutlineView.h; + path = ../src/bookmarks/BookmarksOutlineView.h; + refType = 2; }; 2EEC3E62028138714B000102 = { isa = PBXFileReference; - path = CHBookmarksOutlineView.mm; - refType = 4; + name = BookmarksOutlineView.mm; + path = ../src/bookmarks/BookmarksOutlineView.mm; + refType = 2; }; 2EEC3E63028138724B000102 = { fileRef = 2EEC3E61028138714B000102; @@ -764,7 +770,7 @@ F506477602AD7E2701A967F3 = { isa = PBXFileReference; name = libunicharutil.a; - path = ../intl/unicharutil/src/libunicharutil.a; + path = ../../intl/unicharutil/src/libunicharutil.a; refType = 2; }; F506477702AD7E2801A967F3 = { @@ -786,7 +792,7 @@ F507423C02AD808201A967F3 = { isa = PBXFileReference; name = libcrmf.a; - path = ../dist/lib/libcrmf.a; + path = ../../dist/lib/libcrmf.a; refType = 2; }; F507423D02AD808301A967F3 = { @@ -798,7 +804,7 @@ F507A82C030BFB7901026D5D = { isa = PBXFileReference; name = libuniversalchardet.dylib; - path = ../dist/Embed/components/libuniversalchardet.dylib; + path = ../../dist/Embed/components/libuniversalchardet.dylib; refType = 2; }; F507A82E030BFBB201026D5D = { @@ -813,10 +819,250 @@ settings = { }; }; + F507A84103116E1D01026D5D = { + children = ( + 29B97319FDCFA39411CA2CEA, + ); + isa = PBXVariantGroup; + name = MainMenu.nib; + refType = 4; + }; + F507A84203116E1D01026D5D = { + fileRef = F507A84103116E1D01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84303116E1D01026D5D = { + fileRef = F507A84103116E1D01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84403116E5501026D5D = { + children = ( + F51842FC0206176901A966FE, + ); + isa = PBXVariantGroup; + name = BrowserWindow.nib; + refType = 4; + }; + F507A84503116E5501026D5D = { + fileRef = F507A84403116E5501026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84603116E5501026D5D = { + fileRef = F507A84403116E5501026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84703116E6901026D5D = { + children = ( + F5247C2D02289FD9013DD99A, + ); + isa = PBXVariantGroup; + name = alert.nib; + refType = 4; + }; + F507A84803116E6901026D5D = { + fileRef = F507A84703116E6901026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84903116E6901026D5D = { + fileRef = F507A84703116E6901026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84A03116E6E01026D5D = { + children = ( + F5173958020CE1E50189DA0C, + ); + isa = PBXVariantGroup; + name = ProgressDialog.nib; + refType = 4; + }; + F507A84B03116E6E01026D5D = { + fileRef = F507A84A03116E6E01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84C03116E6E01026D5D = { + fileRef = F507A84A03116E6E01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84D03116E7401026D5D = { + children = ( + F528E216020FD5D80168DE43, + ); + isa = PBXVariantGroup; + name = FindDialog.nib; + refType = 4; + }; + F507A84E03116E7401026D5D = { + fileRef = F507A84D03116E7401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A84F03116E7401026D5D = { + fileRef = F507A84D03116E7401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85003116E7901026D5D = { + children = ( + F53E012F02AEE9BD01A967F3, + ); + isa = PBXVariantGroup; + name = BookmarkInfoPanel.nib; + refType = 4; + }; + F507A85103116E7901026D5D = { + fileRef = F507A85003116E7901026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85203116E7901026D5D = { + fileRef = F507A85003116E7901026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85303116EA401026D5D = { + children = ( + F585677D02382E97010001CA, + ); + isa = PBXVariantGroup; + name = MVPreferences.nib; + refType = 4; + }; + F507A85403116EA401026D5D = { + fileRef = F507A85303116EA401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85503116EA401026D5D = { + fileRef = F507A85303116EA401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85603116EBB01026D5D = { + children = ( + F568C3CD023A49C0010001CA, + ); + isa = PBXVariantGroup; + name = AboutBox.nib; + refType = 4; + }; + F507A85703116EBB01026D5D = { + fileRef = F507A85603116EBB01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85803116EBC01026D5D = { + fileRef = F507A85603116EBB01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85903116FF301026D5D = { + children = ( + F5A8CE5002DFF167013CA8EC, + ); + isa = PBXVariantGroup; + name = Appearance.nib; + path = ../PreferencePanes/Appearance; + refType = 2; + }; + F507A85A03116FF301026D5D = { + fileRef = F507A85903116FF301026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85B0311895401026D5D = { + children = ( + F52627DA027E98A401000102, + ); + isa = PBXVariantGroup; + name = Navigation.nib; + refType = 4; + }; + F507A85C0311895401026D5D = { + fileRef = F507A85B0311895401026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85D0311948201026D5D = { + children = ( + F57F205E029997E701000106, + ); + isa = PBXVariantGroup; + name = Privacy.nib; + path = ../PreferencePanes/Privacy; + refType = 2; + }; + F507A85E0311948201026D5D = { + fileRef = F507A85D0311948201026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A85F031194B101026D5D = { + children = ( + F53F21FD022B7C77010001CA, + ); + isa = PBXVariantGroup; + name = Personal.nib; + path = ../PreferencePanes/Personal; + refType = 2; + }; + F507A860031194B101026D5D = { + fileRef = F507A85F031194B101026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A86103128A3D01026D5D = { + children = ( + F53F21EE022B7C77010001CA, + ); + isa = PBXVariantGroup; + name = MVPreferencePaneGroups.strings; + refType = 4; + }; + F507A86203128A3D01026D5D = { + fileRef = F507A86103128A3D01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F507A86303128A3D01026D5D = { + fileRef = F507A86103128A3D01026D5D; + isa = PBXBuildFile; + settings = { + }; + }; F507BA480213AD5F01D93544 = { isa = PBXFileReference; - path = BookmarksService.h; - refType = 4; + name = BookmarksService.h; + path = ../src/bookmarks/BookmarksService.h; + refType = 2; }; F507BA4A0213AD5F01D93544 = { fileRef = F507BA480213AD5F01D93544; @@ -826,8 +1072,9 @@ }; F507BA4C0213AFF701D93544 = { isa = PBXFileReference; - path = BookmarksService.mm; - refType = 4; + name = BookmarksService.mm; + path = ../src/bookmarks/BookmarksService.mm; + refType = 2; }; F507BA4D0213AFF701D93544 = { fileRef = F507BA4C0213AFF701D93544; @@ -838,7 +1085,7 @@ F507BA4E0213BAC401D93544 = { isa = PBXFileReference; name = libxmlextras.dylib; - path = ../extensions/xmlextras/build/src/libxmlextras.dylib; + path = ../../extensions/xmlextras/build/src/libxmlextras.dylib; refType = 2; }; F507BA500213BB0B01D93544 = { @@ -868,7 +1115,8 @@ }; F507BA540213C29E01D93544 = { isa = PBXFileReference; - path = bookmarks.xml; + name = bookmarks.xml; + path = ../resources/application/bookmarks.xml; refType = 2; }; F507BA560213C29E01D93544 = { @@ -892,13 +1140,15 @@ }; F50D9DE202ECC2C601BB4219 = { isa = PBXFileReference; - path = nsDownloadListener.h; - refType = 4; + name = nsDownloadListener.h; + path = ../src/download/nsDownloadListener.h; + refType = 2; }; F50D9DE302ECC2C601BB4219 = { isa = PBXFileReference; - path = nsDownloadListener.mm; - refType = 4; + name = nsDownloadListener.mm; + path = ../src/download/nsDownloadListener.mm; + refType = 2; }; F50D9DE402ECC2C601BB4219 = { fileRef = F50D9DE202ECC2C601BB4219; @@ -942,13 +1192,15 @@ }; F50D9DED02EE0AB101BB4219 = { isa = PBXFileReference; - path = DownloadProgressDisplay.h; - refType = 4; + name = CHDownloadProgressDisplay.h; + path = ../src/embedding/CHDownloadProgressDisplay.h; + refType = 2; }; F50D9DEE02EE0AB101BB4219 = { isa = PBXFileReference; - path = DownloadProgressDisplay.mm; - refType = 4; + name = CHDownloadProgressDisplay.mm; + path = ../src/embedding/CHDownloadProgressDisplay.mm; + refType = 2; }; F50D9DEF02EE0AB101BB4219 = { fileRef = F50D9DED02EE0AB101BB4219; @@ -964,13 +1216,15 @@ }; F50D9DF102EE194001BB4219 = { isa = PBXFileReference; - path = DownloadFactories.h; - refType = 4; + name = CHDownloadFactories.h; + path = ../src/embedding/CHDownloadFactories.h; + refType = 2; }; F50D9DF202EE194001BB4219 = { isa = PBXFileReference; - path = DownloadFactories.mm; - refType = 4; + name = CHDownloadFactories.mm; + path = ../src/embedding/CHDownloadFactories.mm; + refType = 2; }; F50D9DF302EE194001BB4219 = { fileRef = F50D9DF102EE194001BB4219; @@ -986,13 +1240,15 @@ }; F50D9DF502EE2B9A01BB4219 = { isa = PBXFileReference; - path = SaveHeaderSniffer.h; - refType = 4; + name = SaveHeaderSniffer.h; + path = ../src/download/SaveHeaderSniffer.h; + refType = 2; }; F50D9DF602EE2B9A01BB4219 = { isa = PBXFileReference; - path = SaveHeaderSniffer.mm; - refType = 4; + name = SaveHeaderSniffer.mm; + path = ../src/download/SaveHeaderSniffer.mm; + refType = 2; }; F50D9DF702EE2B9B01BB4219 = { fileRef = F50D9DF502EE2B9A01BB4219; @@ -1032,7 +1288,7 @@ F50DCB4302C2856001A967F3 = { isa = PBXFileReference; name = libjsj.dylib; - path = ../js/src/liveconnect/libjsj.dylib; + path = ../../js/src/liveconnect/libjsj.dylib; refType = 2; }; F50DCB4402C2856101A967F3 = { @@ -1041,143 +1297,6 @@ settings = { }; }; - F50E1BA70207EB8201F281DF = { - children = ( - F5EA337802EF886D01A96654, - F5948A48029EB9C801000102, - F50E1BC90207F99201F281DF, - F50E1BBC0207F27B01F281DF, - F50E1BAE0207EE5F01F281DF, - ); - isa = PBXGroup; - name = "Mozilla Source Tree"; - refType = 4; - }; - F50E1BAE0207EE5F01F281DF = { - children = ( - F50E1BB20207EE9F01F281DF, - F50E1BAF0207EE5F01F281DF, - ); - isa = PBXGroup; - name = layout; - path = ""; - refType = 4; - }; - F50E1BAF0207EE5F01F281DF = { - children = ( - F50E1BB00207EE5F01F281DF, - ); - isa = PBXGroup; - name = html; - refType = 4; - }; - F50E1BB00207EE5F01F281DF = { - children = ( - F50E1BB10207EE5F01F281DF, - ); - isa = PBXGroup; - name = base; - refType = 4; - }; - F50E1BB10207EE5F01F281DF = { - children = ( - F50E1BB40207EE9F01F281DF, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F50E1BB20207EE9F01F281DF = { - children = ( - F50E1BB30207EE9F01F281DF, - ); - isa = PBXGroup; - name = base; - refType = 4; - }; - F50E1BB30207EE9F01F281DF = { - children = ( - F50E1BB50207EEDC01F281DF, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F50E1BB40207EE9F01F281DF = { - isa = PBXFileReference; - name = nsPresShell.cpp; - path = ../layout/html/base/src/nsPresShell.cpp; - refType = 2; - }; - F50E1BB50207EEDC01F281DF = { - isa = PBXFileReference; - name = nsPresContext.cpp; - path = ../layout/base/src/nsPresContext.cpp; - refType = 2; - }; - F50E1BBC0207F27B01F281DF = { - children = ( - F50E1BBD0207F27B01F281DF, - ); - isa = PBXGroup; - name = intl; - refType = 4; - }; - F50E1BBD0207F27B01F281DF = { - children = ( - F50E1BBE0207F27B01F281DF, - ); - isa = PBXGroup; - name = locale; - refType = 4; - }; - F50E1BBE0207F27B01F281DF = { - children = ( - F50E1BBF0207F2B701F281DF, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F50E1BBF0207F2B701F281DF = { - isa = PBXFileReference; - name = nsLanguageAtomService.cpp; - path = ../intl/locale/src/nsLanguageAtomService.cpp; - refType = 2; - }; - F50E1BC90207F99201F281DF = { - children = ( - F5C321D402CBD01C014E7D56, - F5C321D002CBCEF7014E7D56, - F50E1BCA0207F99201F281DF, - F51D9B0A020940C101A80166, - ); - isa = PBXGroup; - name = content; - refType = 4; - }; - F50E1BCA0207F99201F281DF = { - children = ( - F50E1BCB0207F99201F281DF, - ); - isa = PBXGroup; - name = base; - refType = 4; - }; - F50E1BCB0207F99201F281DF = { - children = ( - F50E1BCC0207F9B101F281DF, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F50E1BCC0207F9B101F281DF = { - isa = PBXFileReference; - name = nsRuleNode.cpp; - path = ../content/base/src/nsRuleNode.cpp; - refType = 2; - }; F50EA33D02BAAAB701000103 = { children = ( F50EA33E02BAAAB701000103, @@ -1189,43 +1308,51 @@ F50EA34402BAAAB701000103, ); isa = PBXGroup; - path = throbber; - refType = 4; + name = throbber; + path = ../resources/images/throbber; + refType = 2; }; F50EA33E02BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-01.gif"; - refType = 4; + name = "throbber-01.gif"; + path = "../resources/images/throbber/throbber-01.gif"; + refType = 2; }; F50EA33F02BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-02.gif"; - refType = 4; + name = "throbber-02.gif"; + path = "../resources/images/throbber/throbber-02.gif"; + refType = 2; }; F50EA34002BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-03.gif"; - refType = 4; + name = "throbber-03.gif"; + path = "../resources/images/throbber/throbber-03.gif"; + refType = 2; }; F50EA34102BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-04.gif"; - refType = 4; + name = "throbber-04.gif"; + path = "../resources/images/throbber/throbber-04.gif"; + refType = 2; }; F50EA34202BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-05.gif"; - refType = 4; + name = "throbber-05.gif"; + path = "../resources/images/throbber/throbber-05.gif"; + refType = 2; }; F50EA34302BAAAB701000103 = { isa = PBXFileReference; - path = "throbber-06.gif"; - refType = 4; + name = "throbber-06.gif"; + path = "../resources/images/throbber/throbber-06.gif"; + refType = 2; }; F50EA34402BAAAB701000103 = { isa = PBXFileReference; - path = throbber.gif; - refType = 4; + name = throbber.gif; + path = ../resources/images/throbber/throbber.gif; + refType = 2; }; F50EA34502BAAAB701000103 = { fileRef = F50EA33E02BAAAB701000103; @@ -1313,8 +1440,9 @@ }; F5125A110202064D01FAFD9F = { isa = PBXFileReference; - path = CHBrowserWrapper.h; - refType = 4; + name = BrowserWrapper.h; + path = ../src/browser/BrowserWrapper.h; + refType = 2; }; F5125A140202064D01FAFD9F = { fileRef = F5125A110202064D01FAFD9F; @@ -1381,31 +1509,31 @@ F513437402DA286001A967F3 = { isa = PBXFileReference; name = libucvcn.a; - path = ../intl/uconv/ucvcn/libucvcn.a; + path = ../../intl/uconv/ucvcn/libucvcn.a; refType = 2; }; F513437502DA286001A967F3 = { isa = PBXFileReference; name = libucvja.a; - path = ../intl/uconv/ucvja/libucvja.a; + path = ../../intl/uconv/ucvja/libucvja.a; refType = 2; }; F513437602DA286001A967F3 = { isa = PBXFileReference; name = libucvko.a; - path = ../intl/uconv/ucvko/libucvko.a; + path = ../../intl/uconv/ucvko/libucvko.a; refType = 2; }; F513437702DA286001A967F3 = { isa = PBXFileReference; name = libucvtw.a; - path = ../intl/uconv/ucvtw/libucvtw.a; + path = ../../intl/uconv/ucvtw/libucvtw.a; refType = 2; }; F513437802DA286001A967F3 = { isa = PBXFileReference; name = libucvtw2.a; - path = ../intl/uconv/ucvtw2/libucvtw2.a; + path = ../../intl/uconv/ucvtw2/libucvtw2.a; refType = 2; }; F513437902DA286101A967F3 = { @@ -1440,8 +1568,9 @@ }; F5137A1102676B9101026D05 = { isa = PBXFileReference; - path = CHFind.h; - refType = 4; + name = Find.h; + path = ../src/find/Find.h; + refType = 2; }; F5137A1202676B9101026D05 = { fileRef = F5137A1102676B9101026D05; @@ -1451,24 +1580,21 @@ }; F5173958020CE1E50189DA0C = { isa = PBXFileReference; - path = ProgressDialog.nib; - refType = 4; - }; - F5173959020CE1E50189DA0C = { - fileRef = F5173958020CE1E50189DA0C; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/ProgressDialog.nib; + refType = 2; }; F517395A020CE3740189DA0C = { isa = PBXFileReference; - path = ProgressDlgController.h; - refType = 4; + name = ProgressDlgController.h; + path = ../src/download/ProgressDlgController.h; + refType = 2; }; F517395B020CE3740189DA0C = { isa = PBXFileReference; - path = ProgressDlgController.mm; - refType = 4; + name = ProgressDlgController.mm; + path = ../src/download/ProgressDlgController.mm; + refType = 2; }; F517395C020CE3750189DA0C = { fileRef = F517395A020CE3740189DA0C; @@ -1485,7 +1611,7 @@ F517941F027F3F2901A967DF = { isa = PBXFileReference; name = xuldoc.xpt; - path = ../content/xul/document/public/_xpidlgen/xuldoc.xpt; + path = ../../content/xul/document/public/_xpidlgen/xuldoc.xpt; refType = 2; }; F5179421027F3FD301A967DF = { @@ -1496,8 +1622,9 @@ }; F5179422028275B801A967DF = { isa = PBXFileReference; - path = globe_ico.tif; - refType = 4; + name = globe_ico.tif; + path = ../resources/images/chrome/globe_ico.tif; + refType = 2; }; F5179423028275B901A967DF = { fileRef = F5179422028275B801A967DF; @@ -1534,7 +1661,6 @@ F52F87CC027D75C301A80165, 2E748B72029A448D4B000102, F53E012902AEE91C01A967F3, - F53E013202AEEA2801A967F3, F5A3669302CCFAF601DC3354, F59236C102C89AC90100012B, F50D9DE202ECC2C601BB4219, @@ -1554,13 +1680,15 @@ }; F51842FC0206176901A966FE = { isa = PBXFileReference; - path = BrowserWindow.nib; - refType = 4; + name = English; + path = ../English.lproj/BrowserWindow.nib; + refType = 2; }; F51842FE020629B701A966FE = { isa = PBXFileReference; - path = sidebar.tif; - refType = 4; + name = sidebar.tif; + path = ../resources/images/toolbar/sidebar.tif; + refType = 2; }; F51842FF020629B701A966FE = { fileRef = F51842FE020629B701A966FE; @@ -1568,22 +1696,11 @@ settings = { }; }; - F518430602063A8A01A966FE = { - fileRef = F51842FC0206176901A966FE; - isa = PBXBuildFile; - settings = { - }; - }; - F518430702063A9001A966FE = { - fileRef = 29B97319FDCFA39411CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; F51B70B4026EC8A601A80166 = { isa = PBXFileReference; - path = Navigator.scriptSuite; - refType = 4; + name = Navigator.scriptSuite; + path = ../resources/application/Navigator.scriptSuite; + refType = 2; }; F51B70B5026EC8A601A80166 = { fileRef = F51B70B4026EC8A601A80166; @@ -1593,13 +1710,15 @@ }; F51B70B6026EC98B01A80166 = { isa = PBXFileReference; - path = CHGetURLCommand.h; - refType = 4; + name = GetURLCommand.h; + path = ../src/appleevents/GetURLCommand.h; + refType = 2; }; F51B70B7026EC98B01A80166 = { isa = PBXFileReference; - path = CHGetURLCommand.mm; - refType = 4; + name = GetURLCommand.mm; + path = ../src/appleevents/GetURLCommand.mm; + refType = 2; }; F51B70B8026EC98B01A80166 = { fileRef = F51B70B6026EC98B01A80166; @@ -1613,54 +1732,6 @@ settings = { }; }; - F51D9B0A020940C101A80166 = { - children = ( - F51D9B0B020940C101A80166, - F51D9B0D0209421401A80166, - F5C321D702CBD0CE014E7D56, - ); - isa = PBXGroup; - name = xul; - refType = 4; - }; - F51D9B0B020940C101A80166 = { - children = ( - F51D9B0C020940C101A80166, - ); - isa = PBXGroup; - name = document; - refType = 4; - }; - F51D9B0C020940C101A80166 = { - children = ( - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F51D9B0D0209421401A80166 = { - children = ( - F51D9B0E0209421401A80166, - ); - isa = PBXGroup; - name = templates; - path = ""; - refType = 4; - }; - F51D9B0E0209421401A80166 = { - children = ( - F51D9B0F020942AE01A80166, - ); - isa = PBXGroup; - name = src; - refType = 4; - }; - F51D9B0F020942AE01A80166 = { - isa = PBXFileReference; - name = nsXULTemplateBuilder.cpp; - path = ../content/xul/templates/src/nsXULTemplateBuilder.cpp; - refType = 2; - }; F51D9B1402094BB501A80166 = { children = ( F51D9B2D0209573701A80166, @@ -1674,7 +1745,7 @@ F51D9B2D0209573701A80166 = { isa = PBXFileReference; name = libembed_base_s.a; - path = ../embedding/base/libembed_base_s.a; + path = ../../embedding/base/libembed_base_s.a; refType = 4; }; F51D9B2E0209573701A80166 = { @@ -1683,58 +1754,11 @@ settings = { }; }; - F522EFC502F73CF901A96654 = { - isa = PBXFileReference; - name = nsBaseClipboard.cpp; - path = ../widget/src/xpwidgets/nsBaseClipboard.cpp; - refType = 2; - }; - F522EFC602F73CF901A96654 = { - isa = PBXFileReference; - name = nsBaseDragService.cpp; - path = ../widget/src/xpwidgets/nsBaseDragService.cpp; - refType = 2; - }; - F522EFC702F73CF901A96654 = { - isa = PBXFileReference; - name = nsBaseWidget.cpp; - path = ../widget/src/xpwidgets/nsBaseWidget.cpp; - refType = 2; - }; - F522EFC802F73CF901A96654 = { - isa = PBXFileReference; - name = nsClipboardHelper.cpp; - path = ../widget/src/xpwidgets/nsClipboardHelper.cpp; - refType = 2; - }; - F522EFC902F73CF901A96654 = { - isa = PBXFileReference; - name = nsDataFlavor.cpp; - path = ../widget/src/xpwidgets/nsDataFlavor.cpp; - refType = 2; - }; - F522EFCA02F73CF901A96654 = { - isa = PBXFileReference; - name = nsPrimitiveHelpers.cpp; - path = ../widget/src/xpwidgets/nsPrimitiveHelpers.cpp; - refType = 2; - }; - F522EFCB02F73CF901A96654 = { - isa = PBXFileReference; - name = nsTransferable.cpp; - path = ../widget/src/xpwidgets/nsTransferable.cpp; - refType = 2; - }; F5247C2D02289FD9013DD99A = { isa = PBXFileReference; - path = alert.nib; - refType = 4; - }; - F5247C2E02289FD9013DD99A = { - fileRef = F5247C2D02289FD9013DD99A; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/alert.nib; + refType = 2; }; F5247C2F0228B5E7013DD99A = { children = ( @@ -1772,43 +1796,43 @@ F5247C320228B91F013DD99A = { isa = PBXFileReference; name = libnss3.dylib; - path = ../dist/Embed/libnss3.dylib; + path = ../../dist/Embed/libnss3.dylib; refType = 2; }; F5247C330228B91F013DD99A = { isa = PBXFileReference; name = libnssckbi.dylib; - path = ../dist/Embed/libnssckbi.dylib; + path = ../../dist/Embed/libnssckbi.dylib; refType = 2; }; F5247C340228B91F013DD99A = { isa = PBXFileReference; name = libsmime3.dylib; - path = ../dist/Embed/libsmime3.dylib; + path = ../../dist/Embed/libsmime3.dylib; refType = 2; }; F5247C350228B91F013DD99A = { isa = PBXFileReference; name = libsoftokn3.dylib; - path = ../dist/Embed/libsoftokn3.dylib; + path = ../../dist/Embed/libsoftokn3.dylib; refType = 2; }; F5247C360228B91F013DD99A = { isa = PBXFileReference; name = libssl3.dylib; - path = ../dist/Embed/libssl3.dylib; + path = ../../dist/Embed/libssl3.dylib; refType = 2; }; F5247C3C0228B990013DD99A = { isa = PBXFileReference; name = libpipboot.dylib; - path = ../dist/Embed/components/libpipboot.dylib; + path = ../../dist/Embed/components/libpipboot.dylib; refType = 2; }; F5247C3D0228B990013DD99A = { isa = PBXFileReference; name = libpipnss.dylib; - path = ../dist/Embed/components/libpipnss.dylib; + path = ../../dist/Embed/components/libpipnss.dylib; refType = 2; }; F5247C420228B9D7013DD99A = { @@ -1883,13 +1907,13 @@ F5247C4C0228BBB2013DD99A = { isa = PBXFileReference; name = pipboot.xpt; - path = ../dist/Embed/components/pipboot.xpt; + path = ../../dist/Embed/components/pipboot.xpt; refType = 2; }; F5247C4D0228BBB2013DD99A = { isa = PBXFileReference; name = pipnss.xpt; - path = ../dist/Embed/components/pipnss.xpt; + path = ../../dist/Embed/components/pipnss.xpt; refType = 2; }; F5247C520228BBB3013DD99A = { @@ -1907,7 +1931,7 @@ F524EF6702AD8B9301A967F3 = { isa = PBXFileReference; name = libgkgfx.a; - path = ../gfx/src/libgkgfx.a; + path = ../../gfx/src/libgkgfx.a; refType = 2; }; F524EF6802AD8B9401A967F3 = { @@ -1921,11 +1945,12 @@ F52627D4027E982201000102, F52627D5027E982201000102, F52627D8027E984501000102, - F52627DA027E98A401000102, + F507A85B0311895401026D5D, ); isa = PBXGroup; - path = Navigation; - refType = 4; + name = Navigation; + path = ../PreferencePanes/Navigation; + refType = 2; }; F52627CD027E976B01000102 = { isa = PBXBundleReference; @@ -1943,8 +1968,8 @@ ); buildSettings = { DEBUGGING_SYMBOLS = NO; - HEADER_SEARCH_PATHS = "../dist/include/nkcache ../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"; - LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util ../modules/zlib/src"; + HEADER_SEARCH_PATHS = "../../dist/include/nkcache ../../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"; + LIBRARY_SEARCH_PATHS = "../../dist/bin ../../dist/lib ../../intl/unicharutil/util ../../modules/zlib/src"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-bundle -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -lm"; @@ -2009,7 +2034,7 @@ buildActionMask = 2147483647; files = ( F52627D9027E984601000102, - F52627DB027E98A401000102, + F507A85C0311895401026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -2044,15 +2069,17 @@ F52627D4027E982201000102 = { indentWidth = 2; isa = PBXFileReference; - path = Navigation.h; - refType = 4; + name = Navigation.h; + path = ../PreferencePanes/Navigation/Navigation.h; + refType = 2; tabWidth = 2; }; F52627D5027E982201000102 = { indentWidth = 2; isa = PBXFileReference; - path = Navigation.mm; - refType = 4; + name = Navigation.mm; + path = ../PreferencePanes/Navigation/Navigation.mm; + refType = 2; tabWidth = 2; }; F52627D6027E982201000102 = { @@ -2069,8 +2096,9 @@ }; F52627D8027E984501000102 = { isa = PBXFileReference; - path = Navigation.tiff; - refType = 4; + name = Navigation.tiff; + path = ../PreferencePanes/Navigation/Navigation.tiff; + refType = 2; }; F52627D9027E984601000102 = { fileRef = F52627D8027E984501000102; @@ -2080,14 +2108,9 @@ }; F52627DA027E98A401000102 = { isa = PBXFileReference; - path = Navigation.nib; - refType = 4; - }; - F52627DB027E98A401000102 = { - fileRef = F52627DA027E98A401000102; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../PreferencePanes/Navigation/English.lproj/Navigation.nib; + refType = 2; }; F52627DC027E9CCD01000102 = { fileRef = F557193A022B4102010001CA; @@ -2109,8 +2132,16 @@ }; F5264FCB020D4C25010001CA = { children = ( - F5E1196C022CDCA7010001CA, - F5E1196D022CDCA7010001CA, + F5555C8202022F070164C72B, + F5555C8302022F070164C72B, + F5555C8402022F070164C72B, + F5555C8502022F070164C72B, + F5547D60020333DA01F448B0, + F51842FE020629B701A966FE, + F53F5AE902448BC8010001CA, + F53F5AEA02448BC8010001CA, + F55CCFD2020E98EA010001CA, + F5EB9376030C92450100010C, ); isa = PBXGroup; name = "Toolbar-Browser"; @@ -2119,8 +2150,13 @@ }; F5264FCC020D4C25010001CA = { children = ( - F5E1196E022CDCA7010001CA, - F5E1196F022CDCA7010001CA, + F5264FCD020D4C25010001CA, + F5264FCE020D4C25010001CA, + F5264FCF020D4C25010001CA, + F5264FD0020D4C25010001CA, + F5264FD1020D4C25010001CA, + F5264FD2020D4C25010001CA, + F5264FD3020D4C25010001CA, ); isa = PBXGroup; name = "Toolbar-SaveDialog"; @@ -2128,38 +2164,45 @@ }; F5264FCD020D4C25010001CA = { isa = PBXFileReference; - path = saveCancel.tif; - refType = 4; + name = saveCancel.tif; + path = ../resources/images/toolbar/saveCancel.tif; + refType = 2; }; F5264FCE020D4C25010001CA = { isa = PBXFileReference; - path = saveLeaveOpenNO.tif; - refType = 4; + name = saveLeaveOpenNO.tif; + path = ../resources/images/toolbar/saveLeaveOpenNO.tif; + refType = 2; }; F5264FCF020D4C25010001CA = { isa = PBXFileReference; - path = saveLeaveOpenYES.tif; - refType = 4; + name = saveLeaveOpenYES.tif; + path = ../resources/images/toolbar/saveLeaveOpenYES.tif; + refType = 2; }; F5264FD0020D4C25010001CA = { isa = PBXFileReference; - path = saveOpenFile.tif; - refType = 4; + name = saveOpenFile.tif; + path = ../resources/images/toolbar/saveOpenFile.tif; + refType = 2; }; F5264FD1020D4C25010001CA = { isa = PBXFileReference; - path = savePause.tif; - refType = 4; + name = savePause.tif; + path = ../resources/images/toolbar/savePause.tif; + refType = 2; }; F5264FD2020D4C25010001CA = { isa = PBXFileReference; - path = saveResume.tif; - refType = 4; + name = saveResume.tif; + path = ../resources/images/toolbar/saveResume.tif; + refType = 2; }; F5264FD3020D4C25010001CA = { isa = PBXFileReference; - path = saveShowFile.tif; - refType = 4; + name = saveShowFile.tif; + path = ../resources/images/toolbar/saveShowFile.tif; + refType = 2; }; F5264FD4020D4C25010001CA = { fileRef = F5264FCD020D4C25010001CA; @@ -2205,19 +2248,15 @@ }; F528E216020FD5D80168DE43 = { isa = PBXFileReference; - path = FindDialog.nib; - refType = 4; - }; - F528E217020FD5D80168DE43 = { - fileRef = F528E216020FD5D80168DE43; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/FindDialog.nib; + refType = 2; }; F528E218020FD8400168DE43 = { isa = PBXFileReference; - path = FindDlgController.h; - refType = 4; + name = FindDlgController.h; + path = ../src/find/FindDlgController.h; + refType = 2; }; F528E219020FD8400168DE43 = { fileRef = F528E218020FD8400168DE43; @@ -2227,8 +2266,9 @@ }; F528E21A020FD9620168DE43 = { isa = PBXFileReference; - path = FindDlgController.mm; - refType = 4; + name = FindDlgController.mm; + path = ../src/find/FindDlgController.mm; + refType = 2; }; F528E21B020FD9620168DE43 = { fileRef = F528E21A020FD9620168DE43; @@ -2239,8 +2279,8 @@ F52CE65902BFA88701026D5D = { isa = PBXFileReference; name = English; - path = English.lproj/Localizable.strings; - refType = 4; + path = ../English.lproj/Localizable.strings; + refType = 2; }; F52CE65C02BFA8B701026D5D = { children = ( @@ -2266,7 +2306,7 @@ F52CE65F02BFBC7101026D5D = { isa = PBXFileReference; name = "broken-image.gif"; - path = "../dist/Embed/res/broken-image.gif"; + path = "../../dist/Embed/res/broken-image.gif"; refType = 2; }; F52CE66502BFBCE901026D5D = { @@ -2283,13 +2323,15 @@ }; F52D5CCF027A887001A80166 = { isa = PBXFileReference; - path = CHAutoCompleteTextField.h; - refType = 4; + name = AutoCompleteTextField.h; + path = ../src/browser/AutoCompleteTextField.h; + refType = 2; }; F52D5CD0027A887001A80166 = { isa = PBXFileReference; - path = CHAutoCompleteTextField.mm; - refType = 4; + name = AutoCompleteTextField.mm; + path = ../src/browser/AutoCompleteTextField.mm; + refType = 2; }; F52D5CD1027A887001A80166 = { fileRef = F52D5CCF027A887001A80166; @@ -2305,13 +2347,15 @@ }; F52D5CD3027A88C601A80166 = { isa = PBXFileReference; - path = CHAutoCompleteDataSource.h; - refType = 4; + name = AutoCompleteDataSource.h; + path = ../src/browser/AutoCompleteDataSource.h; + refType = 2; }; F52D5CD4027A88C601A80166 = { isa = PBXFileReference; - path = CHAutoCompleteDataSource.mm; - refType = 4; + name = AutoCompleteDataSource.mm; + path = ../src/browser/AutoCompleteDataSource.mm; + refType = 2; }; F52D5CD5027A88C601A80166 = { fileRef = F52D5CD3027A88C601A80166; @@ -2327,14 +2371,16 @@ }; F52D5CD7027D3D5001A80166 = { isa = PBXFileReference; - path = CHPreferenceManager.h; - refType = 4; + name = PreferenceManager.h; + path = ../src/preferences/PreferenceManager.h; + refType = 2; }; F52D5CD8027D3D5001A80166 = { indentWidth = 2; isa = PBXFileReference; - path = CHPreferenceManager.mm; - refType = 4; + name = PreferenceManager.mm; + path = ../src/preferences/PreferenceManager.mm; + refType = 2; }; F52D5CD9027D3D5001A80166 = { fileRef = F52D5CD7027D3D5001A80166; @@ -2386,22 +2432,26 @@ }; F52F87CB027D75C301A80165 = { isa = PBXFileReference; - path = CHHistoryDataSource.h; - refType = 4; + name = HistoryDataSource; + path = ../src/history/HistoryDataSource.h; + refType = 2; }; F52F87CC027D75C301A80165 = { isa = PBXFileReference; - path = CHRDFOutlineViewDataSource.h; - refType = 4; + name = RDFOutlineViewDataSource.h; + path = ../src/extensions/RDFOutlineViewDataSource.h; + refType = 2; }; F52F87CD027D75C301A80165 = { isa = PBXFileReference; - path = CHHistoryDataSource.mm; + name = HistoryDataSource.mm; + path = ../src/history/HistoryDataSource.mm; refType = 4; }; F52F87CE027D75C301A80165 = { isa = PBXFileReference; - path = CHRDFOutlineViewDataSource.mm; + name = RDFOutlineViewDataSource.mm; + path = ../src/extensions/RDFOutlineViewDataSource.mm; refType = 4; }; F52F87CF027D75C301A80165 = { @@ -2442,23 +2492,27 @@ }; F538DFAF023B3739010001CA = { isa = PBXFileReference; - path = fileHtml.icns; - refType = 4; + name = fileHtml.icns; + path = ../resources/images/app/fileHtml.icns; + refType = 2; }; F538DFB0023B3739010001CA = { isa = PBXFileReference; - path = filePreferences.icns; - refType = 4; + name = filePreferences.icns; + path = ../resources/images/app/filePreferences.icns; + refType = 2; }; F538DFB1023B3739010001CA = { isa = PBXFileReference; - path = appicon.icns; - refType = 4; + name = appicon.icns; + path = ../resources/images/app/appicon.icns; + refType = 2; }; F538DFB2023B3739010001CA = { isa = PBXFileReference; - path = fileBookmark.icns; - refType = 4; + name = fileBookmark.icns; + path = ../resources/images/app/fileBookmark.icns; + refType = 2; }; F538DFB3023B3739010001CA = { fileRef = F538DFAF023B3739010001CA; @@ -2487,7 +2541,7 @@ F53A902202C1127A01A967F3 = { isa = PBXFileReference; name = liboji.dylib; - path = ../modules/oji/src/liboji.dylib; + path = ../../modules/oji/src/liboji.dylib; refType = 2; }; F53A902402C1137901A967F3 = { @@ -2498,7 +2552,8 @@ }; F53E012902AEE91C01A967F3 = { isa = PBXFileReference; - path = BookmarkInfoController.h; + name = BookmarkInfoController.h; + path = ../src/bookmarks/BookmarkInfoController.h; refType = 2; }; F53E012A02AEE91D01A967F3 = { @@ -2515,7 +2570,8 @@ }; F53E012C02AEE93601A967F3 = { isa = PBXFileReference; - path = BookmarkInfoController.mm; + name = BookmarkInfoController.mm; + path = ../src/bookmarks/BookmarkInfoController.mm; refType = 2; }; F53E012D02AEE93701A967F3 = { @@ -2532,46 +2588,19 @@ }; F53E012F02AEE9BD01A967F3 = { isa = PBXFileReference; - path = BookmarkInfoPanel.nib; + name = English; + path = ../English.lproj/BookmarkInfoPanel.nib; refType = 2; }; - F53E013002AEE9BD01A967F3 = { - fileRef = F53E012F02AEE9BD01A967F3; - isa = PBXBuildFile; - settings = { - }; - }; - F53E013102AEE9BD01A967F3 = { - fileRef = F53E012F02AEE9BD01A967F3; - isa = PBXBuildFile; - settings = { - }; - }; - F53E013202AEEA2801A967F3 = { - isa = PBXFileReference; - path = StringUtils.h; - refType = 2; - }; - F53E013302AEEA2901A967F3 = { - fileRef = F53E013202AEEA2801A967F3; - isa = PBXBuildFile; - settings = { - }; - }; - F53E013402AEEA2901A967F3 = { - fileRef = F53E013202AEEA2801A967F3; - isa = PBXBuildFile; - settings = { - }; - }; F53EAB79027EBDE801000102 = { isa = PBXTargetDependency; target = F52627CE027E976B01000102; }; F53EB4800269861601A80166 = { isa = PBXFileReference; - path = panel_icon.tif; - refType = 4; + name = panel_icon.tif; + path = ../resources/images/toolbar/panel_icon.tif; + refType = 2; }; F53EB4810269861601A80166 = { fileRef = F53EB4800269861601A80166; @@ -2589,68 +2618,80 @@ F53F21F5022B7C77010001CA, ); isa = PBXGroup; - path = PreferencePanes; - refType = 4; + name = PreferencePanes; + path = ../src/preferences; + refType = 2; }; F53F21EC022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencePaneDefaults.plist; - refType = 4; + name = MVPreferencePaneDefaults.plist; + path = ../src/preferences/MVPreferencePaneDefaults.plist; + refType = 2; }; F53F21ED022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencePaneGroups.plist; - refType = 4; + name = MVPreferencePaneGroups.plist; + path = ../src/preferences/MVPreferencePaneGroups.plist; + refType = 2; }; F53F21EE022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencePaneGroups.strings; - refType = 4; + name = English; + path = ../English.lproj/MVPreferencePaneGroups.strings; + refType = 2; }; F53F21EF022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesController.h; - refType = 4; + name = MVPreferencesController.h; + path = ../src/preferences/MVPreferencesController.h; + refType = 2; }; F53F21F0022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesController.mm; - refType = 4; + name = MVPreferencesController.mm; + path = ../src/preferences/MVPreferencesController.mm; + refType = 2; }; F53F21F1022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesGroupedIconView.h; - refType = 4; + name = MVPreferencesGroupedIconView.h; + path = ../src/preferences/MVPreferencesGroupedIconView.h; + refType = 2; }; F53F21F2022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesGroupedIconView.m; - refType = 4; + name = MVPreferencesGroupedIconView.m; + path = ../src/preferences/MVPreferencesGroupedIconView.m; + refType = 2; }; F53F21F3022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesMultipleIconView.h; - refType = 4; + name = MVPreferencesMultipleIconView.h; + path = ../src/preferences/MVPreferencesMultipleIconView.h; + refType = 2; }; F53F21F4022B7C77010001CA = { isa = PBXFileReference; - path = MVPreferencesMultipleIconView.m; - refType = 4; + name = MVPreferencesMultipleIconView.m; + path = ../src/preferences/MVPreferencesMultipleIconView.m; + refType = 2; }; F53F21F5022B7C77010001CA = { children = ( - F53F21FD022B7C77010001CA, + F507A85F031194B101026D5D, F53F21FE022B7C77010001CA, F53F2200022B7C77010001CA, F53F21FF022B7C77010001CA, ); isa = PBXGroup; - path = Personal; - refType = 4; + name = Personal; + path = ../PreferencePanes/Personal; + refType = 2; }; F53F21FD022B7C77010001CA = { isa = PBXFileReference; - path = Personal.nib; + name = English; + path = English.lproj/Personal.nib; refType = 4; }; F53F21FE022B7C77010001CA = { @@ -2698,12 +2739,6 @@ settings = { }; }; - F53F2208022B7C78010001CA = { - fileRef = F53F21EE022B7C77010001CA; - isa = PBXBuildFile; - settings = { - }; - }; F53F220E022B7C78010001CA = { fileRef = F53F21F0022B7C77010001CA; isa = PBXBuildFile; @@ -2724,13 +2759,15 @@ }; F53F5AE902448BC8010001CA = { isa = PBXFileReference; - path = sidebarOpened.tif; - refType = 4; + name = sidebarOpened.tif; + path = ../resources/images/toolbar/sidebarOpened.tif; + refType = 2; }; F53F5AEA02448BC8010001CA = { isa = PBXFileReference; - path = sidebarClosed.tif; - refType = 4; + name = sidebarClosed.tif; + path = ../resources/images/toolbar/sidebarClosed.tif; + refType = 2; }; F53F5AEB02448BC9010001CA = { fileRef = F53F5AE902448BC8010001CA; @@ -2746,8 +2783,9 @@ }; F540BD1A029ED15301026D5D = { isa = PBXFileReference; - path = security_lock.tif; - refType = 4; + name = security_lock.tif; + path = ../resources/images/chrome/security_lock.tif; + refType = 2; }; F540BD1B029ED15301026D5D = { fileRef = F540BD1A029ED15301026D5D; @@ -2757,8 +2795,9 @@ }; F540BD1C029ED17901026D5D = { isa = PBXFileReference; - path = security_broken.tif; - refType = 4; + name = security_broken.tif; + path = ../resources/images/chrome/security_broken.tif; + refType = 2; }; F540BD1D029ED17901026D5D = { fileRef = F540BD1C029ED17901026D5D; @@ -2780,13 +2819,15 @@ }; F541495A02711A8301A80166 = { isa = PBXFileReference; - path = CHToolbarAdditions.h; - refType = 4; + name = CHToolbarAdditions.h; + path = ../src/extensions/ToolbarAdditions.h; + refType = 2; }; F541495B02711A8301A80166 = { isa = PBXFileReference; - path = CHToolbarAdditions.m; - refType = 4; + name = CHToolbarAdditions.m; + path = ../src/extensions/ToolbarAdditions.m; + refType = 2; }; F541495C02711A8301A80166 = { fileRef = F541495A02711A8301A80166; @@ -2802,12 +2843,14 @@ }; F541495E02711B0001A80166 = { isa = PBXFileReference; - path = CHImageAdditions.h; + name = CHImageAdditions.h; + path = ../src/extensions/ImageAdditions.h; refType = 2; }; F541495F02711B0001A80166 = { isa = PBXFileReference; - path = CHImageAdditions.m; + name = CHImageAdditions.m; + path = ../src/extensions/ImageAdditions.m; refType = 2; }; F541496002711B0101A80166 = { @@ -2824,13 +2867,15 @@ }; F541496202714F9A01A80166 = { isa = PBXFileReference; - path = groupbookmark.tif; - refType = 4; + name = groupbookmark.tif; + path = ../resources/images/chrome/groupbookmark.tif; + refType = 2; }; F541496302714F9A01A80166 = { isa = PBXFileReference; - path = separator_on.tif; - refType = 4; + name = separator_on.tif; + path = ../resources/images/toolbar/separator_on.tif; + refType = 2; }; F541496402714F9A01A80166 = { fileRef = F541496202714F9A01A80166; @@ -2852,13 +2897,15 @@ }; F549ACDE0302DE6001026D5D = { isa = PBXFileReference; - path = ToolTip.mm; - refType = 4; + name = ToolTip.mm; + path = ../src/browser/ToolTip.mm; + refType = 2; }; F549ACDF0302DE6001026D5D = { isa = PBXFileReference; - path = "NSScreen+Utils.m"; - refType = 4; + name = "NSScreen+Utils.m"; + path = "../src/extensions/NSScreen+Utils.m"; + refType = 2; }; F549ACE00302DE6101026D5D = { fileRef = F549ACDE0302DE6001026D5D; @@ -2886,8 +2933,9 @@ }; F549ACE40302DEBB01026D5D = { isa = PBXFileReference; - path = "NSScreen+Utils.h"; - refType = 4; + name = "NSScreen+Utils.h"; + path = "../src/extensions/NSScreen+Utils.h"; + refType = 2; }; F549ACE50302DEBB01026D5D = { fileRef = F549ACE40302DEBB01026D5D; @@ -2903,8 +2951,9 @@ }; F549ACE70302DEF001026D5D = { isa = PBXFileReference; - path = ToolTip.h; - refType = 4; + name = ToolTip.h; + path = ../src/browser/ToolTip.h; + refType = 2; }; F549ACE80302DEF001026D5D = { fileRef = F549ACE70302DEF001026D5D; @@ -2921,7 +2970,7 @@ F54AD84402C115D901A967F3 = { isa = PBXFileReference; name = liboji.a; - path = ../modules/oji/src/liboji.a; + path = ../../modules/oji/src/liboji.a; refType = 2; }; F54AD84502C115DA01A967F3 = { @@ -2933,13 +2982,13 @@ F54EF7ED022A2F9C01A80165 = { isa = PBXFileReference; name = pipnss.jar; - path = ../dist/Embed/chrome/pipnss.jar; + path = ../../dist/Embed/chrome/pipnss.jar; refType = 2; }; F54EF7EE022A2F9C01A80165 = { isa = PBXFileReference; name = pippki.jar; - path = ../dist/Embed/chrome/pippki.jar; + path = ../../dist/Embed/chrome/pippki.jar; refType = 2; }; F54EF7EF022A2F9D01A80165 = { @@ -2967,8 +3016,9 @@ }; F5547D60020333DA01F448B0 = { isa = PBXFileReference; - path = home.tif; - refType = 4; + name = home.tif; + path = ../resources/images/toolbar/home.tif; + refType = 2; }; F5547D61020333DA01F448B0 = { fileRef = F5547D60020333DA01F448B0; @@ -2978,23 +3028,27 @@ }; F5555C8202022F070164C72B = { isa = PBXFileReference; - path = back.tif; - refType = 4; + name = back.tif; + path = ../resources/images/toolbar/back.tif; + refType = 2; }; F5555C8302022F070164C72B = { isa = PBXFileReference; - path = forward.tif; - refType = 4; + name = forward.tif; + path = ../resources/images/toolbar/forward.tif; + refType = 2; }; F5555C8402022F070164C72B = { isa = PBXFileReference; - path = reload.tif; - refType = 4; + name = reload.tif; + path = ../resources/images/toolbar/reload.tif; + refType = 2; }; F5555C8502022F070164C72B = { isa = PBXFileReference; - path = stop.tif; - refType = 4; + name = stop.tif; + path = ../resources/images/toolbar/stop.tif; + refType = 2; }; F5555C8602022F070164C72B = { fileRef = F5555C8202022F070164C72B; @@ -3022,8 +3076,9 @@ }; F5568A8E0217C7F5010001CA = { isa = PBXFileReference; - path = smallDocument.tiff; - refType = 4; + name = smallDocument.tiff; + path = ../resources/images/chrome/smallDocument.tiff; + refType = 2; }; F5568A8F0217C7F5010001CA = { fileRef = F5568A8E0217C7F5010001CA; @@ -3033,8 +3088,9 @@ }; F5568A900217CA82010001CA = { isa = PBXFileReference; - path = folder.tiff; - refType = 4; + name = folder.tiff; + path = ../resources/images/chrome/folder.tiff; + refType = 2; }; F5568A910217CA82010001CA = { fileRef = F5568A900217CA82010001CA; @@ -3044,13 +3100,15 @@ }; F557149D023B46BF010001CA = { isa = PBXFileReference; - path = splash.tif; - refType = 4; + name = splash.tif; + path = ../resources/images/app/splash.tif; + refType = 2; }; F557149E023B46BF010001CA = { isa = PBXFileReference; - path = about.tif; - refType = 4; + name = about.tif; + path = ../resources/images/app/about.tif; + refType = 2; }; F557149F023B46C0010001CA = { fileRef = F557149D023B46BF010001CA; @@ -3066,8 +3124,9 @@ }; F55714A1023B4898010001CA = { isa = PBXFileReference; - path = smallbookmark.tif; - refType = 4; + name = smallbookmark.tif; + path = ../resources/images/chrome/smallbookmark.tif; + refType = 2; }; F55714A2023B4899010001CA = { fileRef = F55714A1023B4898010001CA; @@ -3099,13 +3158,15 @@ }; F558099D02F22168015DF512 = { isa = PBXFileReference; - path = "NSString+Utils.h"; - refType = 4; + name = "NSString+Utils.h"; + path = "../src/extensions/NSString+Utils.h"; + refType = 2; }; F558099E02F22168015DF512 = { isa = PBXFileReference; - path = "NSString+Utils.mm"; - refType = 4; + name = "NSString+Utils.mm"; + path = "../src/extensions/NSString+Utils.mm"; + refType = 2; }; F558099F02F22169015DF512 = { fileRef = F558099D02F22168015DF512; @@ -3127,13 +3188,15 @@ }; F5581379030AEF9B0176F207 = { isa = PBXFileReference; - path = RemoteDataProvider.h; - refType = 4; + name = RemoteDataProvider.h; + path = ../src/browser/RemoteDataProvider.h; + refType = 2; }; F558137A030AEF9B0176F207 = { isa = PBXFileReference; - path = SiteIconProvider.h; - refType = 4; + name = SiteIconProvider.h; + path = ../src/browser/SiteIconProvider.h; + refType = 2; }; F558137B030AEF9B0176F207 = { children = ( @@ -3147,13 +3210,15 @@ }; F558137C030AEF9B0176F207 = { isa = PBXFileReference; - path = RemoteDataProvider.mm; - refType = 4; + name = RemoteDataProvider.mm; + path = ../src/browser/RemoteDataProvider.mm; + refType = 2; }; F558137D030AEF9B0176F207 = { isa = PBXFileReference; - path = SiteIconProvider.mm; - refType = 4; + name = SiteIconProvider.mm; + path = ../src/browser/SiteIconProvider.mm; + refType = 2; }; F558137E030AEF9C0176F207 = { fileRef = F5581379030AEF9B0176F207; @@ -3205,13 +3270,15 @@ }; F558B1F0030F6E470166970F = { isa = PBXFileReference; - path = nsCocoaBrowserListener.h; - refType = 4; + name = CHBrowserListener.h; + path = ../src/embedding/CHBrowserListener.h; + refType = 2; }; F558B1F1030F6E470166970F = { isa = PBXFileReference; - path = nsCocoaBrowserListener.mm; - refType = 4; + name = CHBrowserListener.mm; + path = ../src/embedding/CHBrowserListener.mm; + refType = 2; }; F558B1F2030F6E470166970F = { fileRef = F558B1F0030F6E470166970F; @@ -3252,7 +3319,7 @@ F55A9BC60228CCE101DAE4DB = { isa = PBXFileReference; name = "security-prefs.js"; - path = "../dist/Embed/defaults/pref/security-prefs.js"; + path = "../../dist/Embed/defaults/pref/security-prefs.js"; refType = 2; }; F55A9BC70228CCE201DAE4DB = { @@ -3263,8 +3330,9 @@ }; F55B6BF402EF1F7E01026D5D = { isa = PBXFileReference; - path = "broken-image.gif"; - refType = 4; + name = "broken-image.gif"; + path = "../resources/images/gecko/broken-image.gif"; + refType = 2; }; F55B6BF702EF1FD901026D5D = { fileRef = F55B6BF402EF1F7E01026D5D; @@ -3280,8 +3348,9 @@ }; F55C4DD302D2864D0130B065 = { isa = PBXFileReference; - path = CHUserDefaults.h; - refType = 4; + name = UserDefaults.h; + path = ../src/application/UserDefaults.h; + refType = 2; }; F55C4DD402D2864E0130B065 = { fileRef = F55C4DD302D2864D0130B065; @@ -3291,8 +3360,9 @@ }; F55CCFD2020E98EA010001CA = { isa = PBXFileReference; - path = print.tif; - refType = 4; + name = print.tif; + path = ../resources/images/toolbar/print.tif; + refType = 2; }; F55CCFD3020E98EA010001CA = { fileRef = F55CCFD2020E98EA010001CA; @@ -3302,7 +3372,8 @@ }; F5607CB5023944AD01A967DF = { isa = PBXFileReference; - path = CHGeckoUtils.h; + name = GeckoUtils.h; + path = ../src/extensions/GeckoUtils.h; refType = 2; }; F5607CB6023944AE01A967DF = { @@ -3334,18 +3405,21 @@ }; F564872F023B957F010001CA = { isa = PBXFileReference; - path = historyicon.tif; - refType = 4; + name = historyicon.tif; + path = ../resources/images/toolbar/historyicon.tif; + refType = 2; }; F5648730023B957F010001CA = { isa = PBXFileReference; - path = searchicon.tif; - refType = 4; + name = searchicon.tif; + path = ../resources/images/toolbar/searchicon.tif; + refType = 2; }; F5648731023B957F010001CA = { isa = PBXFileReference; - path = bookicon.tif; - refType = 4; + name = bookicon.tif; + path = ../resources/images/toolbar/bookicon.tif; + refType = 2; }; F5648732023B957F010001CA = { fileRef = F564872F023B957F010001CA; @@ -3367,13 +3441,15 @@ }; F5648739023C3857010001CA = { isa = PBXFileReference; - path = CHIconTabViewItem.h; - refType = 4; + name = IconTabViewItem.h; + path = ../src/extensions/IconTabViewItem.h; + refType = 2; }; F564873A023C3857010001CA = { isa = PBXFileReference; - path = CHIconTabViewItem.mm; - refType = 4; + name = IconTabViewItem.mm; + path = ../src/extensions/IconTabViewItem.mm; + refType = 2; }; F564873B023C3857010001CA = { fileRef = F5648739023C3857010001CA; @@ -3395,12 +3471,14 @@ }; F566BD1202EFA9AD01A967F3 = { isa = PBXFileReference; - path = CocoaPromptService.h; + name = CocoaPromptService.h; + path = ../src/browser/CocoaPromptService.h; refType = 2; }; F566BD1302EFA9AD01A967F3 = { isa = PBXFileReference; - path = CocoaPromptService.mm; + name = CocoaPromptService.mm; + path = ../src/browser/CocoaPromptService.mm; refType = 2; }; F566BD1402EFA9AD01A967F3 = { @@ -3429,8 +3507,9 @@ }; F56769FB0208F74A010001CA = { isa = PBXFileReference; - path = BrowserWindowController.mm; - refType = 4; + name = BrowserWindowController.mm; + path = ../src/browser/BrowserWindowController.mm; + refType = 2; }; F56769FC0208F74A010001CA = { fileRef = F56769FB0208F74A010001CA; @@ -3440,24 +3519,21 @@ }; F568C3CD023A49C0010001CA = { isa = PBXFileReference; - path = AboutBox.nib; - refType = 4; - }; - F568C3CE023A49C0010001CA = { - fileRef = F568C3CD023A49C0010001CA; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/AboutBox.nib; + refType = 2; }; F568C3CF023A4A5A010001CA = { isa = PBXFileReference; - path = CHAboutBox.h; - refType = 4; + name = AboutBox.h; + path = ../src/application/AboutBox.h; + refType = 2; }; F568C3D0023A4A5A010001CA = { isa = PBXFileReference; - path = CHAboutBox.m; - refType = 4; + name = AboutBox.m; + path = ../src/application/AboutBox.m; + refType = 2; }; F568C3D1023A4A5B010001CA = { fileRef = F568C3CF023A4A5A010001CA; @@ -3473,8 +3549,9 @@ }; F568C3D3023A4F71010001CA = { isa = PBXFileReference; - path = Credits.rtf; - refType = 4; + name = Credits.rtf; + path = ../resources/application/Credits.rtf; + refType = 2; }; F568C3D4023A4F71010001CA = { fileRef = F568C3D3023A4F71010001CA; @@ -3485,7 +3562,7 @@ F56DEF11020802A501FF5ADC = { isa = PBXFileReference; name = urlbarhistory.xpt; - path = ../xpfe/components/urlbarhistory/public/_xpidlgen/urlbarhistory.xpt; + path = ../../xpfe/components/urlbarhistory/public/_xpidlgen/urlbarhistory.xpt; refType = 2; }; F56DEF130208030601FF5ADC = { @@ -3496,7 +3573,8 @@ }; F56F241F02AC6D0401A967F3 = { isa = PBXFileReference; - path = nsStaticComponents.cpp; + name = nsStaticComponents.cpp; + path = ../src/application/nsStaticComponents.cpp; refType = 2; }; F56F242102AC6D0401A967F3 = { @@ -3568,67 +3646,67 @@ F56F242302AC706801A967F3 = { isa = PBXFileReference; name = libchardet.a; - path = ../intl/chardet/src/libchardet.a; + path = ../../intl/chardet/src/libchardet.a; refType = 2; }; F56F242502AC706801A967F3 = { isa = PBXFileReference; name = liblwbrk.a; - path = ../intl/lwbrk/src/liblwbrk.a; + path = ../../intl/lwbrk/src/liblwbrk.a; refType = 2; }; F56F242602AC706801A967F3 = { isa = PBXFileReference; name = libnecko.a; - path = ../netwerk/build/libnecko.a; + path = ../../netwerk/build/libnecko.a; refType = 2; }; F56F242702AC706801A967F3 = { isa = PBXFileReference; name = libnecko2.a; - path = ../netwerk/build2/libnecko2.a; + path = ../../netwerk/build2/libnecko2.a; refType = 2; }; F56F242802AC706801A967F3 = { isa = PBXFileReference; name = libnkcache.a; - path = ../netwerk/cache/src/libnkcache.a; + path = ../../netwerk/cache/src/libnkcache.a; refType = 2; }; F56F242902AC706801A967F3 = { isa = PBXFileReference; name = libnslocale.a; - path = ../intl/locale/src/unix/libnslocale.a; + path = ../../intl/locale/src/unix/libnslocale.a; refType = 2; }; F56F242A02AC706801A967F3 = { isa = PBXFileReference; name = libstrres.a; - path = ../intl/strres/src/libstrres.a; + path = ../../intl/strres/src/libstrres.a; refType = 2; }; F56F242B02AC706801A967F3 = { isa = PBXFileReference; name = libuconv.a; - path = ../intl/uconv/src/libuconv.a; + path = ../../intl/uconv/src/libuconv.a; refType = 2; }; F56F243002AC706801A967F3 = { isa = PBXFileReference; name = libucvlatin.a; - path = ../intl/uconv/ucvlatin/libucvlatin.a; + path = ../../intl/uconv/ucvlatin/libucvlatin.a; refType = 2; }; F56F243202AC706801A967F3 = { isa = PBXFileReference; name = liburiloader.a; - path = ../uriloader/build/liburiloader.a; + path = ../../uriloader/build/liburiloader.a; refType = 2; }; F56F243302AC706801A967F3 = { isa = PBXFileReference; name = libxpconnect.a; - path = ../js/src/xpconnect/src/libxpconnect.a; + path = ../../js/src/xpconnect/src/libxpconnect.a; refType = 2; }; F56F243402AC706801A967F3 = { @@ -3700,67 +3778,67 @@ F56F244502AC714601A967F3 = { isa = PBXFileReference; name = libcaps.a; - path = ../caps/src/libcaps.a; + path = ../../caps/src/libcaps.a; refType = 2; }; F56F244602AC714601A967F3 = { isa = PBXFileReference; name = libchrome.a; - path = ../rdf/chrome/build/libchrome.a; + path = ../../rdf/chrome/build/libchrome.a; refType = 2; }; F56F244702AC714601A967F3 = { isa = PBXFileReference; name = libgfx_mac.a; - path = ../gfx/src/mac/libgfx_mac.a; + path = ../../gfx/src/mac/libgfx_mac.a; refType = 2; }; F56F244802AC714601A967F3 = { isa = PBXFileReference; name = libgfx2.a; - path = ../gfx2/src/libgfx2.a; + path = ../../gfx2/src/libgfx2.a; refType = 2; }; F56F244902AC714601A967F3 = { isa = PBXFileReference; name = libhtmlpars.a; - path = ../htmlparser/src/libhtmlpars.a; + path = ../../htmlparser/src/libhtmlpars.a; refType = 2; }; F56F244B02AC714601A967F3 = { isa = PBXFileReference; name = libimggif.a; - path = ../modules/libpr0n/decoders/gif/libimggif.a; + path = ../../modules/libpr0n/decoders/gif/libimggif.a; refType = 2; }; F56F244C02AC714601A967F3 = { isa = PBXFileReference; name = libimgjpeg.a; - path = ../modules/libpr0n/decoders/jpeg/libimgjpeg.a; + path = ../../modules/libpr0n/decoders/jpeg/libimgjpeg.a; refType = 2; }; F56F244D02AC714601A967F3 = { isa = PBXFileReference; name = libimglib2.a; - path = ../modules/libpr0n/src/libimglib2.a; + path = ../../modules/libpr0n/src/libimglib2.a; refType = 2; }; F56F244E02AC714601A967F3 = { isa = PBXFileReference; name = libimgpng.a; - path = ../modules/libpr0n/decoders/png/libimgpng.a; + path = ../../modules/libpr0n/decoders/png/libimgpng.a; refType = 2; }; F56F245002AC714601A967F3 = { isa = PBXFileReference; name = libpref.a; - path = ../modules/libpref/src/libpref.a; + path = ../../modules/libpref/src/libpref.a; refType = 2; }; F56F245102AC714601A967F3 = { isa = PBXFileReference; name = librdf.a; - path = ../rdf/build/librdf.a; + path = ../../rdf/build/librdf.a; refType = 2; }; F56F245202AC714701A967F3 = { @@ -3832,91 +3910,91 @@ F56F246002AC723001A967F3 = { isa = PBXFileReference; name = libdocshell.a; - path = ../docshell/build/libdocshell.a; + path = ../../docshell/build/libdocshell.a; refType = 2; }; F56F246102AC723001A967F3 = { isa = PBXFileReference; name = libeditor.a; - path = ../editor/libeditor/build/libeditor.a; + path = ../../editor/libeditor/build/libeditor.a; refType = 2; }; F56F246202AC723001A967F3 = { isa = PBXFileReference; name = libembedcomponents.a; - path = ../embedding/components/build/libembedcomponents.a; + path = ../../embedding/components/build/libembedcomponents.a; refType = 2; }; F56F246302AC723001A967F3 = { isa = PBXFileReference; name = libgkcontent.a; - path = ../content/build/libgkcontent.a; + path = ../../content/build/libgkcontent.a; refType = 2; }; F56F246402AC723001A967F3 = { isa = PBXFileReference; name = libgklayout.a; - path = ../layout/build/libgklayout.a; + path = ../../layout/build/libgklayout.a; refType = 2; }; F56F246502AC723001A967F3 = { isa = PBXFileReference; name = libgkplugin.a; - path = ../modules/plugin/base/src/libgkplugin.a; + path = ../../modules/plugin/base/src/libgkplugin.a; refType = 2; }; F56F246602AC723001A967F3 = { isa = PBXFileReference; name = libgkview.a; - path = ../view/src/libgkview.a; + path = ../../view/src/libgkview.a; refType = 2; }; F56F246902AC723001A967F3 = { isa = PBXFileReference; name = libjsdom.a; - path = ../dom/src/build/libjsdom.a; + path = ../../dom/src/build/libjsdom.a; refType = 2; }; F56F246A02AC723001A967F3 = { isa = PBXFileReference; name = libjsurl.a; - path = ../dom/src/jsurl/libjsurl.a; + path = ../../dom/src/jsurl/libjsurl.a; refType = 2; }; F56F246B02AC723001A967F3 = { isa = PBXFileReference; name = libmork.a; - path = ../db/mork/build/libmork.a; + path = ../../db/mork/build/libmork.a; refType = 2; }; F56F246F02AC723001A967F3 = { isa = PBXFileReference; name = libprofile.a; - path = ../profile/src/libprofile.a; + path = ../../profile/src/libprofile.a; refType = 2; }; F56F247002AC723001A967F3 = { isa = PBXFileReference; name = libtxmgr.a; - path = ../editor/txmgr/src/libtxmgr.a; + path = ../../editor/txmgr/src/libtxmgr.a; refType = 2; }; F56F247102AC723001A967F3 = { isa = PBXFileReference; name = libtxtsvc.a; - path = ../editor/txtsvc/src/libtxtsvc.a; + path = ../../editor/txtsvc/src/libtxtsvc.a; refType = 2; }; F56F247302AC723001A967F3 = { isa = PBXFileReference; name = libwebbrwsr.a; - path = ../embedding/browser/build/libwebbrwsr.a; + path = ../../embedding/browser/build/libwebbrwsr.a; refType = 2; }; F56F247402AC723001A967F3 = { isa = PBXFileReference; name = libwidget_mac.a; - path = ../widget/src/cocoa/libwidget_mac.a; + path = ../../widget/src/cocoa/libwidget_mac.a; refType = 2; }; F56F247602AC723101A967F3 = { @@ -4012,37 +4090,37 @@ F56F248B02AC729901A967F3 = { isa = PBXFileReference; name = libappcomps.a; - path = ../xpfe/components/build/libappcomps.a; + path = ../../xpfe/components/build/libappcomps.a; refType = 2; }; F56F248C02AC729901A967F3 = { isa = PBXFileReference; name = libcookie.a; - path = ../extensions/cookie/libcookie.a; + path = ../../extensions/cookie/libcookie.a; refType = 2; }; F56F248F02AC729901A967F3 = { isa = PBXFileReference; name = libpipboot.a; - path = ../security/manager/boot/src/libpipboot.a; + path = ../../security/manager/boot/src/libpipboot.a; refType = 2; }; F56F249002AC729901A967F3 = { isa = PBXFileReference; name = libpipnss.a; - path = ../security/manager/ssl/src/libpipnss.a; + path = ../../security/manager/ssl/src/libpipnss.a; refType = 2; }; F56F249302AC729901A967F3 = { isa = PBXFileReference; name = libshistory.a; - path = ../xpfe/components/shistory/src/libshistory.a; + path = ../../xpfe/components/shistory/src/libshistory.a; refType = 2; }; F56F249402AC729901A967F3 = { isa = PBXFileReference; name = libxmlextras.a; - path = ../extensions/xmlextras/build/src/libxmlextras.a; + path = ../../extensions/xmlextras/build/src/libxmlextras.a; refType = 2; }; F56F249502AC729901A967F3 = { @@ -4100,8 +4178,8 @@ F56F837202E47CCD01EF35C9 = { isa = PBXFileReference; name = RegionNames.strings; - path = English.lproj/RegionNames.strings; - refType = 4; + path = ../PreferencePanes/Appearance/English.lproj/RegionNames.strings; + refType = 2; }; F56F837402E47DB401EF35C9 = { children = ( @@ -4109,7 +4187,8 @@ ); isa = PBXVariantGroup; name = RegionNames.strings; - refType = 4; + path = ../PreferencePanes/Appearance; + refType = 2; }; F56F837502E47DB501EF35C9 = { fileRef = F56F837402E47DB401EF35C9; @@ -4119,13 +4198,15 @@ }; F57074B5026BA85F01A80166 = { isa = PBXFileReference; - path = CHBookmarksToolbar.h; - refType = 4; + name = BookmarksToolbar.h; + path = ../src/bookmarks/BookmarksToolbar.h; + refType = 2; }; F57074B6026BA85F01A80166 = { isa = PBXFileReference; - path = CHBookmarksToolbar.mm; - refType = 4; + name = BookmarksToolbar.mm; + path = ../src/bookmarks/BookmarksToolbar.mm; + refType = 2; }; F57074B7026BA85F01A80166 = { fileRef = F57074B5026BA85F01A80166; @@ -4141,13 +4222,15 @@ }; F57074B9026BFD0101A80166 = { isa = PBXFileReference; - path = CHBookmarksButton.h; - refType = 4; + name = BookmarksButton.h; + path = ../src/bookmarks/BookmarksButton.h; + refType = 2; }; F57074BA026BFD0101A80166 = { isa = PBXFileReference; - path = CHBookmarksButton.mm; - refType = 4; + name = BookmarksButton.mm; + path = ../src/bookmarks/BookmarksButton.mm; + refType = 2; }; F57074BB026BFD0201A80166 = { fileRef = F57074B9026BFD0101A80166; @@ -4163,13 +4246,15 @@ }; F57074BD026D80DF01A80166 = { isa = PBXFileReference; - path = CHLocationBar.h; - refType = 4; + name = LocationBar.h; + path = ../src/browser/LocationBar.h; + refType = 2; }; F57074BE026D80DF01A80166 = { isa = PBXFileReference; - path = CHLocationBar.mm; - refType = 4; + name = LocationBar.mm; + path = ../src/browser/LocationBar.mm; + refType = 2; }; F57074BF026D80DF01A80166 = { fileRef = F57074BD026D80DF01A80166; @@ -4186,31 +4271,31 @@ F57BBFDB02DA02C401026D5D = { isa = PBXFileReference; name = libucvcn.dylib; - path = ../dist/Embed/components/libucvcn.dylib; + path = ../../dist/Embed/components/libucvcn.dylib; refType = 2; }; F57BBFDC02DA02C401026D5D = { isa = PBXFileReference; name = libucvja.dylib; - path = ../dist/Embed/components/libucvja.dylib; + path = ../../dist/Embed/components/libucvja.dylib; refType = 2; }; F57BBFDD02DA02C401026D5D = { isa = PBXFileReference; name = libucvko.dylib; - path = ../dist/Embed/components/libucvko.dylib; + path = ../../dist/Embed/components/libucvko.dylib; refType = 2; }; F57BBFDE02DA02C401026D5D = { isa = PBXFileReference; name = libucvtw.dylib; - path = ../dist/Embed/components/libucvtw.dylib; + path = ../../dist/Embed/components/libucvtw.dylib; refType = 2; }; F57BBFDF02DA02C401026D5D = { isa = PBXFileReference; name = libucvtw2.dylib; - path = ../dist/Embed/components/libucvtw2.dylib; + path = ../../dist/Embed/components/libucvtw2.dylib; refType = 2; }; F57BBFEA02DA034601026D5D = { @@ -4246,7 +4331,7 @@ F57F0F470209DF5301A967DF = { isa = PBXFileReference; name = libxpcom.dylib; - path = ../dist/Embed/libxpcom.dylib; + path = ../../dist/Embed/libxpcom.dylib; refType = 2; }; F57F0F480209DF5301A967DF = { @@ -4272,8 +4357,8 @@ buildSettings = { DEBUGGING_SYMBOLS = NO; FRAMEWORK_SEARCH_PATHS = ""; - HEADER_SEARCH_PATHS = "../dist/include/pref ../dist/include/nspr ../dist/include/cookie ../dist/include/nkcache ../dist/include/xpcom"; - LIBRARY_SEARCH_PATHS = "../dist/Embed ../embedding/base ../string/obsolete ../intl/unicharutil/util ../js/src ../dist/Embed/components"; + HEADER_SEARCH_PATHS = "../../dist/include/pref ../../dist/include/nspr ../../dist/include/cookie ../../dist/include/nkcache ../../dist/include/xpcom"; + LIBRARY_SEARCH_PATHS = "../../dist/Embed ../../embedding/base ../../string/obsolete ../../intl/unicharutil/util ../../js/src ../../dist/Embed/components"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-bundle"; @@ -4327,45 +4412,45 @@ }; F57F205D029997E701000106 = { children = ( - F57F205E029997E701000106, + F507A85D0311948201026D5D, F57F205F029997E701000106, F57F2060029997E701000106, F57F2061029997E701000106, ); isa = PBXGroup; name = Privacy; - path = Personal; - refType = 4; + path = ../PreferencePanes/Privacy; + refType = 2; }; F57F205E029997E701000106 = { isa = PBXFileReference; - name = Privacy.nib; - path = PreferencePanes/Privacy/Privacy.nib; + name = English; + path = ../PreferencePanes/Privacy/English.lproj/Privacy.nib; refType = 2; }; F57F205F029997E701000106 = { isa = PBXFileReference; name = Privacy.tiff; - path = PreferencePanes/Privacy/Privacy.tiff; + path = ../PreferencePanes/Privacy/Privacy.tiff; refType = 2; }; F57F2060029997E701000106 = { isa = PBXFileReference; name = PrivacyPane.h; - path = PreferencePanes/Privacy/PrivacyPane.h; + path = ../PreferencePanes/Privacy/PrivacyPane.h; refType = 2; }; F57F2061029997E701000106 = { isa = PBXFileReference; name = PrivacyPane.mm; - path = PreferencePanes/Privacy/PrivacyPane.mm; + path = ../PreferencePanes/Privacy/PrivacyPane.mm; refType = 2; }; F57F2062029997E701000106 = { isa = PBXBundleReference; name = Privacy.prefPane; path = build/Privacy.prefPane; - refType = 4; + refType = 2; }; F57F2064029997E701000106 = { buildActionMask = 2147483647; @@ -4384,18 +4469,12 @@ F57F2066029997E701000106 = { buildActionMask = 2147483647; files = ( - F57F2067029997E701000106, + F507A85E0311948201026D5D, F57F2068029997E701000106, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; }; - F57F2067029997E701000106 = { - fileRef = F57F205E029997E701000106; - isa = PBXBuildFile; - settings = { - }; - }; F57F2068029997E701000106 = { fileRef = F57F205F029997E701000106; isa = PBXBuildFile; @@ -4523,18 +4602,20 @@ }; F5807369023A1514010001CA = { isa = PBXFileReference; - path = CHSplashScreenWindow.h; - refType = 4; + name = SplashScreenWindow.h; + path = ../src/application/SplashScreenWindow.h; + refType = 2; }; F580736A023A1514010001CA = { isa = PBXFileReference; - path = CHSplashScreenWindow.m; + name = SplashScreenWindow.m; + path = ../src/application/SplashScreenWindow.m; refType = 4; }; F580736B023A1514010001CA = { children = ( F568C3D3023A4F71010001CA, - F568C3CD023A49C0010001CA, + F507A85603116EBB01026D5D, F568C3CF023A4A5A010001CA, F568C3D0023A4A5A010001CA, ); @@ -4599,20 +4680,15 @@ }; F585677D02382E97010001CA = { isa = PBXFileReference; - path = MVPreferences.nib; - refType = 4; - }; - F585677E02382E97010001CA = { - fileRef = F585677D02382E97010001CA; - isa = PBXBuildFile; - settings = { - }; + name = English; + path = ../English.lproj/MVPreferences.nib; + refType = 2; }; F58581AD022B8D61010001CA = { isa = PBXBundleReference; name = Personal.prefPane; path = build/Personal.prefPane; - refType = 4; + refType = 2; }; F58581AE022B8D62010001CA = { buildPhases = ( @@ -4688,7 +4764,7 @@ F58581B0022B8D62010001CA = { buildActionMask = 2147483647; files = ( - F58581B5022B8E0D010001CA, + F507A860031194B101026D5D, F58581B6022B8E0D010001CA, ); isa = PBXResourcesBuildPhase; @@ -4724,12 +4800,6 @@ settings = { }; }; - F58581B5022B8E0D010001CA = { - fileRef = F53F21FD022B7C77010001CA; - isa = PBXBuildFile; - settings = { - }; - }; F58581B6022B8E0D010001CA = { fileRef = F53F21FE022B7C77010001CA; isa = PBXBuildFile; @@ -4766,12 +4836,12 @@ }; F58A94F2023F10CA010001CA = { children = ( - 29B97319FDCFA39411CA2CEA, - F51842FC0206176901A966FE, - F5247C2D02289FD9013DD99A, - F5173958020CE1E50189DA0C, - F528E216020FD5D80168DE43, - F53E012F02AEE9BD01A967F3, + F507A84103116E1D01026D5D, + F507A84403116E5501026D5D, + F507A84703116E6901026D5D, + F507A84A03116E6E01026D5D, + F507A84D03116E7401026D5D, + F507A85003116E7901026D5D, ); isa = PBXGroup; name = Nibs; @@ -4779,13 +4849,15 @@ }; F59236C002C89AC90100012B = { isa = PBXFileReference; - path = AppDirServiceProvider.cpp; - refType = 4; + name = AppDirServiceProvider.cpp; + path = ../src/application/AppDirServiceProvider.cpp; + refType = 2; }; F59236C102C89AC90100012B = { isa = PBXFileReference; - path = AppDirServiceProvider.h; - refType = 4; + name = AppDirServiceProvider.h; + path = ../src/application/AppDirServiceProvider.h; + refType = 2; }; F59236C202C89ACA0100012B = { fileRef = F59236C102C89AC90100012B; @@ -4811,28 +4883,6 @@ settings = { }; }; - F5948A48029EB9C801000102 = { - children = ( - F5948A49029EB9E301000102, - ); - isa = PBXGroup; - name = xpcom; - refType = 4; - }; - F5948A49029EB9E301000102 = { - children = ( - F5948A4A029EBA3701000102, - ); - isa = PBXGroup; - name = components; - refType = 4; - }; - F5948A4A029EBA3701000102 = { - isa = PBXFileReference; - name = nsComponentManager.cpp; - path = ../xpcom/components/nsComponentManager.cpp; - refType = 2; - }; F5960E9C02BA686001000103 = { fileRef = F5FEDBCB02AD8DD101A967F3; isa = PBXBuildFile; @@ -4841,7 +4891,8 @@ }; F59A0E320307635401A967F3 = { isa = PBXFileReference; - path = chimera.js; + name = chimera.js; + path = ../resources/application/chimera.js; refType = 2; }; F59A0E350307639801A967F3 = { @@ -4858,7 +4909,8 @@ }; F59E9F3D0237E28401A967DF = { isa = PBXFileReference; - path = ContentClickListener.h; + name = ContentClickListener.h; + path = ../src/browser/ContentClickListener.h; refType = 2; }; F59E9F3E0237E28401A967DF = { @@ -4869,7 +4921,8 @@ }; F59E9F3F0237E43401A967DF = { isa = PBXFileReference; - path = ContentClickListener.mm; + name = ContentClickListener.mm; + path = ../src/browser/ContentClickListener.mm; refType = 2; }; F59E9F400237E43401A967DF = { @@ -4880,7 +4933,8 @@ }; F5A112C902DF270F01026D5D = { isa = PBXFileReference; - path = "loading-image.gif"; + name = "loading-image.gif"; + path = "../resources/images/gecko/loading-image.gif"; refType = 2; }; F5A112CA02DF270F01026D5D = { @@ -4897,8 +4951,9 @@ }; F5A3669302CCFAF601DC3354 = { isa = PBXFileReference; - path = BookmarksDataSource.h; - refType = 4; + name = BookmarksDataSource.h; + path = ../src/bookmarks/BookmarksDataSource.h; + refType = 2; }; F5A3669402CCFAF601DC3354 = { children = ( @@ -4915,8 +4970,9 @@ }; F5A3669502CCFAF601DC3354 = { isa = PBXFileReference; - path = BookmarksDataSource.mm; - refType = 4; + name = BookmarksDataSource.mm; + path = ../src/bookmarks/BookmarksDataSource.mm; + refType = 2; }; F5A3669602CCFAF601DC3354 = { children = ( @@ -4986,14 +5042,14 @@ F5A8CE4102DFEF4C013CA8EC = { isa = PBXFileReference; name = PreferencePaneBase.h; - path = Shared/PreferencePaneBase.h; - refType = 4; + path = ../PreferencePanes/Shared/PreferencePaneBase.h; + refType = 2; }; F5A8CE4202DFEF4C013CA8EC = { isa = PBXFileReference; name = PreferencePaneBase.mm; - path = Shared/PreferencePaneBase.mm; - refType = 4; + path = ../PreferencePanes/Shared/PreferencePaneBase.mm; + refType = 2; }; F5A8CE4302DFEF4C013CA8EC = { fileRef = F5A8CE4102DFEF4C013CA8EC; @@ -5023,8 +5079,8 @@ ); buildSettings = { DEBUGGING_SYMBOLS = NO; - 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"; - LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util ../modules/zlib/src"; + 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"; + LIBRARY_SEARCH_PATHS = "../../dist/bin ../../dist/lib ../../intl/unicharutil/util ../../modules/zlib/src"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-bundle -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -lm"; @@ -5088,7 +5144,7 @@ F5A8CE4902DFF039013CA8EC = { buildActionMask = 2147483647; files = ( - F5A8CE5402DFF167013CA8EC, + F507A85A03116FF301026D5D, F5A8CE5502DFF167013CA8EC, F5F9FBDD02E1414C012B5DB7, F56F837502E47DB501EF35C9, @@ -5127,34 +5183,39 @@ children = ( F5A8CE4E02DFF167013CA8EC, F5A8CE4F02DFF167013CA8EC, - F5A8CE5002DFF167013CA8EC, + F507A85903116FF301026D5D, F5A8CE5102DFF167013CA8EC, F5F9FBD902E13767012B5DB7, F56F837402E47DB401EF35C9, ); isa = PBXGroup; - path = Appearance; - refType = 4; + name = Appearance; + path = ../PreferencePanes/Appearance; + refType = 2; }; F5A8CE4E02DFF167013CA8EC = { isa = PBXFileReference; - path = Appearance.h; - refType = 4; + name = Appearance.h; + path = ../PreferencePanes/Appearance/Appearance.h; + refType = 2; }; F5A8CE4F02DFF167013CA8EC = { isa = PBXFileReference; - path = Appearance.mm; - refType = 4; + name = Appearance.mm; + path = ../PreferencePanes/Appearance/Appearance.mm; + refType = 2; }; F5A8CE5002DFF167013CA8EC = { isa = PBXFileReference; - path = Appearance.nib; - refType = 4; + name = English; + path = ../PreferencePanes/Appearance/English.lproj/Appearance.nib; + refType = 2; }; F5A8CE5102DFF167013CA8EC = { isa = PBXFileReference; - path = Appearance.tiff; - refType = 4; + name = Appearance.tiff; + path = ../PreferencePanes/Appearance/Appearance.tiff; + refType = 2; }; F5A8CE5202DFF167013CA8EC = { fileRef = F5A8CE4E02DFF167013CA8EC; @@ -5168,12 +5229,6 @@ settings = { }; }; - F5A8CE5402DFF167013CA8EC = { - fileRef = F5A8CE5002DFF167013CA8EC; - isa = PBXBuildFile; - settings = { - }; - }; F5A8CE5502DFF167013CA8EC = { fileRef = F5A8CE5102DFF167013CA8EC; isa = PBXBuildFile; @@ -5224,8 +5279,9 @@ }; F5AE04B20206A34801A967DF = { isa = PBXFileReference; - path = BrowserWindowController.h; - refType = 4; + name = BrowserWindowController.h; + path = ../src/browser/BrowserWindowController.h; + refType = 2; }; F5AE04B40206A34801A967DF = { fileRef = F5AE04B20206A34801A967DF; @@ -5235,8 +5291,9 @@ }; F5AE04B60206A37C01A967DF = { isa = PBXFileReference; - path = MainController.h; - refType = 4; + name = MainController.h; + path = ../src/application/MainController.h; + refType = 2; }; F5AE04B80206A37C01A967DF = { fileRef = F5AE04B60206A37C01A967DF; @@ -5246,8 +5303,9 @@ }; F5AE04BA0206A4FE01A967DF = { isa = PBXFileReference; - path = MainController.mm; - refType = 4; + name = MainController.mm; + path = ../src/application/MainController.mm; + refType = 2; }; F5AE04BB0206A4FE01A967DF = { fileRef = F5AE04BA0206A4FE01A967DF; @@ -5258,7 +5316,7 @@ F5B8CC460209D1B601A967DF = { isa = PBXFileReference; name = libstring_obsolete_s.a; - path = ../string/obsolete/libstring_obsolete_s.a; + path = ../../string/obsolete/libstring_obsolete_s.a; refType = 2; }; F5B950BA030C833301A96654 = { @@ -5290,13 +5348,15 @@ }; F5B950BC030C83B601A96654 = { isa = PBXFileReference; - path = BrowserTabViewItem.h; - refType = 4; + name = BrowserTabViewItem.h; + path = ../src/browser/BrowserTabViewItem.h; + refType = 2; }; F5B950BD030C83B601A96654 = { isa = PBXFileReference; - path = BrowserTabViewItem.mm; - refType = 4; + name = BrowserTabViewItem.mm; + path = ../src/browser/BrowserTabViewItem.mm; + refType = 2; }; F5B950BE030C83B601A96654 = { fileRef = F5B950BC030C83B601A96654; @@ -5349,9 +5409,9 @@ buildSettings = { DEBUGGING_SYMBOLS = NO; FRAMEWORK_SEARCH_PATHS = ""; - HEADER_SEARCH_PATHS = "../dist/include/helperAppDlg ../dist/include/exthandler ../dist/include/intl ../dist/include/pipboot ../dist/include/pipnss ../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/commandhandler ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/nkcache ../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/chrome ../dist/include/xpcom ../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\""; + HEADER_SEARCH_PATHS = "../../dist/include/helperAppDlg ../../dist/include/exthandler ../../dist/include/intl ../../dist/include/pipboot ../../dist/include/pipnss ../../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/commandhandler ../../dist/include/windowwatcher ../../dist/include/webshell ../../dist/include/widget ../../dist/include/uriloader ../../dist/include/nkcache ../../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/chrome ../../dist/include/xpcom ../../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\""; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../dist/lib/components ../intl/unicharutil/src ../gfx/src ../js/src/liveconnect ../intl/unicharutil/util"; + LIBRARY_SEARCH_PATHS = "../../dist/bin ../../dist/lib ../../dist/lib/components ../../intl/unicharutil/src ../../gfx/src ../../js/src/liveconnect ../../intl/unicharutil/util"; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = "-fno-rtti -DOSTYPE=\\\"Darwin1.4\\\" -DOSARCH=\\\"Darwin\\\" -D_BUILD_STATIC_BIN"; OTHER_LDFLAGS = "-lxpcom -lplds4 -lplc4 -lnspr4 -lsmime3 -lssl3 -lnss3 -lsoftokn3 -lmozjs -lmozjpeg -ljsj -lmozpng -lmozmng -lpthread -lz -lm"; @@ -5548,7 +5608,6 @@ F5BAAB4002AC4A2E01A967F3, F5BAAB4102AC4A2E01A967F3, F53E012B02AEE91D01A967F3, - F53E013402AEEA2901A967F3, F59236C402C89ACA0100012B, F5A3669A02CCFB7A01DC3354, F50D9DE702ECC36201BB4219, @@ -5573,16 +5632,16 @@ F5BAAB1B02AC45D301A967F3 = { buildActionMask = 2147483647; files = ( - F5BAAB4202AC4A5301A967F3, + F507A84303116E1D01026D5D, F5BAAB4302AC4A5301A967F3, F5BAAB4402AC4A5301A967F3, F5BAAB4502AC4A5301A967F3, F5BAAB4602AC4A5301A967F3, F5BAAB4702AC4A5301A967F3, F5BAAB4802AC4A5301A967F3, - F5BAAB4902AC4A5301A967F3, + F507A84603116E5501026D5D, F5BAAB4A02AC4A5301A967F3, - F5BAAB4B02AC4A5301A967F3, + F507A84C03116E6E01026D5D, F5BAAB4C02AC4A5301A967F3, F5BAAB4D02AC4A5301A967F3, F5BAAB4E02AC4A5301A967F3, @@ -5591,15 +5650,15 @@ F5BAAB5102AC4A5301A967F3, F5BAAB5202AC4A5301A967F3, F5BAAB5302AC4A5301A967F3, - F5BAAB5402AC4A5301A967F3, + F507A84F03116E7401026D5D, F5BAAB5602AC4A5301A967F3, F5BAAB5702AC4A5301A967F3, - F5BAAB5802AC4A5301A967F3, + F507A84903116E6901026D5D, F5BAAB5902AC4A5301A967F3, F5BAAB5A02AC4A5301A967F3, - F5BAAB5B02AC4A5301A967F3, - F5BAAB5C02AC4A5301A967F3, - F5BAAB5D02AC4A5301A967F3, + F507A86303128A3D01026D5D, + F507A85503116EA401026D5D, + F507A85803116EBC01026D5D, F5BAAB5E02AC4A5301A967F3, F5BAAB5F02AC4A5301A967F3, F5BAAB6002AC4A5301A967F3, @@ -5624,7 +5683,7 @@ F5BAAB7502AC4A5301A967F3, F5BAAB7702AC4A5301A967F3, F5BAAB7802AC4A5301A967F3, - F53E013102AEE9BD01A967F3, + F507A85203116E7901026D5D, F50EA34C02BAB1E401000103, F50EA34D02BAB1E401000103, F50EA34E02BAB1E401000103, @@ -5973,12 +6032,6 @@ settings = { }; }; - F5BAAB4202AC4A5301A967F3 = { - fileRef = 29B97319FDCFA39411CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB4302AC4A5301A967F3 = { fileRef = 089C165CFE840E0CC02AAC07; isa = PBXBuildFile; @@ -6015,24 +6068,12 @@ settings = { }; }; - F5BAAB4902AC4A5301A967F3 = { - fileRef = F51842FC0206176901A966FE; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB4A02AC4A5301A967F3 = { fileRef = F51842FE020629B701A966FE; isa = PBXBuildFile; settings = { }; }; - F5BAAB4B02AC4A5301A967F3 = { - fileRef = F5173958020CE1E50189DA0C; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB4C02AC4A5301A967F3 = { fileRef = F5264FCD020D4C25010001CA; isa = PBXBuildFile; @@ -6081,12 +6122,6 @@ settings = { }; }; - F5BAAB5402AC4A5301A967F3 = { - fileRef = F528E216020FD5D80168DE43; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB5602AC4A5301A967F3 = { fileRef = F5568A8E0217C7F5010001CA; isa = PBXBuildFile; @@ -6099,12 +6134,6 @@ settings = { }; }; - F5BAAB5802AC4A5301A967F3 = { - fileRef = F5247C2D02289FD9013DD99A; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB5902AC4A5301A967F3 = { fileRef = F53F21EC022B7C77010001CA; isa = PBXBuildFile; @@ -6117,24 +6146,6 @@ settings = { }; }; - F5BAAB5B02AC4A5301A967F3 = { - fileRef = F53F21EE022B7C77010001CA; - isa = PBXBuildFile; - settings = { - }; - }; - F5BAAB5C02AC4A5301A967F3 = { - fileRef = F585677D02382E97010001CA; - isa = PBXBuildFile; - settings = { - }; - }; - F5BAAB5D02AC4A5301A967F3 = { - fileRef = F568C3CD023A49C0010001CA; - isa = PBXBuildFile; - settings = { - }; - }; F5BAAB5E02AC4A5301A967F3 = { fileRef = F568C3D3023A4F71010001CA; isa = PBXBuildFile; @@ -7338,13 +7349,15 @@ }; F5BF71450231B8BC010001CA = { isa = PBXFileReference; - path = BrowserTabView.h; - refType = 4; + name = BrowserTabView.h; + path = ../src/browser/BrowserTabView.h; + refType = 2; }; F5BF71460231B8BC010001CA = { isa = PBXFileReference; - path = BrowserTabView.mm; - refType = 4; + name = BrowserTabView.mm; + path = ../src/browser/BrowserTabView.mm; + refType = 2; }; F5BF71510231DC5D010001CA = { fileRef = F5BF71450231B8BC010001CA; @@ -7361,13 +7374,13 @@ F5C2793102C514FF010000E1 = { isa = PBXFileReference; name = initpref.js; - path = ../dist/Embed/defaults/pref/initpref.js; + path = ../../dist/Embed/defaults/pref/initpref.js; refType = 2; }; F5C2793202C514FF010000E1 = { isa = PBXFileReference; name = macprefs.js; - path = ../dist/Embed/defaults/pref/macprefs.js; + path = ../../dist/Embed/defaults/pref/macprefs.js; refType = 2; }; F5C2793702C5158B010000E1 = { @@ -7397,7 +7410,7 @@ F5C2CDA702383CE601A967DF = { isa = PBXFileReference; name = libunicharutil_s.a; - path = ../intl/unicharutil/util/libunicharutil_s.a; + path = ../../intl/unicharutil/util/libunicharutil_s.a; refType = 2; }; F5C2CDA802383CE701A967DF = { @@ -7406,33 +7419,17 @@ settings = { }; }; - F5C321D002CBCEF7014E7D56 = { - isa = PBXFileReference; - name = nsXBLService.cpp; - path = /Volumes/Development/Projects/Mozilla/Chimera/mozilla/content/xbl/src/nsXBLService.cpp; - refType = 0; - }; - F5C321D402CBD01C014E7D56 = { - isa = PBXFileReference; - name = xmlparse.c; - path = /Volumes/Development/Projects/Mozilla/Chimera/mozilla/expat/xmlparse/xmlparse.c; - refType = 0; - }; - F5C321D702CBD0CE014E7D56 = { - isa = PBXFileReference; - name = nsXMLContentSink.cpp; - path = /Volumes/Development/Projects/Mozilla/Chimera/mozilla/content/xml/document/src/nsXMLContentSink.cpp; - refType = 0; - }; F5C3AB810270072A01A80166 = { isa = PBXFileReference; - path = CHExtendedOutlineView.h; - refType = 4; + name = ExtendedOutlineView.h; + path = ../src/extensions/ExtendedOutlineView.h; + refType = 2; }; F5C3AB820270072A01A80166 = { isa = PBXFileReference; - path = CHExtendedOutlineView.mm; - refType = 4; + name = ExtendedOutlineView.mm; + path = ../src/extensions/ExtendedOutlineView.mm; + refType = 2; }; F5C3AB830270072A01A80166 = { fileRef = F5C3AB810270072A01A80166; @@ -7458,8 +7455,8 @@ F5CA1A1A02D3956F01F34900 = { isa = PBXFileReference; name = English; - path = English.lproj/Navigator.scriptTerminology; - refType = 4; + path = ../English.lproj/Navigator.scriptTerminology; + refType = 2; }; F5CA1A1B02D3957001F34900 = { fileRef = F5CA1A1902D3956F01F34900; @@ -7475,10 +7472,10 @@ }; F5CA1A1D02D4ECDA01F34900 = { children = ( - F585677D02382E97010001CA, + F507A85303116EA401026D5D, F53F21EC022B7C77010001CA, F53F21ED022B7C77010001CA, - F53F21EE022B7C77010001CA, + F507A86103128A3D01026D5D, F53F21EF022B7C77010001CA, F53F21F0022B7C77010001CA, F53F21F1022B7C77010001CA, @@ -7503,17 +7500,20 @@ }; F5D33CBC02EF61A901A967F3 = { isa = PBXFileReference; - path = SecurityDialogs.h; + name = SecurityDialogs.h; + path = ../src/browser/SecurityDialogs.h; refType = 2; }; F5D33CBD02EF61A901A967F3 = { isa = PBXFileReference; - path = AppComponents.mm; + name = AppComponents.mm; + path = ../src/application/AppComponents.mm; refType = 2; }; F5D33CBE02EF61A901A967F3 = { isa = PBXFileReference; - path = SecurityDialogs.mm; + name = SecurityDialogs.mm; + path = ../src/browser/SecurityDialogs.mm; refType = 2; }; F5D33CBF02EF61AA01A967F3 = { @@ -7555,7 +7555,7 @@ F5D3F1CE0209235A014E447F = { isa = PBXFileReference; name = libmork.dylib; - path = ../db/mork/build/libmork.dylib; + path = ../../db/mork/build/libmork.dylib; refType = 2; }; F5D3F1D002092373014E447F = { @@ -7567,7 +7567,7 @@ F5DA444A027DD5AA01A80166 = { isa = PBXFileReference; name = "installed-chrome.txt"; - path = "../dist/Embed/chrome/installed-chrome.txt"; + path = "../../dist/Embed/chrome/installed-chrome.txt"; refType = 2; }; F5DA444C027DD5AA01A80166 = { @@ -7578,8 +7578,9 @@ }; F5DAB15002698C0D01A80166 = { isa = PBXFileReference; - path = bookmark_on.tif; - refType = 4; + name = bookmark_on.tif; + path = ../resources/images/toolbar/bookmark_on.tif; + refType = 2; }; F5DAB15102698C0D01A80166 = { fileRef = F5DAB15002698C0D01A80166; @@ -7589,18 +7590,21 @@ }; F5DAB15202698D5401A80166 = { isa = PBXFileReference; - path = delete_on.tif; - refType = 4; + name = delete_on.tif; + path = ../resources/images/toolbar/delete_on.tif; + refType = 2; }; F5DAB15302698D5401A80166 = { isa = PBXFileReference; - path = edit_on.tif; - refType = 4; + name = edit_on.tif; + path = ../resources/images/toolbar/edit_on.tif; + refType = 2; }; F5DAB15402698D5401A80166 = { isa = PBXFileReference; - path = folder_on.tif; - refType = 4; + name = folder_on.tif; + path = ../resources/images/toolbar/folder_on.tif; + refType = 2; }; F5DAB15502698D5401A80166 = { fileRef = F5DAB15202698D5401A80166; @@ -7622,33 +7626,39 @@ }; F5DE10E60209DC0601A967DF = { isa = PBXFileReference; - path = nsAlertController.h; - refType = 4; + name = nsAlertController.h; + path = ../src/browser/nsAlertController.h; + refType = 2; }; F5DE10E70209DC0601A967DF = { isa = PBXFileReference; - path = CHBrowserView.h; - refType = 4; + name = CHBrowserView.h; + path = ../src/embedding/CHBrowserView.h; + refType = 2; }; F5DE10E80209DC0601A967DF = { isa = PBXFileReference; - path = nsCocoaBrowserService.h; - refType = 4; + name = CHBrowserService.h; + path = ../src/embedding/CHBrowserService.h; + refType = 2; }; F5DE10E90209DC0601A967DF = { isa = PBXFileReference; - path = nsAlertController.mm; - refType = 4; + name = nsAlertController.mm; + path = ../src/browser/nsAlertController.mm; + refType = 2; }; F5DE10EA0209DC0601A967DF = { isa = PBXFileReference; - path = CHBrowserView.mm; - refType = 4; + name = CHBrowserView.mm; + path = ../src/embedding/CHBrowserView.mm; + refType = 2; }; F5DE10EB0209DC0601A967DF = { isa = PBXFileReference; - path = nsCocoaBrowserService.mm; - refType = 4; + name = CHBrowserService.mm; + path = ../src/embedding/CHBrowserService.mm; + refType = 2; }; F5DE10EC0209DC0601A967DF = { fileRef = F5DE10E60209DC0601A967DF; @@ -7686,51 +7696,6 @@ settings = { }; }; - F5E1196C022CDCA7010001CA = { - children = ( - F5555C8202022F070164C72B, - F5555C8302022F070164C72B, - F5555C8402022F070164C72B, - F5555C8502022F070164C72B, - F5547D60020333DA01F448B0, - F51842FE020629B701A966FE, - F53F5AE902448BC8010001CA, - F53F5AEA02448BC8010001CA, - F55CCFD2020E98EA010001CA, - F5EB9376030C92450100010C, - ); - isa = PBXGroup; - name = "Purple Images"; - refType = 4; - }; - F5E1196D022CDCA7010001CA = { - children = ( - ); - isa = PBXGroup; - name = "Gray Images"; - refType = 4; - }; - F5E1196E022CDCA7010001CA = { - children = ( - F5264FCD020D4C25010001CA, - F5264FCE020D4C25010001CA, - F5264FCF020D4C25010001CA, - F5264FD0020D4C25010001CA, - F5264FD1020D4C25010001CA, - F5264FD2020D4C25010001CA, - F5264FD3020D4C25010001CA, - ); - isa = PBXGroup; - name = "Purple Images"; - refType = 4; - }; - F5E1196F022CDCA7010001CA = { - children = ( - ); - isa = PBXGroup; - name = "Gray Images"; - refType = 4; - }; F5E37B0C02EE959601A967F3 = { fileRef = F55C4DD302D2864D0130B065; isa = PBXBuildFile; @@ -7776,7 +7741,7 @@ F5E47654030C5FD501A967F3 = { isa = PBXFileReference; name = libuniversalchardet.a; - path = ../extensions/universalchardet/src/libuniversalchardet.a; + path = ../../extensions/universalchardet/src/libuniversalchardet.a; refType = 2; }; F5E47655030C5FD501A967F3 = { @@ -7785,65 +7750,10 @@ settings = { }; }; - F5EA337802EF886D01A96654 = { - children = ( - F5EA337902EF889001A96654, - F5EA337A02EF889001A96654, - F5EA337B02EF889001A96654, - F5EA337C02EF889001A96654, - F5EA337D02EF889001A96654, - F5EA337E02EF889001A96654, - F522EFC502F73CF901A96654, - F522EFC602F73CF901A96654, - F522EFC702F73CF901A96654, - F522EFC802F73CF901A96654, - F522EFC902F73CF901A96654, - F522EFCA02F73CF901A96654, - F522EFCB02F73CF901A96654, - ); - isa = PBXGroup; - name = widget; - refType = 4; - }; - F5EA337902EF889001A96654 = { - isa = PBXFileReference; - name = nsAppShellCocoa.mm; - path = ../widget/src/cocoa/nsAppShellCocoa.mm; - refType = 2; - }; - F5EA337A02EF889001A96654 = { - isa = PBXFileReference; - name = nsChildView.mm; - path = ../widget/src/cocoa/nsChildView.mm; - refType = 2; - }; - F5EA337B02EF889001A96654 = { - isa = PBXFileReference; - name = nsCocoaWindow.mm; - path = ../widget/src/cocoa/nsCocoaWindow.mm; - refType = 2; - }; - F5EA337C02EF889001A96654 = { - isa = PBXFileReference; - name = nsDragHelperService.cpp; - path = ../widget/src/cocoa/nsDragHelperService.cpp; - refType = 2; - }; - F5EA337D02EF889001A96654 = { - isa = PBXFileReference; - name = nsDragService.cpp; - path = ../widget/src/cocoa/nsDragService.cpp; - refType = 2; - }; - F5EA337E02EF889001A96654 = { - isa = PBXFileReference; - name = nsToolkit.mm; - path = ../widget/src/cocoa/nsToolkit.mm; - refType = 2; - }; F5EB9376030C92450100010C = { isa = PBXFileReference; - path = showsource.tif; + name = showsource.tif; + path = ../resources/images/toolbar/showsource.tif; refType = 2; }; F5EB9377030C92450100010C = { @@ -7861,7 +7771,7 @@ F5F14E9602A5A43A01A967F3 = { isa = PBXFileReference; name = libwidget.rsrc; - path = ../dist/Embed/libwidget.rsrc; + path = ../../dist/Embed/libwidget.rsrc; refType = 2; }; F5F14E9802A5A43A01A967F3 = { @@ -7873,31 +7783,32 @@ F5F181C50208006F0124611D = { isa = PBXFileReference; name = history.xpt; - path = ../xpfe/components/history/public/_xpidlgen/history.xpt; + path = ../../xpfe/components/history/public/_xpidlgen/history.xpt; refType = 2; }; F5F181C60208006F0124611D = { isa = PBXFileReference; name = search.xpt; - path = ../xpfe/components/search/public/_xpidlgen/search.xpt; + path = ../../xpfe/components/search/public/_xpidlgen/search.xpt; refType = 2; }; F5F181C80208006F0124611D = { isa = PBXFileReference; name = autocomplete.xpt; - path = ../xpfe/components/autocomplete/public/_xpidlgen/autocomplete.xpt; + path = ../../xpfe/components/autocomplete/public/_xpidlgen/autocomplete.xpt; refType = 2; }; F5F181C90208006F0124611D = { isa = PBXFileReference; name = libappcomps.dylib; - path = ../xpfe/components/build/libappcomps.dylib; + path = ../../xpfe/components/build/libappcomps.dylib; refType = 2; }; F5F190BB02D1F81A01026D5D = { isa = PBXFileReference; - path = ToolbarDefaults.plist; - refType = 4; + name = ToolbarDefaults.plist; + path = ../resources/application/ToolbarDefaults.plist; + refType = 2; }; F5F190BC02D1F81A01026D5D = { fileRef = F5F190BB02D1F81A01026D5D; @@ -7913,8 +7824,9 @@ }; F5F190BE02D217C201026D5D = { isa = PBXFileReference; - path = WebsiteDefaults.strings; - refType = 4; + name = WebsiteDefaults.strings; + path = ../resources/application/WebsiteDefaults.strings; + refType = 2; }; F5F190BF02D217C201026D5D = { fileRef = F5F190BE02D217C201026D5D; @@ -7944,7 +7856,7 @@ F5F59320020F4CD201ACA690 = { isa = PBXFileReference; name = libtxmgr.dylib; - path = ../editor/txmgr/src/libtxmgr.dylib; + path = ../../editor/txmgr/src/libtxmgr.dylib; refType = 2; }; F5F59322020F4D0201ACA690 = { @@ -7965,8 +7877,9 @@ }; F5F9FBD902E13767012B5DB7 = { isa = PBXFileReference; - path = RegionMapping.plist; - refType = 4; + name = RegionMapping.plist; + path = ../PreferencePanes/Appearance/RegionMapping.plist; + refType = 2; }; F5F9FBDD02E1414C012B5DB7 = { fileRef = F5F9FBD902E13767012B5DB7; @@ -8022,13 +7935,15 @@ //F64 F632AF8302B9AEBB01000103 = { isa = PBXFileReference; - path = BrowserWindow.h; - refType = 4; + name = BrowserWindow.h; + path = ../src/browser/BrowserWindow.h; + refType = 2; }; F632AF8402B9AEBB01000103 = { isa = PBXFileReference; - path = BrowserWindow.mm; - refType = 4; + name = BrowserWindow.mm; + path = ../src/browser/BrowserWindow.mm; + refType = 2; }; F632AF8502B9AEBB01000103 = { fileRef = F632AF8302B9AEBB01000103; @@ -8045,7 +7960,7 @@ F655020201B480F201A962F7 = { isa = PBXFileReference; name = libnkcache.dylib; - path = ../netwerk/cache/src/libnkcache.dylib; + path = ../../netwerk/cache/src/libnkcache.dylib; refType = 2; }; F655020401B4812301A962F7 = { @@ -8056,7 +7971,8 @@ }; F6BA6D4E01B2F8A601A962F7 = { isa = PBXFileReference; - path = CHBrowserWrapper.mm; + name = BrowserWrapper.mm; + path = ../src/browser/BrowserWrapper.mm; refType = 2; }; F6BA6D4F01B2F8A601A962F7 = { @@ -8108,31 +8024,31 @@ F6BD637F01B30EA301A962F7 = { isa = PBXFileReference; name = libmozjs.dylib; - path = ../dist/Embed/libmozjs.dylib; + path = ../../dist/Embed/libmozjs.dylib; refType = 2; }; F6BD638001B30EA301A962F7 = { isa = PBXFileReference; name = libnspr4.dylib; - path = ../dist/Embed/libnspr4.dylib; + path = ../../dist/Embed/libnspr4.dylib; refType = 2; }; F6BD638101B30EA301A962F7 = { isa = PBXFileReference; name = libplc4.dylib; - path = ../dist/Embed/libplc4.dylib; + path = ../../dist/Embed/libplc4.dylib; refType = 2; }; F6BD638201B30EA301A962F7 = { isa = PBXFileReference; name = libplds4.dylib; - path = ../dist/Embed/libplds4.dylib; + path = ../../dist/Embed/libplds4.dylib; refType = 2; }; F6BD638701B30F5301A962F7 = { isa = PBXFileReference; name = libgkgfx.dylib; - path = ../dist/Embed/libgkgfx.dylib; + path = ../../dist/Embed/libgkgfx.dylib; refType = 2; }; F6BD638901B30F5301A962F7 = { @@ -8403,553 +8319,553 @@ F6BD639401B3131201A962F7 = { isa = PBXFileReference; name = caps.xpt; - path = ../dist/Embed/components/caps.xpt; + path = ../../dist/Embed/components/caps.xpt; refType = 2; }; F6BD639501B3131201A962F7 = { isa = PBXFileReference; name = chrome.xpt; - path = ../dist/Embed/components/chrome.xpt; + path = ../../dist/Embed/components/chrome.xpt; refType = 2; }; F6BD639601B3131201A962F7 = { isa = PBXFileReference; name = docshell.xpt; - path = ../dist/Embed/components/docshell.xpt; + path = ../../dist/Embed/components/docshell.xpt; refType = 2; }; F6BD639701B3131201A962F7 = { isa = PBXFileReference; name = dom_base.xpt; - path = ../dist/Embed/components/dom_base.xpt; + path = ../../dist/Embed/components/dom_base.xpt; refType = 2; }; F6BD639801B3131201A962F7 = { isa = PBXFileReference; name = dom_core.xpt; - path = ../dist/Embed/components/dom_core.xpt; + path = ../../dist/Embed/components/dom_core.xpt; refType = 2; }; F6BD639901B3131201A962F7 = { isa = PBXFileReference; name = dom_css.xpt; - path = ../dist/Embed/components/dom_css.xpt; + path = ../../dist/Embed/components/dom_css.xpt; refType = 2; }; F6BD639A01B3131201A962F7 = { isa = PBXFileReference; name = dom_events.xpt; - path = ../dist/Embed/components/dom_events.xpt; + path = ../../dist/Embed/components/dom_events.xpt; refType = 2; }; F6BD639B01B3131201A962F7 = { isa = PBXFileReference; name = dom_html.xpt; - path = ../dist/Embed/components/dom_html.xpt; + path = ../../dist/Embed/components/dom_html.xpt; refType = 2; }; F6BD639C01B3131201A962F7 = { isa = PBXFileReference; name = dom_range.xpt; - path = ../dist/Embed/components/dom_range.xpt; + path = ../../dist/Embed/components/dom_range.xpt; refType = 2; }; F6BD639D01B3131201A962F7 = { isa = PBXFileReference; name = dom_stylesheets.xpt; - path = ../dist/Embed/components/dom_stylesheets.xpt; + path = ../../dist/Embed/components/dom_stylesheets.xpt; refType = 2; }; F6BD639E01B3131201A962F7 = { isa = PBXFileReference; name = dom_traversal.xpt; - path = ../dist/Embed/components/dom_traversal.xpt; + path = ../../dist/Embed/components/dom_traversal.xpt; refType = 2; }; F6BD639F01B3131201A962F7 = { isa = PBXFileReference; name = dom_views.xpt; - path = ../dist/Embed/components/dom_views.xpt; + path = ../../dist/Embed/components/dom_views.xpt; refType = 2; }; F6BD63A001B3131201A962F7 = { isa = PBXFileReference; name = dom_xbl.xpt; - path = ../dist/Embed/components/dom_xbl.xpt; + path = ../../dist/Embed/components/dom_xbl.xpt; refType = 2; }; F6BD63A101B3131201A962F7 = { isa = PBXFileReference; name = dom_xul.xpt; - path = ../dist/Embed/components/dom_xul.xpt; + path = ../../dist/Embed/components/dom_xul.xpt; refType = 2; }; F6BD63A201B3131201A962F7 = { isa = PBXFileReference; name = dom.xpt; - path = ../dist/Embed/components/dom.xpt; + path = ../../dist/Embed/components/dom.xpt; refType = 2; }; F6BD63A401B3131201A962F7 = { isa = PBXFileReference; name = gfx.xpt; - path = ../dist/Embed/components/gfx.xpt; + path = ../../dist/Embed/components/gfx.xpt; refType = 2; }; F6BD63A501B3131201A962F7 = { isa = PBXFileReference; name = gfx2.xpt; - path = ../dist/Embed/components/gfx2.xpt; + path = ../../dist/Embed/components/gfx2.xpt; refType = 2; }; F6BD63A601B3131201A962F7 = { isa = PBXFileReference; name = libcaps.dylib; - path = ../dist/Embed/components/libcaps.dylib; + path = ../../dist/Embed/components/libcaps.dylib; refType = 2; }; F6BD63A701B3131201A962F7 = { isa = PBXFileReference; name = libchrome.dylib; - path = ../dist/Embed/components/libchrome.dylib; + path = ../../dist/Embed/components/libchrome.dylib; refType = 2; }; F6BD63A801B3131201A962F7 = { isa = PBXFileReference; name = libcookie.dylib; - path = ../dist/Embed/components/libcookie.dylib; + path = ../../dist/Embed/components/libcookie.dylib; refType = 2; }; F6BD63A901B3131201A962F7 = { isa = PBXFileReference; name = libdocshell.dylib; - path = ../dist/Embed/components/libdocshell.dylib; + path = ../../dist/Embed/components/libdocshell.dylib; refType = 2; }; F6BD63AA01B3131201A962F7 = { isa = PBXFileReference; name = libeditor.dylib; - path = ../dist/Embed/components/libeditor.dylib; + path = ../../dist/Embed/components/libeditor.dylib; refType = 2; }; F6BD63AB01B3131201A962F7 = { isa = PBXFileReference; name = libembedcomponents.dylib; - path = ../dist/Embed/components/libembedcomponents.dylib; + path = ../../dist/Embed/components/libembedcomponents.dylib; refType = 2; }; F6BD63AC01B3131201A962F7 = { isa = PBXFileReference; name = libgfx_mac.dylib; - path = ../dist/Embed/components/libgfx_mac.dylib; + path = ../../dist/Embed/components/libgfx_mac.dylib; refType = 2; }; F6BD63AD01B3131201A962F7 = { isa = PBXFileReference; name = libgfx2.dylib; - path = ../dist/Embed/components/libgfx2.dylib; + path = ../../dist/Embed/components/libgfx2.dylib; refType = 2; }; F6BD63B001B3131201A962F7 = { isa = PBXFileReference; name = libtxtsvc.dylib; - path = ../dist/Embed/components/libtxtsvc.dylib; + path = ../../dist/Embed/components/libtxtsvc.dylib; refType = 2; }; F6BD63B101B3131201A962F7 = { isa = PBXFileReference; name = libwebbrwsr.dylib; - path = ../dist/Embed/components/libwebbrwsr.dylib; + path = ../../dist/Embed/components/libwebbrwsr.dylib; refType = 2; }; F6BD63B201B3131201A962F7 = { isa = PBXFileReference; name = mimetype.xpt; - path = ../netwerk/mime/public/_xpidlgen/mimetype.xpt; + path = ../../netwerk/mime/public/_xpidlgen/mimetype.xpt; refType = 2; }; F6BD63B301B3131201A962F7 = { isa = PBXFileReference; name = txtsvc.xpt; - path = ../dist/Embed/components/txtsvc.xpt; + path = ../../dist/Embed/components/txtsvc.xpt; refType = 2; }; F6BD63B401B3131201A962F7 = { isa = PBXFileReference; name = webBrowser_core.xpt; - path = ../dist/Embed/components/webBrowser_core.xpt; + path = ../../dist/Embed/components/webBrowser_core.xpt; refType = 2; }; F6BD63B501B3131201A962F7 = { isa = PBXFileReference; name = windowwatcher.xpt; - path = ../dist/Embed/components/windowwatcher.xpt; + path = ../../dist/Embed/components/windowwatcher.xpt; refType = 2; }; F6BD63D901B313EE01A962F7 = { isa = PBXFileReference; name = content_base.xpt; - path = ../dist/Embed/components/content_base.xpt; + path = ../../dist/Embed/components/content_base.xpt; refType = 2; }; F6BD63DA01B313EE01A962F7 = { isa = PBXFileReference; name = jar.xpt; - path = ../dist/Embed/components/jar.xpt; + path = ../../dist/Embed/components/jar.xpt; refType = 2; }; F6BD63DB01B313EE01A962F7 = { isa = PBXFileReference; name = jsurl.xpt; - path = ../dist/Embed/components/jsurl.xpt; + path = ../../dist/Embed/components/jsurl.xpt; refType = 2; }; F6BD63DC01B313EE01A962F7 = { isa = PBXFileReference; name = layout_base.xpt; - path = ../dist/Embed/components/layout_base.xpt; + path = ../../dist/Embed/components/layout_base.xpt; refType = 2; }; F6BD63DD01B313EE01A962F7 = { isa = PBXFileReference; name = layout_xul.xpt; - path = ../dist/Embed/components/layout_xul.xpt; + path = ../../dist/Embed/components/layout_xul.xpt; refType = 2; }; F6BD63DE01B313EE01A962F7 = { isa = PBXFileReference; name = libgkcontent.dylib; - path = ../dist/Embed/components/libgkcontent.dylib; + path = ../../dist/Embed/components/libgkcontent.dylib; refType = 2; }; F6BD63DF01B313EE01A962F7 = { isa = PBXFileReference; name = libgklayout.dylib; - path = ../dist/Embed/components/libgklayout.dylib; + path = ../../dist/Embed/components/libgklayout.dylib; refType = 2; }; F6BD63E001B313EE01A962F7 = { isa = PBXFileReference; name = libgkview.dylib; - path = ../dist/Embed/components/libgkview.dylib; + path = ../../dist/Embed/components/libgkview.dylib; refType = 2; }; F6BD63E101B313EE01A962F7 = { isa = PBXFileReference; name = libhtmlpars.dylib; - path = ../dist/Embed/components/libhtmlpars.dylib; + path = ../../dist/Embed/components/libhtmlpars.dylib; refType = 2; }; F6BD63E201B313EE01A962F7 = { isa = PBXFileReference; name = libjar50.dylib; - path = ../dist/Embed/components/libjar50.dylib; + path = ../../dist/Embed/components/libjar50.dylib; refType = 2; }; F6BD63E301B313EE01A962F7 = { isa = PBXFileReference; name = libjsurl.dylib; - path = ../dist/Embed/components/libjsurl.dylib; + path = ../../dist/Embed/components/libjsurl.dylib; refType = 2; }; F6BD63E401B313EE01A962F7 = { isa = PBXFileReference; name = libnecko.dylib; - path = ../dist/Embed/components/libnecko.dylib; + path = ../../dist/Embed/components/libnecko.dylib; refType = 2; }; F6BD63E501B313EE01A962F7 = { isa = PBXFileReference; name = libnecko2.dylib; - path = ../dist/Embed/components/libnecko2.dylib; + path = ../../dist/Embed/components/libnecko2.dylib; refType = 2; }; F6BD63E601B313EE01A962F7 = { isa = PBXFileReference; name = necko_about.xpt; - path = ../dist/Embed/components/necko_about.xpt; + path = ../../dist/Embed/components/necko_about.xpt; refType = 2; }; F6BD63E701B313EE01A962F7 = { isa = PBXFileReference; name = necko_cache.xpt; - path = ../dist/Embed/components/necko_cache.xpt; + path = ../../dist/Embed/components/necko_cache.xpt; refType = 2; }; F6BD63E801B313EE01A962F7 = { isa = PBXFileReference; name = necko_data.xpt; - path = ../dist/Embed/components/necko_data.xpt; + path = ../../dist/Embed/components/necko_data.xpt; refType = 2; }; F6BD63E901B313EE01A962F7 = { isa = PBXFileReference; name = necko_dns.xpt; - path = ../dist/Embed/components/necko_dns.xpt; + path = ../../dist/Embed/components/necko_dns.xpt; refType = 2; }; F6BD63EA01B313EE01A962F7 = { isa = PBXFileReference; name = necko_ftp.xpt; - path = ../dist/Embed/components/necko_ftp.xpt; + path = ../../dist/Embed/components/necko_ftp.xpt; refType = 2; }; F6BD63EB01B313EE01A962F7 = { isa = PBXFileReference; name = necko_http.xpt; - path = ../dist/Embed/components/necko_http.xpt; + path = ../../dist/Embed/components/necko_http.xpt; refType = 2; }; F6BD63EC01B313EE01A962F7 = { isa = PBXFileReference; name = necko_jar.xpt; - path = ../dist/Embed/components/necko_jar.xpt; + path = ../../dist/Embed/components/necko_jar.xpt; refType = 2; }; F6BD63ED01B313EE01A962F7 = { isa = PBXFileReference; name = necko_res.xpt; - path = ../dist/Embed/components/necko_res.xpt; + path = ../../dist/Embed/components/necko_res.xpt; refType = 2; }; F6BD63EE01B313EE01A962F7 = { isa = PBXFileReference; name = necko_socket.xpt; - path = ../netwerk/socket/base/_xpidlgen/necko_socket.xpt; + path = ../../netwerk/socket/base/_xpidlgen/necko_socket.xpt; refType = 2; }; F6BD63EF01B313EE01A962F7 = { isa = PBXFileReference; name = necko_strconv.xpt; - path = ../dist/Embed/components/necko_strconv.xpt; + path = ../../dist/Embed/components/necko_strconv.xpt; refType = 2; }; F6BD63F001B313EE01A962F7 = { isa = PBXFileReference; name = necko_viewsource.xpt; - path = ../netwerk/protocol/viewsource/public/_xpidlgen/necko_viewsource.xpt; + path = ../../netwerk/protocol/viewsource/public/_xpidlgen/necko_viewsource.xpt; refType = 2; }; F6BD63F101B313EE01A962F7 = { isa = PBXFileReference; name = necko.xpt; - path = ../dist/Embed/components/necko.xpt; + path = ../../dist/Embed/components/necko.xpt; refType = 2; }; F6BD640B01B3156701A962F7 = { isa = PBXFileReference; name = libchardet.dylib; - path = ../dist/Embed/components/libchardet.dylib; + path = ../../dist/Embed/components/libchardet.dylib; refType = 2; }; F6BD640C01B3156701A962F7 = { isa = PBXFileReference; name = libimggif.dylib; - path = ../dist/Embed/components/libimggif.dylib; + path = ../../dist/Embed/components/libimggif.dylib; refType = 2; }; F6BD640D01B3156701A962F7 = { isa = PBXFileReference; name = libimgjpeg.dylib; - path = ../dist/Embed/components/libimgjpeg.dylib; + path = ../../dist/Embed/components/libimgjpeg.dylib; refType = 2; }; F6BD640E01B3156701A962F7 = { isa = PBXFileReference; name = libimglib2.dylib; - path = ../dist/Embed/components/libimglib2.dylib; + path = ../../dist/Embed/components/libimglib2.dylib; refType = 2; }; F6BD640F01B3156701A962F7 = { isa = PBXFileReference; name = libimgpng.dylib; - path = ../dist/Embed/components/libimgpng.dylib; + path = ../../dist/Embed/components/libimgpng.dylib; refType = 2; }; F6BD641001B3156701A962F7 = { isa = PBXFileReference; name = liblwbrk.dylib; - path = ../dist/Embed/components/liblwbrk.dylib; + path = ../../dist/Embed/components/liblwbrk.dylib; refType = 2; }; F6BD641101B3156701A962F7 = { isa = PBXFileReference; name = libnslocale.dylib; - path = ../dist/Embed/components/libnslocale.dylib; + path = ../../dist/Embed/components/libnslocale.dylib; refType = 2; }; F6BD641201B3156701A962F7 = { isa = PBXFileReference; name = libpref.dylib; - path = ../dist/Embed/components/libpref.dylib; + path = ../../dist/Embed/components/libpref.dylib; refType = 2; }; F6BD641301B3156701A962F7 = { isa = PBXFileReference; name = libprofile.dylib; - path = ../dist/Embed/components/libprofile.dylib; + path = ../../dist/Embed/components/libprofile.dylib; refType = 2; }; F6BD641401B3156701A962F7 = { isa = PBXFileReference; name = librdf.dylib; - path = ../dist/Embed/components/librdf.dylib; + path = ../../dist/Embed/components/librdf.dylib; refType = 2; }; F6BD641501B3156701A962F7 = { isa = PBXFileReference; name = libshistory.dylib; - path = ../dist/Embed/components/libshistory.dylib; + path = ../../dist/Embed/components/libshistory.dylib; refType = 2; }; F6BD641601B3156701A962F7 = { isa = PBXFileReference; name = libstrres.dylib; - path = ../dist/Embed/components/libstrres.dylib; + path = ../../dist/Embed/components/libstrres.dylib; refType = 2; }; F6BD641701B3156701A962F7 = { isa = PBXFileReference; name = libuconv.dylib; - path = ../dist/Embed/components/libuconv.dylib; + path = ../../dist/Embed/components/libuconv.dylib; refType = 2; }; F6BD641801B3156701A962F7 = { isa = PBXFileReference; name = libucvlatin.dylib; - path = ../dist/Embed/components/libucvlatin.dylib; + path = ../../dist/Embed/components/libucvlatin.dylib; refType = 2; }; F6BD641901B3156701A962F7 = { isa = PBXFileReference; name = libunicharutil.dylib; - path = ../dist/Embed/components/libunicharutil.dylib; + path = ../../dist/Embed/components/libunicharutil.dylib; refType = 2; }; F6BD641A01B3156701A962F7 = { isa = PBXFileReference; name = liburiloader.dylib; - path = ../dist/Embed/components/liburiloader.dylib; + path = ../../dist/Embed/components/liburiloader.dylib; refType = 2; }; F6BD641B01B3156701A962F7 = { isa = PBXFileReference; name = libwidget_mac.dylib; - path = ../dist/Embed/components/libwidget_mac.dylib; + path = ../../dist/Embed/components/libwidget_mac.dylib; refType = 2; }; F6BD641C01B3156701A962F7 = { isa = PBXFileReference; name = libxpconnect.dylib; - path = ../dist/Embed/components/libxpconnect.dylib; + path = ../../dist/Embed/components/libxpconnect.dylib; refType = 2; }; F6BD641D01B3156701A962F7 = { isa = PBXFileReference; name = pref.xpt; - path = ../dist/Embed/components/pref.xpt; + path = ../../dist/Embed/components/pref.xpt; refType = 2; }; F6BD641E01B3156701A962F7 = { isa = PBXFileReference; name = profile.xpt; - path = ../dist/Embed/components/profile.xpt; + path = ../../dist/Embed/components/profile.xpt; refType = 2; }; F6BD641F01B3156701A962F7 = { isa = PBXFileReference; name = rdf.xpt; - path = ../dist/Embed/components/rdf.xpt; + path = ../../dist/Embed/components/rdf.xpt; refType = 2; }; F6BD642001B3156701A962F7 = { isa = PBXFileReference; name = shistory.xpt; - path = ../dist/Embed/components/shistory.xpt; + path = ../../dist/Embed/components/shistory.xpt; refType = 2; }; F6BD642101B3156701A962F7 = { isa = PBXFileReference; name = uconv.xpt; - path = ../dist/Embed/components/uconv.xpt; + path = ../../dist/Embed/components/uconv.xpt; refType = 2; }; F6BD642201B3156701A962F7 = { isa = PBXFileReference; name = unicharutil.xpt; - path = ../dist/Embed/components/unicharutil.xpt; + path = ../../dist/Embed/components/unicharutil.xpt; refType = 2; }; F6BD642301B3156701A962F7 = { isa = PBXFileReference; name = uriloader.xpt; - path = ../dist/Embed/components/uriloader.xpt; + path = ../../dist/Embed/components/uriloader.xpt; refType = 2; }; F6BD642501B3156701A962F7 = { isa = PBXFileReference; name = xpcom_base.xpt; - path = ../dist/Embed/components/xpcom_base.xpt; + path = ../../dist/Embed/components/xpcom_base.xpt; refType = 2; }; F6BD642601B3156701A962F7 = { isa = PBXFileReference; name = xpcom_components.xpt; - path = ../dist/Embed/components/xpcom_components.xpt; + path = ../../dist/Embed/components/xpcom_components.xpt; refType = 2; }; F6BD642701B3156701A962F7 = { isa = PBXFileReference; name = xpcom_ds.xpt; - path = ../dist/Embed/components/xpcom_ds.xpt; + path = ../../dist/Embed/components/xpcom_ds.xpt; refType = 2; }; F6BD642801B3156701A962F7 = { isa = PBXFileReference; name = xpcom_io.xpt; - path = ../dist/Embed/components/xpcom_io.xpt; + path = ../../dist/Embed/components/xpcom_io.xpt; refType = 2; }; F6BD642901B3156701A962F7 = { isa = PBXFileReference; name = xpcom_threads.xpt; - path = ../dist/Embed/components/xpcom_threads.xpt; + path = ../../dist/Embed/components/xpcom_threads.xpt; refType = 2; }; F6BD642A01B3156701A962F7 = { isa = PBXFileReference; name = xpcom_xpti.xpt; - path = ../dist/Embed/components/xpcom_xpti.xpt; + path = ../../dist/Embed/components/xpcom_xpti.xpt; refType = 2; }; F6BD642B01B3156701A962F7 = { isa = PBXFileReference; name = xpconnect.xpt; - path = ../dist/Embed/components/xpconnect.xpt; + path = ../../dist/Embed/components/xpconnect.xpt; refType = 2; }; F6BD644D01B315FA01A962F7 = { isa = PBXFileReference; name = embed_base.xpt; - path = ../embedding/base/_xpidlgen/embed_base.xpt; + path = ../../embedding/base/_xpidlgen/embed_base.xpt; refType = 2; }; F6BD644E01B315FA01A962F7 = { isa = PBXFileReference; name = imglib2.xpt; - path = ../dist/Embed/components/imglib2.xpt; + path = ../../dist/Embed/components/imglib2.xpt; refType = 2; }; F6BD644F01B315FA01A962F7 = { isa = PBXFileReference; name = libgkplugin.dylib; - path = ../modules/plugin/base/src/libgkplugin.dylib; + path = ../../modules/plugin/base/src/libgkplugin.dylib; refType = 2; }; F6BD645001B315FA01A962F7 = { isa = PBXFileReference; name = libjsdom.dylib; - path = ../dist/Embed/components/libjsdom.dylib; + path = ../../dist/Embed/components/libjsdom.dylib; refType = 2; }; F6BD645501B3167601A962F7 = { @@ -9552,31 +9468,31 @@ F6BD64B801B316DA01A962F7 = { isa = PBXFileReference; name = charsetalias.properties; - path = ../dist/Embed/res/charsetalias.properties; + path = ../../dist/Embed/res/charsetalias.properties; refType = 2; }; F6BD64B901B316DA01A962F7 = { isa = PBXFileReference; name = charsetData.properties; - path = ../dist/Embed/res/charsetData.properties; + path = ../../dist/Embed/res/charsetData.properties; refType = 2; }; F6BD64BA01B316DA01A962F7 = { isa = PBXFileReference; name = langGroups.properties; - path = ../dist/Embed/res/langGroups.properties; + path = ../../dist/Embed/res/langGroups.properties; refType = 2; }; F6BD64BB01B316DA01A962F7 = { isa = PBXFileReference; name = language.properties; - path = ../dist/Embed/res/language.properties; + path = ../../dist/Embed/res/language.properties; refType = 2; }; F6BD64BC01B316DA01A962F7 = { isa = PBXFileReference; name = unixcharset.properties; - path = ../dist/Embed/res/unixcharset.properties; + path = ../../dist/Embed/res/unixcharset.properties; refType = 2; }; F6BD64C201B316DA01A962F7 = { @@ -9612,7 +9528,7 @@ F6BD64C701B3172601A962F7 = { isa = PBXFileReference; name = arrow.gif; - path = ../dist/Embed/res/arrow.gif; + path = ../../dist/Embed/res/arrow.gif; refType = 2; }; F6BD64C801B3172601A962F7 = { @@ -9628,13 +9544,13 @@ F6BD64D301B3172601A962F7 = { isa = PBXFileReference; name = htmlBindings.xml; - path = ../dist/Embed/res/builtin/htmlBindings.xml; + path = ../../dist/Embed/res/builtin/htmlBindings.xml; refType = 2; }; F6BD64D501B3172601A962F7 = { isa = PBXFileReference; name = platformHTMLBindings.xml; - path = ../dist/Embed/res/builtin/platformHTMLBindings.xml; + path = ../../dist/Embed/res/builtin/platformHTMLBindings.xml; refType = 2; }; F6BD64D701B3172601A962F7 = { @@ -9653,61 +9569,61 @@ F6BD64D801B3172601A962F7 = { isa = PBXFileReference; name = html40Latin1.properties; - path = ../dist/Embed/res/entityTables/html40Latin1.properties; + path = ../../dist/Embed/res/entityTables/html40Latin1.properties; refType = 2; }; F6BD64D901B3172601A962F7 = { isa = PBXFileReference; name = html40Special.properties; - path = ../dist/Embed/res/entityTables/html40Special.properties; + path = ../../dist/Embed/res/entityTables/html40Special.properties; refType = 2; }; F6BD64DA01B3172601A962F7 = { isa = PBXFileReference; name = html40Symbols.properties; - path = ../dist/Embed/res/entityTables/html40Symbols.properties; + path = ../../dist/Embed/res/entityTables/html40Symbols.properties; refType = 2; }; F6BD64DB01B3172601A962F7 = { isa = PBXFileReference; name = htmlEntityVersions.properties; - path = ../dist/Embed/res/entityTables/htmlEntityVersions.properties; + path = ../../dist/Embed/res/entityTables/htmlEntityVersions.properties; refType = 2; }; F6BD64DC01B3172601A962F7 = { isa = PBXFileReference; name = transliterate.properties; - path = ../dist/Embed/res/entityTables/transliterate.properties; + path = ../../dist/Embed/res/entityTables/transliterate.properties; refType = 2; }; F6BD64DD01B3172601A962F7 = { isa = PBXFileReference; name = forms.css; - path = ../dist/Embed/res/forms.css; + path = ../../dist/Embed/res/forms.css; refType = 2; }; F6BD64DE01B3172601A962F7 = { isa = PBXFileReference; name = html.css; - path = ../dist/Embed/res/html.css; + path = ../../dist/Embed/res/html.css; refType = 2; }; F6BD64DF01B3172601A962F7 = { isa = PBXFileReference; name = quirk.css; - path = ../dist/Embed/res/quirk.css; + path = ../../dist/Embed/res/quirk.css; refType = 2; }; F6BD64E001B3172601A962F7 = { isa = PBXFileReference; name = ua.css; - path = ../dist/Embed/res/ua.css; + path = ../../dist/Embed/res/ua.css; refType = 2; }; F6BD64E101B3172601A962F7 = { isa = PBXFileReference; name = viewsource.css; - path = ../dist/Embed/res/viewsource.css; + path = ../../dist/Embed/res/viewsource.css; refType = 2; }; F6BD64FB01B3184301A962F7 = { @@ -9726,7 +9642,7 @@ F6BD64FC01B3184301A962F7 = { isa = PBXFileReference; name = all.js; - path = ../dist/Embed/defaults/pref/all.js; + path = ../../dist/Embed/defaults/pref/all.js; refType = 2; }; F6BD64FF01B3184301A962F7 = { @@ -9743,7 +9659,7 @@ F6BD650001B3184301A962F7 = { isa = PBXFileReference; name = embed.jar; - path = ../dist/Embed/chrome/embed.jar; + path = ../../dist/Embed/chrome/embed.jar; refType = 2; }; F6BD650401B3184301A962F7 = { diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib index 8802bdedcfd..9d9409b58ee 100644 --- a/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib +++ b/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib @@ -1,5 +1,13 @@ { IBClasses = ( + {CLASS = AutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + { + ACTIONS = {onBlur = id; onResize = id; }; + CLASS = AutoCompleteTextField; + LANGUAGE = ObjC; + OUTLETS = {mProxyIcon = PageProxyIcon; }; + SUPERCLASS = NSTextField; + }, {CLASS = BookmarkItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { ACTIONS = { @@ -20,6 +28,11 @@ }; SUPERCLASS = NSObject; }, + { + CLASS = BookmarksOutlineView; + LANGUAGE = ObjC; + SUPERCLASS = ExtendedOutlineView; + }, {CLASS = BookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = BrowserTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, { @@ -65,7 +78,7 @@ mBackItem = NSMenuItem; mCachedBMDS = id; mForwardItem = NSMenuItem; - mHistoryDataSource = CHHistoryDataSource; + mHistoryDataSource = HistoryDataSource; mImageLinkMenu = NSMenu; mImageMenu = NSMenu; mInputMenu = NSMenu; @@ -75,7 +88,7 @@ mLocationToolbarView = NSView; mLock = NSImageView; mPageMenu = NSMenu; - mPersonalToolbar = CHBookmarksToolbar; + mPersonalToolbar = BookmarksToolbar; mProgress = NSProgressIndicator; mProxyIcon = NSImageView; mSidebarBookmarksDataSource = BookmarksDataSource; @@ -85,28 +98,14 @@ mSidebarTabView = NSTabView; mStatus = NSTextField; mStatusBar = NSView; - mTabBrowser = CHExtendedTabView; + mTabBrowser = BrowserTabView; mURLBar = NSTextField; }; SUPERCLASS = NSWindowController; }, - {CLASS = CHAutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {onBlur = id; onResize = id; }; - CLASS = CHAutoCompleteTextField; - LANGUAGE = ObjC; - OUTLETS = {mProxyIcon = CHPageProxyIcon; }; - SUPERCLASS = NSTextField; - }, - { - CLASS = CHBookmarksOutlineView; - LANGUAGE = ObjC; - SUPERCLASS = CHExtendedOutlineView; - }, - {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { ACTIONS = {load = id; }; - CLASS = CHBrowserWrapper; + CLASS = BrowserWrapper; LANGUAGE = ObjC; OUTLETS = { mLockIcon = id; @@ -118,43 +117,23 @@ }; SUPERCLASS = NSView; }, - {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, + {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - CLASS = CHHistoryDataSource; + CLASS = HistoryDataSource; LANGUAGE = ObjC; OUTLETS = {mBrowserWindowController = id; }; - SUPERCLASS = CHRDFOutlineViewDataSource; + SUPERCLASS = RDFOutlineViewDataSource; }, - {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = CHPageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, + {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + {CLASS = MainController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = PageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, { - CLASS = CHRDFOutlineViewDataSource; + CLASS = RDFOutlineViewDataSource; LANGUAGE = ObjC; OUTLETS = {mOutlineView = id; }; SUPERCLASS = NSObject; }, - {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = MainController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {load = id; }; - CLASS = MyBrowserView; - LANGUAGE = ObjC; - OUTLETS = { - mImageLinkMenu = id; - mImageMenu = id; - mInputMenu = id; - mLinkMenu = id; - mPageMenu = id; - mWindowController = id; - progress = id; - progressSuper = id; - status = id; - urlbar = id; - }; - SUPERCLASS = NSView; - }, {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib index 667fcc69e64..82fa1b33249 100644 --- a/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 176 79 632 495 0 0 1280 1002 + 208 152 630 599 0 0 1280 1002 IBEditorPositions 124 @@ -39,11 +39,7 @@ 4 IBLockedObjects - IBOpenObjects - - 10 - IBSystem Version - 5S60 + 5S66 diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/objects.nib index d775c7ae2dba6c102cff6d416dc9fb80155a79f1..9fb6b7c29592f028f0572eb0cfdd7cbd63aa02f3 100644 GIT binary patch literal 14664 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 MmqPtI{d>Uw2gQS!I{*Lx diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib index fae3aa7579e..f4d1aa2760b 100644 --- a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib @@ -5,8 +5,8 @@ LANGUAGE = ObjC; SUPERCLASS = ToolbarController; }, - {CLASS = CHGoMenu; LANGUAGE = ObjC; SUPERCLASS = NSMenu; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = GoMenu; LANGUAGE = ObjC; SUPERCLASS = NSMenu; }, { ACTIONS = { addBookmark = id; diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib index 3eb3a4600a89cc048d32ccdf7e6149915a22fdac..2ad295b96c9eaffb8916ee5ee27d5b421113d191 100644 GIT binary patch literal 9928 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 VrmmeGPQ)=gQ)b*ch?99f|NrKi=ym`A literal 9885 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 B;&}i7 diff --git a/mozilla/chimera/PreferencePanes/Navigation/Navigation.mm b/mozilla/chimera/PreferencePanes/Navigation/Navigation.mm index f1b026b77be..c6a91c2c96e 100644 --- a/mozilla/chimera/PreferencePanes/Navigation/Navigation.mm +++ b/mozilla/chimera/PreferencePanes/Navigation/Navigation.mm @@ -184,7 +184,7 @@ const int kDefaultExpireDays = 9; ICInstance icInstance = NULL; OSStatus error; - // it would be nice to use CHPreferenceManager, but I don't want to drag + // it would be nice to use PreferenceManager, but I don't want to drag // all that code into the plugin error = ICStart(&icInstance, 'CHIM'); if (error != noErr) { diff --git a/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.mm b/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.mm index 1b24b39d550..b85903fa8dd 100644 --- a/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.mm +++ b/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.mm @@ -26,7 +26,7 @@ // Hookup cookie prefs. Relies on the tags of the radio buttons in the matrix being // set such that "enable all" is 0 and "disable all" is 2. If mozilla has other prefs - // that we don't quite know about, we assume they were remapped by the CHPreferenceManager + // that we don't quite know about, we assume they were remapped by the PreferenceManager // at startup. PRInt32 acceptCookies = 0; mPrefService->GetIntPref("network.cookie.cookieBehavior", &acceptCookies); diff --git a/mozilla/chimera/resources/application/Navigator.scriptSuite b/mozilla/chimera/resources/application/Navigator.scriptSuite index 6d790279fd3..d4fadc53ea5 100644 --- a/mozilla/chimera/resources/application/Navigator.scriptSuite +++ b/mozilla/chimera/resources/application/Navigator.scriptSuite @@ -13,7 +13,7 @@ AppleEventCode GURL CommandClass - CHGetURLCommand + GetURLCommand OpenURL @@ -22,7 +22,7 @@ AppleEventCode OURL CommandClass - CHGetURLCommand + GetURLCommand Name diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib index 8802bdedcfd..9d9409b58ee 100644 --- a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib +++ b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib @@ -1,5 +1,13 @@ { IBClasses = ( + {CLASS = AutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + { + ACTIONS = {onBlur = id; onResize = id; }; + CLASS = AutoCompleteTextField; + LANGUAGE = ObjC; + OUTLETS = {mProxyIcon = PageProxyIcon; }; + SUPERCLASS = NSTextField; + }, {CLASS = BookmarkItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { ACTIONS = { @@ -20,6 +28,11 @@ }; SUPERCLASS = NSObject; }, + { + CLASS = BookmarksOutlineView; + LANGUAGE = ObjC; + SUPERCLASS = ExtendedOutlineView; + }, {CLASS = BookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = BrowserTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, { @@ -65,7 +78,7 @@ mBackItem = NSMenuItem; mCachedBMDS = id; mForwardItem = NSMenuItem; - mHistoryDataSource = CHHistoryDataSource; + mHistoryDataSource = HistoryDataSource; mImageLinkMenu = NSMenu; mImageMenu = NSMenu; mInputMenu = NSMenu; @@ -75,7 +88,7 @@ mLocationToolbarView = NSView; mLock = NSImageView; mPageMenu = NSMenu; - mPersonalToolbar = CHBookmarksToolbar; + mPersonalToolbar = BookmarksToolbar; mProgress = NSProgressIndicator; mProxyIcon = NSImageView; mSidebarBookmarksDataSource = BookmarksDataSource; @@ -85,28 +98,14 @@ mSidebarTabView = NSTabView; mStatus = NSTextField; mStatusBar = NSView; - mTabBrowser = CHExtendedTabView; + mTabBrowser = BrowserTabView; mURLBar = NSTextField; }; SUPERCLASS = NSWindowController; }, - {CLASS = CHAutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {onBlur = id; onResize = id; }; - CLASS = CHAutoCompleteTextField; - LANGUAGE = ObjC; - OUTLETS = {mProxyIcon = CHPageProxyIcon; }; - SUPERCLASS = NSTextField; - }, - { - CLASS = CHBookmarksOutlineView; - LANGUAGE = ObjC; - SUPERCLASS = CHExtendedOutlineView; - }, - {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { ACTIONS = {load = id; }; - CLASS = CHBrowserWrapper; + CLASS = BrowserWrapper; LANGUAGE = ObjC; OUTLETS = { mLockIcon = id; @@ -118,43 +117,23 @@ }; SUPERCLASS = NSView; }, - {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, + {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - CLASS = CHHistoryDataSource; + CLASS = HistoryDataSource; LANGUAGE = ObjC; OUTLETS = {mBrowserWindowController = id; }; - SUPERCLASS = CHRDFOutlineViewDataSource; + SUPERCLASS = RDFOutlineViewDataSource; }, - {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = CHPageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, + {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + {CLASS = MainController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = PageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, { - CLASS = CHRDFOutlineViewDataSource; + CLASS = RDFOutlineViewDataSource; LANGUAGE = ObjC; OUTLETS = {mOutlineView = id; }; SUPERCLASS = NSObject; }, - {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = MainController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {load = id; }; - CLASS = MyBrowserView; - LANGUAGE = ObjC; - OUTLETS = { - mImageLinkMenu = id; - mImageMenu = id; - mInputMenu = id; - mLinkMenu = id; - mPageMenu = id; - mWindowController = id; - progress = id; - progressSuper = id; - status = id; - urlbar = id; - }; - SUPERCLASS = NSView; - }, {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib index 667fcc69e64..82fa1b33249 100644 --- a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 176 79 632 495 0 0 1280 1002 + 208 152 630 599 0 0 1280 1002 IBEditorPositions 124 @@ -39,11 +39,7 @@ 4 IBLockedObjects - IBOpenObjects - - 10 - IBSystem Version - 5S60 + 5S66 diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index d775c7ae2dba6c102cff6d416dc9fb80155a79f1..9fb6b7c29592f028f0572eb0cfdd7cbd63aa02f3 100644 GIT binary patch literal 14664 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 MmqPtI{d>Uw2gQS!I{*Lx diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib index fae3aa7579e..f4d1aa2760b 100644 --- a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib @@ -5,8 +5,8 @@ LANGUAGE = ObjC; SUPERCLASS = ToolbarController; }, - {CLASS = CHGoMenu; LANGUAGE = ObjC; SUPERCLASS = NSMenu; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = GoMenu; LANGUAGE = ObjC; SUPERCLASS = NSMenu; }, { ACTIONS = { addBookmark = id; diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib index 3eb3a4600a89cc048d32ccdf7e6149915a22fdac..2ad295b96c9eaffb8916ee5ee27d5b421113d191 100644 GIT binary patch literal 9928 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 VrmmeGPQ)=gQ)b*ch?99f|NrKi=ym`A literal 9885 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 B;&}i7 diff --git a/mozilla/chimera/src/appleevents/GetURLCommand.h b/mozilla/chimera/src/appleevents/GetURLCommand.h index b5f907bfcb2..e00e65b6674 100644 --- a/mozilla/chimera/src/appleevents/GetURLCommand.h +++ b/mozilla/chimera/src/appleevents/GetURLCommand.h @@ -23,7 +23,7 @@ #import -@interface CHGetURLCommand : NSScriptCommand {} +@interface GetURLCommand : NSScriptCommand {} - (id)performDefaultImplementation; diff --git a/mozilla/chimera/src/appleevents/GetURLCommand.mm b/mozilla/chimera/src/appleevents/GetURLCommand.mm index 6c4558ea2fb..5e452527ac5 100644 --- a/mozilla/chimera/src/appleevents/GetURLCommand.mm +++ b/mozilla/chimera/src/appleevents/GetURLCommand.mm @@ -21,12 +21,12 @@ * David Hyatt (Original Author) */ -#import "CHGetURLCommand.h" +#import "GetURLCommand.h" #import #import "MainController.h" -@implementation CHGetURLCommand +@implementation GetURLCommand - (id)performDefaultImplementation { diff --git a/mozilla/chimera/src/application/AboutBox.h b/mozilla/chimera/src/application/AboutBox.h index 2068306e703..20990f387ae 100644 --- a/mozilla/chimera/src/application/AboutBox.h +++ b/mozilla/chimera/src/application/AboutBox.h @@ -38,7 +38,7 @@ #include -@interface CHAboutBox : NSObject +@interface AboutBox : NSObject { IBOutlet NSTextView* creditsField; IBOutlet NSTextField* buildNumberField; @@ -50,7 +50,7 @@ BOOL restartAtTop; } -+ (CHAboutBox *)sharedInstance; ++ (AboutBox *)sharedInstance; - (IBAction)showPanel:(id)sender; @end diff --git a/mozilla/chimera/src/application/AboutBox.m b/mozilla/chimera/src/application/AboutBox.m index ec983bb4c99..be381c08373 100644 --- a/mozilla/chimera/src/application/AboutBox.m +++ b/mozilla/chimera/src/application/AboutBox.m @@ -37,19 +37,19 @@ * * ***** END LICENSE BLOCK ***** */ -#import "CHAboutBox.h" +#import "AboutBox.h" #include "nsBuildID.h" -@interface CHAboutBox(Private) +@interface AboutBox(Private) - (void)loadWindow; @end -@implementation CHAboutBox +@implementation AboutBox -static CHAboutBox *sharedInstance = nil; +static AboutBox *sharedInstance = nil; -+ (CHAboutBox *)sharedInstance ++ (AboutBox *)sharedInstance { return sharedInstance ? sharedInstance : [[self alloc] init]; } diff --git a/mozilla/chimera/src/application/MainController.h b/mozilla/chimera/src/application/MainController.h index a88c3abbfae..48eee9306f9 100644 --- a/mozilla/chimera/src/application/MainController.h +++ b/mozilla/chimera/src/application/MainController.h @@ -38,9 +38,9 @@ #import #import "BrowserWindowController.h" #import "MVPreferencesController.h" -#import "CHSplashScreenWindow.h" +#import "SplashScreenWindow.h" #import "FindDlgController.h" -#import "CHPreferenceManager.h" +#import "PreferenceManager.h" class BookmarksService; @@ -67,9 +67,9 @@ class BookmarksService; BOOL mOffline; - CHSplashScreenWindow* mSplashScreen; + SplashScreenWindow* mSplashScreen; - CHPreferenceManager* mPreferenceManager; + PreferenceManager* mPreferenceManager; BookmarksService* mMenuBookmarks; @@ -142,7 +142,7 @@ class BookmarksService; - (MVPreferencesController *)preferencesController; - (void)displayPreferencesWindow:sender; -- (CHPreferenceManager *)preferenceManager; +- (PreferenceManager *)preferenceManager; - (BOOL)isMainWindowABrowserWindow; // if the main window is a browser window, return its controller, otherwise nil diff --git a/mozilla/chimera/src/application/MainController.mm b/mozilla/chimera/src/application/MainController.mm index b30ac343a96..1787848f707 100644 --- a/mozilla/chimera/src/application/MainController.mm +++ b/mozilla/chimera/src/application/MainController.mm @@ -41,9 +41,9 @@ #import "MainController.h" #import "BrowserWindowController.h" #import "BookmarksService.h" -#import "nsCocoaBrowserService.h" -#import "CHAboutBox.h" -#import "CHUserDefaults.h" +#import "CHBrowserService.h" +#import "AboutBox.h" +#import "UserDefaults.h" #include "nsCOMPtr.h" #include "nsEmbedAPI.h" @@ -94,7 +94,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; NSString* url = [defaults stringForKey:USER_DEFAULTS_URL_KEY]; mStartURL = url ? [url retain] : nil; - mSplashScreen = [[CHSplashScreenWindow alloc] splashImage:nil withFade:NO withStatusRect:NSMakeRect(0,0,0,0)]; + mSplashScreen = [[SplashScreenWindow alloc] splashImage:nil withFade:NO withStatusRect:NSMakeRect(0,0,0,0)]; mFindDialog = nil; mMenuBookmarks = nil; @@ -170,7 +170,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [mPreferencesController release]; [mPreferenceManager release]; - nsCocoaBrowserService::TermEmbedding(); + CHBrowserService::TermEmbedding(); [self autorelease]; } @@ -556,10 +556,10 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [[browserWindow windowController] manageBookmarks: aSender]; } -- (CHPreferenceManager *)preferenceManager +- (PreferenceManager *)preferenceManager { if (!mPreferenceManager) - mPreferenceManager = [[CHPreferenceManager sharedInstance] retain]; + mPreferenceManager = [[PreferenceManager sharedInstance] retain]; return mPreferenceManager; } @@ -578,7 +578,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; - (IBAction)showAboutBox:(id)sender { - [[CHAboutBox sharedInstance] showPanel:sender]; + [[AboutBox sharedInstance] showPanel:sender]; } - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename diff --git a/mozilla/chimera/src/application/SplashScreenWindow.h b/mozilla/chimera/src/application/SplashScreenWindow.h index df82c005af8..dd5348e54ad 100644 --- a/mozilla/chimera/src/application/SplashScreenWindow.h +++ b/mozilla/chimera/src/application/SplashScreenWindow.h @@ -17,7 +17,7 @@ #import -@interface CHSplashScreenWindow : NSWindow { +@interface SplashScreenWindow : NSWindow { BOOL _fades; BOOL __didFadeIn; int _fadeIndex; diff --git a/mozilla/chimera/src/application/SplashScreenWindow.m b/mozilla/chimera/src/application/SplashScreenWindow.m index 0cac643da15..e3c9a09a1be 100644 --- a/mozilla/chimera/src/application/SplashScreenWindow.m +++ b/mozilla/chimera/src/application/SplashScreenWindow.m @@ -16,16 +16,16 @@ * */ -#import "CHSplashScreenWindow.h" +#import "SplashScreenWindow.h" -@interface CHSplashScreenWindow (Private) +@interface SplashScreenWindow (Private) -(void)fadeIn; -(void)fadeInThread; -(void)fadeOut; -(void)fadeOutThread; @end -@implementation CHSplashScreenWindow +@implementation SplashScreenWindow -(id)splashImage:(NSImage *)splashImage withFade:(BOOL)shouldFade withStatusRect:(NSRect)statusRect { diff --git a/mozilla/chimera/src/bookmarks/BookmarksButton.h b/mozilla/chimera/src/bookmarks/BookmarksButton.h index 27d5623352e..59620995367 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksButton.h +++ b/mozilla/chimera/src/bookmarks/BookmarksButton.h @@ -29,7 +29,7 @@ class BookmarksService; @class BookmarkItem; -@interface CHBookmarksButton : NSButton +@interface BookmarksButton : NSButton { nsIDOMElement* mElement; BookmarkItem* mBookmarkItem; diff --git a/mozilla/chimera/src/bookmarks/BookmarksButton.mm b/mozilla/chimera/src/bookmarks/BookmarksButton.mm index abf785435fd..58ce77cb8e6 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksButton.mm +++ b/mozilla/chimera/src/bookmarks/BookmarksButton.mm @@ -22,7 +22,7 @@ */ #import "NSString+Utils.h" -#import "CHBookmarksButton.h" +#import "BookmarksButton.h" #include "nsCOMPtr.h" #include "nsIContent.h" @@ -37,7 +37,7 @@ #import "BookmarksDataSource.h" #import "BookmarksService.h" -@implementation CHBookmarksButton +@implementation BookmarksButton - (id)initWithFrame:(NSRect)frame { @@ -163,7 +163,7 @@ // Make a copy of the context menu but change it to target us // FIXME - this will stop to work as soon as we add items to the context menu // that have different targets. In that case, we probably should add code to - // CHBookmarksToolbar that manages the context menu for the CHBookmarksButtons. + // BookmarksToolbar that manages the context menu for the CHBookmarksButtons. NSMenu* myMenu = [[[self superview] menu] copy]; [[myMenu itemArray] makeObjectsPerformSelector:@selector(setTarget:) withObject: self]; diff --git a/mozilla/chimera/src/bookmarks/BookmarksDataSource.h b/mozilla/chimera/src/bookmarks/BookmarksDataSource.h index 3b0c373041f..a18f17d7ccd 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksDataSource.h +++ b/mozilla/chimera/src/bookmarks/BookmarksDataSource.h @@ -41,8 +41,8 @@ #import #import "MainController.h" -#import "CHBookmarksToolbar.h" -#import "CHExtendedOutlineView.h" +#import "BookmarksToolbar.h" +#import "ExtendedOutlineView.h" class nsIContent; class BookmarksService; diff --git a/mozilla/chimera/src/bookmarks/BookmarksOutlineView.h b/mozilla/chimera/src/bookmarks/BookmarksOutlineView.h index 2c01061c074..9df77d51119 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksOutlineView.h +++ b/mozilla/chimera/src/bookmarks/BookmarksOutlineView.h @@ -22,9 +22,9 @@ */ #import -#import "CHExtendedOutlineView.h" +#import "ExtendedOutlineView.h" -@interface CHBookmarksOutlineView : CHExtendedOutlineView { +@interface BookmarksOutlineView : ExtendedOutlineView { } diff --git a/mozilla/chimera/src/bookmarks/BookmarksOutlineView.mm b/mozilla/chimera/src/bookmarks/BookmarksOutlineView.mm index f3a8942e9fe..7e1abf3f36e 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksOutlineView.mm +++ b/mozilla/chimera/src/bookmarks/BookmarksOutlineView.mm @@ -21,7 +21,7 @@ * Joe Hewitt (Original Author) */ -#import "CHBookmarksOutlineView.h" +#import "BookmarksOutlineView.h" #import "BookmarksService.h" #import "BookmarksDataSource.h" @@ -30,7 +30,7 @@ #include "nsIContent.h" #include "nsIDOMNode.h" -@implementation CHBookmarksOutlineView +@implementation BookmarksOutlineView - (void)awakeFromNib { diff --git a/mozilla/chimera/src/bookmarks/BookmarksService.h b/mozilla/chimera/src/bookmarks/BookmarksService.h index 411935e2517..a3103091d56 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksService.h +++ b/mozilla/chimera/src/bookmarks/BookmarksService.h @@ -44,8 +44,8 @@ #include "nsVoidArray.h" #import "MainController.h" -#import "CHBookmarksToolbar.h" -#import "CHExtendedOutlineView.h" +#import "BookmarksToolbar.h" +#import "ExtendedOutlineView.h" class nsIAtom; class nsIDOMHTMLDocument; @@ -60,7 +60,7 @@ class BookmarksService { public: BookmarksService(BookmarksDataSource* aDataSource); - BookmarksService(CHBookmarksToolbar* aToolbar); + BookmarksService(BookmarksToolbar* aToolbar); virtual ~BookmarksService(); void AddObserver(); @@ -139,7 +139,7 @@ private: // There are three kinds of bookmarks data sources: // tree views (mDataSource), the personal toolbar (mToolbar) // and menus (gBookmarksMenu). - CHBookmarksToolbar* mToolbar; + BookmarksToolbar* mToolbar; BookmarksDataSource* mDataSource; }; diff --git a/mozilla/chimera/src/bookmarks/BookmarksService.mm b/mozilla/chimera/src/bookmarks/BookmarksService.mm index 2f3b7c8d57a..7825d49c40f 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksService.mm +++ b/mozilla/chimera/src/bookmarks/BookmarksService.mm @@ -37,7 +37,7 @@ #import "NSString+Utils.h" -#import "CHPreferenceManager.h" +#import "PreferenceManager.h" #import "CHBrowserView.h" #import "BookmarksService.h" #import "BookmarksDataSource.h" @@ -132,7 +132,7 @@ BookmarksService::BookmarksService(BookmarksDataSource* aDataSource) mToolbar = nil; } -BookmarksService::BookmarksService(CHBookmarksToolbar* aToolbar) +BookmarksService::BookmarksService(BookmarksToolbar* aToolbar) { mDataSource = nil; mToolbar = aToolbar; @@ -629,7 +629,7 @@ BookmarksService::CreateIconForBookmark(nsIDOMElement* aElement) return [NSImage imageNamed:@"folder"]; // fire off a proxy icon load - if ([[CHPreferenceManager sharedInstance] getBooleanPref:"browser.chrome.site_icons" withSuccess:NULL]) + if ([[PreferenceManager sharedInstance] getBooleanPref:"browser.chrome.site_icons" withSuccess:NULL]) { nsAutoString href; content->GetAttr(kNameSpaceID_None, gHrefAtom, href); @@ -1109,7 +1109,7 @@ BookmarksService::OpenBookmarkGroup(id aTabView, nsIDOMElement* aFolder) // XXX this needs fixing to not max out the number of tabs in a browser window. // See [BrowserWindowController newTabsAllowed]; tabViewItem = [BrowserTabView makeNewTabItem]; - CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: tabViewItem andWindow: [aTabView window]] autorelease]; + BrowserWrapper* newView = [[[BrowserWrapper alloc] initWithTab: tabViewItem andWindow: [aTabView window]] autorelease]; [tabViewItem setLabel: NSLocalizedString(@"UntitledPageTitle", @"")]; [tabViewItem setView: newView]; [aTabView addTabViewItem: tabViewItem]; diff --git a/mozilla/chimera/src/bookmarks/BookmarksToolbar.h b/mozilla/chimera/src/bookmarks/BookmarksToolbar.h index 8f164fdaf8a..4ca6e67bdae 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksToolbar.h +++ b/mozilla/chimera/src/bookmarks/BookmarksToolbar.h @@ -26,13 +26,13 @@ class nsIDOMElement; class BookmarksService; -class CHBookmarksButton; +class BookmarksButton; -@interface CHBookmarksToolbar : NSView +@interface BookmarksToolbar : NSView { BookmarksService* mBookmarks; NSMutableArray* mButtons; - CHBookmarksButton* mDragInsertionButton; + BookmarksButton* mDragInsertionButton; int mDragInsertionPosition; BOOL mIsShowing; } diff --git a/mozilla/chimera/src/bookmarks/BookmarksToolbar.mm b/mozilla/chimera/src/bookmarks/BookmarksToolbar.mm index c65d4d90c18..1cfff2c885e 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksToolbar.mm +++ b/mozilla/chimera/src/bookmarks/BookmarksToolbar.mm @@ -23,19 +23,19 @@ * David Haas */ -#import "CHBookmarksButton.h" -#import "CHBookmarksToolbar.h" +#import "BookmarksButton.h" +#import "BookmarksToolbar.h" #import "BookmarksService.h" #import "BookmarksDataSource.h" #include "nsIDOMElement.h" #include "nsIContent.h" -@interface CHBookmarksToolbar(Private) -- (CHBookmarksButton*)makeNewButtonWithElement:(nsIDOMElement*)element; +@interface BookmarksToolbar(Private) +- (BookmarksButton*)makeNewButtonWithElement:(nsIDOMElement*)element; @end -@implementation CHBookmarksToolbar +@implementation BookmarksToolbar - (id)initWithFrame:(NSRect)frame { @@ -100,7 +100,7 @@ while (child) { nsCOMPtr childElt(do_QueryInterface(child)); if (childElt) { - CHBookmarksButton* button = [self makeNewButtonWithElement:childElt]; + BookmarksButton* button = [self makeNewButtonWithElement:childElt]; [self addSubview: button]; [mButtons addObject: button]; } @@ -115,7 +115,7 @@ -(void)addButton: (nsIDOMElement*)aElt atIndex: (int)aIndex { - CHBookmarksButton* button = [self makeNewButtonWithElement:aElt]; + BookmarksButton* button = [self makeNewButtonWithElement:aElt]; [self addSubview: button]; [mButtons insertObject: button atIndex: aIndex]; if ([self isShown]) @@ -126,7 +126,7 @@ { int count = [mButtons count]; for (int i = 0; i < count; i++) { - CHBookmarksButton* button = [mButtons objectAtIndex: i]; + BookmarksButton* button = [mButtons objectAtIndex: i]; if ([button element] == aElt) { [button setElement: aElt]; if (count > i && [self isShown]) @@ -142,7 +142,7 @@ { int count = [mButtons count]; for (int i = 0; i < count; i++) { - CHBookmarksButton* button = [mButtons objectAtIndex: i]; + BookmarksButton* button = [mButtons objectAtIndex: i]; if ([button element] == aElt) { [mButtons removeObjectAtIndex: i]; [button removeFromSuperview]; @@ -168,12 +168,12 @@ float currY = 1.0; float prevX = 2.0; if (aIndex > 0) { - CHBookmarksButton* prevButton = [mButtons objectAtIndex: (aIndex-1)]; + BookmarksButton* prevButton = [mButtons objectAtIndex: (aIndex-1)]; prevX += [prevButton frame].origin.x + [prevButton frame].size.width; currY = [prevButton frame].origin.y; } for (int i = aIndex; i < count; i++) { - CHBookmarksButton* button = [mButtons objectAtIndex: i]; + BookmarksButton* button = [mButtons objectAtIndex: i]; [button sizeToFit]; float width = [button frame].size.width; float height = [button frame].size.height; @@ -240,7 +240,7 @@ else { // We got smaller. Just go to the last button and see if it is outside // our bounds. - CHBookmarksButton* button = [mButtons objectAtIndex:(count-1)]; + BookmarksButton* button = [mButtons objectAtIndex:(count-1)]; if ([button frame].origin.x + [button frame].size.width > [self bounds].size.width - 2) { // The button doesn't fit any more. Reflow starting at this index. @@ -285,7 +285,7 @@ mDragInsertionPosition = BookmarksService::CHInsertAfter; for (int i = 0; i < count; ++i) { - CHBookmarksButton* button = [mButtons objectAtIndex: i]; + BookmarksButton* button = [mButtons objectAtIndex: i]; //NSLog(@"check %d - %d,%d %d,%d\n", i, [button frame].origin.x, [button frame].origin.y, aPoint.x, aPoint.y); // XXX origin.y is coming up zero here! Need that to check the row we're dragging in :( @@ -456,9 +456,9 @@ } } -- (CHBookmarksButton*)makeNewButtonWithElement:(nsIDOMElement*)element +- (BookmarksButton*)makeNewButtonWithElement:(nsIDOMElement*)element { - return [[[CHBookmarksButton alloc] initWithFrame: NSMakeRect(2, 1, 100, 17) element:element bookmarksService:mBookmarks] autorelease]; + return [[[BookmarksButton alloc] initWithFrame: NSMakeRect(2, 1, 100, 17) element:element bookmarksService:mBookmarks] autorelease]; } @end diff --git a/mozilla/chimera/src/browser/AutoCompleteDataSource.h b/mozilla/chimera/src/browser/AutoCompleteDataSource.h index 539ed560d87..2cd28fd356a 100644 --- a/mozilla/chimera/src/browser/AutoCompleteDataSource.h +++ b/mozilla/chimera/src/browser/AutoCompleteDataSource.h @@ -22,12 +22,12 @@ */ #import -#import "CHAutoCompleteTextField.h" +#import "AutoCompleteTextField.h" #include "nsIAutoCompleteResults.h" -@class CHAutoCompleteTextField; +@class AutoCompleteTextField; -@interface CHAutoCompleteDataSource : NSObject +@interface AutoCompleteDataSource : NSObject { NSImage *mIconImage; diff --git a/mozilla/chimera/src/browser/AutoCompleteDataSource.mm b/mozilla/chimera/src/browser/AutoCompleteDataSource.mm index 0071afa0f07..16dec72ddc2 100644 --- a/mozilla/chimera/src/browser/AutoCompleteDataSource.mm +++ b/mozilla/chimera/src/browser/AutoCompleteDataSource.mm @@ -25,11 +25,11 @@ #import "NSString+Utils.h" #import -#import "CHAutoCompleteTextField.h" +#import "AutoCompleteTextField.h" #include "nsString.h" #include "nsCRT.h" -@implementation CHAutoCompleteDataSource +@implementation AutoCompleteDataSource -(id)init { diff --git a/mozilla/chimera/src/browser/AutoCompleteTextField.h b/mozilla/chimera/src/browser/AutoCompleteTextField.h index 847b86d16a7..a6ea7a66aaf 100644 --- a/mozilla/chimera/src/browser/AutoCompleteTextField.h +++ b/mozilla/chimera/src/browser/AutoCompleteTextField.h @@ -23,20 +23,20 @@ */ #import -#import "CHAutoCompleteDataSource.h" +#import "AutoCompleteDataSource.h" #include "nsIAutoCompleteSession.h" #include "nsIAutoCompleteResults.h" #include "nsIAutoCompleteListener.h" -@class CHAutoCompleteDataSource, CHPageProxyIcon; +@class BookmarksOutlineView, PageProxyIcon; -@interface CHAutoCompleteTextField : NSTextField +@interface AutoCompleteTextField : NSTextField { - IBOutlet CHPageProxyIcon *mProxyIcon; + IBOutlet PageProxyIcon *mProxyIcon; NSWindow *mPopupWin; NSTableView *mTableView; - CHAutoCompleteDataSource *mDataSource; + AutoCompleteDataSource *mDataSource; nsIAutoCompleteSession *mSession; nsIAutoCompleteResults *mResults; diff --git a/mozilla/chimera/src/browser/AutoCompleteTextField.mm b/mozilla/chimera/src/browser/AutoCompleteTextField.mm index 9fd20c4a4c4..c3936bb573d 100644 --- a/mozilla/chimera/src/browser/AutoCompleteTextField.mm +++ b/mozilla/chimera/src/browser/AutoCompleteTextField.mm @@ -22,13 +22,13 @@ * David Haas */ -#import "CHAutoCompleteTextField.h" +#import "AutoCompleteTextField.h" #import "BrowserWindowController.h" -#import "CHPageProxyIcon.h" +#import "PageProxyIcon.h" #include "nsIServiceManager.h" #include "nsMemory.h" #include "nsString.h" -#include "CHUserDefaults.h" +#include "UserDefaults.h" static const int kMaxRows = 6; static const int kFrameMargin = 1; @@ -47,7 +47,7 @@ static const int kFrameMargin = 1; class AutoCompleteListener : public nsIAutoCompleteListener { public: - AutoCompleteListener(CHAutoCompleteTextField* aTextField) + AutoCompleteListener(AutoCompleteTextField* aTextField) { NS_INIT_REFCNT(); mTextField = aTextField; @@ -66,14 +66,14 @@ public: } private: - CHAutoCompleteTextField *mTextField; + AutoCompleteTextField *mTextField; }; NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) //////////////////////////////////////////////////////////////////////// -@implementation CHAutoCompleteTextField +@implementation AutoCompleteTextField - (void) awakeFromNib { @@ -137,7 +137,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [scrollView setDocumentView: mTableView]; // construct the datasource - mDataSource = [[CHAutoCompleteDataSource alloc] init]; + mDataSource = [[AutoCompleteDataSource alloc] init]; [mTableView setDataSource: mDataSource]; [mPopupWin setContentView:scrollView]; diff --git a/mozilla/chimera/src/browser/BrowserTabView.mm b/mozilla/chimera/src/browser/BrowserTabView.mm index a0993900829..0604b10d8eb 100644 --- a/mozilla/chimera/src/browser/BrowserTabView.mm +++ b/mozilla/chimera/src/browser/BrowserTabView.mm @@ -384,7 +384,7 @@ { // We need to make a new tab. BrowserTabViewItem *tabViewItem= [BrowserTabView makeNewTabItem]; - CHBrowserWrapper *newView = [[[CHBrowserWrapper alloc] initWithTab: tabViewItem andWindow: [self window]] autorelease]; + BrowserWrapper *newView = [[[BrowserWrapper alloc] initWithTab: tabViewItem andWindow: [self window]] autorelease]; [tabViewItem setLabel: NSLocalizedString(@"UntitledPageTitle", @"")]; [tabViewItem setView: newView]; [self addTabViewItem: tabViewItem]; diff --git a/mozilla/chimera/src/browser/BrowserTabViewItem.h b/mozilla/chimera/src/browser/BrowserTabViewItem.h index ae4787b7ff8..877500ad605 100644 --- a/mozilla/chimera/src/browser/BrowserTabViewItem.h +++ b/mozilla/chimera/src/browser/BrowserTabViewItem.h @@ -38,12 +38,12 @@ #import -#import "CHIconTabViewItem.h" +#import "IconTabViewItem.h" -// a subclass of CHIconTabViewItem that handles dragging of site icons +// a subclass of IconTabViewItem that handles dragging of site icons @class BrowserTabItemContainerView; -@interface BrowserTabViewItem : CHIconTabViewItem +@interface BrowserTabViewItem : IconTabViewItem { NSRect mLastDrawRect; // cached draw rect, used for dragging location BrowserTabItemContainerView* mTabContentsView; diff --git a/mozilla/chimera/src/browser/BrowserWindow.mm b/mozilla/chimera/src/browser/BrowserWindow.mm index 35f409d4ee6..94e1caf8595 100644 --- a/mozilla/chimera/src/browser/BrowserWindow.mm +++ b/mozilla/chimera/src/browser/BrowserWindow.mm @@ -37,7 +37,7 @@ #import "BrowserWindow.h" #import "BrowserWindowController.h" -#import "CHAutoCompleteTextField.h" +#import "AutoCompleteTextField.h" static const int kEscapeKeyCode = 53; diff --git a/mozilla/chimera/src/browser/BrowserWindowController.h b/mozilla/chimera/src/browser/BrowserWindowController.h index 1a1c3dd4d29..3f4d8921433 100644 --- a/mozilla/chimera/src/browser/BrowserWindowController.h +++ b/mozilla/chimera/src/browser/BrowserWindowController.h @@ -36,9 +36,9 @@ * ***** END LICENSE BLOCK ***** */ #import -#import "CHBrowserWrapper.h" -#import "CHFind.h" -#import "CHBookmarksToolbar.h" +#import "BrowserWrapper.h" +#import "Find.h" +#import "BookmarksToolbar.h" class nsIDOMEvent; class nsIDOMNode; @@ -76,13 +76,13 @@ class nsIDOMNode; @class BookmarksDataSource; -@class CHHistoryDataSource; +@class HistoryDataSource; @class BrowserTabView; -@class CHPageProxyIcon; +@class PageProxyIcon; -@interface BrowserWindowController : NSWindowController +@interface BrowserWindowController : NSWindowController { - IBOutlet BrowserTabView* mTabBrowser; + IBOutlet BrowserTabView* mTabBrowser; IBOutlet NSDrawer* mSidebarDrawer; IBOutlet NSTabView* mSidebarTabView; IBOutlet NSTabView* mSidebarSourceTabView; @@ -94,13 +94,13 @@ class nsIDOMNode; IBOutlet NSWindow* mLocationSheetWindow; IBOutlet NSTextField* mLocationSheetURLField; IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock - IBOutlet CHPageProxyIcon* mProxyIcon; + IBOutlet PageProxyIcon* mProxyIcon; IBOutlet id mSidebarBrowserView; // currently unused IBOutlet BookmarksDataSource* mSidebarBookmarksDataSource; - IBOutlet CHHistoryDataSource* mHistoryDataSource; + IBOutlet HistoryDataSource* mHistoryDataSource; - IBOutlet CHBookmarksToolbar* mPersonalToolbar; + IBOutlet BookmarksToolbar* mPersonalToolbar; IBOutlet NSWindow* mAddBookmarkSheetWindow; IBOutlet NSTextField* mAddBookmarkTitleField; @@ -125,7 +125,7 @@ class nsIDOMNode; NSString* mPendingReferrer; BOOL mPendingActivate; - CHBrowserWrapper* mBrowserView; + BrowserWrapper* mBrowserView; BOOL mMoveReentrant; NSModalSession mModalSession; @@ -160,7 +160,7 @@ class nsIDOMNode; - (id)getTabBrowser; - (BOOL)newTabsAllowed; -- (CHBrowserWrapper*)getBrowserWrapper; +- (BrowserWrapper*)getBrowserWrapper; - (void)loadURL:(NSString*)aURLSpec referrer:(NSString*)aReferrer activate:(BOOL)activate; - (void)updateLocationFields:(NSString *)locationString; @@ -259,7 +259,7 @@ class nsIDOMNode; - (IBAction)viewOnlyThisImage:(id)aSender; -- (CHBookmarksToolbar*) bookmarksToolbar; +- (BookmarksToolbar*) bookmarksToolbar; - (BOOL) isResponderGeckoView:(NSResponder*) responder; @@ -279,7 +279,7 @@ class nsIDOMNode; - (NSDrawer *)sidebarDrawer; // Accessor to get the proxy icon view -- (CHPageProxyIcon *)proxyIconView; +- (PageProxyIcon *)proxyIconView; @end diff --git a/mozilla/chimera/src/browser/BrowserWindowController.mm b/mozilla/chimera/src/browser/BrowserWindowController.mm index 2005de8af26..0b8cb0818b7 100644 --- a/mozilla/chimera/src/browser/BrowserWindowController.mm +++ b/mozilla/chimera/src/browser/BrowserWindowController.mm @@ -39,13 +39,13 @@ #import "BrowserWindowController.h" -#import "CHBrowserWrapper.h" -#import "CHPreferenceManager.h" +#import "BrowserWrapper.h" +#import "PreferenceManager.h" #import "BookmarksDataSource.h" -#import "CHHistoryDataSource.h" +#import "HistoryDataSource.h" #import "BrowserTabView.h" -#import "CHUserDefaults.h" -#import "CHPageProxyIcon.h" +#import "UserDefaults.h" +#import "PageProxyIcon.h" #include "nsIWebNavigation.h" #include "nsIDOMElement.h" @@ -57,10 +57,10 @@ #include "nsIDocShell.h" #include "nsIMarkupDocumentViewer.h" #include "nsIContentViewer.h" -#include "nsCocoaBrowserService.h" +#include "CHBrowserService.h" #include "nsString.h" #include "nsCRT.h" -#include "CHGeckoUtils.h" +#include "GeckoUtils.h" #include "nsIWebProgressListener.h" #include "nsIWebBrowserChrome.h" @@ -186,7 +186,7 @@ static NSArray* sToolbarDefaults = nil; if ( (self = [super initWithWindowNibName:(NSString *)windowNibName]) ) { // this won't correctly cascade windows on multiple monitors. RADAR bug 2972893 // filed since it also happens in Terminal.app - if ( nsCocoaBrowserService::sNumBrowsers == 0 ) + if ( CHBrowserService::sNumBrowsers == 0 ) [self setShouldCascadeWindows:NO]; else [self setShouldCascadeWindows:YES]; @@ -725,7 +725,7 @@ static NSArray* sToolbarDefaults = nil; [self manageBookmarks: self]; // Now do the importing. - CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: nil andWindow: [self window]] autorelease]; + BrowserWrapper* newView = [[[BrowserWrapper alloc] initWithTab: nil andWindow: [self window]] autorelease]; [newView setFrame: NSZeroRect]; [newView setIsBookmarksImport: YES]; [[[self window] contentView] addSubview: newView]; @@ -786,7 +786,7 @@ static NSArray* sToolbarDefaults = nil; // Get the users preferred search engine from IC if (!searchEngine || [searchEngine isEqualToString:@"SearchPageDefault"]) { - searchEngine = [[CHPreferenceManager sharedInstance] getICStringPref:kICWebSearchPagePrefs]; + searchEngine = [[PreferenceManager sharedInstance] getICStringPref:kICWebSearchPagePrefs]; if (!searchEngine || ([searchEngine length] == 0)) searchEngine = @"http://dmoz.org/"; } @@ -897,9 +897,9 @@ static NSArray* sToolbarDefaults = nil; { nsCOMPtr linkContent; nsAutoString href; - CHGeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); + GeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); nsAutoString linkText; - CHGeckoUtils::GatherTextUnder(linkContent, linkText); + GeckoUtils::GatherTextUnder(linkContent, linkText); NSString* urlStr = [NSString stringWith_nsAString:href]; NSString* titleStr = [NSString stringWith_nsAString:linkText]; [self addBookmarkExtended:YES isFolder:NO URL:urlStr title:titleStr]; @@ -927,7 +927,7 @@ static NSArray* sToolbarDefaults = nil; - (IBAction)home:(id)aSender { - [mBrowserView loadURI:[[CHPreferenceManager sharedInstance] homePage:NO] referrer: nil flags:NSLoadFlagsNone activate:NO]; + [mBrowserView loadURI:[[PreferenceManager sharedInstance] homePage:NO] referrer: nil flags:NSLoadFlagsNone activate:NO]; } - (IBAction)toggleSidebar:(id)aSender @@ -979,7 +979,7 @@ static NSArray* sToolbarDefaults = nil; -(void)newTab:(BOOL)allowHomepage { BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem]; - CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; + BrowserWrapper* newView = [[[BrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; PRInt32 newTabPage = 0; if (allowHomepage) { @@ -999,7 +999,7 @@ static NSArray* sToolbarDefaults = nil; newTabPage != 1 && allowHomepage); if (allowHomepage) - [newView loadURI: ((newTabPage == 1) ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") referrer:nil flags:NSLoadFlagsNone activate:!focusURLBar]; + [newView loadURI: ((newTabPage == 1) ? [[PreferenceManager sharedInstance] homePage: NO] : @"about:blank") referrer:nil flags:NSLoadFlagsNone activate:!focusURLBar]; [mTabBrowser selectLastTabViewItem: self]; @@ -1061,7 +1061,7 @@ static NSArray* sToolbarDefaults = nil; return [mTabBrowser canMakeNewTabs]; } --(CHBrowserWrapper*)getBrowserWrapper +-(BrowserWrapper*)getBrowserWrapper { return mBrowserView; } @@ -1111,7 +1111,7 @@ static NSArray* sToolbarDefaults = nil; [mTabBrowser addTabViewItem: newTab]; #endif - CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; + BrowserWrapper* newView = [[[BrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; [newView setTab: newTab]; [newTab setLabel: NSLocalizedString(@"TabLoading", @"")]; @@ -1125,16 +1125,16 @@ static NSArray* sToolbarDefaults = nil; -(void)setupSidebarTabs { - CHIconTabViewItem *bookItem = [[CHIconTabViewItem alloc] initWithIdentifier:@"bookmarkSidebarCHIconTabViewItem" + IconTabViewItem *bookItem = [[IconTabViewItem alloc] initWithIdentifier:@"bookmarkSidebarCHIconTabViewItem" withTabIcon:[NSImage imageNamed:@"bookicon"]]; - CHIconTabViewItem *histItem = [[CHIconTabViewItem alloc] initWithIdentifier:@"historySidebarCHIconTabViewItem" + IconTabViewItem *histItem = [[IconTabViewItem alloc] initWithIdentifier:@"historySidebarCHIconTabViewItem" withTabIcon:[NSImage imageNamed:@"historyicon"]]; #if USE_SEARCH_ITEM - CHIconTabViewItem *searchItem = [[CHIconTabViewItem alloc] initWithIdentifier:@"searchSidebarCHIconTabViewItem" + IconTabViewItem *searchItem = [[IconTabViewItem alloc] initWithIdentifier:@"searchSidebarCHIconTabViewItem" withTabIcon:[NSImage imageNamed:@"searchicon"]]; #endif #if USE_PANELS_ITEM - CHIconTabViewItem *panelsItem = [[CHIconTabViewItem alloc] initWithIdentifier:@"myPanelsCHIconTabViewItem" + IconTabViewItem *panelsItem = [[IconTabViewItem alloc] initWithIdentifier:@"myPanelsCHIconTabViewItem" withTabIcon:[NSImage imageNamed:@"panel_icon"]]; #endif @@ -1327,7 +1327,7 @@ static NSArray* sToolbarDefaults = nil; { nsCOMPtr linkContent; nsAutoString href; - CHGeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); + GeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); // XXXdwh Handle simple XLINKs if we want to be compatible with Mozilla, but who // really uses these anyway? :) @@ -1360,7 +1360,7 @@ static NSArray* sToolbarDefaults = nil; { nsCOMPtr linkContent; nsAutoString href; - CHGeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); + GeckoUtils::GetEnclosingLinkElementAndHref(mContextMenuNode, getter_AddRefs(linkContent), href); // XXXdwh Handle simple XLINKs if we want to be compatible with Mozilla, but who // really uses these anyway? :) @@ -1371,7 +1371,7 @@ static NSArray* sToolbarDefaults = nil; // The user wants to save this link. nsAutoString text; - CHGeckoUtils::GatherTextUnder(mContextMenuNode, text); + GeckoUtils::GatherTextUnder(mContextMenuNode, text); [self saveURL: nil filterList: nil url: hrefStr suggestedFilename: [NSString stringWith_nsAString: text]]; @@ -1422,7 +1422,7 @@ static NSArray* sToolbarDefaults = nil; } } -- (CHBookmarksToolbar*) bookmarksToolbar +- (BookmarksToolbar*) bookmarksToolbar { return mPersonalToolbar; } @@ -1486,7 +1486,7 @@ static NSArray* sToolbarDefaults = nil; return mSidebarDrawer; } -- (CHPageProxyIcon *)proxyIconView +- (PageProxyIcon *)proxyIconView { return mProxyIcon; } diff --git a/mozilla/chimera/src/browser/BrowserWrapper.h b/mozilla/chimera/src/browser/BrowserWrapper.h index c50f9c2a942..486e416fd91 100644 --- a/mozilla/chimera/src/browser/BrowserWrapper.h +++ b/mozilla/chimera/src/browser/BrowserWrapper.h @@ -41,7 +41,7 @@ @class BrowserWindowController; @class ToolTip; -@interface CHBrowserWrapper : NSView +@interface BrowserWrapper : NSView { NSTextField* mUrlbar; NSTextField* mStatus; diff --git a/mozilla/chimera/src/browser/BrowserWrapper.mm b/mozilla/chimera/src/browser/BrowserWrapper.mm index e84899836a4..ff05eecc082 100644 --- a/mozilla/chimera/src/browser/BrowserWrapper.mm +++ b/mozilla/chimera/src/browser/BrowserWrapper.mm @@ -37,14 +37,14 @@ #import "NSString+Utils.h" -#import "CHPreferenceManager.h" -#import "CHBrowserWrapper.h" +#import "PreferenceManager.h" +#import "BrowserWrapper.h" #import "BrowserWindowController.h" #import "BookmarksService.h" #import "SiteIconProvider.h" #import "BrowserTabViewItem.h" #import "ToolTip.h" -#import "CHPageProxyIcon.h" +#import "PageProxyIcon.h" #include "nsCOMPtr.h" #include "nsIServiceManager.h" @@ -59,7 +59,7 @@ #include "nsIDOMEventReceiver.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" -#include "nsCocoaBrowserService.h" +#include "CHBrowserService.h" #include "nsIWebProgressListener.h" #include @@ -70,7 +70,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; const NSString* kOfflineNotificationName = @"offlineModeChanged"; -@interface CHBrowserWrapper(Private) +@interface BrowserWrapper(Private) - (void)setPendingActive:(BOOL)active; - (void)registerNotificationListener; @@ -82,7 +82,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged"; @end -@implementation CHBrowserWrapper +@implementation BrowserWrapper - (id)initWithTab:(NSTabViewItem*)aTab andWindow:(NSWindow*)aWindow { @@ -340,7 +340,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged"; - (void)onLocationChange:(NSString*)urlSpec { - BOOL useSiteIcons = [[CHPreferenceManager sharedInstance] getBooleanPref:"browser.chrome.site_icons" withSuccess:NULL]; + BOOL useSiteIcons = [[PreferenceManager sharedInstance] getBooleanPref:"browser.chrome.site_icons" withSuccess:NULL]; BOOL siteIconLoadInitiated = NO; SiteIconProvider* faviconProvider = [SiteIconProvider sharedFavoriteIconProvider]; @@ -573,7 +573,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged"; if (isUnrequested) { // A popup is being opened while the page is currently loading. Offer to block the // popup. - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); BOOL confirm = [controller confirm: [self window] title: @"Unrequested Popup Detected" text: [NSString stringWithFormat: NSLocalizedString(@"PopupBlockMsg", @""), NSLocalizedStringFromTable(@"CFBundleName", @"InfoPlist", nil)]]; @@ -680,7 +680,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged"; NSImage* iconImage = [userInfo objectForKey:SiteIconLoadImageKey]; NSString* siteIconURI = [userInfo objectForKey:SiteIconLoadURIKey]; - // NSLog(@"CHBrowserWrapper imageLoadedNotification got image %@ and uri %@", iconImage, proxyImageURI); + // NSLog(@"BrowserWrapper imageLoadedNotification got image %@ and uri %@", iconImage, proxyImageURI); if (iconImage == nil) siteIconURI = @""; // go back to default image diff --git a/mozilla/chimera/src/browser/CocoaPromptService.mm b/mozilla/chimera/src/browser/CocoaPromptService.mm index 796762d02b8..efc42afe877 100644 --- a/mozilla/chimera/src/browser/CocoaPromptService.mm +++ b/mozilla/chimera/src/browser/CocoaPromptService.mm @@ -38,7 +38,7 @@ #import "NSString+Utils.h" -#import "nsCocoaBrowserService.h" +#import "CHBrowserService.h" #import "CocoaPromptService.h" #include "nsCRT.h" @@ -65,7 +65,7 @@ CocoaPromptService::Alert(nsIDOMWindow *parent, const PRUnichar *dialogTitle, const PRUnichar *text) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -89,7 +89,7 @@ CocoaPromptService::AlertCheck(nsIDOMWindow *parent, const PRUnichar *checkMsg, PRBool *checkValue) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -120,7 +120,7 @@ CocoaPromptService::Confirm(nsIDOMWindow *parent, const PRUnichar *text, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -142,7 +142,7 @@ CocoaPromptService::ConfirmCheck(nsIDOMWindow *parent, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -185,7 +185,7 @@ CocoaPromptService::ConfirmEx(nsIDOMWindow *parent, const PRUnichar *checkMsg, PRBool *checkValue, PRInt32 *buttonPressed) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -228,7 +228,7 @@ CocoaPromptService::Prompt(nsIDOMWindow *parent, PRBool *checkValue, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -270,7 +270,7 @@ CocoaPromptService::PromptUsernameAndPassword(nsIDOMWindow *parent, PRBool *checkValue, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } @@ -318,7 +318,7 @@ CocoaPromptService::PromptPassword(nsIDOMWindow *parent, PRBool *checkValue, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) { return NS_ERROR_FAILURE; } diff --git a/mozilla/chimera/src/browser/ContentClickListener.mm b/mozilla/chimera/src/browser/ContentClickListener.mm index 3e9d997e30c..9ed723eec1f 100644 --- a/mozilla/chimera/src/browser/ContentClickListener.mm +++ b/mozilla/chimera/src/browser/ContentClickListener.mm @@ -69,7 +69,7 @@ #include "nsNetUtil.h" // Common helper routines (also used by the context menu code) -#include "CHGeckoUtils.h" +#include "GeckoUtils.h" #import "CHBrowserView.h" @@ -261,7 +261,7 @@ ContentClickListener::MouseClick(nsIDOMEvent* aEvent) nsCOMPtr linkContent; nsAutoString href; - CHGeckoUtils::GetEnclosingLinkElementAndHref(content, getter_AddRefs(linkContent), href); + GeckoUtils::GetEnclosingLinkElementAndHref(content, getter_AddRefs(linkContent), href); // XXXdwh Handle simple XLINKs if we want to be compatible with Mozilla, but who // really uses these anyway? :) @@ -301,7 +301,7 @@ ContentClickListener::MouseClick(nsIDOMEvent* aEvent) else if (altKey) { // The user wants to save this link. nsAutoString text; - CHGeckoUtils::GatherTextUnder(content, text); + GeckoUtils::GatherTextUnder(content, text); [mBrowserController saveURL: nil filterList: nil url: hrefStr suggestedFilename: [NSString stringWith_nsAString: text]]; diff --git a/mozilla/chimera/src/browser/GoMenu.h b/mozilla/chimera/src/browser/GoMenu.h index 17e614302d8..b9ea77347de 100644 --- a/mozilla/chimera/src/browser/GoMenu.h +++ b/mozilla/chimera/src/browser/GoMenu.h @@ -23,7 +23,7 @@ #import -@interface CHGoMenu : NSMenu { +@interface GoMenu : NSMenu { } diff --git a/mozilla/chimera/src/browser/GoMenu.mm b/mozilla/chimera/src/browser/GoMenu.mm index e160c8dd15e..3f1efd6ce47 100644 --- a/mozilla/chimera/src/browser/GoMenu.mm +++ b/mozilla/chimera/src/browser/GoMenu.mm @@ -23,10 +23,10 @@ #import "NSString+Utils.h" -#import "CHGoMenu.h" +#import "GoMenu.h" #import "MainController.h" #import "BrowserWindowController.h" -#import "CHBrowserWrapper.h" +#import "BrowserWrapper.h" #import "CHBrowserView.h" #include "nsCOMPtr.h" #include "nsString.h" @@ -43,7 +43,7 @@ static const int kMaxItems = 15; // the maximum number of characters in a menu title before cropping it static const unsigned int kMaxTitleLength = 80; -@implementation CHGoMenu +@implementation GoMenu - (void) update { @@ -60,7 +60,7 @@ static const unsigned int kMaxTitleLength = 80; if (!controller) return nsnull; // get web navigation for current browser - CHBrowserWrapper* wrapper = [controller getBrowserWrapper]; + BrowserWrapper* wrapper = [controller getBrowserWrapper]; if (!wrapper) return nsnull; CHBrowserView* view = [wrapper getBrowserView]; if (!view) return nsnull; diff --git a/mozilla/chimera/src/browser/LocationBar.h b/mozilla/chimera/src/browser/LocationBar.h index f2700e473f6..5fe9e3a4a4c 100644 --- a/mozilla/chimera/src/browser/LocationBar.h +++ b/mozilla/chimera/src/browser/LocationBar.h @@ -23,7 +23,7 @@ #import -@interface CHLocationBar : NSView { +@interface LocationBar : NSView { } diff --git a/mozilla/chimera/src/browser/LocationBar.mm b/mozilla/chimera/src/browser/LocationBar.mm index 6056d1c7977..9504fdfdeef 100644 --- a/mozilla/chimera/src/browser/LocationBar.mm +++ b/mozilla/chimera/src/browser/LocationBar.mm @@ -36,9 +36,9 @@ * * ***** END LICENSE BLOCK ***** */ -#import "CHLocationBar.h" +#import "LocationBar.h" -@implementation CHLocationBar +@implementation LocationBar - (void)drawRect:(NSRect)aRect { // Frame the border. diff --git a/mozilla/chimera/src/browser/PageProxyIcon.h b/mozilla/chimera/src/browser/PageProxyIcon.h index 4e8b1e17ce8..62cac205565 100644 --- a/mozilla/chimera/src/browser/PageProxyIcon.h +++ b/mozilla/chimera/src/browser/PageProxyIcon.h @@ -23,7 +23,7 @@ #import -@interface CHPageProxyIcon : NSImageView +@interface PageProxyIcon : NSImageView { } diff --git a/mozilla/chimera/src/browser/PageProxyIcon.mm b/mozilla/chimera/src/browser/PageProxyIcon.mm index 51ab9d59f31..41e382ae903 100644 --- a/mozilla/chimera/src/browser/PageProxyIcon.mm +++ b/mozilla/chimera/src/browser/PageProxyIcon.mm @@ -23,7 +23,7 @@ #import "NSString+Utils.h" -#import "CHPageProxyIcon.h" +#import "PageProxyIcon.h" #import "BookmarksService.h" #import "MainController.h" @@ -32,7 +32,7 @@ #include "nsNetUtil.h" #include "nsString.h" -@implementation CHPageProxyIcon +@implementation PageProxyIcon - (void)awakeFromNib { diff --git a/mozilla/chimera/src/browser/SecurityDialogs.mm b/mozilla/chimera/src/browser/SecurityDialogs.mm index a07700a153b..83d9e1adc11 100644 --- a/mozilla/chimera/src/browser/SecurityDialogs.mm +++ b/mozilla/chimera/src/browser/SecurityDialogs.mm @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #import "nsAlertController.h" -#import "nsCocoaBrowserService.h" +#import "CHBrowserService.h" #import "SecurityDialogs.h" #import "MainController.h" @@ -71,7 +71,7 @@ SecurityDialogs::UnknownIssuer(nsITransportSecurityInfo *socketInfo, *_retval = PR_TRUE; *outAddType = ADD_TRUSTED_FOR_SESSION; - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) return NS_ERROR_FAILURE; @@ -99,7 +99,7 @@ SecurityDialogs::MismatchDomain(nsITransportSecurityInfo *socketInfo, const PRUnichar *targetURL, nsIX509Cert *cert, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) return NS_ERROR_FAILURE; @@ -118,7 +118,7 @@ NS_IMETHODIMP SecurityDialogs::CertExpired(nsITransportSecurityInfo *socketInfo, nsIX509Cert *cert, PRBool *_retval) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) return NS_ERROR_FAILURE; @@ -199,7 +199,7 @@ NS_IMETHODIMP SecurityDialogs::ConfirmPostToInsecureFromSecure(nsIInterfaceRequestor *ctx, PRBool* _result) { - nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); + nsAlertController* controller = CHBrowserService::GetAlertController(); if (!controller) return NS_ERROR_FAILURE; diff --git a/mozilla/chimera/src/browser/nsAlertController.mm b/mozilla/chimera/src/browser/nsAlertController.mm index 27225a524fc..9f0127af5e8 100644 --- a/mozilla/chimera/src/browser/nsAlertController.mm +++ b/mozilla/chimera/src/browser/nsAlertController.mm @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #import "nsAlertController.h" -#import "nsCocoaBrowserService.h" +#import "CHBrowserService.h" #include "nsIBadCertListener.h" @@ -62,7 +62,7 @@ enum { kOKButton = 0, kCancelButton = 1, kOtherButton = 2 }; - (void)awakeFromNib { - nsCocoaBrowserService::SetAlertController(self); + CHBrowserService::SetAlertController(self); } - (void)alert:(NSWindow*)parent title:(NSString*)title text:(NSString*)text diff --git a/mozilla/chimera/src/download/ProgressDlgController.h b/mozilla/chimera/src/download/ProgressDlgController.h index 422a3fc70e5..bfd05ace6c0 100644 --- a/mozilla/chimera/src/download/ProgressDlgController.h +++ b/mozilla/chimera/src/download/ProgressDlgController.h @@ -37,7 +37,7 @@ #import -#import "DownloadProgressDisplay.h" +#import "CHDownloadProgressDisplay.h" #include "nscore.h" @@ -51,7 +51,7 @@ class nsDownloadListener; @end -@interface ProgressDlgController : NSWindowController +@interface ProgressDlgController : NSWindowController { IBOutlet NSTextField *mElapsedTimeLabel; IBOutlet NSTextField *mFromField; diff --git a/mozilla/chimera/src/download/ProgressDlgController.mm b/mozilla/chimera/src/download/ProgressDlgController.mm index 55f5e8897d5..a9b304cc93d 100644 --- a/mozilla/chimera/src/download/ProgressDlgController.mm +++ b/mozilla/chimera/src/download/ProgressDlgController.mm @@ -60,11 +60,11 @@ static NSString *ProgressWindowFrameSaveName = @"ProgressWindow"; @implementation ChimeraDownloadControllerFactory : DownloadControllerFactory -- (NSWindowController *)createDownloadController +- (NSWindowController *)createDownloadController { NSWindowController* progressController = [[ProgressDlgController alloc] initWithWindowNibName: @"ProgressDialog"]; - NSAssert([progressController conformsToProtocol:@protocol(DownloadProgressDisplay)], - @"progressController should conform to DownloadProgressDisplay protocol"); + NSAssert([progressController conformsToProtocol:@protocol(CHDownloadProgressDisplay)], + @"progressController should conform to CHDownloadProgressDisplay protocol"); return progressController; } @@ -434,7 +434,7 @@ static NSString *ProgressWindowFrameSaveName = @"ProgressWindow"; #pragma mark - -// DownloadProgressDisplay protocol methods +// CHDownloadProgressDisplay protocol methods - (void)onStartDownload:(BOOL)isFileSave; { diff --git a/mozilla/chimera/src/download/nsDownloadListener.h b/mozilla/chimera/src/download/nsDownloadListener.h index cd15b3626cd..771708f54eb 100644 --- a/mozilla/chimera/src/download/nsDownloadListener.h +++ b/mozilla/chimera/src/download/nsDownloadListener.h @@ -41,7 +41,7 @@ #import #import -#import "DownloadProgressDisplay.h" +#import "CHDownloadProgressDisplay.h" #include "nsString.h" #include "nsIDownload.h" diff --git a/mozilla/chimera/src/embedding/CHBrowserListener.h b/mozilla/chimera/src/embedding/CHBrowserListener.h index 0f4880be093..58843686dcc 100644 --- a/mozilla/chimera/src/embedding/CHBrowserListener.h +++ b/mozilla/chimera/src/embedding/CHBrowserListener.h @@ -1,5 +1,5 @@ // -// nsCocoaBrowserListener.h +// CHBrowserListener.h // Chimera // // Created by Simon Fraser on Sat Aug 17 2002. @@ -23,7 +23,7 @@ @class CHBrowserView; -class nsCocoaBrowserListener : public nsSupportsWeakReference, +class CHBrowserListener : public nsSupportsWeakReference, public nsIInterfaceRequestor, public nsIWebBrowserChrome, public nsIWindowCreator, @@ -33,8 +33,8 @@ class nsCocoaBrowserListener : public nsSupportsWeakReference, public nsITooltipListener { public: - nsCocoaBrowserListener(CHBrowserView* aView); - virtual ~nsCocoaBrowserListener(); + CHBrowserListener(CHBrowserView* aView); + virtual ~CHBrowserListener(); NS_DECL_ISUPPORTS NS_DECL_NSIINTERFACEREQUESTOR diff --git a/mozilla/chimera/src/embedding/CHBrowserListener.mm b/mozilla/chimera/src/embedding/CHBrowserListener.mm index d9406ce59ea..2d15cdf65d7 100644 --- a/mozilla/chimera/src/embedding/CHBrowserListener.mm +++ b/mozilla/chimera/src/embedding/CHBrowserListener.mm @@ -53,17 +53,17 @@ #import "CHBrowserView.h" -#include "nsCocoaBrowserListener.h" +#include "CHBrowserListener.h" -nsCocoaBrowserListener::nsCocoaBrowserListener(CHBrowserView* aView) +CHBrowserListener::CHBrowserListener(CHBrowserView* aView) : mView(aView), mContainer(nsnull), mIsModal(PR_FALSE), mChromeFlags(0) { NS_INIT_ISUPPORTS(); mListeners = [[NSMutableArray alloc] init]; } -nsCocoaBrowserListener::~nsCocoaBrowserListener() +CHBrowserListener::~CHBrowserListener() { [mListeners release]; mView = nsnull; @@ -72,7 +72,7 @@ nsCocoaBrowserListener::~nsCocoaBrowserListener() } } -NS_IMPL_ISUPPORTS9(nsCocoaBrowserListener, +NS_IMPL_ISUPPORTS9(CHBrowserListener, nsIInterfaceRequestor, nsIWebBrowserChrome, nsIWindowCreator, @@ -85,7 +85,7 @@ NS_IMPL_ISUPPORTS9(nsCocoaBrowserListener, // Implementation of nsIInterfaceRequestor NS_IMETHODIMP -nsCocoaBrowserListener::GetInterface(const nsIID &aIID, void** aInstancePtr) +CHBrowserListener::GetInterface(const nsIID &aIID, void** aInstancePtr) { if (aIID.Equals(NS_GET_IID(nsIDOMWindow))) { nsCOMPtr browser = dont_AddRef([mView getWebBrowser]); @@ -100,13 +100,13 @@ nsCocoaBrowserListener::GetInterface(const nsIID &aIID, void** aInstancePtr) // for a new window that have a parent to us, and we take over from there. /* nsIWebBrowserChrome createChromeWindow (in nsIWebBrowserChrome parent, in PRUint32 chromeFlags); */ NS_IMETHODIMP -nsCocoaBrowserListener::CreateChromeWindow(nsIWebBrowserChrome *parent, +CHBrowserListener::CreateChromeWindow(nsIWebBrowserChrome *parent, PRUint32 chromeFlags, nsIWebBrowserChrome **_retval) { if (parent != this) { #if DEBUG - NSLog(@"Mismatch in nsCocoaBrowserListener::CreateChromeWindow. We should be the owning parent."); + NSLog(@"Mismatch in CHBrowserListener::CreateChromeWindow. We should be the owning parent."); #endif return NS_ERROR_FAILURE; } @@ -119,7 +119,7 @@ nsCocoaBrowserListener::CreateChromeWindow(nsIWebBrowserChrome *parent, return NS_ERROR_FAILURE; } - nsCocoaBrowserListener* listener = [childView getCocoaBrowserListener]; + CHBrowserListener* listener = [childView getCocoaBrowserListener]; if (!listener) { #if DEBUG NSLog(@"Uh-oh! No listener yet for a newly created window (nsCocoaBrowserlistener)"); @@ -138,7 +138,7 @@ nsCocoaBrowserListener::CreateChromeWindow(nsIWebBrowserChrome *parent, // Implementation of nsIContextMenuListener NS_IMETHODIMP -nsCocoaBrowserListener::OnShowContextMenu(PRUint32 aContextFlags, nsIDOMEvent* aEvent, nsIDOMNode* aNode) +CHBrowserListener::OnShowContextMenu(PRUint32 aContextFlags, nsIDOMEvent* aEvent, nsIDOMNode* aNode) { [mContainer onShowContextMenu: aContextFlags domEvent: aEvent domNode: aNode]; return NS_OK; @@ -146,7 +146,7 @@ nsCocoaBrowserListener::OnShowContextMenu(PRUint32 aContextFlags, nsIDOMEvent* a // Implementation of nsITooltipListener NS_IMETHODIMP -nsCocoaBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText) +CHBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText) { NSPoint where; where.x = aXCoords; where.y = aYCoords; @@ -155,7 +155,7 @@ nsCocoaBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const } NS_IMETHODIMP -nsCocoaBrowserListener::OnHideTooltip() +CHBrowserListener::OnHideTooltip() { [mContainer onHideTooltip]; return NS_OK; @@ -164,7 +164,7 @@ nsCocoaBrowserListener::OnHideTooltip() // Implementation of nsIWebBrowserChrome /* void setStatus (in unsigned long statusType, in wstring status); */ NS_IMETHODIMP -nsCocoaBrowserListener::SetStatus(PRUint32 statusType, const PRUnichar *status) +CHBrowserListener::SetStatus(PRUint32 statusType, const PRUnichar *status) { if (!mContainer) { return NS_ERROR_FAILURE; @@ -182,7 +182,7 @@ nsCocoaBrowserListener::SetStatus(PRUint32 statusType, const PRUnichar *status) /* attribute nsIWebBrowser webBrowser; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetWebBrowser(nsIWebBrowser * *aWebBrowser) +CHBrowserListener::GetWebBrowser(nsIWebBrowser * *aWebBrowser) { NS_ENSURE_ARG_POINTER(aWebBrowser); if (!mView) { @@ -193,7 +193,7 @@ nsCocoaBrowserListener::GetWebBrowser(nsIWebBrowser * *aWebBrowser) return NS_OK; } NS_IMETHODIMP -nsCocoaBrowserListener::SetWebBrowser(nsIWebBrowser * aWebBrowser) +CHBrowserListener::SetWebBrowser(nsIWebBrowser * aWebBrowser) { if (!mView) { return NS_ERROR_FAILURE; @@ -206,14 +206,14 @@ nsCocoaBrowserListener::SetWebBrowser(nsIWebBrowser * aWebBrowser) /* attribute unsigned long chromeFlags; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetChromeFlags(PRUint32 *aChromeFlags) +CHBrowserListener::GetChromeFlags(PRUint32 *aChromeFlags) { NS_ENSURE_ARG_POINTER(aChromeFlags); *aChromeFlags = mChromeFlags; return NS_OK; } NS_IMETHODIMP -nsCocoaBrowserListener::SetChromeFlags(PRUint32 aChromeFlags) +CHBrowserListener::SetChromeFlags(PRUint32 aChromeFlags) { // XXX Do nothing with them for now mChromeFlags = aChromeFlags; @@ -222,7 +222,7 @@ nsCocoaBrowserListener::SetChromeFlags(PRUint32 aChromeFlags) /* void destroyBrowserWindow (); */ NS_IMETHODIMP -nsCocoaBrowserListener::DestroyBrowserWindow() +CHBrowserListener::DestroyBrowserWindow() { // XXX Could send this up to the container, but for now, // we just destroy the enclosing window. @@ -237,7 +237,7 @@ nsCocoaBrowserListener::DestroyBrowserWindow() /* void sizeBrowserTo (in long aCX, in long aCY); */ NS_IMETHODIMP -nsCocoaBrowserListener::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY) +CHBrowserListener::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY) { if (mContainer) { NSSize size; @@ -253,7 +253,7 @@ nsCocoaBrowserListener::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY) /* void showAsModal (); */ NS_IMETHODIMP -nsCocoaBrowserListener::ShowAsModal() +CHBrowserListener::ShowAsModal() { if (!mView) { return NS_ERROR_FAILURE; @@ -274,7 +274,7 @@ nsCocoaBrowserListener::ShowAsModal() /* boolean isWindowModal (); */ NS_IMETHODIMP -nsCocoaBrowserListener::IsWindowModal(PRBool *_retval) +CHBrowserListener::IsWindowModal(PRBool *_retval) { NS_ENSURE_ARG_POINTER(_retval); @@ -285,7 +285,7 @@ nsCocoaBrowserListener::IsWindowModal(PRBool *_retval) /* void exitModalEventLoop (in nsresult aStatus); */ NS_IMETHODIMP -nsCocoaBrowserListener::ExitModalEventLoop(nsresult aStatus) +CHBrowserListener::ExitModalEventLoop(nsresult aStatus) { // [NSApp stopModalWithCode:(int)aStatus]; @@ -294,7 +294,7 @@ nsCocoaBrowserListener::ExitModalEventLoop(nsresult aStatus) // Implementation of nsIEmbeddingSiteWindow2 NS_IMETHODIMP -nsCocoaBrowserListener::Blur() +CHBrowserListener::Blur() { return NS_OK; } @@ -302,7 +302,7 @@ nsCocoaBrowserListener::Blur() // Implementation of nsIEmbeddingSiteWindow /* void setDimensions (in unsigned long flags, in long x, in long y, in long cx, in long cy); */ NS_IMETHODIMP -nsCocoaBrowserListener::SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) +CHBrowserListener::SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) { if (!mView) return NS_ERROR_FAILURE; @@ -344,7 +344,7 @@ nsCocoaBrowserListener::SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRIn /* void getDimensions (in unsigned long flags, out long x, out long y, out long cx, out long cy); */ NS_IMETHODIMP -nsCocoaBrowserListener::GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) +CHBrowserListener::GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) { if (!mView) return NS_ERROR_FAILURE; @@ -380,7 +380,7 @@ nsCocoaBrowserListener::GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, /* void setFocus (); */ NS_IMETHODIMP -nsCocoaBrowserListener::SetFocus() +CHBrowserListener::SetFocus() { if (!mView) { return NS_ERROR_FAILURE; @@ -398,7 +398,7 @@ nsCocoaBrowserListener::SetFocus() /* attribute boolean visibility; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetVisibility(PRBool *aVisibility) +CHBrowserListener::GetVisibility(PRBool *aVisibility) { NS_ENSURE_ARG_POINTER(aVisibility); @@ -416,7 +416,7 @@ nsCocoaBrowserListener::GetVisibility(PRBool *aVisibility) return NS_OK; } NS_IMETHODIMP -nsCocoaBrowserListener::SetVisibility(PRBool aVisibility) +CHBrowserListener::SetVisibility(PRBool aVisibility) { if (!mView) { return NS_ERROR_FAILURE; @@ -439,7 +439,7 @@ nsCocoaBrowserListener::SetVisibility(PRBool aVisibility) /* attribute wstring title; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetTitle(PRUnichar * *aTitle) +CHBrowserListener::GetTitle(PRUnichar * *aTitle) { NS_ENSURE_ARG_POINTER(aTitle); @@ -463,7 +463,7 @@ nsCocoaBrowserListener::GetTitle(PRUnichar * *aTitle) return NS_OK; } NS_IMETHODIMP -nsCocoaBrowserListener::SetTitle(const PRUnichar * aTitle) +CHBrowserListener::SetTitle(const PRUnichar * aTitle) { NS_ENSURE_ARG(aTitle); @@ -479,7 +479,7 @@ nsCocoaBrowserListener::SetTitle(const PRUnichar * aTitle) /* [noscript] readonly attribute voidPtr siteWindow; */ NS_IMETHODIMP -nsCocoaBrowserListener::GetSiteWindow(void * *aSiteWindow) +CHBrowserListener::GetSiteWindow(void * *aSiteWindow) { NS_ENSURE_ARG_POINTER(aSiteWindow); *aSiteWindow = nsnull; @@ -504,7 +504,7 @@ nsCocoaBrowserListener::GetSiteWindow(void * *aSiteWindow) /* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in unsigned long aStatus); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, +CHBrowserListener::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 aStateFlags, PRUint32 aStatus) { NSEnumerator* enumerator = [mListeners objectEnumerator]; @@ -526,7 +526,7 @@ nsCocoaBrowserListener::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest * /* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, +CHBrowserListener::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress, PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress) { @@ -540,7 +540,7 @@ nsCocoaBrowserListener::OnProgressChange(nsIWebProgress *aWebProgress, nsIReques /* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, +CHBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location) { if (!location) @@ -560,7 +560,7 @@ nsCocoaBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIReques /* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, +CHBrowserListener::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const PRUnichar *aMessage) { NSString* str = [NSString stringWithPRUnichars:aMessage]; @@ -575,7 +575,7 @@ nsCocoaBrowserListener::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest /* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */ NS_IMETHODIMP -nsCocoaBrowserListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 state) +CHBrowserListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 state) { NSEnumerator* enumerator = [mListeners objectEnumerator]; id obj; @@ -586,19 +586,19 @@ nsCocoaBrowserListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIReques } void -nsCocoaBrowserListener::AddListener(id aListener) +CHBrowserListener::AddListener(id aListener) { [mListeners addObject:aListener]; } void -nsCocoaBrowserListener::RemoveListener(id aListener) +CHBrowserListener::RemoveListener(id aListener) { [mListeners removeObject:aListener]; } void -nsCocoaBrowserListener::SetContainer(id aContainer) +CHBrowserListener::SetContainer(id aContainer) { [mContainer autorelease]; diff --git a/mozilla/chimera/src/embedding/CHBrowserService.h b/mozilla/chimera/src/embedding/CHBrowserService.h index e72518cf66e..00c903eaabd 100644 --- a/mozilla/chimera/src/embedding/CHBrowserService.h +++ b/mozilla/chimera/src/embedding/CHBrowserService.h @@ -44,13 +44,13 @@ #include "nsIHelperAppLauncherDialog.h" #include "nsIFactory.h" -class nsCocoaBrowserService : public nsIWindowCreator, +class CHBrowserService : public nsIWindowCreator, public nsIFactory, public nsIHelperAppLauncherDialog { public: - nsCocoaBrowserService(); - virtual ~nsCocoaBrowserService(); + CHBrowserService(); + virtual ~CHBrowserService(); NS_DECL_ISUPPORTS NS_DECL_NSIWINDOWCREATOR @@ -68,7 +68,7 @@ public: static PRUint32 sNumBrowsers; private: - static nsCocoaBrowserService* sSingleton; + static CHBrowserService* sSingleton; static nsAlertController* sController; static PRBool sCanTerminate; }; diff --git a/mozilla/chimera/src/embedding/CHBrowserService.mm b/mozilla/chimera/src/embedding/CHBrowserService.mm index b6a20a40415..fb4ed9ae9de 100644 --- a/mozilla/chimera/src/embedding/CHBrowserService.mm +++ b/mozilla/chimera/src/embedding/CHBrowserService.mm @@ -37,8 +37,8 @@ #import "NSString+Utils.h" -#import "nsCocoaBrowserService.h" -#import "DownloadFactories.h" +#import "CHBrowserService.h" +#import "CHDownloadFactories.h" #import "CHBrowserView.h" #include "nsIWindowWatcher.h" @@ -51,41 +51,41 @@ #include "nsIDownload.h" #include "nsIExternalHelperAppService.h" -nsAlertController* nsCocoaBrowserService::sController = nsnull; -nsCocoaBrowserService* nsCocoaBrowserService::sSingleton = nsnull; -PRUint32 nsCocoaBrowserService::sNumBrowsers = 0; -PRBool nsCocoaBrowserService::sCanTerminate = PR_FALSE; +nsAlertController* CHBrowserService::sController = nsnull; +CHBrowserService* CHBrowserService::sSingleton = nsnull; +PRUint32 CHBrowserService::sNumBrowsers = 0; +PRBool CHBrowserService::sCanTerminate = PR_FALSE; // This method should return a nsModuleComponentInfo array of // application-provided XPCOM components to register. The implementation // is in AppComponents.mm. extern const nsModuleComponentInfo* GetAppModuleComponentInfo(int* outNumComponents); -// nsCocoaBrowserService implementation -nsCocoaBrowserService::nsCocoaBrowserService() +// CHBrowserService implementation +CHBrowserService::CHBrowserService() { NS_INIT_ISUPPORTS(); } -nsCocoaBrowserService::~nsCocoaBrowserService() +CHBrowserService::~CHBrowserService() { } -NS_IMPL_ISUPPORTS3(nsCocoaBrowserService, +NS_IMPL_ISUPPORTS3(CHBrowserService, nsIWindowCreator, nsIFactory, nsIHelperAppLauncherDialog) /* static */ nsresult -nsCocoaBrowserService::InitEmbedding() +CHBrowserService::InitEmbedding() { sNumBrowsers++; if (sSingleton) return NS_OK; - sSingleton = new nsCocoaBrowserService(); + sSingleton = new CHBrowserService(); if (!sSingleton) return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(sSingleton); @@ -141,7 +141,7 @@ nsCocoaBrowserService::InitEmbedding() /* static */ void -nsCocoaBrowserService::BrowserClosed() +CHBrowserService::BrowserClosed() { sNumBrowsers--; if (sCanTerminate && sNumBrowsers == 0) { @@ -156,7 +156,7 @@ nsCocoaBrowserService::BrowserClosed() /* static */ void -nsCocoaBrowserService::TermEmbedding() +CHBrowserService::TermEmbedding() { sCanTerminate = PR_TRUE; if (sNumBrowsers == 0) { @@ -178,7 +178,7 @@ nsCocoaBrowserService::TermEmbedding() #define NS_ALERT_NIB_NAME "alert" nsAlertController* -nsCocoaBrowserService::GetAlertController() +CHBrowserService::GetAlertController() { if (!sController) { NSBundle* bundle = [NSBundle bundleForClass:[CHBrowserView class]]; @@ -188,7 +188,7 @@ nsCocoaBrowserService::GetAlertController() } void -nsCocoaBrowserService::SetAlertController(nsAlertController* aController) +CHBrowserService::SetAlertController(nsAlertController* aController) { // XXX When should the controller be released? sController = aController; @@ -197,7 +197,7 @@ nsCocoaBrowserService::SetAlertController(nsAlertController* aController) // nsIFactory implementation NS_IMETHODIMP -nsCocoaBrowserService::CreateInstance(nsISupports *aOuter, +CHBrowserService::CreateInstance(nsISupports *aOuter, const nsIID & aIID, void **aResult) { @@ -214,7 +214,7 @@ nsCocoaBrowserService::CreateInstance(nsISupports *aOuter, } NS_IMETHODIMP -nsCocoaBrowserService::LockFactory(PRBool lock) +CHBrowserService::LockFactory(PRBool lock) { return NS_OK; } @@ -223,7 +223,7 @@ nsCocoaBrowserService::LockFactory(PRBool lock) // Implementation of nsIWindowCreator /* nsIWebBrowserChrome createChromeWindow (in nsIWebBrowserChrome parent, in PRUint32 chromeFlags); */ NS_IMETHODIMP -nsCocoaBrowserService::CreateChromeWindow(nsIWebBrowserChrome *parent, +CHBrowserService::CreateChromeWindow(nsIWebBrowserChrome *parent, PRUint32 chromeFlags, nsIWebBrowserChrome **_retval) { @@ -241,13 +241,13 @@ nsCocoaBrowserService::CreateChromeWindow(nsIWebBrowserChrome *parent, // void show( in nsIHelperAppLauncher aLauncher, in nsISupports aContext ); NS_IMETHODIMP -nsCocoaBrowserService::Show(nsIHelperAppLauncher* inLauncher, nsISupports* inContext) +CHBrowserService::Show(nsIHelperAppLauncher* inLauncher, nsISupports* inContext) { return inLauncher->SaveToDisk(nsnull, PR_FALSE); } NS_IMETHODIMP -nsCocoaBrowserService::PromptForSaveToFile(nsISupports *aWindowContext, const PRUnichar *aDefaultFile, const PRUnichar *aSuggestedFileExtension, nsILocalFile **_retval) +CHBrowserService::PromptForSaveToFile(nsISupports *aWindowContext, const PRUnichar *aDefaultFile, const PRUnichar *aSuggestedFileExtension, nsILocalFile **_retval) { NSString* filename = [NSString stringWithPRUnichars:aDefaultFile]; NSSavePanel *thePanel = [NSSavePanel savePanel]; @@ -267,8 +267,8 @@ nsCocoaBrowserService::PromptForSaveToFile(nsISupports *aWindowContext, const PR /* void showProgressDialog (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */ NS_IMETHODIMP -nsCocoaBrowserService::ShowProgressDialog(nsIHelperAppLauncher *aLauncher, nsISupports *aContext) +CHBrowserService::ShowProgressDialog(nsIHelperAppLauncher *aLauncher, nsISupports *aContext) { - NSLog(@"nsCocoaBrowserService::ShowProgressDialog"); + NSLog(@"CHBrowserService::ShowProgressDialog"); return NS_OK; } diff --git a/mozilla/chimera/src/embedding/CHBrowserView.h b/mozilla/chimera/src/embedding/CHBrowserView.h index ccf88cdd477..8c568d7de30 100644 --- a/mozilla/chimera/src/embedding/CHBrowserView.h +++ b/mozilla/chimera/src/embedding/CHBrowserView.h @@ -42,7 +42,7 @@ #import @class CHBrowserView; -class nsCocoaBrowserListener; +class CHBrowserListener; class nsIDOMWindow; class nsIWebBrowser; class nsIDOMNode; @@ -118,7 +118,7 @@ enum { @interface CHBrowserView : NSView { nsIWebBrowser* _webBrowser; - nsCocoaBrowserListener* _listener; + CHBrowserListener* _listener; NSWindow* mWindow; nsIDragHelperService* mDragHelper; @@ -186,7 +186,7 @@ enum { - (void)destroyWebBrowser; - (nsIWebBrowser*)getWebBrowser; -- (nsCocoaBrowserListener*)getCocoaBrowserListener; +- (CHBrowserListener*)getCocoaBrowserListener; - (void)setWebBrowser:(nsIWebBrowser*)browser; - (NSString*)getFocusedURLString; diff --git a/mozilla/chimera/src/embedding/CHBrowserView.mm b/mozilla/chimera/src/embedding/CHBrowserView.mm index 3006c0304d1..044758a0607 100644 --- a/mozilla/chimera/src/embedding/CHBrowserView.mm +++ b/mozilla/chimera/src/embedding/CHBrowserView.mm @@ -64,12 +64,12 @@ #include "nsNetUtil.h" #include "SaveHeaderSniffer.h" -#import "CHBrowserWrapper.h" +#import "BrowserWrapper.h" #import "CHBrowserView.h" #import "FindDlgController.h" -#import "nsCocoaBrowserService.h" -#import "nsCocoaBrowserListener.h" +#import "CHBrowserService.h" +#import "CHBrowserListener.h" #import "mozView.h" @@ -100,12 +100,12 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; { if ( (self = [super initWithFrame:frame]) ) { - nsresult rv = nsCocoaBrowserService::InitEmbedding(); + nsresult rv = CHBrowserService::InitEmbedding(); if (NS_FAILED(rv)) { // XXX need to throw } - _listener = new nsCocoaBrowserListener(self); + _listener = new CHBrowserListener(self); NS_ADDREF(_listener); // Create the web browser instance @@ -148,7 +148,7 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; NS_RELEASE(_listener); NS_IF_RELEASE(_webBrowser); - nsCocoaBrowserService::BrowserClosed(); + CHBrowserService::BrowserClosed(); #if DEBUG NSLog(@"CHBrowserView died."); @@ -321,7 +321,7 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; return str; } -- (nsCocoaBrowserListener*)getCocoaBrowserListener +- (CHBrowserListener*)getCocoaBrowserListener { return _listener; } diff --git a/mozilla/chimera/src/embedding/CHDownloadFactories.mm b/mozilla/chimera/src/embedding/CHDownloadFactories.mm index e68a8d369a5..b14fd7ffbcd 100644 --- a/mozilla/chimera/src/embedding/CHDownloadFactories.mm +++ b/mozilla/chimera/src/embedding/CHDownloadFactories.mm @@ -38,14 +38,14 @@ // This file contains implementations of factories for various // downloading-related interfaces. -#import "DownloadProgressDisplay.h" +#import "CHDownloadProgressDisplay.h" #import "ProgressDlgController.h" #include "nsCOMPtr.h" #include "nsIFactory.h" #include "nsDownloadListener.h" -#include "DownloadFactories.h" +#include "CHDownloadFactories.h" // factory for nsIDownload objects // XXX replace with generic factory stuff diff --git a/mozilla/chimera/src/embedding/CHDownloadProgressDisplay.h b/mozilla/chimera/src/embedding/CHDownloadProgressDisplay.h index fc1fe6ce074..03b8e659354 100644 --- a/mozilla/chimera/src/embedding/CHDownloadProgressDisplay.h +++ b/mozilla/chimera/src/embedding/CHDownloadProgressDisplay.h @@ -42,7 +42,7 @@ There are three things here: - 1. The DownloadProgressDisplay protocol. + 1. The CHDownloadProgressDisplay protocol. This is a formal protocol that needs to be implemented by a window controller for your progress window. Its methods @@ -53,7 +53,7 @@ This class should be subclassed by an embedder, with an implementation of 'createDownloadController' that hands back a new instance of an NSWindowController that implements the - protocol. + protocol. The underlying C++ classes use this factory to create the progress window controller. @@ -108,7 +108,7 @@ class CHDownloader; // a formal protocol for something that implements progress display // Embedders can make a window controller that conforms to this // protocol, and reuse nsDownloadListener to get download UI. -@protocol DownloadProgressDisplay +@protocol CHDownloadProgressDisplay - (void)onStartDownload:(BOOL)isFileSave; - (void)onEndDownload; @@ -127,7 +127,7 @@ class CHDownloader; { } -- (NSWindowController *)createDownloadController; +- (NSWindowController *)createDownloadController; @end @@ -161,7 +161,7 @@ protected: protected: DownloadControllerFactory* mControllerFactory; - id mDownloadDisplay; // something that implements the DownloadProgressDisplay protocol + id mDownloadDisplay; // something that implements the CHDownloadProgressDisplay protocol PRBool mIsFileSave; // true if we're doing a save, rather than a download }; diff --git a/mozilla/chimera/src/embedding/CHDownloadProgressDisplay.mm b/mozilla/chimera/src/embedding/CHDownloadProgressDisplay.mm index 4dac500c85b..3f384b9fa90 100644 --- a/mozilla/chimera/src/embedding/CHDownloadProgressDisplay.mm +++ b/mozilla/chimera/src/embedding/CHDownloadProgressDisplay.mm @@ -35,12 +35,12 @@ * * ***** END LICENSE BLOCK ***** */ -#import "DownloadProgressDisplay.h" +#import "CHDownloadProgressDisplay.h" @implementation DownloadControllerFactory -- (NSWindowController *)createDownloadController +- (NSWindowController *)createDownloadController { // a dummy implementation. You should provide a subclass that // returns an instance of your progress dialog controller. diff --git a/mozilla/chimera/src/extensions/ExtendedOutlineView.h b/mozilla/chimera/src/extensions/ExtendedOutlineView.h index 8b90a2820cf..edbde3aaffa 100644 --- a/mozilla/chimera/src/extensions/ExtendedOutlineView.h +++ b/mozilla/chimera/src/extensions/ExtendedOutlineView.h @@ -24,7 +24,7 @@ #import -@interface CHExtendedOutlineView : NSOutlineView { +@interface ExtendedOutlineView : NSOutlineView { SEL mDeleteAction; NSRect mOldFrameRect; diff --git a/mozilla/chimera/src/extensions/ExtendedOutlineView.mm b/mozilla/chimera/src/extensions/ExtendedOutlineView.mm index 6d40efb013c..83e68278b1f 100644 --- a/mozilla/chimera/src/extensions/ExtendedOutlineView.mm +++ b/mozilla/chimera/src/extensions/ExtendedOutlineView.mm @@ -22,13 +22,13 @@ * Max Horn (Context menu & tooltip code) */ -#import "CHExtendedOutlineView.h" +#import "ExtendedOutlineView.h" -@interface CHExtendedOutlineView (Private) +@interface ExtendedOutlineView (Private) - (void)_updateToolTipRect; @end -@implementation CHExtendedOutlineView +@implementation ExtendedOutlineView - (id)initWithFrame:(NSRect)frame { @@ -191,7 +191,7 @@ @end -@implementation CHExtendedOutlineView (Private) +@implementation ExtendedOutlineView (Private) /* * Set up tooltip rects for every row, but only if the frame size or diff --git a/mozilla/chimera/src/extensions/GeckoUtils.h b/mozilla/chimera/src/extensions/GeckoUtils.h index dfa225a2ff0..85fc3860fbf 100644 --- a/mozilla/chimera/src/extensions/GeckoUtils.h +++ b/mozilla/chimera/src/extensions/GeckoUtils.h @@ -44,7 +44,7 @@ #include "nsIDOMHTMLImageElement.h" #include "nsIDOMCharacterData.h" -class CHGeckoUtils +class GeckoUtils { public: static void GatherTextUnder(nsIDOMNode* aNode, nsString& aResult) { diff --git a/mozilla/chimera/src/extensions/IconTabViewItem.h b/mozilla/chimera/src/extensions/IconTabViewItem.h index f56f0635483..7f94e61b861 100644 --- a/mozilla/chimera/src/extensions/IconTabViewItem.h +++ b/mozilla/chimera/src/extensions/IconTabViewItem.h @@ -40,7 +40,7 @@ #import -@interface CHIconTabViewItem : NSTabViewItem +@interface IconTabViewItem : NSTabViewItem { NSImage *mTabIcon; NSDictionary *mLabelAttributes; diff --git a/mozilla/chimera/src/extensions/IconTabViewItem.mm b/mozilla/chimera/src/extensions/IconTabViewItem.mm index dc58171d306..5439e1da760 100644 --- a/mozilla/chimera/src/extensions/IconTabViewItem.mm +++ b/mozilla/chimera/src/extensions/IconTabViewItem.mm @@ -41,7 +41,7 @@ #import "NSString+Utils.h" -#import "CHIconTabViewItem.h" +#import "IconTabViewItem.h" #import "NSString+Utils.h" // @@ -53,11 +53,11 @@ static const int kMinTabsForSpacing = 4; // with 1-4 tabs, each tab is 1/4 the tab view width -@interface CHIconTabViewItem(Private) +@interface IconTabViewItem(Private) - (void)setupLabelAttributes; @end; -@implementation CHIconTabViewItem +@implementation IconTabViewItem -(id)initWithIdentifier:(id)identifier withTabIcon:(NSImage *)tabIcon { diff --git a/mozilla/chimera/src/extensions/ImageAdditions.h b/mozilla/chimera/src/extensions/ImageAdditions.h index 54c5e8cd1a5..ffdc35eca9c 100644 --- a/mozilla/chimera/src/extensions/ImageAdditions.h +++ b/mozilla/chimera/src/extensions/ImageAdditions.h @@ -1,6 +1,6 @@ #import -@interface NSImage (CHImageAdditions) +@interface NSImage (ImageAdditions) - (void) drawFlippedInRect:(NSRect) rect operation:(NSCompositingOperation) op fraction:(float) delta; - (void) drawFlippedInRect:(NSRect) rect operation:(NSCompositingOperation) op; - (void)applyBadge:(NSImage*)badge withAlpha:(float)alpha scale:(float)scale; diff --git a/mozilla/chimera/src/extensions/ImageAdditions.m b/mozilla/chimera/src/extensions/ImageAdditions.m index 81362fda06e..173918ec057 100644 --- a/mozilla/chimera/src/extensions/ImageAdditions.m +++ b/mozilla/chimera/src/extensions/ImageAdditions.m @@ -1,7 +1,7 @@ -#import "CHImageAdditions.h" +#import "ImageAdditions.h" #import -@implementation NSImage (CHImageAdditions) +@implementation NSImage (ImageAdditions) - (void) drawFlippedInRect:(NSRect) rect operation:(NSCompositingOperation) op fraction:(float) delta { CGContextRef context; diff --git a/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.h b/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.h index 2d66e0ef490..dd6bc273a2c 100644 --- a/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.h +++ b/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.h @@ -45,7 +45,7 @@ class nsIRDFContainerUtils; class nsIRDFResource; class nsIRDFService; -@interface CHRDFOutlineViewDataSource : NSObject { +@interface RDFOutlineViewDataSource : NSObject { nsIRDFDataSource* mDataSource; nsIRDFContainer* mContainer; nsIRDFContainerUtils* mContainerUtils; diff --git a/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.mm b/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.mm index c39c8263299..8082b634f7c 100644 --- a/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.mm +++ b/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.mm @@ -38,7 +38,7 @@ #import "NSString+Utils.h" -#import "CHRDFOutlineViewDataSource.h" +#import "RDFOutlineViewDataSource.h" #include "nsIRDFDataSource.h" #include "nsIRDFService.h" @@ -56,7 +56,7 @@ -@implementation CHRDFOutlineViewDataSource +@implementation RDFOutlineViewDataSource - (void) ensureDataSourceLoaded { diff --git a/mozilla/chimera/src/extensions/ToolbarAdditions.m b/mozilla/chimera/src/extensions/ToolbarAdditions.m index 62e3c6f1bc8..363bb2711d4 100644 --- a/mozilla/chimera/src/extensions/ToolbarAdditions.m +++ b/mozilla/chimera/src/extensions/ToolbarAdditions.m @@ -1,4 +1,4 @@ -#import "CHToolbarAdditions.h" +#import "ToolbarAdditions.h" #import @implementation NSToolbar (CHToolbarCustomizableAdditions) diff --git a/mozilla/chimera/src/find/Find.h b/mozilla/chimera/src/find/Find.h index 588a815c0c5..21d79118f1b 100644 --- a/mozilla/chimera/src/find/Find.h +++ b/mozilla/chimera/src/find/Find.h @@ -24,13 +24,13 @@ #import // -// protocol CHFind +// protocol Find // // Any window who wants to be able to work with the Find dialog should implement // this protocol. // -@protocol CHFind +@protocol Find - (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive wrap:(BOOL)inWrap backwards:(BOOL)inBackwards; diff --git a/mozilla/chimera/src/find/FindDlgController.mm b/mozilla/chimera/src/find/FindDlgController.mm index 23de3042d6d..edf9fa9fe20 100644 --- a/mozilla/chimera/src/find/FindDlgController.mm +++ b/mozilla/chimera/src/find/FindDlgController.mm @@ -37,7 +37,7 @@ #import "FindDlgController.h" #import "BrowserWindowController.h" -#import "CHFind.h" +#import "Find.h" #include "nsCOMPtr.h" @@ -70,8 +70,8 @@ -(IBAction) find: (id)aSender { NSWindowController* controller = [[NSApp mainWindow] windowController]; - if ( [controller conformsToProtocol:@protocol(CHFind)] ) { - id browserController = controller; + if ( [controller conformsToProtocol:@protocol(Find)] ) { + id browserController = controller; BOOL ignoreCase = [mIgnoreCaseBox state]; BOOL wrapSearch = [mWrapAroundBox state]; BOOL searchBack = [mSearchBackwardsBox state]; @@ -99,8 +99,8 @@ -(IBAction) findAgain: (id)aSender { NSWindowController* controller = [[NSApp mainWindow] windowController]; - if ( [controller conformsToProtocol:@protocol(CHFind)] ) { - id browserController = controller; + if ( [controller conformsToProtocol:@protocol(Find)] ) { + id browserController = controller; BOOL ignoreCase = [mIgnoreCaseBox state]; BOOL wrapSearch = [mWrapAroundBox state]; BOOL searchBack = [mSearchBackwardsBox state]; diff --git a/mozilla/chimera/src/history/HistoryDataSource.h b/mozilla/chimera/src/history/HistoryDataSource.h index cb2259e98bd..db46cba67d1 100644 --- a/mozilla/chimera/src/history/HistoryDataSource.h +++ b/mozilla/chimera/src/history/HistoryDataSource.h @@ -1,5 +1,5 @@ // -// CHHistoryDataSource.h +// HistoryDataSource.h // Chimera // // Created by Ben Goodger on Sun Apr 28 2002. @@ -8,11 +8,11 @@ #import -#import "CHRDFOutlineViewDataSource.h" +#import "RDFOutlineViewDataSource.h" @class BrowserWindowController; -@interface CHHistoryDataSource : CHRDFOutlineViewDataSource +@interface HistoryDataSource : RDFOutlineViewDataSource { IBOutlet BrowserWindowController* mBrowserWindowController; diff --git a/mozilla/chimera/src/history/HistoryDataSource.mm b/mozilla/chimera/src/history/HistoryDataSource.mm index 932676ef92d..976dc340c69 100644 --- a/mozilla/chimera/src/history/HistoryDataSource.mm +++ b/mozilla/chimera/src/history/HistoryDataSource.mm @@ -1,5 +1,5 @@ // -// CHHistoryDataSource.mm +// HistoryDataSource.mm // Chimera // // Created by Ben Goodger on Sun Apr 28 2002. @@ -9,7 +9,7 @@ #import "NSString+Utils.h" #import "BrowserWindowController.h" -#import "CHHistoryDataSource.h" +#import "HistoryDataSource.h" #import "CHBrowserView.h" #include "nsIRDFService.h" @@ -21,7 +21,7 @@ #include "nsComponentManagerUtils.h" -@implementation CHHistoryDataSource +@implementation HistoryDataSource - (void) ensureDataSourceLoaded { diff --git a/mozilla/chimera/src/preferences/MVPreferencesController.mm b/mozilla/chimera/src/preferences/MVPreferencesController.mm index 6719b1ff9aa..3d83175c672 100644 --- a/mozilla/chimera/src/preferences/MVPreferencesController.mm +++ b/mozilla/chimera/src/preferences/MVPreferencesController.mm @@ -2,12 +2,12 @@ #import "MVPreferencesController.h" #import "MVPreferencesMultipleIconView.h" #import "MVPreferencesGroupedIconView.h" -#import "CHToolbarAdditions.h" +#import "ToolbarAdditions.h" #include "nsCOMPtr.h" #include "nsIServiceManager.h" #include "nsIPref.h" -#include "nsCocoaBrowserService.h" +#include "CHBrowserService.h" // #import "Defines.h" @@ -114,7 +114,7 @@ NSString *MVPreferencesWindowNotification = @"MVPreferencesWindowNotification"; // with it in |windowDidClose()|. Need to ensure this is exactly balanced with |BrowserClosed()| // calls as it increments a refcount. As a result, we can only call it when we're making // the window visible. Too bad cocoa doesn't give us any notifications of this. - nsCocoaBrowserService::InitEmbedding(); + CHBrowserService::InitEmbedding(); } [self showAll:nil]; [window makeKeyAndOrderFront:nil]; @@ -236,7 +236,7 @@ NSString *MVPreferencesWindowNotification = @"MVPreferencesWindowNotification"; [[NSUserDefaults standardUserDefaults] synchronize]; // tell gecko that this window no longer needs it around. - nsCocoaBrowserService::BrowserClosed(); + CHBrowserService::BrowserClosed(); } - (NSToolbarItem *) toolbar:(NSToolbar *) toolbar diff --git a/mozilla/chimera/src/preferences/MVPreferencesMultipleIconView.m b/mozilla/chimera/src/preferences/MVPreferencesMultipleIconView.m index 571f1f80192..c79db49f8d0 100644 --- a/mozilla/chimera/src/preferences/MVPreferencesMultipleIconView.m +++ b/mozilla/chimera/src/preferences/MVPreferencesMultipleIconView.m @@ -1,7 +1,7 @@ #import #import "MVPreferencesMultipleIconView.h" #import "MVPreferencesController.h" -#import "CHImageAdditions.h" +#import "ImageAdditions.h" @interface MVPreferencesMultipleIconView (MVPreferencesMultipleIconViewPrivate) - (void) _focusFirst; diff --git a/mozilla/chimera/src/preferences/PreferenceManager.h b/mozilla/chimera/src/preferences/PreferenceManager.h index a682a4c80e4..75f9ebc137c 100644 --- a/mozilla/chimera/src/preferences/PreferenceManager.h +++ b/mozilla/chimera/src/preferences/PreferenceManager.h @@ -40,14 +40,14 @@ class nsIPref; -@interface CHPreferenceManager : NSObject +@interface PreferenceManager : NSObject { NSUserDefaults* mDefaults; ICInstance mInternetConfig; nsIPref* mPrefs; } -+ (CHPreferenceManager *)sharedInstance; ++ (PreferenceManager *)sharedInstance; - (id) init; - (void) dealloc; diff --git a/mozilla/chimera/src/preferences/PreferenceManager.mm b/mozilla/chimera/src/preferences/PreferenceManager.mm index 1fcdece52f9..8b5b5470f8b 100644 --- a/mozilla/chimera/src/preferences/PreferenceManager.mm +++ b/mozilla/chimera/src/preferences/PreferenceManager.mm @@ -39,8 +39,8 @@ #import #import -#import "CHPreferenceManager.h" -#import "CHUserDefaults.h" +#import "PreferenceManager.h" +#import "UserDefaults.h" #include "nsIServiceManager.h" #include "nsIProfile.h" @@ -58,12 +58,12 @@ nsresult PR_CALLBACK app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); #endif -@implementation CHPreferenceManager +@implementation PreferenceManager -+ (CHPreferenceManager *) sharedInstance { - static CHPreferenceManager *sSharedInstance = nil; - return ( sSharedInstance ? sSharedInstance : (sSharedInstance = [[[CHPreferenceManager alloc] init] autorelease] )); ++ (PreferenceManager *) sharedInstance { + static PreferenceManager *sSharedInstance = nil; + return ( sSharedInstance ? sSharedInstance : (sSharedInstance = [[[PreferenceManager alloc] init] autorelease] )); }