Index: trunk/ChameleonPrefPane/Sources/AboutController.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/AboutController.mm (revision 440) +++ trunk/ChameleonPrefPane/Sources/AboutController.mm (revision 441) @@ -25,7 +25,10 @@ - (NSString *)bundleVersionNumber { NSString * sVer = [[bundle infoDictionary] valueForKey:@"CFBundleVersion"]; - NSString * info = [[NSString alloc] initWithFormat:@"Version %@", sVer ]; + NSString* revFile = [bundle pathForResource: @"version" ofType: nil ]; + NSString* rev = [NSString stringWithContentsOfFile:revFile encoding:NSUTF8StringEncoding error:nil] ; + + NSString * info = [[NSString alloc] initWithFormat:@"Version %@ - %@", sVer, rev ]; return info; } Index: trunk/ChameleonPrefPane/French.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/French.lproj/Chameleon.xib (revision 440) +++ trunk/ChameleonPrefPane/French.lproj/Chameleon.xib (revision 441) @@ -313,7 +313,7 @@ Item 1 - + 292 YES @@ -1020,7 +1020,6 @@ {541, 408} - 2 Démarrer De ... @@ -4576,7 +4575,7 @@ Item 7 - + 256 YES @@ -4588,6 +4587,118 @@ 274 + + YES + + + 264 + {{46.4453125, 476}, {508.73828125, 17}} + + 2 + YES + + 68288064 + 138413056 + Version bla bla. + + LucidaGrande-Bold + 13 + 16 + + + YES + + + 1 + MCAwIDAgMC45AA + + + + + + 268 + {{49, 157.34765625}, {503.18359375, 235.62890625}} + + + subviews + + + + + + + YES + + fromTop + fade + + YES + filter + subtype + type + + + + 2 + YES + + -2076049920 + 4194304 + + + + YES + + 6 + System + windowFrameTextColor + + + + 6 + System + alternateSelectedControlColor + + 1 + MCAwIDEAA + + + + + + + 256 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{256, 361}, {100, 100}} + + 2 + YES + + 130560 + 33554432 + + NSImage + cham + + 0 + 0 + 0 + YES + + YES + + {{1, 1}, {603, 566}} 2 @@ -4619,87 +4730,6 @@ MC42OTcwODAyOTIAA - - - 268 - {{18, -1}, {513, 261}} - - 2 - YES - - -2080244224 - 138412032 - - - - YES - - 1 - MCAwIDAgMAA - - - 1 - MCAwIDAgMC45AA - - - - - - 268 - {{186, 338}, {172, 17}} - - 2 - YES - - 68288064 - 138413056 - Version bla bla. - - LucidaGrande-Bold - 13 - 16 - - - - - 1 - MCAwIDAgMC45AA - - - - - - 256 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{223, 243}, {100, 100}} - - 2 - YES - - 130560 - 33554432 - - NSImage - cham - - 0 - 0 - 0 - YES - - YES - 256 @@ -4735,6 +4765,7 @@ {541, 408} + 2 A Propos @@ -4742,14 +4773,14 @@ - + 268435462 YES YES YES - + @@ -7471,62 +7502,23 @@ YES - - - - 907 - - - YES - - - - - - 908 - - - - 1002 - - - - 911 - YES - + + + - 912 - - - - - 914 - - - YES - - - - - - 915 - - - - 918 @@ -8679,6 +8671,48 @@ + + 911 + + + YES + + + + + + 912 + + + + + 907 + + + YES + + + + + + 908 + + + + + 914 + + + YES + + + + + + 915 + + + @@ -9301,7 +9335,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{23, 403}, {668, 439}} + {{63, 381}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin YES Index: trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib (revision 440) +++ trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib (revision 441) @@ -313,7 +313,7 @@ Item 1 - + 292 YES @@ -1020,7 +1020,6 @@ {541, 408} - 2 Arranque ... @@ -4578,7 +4577,7 @@ Item 7 - + 256 YES @@ -4590,6 +4589,118 @@ 274 + + YES + + + 264 + {{46.4453125, 476}, {508.73828125, 17}} + + 2 + YES + + 68288064 + 138413056 + Version bla bla. + + LucidaGrande-Bold + 13 + 16 + + + YES + + + 1 + MCAwIDAgMC45AA + + + + + + 268 + {{49, 157.34765625}, {503.18359375, 235.62890625}} + + + subviews + + + + + + + YES + + fromTop + fade + + YES + filter + subtype + type + + + + 2 + YES + + -2076049920 + 4194304 + + + + YES + + 6 + System + windowFrameTextColor + + + + 6 + System + alternateSelectedControlColor + + 1 + MCAwIDEAA + + + + + + + 256 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{256, 361}, {100, 100}} + + 2 + YES + + 130560 + 33554432 + + NSImage + cham + + 0 + 0 + 0 + YES + + YES + + {{1, 1}, {603, 566}} 2 @@ -4621,87 +4732,6 @@ MC42OTcwODAyOTIAA - - - 268 - {{18, -1}, {513, 261}} - - 2 - YES - - -2080244224 - 138412032 - - - - YES - - 1 - MCAwIDAgMAA - - - 1 - MCAwIDAgMC45AA - - - - - - 268 - {{186, 338}, {172, 17}} - - 2 - YES - - 68288064 - 138413056 - Version bla bla. - - LucidaGrande-Bold - 13 - 16 - - - - - 1 - MCAwIDAgMC45AA - - - - - - 256 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{223, 243}, {100, 100}} - - 2 - YES - - 130560 - 33554432 - - NSImage - cham - - 0 - 0 - 0 - YES - - YES - 256 @@ -4737,6 +4767,7 @@ {541, 408} + 2 About @@ -4744,14 +4775,14 @@ - + 268435462 YES YES YES - + @@ -7473,62 +7504,23 @@ YES - - - - 907 - - - YES - - - - - - 908 - - - - 1002 - - - - 911 - YES - + + + - 912 - - - - - 914 - - - YES - - - - - - 915 - - - - 918 @@ -8681,6 +8673,48 @@ + + 911 + + + YES + + + + + + 912 + + + + + 907 + + + YES + + + + + + 908 + + + + + 914 + + + YES + + + + + + 915 + + + @@ -9306,7 +9340,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{23, 403}, {668, 439}} + {{63, 381}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin YES Index: trunk/ChameleonPrefPane/CREDITS =================================================================== --- trunk/ChameleonPrefPane/CREDITS (revision 440) +++ trunk/ChameleonPrefPane/CREDITS (revision 441) @@ -1,18 +1,14 @@ -Initial Conception & Design: ---------------------------- -Rekursor + Conception & Design: + Rekursor -Crew Members ----------- -Rekursor, DieBuche + Crew Members: + Rekursor, DieBuche -Contributors & Testers: ---------------------- -BlackOSX, MasterChief, digital_dreamer, smith@@, scrax, quinielascom -Azimutz, ErmaC - -Chameleon also reuses: ---------------------- -Courtesy of Ronan (Lizard): -Existing scripts and gfxutil tool from Lizard available at: -http://code.google.com/p/lizard-app/ + Contributors & Testers: + BlackOSX, MasterChief, digital_dreamer, smith@@, scrax, + quinielascom, Azimutz, ErmaC + + Chameleon also reuses: + Courtesy of Ronan (Lizard): + Existing scripts and gfxutil from Lizard available at: + (http://code.google.com/p/lizard-app/) Index: trunk/ChameleonPrefPane/README =================================================================== --- trunk/ChameleonPrefPane/README (revision 440) +++ trunk/ChameleonPrefPane/README (revision 441) @@ -36,3 +36,4 @@ How to build from sources Please use XCode 3.2.6 or superior from SnowLeopard or Lion (yes you can still install 3.2.6 for backward compatible dev in Lion) + Then use makebin to generate a prop release build. Index: trunk/ChameleonPrefPane/German.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/German.lproj/Chameleon.xib (revision 440) +++ trunk/ChameleonPrefPane/German.lproj/Chameleon.xib (revision 441) @@ -313,7 +313,7 @@ Item 1 - + 292 YES @@ -1020,7 +1020,6 @@ {541, 408} - 2 Starte von ... @@ -4576,7 +4575,7 @@ Item 7 - + 256 YES @@ -4588,6 +4587,118 @@ 274 + + YES + + + 264 + {{46.4453125, 476}, {508.73828125, 17}} + + 2 + YES + + 68288064 + 138413056 + Version bla bla. + + LucidaGrande-Bold + 13 + 16 + + + YES + + + 1 + MCAwIDAgMC45AA + + + + + + 268 + {{49, 157.34765625}, {503.18359375, 235.62890625}} + + + subviews + + + + + + + YES + + fromTop + fade + + YES + filter + subtype + type + + + + 2 + YES + + -2076049920 + 4194304 + + + + YES + + 6 + System + windowFrameTextColor + + + + 6 + System + alternateSelectedControlColor + + 1 + MCAwIDEAA + + + + + + + 256 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{256, 361}, {100, 100}} + + 2 + YES + + 130560 + 33554432 + + NSImage + cham + + 0 + 0 + 0 + YES + + YES + + {{1, 1}, {603, 566}} 2 @@ -4619,87 +4730,6 @@ MC42OTcwODAyOTIAA - - - 268 - {{18, -1}, {513, 261}} - - 2 - YES - - -2080244224 - 138412032 - - - - YES - - 1 - MCAwIDAgMAA - - - 1 - MCAwIDAgMC45AA - - - - - - 268 - {{186, 338}, {172, 17}} - - 2 - YES - - 68288064 - 138413056 - Version bla bla. - - LucidaGrande-Bold - 13 - 16 - - - - - 1 - MCAwIDAgMC45AA - - - - - - 256 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{223, 243}, {100, 100}} - - 2 - YES - - 130560 - 33554432 - - NSImage - cham - - 0 - 0 - 0 - YES - - YES - 256 @@ -4735,6 +4765,7 @@ {541, 408} + 2 Über @@ -4742,14 +4773,14 @@ - + 268435462 YES YES YES - + @@ -7471,62 +7502,23 @@ YES - - - - 907 - - - YES - - - - - - 908 - - - - 1002 - - - - 911 - YES - + + + - 912 - - - - - 914 - - - YES - - - - - - 915 - - - - 918 @@ -8679,6 +8671,48 @@ + + 911 + + + YES + + + + + + 912 + + + + + 907 + + + YES + + + + + + 908 + + + + + 914 + + + YES + + + + + + 915 + + + @@ -9305,7 +9339,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{23, 403}, {668, 439}} + {{63, 381}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin YES Index: trunk/ChameleonPrefPane/makebin =================================================================== --- trunk/ChameleonPrefPane/makebin (revision 440) +++ trunk/ChameleonPrefPane/makebin (revision 441) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Creates binaries archives from the current version stored in ./bin # @@ -7,7 +7,8 @@ # makebin # # (cd bin/OSX105; ditto -ck --keepParent ../../build/Release\ 10.5/Chameleon.prefPane Chameleon.zip) +echo `svn info | grep Revision` > ./bin/version +xcodebuild (cd bin/OSX106; ditto -ck --keepParent ../../build/Release/*.prefPane Chameleon.zip) -if test "$1" != "" ; then - echo "$1" > bin/version -fi \ No newline at end of file +cat bin/version +ls -l bin/OSX106/* \ No newline at end of file Index: trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib (revision 440) +++ trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib (revision 441) @@ -313,7 +313,7 @@ Item 1 - + 292 YES @@ -1020,7 +1020,6 @@ {541, 408} - 2 Avvio da... @@ -4576,7 +4575,7 @@ Item 7 - + 256 YES @@ -4588,6 +4587,118 @@ 274 + + YES + + + 264 + {{46.4453125, 476}, {508.73828125, 17}} + + 2 + YES + + 68288064 + 138413056 + Version bla bla. + + LucidaGrande-Bold + 13 + 16 + + + YES + + + 1 + MCAwIDAgMC45AA + + + + + + 268 + {{49, 157.34765625}, {503.18359375, 235.62890625}} + + + subviews + + + + + + + YES + + fromTop + fade + + YES + filter + subtype + type + + + + 2 + YES + + -2076049920 + 4194304 + + + + YES + + 6 + System + windowFrameTextColor + + + + 6 + System + alternateSelectedControlColor + + 1 + MCAwIDEAA + + + + + + + 256 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{256, 361}, {100, 100}} + + 2 + YES + + 130560 + 33554432 + + NSImage + cham + + 0 + 0 + 0 + YES + + YES + + {{1, 1}, {603, 566}} 2 @@ -4619,87 +4730,6 @@ MC42OTcwODAyOTIAA - - - 268 - {{18, -1}, {513, 261}} - - 2 - YES - - -2080244224 - 138412032 - - - - YES - - 1 - MCAwIDAgMAA - - - 1 - MCAwIDAgMC45AA - - - - - - 268 - {{186, 338}, {172, 17}} - - 2 - YES - - 68288064 - 138413056 - Version bla bla. - - LucidaGrande-Bold - 13 - 16 - - - - - 1 - MCAwIDAgMC45AA - - - - - - 256 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{223, 243}, {100, 100}} - - 2 - YES - - 130560 - 33554432 - - NSImage - cham - - 0 - 0 - 0 - YES - - YES - 256 @@ -4735,6 +4765,7 @@ {541, 408} + 2 About @@ -4742,14 +4773,14 @@ - + 268435462 YES YES YES - + @@ -7471,62 +7502,23 @@ YES - - - - 907 - - - YES - - - - - - 908 - - - - 1002 - - - - 911 - YES - + + + - 912 - - - - - 914 - - - YES - - - - - - 915 - - - - 918 @@ -8679,6 +8671,48 @@ + + 911 + + + YES + + + + + + 912 + + + + + 907 + + + YES + + + + + + 908 + + + + + 914 + + + YES + + + + + + 915 + + + @@ -9306,7 +9340,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{23, 403}, {668, 439}} + {{63, 381}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin YES Index: trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj =================================================================== --- trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 440) +++ trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 441) @@ -857,6 +857,7 @@ isa = XCBuildConfiguration; buildSettings = { DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEPLOYMENT_POSTPROCESSING = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 440) +++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 441) @@ -12,7 +12,7 @@ YES - + YES @@ -293,7 +293,7 @@ Item 1 - + 292 YES @@ -1000,7 +1000,6 @@ {541, 408} - 2 Startup Disk @@ -4556,7 +4555,7 @@ Item 7 - + 256 YES @@ -4568,6 +4567,118 @@ 274 + + YES + + + 264 + {{46.4453125, 476}, {508.73828125, 17}} + + 2 + YES + + 68288064 + 138413056 + Version bla bla. + + LucidaGrande-Bold + 13 + 16 + + + YES + + + 1 + MCAwIDAgMC45AA + + + + + + 268 + {{49, 157.34765625}, {503.18359375, 235.62890625}} + + + subviews + + + + + + + YES + + fromTop + fade + + YES + filter + subtype + type + + + + 2 + YES + + -2076049920 + 4194304 + + + + YES + + 6 + System + windowFrameTextColor + + + + 6 + System + alternateSelectedControlColor + + 1 + MCAwIDEAA + + + + + + + 256 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{256, 361}, {100, 100}} + + 2 + YES + + 130560 + 33554432 + + NSImage + cham + + 0 + 0 + 0 + YES + + YES + + {{1, 1}, {603, 566}} 2 @@ -4599,87 +4710,6 @@ MC42OTcwODAyOTIAA - - - 268 - {{18, -1}, {513, 261}} - - 2 - YES - - -2080244224 - 138412032 - - - - YES - - 1 - MCAwIDAgMAA - - - 1 - MCAwIDAgMC45AA - - - - - - 268 - {{186, 338}, {172, 17}} - - 2 - YES - - 68288064 - 138413056 - Version bla bla. - - LucidaGrande-Bold - 13 - 16 - - - - - 1 - MCAwIDAgMC45AA - - - - - - 256 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{223, 243}, {100, 100}} - - 2 - YES - - 130560 - 33554432 - - NSImage - cham - - 0 - 0 - 0 - YES - - YES - 256 @@ -4715,6 +4745,7 @@ {541, 408} + 2 About @@ -4722,14 +4753,14 @@ - + 268435462 YES YES YES - + @@ -7452,62 +7483,23 @@ YES - - - - 907 - - - YES - - - - - - 908 - - - - 1002 - - - - 911 - YES - + + + - 912 - - - - - 914 - - - YES - - - - - - 915 - - - - 918 @@ -8660,6 +8652,48 @@ + + 911 + + + YES + + + + + + 912 + + + + + 907 + + + YES + + + + + + 908 + + + + + 914 + + + YES + + + + + + 915 + + + @@ -9054,10 +9088,13 @@ 905.IBPluginDependency 906.IBPluginDependency 907.IBPluginDependency + 907.IBViewBoundsToFrameTransform 908.IBPluginDependency 911.IBPluginDependency + 911.IBViewBoundsToFrameTransform 912.IBPluginDependency 914.IBPluginDependency + 914.IBViewBoundsToFrameTransform 915.IBPluginDependency 918.IBPluginDependency 919.IBPluginDependency @@ -9300,9 +9337,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{23, 403}, {668, 439}} + {{63, 381}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin - {{23, 403}, {668, 439}} + {{63, 381}, {668, 439}} {224.66399999999999, 10} com.apple.InterfaceBuilder.CocoaPlugin @@ -10093,10 +10130,19 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCRAAAw8L9AA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDAgAAw/UAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUN/AABDugAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin