Index: branches/diebuche/ChameleonPrefPane/Sources/ShellProcess.cpp =================================================================== --- branches/diebuche/ChameleonPrefPane/Sources/ShellProcess.cpp (revision 89) +++ branches/diebuche/ChameleonPrefPane/Sources/ShellProcess.cpp (revision 90) @@ -160,12 +160,14 @@ // filter useless partitions: if (partInfo.clabel()[len-1] !='*' && + partInfo.clabel()!="EFI" && partInfo.fsType()!="EFI" && partInfo.fsType()!="Apple_partition_scheme" && partInfo.fsType()!="Apple_partition_map" && partInfo.fsType()!="Apple_Free" ) { + if (partInfo.fsType()=="Apple_HFS") partInfo.fsType("Apple HFS"); std::string diskLabel(trim(label)); bool found=false; // early bail out if we found what we need: DON't make any assumption Index: branches/diebuche/ChameleonPrefPane/Sources/RoundedBox.m =================================================================== --- branches/diebuche/ChameleonPrefPane/Sources/RoundedBox.m (revision 89) +++ branches/diebuche/ChameleonPrefPane/Sources/RoundedBox.m (revision 90) @@ -55,7 +55,7 @@ - (void)setDefaults { borderWidth = 2.0; - [self setBorderColor:[NSColor colorWithCalibratedRed:0.0 green:0.45 blue:0.6 alpha: 1.0]]; + [self setBorderColor:[NSColor colorWithCalibratedRed:0.38 green:0.48 blue:0.68 alpha: 1.0]]; [self setTitleColor:[NSColor whiteColor]]; [self setGradientStartColor:[NSColor colorWithCalibratedWhite:0.93 alpha:1.0]]; [self setGradientEndColor:[NSColor colorWithCalibratedWhite:0.82 alpha:1.0]]; Index: branches/diebuche/ChameleonPrefPane/Sources/CustomTableView.mm =================================================================== --- branches/diebuche/ChameleonPrefPane/Sources/CustomTableView.mm (revision 89) +++ branches/diebuche/ChameleonPrefPane/Sources/CustomTableView.mm (revision 90) @@ -13,8 +13,8 @@ - (void)awakeFromNib { // highlight colors - mHighlightColorInFocusView = [[NSColor colorWithDeviceRed:.65 green:.75 blue:1.0 alpha:1.0] retain]; - mHighlightColorOutOfFocusView = [[NSColor colorWithDeviceRed:.50 green:.65 blue:.85 alpha:1.0] retain]; + mHighlightColorInFocusView = [[NSColor colorWithCalibratedRed:.38 green:.48 blue:.68 alpha:1] retain]; + mHighlightColorOutOfFocusView = [[NSColor colorWithCalibratedRed:.38 green:.48 blue:.68 alpha:0.5] retain]; } - (id)_highlightColorForCell:(NSCell *)cell { Index: branches/diebuche/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj =================================================================== --- branches/diebuche/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 89) +++ branches/diebuche/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 90) @@ -68,6 +68,12 @@ B398220D111349F5009E2520 /* RoundedBox.h in Headers */ = {isa = PBXBuildFile; fileRef = B398220A111349F5009E2520 /* RoundedBox.h */; }; B39822E911134F8B009E2520 /* RoundedBox.m in Sources */ = {isa = PBXBuildFile; fileRef = B398220B111349F5009E2520 /* RoundedBox.m */; }; B3E370081115D2B000BBF949 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B3E370061115D2B000BBF949 /* Localizable.strings */; }; + B3E372EC1115E78E00BBF949 /* Chameleon.xib in Resources */ = {isa = PBXBuildFile; fileRef = B3E372E61115E78E00BBF949 /* Chameleon.xib */; }; + B3E372ED1115E78E00BBF949 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B3E372E81115E78E00BBF949 /* InfoPlist.strings */; }; + B3E372EE1115E78E00BBF949 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B3E372EA1115E78E00BBF949 /* Localizable.strings */; }; + B3E372F61115E79500BBF949 /* Chameleon.xib in Resources */ = {isa = PBXBuildFile; fileRef = B3E372F01115E79500BBF949 /* Chameleon.xib */; }; + B3E372F71115E79500BBF949 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B3E372F21115E79500BBF949 /* InfoPlist.strings */; }; + B3E372F81115E79500BBF949 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B3E372F41115E79500BBF949 /* Localizable.strings */; }; B3F8855D11146A460022CA5D /* TableViewsController.h in Headers */ = {isa = PBXBuildFile; fileRef = B3F8855B11146A460022CA5D /* TableViewsController.h */; }; B3F8855E11146A460022CA5D /* TableViewsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B3F8855C11146A460022CA5D /* TableViewsController.mm */; }; B3F8879611148E790022CA5D /* footer.png in Resources */ = {isa = PBXBuildFile; fileRef = B3F8879511148E790022CA5D /* footer.png */; }; @@ -137,6 +143,12 @@ B398220A111349F5009E2520 /* RoundedBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RoundedBox.h; path = Sources/RoundedBox.h; sourceTree = ""; }; B398220B111349F5009E2520 /* RoundedBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RoundedBox.m; path = Sources/RoundedBox.m; sourceTree = ""; }; B3E370071115D2B000BBF949 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; + B3E372E71115E78E00BBF949 /* de_DE */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de_DE; path = Chameleon.xib; sourceTree = ""; }; + B3E372E91115E78E00BBF949 /* de_DE */ = {isa = PBXFileReference; fileEncoding = 2483028224; lastKnownFileType = text.plist.strings; name = de_DE; path = InfoPlist.strings; sourceTree = ""; }; + B3E372EB1115E78E00BBF949 /* de_DE */ = {isa = PBXFileReference; fileEncoding = 2483028224; lastKnownFileType = text.plist.strings; name = de_DE; path = Localizable.strings; sourceTree = ""; }; + B3E372F11115E79500BBF949 /* it_IT */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it_IT; path = Chameleon.xib; sourceTree = ""; }; + B3E372F31115E79500BBF949 /* it_IT */ = {isa = PBXFileReference; fileEncoding = 2483028224; lastKnownFileType = text.plist.strings; name = it_IT; path = InfoPlist.strings; sourceTree = ""; }; + B3E372F51115E79500BBF949 /* it_IT */ = {isa = PBXFileReference; fileEncoding = 2483028224; lastKnownFileType = text.plist.strings; name = it_IT; path = Localizable.strings; sourceTree = ""; }; B3F8855B11146A460022CA5D /* TableViewsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableViewsController.h; path = Sources/TableViewsController.h; sourceTree = ""; }; B3F8855C11146A460022CA5D /* TableViewsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TableViewsController.mm; path = Sources/TableViewsController.mm; sourceTree = ""; }; B3F8879511148E790022CA5D /* footer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = footer.png; path = Resources/footer.png; sourceTree = ""; }; @@ -242,6 +254,8 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + B3E372EF1115E79500BBF949 /* it_IT.lproj */, + B3E372E51115E78E00BBF949 /* de_DE.lproj */, B3E370061115D2B000BBF949 /* Localizable.strings */, 01A25D68111109FF0024EA7E /* cdBootCreator.sh */, 01A25D69111109FF0024EA7E /* getDevProp.sh */, @@ -324,6 +338,26 @@ name = RoundedBox; sourceTree = ""; }; + B3E372E51115E78E00BBF949 /* de_DE.lproj */ = { + isa = PBXGroup; + children = ( + B3E372E61115E78E00BBF949 /* Chameleon.xib */, + B3E372E81115E78E00BBF949 /* InfoPlist.strings */, + B3E372EA1115E78E00BBF949 /* Localizable.strings */, + ); + path = de_DE.lproj; + sourceTree = ""; + }; + B3E372EF1115E79500BBF949 /* it_IT.lproj */ = { + isa = PBXGroup; + children = ( + B3E372F01115E79500BBF949 /* Chameleon.xib */, + B3E372F21115E79500BBF949 /* InfoPlist.strings */, + B3E372F41115E79500BBF949 /* Localizable.strings */, + ); + path = it_IT.lproj; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -386,6 +420,14 @@ buildConfigurationList = 1DBD214C08BA80EA00186707 /* Build configuration list for PBXProject "ChameleonPrefPane" */; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + de_DE, + it_IT, + ); mainGroup = 089C166AFE841209C02AAC07 /* StartupPrefPane */; projectDirPath = ""; projectRoot = ""; @@ -421,6 +463,12 @@ B3981F48111332FB009E2520 /* name.png in Resources */, B3F8879611148E790022CA5D /* footer.png in Resources */, B3E370081115D2B000BBF949 /* Localizable.strings in Resources */, + B3E372EC1115E78E00BBF949 /* Chameleon.xib in Resources */, + B3E372ED1115E78E00BBF949 /* InfoPlist.strings in Resources */, + B3E372EE1115E78E00BBF949 /* Localizable.strings in Resources */, + B3E372F61115E79500BBF949 /* Chameleon.xib in Resources */, + B3E372F71115E79500BBF949 /* InfoPlist.strings in Resources */, + B3E372F81115E79500BBF949 /* Localizable.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -480,6 +528,54 @@ name = Localizable.strings; sourceTree = ""; }; + B3E372E61115E78E00BBF949 /* Chameleon.xib */ = { + isa = PBXVariantGroup; + children = ( + B3E372E71115E78E00BBF949 /* de_DE */, + ); + name = Chameleon.xib; + sourceTree = ""; + }; + B3E372E81115E78E00BBF949 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + B3E372E91115E78E00BBF949 /* de_DE */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + B3E372EA1115E78E00BBF949 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + B3E372EB1115E78E00BBF949 /* de_DE */, + ); + name = Localizable.strings; + sourceTree = ""; + }; + B3E372F01115E79500BBF949 /* Chameleon.xib */ = { + isa = PBXVariantGroup; + children = ( + B3E372F11115E79500BBF949 /* it_IT */, + ); + name = Chameleon.xib; + sourceTree = ""; + }; + B3E372F21115E79500BBF949 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + B3E372F31115E79500BBF949 /* it_IT */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + B3E372F41115E79500BBF949 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + B3E372F51115E79500BBF949 /* it_IT */, + ); + name = Localizable.strings; + sourceTree = ""; + }; F506C042013D9D8C01CA16C8 /* Chameleon.xib */ = { isa = PBXVariantGroup; children = (