diff --git a/camino/BrowserWindowController.mm b/camino/BrowserWindowController.mm index add7f7538795..cd111b431d7e 100644 --- a/camino/BrowserWindowController.mm +++ b/camino/BrowserWindowController.mm @@ -624,21 +624,22 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par - (NSArray*)throbberImages { - // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to - // save all of the frames of the animated gif as individual .tif files for simplicity of implementation. - if (mThrobberImages == nil) { - NSImage* images[43]; - for (int i = 0; i < 43; ++i) { - NSString* imageName = [NSString stringWithFormat: @"throbber-%02d", i + 1]; - images[i] = [NSImage imageNamed: imageName]; - if (images[i] == nil) { - NSLog(@"throbber image %@ failed to load", imageName); - abort(); - } - } - mThrobberImages = [[NSArray alloc] initWithObjects: images count: 43]; + const int kNumThrobberImages = 6; + // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to + // save all of the frames of the animated gif as individual .tif files for simplicity of implementation. + if (mThrobberImages == nil) { + NSImage* images[kNumThrobberImages]; + for (int i = 0; i < kNumThrobberImages; ++i) { + NSString* imageName = [NSString stringWithFormat: @"throbber-%02d", i + 1]; + images[i] = [NSImage imageNamed: imageName]; + if (images[i] == nil) { + NSLog(@"throbber image %@ failed to load", imageName); + abort(); + } } - return mThrobberImages; + mThrobberImages = [[NSArray alloc] initWithObjects: images count: kNumThrobberImages]; + } + return mThrobberImages; } - (NSToolbarItem*)throbberItem diff --git a/camino/Chimera.pbproj/project.pbxproj b/camino/Chimera.pbproj/project.pbxproj index 1c14c5dc17a6..3ef930ba91e6 100644 --- a/camino/Chimera.pbproj/project.pbxproj +++ b/camino/Chimera.pbproj/project.pbxproj @@ -490,43 +490,6 @@ F5960E7402BA4E4901000103, F5960E7502BA4E4901000103, F5960E7602BA4E4901000103, - F5960E7702BA4E4901000103, - F5960E7802BA4E4901000103, - F5960E7902BA4E4901000103, - F5960E7A02BA4E4901000103, - F5960E7B02BA4E4901000103, - F5960E7C02BA4E4901000103, - F5960E7D02BA4E4901000103, - F5960E7E02BA4E4901000103, - F5960E7F02BA4E4901000103, - F5960E8002BA4E4901000103, - F5960E8102BA4E4901000103, - F5960E8202BA4E4901000103, - F5960E8302BA4E4901000103, - F5960E8402BA4E4901000103, - F5960E8502BA4E4901000103, - F5960E8602BA4E4901000103, - F5960E8702BA4E4901000103, - F5960E8802BA4E4901000103, - F5960E8902BA4E4901000103, - F5960E8A02BA4E4901000103, - F5960E8B02BA4E4901000103, - F5960E8C02BA4E4901000103, - F5960E8D02BA4E4901000103, - F5960E8E02BA4E4901000103, - F5960E8F02BA4E4901000103, - F5960E9002BA4E4901000103, - F5960E9102BA4E4901000103, - F5960E9202BA4E4901000103, - F5960E9302BA4E4901000103, - F5960E9402BA4E4901000103, - F5960E9502BA4E4901000103, - F5960E9602BA4E4901000103, - F5960E9702BA4E4901000103, - F5960E9802BA4E4901000103, - F5960E9902BA4E4901000103, - F5960E9A02BA4E4901000103, - F5960E9B02BA4E4901000103, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -3904,43 +3867,6 @@ F5960E4902BA4E4901000103, F5960E4A02BA4E4901000103, F5960E4B02BA4E4901000103, - F5960E4C02BA4E4901000103, - F5960E4D02BA4E4901000103, - F5960E4E02BA4E4901000103, - F5960E4F02BA4E4901000103, - F5960E5002BA4E4901000103, - F5960E5102BA4E4901000103, - F5960E5202BA4E4901000103, - F5960E5302BA4E4901000103, - F5960E5402BA4E4901000103, - F5960E5502BA4E4901000103, - F5960E5602BA4E4901000103, - F5960E5702BA4E4901000103, - F5960E5802BA4E4901000103, - F5960E5902BA4E4901000103, - F5960E5A02BA4E4901000103, - F5960E5B02BA4E4901000103, - F5960E5C02BA4E4901000103, - F5960E5D02BA4E4901000103, - F5960E5E02BA4E4901000103, - F5960E5F02BA4E4901000103, - F5960E6002BA4E4901000103, - F5960E6102BA4E4901000103, - F5960E6202BA4E4901000103, - F5960E6302BA4E4901000103, - F5960E6402BA4E4901000103, - F5960E6502BA4E4901000103, - F5960E6602BA4E4901000103, - F5960E6702BA4E4901000103, - F5960E6802BA4E4901000103, - F5960E6902BA4E4901000103, - F5960E6A02BA4E4901000103, - F5960E6B02BA4E4901000103, - F5960E6C02BA4E4901000103, - F5960E6D02BA4E4901000103, - F5960E6E02BA4E4901000103, - F5960E6F02BA4E4901000103, - F5960E7002BA4E4901000103, ); isa = PBXGroup; path = throbber; @@ -3976,191 +3902,6 @@ path = "throbber-06.tif"; refType = 4; }; - F5960E4C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-07.tif"; - refType = 4; - }; - F5960E4D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-08.tif"; - refType = 4; - }; - F5960E4E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-09.tif"; - refType = 4; - }; - F5960E4F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-10.tif"; - refType = 4; - }; - F5960E5002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-11.tif"; - refType = 4; - }; - F5960E5102BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-12.tif"; - refType = 4; - }; - F5960E5202BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-13.tif"; - refType = 4; - }; - F5960E5302BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-14.tif"; - refType = 4; - }; - F5960E5402BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-15.tif"; - refType = 4; - }; - F5960E5502BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-16.tif"; - refType = 4; - }; - F5960E5602BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-17.tif"; - refType = 4; - }; - F5960E5702BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-18.tif"; - refType = 4; - }; - F5960E5802BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-19.tif"; - refType = 4; - }; - F5960E5902BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-20.tif"; - refType = 4; - }; - F5960E5A02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-21.tif"; - refType = 4; - }; - F5960E5B02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-22.tif"; - refType = 4; - }; - F5960E5C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-23.tif"; - refType = 4; - }; - F5960E5D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-24.tif"; - refType = 4; - }; - F5960E5E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-25.tif"; - refType = 4; - }; - F5960E5F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-26.tif"; - refType = 4; - }; - F5960E6002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-27.tif"; - refType = 4; - }; - F5960E6102BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-28.tif"; - refType = 4; - }; - F5960E6202BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-29.tif"; - refType = 4; - }; - F5960E6302BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-30.tif"; - refType = 4; - }; - F5960E6402BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-31.tif"; - refType = 4; - }; - F5960E6502BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-32.tif"; - refType = 4; - }; - F5960E6602BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-33.tif"; - refType = 4; - }; - F5960E6702BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-34.tif"; - refType = 4; - }; - F5960E6802BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-35.tif"; - refType = 4; - }; - F5960E6902BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-36.tif"; - refType = 4; - }; - F5960E6A02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-37.tif"; - refType = 4; - }; - F5960E6B02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-38.tif"; - refType = 4; - }; - F5960E6C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-39.tif"; - refType = 4; - }; - F5960E6D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-40.tif"; - refType = 4; - }; - F5960E6E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-41.tif"; - refType = 4; - }; - F5960E6F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-42.tif"; - refType = 4; - }; - F5960E7002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-43.tif"; - refType = 4; - }; F5960E7102BA4E4901000103 = { fileRef = F5960E4602BA4E4901000103; isa = PBXBuildFile; @@ -4197,228 +3938,6 @@ settings = { }; }; - F5960E7702BA4E4901000103 = { - fileRef = F5960E4C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7802BA4E4901000103 = { - fileRef = F5960E4D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7902BA4E4901000103 = { - fileRef = F5960E4E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7A02BA4E4901000103 = { - fileRef = F5960E4F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7B02BA4E4901000103 = { - fileRef = F5960E5002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7C02BA4E4901000103 = { - fileRef = F5960E5102BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7D02BA4E4901000103 = { - fileRef = F5960E5202BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7E02BA4E4901000103 = { - fileRef = F5960E5302BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7F02BA4E4901000103 = { - fileRef = F5960E5402BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8002BA4E4901000103 = { - fileRef = F5960E5502BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8102BA4E4901000103 = { - fileRef = F5960E5602BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8202BA4E4901000103 = { - fileRef = F5960E5702BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8302BA4E4901000103 = { - fileRef = F5960E5802BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8402BA4E4901000103 = { - fileRef = F5960E5902BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8502BA4E4901000103 = { - fileRef = F5960E5A02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8602BA4E4901000103 = { - fileRef = F5960E5B02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8702BA4E4901000103 = { - fileRef = F5960E5C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8802BA4E4901000103 = { - fileRef = F5960E5D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8902BA4E4901000103 = { - fileRef = F5960E5E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8A02BA4E4901000103 = { - fileRef = F5960E5F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8B02BA4E4901000103 = { - fileRef = F5960E6002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8C02BA4E4901000103 = { - fileRef = F5960E6102BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8D02BA4E4901000103 = { - fileRef = F5960E6202BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8E02BA4E4901000103 = { - fileRef = F5960E6302BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8F02BA4E4901000103 = { - fileRef = F5960E6402BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9002BA4E4901000103 = { - fileRef = F5960E6502BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9102BA4E4901000103 = { - fileRef = F5960E6602BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9202BA4E4901000103 = { - fileRef = F5960E6702BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9302BA4E4901000103 = { - fileRef = F5960E6802BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9402BA4E4901000103 = { - fileRef = F5960E6902BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9502BA4E4901000103 = { - fileRef = F5960E6A02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9602BA4E4901000103 = { - fileRef = F5960E6B02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9702BA4E4901000103 = { - fileRef = F5960E6C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9802BA4E4901000103 = { - fileRef = F5960E6D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9902BA4E4901000103 = { - fileRef = F5960E6E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9A02BA4E4901000103 = { - fileRef = F5960E6F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9B02BA4E4901000103 = { - fileRef = F5960E7002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; F5960E9C02BA686001000103 = { fileRef = F5FEDBCB02AD8DD101A967F3; isa = PBXBuildFile; diff --git a/camino/projects/Chimera.pbproj/project.pbxproj b/camino/projects/Chimera.pbproj/project.pbxproj index 1c14c5dc17a6..3ef930ba91e6 100644 --- a/camino/projects/Chimera.pbproj/project.pbxproj +++ b/camino/projects/Chimera.pbproj/project.pbxproj @@ -490,43 +490,6 @@ F5960E7402BA4E4901000103, F5960E7502BA4E4901000103, F5960E7602BA4E4901000103, - F5960E7702BA4E4901000103, - F5960E7802BA4E4901000103, - F5960E7902BA4E4901000103, - F5960E7A02BA4E4901000103, - F5960E7B02BA4E4901000103, - F5960E7C02BA4E4901000103, - F5960E7D02BA4E4901000103, - F5960E7E02BA4E4901000103, - F5960E7F02BA4E4901000103, - F5960E8002BA4E4901000103, - F5960E8102BA4E4901000103, - F5960E8202BA4E4901000103, - F5960E8302BA4E4901000103, - F5960E8402BA4E4901000103, - F5960E8502BA4E4901000103, - F5960E8602BA4E4901000103, - F5960E8702BA4E4901000103, - F5960E8802BA4E4901000103, - F5960E8902BA4E4901000103, - F5960E8A02BA4E4901000103, - F5960E8B02BA4E4901000103, - F5960E8C02BA4E4901000103, - F5960E8D02BA4E4901000103, - F5960E8E02BA4E4901000103, - F5960E8F02BA4E4901000103, - F5960E9002BA4E4901000103, - F5960E9102BA4E4901000103, - F5960E9202BA4E4901000103, - F5960E9302BA4E4901000103, - F5960E9402BA4E4901000103, - F5960E9502BA4E4901000103, - F5960E9602BA4E4901000103, - F5960E9702BA4E4901000103, - F5960E9802BA4E4901000103, - F5960E9902BA4E4901000103, - F5960E9A02BA4E4901000103, - F5960E9B02BA4E4901000103, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -3904,43 +3867,6 @@ F5960E4902BA4E4901000103, F5960E4A02BA4E4901000103, F5960E4B02BA4E4901000103, - F5960E4C02BA4E4901000103, - F5960E4D02BA4E4901000103, - F5960E4E02BA4E4901000103, - F5960E4F02BA4E4901000103, - F5960E5002BA4E4901000103, - F5960E5102BA4E4901000103, - F5960E5202BA4E4901000103, - F5960E5302BA4E4901000103, - F5960E5402BA4E4901000103, - F5960E5502BA4E4901000103, - F5960E5602BA4E4901000103, - F5960E5702BA4E4901000103, - F5960E5802BA4E4901000103, - F5960E5902BA4E4901000103, - F5960E5A02BA4E4901000103, - F5960E5B02BA4E4901000103, - F5960E5C02BA4E4901000103, - F5960E5D02BA4E4901000103, - F5960E5E02BA4E4901000103, - F5960E5F02BA4E4901000103, - F5960E6002BA4E4901000103, - F5960E6102BA4E4901000103, - F5960E6202BA4E4901000103, - F5960E6302BA4E4901000103, - F5960E6402BA4E4901000103, - F5960E6502BA4E4901000103, - F5960E6602BA4E4901000103, - F5960E6702BA4E4901000103, - F5960E6802BA4E4901000103, - F5960E6902BA4E4901000103, - F5960E6A02BA4E4901000103, - F5960E6B02BA4E4901000103, - F5960E6C02BA4E4901000103, - F5960E6D02BA4E4901000103, - F5960E6E02BA4E4901000103, - F5960E6F02BA4E4901000103, - F5960E7002BA4E4901000103, ); isa = PBXGroup; path = throbber; @@ -3976,191 +3902,6 @@ path = "throbber-06.tif"; refType = 4; }; - F5960E4C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-07.tif"; - refType = 4; - }; - F5960E4D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-08.tif"; - refType = 4; - }; - F5960E4E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-09.tif"; - refType = 4; - }; - F5960E4F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-10.tif"; - refType = 4; - }; - F5960E5002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-11.tif"; - refType = 4; - }; - F5960E5102BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-12.tif"; - refType = 4; - }; - F5960E5202BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-13.tif"; - refType = 4; - }; - F5960E5302BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-14.tif"; - refType = 4; - }; - F5960E5402BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-15.tif"; - refType = 4; - }; - F5960E5502BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-16.tif"; - refType = 4; - }; - F5960E5602BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-17.tif"; - refType = 4; - }; - F5960E5702BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-18.tif"; - refType = 4; - }; - F5960E5802BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-19.tif"; - refType = 4; - }; - F5960E5902BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-20.tif"; - refType = 4; - }; - F5960E5A02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-21.tif"; - refType = 4; - }; - F5960E5B02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-22.tif"; - refType = 4; - }; - F5960E5C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-23.tif"; - refType = 4; - }; - F5960E5D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-24.tif"; - refType = 4; - }; - F5960E5E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-25.tif"; - refType = 4; - }; - F5960E5F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-26.tif"; - refType = 4; - }; - F5960E6002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-27.tif"; - refType = 4; - }; - F5960E6102BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-28.tif"; - refType = 4; - }; - F5960E6202BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-29.tif"; - refType = 4; - }; - F5960E6302BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-30.tif"; - refType = 4; - }; - F5960E6402BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-31.tif"; - refType = 4; - }; - F5960E6502BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-32.tif"; - refType = 4; - }; - F5960E6602BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-33.tif"; - refType = 4; - }; - F5960E6702BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-34.tif"; - refType = 4; - }; - F5960E6802BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-35.tif"; - refType = 4; - }; - F5960E6902BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-36.tif"; - refType = 4; - }; - F5960E6A02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-37.tif"; - refType = 4; - }; - F5960E6B02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-38.tif"; - refType = 4; - }; - F5960E6C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-39.tif"; - refType = 4; - }; - F5960E6D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-40.tif"; - refType = 4; - }; - F5960E6E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-41.tif"; - refType = 4; - }; - F5960E6F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-42.tif"; - refType = 4; - }; - F5960E7002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-43.tif"; - refType = 4; - }; F5960E7102BA4E4901000103 = { fileRef = F5960E4602BA4E4901000103; isa = PBXBuildFile; @@ -4197,228 +3938,6 @@ settings = { }; }; - F5960E7702BA4E4901000103 = { - fileRef = F5960E4C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7802BA4E4901000103 = { - fileRef = F5960E4D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7902BA4E4901000103 = { - fileRef = F5960E4E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7A02BA4E4901000103 = { - fileRef = F5960E4F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7B02BA4E4901000103 = { - fileRef = F5960E5002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7C02BA4E4901000103 = { - fileRef = F5960E5102BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7D02BA4E4901000103 = { - fileRef = F5960E5202BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7E02BA4E4901000103 = { - fileRef = F5960E5302BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7F02BA4E4901000103 = { - fileRef = F5960E5402BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8002BA4E4901000103 = { - fileRef = F5960E5502BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8102BA4E4901000103 = { - fileRef = F5960E5602BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8202BA4E4901000103 = { - fileRef = F5960E5702BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8302BA4E4901000103 = { - fileRef = F5960E5802BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8402BA4E4901000103 = { - fileRef = F5960E5902BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8502BA4E4901000103 = { - fileRef = F5960E5A02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8602BA4E4901000103 = { - fileRef = F5960E5B02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8702BA4E4901000103 = { - fileRef = F5960E5C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8802BA4E4901000103 = { - fileRef = F5960E5D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8902BA4E4901000103 = { - fileRef = F5960E5E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8A02BA4E4901000103 = { - fileRef = F5960E5F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8B02BA4E4901000103 = { - fileRef = F5960E6002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8C02BA4E4901000103 = { - fileRef = F5960E6102BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8D02BA4E4901000103 = { - fileRef = F5960E6202BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8E02BA4E4901000103 = { - fileRef = F5960E6302BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8F02BA4E4901000103 = { - fileRef = F5960E6402BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9002BA4E4901000103 = { - fileRef = F5960E6502BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9102BA4E4901000103 = { - fileRef = F5960E6602BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9202BA4E4901000103 = { - fileRef = F5960E6702BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9302BA4E4901000103 = { - fileRef = F5960E6802BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9402BA4E4901000103 = { - fileRef = F5960E6902BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9502BA4E4901000103 = { - fileRef = F5960E6A02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9602BA4E4901000103 = { - fileRef = F5960E6B02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9702BA4E4901000103 = { - fileRef = F5960E6C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9802BA4E4901000103 = { - fileRef = F5960E6D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9902BA4E4901000103 = { - fileRef = F5960E6E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9A02BA4E4901000103 = { - fileRef = F5960E6F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9B02BA4E4901000103 = { - fileRef = F5960E7002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; F5960E9C02BA686001000103 = { fileRef = F5FEDBCB02AD8DD101A967F3; isa = PBXBuildFile; diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm index add7f7538795..cd111b431d7e 100644 --- a/camino/src/browser/BrowserWindowController.mm +++ b/camino/src/browser/BrowserWindowController.mm @@ -624,21 +624,22 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par - (NSArray*)throbberImages { - // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to - // save all of the frames of the animated gif as individual .tif files for simplicity of implementation. - if (mThrobberImages == nil) { - NSImage* images[43]; - for (int i = 0; i < 43; ++i) { - NSString* imageName = [NSString stringWithFormat: @"throbber-%02d", i + 1]; - images[i] = [NSImage imageNamed: imageName]; - if (images[i] == nil) { - NSLog(@"throbber image %@ failed to load", imageName); - abort(); - } - } - mThrobberImages = [[NSArray alloc] initWithObjects: images count: 43]; + const int kNumThrobberImages = 6; + // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to + // save all of the frames of the animated gif as individual .tif files for simplicity of implementation. + if (mThrobberImages == nil) { + NSImage* images[kNumThrobberImages]; + for (int i = 0; i < kNumThrobberImages; ++i) { + NSString* imageName = [NSString stringWithFormat: @"throbber-%02d", i + 1]; + images[i] = [NSImage imageNamed: imageName]; + if (images[i] == nil) { + NSLog(@"throbber image %@ failed to load", imageName); + abort(); + } } - return mThrobberImages; + mThrobberImages = [[NSArray alloc] initWithObjects: images count: kNumThrobberImages]; + } + return mThrobberImages; } - (NSToolbarItem*)throbberItem diff --git a/chimera/BrowserWindowController.mm b/chimera/BrowserWindowController.mm index add7f7538795..cd111b431d7e 100644 --- a/chimera/BrowserWindowController.mm +++ b/chimera/BrowserWindowController.mm @@ -624,21 +624,22 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par - (NSArray*)throbberImages { - // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to - // save all of the frames of the animated gif as individual .tif files for simplicity of implementation. - if (mThrobberImages == nil) { - NSImage* images[43]; - for (int i = 0; i < 43; ++i) { - NSString* imageName = [NSString stringWithFormat: @"throbber-%02d", i + 1]; - images[i] = [NSImage imageNamed: imageName]; - if (images[i] == nil) { - NSLog(@"throbber image %@ failed to load", imageName); - abort(); - } - } - mThrobberImages = [[NSArray alloc] initWithObjects: images count: 43]; + const int kNumThrobberImages = 6; + // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to + // save all of the frames of the animated gif as individual .tif files for simplicity of implementation. + if (mThrobberImages == nil) { + NSImage* images[kNumThrobberImages]; + for (int i = 0; i < kNumThrobberImages; ++i) { + NSString* imageName = [NSString stringWithFormat: @"throbber-%02d", i + 1]; + images[i] = [NSImage imageNamed: imageName]; + if (images[i] == nil) { + NSLog(@"throbber image %@ failed to load", imageName); + abort(); + } } - return mThrobberImages; + mThrobberImages = [[NSArray alloc] initWithObjects: images count: kNumThrobberImages]; + } + return mThrobberImages; } - (NSToolbarItem*)throbberItem diff --git a/chimera/Chimera.pbproj/project.pbxproj b/chimera/Chimera.pbproj/project.pbxproj index 1c14c5dc17a6..3ef930ba91e6 100644 --- a/chimera/Chimera.pbproj/project.pbxproj +++ b/chimera/Chimera.pbproj/project.pbxproj @@ -490,43 +490,6 @@ F5960E7402BA4E4901000103, F5960E7502BA4E4901000103, F5960E7602BA4E4901000103, - F5960E7702BA4E4901000103, - F5960E7802BA4E4901000103, - F5960E7902BA4E4901000103, - F5960E7A02BA4E4901000103, - F5960E7B02BA4E4901000103, - F5960E7C02BA4E4901000103, - F5960E7D02BA4E4901000103, - F5960E7E02BA4E4901000103, - F5960E7F02BA4E4901000103, - F5960E8002BA4E4901000103, - F5960E8102BA4E4901000103, - F5960E8202BA4E4901000103, - F5960E8302BA4E4901000103, - F5960E8402BA4E4901000103, - F5960E8502BA4E4901000103, - F5960E8602BA4E4901000103, - F5960E8702BA4E4901000103, - F5960E8802BA4E4901000103, - F5960E8902BA4E4901000103, - F5960E8A02BA4E4901000103, - F5960E8B02BA4E4901000103, - F5960E8C02BA4E4901000103, - F5960E8D02BA4E4901000103, - F5960E8E02BA4E4901000103, - F5960E8F02BA4E4901000103, - F5960E9002BA4E4901000103, - F5960E9102BA4E4901000103, - F5960E9202BA4E4901000103, - F5960E9302BA4E4901000103, - F5960E9402BA4E4901000103, - F5960E9502BA4E4901000103, - F5960E9602BA4E4901000103, - F5960E9702BA4E4901000103, - F5960E9802BA4E4901000103, - F5960E9902BA4E4901000103, - F5960E9A02BA4E4901000103, - F5960E9B02BA4E4901000103, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -3904,43 +3867,6 @@ F5960E4902BA4E4901000103, F5960E4A02BA4E4901000103, F5960E4B02BA4E4901000103, - F5960E4C02BA4E4901000103, - F5960E4D02BA4E4901000103, - F5960E4E02BA4E4901000103, - F5960E4F02BA4E4901000103, - F5960E5002BA4E4901000103, - F5960E5102BA4E4901000103, - F5960E5202BA4E4901000103, - F5960E5302BA4E4901000103, - F5960E5402BA4E4901000103, - F5960E5502BA4E4901000103, - F5960E5602BA4E4901000103, - F5960E5702BA4E4901000103, - F5960E5802BA4E4901000103, - F5960E5902BA4E4901000103, - F5960E5A02BA4E4901000103, - F5960E5B02BA4E4901000103, - F5960E5C02BA4E4901000103, - F5960E5D02BA4E4901000103, - F5960E5E02BA4E4901000103, - F5960E5F02BA4E4901000103, - F5960E6002BA4E4901000103, - F5960E6102BA4E4901000103, - F5960E6202BA4E4901000103, - F5960E6302BA4E4901000103, - F5960E6402BA4E4901000103, - F5960E6502BA4E4901000103, - F5960E6602BA4E4901000103, - F5960E6702BA4E4901000103, - F5960E6802BA4E4901000103, - F5960E6902BA4E4901000103, - F5960E6A02BA4E4901000103, - F5960E6B02BA4E4901000103, - F5960E6C02BA4E4901000103, - F5960E6D02BA4E4901000103, - F5960E6E02BA4E4901000103, - F5960E6F02BA4E4901000103, - F5960E7002BA4E4901000103, ); isa = PBXGroup; path = throbber; @@ -3976,191 +3902,6 @@ path = "throbber-06.tif"; refType = 4; }; - F5960E4C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-07.tif"; - refType = 4; - }; - F5960E4D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-08.tif"; - refType = 4; - }; - F5960E4E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-09.tif"; - refType = 4; - }; - F5960E4F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-10.tif"; - refType = 4; - }; - F5960E5002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-11.tif"; - refType = 4; - }; - F5960E5102BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-12.tif"; - refType = 4; - }; - F5960E5202BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-13.tif"; - refType = 4; - }; - F5960E5302BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-14.tif"; - refType = 4; - }; - F5960E5402BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-15.tif"; - refType = 4; - }; - F5960E5502BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-16.tif"; - refType = 4; - }; - F5960E5602BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-17.tif"; - refType = 4; - }; - F5960E5702BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-18.tif"; - refType = 4; - }; - F5960E5802BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-19.tif"; - refType = 4; - }; - F5960E5902BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-20.tif"; - refType = 4; - }; - F5960E5A02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-21.tif"; - refType = 4; - }; - F5960E5B02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-22.tif"; - refType = 4; - }; - F5960E5C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-23.tif"; - refType = 4; - }; - F5960E5D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-24.tif"; - refType = 4; - }; - F5960E5E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-25.tif"; - refType = 4; - }; - F5960E5F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-26.tif"; - refType = 4; - }; - F5960E6002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-27.tif"; - refType = 4; - }; - F5960E6102BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-28.tif"; - refType = 4; - }; - F5960E6202BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-29.tif"; - refType = 4; - }; - F5960E6302BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-30.tif"; - refType = 4; - }; - F5960E6402BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-31.tif"; - refType = 4; - }; - F5960E6502BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-32.tif"; - refType = 4; - }; - F5960E6602BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-33.tif"; - refType = 4; - }; - F5960E6702BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-34.tif"; - refType = 4; - }; - F5960E6802BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-35.tif"; - refType = 4; - }; - F5960E6902BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-36.tif"; - refType = 4; - }; - F5960E6A02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-37.tif"; - refType = 4; - }; - F5960E6B02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-38.tif"; - refType = 4; - }; - F5960E6C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-39.tif"; - refType = 4; - }; - F5960E6D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-40.tif"; - refType = 4; - }; - F5960E6E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-41.tif"; - refType = 4; - }; - F5960E6F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-42.tif"; - refType = 4; - }; - F5960E7002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-43.tif"; - refType = 4; - }; F5960E7102BA4E4901000103 = { fileRef = F5960E4602BA4E4901000103; isa = PBXBuildFile; @@ -4197,228 +3938,6 @@ settings = { }; }; - F5960E7702BA4E4901000103 = { - fileRef = F5960E4C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7802BA4E4901000103 = { - fileRef = F5960E4D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7902BA4E4901000103 = { - fileRef = F5960E4E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7A02BA4E4901000103 = { - fileRef = F5960E4F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7B02BA4E4901000103 = { - fileRef = F5960E5002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7C02BA4E4901000103 = { - fileRef = F5960E5102BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7D02BA4E4901000103 = { - fileRef = F5960E5202BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7E02BA4E4901000103 = { - fileRef = F5960E5302BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7F02BA4E4901000103 = { - fileRef = F5960E5402BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8002BA4E4901000103 = { - fileRef = F5960E5502BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8102BA4E4901000103 = { - fileRef = F5960E5602BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8202BA4E4901000103 = { - fileRef = F5960E5702BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8302BA4E4901000103 = { - fileRef = F5960E5802BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8402BA4E4901000103 = { - fileRef = F5960E5902BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8502BA4E4901000103 = { - fileRef = F5960E5A02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8602BA4E4901000103 = { - fileRef = F5960E5B02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8702BA4E4901000103 = { - fileRef = F5960E5C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8802BA4E4901000103 = { - fileRef = F5960E5D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8902BA4E4901000103 = { - fileRef = F5960E5E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8A02BA4E4901000103 = { - fileRef = F5960E5F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8B02BA4E4901000103 = { - fileRef = F5960E6002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8C02BA4E4901000103 = { - fileRef = F5960E6102BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8D02BA4E4901000103 = { - fileRef = F5960E6202BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8E02BA4E4901000103 = { - fileRef = F5960E6302BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8F02BA4E4901000103 = { - fileRef = F5960E6402BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9002BA4E4901000103 = { - fileRef = F5960E6502BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9102BA4E4901000103 = { - fileRef = F5960E6602BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9202BA4E4901000103 = { - fileRef = F5960E6702BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9302BA4E4901000103 = { - fileRef = F5960E6802BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9402BA4E4901000103 = { - fileRef = F5960E6902BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9502BA4E4901000103 = { - fileRef = F5960E6A02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9602BA4E4901000103 = { - fileRef = F5960E6B02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9702BA4E4901000103 = { - fileRef = F5960E6C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9802BA4E4901000103 = { - fileRef = F5960E6D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9902BA4E4901000103 = { - fileRef = F5960E6E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9A02BA4E4901000103 = { - fileRef = F5960E6F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9B02BA4E4901000103 = { - fileRef = F5960E7002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; F5960E9C02BA686001000103 = { fileRef = F5FEDBCB02AD8DD101A967F3; isa = PBXBuildFile; diff --git a/chimera/projects/Chimera.pbproj/project.pbxproj b/chimera/projects/Chimera.pbproj/project.pbxproj index 1c14c5dc17a6..3ef930ba91e6 100644 --- a/chimera/projects/Chimera.pbproj/project.pbxproj +++ b/chimera/projects/Chimera.pbproj/project.pbxproj @@ -490,43 +490,6 @@ F5960E7402BA4E4901000103, F5960E7502BA4E4901000103, F5960E7602BA4E4901000103, - F5960E7702BA4E4901000103, - F5960E7802BA4E4901000103, - F5960E7902BA4E4901000103, - F5960E7A02BA4E4901000103, - F5960E7B02BA4E4901000103, - F5960E7C02BA4E4901000103, - F5960E7D02BA4E4901000103, - F5960E7E02BA4E4901000103, - F5960E7F02BA4E4901000103, - F5960E8002BA4E4901000103, - F5960E8102BA4E4901000103, - F5960E8202BA4E4901000103, - F5960E8302BA4E4901000103, - F5960E8402BA4E4901000103, - F5960E8502BA4E4901000103, - F5960E8602BA4E4901000103, - F5960E8702BA4E4901000103, - F5960E8802BA4E4901000103, - F5960E8902BA4E4901000103, - F5960E8A02BA4E4901000103, - F5960E8B02BA4E4901000103, - F5960E8C02BA4E4901000103, - F5960E8D02BA4E4901000103, - F5960E8E02BA4E4901000103, - F5960E8F02BA4E4901000103, - F5960E9002BA4E4901000103, - F5960E9102BA4E4901000103, - F5960E9202BA4E4901000103, - F5960E9302BA4E4901000103, - F5960E9402BA4E4901000103, - F5960E9502BA4E4901000103, - F5960E9602BA4E4901000103, - F5960E9702BA4E4901000103, - F5960E9802BA4E4901000103, - F5960E9902BA4E4901000103, - F5960E9A02BA4E4901000103, - F5960E9B02BA4E4901000103, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -3904,43 +3867,6 @@ F5960E4902BA4E4901000103, F5960E4A02BA4E4901000103, F5960E4B02BA4E4901000103, - F5960E4C02BA4E4901000103, - F5960E4D02BA4E4901000103, - F5960E4E02BA4E4901000103, - F5960E4F02BA4E4901000103, - F5960E5002BA4E4901000103, - F5960E5102BA4E4901000103, - F5960E5202BA4E4901000103, - F5960E5302BA4E4901000103, - F5960E5402BA4E4901000103, - F5960E5502BA4E4901000103, - F5960E5602BA4E4901000103, - F5960E5702BA4E4901000103, - F5960E5802BA4E4901000103, - F5960E5902BA4E4901000103, - F5960E5A02BA4E4901000103, - F5960E5B02BA4E4901000103, - F5960E5C02BA4E4901000103, - F5960E5D02BA4E4901000103, - F5960E5E02BA4E4901000103, - F5960E5F02BA4E4901000103, - F5960E6002BA4E4901000103, - F5960E6102BA4E4901000103, - F5960E6202BA4E4901000103, - F5960E6302BA4E4901000103, - F5960E6402BA4E4901000103, - F5960E6502BA4E4901000103, - F5960E6602BA4E4901000103, - F5960E6702BA4E4901000103, - F5960E6802BA4E4901000103, - F5960E6902BA4E4901000103, - F5960E6A02BA4E4901000103, - F5960E6B02BA4E4901000103, - F5960E6C02BA4E4901000103, - F5960E6D02BA4E4901000103, - F5960E6E02BA4E4901000103, - F5960E6F02BA4E4901000103, - F5960E7002BA4E4901000103, ); isa = PBXGroup; path = throbber; @@ -3976,191 +3902,6 @@ path = "throbber-06.tif"; refType = 4; }; - F5960E4C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-07.tif"; - refType = 4; - }; - F5960E4D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-08.tif"; - refType = 4; - }; - F5960E4E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-09.tif"; - refType = 4; - }; - F5960E4F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-10.tif"; - refType = 4; - }; - F5960E5002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-11.tif"; - refType = 4; - }; - F5960E5102BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-12.tif"; - refType = 4; - }; - F5960E5202BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-13.tif"; - refType = 4; - }; - F5960E5302BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-14.tif"; - refType = 4; - }; - F5960E5402BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-15.tif"; - refType = 4; - }; - F5960E5502BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-16.tif"; - refType = 4; - }; - F5960E5602BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-17.tif"; - refType = 4; - }; - F5960E5702BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-18.tif"; - refType = 4; - }; - F5960E5802BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-19.tif"; - refType = 4; - }; - F5960E5902BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-20.tif"; - refType = 4; - }; - F5960E5A02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-21.tif"; - refType = 4; - }; - F5960E5B02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-22.tif"; - refType = 4; - }; - F5960E5C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-23.tif"; - refType = 4; - }; - F5960E5D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-24.tif"; - refType = 4; - }; - F5960E5E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-25.tif"; - refType = 4; - }; - F5960E5F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-26.tif"; - refType = 4; - }; - F5960E6002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-27.tif"; - refType = 4; - }; - F5960E6102BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-28.tif"; - refType = 4; - }; - F5960E6202BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-29.tif"; - refType = 4; - }; - F5960E6302BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-30.tif"; - refType = 4; - }; - F5960E6402BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-31.tif"; - refType = 4; - }; - F5960E6502BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-32.tif"; - refType = 4; - }; - F5960E6602BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-33.tif"; - refType = 4; - }; - F5960E6702BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-34.tif"; - refType = 4; - }; - F5960E6802BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-35.tif"; - refType = 4; - }; - F5960E6902BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-36.tif"; - refType = 4; - }; - F5960E6A02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-37.tif"; - refType = 4; - }; - F5960E6B02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-38.tif"; - refType = 4; - }; - F5960E6C02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-39.tif"; - refType = 4; - }; - F5960E6D02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-40.tif"; - refType = 4; - }; - F5960E6E02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-41.tif"; - refType = 4; - }; - F5960E6F02BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-42.tif"; - refType = 4; - }; - F5960E7002BA4E4901000103 = { - isa = PBXFileReference; - path = "throbber-43.tif"; - refType = 4; - }; F5960E7102BA4E4901000103 = { fileRef = F5960E4602BA4E4901000103; isa = PBXBuildFile; @@ -4197,228 +3938,6 @@ settings = { }; }; - F5960E7702BA4E4901000103 = { - fileRef = F5960E4C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7802BA4E4901000103 = { - fileRef = F5960E4D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7902BA4E4901000103 = { - fileRef = F5960E4E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7A02BA4E4901000103 = { - fileRef = F5960E4F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7B02BA4E4901000103 = { - fileRef = F5960E5002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7C02BA4E4901000103 = { - fileRef = F5960E5102BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7D02BA4E4901000103 = { - fileRef = F5960E5202BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7E02BA4E4901000103 = { - fileRef = F5960E5302BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E7F02BA4E4901000103 = { - fileRef = F5960E5402BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8002BA4E4901000103 = { - fileRef = F5960E5502BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8102BA4E4901000103 = { - fileRef = F5960E5602BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8202BA4E4901000103 = { - fileRef = F5960E5702BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8302BA4E4901000103 = { - fileRef = F5960E5802BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8402BA4E4901000103 = { - fileRef = F5960E5902BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8502BA4E4901000103 = { - fileRef = F5960E5A02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8602BA4E4901000103 = { - fileRef = F5960E5B02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8702BA4E4901000103 = { - fileRef = F5960E5C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8802BA4E4901000103 = { - fileRef = F5960E5D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8902BA4E4901000103 = { - fileRef = F5960E5E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8A02BA4E4901000103 = { - fileRef = F5960E5F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8B02BA4E4901000103 = { - fileRef = F5960E6002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8C02BA4E4901000103 = { - fileRef = F5960E6102BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8D02BA4E4901000103 = { - fileRef = F5960E6202BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8E02BA4E4901000103 = { - fileRef = F5960E6302BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E8F02BA4E4901000103 = { - fileRef = F5960E6402BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9002BA4E4901000103 = { - fileRef = F5960E6502BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9102BA4E4901000103 = { - fileRef = F5960E6602BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9202BA4E4901000103 = { - fileRef = F5960E6702BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9302BA4E4901000103 = { - fileRef = F5960E6802BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9402BA4E4901000103 = { - fileRef = F5960E6902BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9502BA4E4901000103 = { - fileRef = F5960E6A02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9602BA4E4901000103 = { - fileRef = F5960E6B02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9702BA4E4901000103 = { - fileRef = F5960E6C02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9802BA4E4901000103 = { - fileRef = F5960E6D02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9902BA4E4901000103 = { - fileRef = F5960E6E02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9A02BA4E4901000103 = { - fileRef = F5960E6F02BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; - F5960E9B02BA4E4901000103 = { - fileRef = F5960E7002BA4E4901000103; - isa = PBXBuildFile; - settings = { - }; - }; F5960E9C02BA686001000103 = { fileRef = F5FEDBCB02AD8DD101A967F3; isa = PBXBuildFile; diff --git a/chimera/src/browser/BrowserWindowController.mm b/chimera/src/browser/BrowserWindowController.mm index add7f7538795..cd111b431d7e 100644 --- a/chimera/src/browser/BrowserWindowController.mm +++ b/chimera/src/browser/BrowserWindowController.mm @@ -624,21 +624,22 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par - (NSArray*)throbberImages { - // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to - // save all of the frames of the animated gif as individual .tif files for simplicity of implementation. - if (mThrobberImages == nil) { - NSImage* images[43]; - for (int i = 0; i < 43; ++i) { - NSString* imageName = [NSString stringWithFormat: @"throbber-%02d", i + 1]; - images[i] = [NSImage imageNamed: imageName]; - if (images[i] == nil) { - NSLog(@"throbber image %@ failed to load", imageName); - abort(); - } - } - mThrobberImages = [[NSArray alloc] initWithObjects: images count: 43]; + const int kNumThrobberImages = 6; + // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to + // save all of the frames of the animated gif as individual .tif files for simplicity of implementation. + if (mThrobberImages == nil) { + NSImage* images[kNumThrobberImages]; + for (int i = 0; i < kNumThrobberImages; ++i) { + NSString* imageName = [NSString stringWithFormat: @"throbber-%02d", i + 1]; + images[i] = [NSImage imageNamed: imageName]; + if (images[i] == nil) { + NSLog(@"throbber image %@ failed to load", imageName); + abort(); + } } - return mThrobberImages; + mThrobberImages = [[NSArray alloc] initWithObjects: images count: kNumThrobberImages]; + } + return mThrobberImages; } - (NSToolbarItem*)throbberItem