Chameleon Applications

Chameleon Applications Commit Details

Date:2010-01-26 08:23:51 (14 years 3 months ago)
Author:Rekursor
Commit:61
Parents: 60
Message:fixed partitions with empty names would not display though valid linux or windows partitions
Changes:
A/trunk/ChameleonPrefPane/Sources/CustomTableView.h
A/trunk/ChameleonPrefPane/Sources/CustomTableView.mm
M/trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj
M/trunk/ChameleonPrefPane/bin/OSX105/Chameleon.zip
M/trunk/ChameleonPrefPane/bin/OSX106/Chameleon.zip
M/trunk/ChameleonPrefPane/Info.plist
M/trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h
M/trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm
M/trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
M/trunk/ChameleonPrefPane/Sources/ShellProcess.cpp
M/trunk/ChameleonPrefPane/bin/version

File differences

trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm
6767
6868
6969
70
71
72
73
74
75
76
77
7078
7179
7280
......
8896
8997
9098
91
99
92100
93101
94102
// Retrieve the com.chameleon.prefPane.plist config
return self;
}
- (void)dealloc
{
// release the colors
[mOptionsDict release];
[mPartitionsDict release];
[super dealloc];
}
- (NSMutableDictionary*) preferencesFile {return mOptionsDict; }
- (NSMutableDictionary*) preferencesParts {return mPartitionsDict; }
}
//--------------------------------------------------------------------------
// SFAuthorization implementaion
// SFAuthorization implementation
//--------------------------------------------------------------------------
// SFAuthorization delegates
trunk/ChameleonPrefPane/Sources/CustomTableView.mm
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
//
// CustomTableView.mm
// ChameleonPrefPane
//
// Created by Fabien on 1/25/10.
// Copyright 2010 __MyCompanyName__. All rights reserved.
//
#import "CustomTableView.h"
@implementation CustomTableView
- (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];
}
- (id)_highlightColorForCell:(NSCell *)cell
{
return [self isEnabled] ? mHighlightColorInFocusView : mHighlightColorOutOfFocusView;
}
- (void)dealloc
{
// release the colors
[mHighlightColorInFocusView release];
[mHighlightColorOutOfFocusView release];
[super dealloc];
}
@end
trunk/ChameleonPrefPane/Sources/ShellProcess.cpp
8686
8787
8888
89
89
90
9091
9192
9293
......
151152
152153
153154
155
156
157
158
159
154160
155
156
161
157162
158163
159164
......
162167
163168
164169
165
170
171
166172
167173
168174
}
// uncomment the following line for debug
// set to 1 the following line for debugging with a fake diskutil file named /diskutil.txt
// for the debug to be accurate you need to alias (ln -s ...) the user to debug with your real disks
#define DEBUG_DISKUTIL 0
//----------------------------------------------------------------
partInfo.partition(part);
partInfo.label(checkForRename(label, partInfo.toHdStr().c_str()));
size_t len = partInfo.label().length();
if(len==0){
strncpy(label, "Untitled", sizeof(label));
partInfo.label(label);
}
// filter useless partitions:
if ( len > 0 &&
partInfo.clabel()[len-1] !='*' &&
if (partInfo.clabel()[len-1] !='*' &&
partInfo.fsType()!="EFI" &&
partInfo.fsType()!="Apple_partition_scheme" &&
partInfo.fsType()!="Apple_partition_map" &&
{
std::string diskLabel(trim(label));
bool found=false;
if (strstr(fsType,"NTFS"))
disk=disk+10;
// early bail out if we found what we need: DON't make any assumption
// that Windows is the name of WIN32 bootable disk dir ...
if (
trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h
88
99
1010
11
1112
1213
1314
......
2829
2930
3031
31
32
3233
3334
3435
#import <PreferencePanes/PreferencePanes.h>
#import <SecurityFoundation/SFAuthorization.h>
#import <SecurityInterface/SFAuthorizationView.h>
#import "CustomTableView.h"
// Constants
static const NSString* const keyForceBootConfigPath = @"forceBootConfigPath";
@private
// Objects corresponding to the interface mapping:
IBOutlet NSTableView *mPartitionsTable;
IBOutlet CustomTableView *mPartitionsTable;
IBOutlet NSTableColumn *mPartitionImgColumn;
IBOutlet NSTableColumn *mFileSystemColumn;
IBOutlet NSTableColumn *mPartitionNameColumn;
trunk/ChameleonPrefPane/Sources/CustomTableView.h
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
//
// CustomTableView.h
// ChameleonPrefPane
//
// Created by Fabien on 1/25/10.
// Copyright 2010 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
@interface CustomTableView : NSTableView {
NSColor *mHighlightColorInFocusView;
NSColor *mHighlightColorOutOfFocusView;
}
@end
trunk/ChameleonPrefPane/Info.plist
1717
1818
1919
20
20
2121
2222
2323
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.0 b5</string>
<string>2.0 b6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj
77
88
99
10
11
1012
1113
1214
......
5456
5557
5658
59
60
5761
5862
5963
......
174178
175179
176180
181
182
177183
178184
179185
......
252258
253259
254260
261
255262
256263
257264
......
346353
347354
348355
356
349357
350358
351359
objects = {
/* 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 */; };
010CC625110927A2006EFFE9 /* QuestionMark.png in Resources */ = {isa = PBXBuildFile; fileRef = 010CC624110927A2006EFFE9 /* QuestionMark.png */; };
01466A931104062500088464 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01466A921104062500088464 /* Security.framework */; };
01466C2A110408CC00088464 /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01466C29110408CC00088464 /* SecurityInterface.framework */; };
/* End PBXBuildFile section */
/* 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; };
010CC624110927A2006EFFE9 /* QuestionMark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = QuestionMark.png; path = Resources/QuestionMark.png; sourceTree = SOURCE_ROOT; };
01466A921104062500088464 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
01466C29110408CC00088464 /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = System/Library/Frameworks/SecurityInterface.framework; sourceTree = SDKROOT; };
019930FD110A0E6F003B056E /* PeripheralsController.mm */,
01993113110A0EB9003B056E /* AdvancedSetupController.h */,
01993114110A0EB9003B056E /* AdvancedSetupController.mm */,
01001001110EBB2A00221234 /* CustomTableView.h */,
01001002110EBB2A00221234 /* CustomTableView.mm */,
01D5D9C5110D723200AAE2C3 /* file_util.h */,
01993198110A2C61003B056E /* string_util.h */,
01AF5E68110C1C6800816AA8 /* string_util.cpp */,
01AF5E6D110C1C9C00816AA8 /* KernOptionsParser.h in Headers */,
01D5D9C6110D723200AAE2C3 /* file_util.h in Headers */,
01D5DBE0110DA3CD00AAE2C3 /* GroupControllerProtocol.h in Headers */,
01001003110EBB2A00221234 /* CustomTableView.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
01993568110AA9FA003B056E /* ChameleonPropertyList.cpp in Sources */,
01AF5E69110C1C6800816AA8 /* string_util.cpp in Sources */,
01AF5E6C110C1C9C00816AA8 /* KernOptionsParser.cpp in Sources */,
01001004110EBB2A00221234 /* CustomTableView.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
trunk/ChameleonPrefPane/bin/version
1
1
2.0.b5
2.0.b6
trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
5858
5959
6060
61
61
6262
6363
6464
......
8585
8686
8787
88
88
8989
9090
9191
......
679679
680680
681681
682
682
683683
684684
685685
......
25502550
25512551
25522552
2553
2553
25542554
25552555
25562556
......
25932593
25942594
25952595
2596
2596
25972597
25982598
25992599
......
26022602
26032603
26042604
2605
26052606
26062607
26072608
......
26212622
26222623
26232624
2625
26242626
26252627
26262628
......
26372639
26382640
26392641
2642
26402643
26412644
26422645
......
26552658
26562659
26572660
2661
2662
26582663
26592664
26602665
......
38683873
38693874
38703875
3876
38713877
3872
38733878
38743879
38753880
......
39173922
39183923
39193924
3920
39213925
39223926
39233927
39243928
39253929
3930
39263931
39273932
39283933
......
42514256
42524257
42534258
4254
42554259
42564260
42574261
4262
42584263
42594264
42604265
......
53235328
53245329
53255330
5331
53265332
53275333
53285334
......
55905596
55915597
55925598
5599
55935600
55945601
55955602
......
57635770
57645771
57655772
5766
5767
5768
5769
5770
5771
5773
5774
5775
5776
57725777
57735778
57745779
......
57845789
57855790
57865791
5787
5788
5789
5790
5791
5792
5793
5794
5795
57925796
57935797
57945798
......
63036307
63046308
63056309
6306
6307
6308
6309
6310
6310
6311
6312
6313
63116314
63126315
63136316
......
65916594
65926595
65936596
6594
6597
65956598
65966599
65976600
......
66046607
66056608
66066609
6610
6611
6612
6613
6614
6615
6616
6617
66076618
66086619
66096620
<object class="NSCustomView" id="475549282">
<reference key="NSNextResponder" ref="1037298196"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{13, 13}, {610, 38}}</string>
<string key="NSFrame">{{13, 5}, {610, 46}}</string>
<reference key="NSSuperview" ref="1037298196"/>
<string key="NSClassName">SFAuthorizationView</string>
</object>
<object class="NSTextFieldCell" key="NSCell" id="98357325">
<int key="NSCellFlags">72482368</int>
<int key="NSCellFlags2">138544128</int>
<string key="NSContents">Version 2.0 b4</string>
<string key="NSContents">Version 2.0 b6</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
</object>
<reference ref="447791831"/>
</object>
<string key="NSFrame">{{7, 2}, {467, 256}}</string>
<string key="NSFrame">{{9, 2}, {467, 256}}</string>
<reference key="NSSuperview" ref="389526238"/>
<reference key="NSNextKeyView" ref="729666351"/>
<int key="NSsFlags">562</int>
<object class="NSButton" id="474865121">
<reference key="NSNextResponder" ref="1037298196"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{625, 6}, {39, 38}}</string>
<string key="NSFrame">{{625, 7}, {39, 38}}</string>
<reference key="NSSuperview" ref="1037298196"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="737033551">
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<object class="NSView" key="NSWindowView" id="908319067">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{245, 218}, {38, 17}}</string>
<reference key="NSSuperview" ref="908319067"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="413394443">
<int key="NSCellFlags">68288064</int>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{182, 218}, {52, 17}}</string>
<reference key="NSSuperview" ref="908319067"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="807339214">
<int key="NSCellFlags">68288064</int>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{46, 49}, {373, 154}}</string>
<reference key="NSSuperview" ref="908319067"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="294587452">
<int key="NSCellFlags">-1805517311</int>
</object>
</object>
<string key="NSFrameSize">{464, 255}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="475549282"/>
<reference ref="869599070"/>
<reference ref="474865121"/>
<reference ref="869599070"/>
</object>
<reference key="parent" ref="660800786"/>
</object>
<reference key="object" ref="389526238"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="303493593"/>
<reference ref="372541434"/>
<reference ref="1064169092"/>
<reference ref="756755885"/>
<reference ref="1032245036"/>
<reference ref="158463244"/>
<reference ref="303493593"/>
</object>
<reference key="parent" ref="210384195"/>
</object>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="778294972"/>
<reference ref="18675440"/>
<reference ref="316034842"/>
<reference ref="386809836"/>
<reference ref="592293744"/>
<reference ref="276176519"/>
<reference ref="316034842"/>
</object>
<reference key="parent" ref="451295758"/>
</object>
<string>-3.IBPluginDependency</string>
<string>100.IBPluginDependency</string>
<string>101.IBPluginDependency</string>
<string>102.CustomClassName</string>
<string>102.IBPluginDependency</string>
<string>103.IBPluginDependency</string>
<string>104.IBPluginDependency</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>CustomTableView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string>
<reference key="object" ref="167604257"/>
<string type="base64-UTF8" key="toolTip">U2V0IHRoZSBib290IHBhcnRpdGlvbnMgaGQoeCx5KSB0byBoaWRlICAgICAgICAgICAgICAgICAgd2hl
cmUgJ3gnIGlzIHRoZSBkaXNrIG51bWJlciwgJ3knIHRoZSBwYXJ0aXRpb24gbnVtYmVyCg</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string>
<reference key="object" ref="631213817"/>
<string key="toolTip">Sets the boot partitions "hd(x,y) MyVolumeName " where 'x' is the disk number, 'y' the partition number and MyVolumeName is the alias you want to give to this partition. (i.e: useful for renaming System Reserved boot partition for Windows 7)</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string>
<reference key="object" ref="86444871"/>
<string key="toolTip">Sets the boot partitions "hd(x,y) MyVolumeName " where 'x' is the disk number, 'y' the partition number and MyVolumeName is the alias you want to give to this partition. (i.e: useful for renaming System Reserved boot partition for Windows 7)</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>NSTableColumn</string>
<string>NSTableColumn</string>
<string>NSTableColumn</string>
<string>NSTableView</string>
<string>CustomTableView</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSButton</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">CustomTableView</string>
<string key="superclassName">NSTableView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/CustomTableView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">

Archive Download the corresponding diff file

Revision: 61