Changeset 188
- Timestamp:
- 22-01-2008 13:28:59 (5 years ago)
- Location:
- trunk/lilypad
- Files:
-
- 4 modified
-
Lilypad.xcodeproj/jpp.mode1v3 (modified) (18 diffs)
-
Lilypad.xcodeproj/jpp.pbxuser (modified) (18 diffs)
-
Sources/LPAccountsController.m (modified) (2 diffs)
-
Sources/LPInternalDataUpgradeManager.m (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/lilypad/Lilypad.xcodeproj/jpp.mode1v3
r187 r188 409 409 <key>TableOfContents</key> 410 410 <array> 411 <string>D4 3A02B40D3F8272004E0F7E</string>411 <string>D4C0D3AD0D450332003FBFAE</string> 412 412 <string>1CE0B1FE06471DED0097A5F4</string> 413 <string>D4 3A02B50D3F8272004E0F7E</string>413 <string>D4C0D3AE0D450332003FBFAE</string> 414 414 <string>1CE0B20306471E060097A5F4</string> 415 415 <string>1CE0B20506471E060097A5F4</string> … … 501 501 <string>96DEDCDA08C7B2DD00E7112F</string> 502 502 <string>D44A2A1C0A47063200A9D148</string> 503 <string>29B97318FDCFA39411CA2CEA</string>504 <string>9672A028091046220022C1C7</string>505 503 <string>D4C688E00B13CFB400238AD2</string> 506 504 <string>1C37FBAC04509CD000000102</string> … … 512 510 <array> 513 511 <array> 514 <integer>295</integer> 515 <integer>294</integer> 516 <integer>210</integer> 517 <integer>0</integer> 518 </array> 519 <array> 520 <integer>296</integer> 521 <integer>294</integer> 522 <integer>210</integer> 523 <integer>0</integer> 524 </array> 525 <array> 526 <integer>308</integer> 527 <integer>307</integer> 528 <integer>210</integer> 529 <integer>0</integer> 530 </array> 531 <array> 532 <integer>309</integer> 533 <integer>307</integer> 534 <integer>210</integer> 512 <integer>23</integer> 513 <integer>12</integer> 535 514 <integer>0</integer> 536 515 </array> 537 516 </array> 538 517 <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> 539 <string>{{0, 4658}, {317, 680}}</string>518 <string>{{0, 82}, {317, 680}}</string> 540 519 </dict> 541 520 <key>PBXTopSmartGroupGIDs</key> … … 577 556 <key>TableOfContents</key> 578 557 <array> 579 <string>D4 7FCEAB0D422BF400C389BF</string>558 <string>D4D97FAE0D462B2F006524C8</string> 580 559 <string>11E0B1FE06471DED0097A5F4</string> 581 560 </array> … … 591 570 <true/> 592 571 <key>TimeStamp</key> 593 <real>222 440436.48611799</real>572 <real>222702376.829725</real> 594 573 <key>ToolbarDisplayMode</key> 595 574 <integer>1</integer> … … 606 585 <key>WindowOrderList</key> 607 586 <array> 608 <string>D47FCEAC0D422BF400C389BF</string> 609 <string>D47FCEAD0D422BF400C389BF</string> 610 <string>D47FCEAE0D422BF400C389BF</string> 611 <string>1C78EAAD065D492600B07095</string> 612 <string>1CD10A99069EF8BA00B06720</string> 613 <string>D485934D0D3E5F6700D30AC8</string> 614 <string>/Users/jpp/Developer/Projects/SapoMSG/leapfrog-trunk/lilypad/Lilypad.xcodeproj</string> 587 <string>/Users/jpp/Developer/Projects/SapoMSG/leapfrog-oss-trunk/lilypad/Lilypad.xcodeproj</string> 615 588 </array> 616 589 <key>WindowString</key> … … 694 667 <array> 695 668 <string>D485934D0D3E5F6700D30AC8</string> 696 <string>D4 7FCEA20D422B9D00C389BF</string>669 <string>D4D97F410D461D61006524C8</string> 697 670 <string>1CD0528F0623707200166675</string> 698 671 <string>XCMainBuildResultsModuleGUID</string> … … 736 709 <key>sizes</key> 737 710 <array> 738 <string>{{0, 0}, { 463, 373}}</string>739 <string>{{ 463, 0}, {517, 373}}</string>711 <string>{{0, 0}, {503, 333}}</string> 712 <string>{{503, 0}, {477, 333}}</string> 740 713 </array> 741 714 </dict> … … 752 725 <key>sizes</key> 753 726 <array> 754 <string>{{0, 0}, {980, 3 73}}</string>755 <string>{{0, 3 73}, {980, 327}}</string>727 <string>{{0, 0}, {980, 333}}</string> 728 <string>{{0, 333}, {980, 367}}</string> 756 729 </array> 757 730 </dict> … … 783 756 <real>85</real> 784 757 <string>Summary</string> 785 <real>2 58</real>758 <real>218</real> 786 759 </array> 787 760 <key>Frame</key> 788 <string>{{ 463, 0}, {517, 373}}</string>761 <string>{{503, 0}, {477, 333}}</string> 789 762 <key>RubberWindowFrame</key> 790 763 <string>387 137 980 741 0 0 1440 878 </string> … … 814 787 <array> 815 788 <string>1CD10A99069EF8BA00B06720</string> 816 <string>D4 7FCEA30D422B9D00C389BF</string>789 <string>D4D97F420D461D61006524C8</string> 817 790 <string>1C162984064C10D400B95A72</string> 818 <string>D4 7FCEA40D422B9D00C389BF</string>819 <string>D4 7FCEA50D422B9D00C389BF</string>820 <string>D4 7FCEA60D422B9D00C389BF</string>821 <string>D4 7FCEA70D422B9D00C389BF</string>822 <string>D4 7FCEA80D422B9D00C389BF</string>791 <string>D4D97F430D461D61006524C8</string> 792 <string>D4D97F440D461D61006524C8</string> 793 <string>D4D97F450D461D61006524C8</string> 794 <string>D4D97F460D461D61006524C8</string> 795 <string>D4D97F470D461D61006524C8</string> 823 796 </array> 824 797 <key>ToolbarConfiguration</key> … … 847 820 <array> 848 821 <dict> 822 <key>BecomeActive</key> 823 <true/> 849 824 <key>ContentConfiguration</key> 850 825 <dict> … … 852 827 <string>1CDD528C0622207200134675</string> 853 828 <key>PBXProjectModuleLabel</key> 854 <string> </string>829 <string>LPInternalDataUpgradeManager.m</string> 855 830 <key>StatusBarVisibility</key> 856 831 <true/> … … 873 848 </dict> 874 849 <dict> 875 <key>BecomeActive</key>876 <true/>877 850 <key>ContentConfiguration</key> 878 851 <dict> … … 910 883 <array> 911 884 <string>1C530D57069F1CE1000CFCEE</string> 912 <string>D4 7D8C570D4111910095DE85</string>913 <string>D4 7D8C580D4111910095DE85</string>885 <string>D4D97F540D461F0A006524C8</string> 886 <string>D4D97F550D461F0A006524C8</string> 914 887 <string>1CDD528C0622207200134675</string> 915 888 <string>1CD0528E0623707200166675</string> … … 978 951 <array> 979 952 <string>1C78EAAD065D492600B07095</string> 980 <string>D4 7FCEA90D422B9D00C389BF</string>953 <string>D4D97F480D461D61006524C8</string> 981 954 <string>1C78EAAC065D492600B07095</string> 982 955 </array> … … 1218 1191 <key>TableOfContents</key> 1219 1192 <array> 1220 <string>D4 7D8C740D4135180095DE85</string>1221 <string>D4 7D8C750D4135180095DE85</string>1193 <string>D4D97FA00D46278B006524C8</string> 1194 <string>D4D97FA10D46278B006524C8</string> 1222 1195 <string>1CE0B1FE06471DED0097A5F4</string> 1223 1196 <string>1CA1AED706398EBD00589147</string> … … 1228 1201 <string>321 385 996 358 0 0 1440 878 </string> 1229 1202 <key>WindowToolGUID</key> 1230 <string>D4 7D8C740D4135180095DE85</string>1203 <string>D4D97FA00D46278B006524C8</string> 1231 1204 <key>WindowToolIsVisible</key> 1232 1205 <false/> -
trunk/lilypad/Lilypad.xcodeproj/jpp.pbxuser
r187 r188 156 156 ); 157 157 }; 158 PBXPerProjectTemplateStateSaveDate = 222 439487;159 PBXWorkspaceStateSaveDate = 222 439487;158 PBXPerProjectTemplateStateSaveDate = 222702376; 159 PBXWorkspaceStateSaveDate = 222702376; 160 160 }; 161 161 sourceControlManager = D49C663B09B879CA0001210B /* Source Control */; … … 272 272 964276B2091464180037BC67 /* JKGroupTableView.m */ = { 273 273 uiCtxt = { 274 sepNavIntBoundsRect = "{{0, 0}, { 757, 9576}}";275 sepNavSelRange = "{ 12749, 28}";276 sepNavVisRange = "{ 11949, 1545}";274 sepNavIntBoundsRect = "{{0, 0}, {877, 9436}}"; 275 sepNavSelRange = "{8654, 0}"; 276 sepNavVisRange = "{8186, 868}"; 277 277 sepNavVisRect = "{{0, 2621}, {771, 820}}"; 278 278 sepNavWindowFrame = "{{530, 0}, {816, 878}}"; … … 325 325 9672A00A09100C060022C1C7 /* LPRosterController.h */ = { 326 326 uiCtxt = { 327 sepNavIntBoundsRect = "{{0, 0}, { 839, 2422}}";328 sepNavSelRange = "{ 4219, 0}";329 sepNavVisRange = "{ 2834, 2205}";327 sepNavIntBoundsRect = "{{0, 0}, {990, 2310}}"; 328 sepNavSelRange = "{5316, 0}"; 329 sepNavVisRange = "{4180, 1580}"; 330 330 sepNavVisRect = "{{0, 1597}, {832, 475}}"; 331 331 sepNavWindowFrame = "{{520, 69}, {898, 809}}"; … … 334 334 9672A00B09100C060022C1C7 /* LPRosterController.m */ = { 335 335 uiCtxt = { 336 sepNavIntBoundsRect = "{{0, 0}, { 839, 35770}}";337 sepNavSelRange = "{ 39562, 0}";338 sepNavVisRange = "{ 38839, 1535}";336 sepNavIntBoundsRect = "{{0, 0}, {990, 35196}}"; 337 sepNavSelRange = "{76033, 12}"; 338 sepNavVisRange = "{75464, 1164}"; 339 339 sepNavVisRect = "{{0, 17214}, {832, 475}}"; 340 sepNavWindowFrame = "{{ 520, 69}, {898, 809}}";340 sepNavWindowFrame = "{{117, 62}, {1005, 816}}"; 341 341 }; 342 342 }; … … 444 444 96894EBE0912DAA7003C7540 /* LPAccount.m */ = { 445 445 uiCtxt = { 446 sepNavIntBoundsRect = "{{0, 0}, {9 19, 22848}}";446 sepNavIntBoundsRect = "{{0, 0}, {905, 22610}}"; 447 447 sepNavSelRange = "{45710, 0}"; 448 sepNavVisRange = "{4 5342, 1248}";448 sepNavVisRange = "{44243, 3186}"; 449 449 sepNavVisRect = "{{0, 17528}, {937, 820}}"; 450 450 sepNavWindowFrame = "{{151, 0}, {964, 878}}"; … … 629 629 96DEDCBA08C7AF9400E7112F /* Defaults.plist */ = { 630 630 uiCtxt = { 631 sepNavIntBoundsRect = "{{0, 0}, {799, 687}}"; 632 sepNavSelRange = "{918, 2}"; 631 sepNavIntBoundsRect = "{{0, 0}, {990, 560}}"; 632 sepNavSelRange = "{237, 16}"; 633 sepNavVisRange = "{0, 836}"; 633 634 sepNavVisRect = "{{0, 0}, {799, 687}}"; 634 635 sepNavWindowFrame = "{{137, 65}, {844, 745}}"; … … 1284 1285 D40CB1170C45288B0003859D /* LPUIController.m */ = { 1285 1286 uiCtxt = { 1286 sepNavIntBoundsRect = "{{0, 0}, { 805, 26026}}";1287 sepNavSelRange = "{ 15971, 0}";1288 sepNavVisRange = "{ 15799, 404}";1287 sepNavIntBoundsRect = "{{0, 0}, {990, 25774}}"; 1288 sepNavSelRange = "{34582, 27}"; 1289 sepNavVisRange = "{33887, 1420}"; 1289 1290 sepNavVisRect = "{{0, 14930}, {898, 473}}"; 1290 1291 sepNavWindowFrame = "{{300, 69}, {916, 809}}"; … … 1528 1529 D42386B80BB02DDE007FE580 /* LPMessageCenter.m */ = { 1529 1530 uiCtxt = { 1530 sepNavIntBoundsRect = "{{0, 0}, {9 90, 8386}}";1531 sepNavSelRange = "{ 3812, 29}";1532 sepNavVisRange = "{ 3235, 1089}";1531 sepNavIntBoundsRect = "{{0, 0}, {906, 7994}}"; 1532 sepNavSelRange = "{5872, 146}"; 1533 sepNavVisRange = "{9179, 2637}"; 1533 1534 sepNavVisRect = "{{0, 1435}, {914, 802}}"; 1534 1535 sepNavWindowFrame = "{{424, 18}, {965, 860}}"; … … 1636 1637 ignoreCount = 0; 1637 1638 location = AppKit; 1638 modificationTime = 222 440241.688047;1639 modificationTime = 222700092.438156; 1639 1640 state = 1; 1640 1641 symbolName = NSBeep; … … 1703 1704 D43BD3AE0C55148D006CB4ED /* LPInternalDataUpgradeManager.m */ = { 1704 1705 uiCtxt = { 1705 sepNavIntBoundsRect = "{{0, 0}, {871, 1162}}"; 1706 sepNavSelRange = "{1428, 0}"; 1706 sepNavIntBoundsRect = "{{0, 0}, {990, 1232}}"; 1707 sepNavSelRange = "{1498, 36}"; 1708 sepNavVisRange = "{908, 875}"; 1707 1709 sepNavVisRect = "{{0, 809}, {871, 273}}"; 1708 1710 sepNavWindowFrame = "{{412, 0}, {896, 878}}"; … … 1711 1713 D43BD3AF0C55148D006CB4ED /* LPInternalDataUpgradeManager.h */ = { 1712 1714 uiCtxt = { 1713 sepNavIntBoundsRect = "{{0, 0}, {736, 791}}"; 1714 sepNavSelRange = "{395, 0}"; 1715 sepNavIntBoundsRect = "{{0, 0}, {837, 821}}"; 1716 sepNavSelRange = "{381, 27}"; 1717 sepNavVisRange = "{0, 605}"; 1715 1718 sepNavVisRect = "{{0, 0}, {736, 791}}"; 1719 sepNavWindowFrame = "{{66, 4}, {874, 869}}"; 1716 1720 }; 1717 1721 }; … … 2220 2224 ignoreCount = 0; 2221 2225 location = Foundation; 2222 modificationTime = 222 440241.688071;2223 state = 0;2226 modificationTime = 222700358.48615; 2227 state = 1; 2224 2228 symbolName = "-[_NSZombie methodSignatureForSelector:]"; 2225 2229 }; … … 2235 2239 ignoreCount = 0; 2236 2240 location = Foundation; 2237 modificationTime = 222 440241.688082;2241 modificationTime = 222700101.868394; 2238 2242 state = 1; 2239 2243 symbolName = "-[NSObject valueForUndefinedKey:]"; … … 2250 2254 ignoreCount = 0; 2251 2255 location = Foundation; 2252 modificationTime = 222 440241.688092;2253 state = 0;2256 modificationTime = 222700358.486189; 2257 state = 1; 2254 2258 symbolName = "-[_NSZombie release]"; 2255 2259 }; 2256 2260 D499FB0C09E56DD1007E68AE /* LPAccountsController.h */ = { 2257 2261 uiCtxt = { 2258 sepNavIntBoundsRect = "{{0, 0}, {910, 21 00}}";2259 sepNavSelRange = "{ 3597, 18}";2260 sepNavVisRange = "{2 304, 1918}";2262 sepNavIntBoundsRect = "{{0, 0}, {910, 2128}}"; 2263 sepNavSelRange = "{2601, 25}"; 2264 sepNavVisRange = "{2081, 1617}"; 2261 2265 sepNavVisRect = "{{0, 1541}, {832, 475}}"; 2262 2266 sepNavWindowFrame = "{{269, 69}, {969, 809}}"; … … 2265 2269 D499FB0D09E56DD2007E68AE /* LPAccountsController.m */ = { 2266 2270 uiCtxt = { 2267 sepNavIntBoundsRect = "{{0, 0}, {9 90, 16856}}";2268 sepNavSelRange = "{ 36508, 23}";2269 sepNavVisRange = "{ 35977, 1359}";2271 sepNavIntBoundsRect = "{{0, 0}, {910, 17332}}"; 2272 sepNavSelRange = "{8102, 0}"; 2273 sepNavVisRange = "{6886, 1861}"; 2270 2274 sepNavVisRect = "{{0, 11388}, {892, 820}}"; 2271 2275 sepNavWindowFrame = "{{269, 69}, {969, 809}}"; … … 2396 2400 countType = 0; 2397 2401 delayBeforeContinue = 0; 2398 hitCount = 0;2402 hitCount = 1; 2399 2403 ignoreCount = 0; 2400 2404 location = libobjc.A.dylib; 2401 modificationTime = 222 440241.688121;2405 modificationTime = 222700104.13904; 2402 2406 state = 1; 2403 2407 symbolName = objc_exception_throw; … … 2483 2487 ignoreCount = 0; 2484 2488 location = Foundation; 2485 modificationTime = 222 440241.688101;2486 state = 0;2489 modificationTime = 222700358.486211; 2490 state = 1; 2487 2491 symbolName = _NSKVODeallocateLog; 2488 2492 }; … … 2498 2502 ignoreCount = 0; 2499 2503 location = Foundation; 2500 modificationTime = 222 440241.688111;2504 modificationTime = 222700092.43826; 2501 2505 state = 2; 2502 2506 symbolName = NSLog; -
trunk/lilypad/Sources/LPAccountsController.m
r182 r188 204 204 m_isLoadingFromDefaults = YES; 205 205 206 NSDictionary *accountsFromPrefs = [[NSUserDefaults standardUserDefaults] dictionaryForKey:LPAllAccountsDefaultsKey]; 207 NSArray *sortedAccountUUIDs = [[NSUserDefaults standardUserDefaults] arrayForKey:LPSortedAccountUUIDsDefaultsKey]; 206 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; 207 208 NSDictionary *accountsFromPrefs = [defaults dictionaryForKey:LPAllAccountsDefaultsKey]; 209 NSArray *sortedAccountUUIDs = [defaults arrayForKey:LPSortedAccountUUIDsDefaultsKey]; 208 210 209 211 NSEnumerator *accountUUIDEnumerator = (sortedAccountUUIDs != nil ? … … 231 233 } 232 234 @catch (NSException *exception) { 233 if ([[exception name] isEqualToString:NSUndefinedKeyException]) { 235 if ([key isEqualToString:@"shouldAutoLogin"]) { 236 // Once a property of the only existing account, this is now a default used by the accounts controller 237 [defaults setObject:[accountDict objectForKey:key] forKey:@"AccountAutoLogin"]; 238 } 239 else if ([[exception name] isEqualToString:NSUndefinedKeyException]) { 234 240 // Do nothing. It's probably a key that was saved by a previous version of leapfrog but that is unknown to this version. 235 241 } -
trunk/lilypad/Sources/LPInternalDataUpgradeManager.m
r64 r188 34 34 - (void)p_closeWindow 35 35 { 36 [NSApp abortModal]; 37 [m_progressIndicator stopAnimation:nil]; 36 if ([NSApp modalWindow] == m_window) { 37 [NSApp abortModal]; 38 [m_progressIndicator stopAnimation:nil]; 39 } 38 40 } 39 41 … … 60 62 { 61 63 m_done = YES; 62 if ([NSApp modalWindow] == m_window)63 [self p_closeWindow];64 [self p_closeWindow]; 65 [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(p_showWindow) object:nil]; 64 66 } 65 67 … … 73 75 [self performSelector:@selector(p_showWindow) withObject:nil afterDelay:0.5]; 74 76 75 while (!m_done) 77 while (!m_done) { 76 78 [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.5]]; 79 } 77 80 78 81 [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(p_showWindow) object:nil];