Index: trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm (revision 70) +++ trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm (revision 71) @@ -171,10 +171,6 @@ } } -- (IBAction)onAbout: (id)sender -{ - [mAboutDlg makeKeyAndOrderFront: sender]; -} //-------------------------------------------------------------------------- - (void) loadPreferences { Index: trunk/ChameleonPrefPane/Sources/AboutController.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/AboutController.mm (revision 0) +++ trunk/ChameleonPrefPane/Sources/AboutController.mm (revision 71) @@ -0,0 +1,40 @@ +// +// About.mm +// ChameleonPrefPane +// +// Created by Rekursor on 1/27/10. +// + +#import "AboutController.h" + + +@implementation AboutController +- (id) init +{ + [super init]; + + bundle = [NSBundle bundleForClass:[self class]]; + sCredits = [bundle pathForResource: @"CREDITS" ofType: nil ]; + return self; +} + +- (IBAction)onAbout: (id)sender +{ + [mAboutDlg makeKeyAndOrderFront: sender]; +} + +- (NSString *)bundleVersionNumber { + NSString * sVer = [[bundle infoDictionary] valueForKey:@"CFBundleVersion"]; + NSString * info = [[NSString alloc] initWithFormat:@"Version %@", sVer ]; + return info; +} + +- (NSString *)credits +{ + NSString* s = [[NSString alloc] + initWithContentsOfFile:sCredits encoding: NSASCIIStringEncoding error: nil]; + return s ? s : @""; +} + +@end + Index: trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h =================================================================== --- trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h (revision 70) +++ trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h (revision 71) @@ -29,7 +29,6 @@ @private // Objects corresponding to the interface mapping: - IBOutlet NSPanel* mAboutDlg; IBOutlet CustomTableView * mPartitionsTable; IBOutlet NSTableColumn * mPartitionImgColumn; IBOutlet NSTableColumn * mFileSystemColumn; @@ -65,7 +64,6 @@ - (IBAction)onRestart: (id)sender; - (IBAction)onShutdown: (id)sender; - (IBAction)onSleep: (id)sender; -- (IBAction)onAbout: (id)sender; - (void)awakeFromNib; - (void)initBootConfig; Index: trunk/ChameleonPrefPane/Sources/AboutController.h =================================================================== --- trunk/ChameleonPrefPane/Sources/AboutController.h (revision 0) +++ trunk/ChameleonPrefPane/Sources/AboutController.h (revision 71) @@ -0,0 +1,23 @@ +// +// About.h +// ChameleonPrefPane +// +// Created by Fabien on 1/27/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface AboutController : NSObject { + IBOutlet NSPanel* mAboutDlg; + + NSBundle* bundle; + NSString* sCredits; +} + +- (IBAction)onAbout: (id)sender; +- (NSString *)bundleVersionNumber; +- (NSString *)credits; + +@end Index: trunk/ChameleonPrefPane/Info.plist =================================================================== --- trunk/ChameleonPrefPane/Info.plist (revision 70) +++ trunk/ChameleonPrefPane/Info.plist (revision 71) @@ -17,11 +17,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.0 RC1 + 2.0 CFBundleSignature ???? CFBundleVersion - 2.0.0 + 2.0.0 RC1 NSMainNibFile Chameleon NSPrefPaneIconFile Index: trunk/ChameleonPrefPane/CHANGES =================================================================== --- trunk/ChameleonPrefPane/CHANGES (revision 70) +++ trunk/ChameleonPrefPane/CHANGES (revision 71) @@ -1,4 +1,4 @@ -- +- Added About Dialog, made the displayed version numbers all rely on the info.plist file - Fixed refresh and on checked associated button state, made sure the string is disabled if value is 0 - Fixed crash when using swap hd 0<->2 - Added a new option type (OptionFileString) that features an open dialog box to open files Index: trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj =================================================================== --- trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 70) +++ trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 71) @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 01001003110EBB2A00221234 /* CustomTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 01001001110EBB2A00221234 /* CustomTableView.h */; }; 01001004110EBB2A00221234 /* CustomTableView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 01001002110EBB2A00221234 /* CustomTableView.mm */; }; + 010914DC1110E9B20013CD58 /* AboutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 010914DA1110E9B20013CD58 /* AboutController.h */; }; + 010914DD1110E9B20013CD58 /* AboutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 010914DB1110E9B20013CD58 /* AboutController.mm */; }; 010CC625110927A2006EFFE9 /* QuestionMark.png in Resources */ = {isa = PBXBuildFile; fileRef = 010CC624110927A2006EFFE9 /* QuestionMark.png */; }; 013F671F110F7A7D0095EC8F /* cdBootCreator.sh in Resources */ = {isa = PBXBuildFile; fileRef = 013F671C110F7A7D0095EC8F /* cdBootCreator.sh */; }; 013F6720110F7A7D0095EC8F /* getDevProp.sh in Resources */ = {isa = PBXBuildFile; fileRef = 013F671D110F7A7D0095EC8F /* getDevProp.sh */; }; @@ -65,6 +67,8 @@ /* Begin PBXFileReference section */ 01001001110EBB2A00221234 /* CustomTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomTableView.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/CustomTableView.h; sourceTree = SOURCE_ROOT; }; 01001002110EBB2A00221234 /* CustomTableView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomTableView.mm; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/CustomTableView.mm; sourceTree = SOURCE_ROOT; }; + 010914DA1110E9B20013CD58 /* AboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AboutController.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/AboutController.h; sourceTree = SOURCE_ROOT; }; + 010914DB1110E9B20013CD58 /* AboutController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AboutController.mm; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/AboutController.mm; sourceTree = SOURCE_ROOT; }; 010CC624110927A2006EFFE9 /* QuestionMark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = QuestionMark.png; path = Resources/QuestionMark.png; sourceTree = SOURCE_ROOT; }; 013F671C110F7A7D0095EC8F /* cdBootCreator.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = cdBootCreator.sh; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Resources/cdBootCreator.sh; sourceTree = SOURCE_ROOT; }; 013F671D110F7A7D0095EC8F /* getDevProp.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = getDevProp.sh; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Resources/getDevProp.sh; sourceTree = SOURCE_ROOT; }; @@ -156,6 +160,8 @@ 013F67ED110F970D0095EC8F /* EfiInjectController.mm */, 013F67F2110F97580095EC8F /* SmbiosController.h */, 013F67F3110F97580095EC8F /* SmbiosController.mm */, + 010914DA1110E9B20013CD58 /* AboutController.h */, + 010914DB1110E9B20013CD58 /* AboutController.mm */, ); name = Controllers; sourceTree = ""; @@ -214,6 +220,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 01B0E8261108B89100ACF21B /* CREDITS */, 013F671C110F7A7D0095EC8F /* cdBootCreator.sh */, 013F671D110F7A7D0095EC8F /* getDevProp.sh */, 013F671E110F7A7D0095EC8F /* gfxutil */, @@ -274,7 +281,6 @@ children = ( 01E0E9501108F9ED004EF6E8 /* TODO */, 01B0E8281108B89D00ACF21B /* version */, - 01B0E8261108B89100ACF21B /* CREDITS */, 32DBCFA20370C41700C91783 /* StartupPrefPane_Prefix.pch */, 01A40F74110550F4002A74CD /* CHANGES */, 0196529A11066CC0009E8F2F /* README */, @@ -306,6 +312,7 @@ 01001003110EBB2A00221234 /* CustomTableView.h in Headers */, 013F67EE110F970D0095EC8F /* EfiInjectController.h in Headers */, 013F67F4110F97580095EC8F /* SmbiosController.h in Headers */, + 010914DC1110E9B20013CD58 /* AboutController.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -406,6 +413,7 @@ 01001004110EBB2A00221234 /* CustomTableView.mm in Sources */, 013F67EF110F970D0095EC8F /* EfiInjectController.mm in Sources */, 013F67F5110F97580095EC8F /* SmbiosController.mm in Sources */, + 010914DD1110E9B20013CD58 /* AboutController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Index: trunk/ChameleonPrefPane/bin/OSX105/Chameleon.zip =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/bin/OSX106/Chameleon.zip =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/bin/version =================================================================== --- trunk/ChameleonPrefPane/bin/version (revision 70) +++ trunk/ChameleonPrefPane/bin/version (revision 71) @@ -1 +1 @@ -2.0-b8 +2.0-RC1 Index: trunk/ChameleonPrefPane/CREDITS =================================================================== --- trunk/ChameleonPrefPane/CREDITS (revision 70) +++ trunk/ChameleonPrefPane/CREDITS (revision 71) @@ -1,23 +1,18 @@ -Special Thanks to: -Initial Conception & Design: ---------------------------- - Rekursor - -Crew Members ----------- - Rekursor - DieBuche + Initial Conception & Design: + --------------------------- + Rekursor + + Crew Members + ---------- + Rekursor, DieBuche -Contributors & Testers: ---------------------- - BlackOSX - MasterChief - digital_dreamer - smith@@ - scrax + Contributors & Testers: + --------------------- + BlackOSX, MasterChief, digital_dreamer, smith@@, scrax -Chameleon also reuses existing scripts and gfxutil tool from ronan (Lizard OSX app) available at: - http://code.google.com/p/lizard-app/ -See also: - http://darwinx86.org/software/darwinx86_software.html + Chameleon also reuses: + --------------------- + Courtesy of Ronan (Lizard) : + Existing scripts and gfxutil tool from Lizard available at: + http://code.google.com/p/lizard-app/ Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 70) +++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 71) @@ -13,7 +13,7 @@ YES - + YES @@ -86,7 +86,7 @@ 72482368 138544128 - Version 2.0 b8 + LucidaGrande 11 @@ -2410,7 +2410,7 @@ 611450433 272630784 - + LucidaGrande 11 16 @@ -3425,7 +3425,7 @@ 2843 - -2033975041 + -2033450753 135 NSImage @@ -3446,10 +3446,10 @@ {1.79769e+308, 1.79769e+308} - 8223 + 8215 2 - {{235, 265}, {464, 255}} - 1685585920 + {{235, 202}, {464, 318}} + 1685586944 About the Chameleon Preferences Pane NSPanel @@ -3462,70 +3462,59 @@ 268 - {{245, 218}, {38, 17}} + {{146, 294}, {172, 17}} YES 68288064 - 272630784 - 2.0.0 - + 138413056 + Version bla bla. + + LucidaGrande-Bold + 13 + 16 + - + 1 - MC4xNjEyMjAzNTggMC4zMzc1NjA1ODA1IDEAA + MC4wMzkyNTU0ODM1NCAxIDAuNTg1MTc0NDA4MwA - - - 268 - {{182, 218}, {52, 17}} - - YES - - 68288064 - 272630784 - Version - - - - - - 268 - {{20, 20}, {424, 190}} + {{20, 20}, {424, 266}} YES -2076049920 272629760 - ICBJbml0aWFsIENvbmNlcHRpb24gJiBEZXNpZ246ICAKCVJla3Vyc29yCiAgCiAgQ3JldyBNZW1iZXJz -OiAgCglSZWt1cnNvciwgICBEaWVCdWNoZQogIAogIENvbnRyaWJ1dG9ycyAmIFRlc3RlcnM6ICAKCUJs -YWNrT1NYLCAgTWFzdGVyQ2hpZWYsICBkaWdpdGFsX2RyZWFtZXIsICBzbWl0aEBALCBzb25vdG9uZSAo -Zm9yIExpemFyZCBzY3JpcHRzIGFuZCBnZnggdG9vbCB1c2UpA - + + + YES 1 MCAwIDAAA 1 - MC4yMjkzMDkxODM1IDAuMjk2MzI4MzY2NSAxAA + MC4xMTY2MTUxMiAxIDAuNjA4ODgwNTkwOQA - {464, 255} + {464, 318} {{0, 0}, {1920, 1058}} {1.79769e+308, 1.79769e+308} + + AboutController + ChameleonPrefPane @@ -3547,6 +3536,9 @@ SmbiosController + + YES + @@ -4864,20 +4856,84 @@ 878 + + value: bundleVersionNumber + + + + + + value: bundleVersionNumber + value + bundleVersionNumber + 2 + + + 894 + + - makeKeyAndOrderFront: - + onAbout: + - 880 + 895 + + value: bundleVersionNumber + + + + + + value: bundleVersionNumber + value + bundleVersionNumber + 2 + + + 896 + + + + value: credits + + + + + + value: credits + value + credits + 2 + + + 900 + + + + value: credits + + + + + + value: credits + value + credits + 2 + + + 903 + + mAboutDlg - + - 881 + 904 @@ -5981,7 +6037,6 @@ YES - @@ -6002,20 +6057,6 @@ - 579 - - - YES - - - - - - 582 - - - - 578 @@ -6604,6 +6645,16 @@ + + 893 + + + + + 897 + + + @@ -6805,10 +6856,8 @@ 576.NSWindowTemplate.visibleAtLaunch 577.IBPluginDependency 578.IBPluginDependency - 579.IBPluginDependency 580.IBPluginDependency 581.IBPluginDependency - 582.IBPluginDependency 583.IBPluginDependency 584.IBAttributePlaceholdersKey 584.IBPluginDependency @@ -6902,6 +6951,7 @@ 870.IBPluginDependency 872.IBPluginDependency 873.IBPluginDependency + 893.IBPluginDependency 99.IBAttributePlaceholdersKey 99.IBPluginDependency @@ -6927,9 +6977,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{142, 79}, {668, 368}} + {{142, 78}, {668, 368}} com.apple.InterfaceBuilder.CocoaPlugin - {{142, 79}, {668, 368}} + {{142, 78}, {668, 368}} {224.664, 10} @@ -7425,17 +7475,15 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{524, 438}, {464, 255}} + {{808, 358}, {464, 318}} com.apple.InterfaceBuilder.CocoaPlugin - {{524, 438}, {464, 255}} + {{808, 358}, {464, 318}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -7659,6 +7707,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -7686,12 +7735,28 @@ - 881 + 904 YES + AboutController + NSObject + + onAbout: + id + + + mAboutDlg + NSPanel + + + IBProjectSource + ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/AboutController.h + + + AdvancedSetupController PreferencesControllerBase @@ -7918,7 +7983,6 @@ YES authView - mAboutDlg mFileSystemColumn mOptions mPartitionIDColumn @@ -7933,7 +7997,6 @@ YES SFAuthorizationView - NSPanel NSTableColumn NSBox NSTableColumn @@ -8215,6 +8278,14 @@ + NSController + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSController.h + + + NSFormatter NSObject @@ -8621,6 +8692,14 @@ + NSUserDefaultsController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSUserDefaultsController.h + + + NSView IBFrameworkSource