Chameleon Applications Commit Details - 346 - Chameleon related Applications (system preferences panels, helper applications)

Date:

2011-11-16 06:45:49 (12 years 5 months ago)

Author:

Rekursor

Commit:

346

Parents:

345

Message:

added uuid to freeze

Changes:

M	/trunk/ChameleonPrefPane/Sources/BootSetupController.mm
M	/trunk/ChameleonPrefPane/CHANGES
M	/trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm

File differences

-97
98 98
99 99
100 
100
101
101 102
102 103
103 
104
105
104 106
105 107
106 108
107 109
108 110
109 111
112
113
114
110 115
111 116
112 117
... ...
203 208
204 209
205 210
206 
211
212
207 213
208 214
209 215
+␉␉␉{␊
␉␉␉␉switch (k) {␊
␉␉␉␉␉case 0: // disk number␊
␉␉␉␉␉␉diskNum = [word characterAtIndex:0] - '0' ;␊
␉␉␉␉␉␉diskNum = [word intValue] ;␊
␉␉␉␉␉␉[ p setDiskNumber:diskNum];␊
␉␉␉␉␉␉break;␊
␉␉␉␉␉case 1: // partition number␊
␉␉␉␉␉␉partNum = [word characterAtIndex:0] - '0' ;␊
␉␉␉␉␉␉partNum = [word intValue] ;␊
␉␉␉␉␉␉[ p setPartitionNumber: partNum];␉␉␉␉␉␉␉␊
␉␉␉␉␉␉break;␊
␉␉␉␉␉case 2: // volume label␊
␉␉␉␉␉␉[p setVName: word];␊
␉␉␉␉␉case 3: // fstype␊
␉␉␉␉␉␉[p setVKind: word];␊
␉␉␉␉␉␉break;␊
␉␉␉␉␉case 4: // vUUID␊
␉␉␉␉␉␉[p setVUUID: word];␊
␉␉␉␉␉␉break;␊
␉␉␉␉␉default:␊
␉␉␉␉␉␉break;␊
␉␉␉␉}␊

␉␉␉␉␉ [p diskNumber], cPartDescSep,␊
␉␉␉␉␉ [p partitionNumber], cPartDescSep,␊
␉␉␉␉␉ [[p vName] UTF8String], cPartDescSep,␊
␉␉␉␉␉ [[p vKind] UTF8String]);␊
␉␉␉␉␉ [[p vKind] UTF8String], cPartDescSep, ␊
␉␉␉␉␉ [[p vUUID] UTF8String]);␊
␉␉␉␊
␉␉␉// write it to the dictionary␊
␉␉␉NSString * key  = [[NSString alloc] initWithUTF8String: keyPartN];␊
 ...
 ␉␉␉{␊
 ␉␉␉␉switch (k) {␊
 ␉␉␉␉␉case 0: // disk number␊
-␉␉␉␉␉␉diskNum = [word characterAtIndex:0] - '0' ;␊
+␉␉␉␉␉␉diskNum = [word intValue] ;␊
+␉␉␉␉␉␉[ p setDiskNumber:diskNum];␊
 ␉␉␉␉␉␉break;␊
 ␉␉␉␉␉case 1: // partition number␊
-␉␉␉␉␉␉partNum = [word characterAtIndex:0] - '0' ;␊
+␉␉␉␉␉␉partNum = [word intValue] ;␊
+␉␉␉␉␉␉[ p setPartitionNumber: partNum];␉␉␉␉␉␉␉␊
 ␉␉␉␉␉␉break;␊
 ␉␉␉␉␉case 2: // volume label␊
 ␉␉␉␉␉␉[p setVName: word];␊
 ␉␉␉␉␉case 3: // fstype␊
 ␉␉␉␉␉␉[p setVKind: word];␊
 ␉␉␉␉␉␉break;␊
+␉␉␉␉␉case 4: // vUUID␊
+␉␉␉␉␉␉[p setVUUID: word];␊
+␉␉␉␉␉␉break;␊
 ␉␉␉␉␉default:␊
 ␉␉␉␉␉␉break;␊
 ␉␉␉␉}␊
 ␉␉␉␉␉ [p diskNumber], cPartDescSep,␊
 ␉␉␉␉␉ [p partitionNumber], cPartDescSep,␊
 ␉␉␉␉␉ [[p vName] UTF8String], cPartDescSep,␊
-␉␉␉␉␉ [[p vKind] UTF8String]);␊
+␉␉␉␉␉ [[p vKind] UTF8String], cPartDescSep, ␊
+␉␉␉␉␉ [[p vUUID] UTF8String]);␊
 ␉␉␉␊
 ␉␉␉// write it to the dictionary␊
 ␉␉␉NSString * key  = [[NSString alloc] initWithUTF8String: keyPartN];␊

-25
26 26
27 27
28 
28
29 29
30 30
31 31
+␉char line[256];␊
␉ShellProcess p;␊
␉␊
␉p.open("ls -1 /dev/disk*s*");␊
␉p.open("ls -1 /dev/disk*");␊
␉while( p.get_line(line, sizeof(line)-1))␊
␉{␊
␉␉size_t l = strlen(line);␊
 ␉char line[256];␊
 ␉ShellProcess p;␊
 ␉␊
-␉p.open("ls -1 /dev/disk*s*");␊
+␉p.open("ls -1 /dev/disk*");␊
 ␉while( p.get_line(line, sizeof(line)-1))␊
 ␉{␊
 ␉␉size_t l = strlen(line);␊

-
2
1 3
2 4
3 5
+- Added Partition UUID (OS X standard uuid, so chamelon ntfs/fat partition uuid's are for now not compatible).␊
- Added new Partition Extractor engine, complety rewritten in objective c.␊
- Added About Dialog, made the displayed version numbers all rely on the info.plist file␊
- Fixed refresh and on checked associated button state, made sure the string is disabled if value is 0␊
- Fixed crash when using swap hd 0<->2␊
+- Added Partition UUID (OS X standard uuid, so chamelon ntfs/fat partition uuid's are for now not compatible).␊
+- Added new Partition Extractor engine, complety rewritten in objective c.␊
 - Added About Dialog, made the displayed version numbers all rely on the info.plist file␊
 - Fixed refresh and on checked associated button state, made sure the string is disabled if value is 0␊
 - Fixed crash when using swap hd 0<->2␊

Download the corresponding diff file