Chameleon Applications

Chameleon Applications Commit Details

Date:2011-12-04 19:04:44 (8 years 10 months ago)
Author:Rekursor
Commit:432
Parents: 431
Message:Added darkwake and fixed another awesome bug from recent changes
Changes:
M/trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h
M/trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm
M/trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
M/trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp

File differences

trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm
2727
2828
2929
30
3031
3132
3233
BootProp::instance().addOptionDesc(mCPU, mCPUText, OptionKernel, "cpus", "");
BootProp::instance().addOptionDesc(mBusRatio, mBusRatioText, OptionKernel, "busratio", "");
BootProp::instance().addOptionDesc(mDebug, mDebugText, OptionKernel, "debug", "");
BootProp::instance().addOptionDesc(mDarkWake, mDarkWakeText, OptionKernel, "darkwake", "");
BootProp::instance().addOptionDesc(mIO, mIOText, OptionString, "io", "");
BootProp::instance().addOptionDesc(mDisableKextsBlacklisting, nil, OptionUnix, "blacklist=0", "");
BootProp::instance().addOptionDesc(mDSDTFile, mDSDTFileText, OptionFileString, "DSDT", "");
trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h
1919
2020
2121
22
22
2323
24
24
2525
26
26
2727
28
28
2929
3030
31
31
32
33
3234
33
35
3436
3537
3638
IBOutlet NSTextField*mDeviceRdText;
IBOutlet NSButton*mArch;
IBOutlet NSComboBox*mArchText;
IBOutlet NSComboBox*mArchText;
IBOutlet NSButton*mCPU;
IBOutlet NSComboBox*mCPUText;
IBOutlet NSComboBox*mCPUText;
IBOutlet NSButton*mBusRatio;
IBOutlet NSComboBox*mBusRatioText;
IBOutlet NSComboBox*mBusRatioText;
IBOutlet NSButton*mSystemType;
IBOutlet NSComboBox*mSystemTypeText;
IBOutlet NSComboBox*mSystemTypeText;
IBOutlet NSButton*mDebug;
IBOutlet NSComboBox*mDebugText;
IBOutlet NSComboBox*mDebugText;
IBOutlet NSButton*mDarkWake;
IBOutlet NSComboBox*mDarkWakeText;
IBOutlet NSButton*mIO;
IBOutlet NSComboBox*mIOText;
IBOutlet NSComboBox*mIOText;
IBOutlet NSButton*mDisableKextsBlacklisting;
IBOutlet NSButton*mDSDTFile;
trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp
6666
6767
6868
69
69
7070
7171
7272
std::string::size_type found = _options.find(f);
if (found==std::string::npos) return;
// find the end of the flag
for ( pos=found+flag.length(); pos<l && _options[pos]!=' '; pos++);
for ( pos=found+f.length(); pos<l && _options[pos]!=' '; pos++);
_options.erase(found, pos);
_options = trim(_options);
}
trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
1212
1313
1414
15
15
1616
1717
1818
......
293293
294294
295295
296
296
297297
298298
299299
......
10001000
10011001
10021002
1003
10031004
10041005
10051006
......
15801581
15811582
15821583
1583
1584
15841585
15851586
15861587
......
18761877
18771878
18781879
1879
1880
18801881
18811882
18821883
......
21762177
21772178
21782179
2179
21802180
21812181
21822182
......
28662866
28672867
28682868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
28692892
28702893
28712894
......
29302953
29312954
29322955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
29333037
29343038
29353039
......
45954699
45964700
45974701
4598
4702
45994703
46004704
46014705
46024706
46034707
46044708
4605
4709
46064710
46074711
46084712
......
63686472
63696473
63706474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
63716507
63726508
63736509
......
80448180
80458181
80468182
8183
8184
80478185
80488186
80498187
......
84378575
84388576
84398577
8578
8579
8580
8581
8582
8583
8584
8585
8586
8587
8588
8589
8590
8591
8592
8593
8594
8595
8596
8597
8598
8599
8600
8601
8602
8603
8604
8605
84408606
84418607
84428608
......
85818747
85828748
85838749
8750
8751
8752
8753
8754
8755
8756
85848757
85858758
85868759
......
87158888
87168889
87178890
8891
87188892
87198893
87208894
......
87918965
87928966
87938967
8968
87948969
87958970
87968971
......
90579232
90589233
90599234
9060
9235
90619236
9062
9237
90639238
90649239
90659240
......
91859360
91869361
91879362
9363
9364
9365
9366
9367
9368
9369
9370
91889371
9372
9373
9374
91899375
9376
9377
9378
9379
9380
9381
9382
91909383
91919384
91929385
......
95849777
95859778
95869779
9780
9781
9782
95879783
95889784
95899785
......
97539949
97549950
97559951
9952
9953
9954
97569955
97579956
97589957
......
984510044
984610045
984710046
9848
10047
984910048
985010049
985110050
......
992810127
992910128
993010129
10130
10131
993110132
993210133
993310134
......
996610167
996710168
996810169
10170
10171
996910172
997010173
997110174
......
1000110204
1000210205
1000310206
10207
10208
1000410209
1000510210
1000610211
......
1006410269
1006510270
1006610271
10272
10273
10274
10275
10276
10277
10278
10279
1006710280
1006810281
1006910282
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="286"/>
<integer value="172"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTabViewItem" id="210384195">
<string key="NSIdentifier">Item 1</string>
<object class="NSView" key="NSView" id="389526238">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="869599070"/>
<int key="NSvFlags">292</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<string key="NSFrameSize">{541, 408}</string>
<reference key="NSSuperview" ref="869599070"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
</object>
<string key="NSLabel">Startup Disk</string>
<object class="NSTabViewItem" id="10883603">
<string key="NSIdentifier">Item 3</string>
<object class="NSView" key="NSView" id="798772941">
<reference key="NSNextResponder" ref="869599070"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSComboTableView" key="NSTableView" id="497140426">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{13, 210}</string>
<string key="NSFrameSize">{13, 231}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
</object>
</object>
<string key="NSFrameSize">{541, 408}</string>
<reference key="NSSuperview" ref="869599070"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
</object>
<string key="NSLabel">Boot Flags</string>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="232732509">
<reference key="NSNextResponder" ref="59588505"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{277, 46}, {205, 23}}</string>
<reference key="NSSuperview" ref="59588505"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="893682965">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Dark Wake</string>
<reference key="NSSupport" ref="930899267"/>
<reference key="NSControlView" ref="232732509"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="1062345216"/>
<reference key="NSAlternateImage" ref="731537593"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="449337560">
<reference key="NSNextResponder" ref="59588505"/>
<int key="NSvFlags">268</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSComboBox" id="566032593">
<reference key="NSNextResponder" ref="59588505"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{378, 46}, {76, 26}}</string>
<reference key="NSSuperview" ref="59588505"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="887588379">
<int key="NSCellFlags">343014976</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="930899267"/>
<reference key="NSControlView" ref="566032593"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="501125233"/>
<reference key="NSTextColor" ref="560934093"/>
<int key="NSVisibleItemCount">2</int>
<bool key="NSHasVerticalScroller">YES</bool>
<object class="NSMutableArray" key="NSPopUpListData">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>0</string>
<string>1</string>
</object>
<reference key="NSDelegate" ref="566032593"/>
<object class="NSComboTableView" key="NSTableView" id="630205025">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{13, 63}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn">
<double key="NSWidth">10</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="445094936"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
</object>
<reference key="NSTextColor" ref="732916706"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell">
<int key="NSCellFlags">338820672</int>
<int key="NSCellFlags2">268436480</int>
<reference key="NSSupport" ref="930899267"/>
<reference key="NSControlView" ref="630205025"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="694251928"/>
<reference key="NSTextColor" ref="560934093"/>
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<reference key="NSTableView" ref="630205025"/>
</object>
</object>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<reference key="NSBackgroundColor" ref="694251928"/>
<reference key="NSGridColor" ref="178056349"/>
<double key="NSRowHeight">19</double>
<string key="NSAction">tableViewAction:</string>
<int key="NSTvFlags">-765427712</int>
<reference key="NSDelegate" ref="887588379"/>
<reference key="NSDataSource" ref="887588379"/>
<reference key="NSTarget" ref="887588379"/>
<int key="NSColumnAutoresizingStyle">1</int>
<int key="NSDraggingSourceMaskForLocal">15</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
</object>
</object>
<string key="NSFrame">{{1, 1}, {509, 78}}</string>
<reference key="NSSuperview" ref="965868050"/>
<reference key="NSTabView" ref="869599070"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="10883603"/>
<reference key="NSSelectedTabViewItem" ref="210384195"/>
<reference key="NSFont" ref="22"/>
<int key="NSTvFlags">268435462</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="798772941"/>
<reference ref="389526238"/>
</object>
</object>
<object class="NSImageView" id="2913">
</object>
<int key="connectionID">1427</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">onCheckButtonChange:</string>
<reference key="source" ref="523685185"/>
<reference key="destination" ref="232732509"/>
</object>
<int key="connectionID">1430</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">onTextFiedChange:</string>
<reference key="source" ref="523685185"/>
<reference key="destination" ref="566032593"/>
</object>
<int key="connectionID">1433</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">mDarkWake</string>
<reference key="source" ref="523685185"/>
<reference key="destination" ref="232732509"/>
</object>
<int key="connectionID">1434</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">mDarkWakeText</string>
<reference key="source" ref="523685185"/>
<reference key="destination" ref="566032593"/>
</object>
<int key="connectionID">1435</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<reference ref="353259796"/>
<reference ref="449337560"/>
<reference ref="344346433"/>
<reference ref="232732509"/>
<reference ref="566032593"/>
</object>
<reference key="parent" ref="683634001"/>
</object>
<reference key="object" ref="41430622"/>
<reference key="parent" ref="1032245036"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1428</int>
<reference key="object" ref="232732509"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="893682965"/>
</object>
<reference key="parent" ref="965868050"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1429</int>
<reference key="object" ref="893682965"/>
<reference key="parent" ref="232732509"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1431</int>
<reference key="object" ref="566032593"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="887588379"/>
</object>
<reference key="parent" ref="965868050"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1432</int>
<reference key="object" ref="887588379"/>
<reference key="parent" ref="566032593"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<string>1424.IBPluginDependency</string>
<string>1424.IBViewBoundsToFrameTransform</string>
<string>1425.IBPluginDependency</string>
<string>1428.IBAttributePlaceholdersKey</string>
<string>1428.IBPluginDependency</string>
<string>1428.IBViewBoundsToFrameTransform</string>
<string>1429.IBPluginDependency</string>
<string>1431.IBPluginDependency</string>
<string>1431.IBViewBoundsToFrameTransform</string>
<string>1432.IBPluginDependency</string>
<string>158.IBPluginDependency</string>
<string>160.IBPluginDependency</string>
<string>172.IBAttributePlaceholdersKey</string>
<string>562.IBPluginDependency</string>
<string>563.IBAttributePlaceholdersKey</string>
<string>563.IBPluginDependency</string>
<string>563.IBViewBoundsToFrameTransform</string>
<string>566.IBPluginDependency</string>
<string>567.IBPluginDependency</string>
<string>568.IBPluginDependency</string>
<string>847.IBPluginDependency</string>
<string>848.IBPluginDependency</string>
<string>851.IBPluginDependency</string>
<string>851.IBViewBoundsToFrameTransform</string>
<string>852.IBPluginDependency</string>
<string>855.IBPluginDependency</string>
<string>856.IBPluginDependency</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{938, 770}, {668, 439}}</string>
<string>{{344, 343}, {668, 439}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{938, 770}, {668, 439}}</string>
<string>{{344, 343}, {668, 439}}</string>
<boolean value="YES"/>
<string>{224.66399999999999, 10}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<bytes key="NSTransformStruct">P4AAAL+AAABDUQAAwy4AAA</bytes>
</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="232732509"/>
<string key="toolTip">Force using the sleepimage (default=No)</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDJgAAwnwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDvYAAwoYAAA</bytes>
</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">InitialTabViewItem</string>
<object class="IBInitialTabViewItemAttribute" key="NS.object.0">
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDIQAAwogAAA</bytes>
</object>
<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>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCzAAAwyYAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1427</int>
<int key="maxID">1435</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<string>mDSDTDrop</string>
<string>mDSDTFile</string>
<string>mDSDTFileText</string>
<string>mDarkWake</string>
<string>mDarkWakeText</string>
<string>mDebug</string>
<string>mDebugText</string>
<string>mDeviceRd</string>
<string>NSButton</string>
<string>NSComboBox</string>
<string>NSButton</string>
<string>NSComboBox</string>
<string>NSButton</string>
<string>NSTextField</string>
<string>NSButton</string>
<string>NSButton</string>
<string>mDSDTDrop</string>
<string>mDSDTFile</string>
<string>mDSDTFileText</string>
<string>mDarkWake</string>
<string>mDarkWakeText</string>
<string>mDebug</string>
<string>mDebugText</string>
<string>mDeviceRd</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">mDarkWake</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">mDarkWakeText</string>
<string key="candidateClassName">NSComboBox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">mDebug</string>
<string key="candidateClassName">NSButton</string>
</object>

Archive Download the corresponding diff file

Revision: 432