Menu
▾
▴
macattrick-commit — Every CVS commit will be sent to macattrick-commit.
You can subscribe to this list here.
| 2005 |
Jan
(13) |
Feb
(37) |
Mar
(12) |
Apr
(15) |
May
(46) |
Jun
(40) |
Jul
(27) |
Aug
|
Sep
(35) |
Oct
(15) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Geisschaes <gei...@us...> - 2005-02-27 15:14:59
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19953/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: changed login to security code. password is changed in keychain Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** roman.mode1 16 Feb 2005 21:33:23 -0000 1.20 --- roman.mode1 27 Feb 2005 15:14:46 -0000 1.21 *************** *** 243,251 **** <string>29B97314FDCFA39411CA2CEA</string> <string>1C37FBAC04509CD000000102</string> </array> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> ! <integer>10</integer> <integer>0</integer> </array> --- 243,252 ---- <string>29B97314FDCFA39411CA2CEA</string> <string>1C37FBAC04509CD000000102</string> + <string>1C37FAAC04509CD000000102</string> </array> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> ! <integer>4</integer> <integer>0</integer> </array> *************** *** 267,271 **** </array> <key>RubberWindowFrame</key> ! <string>266 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 268,272 ---- </array> <key>RubberWindowFrame</key> ! <string>216 20 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 283,287 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>14flag.gif</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 284,288 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LoginController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 291,297 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>14flag.gif</string> <key>bookmark</key> ! <string>30DE3FB207C3F36D00342677</string> <key>history</key> <array> --- 292,298 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LoginController.m</string> <key>bookmark</key> ! <string>3077E28707D21ADE00C67D29</string> <key>history</key> <array> *************** *** 314,320 **** <string>306096160793106500BAA4CF</string> <string>306096170793106500BAA4CF</string> - <string>306096180793106500BAA4CF</string> <string>30609625079318BE00BAA4CF</string> - <string>30609626079318BE00BAA4CF</string> <string>306096300793190400BAA4CF</string> <string>3060964307931A3C00BAA4CF</string> --- 315,319 ---- *************** *** 336,341 **** <string>3031CB3407A0495A006539CD</string> <string>3031CB4007A04A5B006539CD</string> - <string>3031CB5107A04D53006539CD</string> - <string>3021F76107A56A290073597B</string> <string>3021F76207A56A290073597B</string> <string>3021F78507A56FCE0073597B</string> --- 335,338 ---- *************** *** 369,373 **** <string>30BA8B6D07B80CB8001B29F3</string> <string>30BA8B7607B80D04001B29F3</string> - <string>30BA8B8B07B80E7A001B29F3</string> <string>30BA8B8C07B80E7A001B29F3</string> <string>30BA8B9707B80EC9001B29F3</string> --- 366,369 ---- *************** *** 378,382 **** <string>30DE3EE507C3C66400342677</string> <string>30DE3F9D07C3F05600342677</string> ! <string>30DE3F9E07C3F05600342677</string> </array> <key>prevStack</key> --- 374,392 ---- <string>30DE3EE507C3C66400342677</string> <string>30DE3F9D07C3F05600342677</string> ! <string>301CA97807C749EC00FABBCC</string> ! <string>307FFA9607C7839400F1D476</string> ! <string>307FFA9707C7839400F1D476</string> ! <string>307FFA9807C7839400F1D476</string> ! <string>307FFA9907C7839400F1D476</string> ! <string>307FFA9A07C7839400F1D476</string> ! <string>307C1F3407D1FC7A00CA6B3D</string> ! <string>307C1F3507D1FC7A00CA6B3D</string> ! <string>307C1F3607D1FC7A00CA6B3D</string> ! <string>307C1F3C07D1FCAA00CA6B3D</string> ! <string>307C1F5E07D200EF00CA6B3D</string> ! <string>307C1F7507D2033400CA6B3D</string> ! <string>307C1F8D07D2092500CA6B3D</string> ! <string>3077E26307D2177A00C67D29</string> ! <string>30BA8B8B07B80E7A001B29F3</string> </array> <key>prevStack</key> *************** *** 463,472 **** <string>30BA8B9107B80E7A001B29F3</string> <string>30BA8BAD07B81026001B29F3</string> - <string>30DE3EB007C3B66600342677</string> - <string>30DE3EB407C3B68500342677</string> <string>30DE3EC807C3BC3600342677</string> ! <string>30DE3EC907C3BC3600342677</string> ! <string>30DE3EE607C3C66400342677</string> ! <string>30DE3F9F07C3F05600342677</string> </array> </dict> --- 473,487 ---- <string>30BA8B9107B80E7A001B29F3</string> <string>30BA8BAD07B81026001B29F3</string> <string>30DE3EC807C3BC3600342677</string> ! <string>301CA97A07C749EC00FABBCC</string> ! <string>307FFA9D07C7839400F1D476</string> ! <string>307FFA9E07C7839400F1D476</string> ! <string>307FFA9F07C7839400F1D476</string> ! <string>307FFAA107C7839400F1D476</string> ! <string>307FFAA307C7839400F1D476</string> ! <string>307C1F3707D1FC7A00CA6B3D</string> ! <string>307C1F3907D1FC7A00CA6B3D</string> ! <string>307C1F7707D2033400CA6B3D</string> ! <string>3077E26407D2177A00C67D29</string> </array> </dict> *************** *** 482,486 **** <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>266 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 497,501 ---- <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>216 20 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 504,508 **** <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>266 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 519,523 ---- <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>216 20 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 528,534 **** <key>TableOfContents</key> <array> ! <string>30DE3EA107C3B29200342677</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30DE3EA207C3B29200342677</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 543,549 ---- <key>TableOfContents</key> <array> ! <string>3077E25D07D216C200C67D29</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3077E25E07D216C200C67D29</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 558,570 **** <key>WindowOrderList</key> <array> ! <string>303B689D075A03FF009951CC</string> ! <string>30DE3F2207C3D11600342677</string> ! <string>303B68B1075A0D24009951CC</string> <string>1CD10A99069EF8BA00B06720</string> - <string>1C0AD2B3069F1EA900FABCE6</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>266 166 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 573,584 ---- <key>WindowOrderList</key> <array> ! <string>3077E25907D216BD00C67D29</string> <string>1CD10A99069EF8BA00B06720</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> + <string>1C0AD2B3069F1EA900FABCE6</string> + <string>3077E26607D2177A00C67D29</string> </array> <key>WindowString</key> ! <string>216 20 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 585,589 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>TryPlayerController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 599,603 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>FormulasViewController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 593,611 **** <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>TryPlayerController.m</string> <key>bookmark</key> ! <string>30DE3FB307C3F36D00342677</string> <key>history</key> <array> ! <string>306BE2E407B80670009942ED</string> ! <string>306BE2F807B806D7009942ED</string> ! <string>30BA8B3407B807F0001B29F3</string> ! <string>30BA8BD507B812DE001B29F3</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>306BE2E607B80670009942ED</string> ! <string>306BE2FA07B806D7009942ED</string> ! <string>30BA8B3607B807F0001B29F3</string> </array> </dict> --- 607,616 ---- <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>FormulasViewController.m</string> <key>bookmark</key> ! <string>307C201407D216A100CA6B3D</string> <key>history</key> <array> ! <string>307C1F4407D1FF4F00CA6B3D</string> </array> </dict> *************** *** 621,625 **** <string>{{0, 0}, {539, 214}}</string> <key>RubberWindowFrame</key> ! <string>522 155 539 499 0 0 1280 832 </string> </dict> <key>Module</key> --- 626,630 ---- <string>{{0, 0}, {539, 214}}</string> <key>RubberWindowFrame</key> ! <string>521 155 539 499 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 647,651 **** <string>{{0, 221}, {539, 236}}</string> <key>RubberWindowFrame</key> ! <string>522 155 539 499 0 0 1280 832 </string> </dict> <key>Module</key> --- 652,656 ---- <string>{{0, 221}, {539, 236}}</string> <key>RubberWindowFrame</key> ! <string>521 155 539 499 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 670,674 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>30DE3EFA07C3CC8B00342677</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 675,679 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>307C1F4607D1FF4F00CA6B3D</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 677,685 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>522 155 539 499 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B68B1075A0D24009951CC</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 682,690 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>521 155 539 499 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B68B1075A0D24009951CC</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 710,715 **** <key>sizes</key> <array> ! <string>{{0, 0}, {195, 242}}</string> ! <string>{{195, 0}, {694, 242}}</string> </array> </dict> --- 715,720 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {168, 242}}</string> ! <string>{{168, 0}, {721, 242}}</string> </array> </dict> *************** *** 774,780 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30DE3F2107C3D11600342677</string> <string>1C162984064C10D400B95A72</string> ! <string>30DE3F2207C3D11600342677</string> </array> <key>ToolbarConfiguration</key> --- 779,785 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3077E25807D216BD00C67D29</string> <string>1C162984064C10D400B95A72</string> ! <string>3077E25907D216BD00C67D29</string> </array> <key>ToolbarConfiguration</key> *************** *** 785,789 **** <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 790,794 ---- <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 815,838 **** <key>PBXProjectModuleLabel</key> <string>FormulasViewController.m</string> - <key>bookmark</key> - <string>306BE2FF07B80708009942ED</string> - <key>history</key> - <array> - <string>306BE2E807B80670009942ED</string> - <string>306BE2E907B80670009942ED</string> - <string>306BE2EA07B80670009942ED</string> - <string>306BE2EB07B80670009942ED</string> - <string>306BE2EC07B80670009942ED</string> - <string>306BE2C907B805E1009942ED</string> - </array> - <key>prevStack</key> - <array> - <string>306BE2ED07B80670009942ED</string> - <string>306BE2EE07B80670009942ED</string> - <string>306BE2EF07B80670009942ED</string> - <string>306BE2F007B80670009942ED</string> - <string>306BE2F107B80670009942ED</string> - <string>306BE2F207B80670009942ED</string> - </array> </dict> <key>SplitCount</key> --- 820,823 ---- *************** *** 859,864 **** </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 844,847 ---- *************** *** 896,901 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>306BE2F407B80670009942ED</string> ! <string>306BE2F507B80670009942ED</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> --- 879,884 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>307C1F7107D2019400CA6B3D</string> ! <string>307C1F7207D2019400CA6B3D</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> *************** *** 960,964 **** <array> <string>303B689D075A03FF009951CC</string> ! <string>30DE3F2307C3D11600342677</string> <string>1C78EAAC065D492600B07095</string> </array> --- 943,947 ---- <array> <string>303B689D075A03FF009951CC</string> ! <string>307C200907D2165A00CA6B3D</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 968,972 **** <string>303B689D075A03FF009951CC</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 951,955 ---- <string>303B689D075A03FF009951CC</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 1003,1008 **** <key>sizes</key> <array> ! <string>{{0, 0}, {366, 167}}</string> ! <string>{{0, 176}, {366, 267}}</string> </array> </dict> --- 986,991 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {365, 167}}</string> ! <string>{{0, 176}, {365, 267}}</string> </array> </dict> *************** *** 1030,1034 **** <string>{{0, 0}, {713, 227}}</string> <key>RubberWindowFrame</key> ! <string>235 303 713 269 0 0 1280 832 </string> </dict> <key>Module</key> --- 1013,1017 ---- <string>{{0, 0}, {713, 227}}</string> <key>RubberWindowFrame</key> ! <string>341 230 713 269 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1053,1064 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30DE3EB807C3B77900342677</string> <string>1CD0528B0623707200166675</string> ! <string>30DE3EB907C3B77900342677</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>235 303 713 269 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1036,1047 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3077E25A07D216BD00C67D29</string> <string>1CD0528B0623707200166675</string> ! <string>3077E25B07D216BD00C67D29</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>341 230 713 269 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** roman.pbxuser 16 Feb 2005 21:33:25 -0000 1.85 --- roman.pbxuser 27 Feb 2005 15:14:46 -0000 1.86 *************** *** 3,9 **** 089C165DFE840E0CC02AAC07 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {705, 428}}"; ! sepNavSelRange = "{157, 0}"; ! sepNavVisRect = "{{0, 0}, {705, 428}}"; sepNavWindowFrame = "{{130, 180}, {750, 542}}"; }; --- 3,9 ---- 089C165DFE840E0CC02AAC07 = { uiCtxt = { [...1496 lines suppressed...] ! sepNavVisRect = "{{0, 716}, {1015, 458}}"; sepNavWindowFrame = "{{153, 159}, {750, 542}}"; }; *************** *** 4133,4139 **** 8D1107310486CEB800E47090 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {705, 428}}"; sepNavSelRange = "{633, 0}"; ! sepNavVisRect = "{{0, 0}, {705, 428}}"; sepNavWindowFrame = "{{107, 201}, {750, 542}}"; }; --- 4669,4675 ---- 8D1107310486CEB800E47090 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {686, 377}}"; sepNavSelRange = "{633, 0}"; ! sepNavVisRect = "{{0, 40}, {606, 326}}"; sepNavWindowFrame = "{{107, 201}, {750, 542}}"; }; |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:31
|
Update of /cvsroot/macattrick/macattrick/English.lproj/MainWindow.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/MainWindow.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/MainWindow.nib/info.nib,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** info.nib 18 Jan 2005 12:16:39 -0000 1.12 --- info.nib 18 Feb 2005 15:40:47 -0000 1.13 *************** *** 12,16 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 12,16 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/MainWindow.nib/keyedobjects.nib,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 Binary files /tmp/cvsgiWLeV and /tmp/cvsTaajv3 differ |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:31
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/PlayerDetails.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib/info.nib,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** info.nib 18 Jan 2005 21:06:10 -0000 1.7 --- info.nib 18 Feb 2005 15:40:50 -0000 1.8 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>32 110 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>43 142 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> *************** *** 14,18 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 14,18 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib/keyedobjects.nib,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvs11FjbV and /tmp/cvsuxhas3 differ |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:30
|
Update of /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/LineUpView.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/info.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** info.nib 18 Jan 2005 12:16:37 -0000 1.2 --- info.nib 18 Feb 2005 15:40:46 -0000 1.3 *************** *** 8,12 **** <dict> <key>5</key> ! <string>263 423 827 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> --- 8,12 ---- <dict> <key>5</key> ! <string>35 468 827 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> *************** *** 17,21 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 17,21 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/keyedobjects.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsPB9P2N and /tmp/cvslsDKeW differ |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:28
|
Update of /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/FormulasView.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/info.nib,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** info.nib 17 Feb 2005 08:49:45 -0000 1.6 --- info.nib 18 Feb 2005 15:40:43 -0000 1.7 *************** *** 8,12 **** <dict> <key>1848</key> ! <string>530 509 540 351 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> --- 8,12 ---- <dict> <key>1848</key> ! <string>34 637 540 351 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/keyedobjects.nib,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsXGkZnt and /tmp/cvsDvW9Cx differ |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:02
|
Update of /cvsroot/macattrick/macattrick/English.lproj/TryPlayer.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/TryPlayer.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/TryPlayer.nib/info.nib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** info.nib 7 Feb 2005 21:15:43 -0000 1.4 --- info.nib 18 Feb 2005 15:40:53 -0000 1.5 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>699 103 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>941 133 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> *************** *** 12,16 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 12,16 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/TryPlayer.nib/keyedobjects.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsZu8Iqh and /tmp/cvspygpb4 differ |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:02
|
Update of /cvsroot/macattrick/macattrick/English.lproj/TeamInfoView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/TeamInfoView.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/TeamInfoView.nib/info.nib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** info.nib 18 Jan 2005 21:06:28 -0000 1.4 --- info.nib 18 Feb 2005 15:40:52 -0000 1.5 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>113 208 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>226 305 827 517 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> --- 4,12 ---- <dict> <key>IBDocumentLocation</key> ! <string>152 268 356 240 0 0 1600 1002 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>36 465 827 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> *************** *** 127,131 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 127,131 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/TeamInfoView.nib/keyedobjects.nib,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvs2CSbd4 and /tmp/cvs73fSQQ differ |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:01
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/PreferencesPanel.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/info.nib,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** info.nib 16 Feb 2005 21:33:16 -0000 1.10 --- info.nib 18 Feb 2005 15:40:52 -0000 1.11 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>69 100 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>93 129 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/keyedobjects.nib,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 Binary files /tmp/cvsfWnxi0 and /tmp/cvs0TE86L differ |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:01
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PositionTableView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/PositionTableView.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PositionTableView.nib/info.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** info.nib 24 Jan 2005 20:18:50 -0000 1.3 --- info.nib 18 Feb 2005 15:40:52 -0000 1.4 *************** *** 4,21 **** <dict> <key>IBDocumentLocation</key> ! <string>69 59 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>226 305 827 517 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> <string>364.0</string> - <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 4,17 ---- <dict> <key>IBDocumentLocation</key> ! <string>93 76 356 240 0 0 1600 1002 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>35 467 827 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> <string>364.0</string> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PositionTableView.nib/keyedobjects.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsSAIYpT and /tmp/cvsrvMn5E differ |
|
From: Gfive <gf...@us...> - 2005-02-18 15:41:00
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30703/English.lproj/PlayerTableView.nib Modified Files: info.nib keyedobjects.nib Log Message: window changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib/info.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** info.nib 18 Jan 2005 12:16:41 -0000 1.3 --- info.nib 18 Feb 2005 15:40:51 -0000 1.4 *************** *** 8,12 **** <dict> <key>5</key> ! <string>388 426 827 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> --- 8,12 ---- <dict> <key>5</key> ! <string>35 466 827 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> *************** *** 17,21 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 17,21 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib/keyedobjects.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvscTpFoh and /tmp/cvs0XVcF2 differ |
|
From: Geisschaes <gei...@us...> - 2005-02-18 10:19:13
|
Update of /cvsroot/macattrick/macattrick/doc/localization/german In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4476/german Modified Files: Localizable.strings lineupview_german.strings login_german.strings mainmenu_german.strings mainwindow_german.strings playertableview_german.strings positiontableview_german.strings preferencespanel_german.strings teaminfoview_german.strings tryplayer_german.strings Log Message: some translations added Index: positiontableview_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/positiontableview_german.strings,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsrBUT2P and /tmp/cvskTd8nt differ Index: lineupview_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/lineupview_german.strings,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsptkqeS and /tmp/cvsq4a7Av differ Index: teaminfoview_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/teaminfoview_german.strings,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvssKfF6U and /tmp/cvsOdYevy differ Index: Localizable.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/Localizable.strings,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsiDu8tX and /tmp/cvsTeNgUA differ Index: login_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/login_german.strings,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsC1q09Z and /tmp/cvsoMRRBD differ Index: playertableview_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/playertableview_german.strings,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsTC2ur2 and /tmp/cvsRd5QUF differ Index: mainmenu_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/mainmenu_german.strings,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvs16eAm4 and /tmp/cvsRttcRH differ Index: mainwindow_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/mainwindow_german.strings,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 Binary files /tmp/cvsN4idC6 and /tmp/cvsJwRh8J differ Index: preferencespanel_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/preferencespanel_german.strings,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvsdlvyRa and /tmp/cvsZTESoO differ Index: tryplayer_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/tryplayer_german.strings,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvsrJ39dd and /tmp/cvsBmi2MQ differ |
|
From: Geisschaes <gei...@us...> - 2005-02-18 10:19:13
|
Update of /cvsroot/macattrick/macattrick/doc/localization/english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4476/english Modified Files: formulasview_english.strings Log Message: some translations added Index: formulasview_english.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/english/formulasview_english.strings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsL0IFlH and /tmp/cvsyXawtk differ |
|
From: Geisschaes <gei...@us...> - 2005-02-17 09:03:37
|
Update of /cvsroot/macattrick/macattrick/doc/localization/german In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13446/doc/localization/german Modified Files: lineupview_german.strings login_german.strings mainmenu_german.strings mainwindow_german.strings playertableview_german.strings positiontableview_german.strings preferencespanel_german.strings teaminfoview_german.strings tryplayer_german.strings Log Message: formulasview_english.strings added Index: positiontableview_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/positiontableview_german.strings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsOpvFi3 and /tmp/cvsD7EPwO differ Index: lineupview_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/lineupview_german.strings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsqrXYEi and /tmp/cvsMwSL13 differ Index: teaminfoview_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/teaminfoview_german.strings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvskIZOCA and /tmp/cvsmmCUcm differ Index: login_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/login_german.strings,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvscyiUL6 and /tmp/cvsxqbuLS differ Index: playertableview_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/playertableview_german.strings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsDnlFnn and /tmp/cvshZF9x9 differ Index: mainmenu_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/mainmenu_german.strings,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvsIGgJPD and /tmp/cvsFoUvcq differ Index: mainwindow_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/mainwindow_german.strings,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsNTouIO and /tmp/cvs8VhmcB differ Index: preferencespanel_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/preferencespanel_german.strings,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvsCSjoE2 and /tmp/cvsdLuMfP differ Index: tryplayer_german.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/tryplayer_german.strings,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 Binary files /tmp/cvs129iY1 and /tmp/cvsAx65GO differ |
Update of /cvsroot/macattrick/macattrick/doc/localization/english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13446/doc/localization/english Modified Files: lineupview_english.strings mainmenu_english.strings preferencespanel_english.strings teaminfoview_english.strings Added Files: formulasview_english.strings Log Message: formulasview_english.strings added Index: teaminfoview_english.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/english/teaminfoview_english.strings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsbE8WGL and /tmp/cvsiMnnDw differ Index: mainmenu_english.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/english/mainmenu_english.strings,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsepJWTS and /tmp/cvskBvfVD differ Index: lineupview_english.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/english/lineupview_english.strings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs6al5Hb and /tmp/cvsngkb0W differ --- NEW FILE: formulasview_english.strings --- (This appears to be a binary file; contents omitted.) Index: preferencespanel_english.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/english/preferencespanel_english.strings,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsye8mWj and /tmp/cvs9AUrl5 differ |
|
From: Geisschaes <gei...@us...> - 2005-02-17 08:56:39
|
Update of /cvsroot/macattrick/macattrick/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11777 Modified Files: glotfinish.pl glotprepare.pl Added Files: tinyglot.pl Log Message: scripts updated Index: glotfinish.pl =================================================================== RCS file: /cvsroot/macattrick/macattrick/scripts/glotfinish.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** glotfinish.pl 20 Dec 2004 20:19:47 -0000 1.1 --- glotfinish.pl 17 Feb 2005 08:56:16 -0000 1.2 *************** *** 14,18 **** "LineUpView.nib" => "lineupview", "TeamInfoView.nib" => "teaminfoview", ! "TryPlayer.nib" => "tryplayer"); my $basedir = ".."; --- 14,19 ---- "LineUpView.nib" => "lineupview", "TeamInfoView.nib" => "teaminfoview", ! "TryPlayer.nib" => "tryplayer", ! "FormulasView.nib" => "formulasview"); my $basedir = ".."; Index: glotprepare.pl =================================================================== RCS file: /cvsroot/macattrick/macattrick/scripts/glotprepare.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** glotprepare.pl 20 Dec 2004 20:19:47 -0000 1.1 --- glotprepare.pl 17 Feb 2005 08:56:16 -0000 1.2 *************** *** 17,23 **** "LineUpView.nib" => "lineupview", "TeamInfoView.nib" => "teaminfoview", ! "TryPlayer.nib" => "tryplayer"); - my $basedir = ".."; my %opt = (man => 0, help => 0); --- 17,26 ---- "LineUpView.nib" => "lineupview", "TeamInfoView.nib" => "teaminfoview", ! "TryPlayer.nib" => "tryplayer", ! "FormulasView.nib" => "formulasview"); ! ! chomp (my $basedir = `pwd`); ! $basedir =~ s/scripts//; my %opt = (man => 0, help => 0); *************** *** 57,61 **** if(-f "${_}_$language.strings") { print "merging with tinyglot: $_\n"; ! my @out = split "\n", `tinyglot ${_}_$language.strings ../english/${_}_english.strings new_${_}_$language.strings`; # system "cp ${_}_$language.strings ${_}_$language.strings.bak"; system "mv new_${_}_$language.strings ${_}_$language.strings"; --- 60,64 ---- if(-f "${_}_$language.strings") { print "merging with tinyglot: $_\n"; ! my @out = split "\n", `$basedir/scripts/tinyglot.pl ${_}_$language.strings ../english/${_}_english.strings new_${_}_$language.strings`; # system "cp ${_}_$language.strings ${_}_$language.strings.bak"; system "mv new_${_}_$language.strings ${_}_$language.strings"; --- NEW FILE: tinyglot.pl --- #!/usr/bin/perl -T # -------------------------------------------------------- # tinyglot.pl # -------------------------------------------------------- # version 1.1 (21-Dec-2004) # [Alessandro Ranellucci <al...@pr...>] # --> Released under Perl Artistic License # # This script is useful to maintain translation of .strings # files or plist-based dict files in Cocoa applications. # It compares two files (the new unlocalized one and the old # localized one) and merges their strings into a new file. # New strings, that have no translation, are put at the end # of the file so that it's easy to complete them. # This script reads and generates both plain .strings files # (UTF-16 encoding) and XML plist files (UTF-8) encoding. # # Three arguments are required: # old_file: the latest localized file # new_file: the newest unlocalized file # output_file: where the two above are merged to # # REQUIREMENTS: # - Unicode::String (available from CPAN) # use strict; use Unicode::String qw(utf7 utf16 utf8 latin1); my ($encoding, $old_file, $new_file, $output_file, $output); my (%strings, %localized_strings, @empty_strings); $encoding = 'plain'; foreach my $arg (@ARGV) { if ($arg eq '--plain') { $encoding = 'plain'; } elsif ($arg eq '--xml') { $encoding = 'xml'; } elsif ($arg !~ /^--/ && !defined($old_file)) { $old_file = $arg; } elsif ($arg !~ /^--/ && !defined($new_file)) { $new_file = $arg; } elsif ($arg !~ /^--/ && !defined($output_file)) { $output_file = $arg; } else { print "Unknown argument \"$arg\"\n"; show_usage(); } } show_usage() if !defined($old_file); show_usage() if !defined($new_file); show_usage() if !defined($output_file); %strings = read_file($new_file); foreach my $key (keys %strings) { $strings{$key} = '' } %localized_strings = read_file($old_file); my ($count_localized, $count_empty) = (0, 0); foreach my $key (keys %strings) { if ($localized_strings{$key}) { $strings{$key} = $localized_strings{$key}; $count_localized++; } else { push(@empty_strings, $key); delete $strings{$key}; $count_empty++; } } print "--> Total: " . ($count_localized + $count_empty) . " strings ($count_empty empty)\n"; $output = Unicode::String->new(); if ($encoding eq 'xml') { $output = latin1('<?xml version="1.0" encoding="UTF-8"?>' . "\n"); $output .= latin1('<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">' . "\n"); $output .= latin1('<plist version="0.9">' . "\n"); $output .= latin1('<dict>' . "\n"); } #%strings = sort %strings; foreach my $key (keys %strings) { if ($encoding eq 'plain') { $output .= utf7($key) . latin1(' = ') . utf7($strings{$key}) . latin1(';' . "\n"); } if ($encoding eq 'xml') { $output .= latin1(" <key>") . utf7(escape_xml($key)) . latin1("</key>\n"); $output .= latin1(" <string>") . utf7(escape_xml($strings{$key})) . latin1("</string>\n"); } } foreach my $key (@empty_strings) { if ($encoding eq 'plain') { $output .= utf7($key) . latin1(' = "";' . "\n"); } if ($encoding eq 'xml') { $output .= latin1(" <key>") . utf7(escape_xml($key)) . latin1("</key>\n"); $output .= latin1(" <string></string>\n"); } } if ($encoding eq 'xml') { $output .= latin1("</dict>\n</plist>\n"); } ($output_file =~ m/^([a-z0-9\.\&\/\s_-]+)$/i) && ($output_file = $1) or die "$output_file: invalid file path"; print "Output file: $output_file\n"; open (OUTPUT, ">$output_file"); if ($encoding eq 'plain') { print OUTPUT chr(0xFE) . chr(0xFF); print OUTPUT $output->utf16; print "Written to a plain .strings file (UTF-16).\n"; } if ($encoding eq 'xml') { print OUTPUT $output->utf8; print "Written to a plist dict file (UTF-8).\n"; } close OUTPUT; #################################################### sub escape_xml { my $str = shift; $str =~ s/&/&/g; $str =~ s/</</g; $str =~ s/>/>/g; return $str; } sub unescape_xml { my $str = shift; $str =~ s/&/&/g; $str =~ s/</</g; $str =~ s/>/>/g; return $str; } sub read_file { my $file_path = shift; my ($file, $u, %dict, @lines, $line, $count_localized, $count_empty); ($file_path =~ m/^([a-z0-9\.\&\/\s_-]+)$/i) && ($file_path = $1) or die "$file_path: invalid file path"; (-e $file_path) or die "$file_path: file not found"; $ENV{'PATH'} = '/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin'; delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; $file = `cat "$file_path"`; if ($file =~ /encoding="UTF-8"/i || substr($file,0,3) eq chr(0xEF) . chr(0xBB) . chr(0xBF)) { $u = utf8($file); } else { $u = utf16($file); } $file = $u->utf8; $file =~ s/<\/key>[\r\n]\t<string>/<\/key><string>/gi; @lines = split(/[\n\r]/, $file); $count_localized = $count_empty = 0; foreach $line (@lines) { $line =~ m/^\s*("(?:\\["\\]|[^"])*?")\s*;\s*$/ && ($dict{$1} = ''); $line =~ m/^\s*("(?:\\["\\]|[^"])*?")\s*=\s*("(?:\\["\\]|[^"])*?")\s*;\s*$/ && ($dict{$1} = $2); $line =~ m/^\s*([^"=\s]+)\s*=\s*("(?:\\["\\]|[^"])*?")\s*;\s*$/ && ($dict{$1} = $2); $line =~ m/<key>([^<]+)<\/key><string>([^<]*)<\/string>/ && ($dict{unescape_xml($1)} = unescape_xml($2)); } foreach my $key (keys %dict) { $dict{$key} eq '' ? $count_empty++ : $count_localized++ } print "$file_path: " . ($count_localized + $count_empty) . " strings found ($count_empty empty)\n"; return %dict; } sub show_usage { print "Usage: tinyglot.pl [ --xml | --plain ] old_file new_file output_file\n"; exit; } |
|
From: Gfive <gf...@us...> - 2005-02-17 08:49:56
|
Update of /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10172/English.lproj/FormulasView.nib Modified Files: info.nib keyedobjects.nib Log Message: formula Interface changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/info.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** info.nib 16 Feb 2005 21:33:06 -0000 1.5 --- info.nib 17 Feb 2005 08:49:45 -0000 1.6 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>66 178 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>1848</key> ! <string>370 395 540 351 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> --- 4,12 ---- <dict> <key>IBDocumentLocation</key> ! <string>89 229 356 240 0 0 1600 1002 </string> <key>IBEditorPositions</key> <dict> <key>1848</key> ! <string>530 509 540 351 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/keyedobjects.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsjgFZd8 and /tmp/cvsspUa9P differ |
|
From: Geisschaes <gei...@us...> - 2005-02-16 21:35:12
|
Update of /cvsroot/macattrick/macattrick/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20991 Added Files: formulas.tiff Log Message: formulas bindings added; formulas as picture inserted --- NEW FILE: formulas.tiff --- (This appears to be a binary file; contents omitted.) |
|
From: Geisschaes <gei...@us...> - 2005-02-16 21:34:37
|
Update of /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20334/English.lproj/FormulasView.nib Modified Files: info.nib keyedobjects.nib Log Message: formulas bindings added; formulas as picture inserted Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/info.nib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** info.nib 7 Feb 2005 21:15:41 -0000 1.4 --- info.nib 16 Feb 2005 21:33:06 -0000 1.5 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>84 163 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>1848</key> ! <string>146 396 542 354 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> --- 4,12 ---- <dict> <key>IBDocumentLocation</key> ! <string>66 178 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>1848</key> ! <string>370 395 540 351 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> *************** *** 17,21 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 17,21 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/keyedobjects.nib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsNEou5I and /tmp/cvsUvV5jN differ |
|
From: Geisschaes <gei...@us...> - 2005-02-16 21:34:37
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20334/English.lproj/PreferencesPanel.nib Modified Files: info.nib keyedobjects.nib Log Message: formulas bindings added; formulas as picture inserted Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/info.nib,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** info.nib 6 Feb 2005 19:36:23 -0000 1.9 --- info.nib 16 Feb 2005 21:33:16 -0000 1.10 *************** *** 12,16 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 12,16 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/keyedobjects.nib,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 Binary files /tmp/cvsZ92klw and /tmp/cvsCCF2Ez differ |
|
From: Geisschaes <gei...@us...> - 2005-02-16 21:34:21
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20334/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: formulas bindings added; formulas as picture inserted Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** project.pbxproj 7 Feb 2005 21:15:44 -0000 1.65 --- project.pbxproj 16 Feb 2005 21:33:18 -0000 1.66 *************** *** 2088,2091 **** --- 2088,2092 ---- 30E83673078DAE4900274608, 3063E946079AE6FC003DF28B, + 30DE3F8D07C3F00700342677, ); isa = PBXResourcesBuildPhase; *************** *** 3812,3815 **** --- 3813,3817 ---- 30E836D9078DAE4900274608, 102B65750796B99C00CE6B91, + 30DE3F8E07C3F00800342677, ); isa = PBXResourcesBuildPhase; *************** *** 4901,4904 **** --- 4903,4907 ---- 30D558060674F5590059F8D8 = { children = ( + 30DE3F8C07C3F00700342677, 30E8346D078DAD9700274608, 30E83458078DAC5D00274608, *************** *** 5188,5191 **** --- 5191,5213 ---- sourceTree = "<group>"; }; + 30DE3F8C07C3F00700342677 = { + isa = PBXFileReference; + lastKnownFileType = image.tiff; + path = formulas.tiff; + refType = 4; + sourceTree = "<group>"; + }; + 30DE3F8D07C3F00700342677 = { + fileRef = 30DE3F8C07C3F00700342677; + isa = PBXBuildFile; + settings = { + }; + }; + 30DE3F8E07C3F00800342677 = { + fileRef = 30DE3F8C07C3F00700342677; + isa = PBXBuildFile; + settings = { + }; + }; 30DFB645071FFAEA00D02508 = { isa = PBXFileReference; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** roman.mode1 7 Feb 2005 21:15:46 -0000 1.19 --- roman.mode1 16 Feb 2005 21:33:23 -0000 1.20 *************** *** 247,251 **** <array> <array> ! <integer>3</integer> <integer>0</integer> </array> --- 247,251 ---- <array> <array> ! <integer>10</integer> <integer>0</integer> </array> *************** *** 267,271 **** </array> <key>RubberWindowFrame</key> ! <string>111 164 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 267,271 ---- </array> <key>RubberWindowFrame</key> ! <string>266 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 283,287 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PositionHeap.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 283,287 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>14flag.gif</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 291,297 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PositionHeap.m</string> <key>bookmark</key> ! <string>30BA8BD007B8117D001B29F3</string> <key>history</key> <array> --- 291,297 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>14flag.gif</string> <key>bookmark</key> ! <string>30DE3FB207C3F36D00342677</string> <key>history</key> <array> *************** *** 342,346 **** <string>3021F79F07A575590073597B</string> <string>3021F7A707A576490073597B</string> - <string>3021F7DD07A57D510073597B</string> <string>3021F7DE07A57D510073597B</string> <string>3021F7E407A5810F0073597B</string> --- 342,345 ---- *************** *** 355,359 **** <string>3092DC1C07B66D430043063E</string> <string>3092DC1D07B66D430043063E</string> - <string>3092DC1E07B66D430043063E</string> <string>3092DC1F07B66D430043063E</string> <string>30CBF0FA07B693F8005A0707</string> --- 354,357 ---- *************** *** 374,380 **** <string>30BA8B8C07B80E7A001B29F3</string> <string>30BA8B9707B80EC9001B29F3</string> - <string>30BA8BAA07B81026001B29F3</string> <string>30BA8BAB07B81026001B29F3</string> ! <string>30BA8B5B07B80ABD001B29F3</string> </array> <key>prevStack</key> --- 372,382 ---- <string>30BA8B8C07B80E7A001B29F3</string> <string>30BA8B9707B80EC9001B29F3</string> <string>30BA8BAB07B81026001B29F3</string> ! <string>30DE3EB207C3B68500342677</string> ! <string>30DE3EC607C3BC3600342677</string> ! <string>30DE3EC707C3BC3600342677</string> ! <string>30DE3EE507C3C66400342677</string> ! <string>30DE3F9D07C3F05600342677</string> ! <string>30DE3F9E07C3F05600342677</string> </array> <key>prevStack</key> *************** *** 458,479 **** <string>306BE2B307B803E7009942ED</string> <string>306BE2D507B80670009942ED</string> - <string>30BA8B3207B807F0001B29F3</string> - <string>30BA8B4907B80958001B29F3</string> - <string>30BA8B5507B80A60001B29F3</string> - <string>30BA8B5607B80A60001B29F3</string> - <string>30BA8B5707B80A60001B29F3</string> - <string>30BA8B5807B80A60001B29F3</string> <string>30BA8B5D07B80ABD001B29F3</string> - <string>30BA8B6F07B80CB8001B29F3</string> - <string>30BA8B7007B80CB8001B29F3</string> - <string>30BA8B7107B80CB8001B29F3</string> - <string>30BA8B7707B80D04001B29F3</string> - <string>30BA8B8F07B80E7A001B29F3</string> - <string>30BA8B9007B80E7A001B29F3</string> <string>30BA8B9107B80E7A001B29F3</string> - <string>30BA8B9207B80E7A001B29F3</string> - <string>30BA8B9907B80EC9001B29F3</string> - <string>30BA8BAC07B81026001B29F3</string> <string>30BA8BAD07B81026001B29F3</string> </array> </dict> --- 460,472 ---- <string>306BE2B307B803E7009942ED</string> <string>306BE2D507B80670009942ED</string> <string>30BA8B5D07B80ABD001B29F3</string> <string>30BA8B9107B80E7A001B29F3</string> <string>30BA8BAD07B81026001B29F3</string> + <string>30DE3EB007C3B66600342677</string> + <string>30DE3EB407C3B68500342677</string> + <string>30DE3EC807C3BC3600342677</string> + <string>30DE3EC907C3BC3600342677</string> + <string>30DE3EE607C3C66400342677</string> + <string>30DE3F9F07C3F05600342677</string> </array> </dict> *************** *** 489,493 **** <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>111 164 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 482,486 ---- <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>266 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 511,515 **** <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>111 164 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 504,508 ---- <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>266 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 535,541 **** <key>TableOfContents</key> <array> ! <string>30BA8B2907B8075B001B29F3</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30BA8B2A07B8075B001B29F3</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 528,534 ---- <key>TableOfContents</key> <array> ! <string>30DE3EA107C3B29200342677</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30DE3EA207C3B29200342677</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 565,575 **** <key>WindowOrderList</key> <array> ! <string>1C0AD2B3069F1EA900FABCE6</string> <string>303B68B1075A0D24009951CC</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> - <string>30BA8B3907B807F0001B29F3</string> </array> <key>WindowString</key> ! <string>111 164 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 558,570 ---- <key>WindowOrderList</key> <array> ! <string>303B689D075A03FF009951CC</string> ! <string>30DE3F2207C3D11600342677</string> <string>303B68B1075A0D24009951CC</string> + <string>1CD10A99069EF8BA00B06720</string> + <string>1C0AD2B3069F1EA900FABCE6</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>266 166 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 600,604 **** <string>TryPlayerController.m</string> <key>bookmark</key> ! <string>30BA8BD107B8117D001B29F3</string> <key>history</key> <array> --- 595,599 ---- <string>TryPlayerController.m</string> <key>bookmark</key> ! <string>30DE3FB307C3F36D00342677</string> <key>history</key> <array> *************** *** 606,610 **** <string>306BE2F807B806D7009942ED</string> <string>30BA8B3407B807F0001B29F3</string> ! <string>30BA8B3507B807F0001B29F3</string> </array> <key>prevStack</key> --- 601,605 ---- <string>306BE2F807B806D7009942ED</string> <string>30BA8B3407B807F0001B29F3</string> ! <string>30BA8BD507B812DE001B29F3</string> </array> <key>prevStack</key> *************** *** 675,679 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>30BA8B3807B807F0001B29F3</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 670,674 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>30DE3EFA07C3CC8B00342677</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 715,720 **** <key>sizes</key> <array> ! <string>{{0, 0}, {204, 242}}</string> ! <string>{{204, 0}, {685, 242}}</string> </array> </dict> --- 710,715 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {195, 242}}</string> ! <string>{{195, 0}, {694, 242}}</string> </array> </dict> *************** *** 756,760 **** <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>351 197 889 609 0 0 1280 832 </string> </dict> <key>Module</key> --- 751,755 ---- <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>86 205 889 609 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 779,794 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>306262D507AECB2D00439F7E</string> <string>1C162984064C10D400B95A72</string> ! <string>306262D607AECB2D00439F7E</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>351 197 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 774,789 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30DE3F2107C3D11600342677</string> <string>1C162984064C10D400B95A72</string> ! <string>30DE3F2207C3D11600342677</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>86 205 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 928,931 **** --- 923,928 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 963,967 **** <array> <string>303B689D075A03FF009951CC</string> ! <string>306262D707AECB2D00439F7E</string> <string>1C78EAAC065D492600B07095</string> </array> --- 960,964 ---- <array> <string>303B689D075A03FF009951CC</string> ! <string>30DE3F2307C3D11600342677</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 1006,1011 **** <key>sizes</key> <array> ! <string>{{0, 0}, {491, 167}}</string> ! <string>{{0, 176}, {491, 267}}</string> </array> </dict> --- 1003,1008 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {366, 167}}</string> ! <string>{{0, 176}, {366, 267}}</string> </array> </dict> *************** *** 1033,1037 **** <string>{{0, 0}, {713, 227}}</string> <key>RubberWindowFrame</key> ! <string>520 355 713 269 0 0 1280 832 </string> </dict> <key>Module</key> --- 1030,1034 ---- <string>{{0, 0}, {713, 227}}</string> <key>RubberWindowFrame</key> ! <string>235 303 713 269 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1056,1071 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30BA8B2B07B8075B001B29F3</string> <string>1CD0528B0623707200166675</string> ! <string>30BA8B2C07B8075B001B29F3</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>520 355 713 269 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 1053,1068 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30DE3EB807C3B77900342677</string> <string>1CD0528B0623707200166675</string> ! <string>30DE3EB907C3B77900342677</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>235 303 713 269 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** roman.pbxuser 7 Feb 2005 21:15:47 -0000 1.84 --- roman.pbxuser 16 Feb 2005 21:33:25 -0000 1.85 *************** *** 42,46 **** activeTarget = 30744BA4069560A70039B82A; addToTargets = ( ! 308427F90643B8C700173CCD, ); breakpoints = ( --- 42,47 ---- activeTarget = 30744BA4069560A70039B82A; addToTargets = ( ! 30744BA4069560A70039B82A, ! 30950682067C4D100077C270, [...3282 lines suppressed...] + rType = 0; + vrLen = 2132; + vrLoc = 2471; + }; + 30DE3FB207C3F36D00342677 = { + fRef = 30E835B5078DAE4900274608; + isa = PBXBookmark; + }; + 30DE3FB307C3F36D00342677 = { + fRef = 3013839E06AED4B2009387D7; + isa = PBXTextBookmark; + name = "TryPlayerController.m: 46"; + rLen = 0; + rLoc = 2931; + rType = 0; + vrLen = 731; + vrLoc = 2244; + }; 30E284D4077EFCC400DB648A = { uiCtxt = { |
|
From: Geisschaes <gei...@us...> - 2005-02-16 21:34:19
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20334 Modified Files: FormulasViewController.h FormulasViewController.m Log Message: formulas bindings added; formulas as picture inserted Index: FormulasViewController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FormulasViewController.h 7 Feb 2005 21:15:38 -0000 1.3 --- FormulasViewController.h 16 Feb 2005 21:32:58 -0000 1.4 *************** *** 33,36 **** --- 33,54 ---- @interface FormulasViewController : NSObject { Position *keeper; + Position *centralDefender; + Position *centralDefenderTowardsWing; + Position *centralDefenderOffensive; + Position *centralDefenderDefensive; + Position *wingback; + Position *wingbackTowardsMiddle; + Position *wingbackOffensive; + Position *wingbackDefensive; + Position *innerMidfield; + Position *innerMidfieldTowardsWing; + Position *innerMidfieldOffensive; + Position *innerMidfieldDefensive; + Position *winger; + Position *wingerTowardsMiddle; + Position *wingerOffensive; + Position *wingerDefensive; + Position *forward; + Position *forwardDefensive; IBOutlet NSTextField *keeperTotal; IBOutlet NSView *formulasView; *************** *** 47,50 **** --- 65,104 ---- - (Position *) keeper; - (void) setKeeper: (Position *) newKeeper; + - (Position *) centralDefender; + - (void) setCentralDefender: (Position *) newCentralDefender; + - (Position *) centralDefenderTowardsWing; + - (void) setCentralDefenderTowardsWing: (Position *) newCentralDefenderTowardsWing; + - (Position *) centralDefenderOffensive; + - (void) setCentralDefenderOffensive: (Position *) newCentralDefenderOffensive; + - (Position *) centralDefenderDefensive; + - (void) setCentralDefenderDefensive: (Position *) newCentralDefenderDefensive; + - (Position *) wingback; + - (void) setWingback: (Position *) newWingback; + - (Position *) wingbackTowardsMiddle; + - (void) setWingbackTowardsMiddle: (Position *) newWingbackTowardsMiddle; + - (Position *) wingbackOffensive; + - (void) setWingbackOffensive: (Position *) newWingbackOffensive; + - (Position *) wingbackDefensive; + - (void) setWingbackDefensive: (Position *) newWingbackDefensive; + - (Position *) innerMidfield; + - (void) setInnerMidfield: (Position *) newInnerMidfield; + - (Position *) innerMidfieldTowardsWing; + - (void) setInnerMidfieldTowardsWing: (Position *) newInnerMidfieldTowardsWing; + - (Position *) innerMidfieldOffensive; + - (void) setInnerMidfieldOffensive: (Position *) newInnerMidfieldOffensive; + - (Position *) innerMidfieldDefensive; + - (void) setInnerMidfieldDefensive: (Position *) newInnerMidfieldDefensive; + - (Position *) winger; + - (void) setWinger: (Position *) newWinger; + - (Position *) wingerTowardsMiddle; + - (void) setWingerTowardsMiddle: (Position *) newWingerTowardsMiddle; + - (Position *) wingerOffensive; + - (void) setWingerOffensive: (Position *) newWingerOffensive; + - (Position *) wingerDefensive; + - (void) setWingerDefensive: (Position *) newWingerDefensive; + - (Position *) forward; + - (void) setForward: (Position *) newForward; + - (Position *) forwardDefensive; + - (void) setForwardDefensive: (Position *) newForwardDefensive; @end Index: FormulasViewController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FormulasViewController.m 7 Feb 2005 21:15:39 -0000 1.3 --- FormulasViewController.m 16 Feb 2005 21:33:06 -0000 1.4 *************** *** 49,52 **** --- 49,69 ---- - (void) loadPositions { [self setKeeper: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"] copy]]; + [self setCentralDefender: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] copy]]; + [self setCentralDefenderTowardsWing: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Towards Wing"] copy]]; + [self setCentralDefenderOffensive: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Offensive"] copy]]; + [self setWingback: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback"] copy]]; + [self setWingbackTowardsMiddle: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Towards Middle"] copy]]; + [self setWingbackOffensive: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Offensive"] copy]]; + [self setWingbackDefensive: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Defensive"] copy]]; + [self setInnerMidfield: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] copy]]; + [self setInnerMidfieldTowardsWing: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Towards Wing"] copy]]; + [self setInnerMidfieldOffensive: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Offensive"] copy]]; + [self setInnerMidfieldDefensive: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Defensive"] copy]]; + [self setWinger: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"] copy]]; + [self setWingerTowardsMiddle: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Towards Middle"] copy]]; + [self setWingerOffensive: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Offensive"] copy]]; + [self setWingerDefensive: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Defensive"] copy]]; + [self setForward: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] copy]]; + [self setForwardDefensive: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward Defensive"] copy]]; } *************** *** 70,79 **** ! - (Position *) keeper { return keeper; } ! - (void) setKeeper: (Position *) newKeeper { ! [newKeeper retain]; ! [keeper release]; ! keeper = newKeeper; ! } - (IBAction)export:(id)sender { --- 87,91 ---- ! - (IBAction)export:(id)sender { *************** *** 87,89 **** --- 99,253 ---- } + + - (Position *) keeper { return keeper; } + - (void) setKeeper: (Position *) newKeeper { + [newKeeper retain]; + [keeper release]; + keeper = newKeeper; + } + + - (Position *) centralDefender { return centralDefender; } + - (void) setCentralDefender: (Position *) newCentralDefender { + [newCentralDefender retain]; + [centralDefender release]; + centralDefender = newCentralDefender; + } + + + - (Position *) centralDefenderTowardsWing { return centralDefenderTowardsWing; } + - (void) setCentralDefenderTowardsWing: (Position *) newCentralDefenderTowardsWing { + [newCentralDefenderTowardsWing retain]; + [centralDefenderTowardsWing release]; + centralDefenderTowardsWing = newCentralDefenderTowardsWing; + } + + + - (Position *) centralDefenderOffensive { return centralDefenderOffensive; } + - (void) setCentralDefenderOffensive: (Position *) newCentralDefenderOffensive { + [newCentralDefenderOffensive retain]; + [centralDefenderOffensive release]; + centralDefenderOffensive = newCentralDefenderOffensive; + } + + + - (Position *) centralDefenderDefensive { return centralDefenderDefensive; } + - (void) setCentralDefenderDefensive: (Position *) newCentralDefenderDefensive { + [newCentralDefenderDefensive retain]; + [centralDefenderDefensive release]; + centralDefenderDefensive = newCentralDefenderDefensive; + } + + + - (Position *) wingback { return wingback; } + - (void) setWingback: (Position *) newWingback { + [newWingback retain]; + [wingback release]; + wingback = newWingback; + } + + + - (Position *) wingbackTowardsMiddle { return wingbackTowardsMiddle; } + - (void) setWingbackTowardsMiddle: (Position *) newWingbackTowardsMiddle { + [newWingbackTowardsMiddle retain]; + [wingbackTowardsMiddle release]; + wingbackTowardsMiddle = newWingbackTowardsMiddle; + } + + + - (Position *) wingbackOffensive { return wingbackOffensive; } + - (void) setWingbackOffensive: (Position *) newWingbackOffensive { + [newWingbackOffensive retain]; + [wingbackOffensive release]; + wingbackOffensive = newWingbackOffensive; + } + + + - (Position *) wingbackDefensive { return wingbackDefensive; } + - (void) setWingbackDefensive: (Position *) newWingbackDefensive { + [newWingbackDefensive retain]; + [wingbackDefensive release]; + wingbackDefensive = newWingbackDefensive; + } + + - (Position *) innerMidfield { return innerMidfield; } + - (void) setInnerMidfield: (Position *) newInnerMidfield { + [newInnerMidfield retain]; + [innerMidfield release]; + innerMidfield = newInnerMidfield; + } + + + - (Position *) innerMidfieldTowardsWing { return innerMidfieldTowardsWing; } + - (void) setInnerMidfieldTowardsWing: (Position *) newInnerMidfieldTowardsWing { + [newInnerMidfieldTowardsWing retain]; + [innerMidfieldTowardsWing release]; + innerMidfieldTowardsWing = newInnerMidfieldTowardsWing; + } + + + - (Position *) innerMidfieldOffensive { return innerMidfieldOffensive; } + - (void) setInnerMidfieldOffensive: (Position *) newInnerMidfieldOffensive { + [newInnerMidfieldOffensive retain]; + [innerMidfieldOffensive release]; + innerMidfieldOffensive = newInnerMidfieldOffensive; + } + + + - (Position *) innerMidfieldDefensive { return innerMidfieldDefensive; } + - (void) setInnerMidfieldDefensive: (Position *) newInnerMidfieldDefensive { + [newInnerMidfieldDefensive retain]; + [innerMidfieldDefensive release]; + innerMidfieldDefensive = newInnerMidfieldDefensive; + } + + + - (Position *) winger { return winger; } + - (void) setWinger: (Position *) newWinger { + [newWinger retain]; + [winger release]; + winger = newWinger; + } + + + - (Position *) wingerTowardsMiddle { return wingerTowardsMiddle; } + - (void) setWingerTowardsMiddle: (Position *) newWingerTowardsMiddle { + [newWingerTowardsMiddle retain]; + [wingerTowardsMiddle release]; + wingerTowardsMiddle = newWingerTowardsMiddle; + } + + + - (Position *) wingerOffensive { return wingerOffensive; } + - (void) setWingerOffensive: (Position *) newWingerOffensive { + [newWingerOffensive retain]; + [wingerOffensive release]; + wingerOffensive = newWingerOffensive; + } + + + - (Position *) wingerDefensive { return wingerDefensive; } + - (void) setWingerDefensive: (Position *) newWingerDefensive { + [newWingerDefensive retain]; + [wingerDefensive release]; + wingerDefensive = newWingerDefensive; + } + + + - (Position *) forward { return forward; } + - (void) setForward: (Position *) newForward { + [newForward retain]; + [forward release]; + forward = newForward; + } + + + - (Position *) forwardDefensive { return forwardDefensive; } + - (void) setForwardDefensive: (Position *) newForwardDefensive { + [newForwardDefensive retain]; + [forwardDefensive release]; + forwardDefensive = newForwardDefensive; + } + + + @end |
|
From: Geisschaes <gei...@us...> - 2005-02-07 21:17:13
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16404/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: PositionHeap introduced, export function started Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** project.pbxproj 6 Feb 2005 19:36:24 -0000 1.64 --- project.pbxproj 7 Feb 2005 21:15:44 -0000 1.65 *************** *** 36,39 **** --- 36,41 ---- 30D77AA106455BEF0095BAC8, 30D77AA206455BEF0095BAC8, + 3034119E07B7FDB000B92C57, + 3034119F07B7FDB000B92C57, 30C85EC6064647730016E5B3, 30C85EC7064647730016E5B3, *************** *** 743,746 **** --- 745,800 ---- }; }; + 3034119E07B7FDB000B92C57 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = PositionHeap.h; + refType = 4; + sourceTree = "<group>"; + }; + 3034119F07B7FDB000B92C57 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = PositionHeap.m; + refType = 4; + sourceTree = "<group>"; + }; + 303411A007B7FDB000B92C57 = { + fileRef = 3034119E07B7FDB000B92C57; + isa = PBXBuildFile; + settings = { + }; + }; + 303411A107B7FDB000B92C57 = { + fileRef = 3034119F07B7FDB000B92C57; + isa = PBXBuildFile; + settings = { + }; + }; + 303411A207B7FDB000B92C57 = { + fileRef = 3034119E07B7FDB000B92C57; + isa = PBXBuildFile; + settings = { + }; + }; + 303411A307B7FDB000B92C57 = { + fileRef = 3034119F07B7FDB000B92C57; + isa = PBXBuildFile; + settings = { + }; + }; + 303411A407B7FDB000B92C57 = { + fileRef = 3034119E07B7FDB000B92C57; + isa = PBXBuildFile; + settings = { + }; + }; + 303411A507B7FDB000B92C57 = { + fileRef = 3034119F07B7FDB000B92C57; + isa = PBXBuildFile; + settings = { + }; + }; 303AED5406B01BE300D5DF46 = { isa = PBXFileReference; *************** *** 1614,1617 **** --- 1668,1699 ---- }; }; + 306BE2A807B803D6009942ED = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = PositionHeapTest.h; + refType = 4; + sourceTree = "<group>"; + }; + 306BE2A907B803D6009942ED = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = PositionHeapTest.m; + refType = 4; + sourceTree = "<group>"; + }; + 306BE2AA07B803D6009942ED = { + fileRef = 306BE2A807B803D6009942ED; + isa = PBXBuildFile; + settings = { + }; + }; + 306BE2AB07B803D6009942ED = { + fileRef = 306BE2A907B803D6009942ED; + isa = PBXBuildFile; + settings = { + }; + }; 306D2F79068AC8EB00CB623F = { fileEncoding = 30; *************** *** 1857,1860 **** --- 1939,1943 ---- 3031CB0A07A043B0006539CD, 3092DC1107B66C780043063E, + 303411A207B7FDB000B92C57, ); isa = PBXHeadersBuildPhase; *************** *** 2067,2070 **** --- 2150,2154 ---- 3031CB0B07A043B0006539CD, 3092DC1207B66C780043063E, + 303411A307B7FDB000B92C57, ); isa = PBXSourcesBuildPhase; *************** *** 2800,2803 **** --- 2884,2889 ---- 307D956A063D9208008E2586 = { children = ( + 306BE2A807B803D6009942ED, + 306BE2A907B803D6009942ED, 30609695079320AC00BAA4CF, 30609696079320AC00BAA4CF, *************** *** 3117,3120 **** --- 3203,3208 ---- 30609697079320AC00BAA4CF, 306F818B079985BC00FC68E8, + 303411A407B7FDB000B92C57, + 306BE2AA07B803D6009942ED, ); isa = PBXHeadersBuildPhase; *************** *** 3173,3176 **** --- 3261,3266 ---- 30609698079320AC00BAA4CF, 306F818C079985BC00FC68E8, + 303411A507B7FDB000B92C57, + 306BE2AB07B803D6009942ED, ); isa = PBXSourcesBuildPhase; *************** *** 3573,3576 **** --- 3663,3667 ---- 3031CB0C07A043B0006539CD, 3092DC1307B66C780043063E, + 303411A007B7FDB000B92C57, ); isa = PBXHeadersBuildPhase; *************** *** 3771,3774 **** --- 3862,3866 ---- 3031CB0D07A043B0006539CD, 3092DC1407B66C780043063E, + 303411A107B7FDB000B92C57, ); isa = PBXSourcesBuildPhase; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** roman.mode1 6 Feb 2005 19:36:25 -0000 1.18 --- roman.mode1 7 Feb 2005 21:15:46 -0000 1.19 *************** *** 267,271 **** </array> <key>RubberWindowFrame</key> ! <string>581 146 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 267,271 ---- </array> <key>RubberWindowFrame</key> ! <string>111 164 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 283,287 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 283,287 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PositionHeap.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 291,297 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>bookmark</key> ! <string>30CBF15607B69E6B005A0707</string> <key>history</key> <array> --- 291,297 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PositionHeap.m</string> <key>bookmark</key> ! <string>30BA8BD007B8117D001B29F3</string> <key>history</key> <array> *************** *** 318,329 **** <string>30609626079318BE00BAA4CF</string> <string>306096300793190400BAA4CF</string> - <string>306096310793190400BAA4CF</string> <string>3060964307931A3C00BAA4CF</string> <string>3060964407931A3C00BAA4CF</string> <string>3060967E07931DDA00BAA4CF</string> - <string>3060969D0793210000BAA4CF</string> <string>306096AA0793218900BAA4CF</string> <string>306096AB0793218900BAA4CF</string> - <string>306096C2079325B700BAA4CF</string> <string>306096C4079325B700BAA4CF</string> <string>306F7F9707992C5300FC68E8</string> --- 318,326 ---- *************** *** 332,336 **** <string>306F81B20799875200FC68E8</string> <string>304A3C52079ACC7700358038</string> - <string>304A3C7D079AD0F000358038</string> <string>304A3CA2079AD44E00358038</string> <string>304A3CB4079AD56A00358038</string> --- 329,332 ---- *************** *** 341,345 **** <string>3031CB4007A04A5B006539CD</string> <string>3031CB5107A04D53006539CD</string> - <string>30557D3407A25F0800D5CE02</string> <string>3021F76107A56A290073597B</string> <string>3021F76207A56A290073597B</string> --- 337,340 ---- *************** *** 351,361 **** <string>3021F7E407A5810F0073597B</string> <string>3021F7FA07A590F30073597B</string> - <string>30884AC807ABD400001F2ACB</string> <string>30884AD407ABF910001F2ACB</string> <string>30884AD707ABF924001F2ACB</string> - <string>30884AFD07ABFBE5001F2ACB</string> <string>30884B0307ABFC21001F2ACB</string> - <string>30884B0407ABFC21001F2ACB</string> - <string>30884B0507ABFC21001F2ACB</string> <string>3092DC1807B66D430043063E</string> <string>3092DC1907B66D430043063E</string> --- 346,352 ---- *************** *** 369,375 **** <string>30CBF0FB07B693F8005A0707</string> <string>30CBF0FC07B693F8005A0707</string> ! <string>30CBF11307B6967F005A0707</string> ! <string>30CBF11D07B69796005A0707</string> ! <string>30CBF11E07B69796005A0707</string> </array> <key>prevStack</key> --- 360,380 ---- <string>30CBF0FB07B693F8005A0707</string> <string>30CBF0FC07B693F8005A0707</string> ! <string>306BE29307B80208009942ED</string> ! <string>306BE2D007B80670009942ED</string> ! <string>306BE2D107B80670009942ED</string> ! <string>306BE2D207B80670009942ED</string> ! <string>30BA8B3107B807F0001B29F3</string> ! <string>30BA8B4807B80958001B29F3</string> ! <string>30BA8B5207B80A60001B29F3</string> ! <string>30BA8B5307B80A60001B29F3</string> ! <string>30BA8B6C07B80CB8001B29F3</string> ! <string>30BA8B6D07B80CB8001B29F3</string> ! <string>30BA8B7607B80D04001B29F3</string> ! <string>30BA8B8B07B80E7A001B29F3</string> ! <string>30BA8B8C07B80E7A001B29F3</string> ! <string>30BA8B9707B80EC9001B29F3</string> ! <string>30BA8BAA07B81026001B29F3</string> ! <string>30BA8BAB07B81026001B29F3</string> ! <string>30BA8B5B07B80ABD001B29F3</string> </array> <key>prevStack</key> *************** *** 450,458 **** <string>3092DC2607B66D430043063E</string> <string>3092DC2707B66D430043063E</string> - <string>30CBF0FD07B693F8005A0707</string> <string>30CBF0FE07B693F8005A0707</string> ! <string>30CBF0FF07B693F8005A0707</string> ! <string>30CBF11407B6967F005A0707</string> ! <string>30CBF11F07B69796005A0707</string> </array> </dict> --- 455,479 ---- <string>3092DC2607B66D430043063E</string> <string>3092DC2707B66D430043063E</string> <string>30CBF0FE07B693F8005A0707</string> ! <string>306BE2B307B803E7009942ED</string> ! <string>306BE2D507B80670009942ED</string> ! <string>30BA8B3207B807F0001B29F3</string> ! <string>30BA8B4907B80958001B29F3</string> ! <string>30BA8B5507B80A60001B29F3</string> ! <string>30BA8B5607B80A60001B29F3</string> ! <string>30BA8B5707B80A60001B29F3</string> ! <string>30BA8B5807B80A60001B29F3</string> ! <string>30BA8B5D07B80ABD001B29F3</string> ! <string>30BA8B6F07B80CB8001B29F3</string> ! <string>30BA8B7007B80CB8001B29F3</string> ! <string>30BA8B7107B80CB8001B29F3</string> ! <string>30BA8B7707B80D04001B29F3</string> ! <string>30BA8B8F07B80E7A001B29F3</string> ! <string>30BA8B9007B80E7A001B29F3</string> ! <string>30BA8B9107B80E7A001B29F3</string> ! <string>30BA8B9207B80E7A001B29F3</string> ! <string>30BA8B9907B80EC9001B29F3</string> ! <string>30BA8BAC07B81026001B29F3</string> ! <string>30BA8BAD07B81026001B29F3</string> </array> </dict> *************** *** 468,472 **** <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>581 146 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 489,493 ---- <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>111 164 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 476,479 **** --- 497,502 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 488,492 **** <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>581 146 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 511,515 ---- <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>111 164 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 512,518 **** <key>TableOfContents</key> <array> ! <string>30CBF0EF07B6912C005A0707</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30CBF0F007B6912C005A0707</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 535,541 ---- <key>TableOfContents</key> <array> ! <string>30BA8B2907B8075B001B29F3</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30BA8B2A07B8075B001B29F3</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 542,553 **** <key>WindowOrderList</key> <array> - <string>1C530D57069F1CE1000CFCEE</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> - <string>303B68B1075A0D24009951CC</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30CBF0F907B691FF005A0707</string> </array> <key>WindowString</key> ! <string>581 146 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 565,575 ---- <key>WindowOrderList</key> <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>303B68B1075A0D24009951CC</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> ! <string>30BA8B3907B807F0001B29F3</string> </array> <key>WindowString</key> ! <string>111 164 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 568,572 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Position.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 590,594 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>TryPlayerController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 576,580 **** <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Position.m</string> </dict> <key>SplitCount</key> --- 598,617 ---- <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>TryPlayerController.m</string> ! <key>bookmark</key> ! <string>30BA8BD107B8117D001B29F3</string> ! <key>history</key> ! <array> ! <string>306BE2E407B80670009942ED</string> ! <string>306BE2F807B806D7009942ED</string> ! <string>30BA8B3407B807F0001B29F3</string> ! <string>30BA8B3507B807F0001B29F3</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>306BE2E607B80670009942ED</string> ! <string>306BE2FA07B806D7009942ED</string> ! <string>30BA8B3607B807F0001B29F3</string> ! </array> </dict> <key>SplitCount</key> *************** *** 638,642 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>30CBF14E07B69E15005A0707</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 675,679 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>30BA8B3807B807F0001B29F3</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 774,778 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 811,815 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>FormulasViewController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 782,791 **** <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>bookmark</key> ! <string>30CBF15707B69E6B005A0707</string> <key>history</key> <array> ! <string>30CBF0F507B691FF005A0707</string> </array> </dict> --- 819,842 ---- <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>FormulasViewController.m</string> <key>bookmark</key> ! <string>306BE2FF07B80708009942ED</string> <key>history</key> <array> ! <string>306BE2E807B80670009942ED</string> ! <string>306BE2E907B80670009942ED</string> ! <string>306BE2EA07B80670009942ED</string> ! <string>306BE2EB07B80670009942ED</string> ! <string>306BE2EC07B80670009942ED</string> ! <string>306BE2C907B805E1009942ED</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>306BE2ED07B80670009942ED</string> ! <string>306BE2EE07B80670009942ED</string> ! <string>306BE2EF07B80670009942ED</string> ! <string>306BE2F007B80670009942ED</string> ! <string>306BE2F107B80670009942ED</string> ! <string>306BE2F207B80670009942ED</string> </array> </dict> *************** *** 801,805 **** <string>{{0, 0}, {781, 191}}</string> <key>RubberWindowFrame</key> ! <string>271 209 781 470 0 0 1280 832 </string> </dict> <key>Module</key> --- 852,856 ---- <string>{{0, 0}, {781, 191}}</string> <key>RubberWindowFrame</key> ! <string>229 160 781 470 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 813,816 **** --- 864,869 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 825,829 **** <string>{{0, 198}, {781, 230}}</string> <key>RubberWindowFrame</key> ! <string>271 209 781 470 0 0 1280 832 </string> </dict> <key>Module</key> --- 878,882 ---- <string>{{0, 198}, {781, 230}}</string> <key>RubberWindowFrame</key> ! <string>229 160 781 470 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 848,858 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30CBF0F707B691FF005A0707</string> ! <string>30CBF0F807B691FF005A0707</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>271 209 781 470 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> --- 901,911 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>306BE2F407B80670009942ED</string> ! <string>306BE2F507B80670009942ED</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>229 160 781 470 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> *************** *** 953,958 **** <key>sizes</key> <array> ! <string>{{0, 0}, {363, 167}}</string> ! <string>{{0, 176}, {363, 267}}</string> </array> </dict> --- 1006,1011 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {491, 167}}</string> ! <string>{{0, 176}, {491, 267}}</string> </array> </dict> *************** *** 978,993 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {633, 216}}</string> <key>RubberWindowFrame</key> ! <string>611 246 633 258 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXRunSessionModule</string> <key>Proportion</key> ! <string>216pt</string> </dict> </array> <key>Proportion</key> ! <string>216pt</string> </dict> </array> --- 1031,1046 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {713, 227}}</string> <key>RubberWindowFrame</key> ! <string>520 355 713 269 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXRunSessionModule</string> <key>Proportion</key> ! <string>227pt</string> </dict> </array> <key>Proportion</key> ! <string>227pt</string> </dict> </array> *************** *** 1003,1018 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30CBF0F107B6912C005A0707</string> <string>1CD0528B0623707200166675</string> ! <string>30CBF0F207B6912C005A0707</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>611 246 633 258 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 1056,1071 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30BA8B2B07B8075B001B29F3</string> <string>1CD0528B0623707200166675</string> ! <string>30BA8B2C07B8075B001B29F3</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>520 355 713 269 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** roman.pbxuser 6 Feb 2005 19:36:25 -0000 1.83 --- roman.pbxuser 7 Feb 2005 21:15:47 -0000 1.84 *************** *** 42,47 **** activeTarget = 30744BA4069560A70039B82A; addToTargets = ( ! 30744BA4069560A70039B82A, ! 30950682067C4D100077C270, ); breakpoints = ( --- 42,46 ---- activeTarget = 30744BA4069560A70039B82A; addToTargets = ( ! 308427F90643B8C700173CCD, [...3427 lines suppressed...] ! sepNavVisRect = "{{0, 1261}, {705, 428}}"; sepNavWindowFrame = "{{84, 222}, {750, 542}}"; }; *************** *** 3851,3857 **** 30EC0BDE06425043008B3F6B = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1090, 2057}}"; ! sepNavSelRange = "{3450, 0}"; ! sepNavVisRect = "{{0, 0}, {1090, 643}}"; sepNavWindowFrame = "{{72, 83}, {1135, 749}}"; }; --- 6524,6530 ---- 30EC0BDE06425043008B3F6B = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {812, 2057}}"; ! sepNavSelRange = "{2586, 34}"; ! sepNavVisRect = "{{0, 434}, {705, 428}}"; sepNavWindowFrame = "{{72, 83}, {1135, 749}}"; }; |
|
From: Geisschaes <gei...@us...> - 2005-02-07 21:17:01
|
Update of /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16404/English.lproj/FormulasView.nib Modified Files: classes.nib info.nib keyedobjects.nib Log Message: PositionHeap introduced, export function started Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/info.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** info.nib 6 Feb 2005 19:36:19 -0000 1.3 --- info.nib 7 Feb 2005 21:15:41 -0000 1.4 *************** *** 8,12 **** <dict> <key>1848</key> ! <string>213 385 542 354 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> --- 8,12 ---- <dict> <key>1848</key> ! <string>146 396 542 354 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> Index: classes.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/classes.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** classes.nib 20 Jan 2005 20:46:02 -0000 1.2 --- classes.nib 7 Feb 2005 21:15:40 -0000 1.3 *************** *** 3,9 **** {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { CLASS = FormulasViewController; LANGUAGE = ObjC; ! OUTLETS = {formulasView = NSView; }; SUPERCLASS = NSObject; } --- 3,10 ---- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { + ACTIONS = {export = id; }; CLASS = FormulasViewController; LANGUAGE = ObjC; ! OUTLETS = {formulasView = NSView; keeperTotal = NSTextField; }; SUPERCLASS = NSObject; } Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/keyedobjects.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvs58LSQ7 and /tmp/cvsAz9VPX differ |
|
From: Geisschaes <gei...@us...> - 2005-02-07 21:16:59
|
Update of /cvsroot/macattrick/macattrick/English.lproj/TryPlayer.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16404/English.lproj/TryPlayer.nib Modified Files: info.nib keyedobjects.nib Log Message: PositionHeap introduced, export function started Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/TryPlayer.nib/info.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** info.nib 4 Jan 2005 13:38:20 -0000 1.3 --- info.nib 7 Feb 2005 21:15:43 -0000 1.4 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>941 133 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>699 103 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/TryPlayer.nib/keyedobjects.nib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvse32BCi and /tmp/cvsu51ic7 differ |
|
From: Geisschaes <gei...@us...> - 2005-02-07 21:16:50
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16404 Modified Files: FormulasViewController.h FormulasViewController.m HattrickOrg.m LineUpController.m Player.m PlayerDetailsController.m PositionsController.m TryPlayerController.m Added Files: PositionHeap.h PositionHeap.m Log Message: PositionHeap introduced, export function started Index: LineUpController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/LineUpController.m,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** LineUpController.m 24 Jan 2005 20:18:27 -0000 1.17 --- LineUpController.m 7 Feb 2005 21:15:39 -0000 1.18 *************** *** 28,31 **** --- 28,33 ---- #import "LineUpController.h" + #import "PositionHeap.h" + @implementation LineUpController *************** *** 108,112 **** positions = [NSMutableArray arrayWithCapacity:11]; // keeper at index 0 ! [positions insertObject:[Position positionWithIdentifier:@"Keeper"] atIndex:0]; // central defenders at index 1 and 2 [self loadCentralDefender]; --- 110,114 ---- positions = [NSMutableArray arrayWithCapacity:11]; // keeper at index 0 ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"] atIndex:0]; // central defenders at index 1 and 2 [self loadCentralDefender]; *************** *** 123,131 **** - (NSArray*) substitutesPositions { NSMutableArray *subPositions = [NSMutableArray array]; ! [subPositions addObject: [Position positionWithIdentifier:@"Keeper"]]; ! [subPositions addObject: [Position positionWithIdentifier:@"Central Defender"]]; ! [subPositions addObject: [Position positionWithIdentifier:@"Inner Midfield"]]; ! [subPositions addObject: [Position positionWithIdentifier:@"Winger"]]; ! [subPositions addObject: [Position positionWithIdentifier:@"Forward"]]; return subPositions; } --- 125,133 ---- - (NSArray*) substitutesPositions { NSMutableArray *subPositions = [NSMutableArray array]; ! [subPositions addObject: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]]; ! [subPositions addObject: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"]]; ! [subPositions addObject: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]]; ! [subPositions addObject: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"]]; ! [subPositions addObject: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"]]; return subPositions; } *************** *** 133,158 **** - (void) loadForward { if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward Defensive"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:9]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward Defensive"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:10]; } } --- 135,160 ---- - (void) loadForward { if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward Defensive"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:9]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward Defensive"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:10]; } } *************** *** 160,235 **** - (void) loadWinger { if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Offensive"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Defensive"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Towards Middle"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:7]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Offensive"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Defensive"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Towards Middle"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:8]; } } - (void) loadInnerMidfield { if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Offensive"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Defensive"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Towards Wing"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:5]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Offensive"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Defensive"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Towards Wing"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:6]; } } --- 162,237 ---- - (void) loadWinger { if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Offensive"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Defensive"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Towards Middle"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:7]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Offensive"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Defensive"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Towards Middle"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:8]; } } - (void) loadInnerMidfield { if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Offensive"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Defensive"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Towards Wing"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:5]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Offensive"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Defensive"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Towards Wing"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:6]; } } *************** *** 238,275 **** - (void) loadBackWings { if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Offensive"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Defensive"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Towards Middle"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:3]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Offensive"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Defensive"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Towards Middle"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:4]; } } --- 240,277 ---- - (void) loadBackWings { if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Offensive"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Defensive"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Towards Middle"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:3]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Offensive"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Defensive"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Towards Middle"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:4]; } } *************** *** 277,308 **** - (void) loadCentralDefender { if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender Offensive"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender Towards Wing"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:1]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender Offensive"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender Towards Wing"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:2]; } } --- 279,310 ---- - (void) loadCentralDefender { if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Offensive"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Towards Wing"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:1]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Offensive"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Towards Wing"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:2]; } } Index: FormulasViewController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FormulasViewController.h 6 Feb 2005 19:36:17 -0000 1.2 --- FormulasViewController.h 7 Feb 2005 21:15:38 -0000 1.3 *************** *** 42,46 **** ! -(IBAction) update; - (Position *) keeper; --- 42,47 ---- ! ! - (IBAction) export:(id)sender; - (Position *) keeper; --- NEW FILE: PositionHeap.m --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import "PositionHeap.h" static PositionHeap* sharedInstance; @implementation PositionHeap + (PositionHeap*) uniqueInstance { if(!sharedInstance) { sharedInstance = [[self alloc] init]; } return sharedInstance; } - (id) init { if (sharedInstance) { [self autorelease]; self = [sharedInstance retain]; } else { self = [super init]; if (self) { sharedInstance = [self retain]; } [self loadPositions]; [self loadDefaultPositions]; } return self; } -(Position*) positionWithIdentifier: (NSString*) positionsIdentifier { Position *pos = [positionsDictionary objectForKey:positionsIdentifier]; if(!pos) { pos= [self defaultPositionWithIdentifier: positionsIdentifier]; } return pos; } -(Position*) defaultPositionWithIdentifier: (NSString*) positionIdentifier { return [defaultPositionsDictionary objectForKey: positionIdentifier]; } - (NSArray*) possiblePositions { NSArray *positions = [NSArray arrayWithObjects: [self positionWithIdentifier:@"Keeper"], [self positionWithIdentifier:@"Central Defender"], [self positionWithIdentifier:@"Central Defender Towards Wing"], [self positionWithIdentifier:@"Central Defender Offensive"], [self positionWithIdentifier:@"Wingback"], [self positionWithIdentifier:@"Wingback Offensive"], [self positionWithIdentifier:@"Wingback Defensive"], [self positionWithIdentifier:@"Wingback Towards Middle"], [self positionWithIdentifier:@"Inner Midfield"], [self positionWithIdentifier:@"Inner Midfield Defensive"], [self positionWithIdentifier:@"Inner Midfield Offensive"], [self positionWithIdentifier:@"Inner Midfield Towards Wing"], [self positionWithIdentifier:@"Winger"], [self positionWithIdentifier:@"Winger Defensive"], [self positionWithIdentifier:@"Winger Offensive"], [self positionWithIdentifier:@"Winger Towards Middle"], [self positionWithIdentifier:@"Forward"], [self positionWithIdentifier:@"Forward Defensive"], nil]; return positions; } - (NSArray*) positionsIdentifiers { return [NSArray arrayWithObjects:@"Keeper", @"Central Defender",@"Central Defender Towards Wing",@"Central Defender Offensive", @"Wingback",@"Wingback Towards Middle",@"Wingback Offensive",@"Wingback Defensive", @"Inner Midfield",@"Inner Midfield Towards Wing",@"Inner Midfield Offensive" ,@"Inner Midfield Defensive", @"Winger",@"Winger Towards Middle",@"Winger Offensive",@"Winger Defensive", @"Forward",@"Forward Defensive",nil]; } - (void) loadPositions { positionsDictionary = [[NSMutableDictionary alloc]init]; NSArray *keys = [self positionsIdentifiers]; NSEnumerator *en = [keys objectEnumerator]; NSString *ident = nil; while (ident = [en nextObject]) { Position *pos = [[Position alloc] initFromUserDefaults: ident]; if(!pos) { pos = [self defaultPositionWithIdentifier:ident]; } [positionsDictionary setValue:pos forKey:ident]; [pos release]; } } - (void) loadDefaultPositions { NSArray *keys = [self positionsIdentifiers]; NSArray *objects = [[NSArray alloc] initWithObjects: [[Position alloc] initWithIdentifier:@"Keeper" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0 keeperRate:1 playmakingRate:0 scorerRate:0 passingRate:0 wingerRate:0 defenderRate:0 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Central Defender" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.02 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.75 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Central Defender Towards Wing" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.1 wingerRate:0.15 defenderRate:0.65 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Central Defender Offensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 passingRate:0.2 wingerRate:0 defenderRate:0.6 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Wingback" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.1 wingerRate:0.2 defenderRate:0.6 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Wingback Towards Middle" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.08 wingerRate:0.17 defenderRate:0.65 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Wingback Offensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 passingRate:0.2 wingerRate:0.25 defenderRate:0.35 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Wingback Defensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.05 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.05 wingerRate:0.1 defenderRate:0.8 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Inner Midfield" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.25 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.1 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Inner Midfield Towards Wing" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.2 keeperRate:0 playmakingRate:0.35 scorerRate:0 passingRate:0.15 wingerRate:0.2 defenderRate:0.1 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Inner Midfield Offensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.2 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.25 wingerRate:0 defenderRate:0.05 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Inner Midfield Defensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.15 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.2 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Winger" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.15 keeperRate:0 playmakingRate:0.25 scorerRate:0 passingRate:0.05 wingerRate:0.5 defenderRate:0.05 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Winger Towards Middle" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.15 keeperRate:0 playmakingRate:0.3 scorerRate:0 passingRate:0.1 wingerRate:0.35 defenderRate:0.1 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Winger Offensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.15 keeperRate:0 playmakingRate:0.15 scorerRate:0 passingRate:0.1 wingerRate:0.6 defenderRate:0 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Winger Defensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.2 scorerRate:0 passingRate:0.1 wingerRate:0.35 defenderRate:0.25 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Forward" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0.6 passingRate:0.3 wingerRate:0 defenderRate:0 setPiecesRate:0], [[Position alloc] initWithIdentifier:@"Forward Defensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.13 scorerRate:0.45 passingRate:0.32 wingerRate:0 defenderRate:0 setPiecesRate:0], nil]; defaultPositionsDictionary = [[NSDictionary alloc] initWithObjects:objects forKeys:keys]; [objects release]; } - (void) setPosition: (Position*) position { [positionsDictionary setObject: position forKey:[position identifier]]; } - (void) saveToFile: (NSString *) filename { [positionsDictionary writeToFile:filename atomically:NO]; } - savePositionsToUserDefaults { NSEnumerator *en = [positionsDictionary objectEnumerator]; Position *current; while(current = [en nextObject]) { [current saveToUserDefaults]; } } @end Index: Player.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.m,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Player.m 6 Feb 2005 19:36:18 -0000 1.20 --- Player.m 7 Feb 2005 21:15:39 -0000 1.21 *************** *** 29,32 **** --- 29,33 ---- #import "Player.h" #import "World.h" + #import "PositionHeap.h" @interface Player(Private) *************** *** 367,371 **** -(Position*) bestPosition { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSArray *possiblePositions = [Position possiblePositions]; NSEnumerator *en = [possiblePositions objectEnumerator]; Position *currentPosition; --- 368,372 ---- -(Position*) bestPosition { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSArray *possiblePositions = [[PositionHeap uniqueInstance] possiblePositions]; NSEnumerator *en = [possiblePositions objectEnumerator]; Position *currentPosition; Index: FormulasViewController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FormulasViewController.m 6 Feb 2005 19:36:18 -0000 1.2 --- FormulasViewController.m 7 Feb 2005 21:15:39 -0000 1.3 *************** *** 30,33 **** --- 30,34 ---- #import "FormulasViewController.h" #import "Position.h" + #import "PositionHeap.h" @interface FormulasViewController (Private) *************** *** 47,51 **** - (void) loadPositions { ! [self setKeeper: [[Position positionWithIdentifier:@"Keeper"] copy]]; } --- 48,52 ---- - (void) loadPositions { ! [self setKeeper: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"] copy]]; } *************** *** 54,59 **** } -(void) ok { ! [Position setPosition: keeper]; ! [Position savePositionsToUserDefaults]; } --- 55,60 ---- } -(void) ok { ! [[PositionHeap uniqueInstance] setPosition: keeper]; ! [[PositionHeap uniqueInstance] savePositionsToUserDefaults]; } *************** *** 76,80 **** } ! @end --- 77,89 ---- } ! - (IBAction)export:(id)sender { ! [self ok]; ! NSSavePanel *sp = [NSSavePanel savePanel]; ! int runResult; ! runResult = [sp runModalForDirectory:NSHomeDirectory() file:@"MacattrickPositions.xml"]; ! if (runResult == NSOKButton) { ! [[PositionHeap uniqueInstance] saveToFile:[sp filename]]; ! } ! } @end Index: TryPlayerController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/TryPlayerController.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TryPlayerController.m 22 Jul 2004 15:29:42 -0000 1.2 --- TryPlayerController.m 7 Feb 2005 21:15:40 -0000 1.3 *************** *** 28,32 **** #import "TryPlayerController.h" ! @implementation TryPlayerController --- 28,32 ---- #import "TryPlayerController.h" ! #import "PositionHeap.h" @implementation TryPlayerController *************** *** 39,44 **** - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex{ ! SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); ! id position = [Position performSelector: selector]; return [NSNumber numberWithDouble: [player calculatePositionValue:position]]; } --- 39,47 ---- - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex{ ! // SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); ! // id position = [[PositionHeap uniqueInstance] performSelector: selector]; ! // return [NSNumber numberWithDouble: [player calculatePositionValue:position]]; ! SEL selector =@selector(positionWithIdentifier:); ! id position = [[PositionHeap uniqueInstance] performSelector:selector withObject:[aTableColumn identifier] ]; return [NSNumber numberWithDouble: [player calculatePositionValue:position]]; } --- NEW FILE: PositionHeap.h --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import <Cocoa/Cocoa.h> #import "Position.h" @interface PositionHeap : NSObject { NSDictionary* defaultPositionsDictionary; NSMutableDictionary *positionsDictionary; } + (PositionHeap*) uniqueInstance; - (Position*) positionWithIdentifier: (NSString*) positionsIdentifier; - (Position*) defaultPositionWithIdentifier: (NSString*) positionIdentifier; - (NSArray*) possiblePositions; - (NSArray*) positionsIdentifiers; - (void) initialize; - (void) loadPositions; - (void) loadDefaultPositions; - (void) setPosition: (Position*) position; - savePositionsToUserDefaults; - (void) saveToFile: (NSString *) filename; @end Index: PlayerDetailsController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerDetailsController.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerDetailsController.m 24 Jan 2005 20:18:29 -0000 1.7 --- PlayerDetailsController.m 7 Feb 2005 21:15:40 -0000 1.8 *************** *** 28,32 **** #import "PlayerDetailsController.h" ! @implementation PlayerDetailsController --- 28,32 ---- #import "PlayerDetailsController.h" ! #import "PositionHeap.h" @implementation PlayerDetailsController *************** *** 103,109 **** - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex{ SEL selector =@selector(positionWithIdentifier:); ! id position = [Position performSelector:selector withObject:[aTableColumn identifier] ]; ! //SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); ! //id position = [Position performSelector: selector]; return [NSNumber numberWithDouble: [tryPlayer calculatePositionValue:position]]; } --- 103,107 ---- - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex{ SEL selector =@selector(positionWithIdentifier:); ! id position = [[PositionHeap uniqueInstance] performSelector:selector withObject:[aTableColumn identifier] ]; return [NSNumber numberWithDouble: [tryPlayer calculatePositionValue:position]]; } Index: PositionsController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PositionsController.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PositionsController.m 24 Jan 2005 20:18:30 -0000 1.7 --- PositionsController.m 7 Feb 2005 21:15:40 -0000 1.8 *************** *** 30,33 **** --- 30,34 ---- #import "MainController.h" #import "Position.h" + #import "PositionHeap.h" @implementation PositionsController *************** *** 66,70 **** // SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); SEL selector =@selector(positionWithIdentifier:); ! id position = [Position performSelector:selector withObject:[aTableColumn identifier] ]; return [NSNumber numberWithDouble: [player calculatePositionValue:position]]; } --- 67,71 ---- // SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); SEL selector =@selector(positionWithIdentifier:); ! id position = [[PositionHeap uniqueInstance] performSelector:selector withObject:[aTableColumn identifier] ]; return [NSNumber numberWithDouble: [player calculatePositionValue:position]]; } *************** *** 113,118 **** static int comparePosition(id player1, id player2, void *positionIdentifier){ NSString *positionID = positionIdentifier; ! int result = [player1 compareDouble: [player1 calculatePositionValue: [Position positionWithIdentifier:positionID]] ! otherDouble: [player2 calculatePositionValue: [Position positionWithIdentifier:positionID]]]; return result; } --- 114,119 ---- static int comparePosition(id player1, id player2, void *positionIdentifier){ NSString *positionID = positionIdentifier; ! int result = [player1 compareDouble: [player1 calculatePositionValue: [[PositionHeap uniqueInstance] positionWithIdentifier:positionID]] ! otherDouble: [player2 calculatePositionValue: [[PositionHeap uniqueInstance] positionWithIdentifier:positionID]]]; return result; } Index: HattrickOrg.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.m,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** HattrickOrg.m 6 Feb 2005 19:36:18 -0000 1.17 --- HattrickOrg.m 7 Feb 2005 21:15:39 -0000 1.18 *************** *** 38,42 **** @implementation HattrickOrg ! + uniqueInstance { if(!sharedInstance) { sharedInstance = [[self alloc] init]; --- 38,42 ---- @implementation HattrickOrg ! + (HattrickOrg*) uniqueInstance { if(!sharedInstance) { sharedInstance = [[self alloc] init]; |
