Changeset 2834
- Timestamp:
- 05/17/05 16:56:41 (3 years ago)
- Files:
-
- CPUMonitor/trunk/CPUController.h (modified) (2 diffs)
- CPUMonitor/trunk/CPUController.m (modified) (1 diff)
- CPUMonitor/trunk/CPUMonitor.xcode/project.pbxproj (modified) (6 diffs)
- CPUMonitor/trunk/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
- CPUMonitor/trunk/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
- CPUMonitor/trunk/English.lproj/MainMenu.nib/objects.nib (modified) (previous)
- CPUMonitor/trunk/makedmg.sh (deleted)
- CPUMonitor/trunk/version.pl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
CPUMonitor/trunk/CPUController.h
r2705 r2834 63 63 IBOutlet CPUExpandedView *_expandedView; 64 64 65 IBOutlet NSWindow *_releaseNotesWindow; 66 IBOutlet NSTextView *_releaseNotesTextView; 67 65 68 NSArray *_imageViews; 66 69 … … 84 87 - (IBAction)changeApplicationIcon:(id)sender; 85 88 89 - (IBAction)releaseNotes:(id)sender; 90 86 91 @end CPUMonitor/trunk/CPUController.m
r2748 r2834 374 374 } 375 375 376 377 378 - (IBAction)releaseNotes:(id)sender { 379 NSAttributedString *string; 380 NSString *path; 381 382 if([[_releaseNotesTextView string] length] == 0) { 383 path = [[self bundle] pathForResource:@"ReleaseNotes" ofType:@"rtf"]; 384 string = [[NSAttributedString alloc] initWithRTF:[NSData dataWithContentsOfFile:path] 385 documentAttributes:NULL]; 386 387 [_releaseNotesTextView setAttributedString:string]; 388 [string release]; 389 } 390 391 [_releaseNotesWindow makeKeyAndOrderFront:self]; 392 } 393 376 394 @end CPUMonitor/trunk/CPUMonitor.xcode/project.pbxproj
r2715 r2834 193 193 8D1107310486CEB800E47090, 194 194 089C165CFE840E0CC02AAC07, 195 77CDAD0F083A3AAF003BE654, 195 196 29B97318FDCFA39411CA2CEA, 196 197 A51B26E7082031E700D76064, … … 320 321 //4A3 321 322 //4A4 323 //770 324 //771 325 //772 326 //773 327 //774 328 77CDAD0F083A3AAF003BE654 = { 329 children = ( 330 77CDAD10083A3AAF003BE654, 331 ); 332 isa = PBXVariantGroup; 333 name = ReleaseNotes.rtf; 334 path = ""; 335 refType = 4; 336 sourceTree = "<group>"; 337 }; 338 77CDAD10083A3AAF003BE654 = { 339 isa = PBXFileReference; 340 lastKnownFileType = text.rtf; 341 name = English; 342 path = English.lproj/ReleaseNotes.rtf; 343 refType = 4; 344 sourceTree = "<group>"; 345 }; 346 77CDAD11083A3AAF003BE654 = { 347 fileRef = 77CDAD0F083A3AAF003BE654; 348 isa = PBXBuildFile; 349 settings = { 350 }; 351 }; 352 //770 353 //771 354 //772 355 //773 356 //774 322 357 //8D0 323 358 //8D1 … … 390 425 A57289310822B01400E0988A, 391 426 A57289320822B01400E0988A, 427 77CDAD11083A3AAF003BE654, 392 428 ); 393 429 isa = PBXResourcesBuildPhase; … … 995 1031 children = ( 996 1032 A59F26230823CAFB001CE5D0, 997 A59F26220823CAFB001CE5D0,998 1033 A59F26210823CAFB001CE5D0, 999 1034 ); … … 1008 1043 lastKnownFileType = text.script.perl; 1009 1044 path = version.pl; 1010 refType = 4;1011 sourceTree = "<group>";1012 };1013 A59F26220823CAFB001CE5D0 = {1014 fileEncoding = 5;1015 isa = PBXFileReference;1016 lastKnownFileType = text.script.sh;1017 path = makedmg.sh;1018 1045 refType = 4; 1019 1046 sourceTree = "<group>"; … … 1082 1109 runOnlyForDeploymentPostprocessing = 0; 1083 1110 shellPath = /bin/sh; 1084 shellScript = "#!/bin/sh\n\n mkdir -p \"$BUILT_PRODUCTS_DIR/CPU Monitor/\"\ncp -rp \"$BUILT_PRODUCTS_DIR/CPU Monitor.app\" \"$BUILT_PRODUCTS_DIR/CPU Monitor/\"\nsh makedmg.sh \"$BUILT_PRODUCTS_DIR/CPU Monitor\" ~/Desktop\n\nexit 0";1111 shellScript = "#!/bin/sh\n\nzip -r \"$BUILD_DIR/CPUMonitor.zip\" \"$BUILD_DIR/CPU Monitor.app\" || exit 1\n\nexit 0"; 1085 1112 }; 1086 1113 A5D2C7940822E609007EB5F3 = { CPUMonitor/trunk/English.lproj/MainMenu.nib/classes.nib
r2705 r2834 9 9 openActivityMonitor = id; 10 10 openTop = id; 11 releaseNotes = id; 11 12 toggleFloatingWindow = id; 12 13 }; … … 25 26 "_floatingViewOrientationMatrix" = NSMatrix; 26 27 "_preferencesWindow" = NSWindow; 28 "_releaseNotesTextView" = NSTextView; 29 "_releaseNotesWindow" = NSWindow; 27 30 "_standardBackgroundImageView" = NSImageView; 28 31 "_standardBox" = NSBox; CPUMonitor/trunk/English.lproj/MainMenu.nib/info.nib
r2705 r2834 8 8 <dict> 9 9 <key>29</key> 10 <string> 489 549 269 44 0 0 1280 1002</string>10 <string>682 564 269 44 0 0 1680 1028 </string> 11 11 </dict> 12 12 <key>IBFramework Version</key> … … 22 22 <key>IBLastGroupID</key> 23 23 <string>1</string> 24 <key>IBOldestOS</key> 25 <integer>2</integer> 24 26 <key>IBOpenObjects</key> 25 27 <array> 26 28 <integer>209</integer> 29 <integer>301</integer> 27 30 <integer>273</integer> 31 <integer>316</integer> 28 32 <integer>29</integer> 29 <integer>301</integer>30 33 </array> 31 34 <key>IBSystem Version</key> 32 <string>8 A425</string>35 <string>8B15</string> 33 36 </dict> 34 37 </plist> CPUMonitor/trunk/version.pl
r2708 r2834 3 3 use strict; 4 4 5 my $REV = `/usr/local/bin/svn info | grep "^Revision:"`; 5 die "$0: Must be run from Xcode" unless $ENV{"BUILT_PRODUCTS_DIR"}; 6 7 my $REV = `svn info | grep "^Revision:"`; 6 8 my $INFO = "$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info.plist"; 7 9 … … 15 17 close(FH); 16 18 17 $info =~ s/([\t ]+<key>CFBundleVersion<\/key>\n[\t ]+<string>). +?(<\/string>)/$1$version$2/;19 $info =~ s/([\t ]+<key>CFBundleVersion<\/key>\n[\t ]+<string>).*?(<\/string>)/$1$version$2/; 18 20 19 21 open(FH, ">$INFO") or die "$0: $INFO: $!";
