Author: mick Date: 2006-03-09 21:51:19 +0100 (Thu, 09 Mar 2006) New Revision: 99 Added: KisMACng/Resources/Map/ KisMACng/Resources/Map/world.kismap/ KisMACng/Resources/Map/world.kismap/map.jpg KisMACng/Resources/Map/world.kismap/waypoints.plist Modified: KisMACng/KisMAC.xcodeproj/mick.mode1 KisMACng/KisMAC.xcodeproj/mick.pbxuser KisMACng/KisMAC.xcodeproj/project.pbxproj KisMACng/Sources/Controller/ScanController.m KisMACng/Sources/Views/MapView.m Log: added a default world map (closing ticket #10) Modified: KisMACng/KisMAC.xcodeproj/mick.mode1 =================================================================== --- KisMACng/KisMAC.xcodeproj/mick.mode1 2006-03-06 06:58:16 UTC (rev 98) +++ KisMACng/KisMAC.xcodeproj/mick.mode1 2006-03-09 20:51:19 UTC (rev 99) @@ -259,19 +259,15 @@ <string>29B97314FDCFA39411CA2CEA</string> <string>080E96DDFE201D6D7F000001</string> <string>003533A406A5DD8500AB4577</string> - <string>003533C506A5DD8500AB4577</string> - <string>003533F406A5DD8500AB4577</string> + <string>003533FE06A5DD8500AB4577</string> <string>29B97317FDCFA39411CA2CEA</string> - <string>00F57C1606A886350035AE2F</string> - <string>00F57C4A06A886630035AE2F</string> - <string>29B97323FDCFA39411CA2CEA</string> <string>1C37FBAC04509CD000000102</string> </array> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>15</integer> - <integer>6</integer> + <integer>32</integer> + <integer>27</integer> <integer>3</integer> <integer>0</integer> </array> @@ -316,7 +312,7 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>ScanControllerScriptable.m</string> + <string>MapView.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> <key>Split0</key> @@ -324,25 +320,18 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>ScanControllerScriptable.m</string> + <string>MapView.m</string> <key>_historyCapacity</key> <integer>20</integer> <key>bookmark</key> - <string>0093D1EA09B0889D0046F830</string> + <string>0042E7E309C0CB8100183F90</string> <key>history</key> <array> - <string>0054927A08E6EF8200307083</string> - <string>001F52780997D8BD00ED11F1</string> - <string>001F527B0997D8BD00ED11F1</string> - <string>0076352C09A26CAB002A5BEF</string> - <string>0076352D09A26CAB002A5BEF</string> <string>0076352E09A26CAB002A5BEF</string> <string>0076352F09A26CAB002A5BEF</string> <string>0076353009A26CAB002A5BEF</string> <string>0076353109A26CAB002A5BEF</string> <string>0076353209A26CAB002A5BEF</string> - <string>0076353509A26CAB002A5BEF</string> - <string>0076353609A26CAB002A5BEF</string> <string>0076353709A26CAB002A5BEF</string> <string>0076353809A26CAC002A5BEF</string> <string>0076353909A26CAC002A5BEF</string> @@ -350,17 +339,16 @@ <string>0093D1CF09B085CB0046F830</string> <string>0093D1D009B085CB0046F830</string> <string>0093D1DA09B086220046F830</string> - <string>0093D1DB09B086220046F830</string> + <string>0042E78809C0C7D700183F90</string> + <string>0042E78909C0C7D700183F90</string> + <string>0042E7BD09C0C97A00183F90</string> + <string>0042E7DA09C0CB4500183F90</string> + <string>0042E7DB09C0CB4500183F90</string> </array> <key>prevStack</key> <array> - <string>0054927C08E6EF8200307083</string> - <string>001F527D0997D8BD00ED11F1</string> <string>001F527E0997D8BD00ED11F1</string> - <string>001F527F0997D8BD00ED11F1</string> - <string>001F52800997D8BD00ED11F1</string> <string>0076350309A1B7B6002A5BEF</string> - <string>0076353B09A26CAC002A5BEF</string> <string>0076353C09A26CAC002A5BEF</string> <string>0076353F09A26CAC002A5BEF</string> <string>0076354709A26CAC002A5BEF</string> @@ -372,15 +360,25 @@ <string>0076355009A26CAC002A5BEF</string> <string>0076355709A26CAC002A5BEF</string> <string>0076356009A26CAC002A5BEF</string> - <string>0093D18809B0744F0046F830</string> - <string>0093D18909B0744F0046F830</string> - <string>0093D18A09B0744F0046F830</string> <string>0093D18B09B0744F0046F830</string> - <string>0093D18C09B0744F0046F830</string> - <string>0093D19309B0753E0046F830</string> - <string>0093D1D209B085CB0046F830</string> <string>0093D1D309B085CB0046F830</string> - <string>0093D1DC09B086220046F830</string> + <string>0042E78C09C0C7D700183F90</string> + <string>0042E78D09C0C7D700183F90</string> + <string>0042E78E09C0C7D700183F90</string> + <string>0042E78F09C0C7D700183F90</string> + <string>0042E79009C0C7D700183F90</string> + <string>0042E79109C0C7D700183F90</string> + <string>0042E79209C0C7D700183F90</string> + <string>0042E79309C0C7D700183F90</string> + <string>0042E79409C0C7D700183F90</string> + <string>0042E7B009C0C90F00183F90</string> + <string>0042E7BF09C0C97A00183F90</string> + <string>0042E7C009C0C97A00183F90</string> + <string>0042E7C109C0C97A00183F90</string> + <string>0042E7C209C0C97A00183F90</string> + <string>0042E7DC09C0CB4500183F90</string> + <string>0042E7DD09C0CB4500183F90</string> + <string>0042E7DE09C0CB4500183F90</string> </array> </dict> <key>SplitCount</key> @@ -438,9 +436,9 @@ </array> <key>TableOfContents</key> <array> - <string>0093D18E09B0744F0046F830</string> + <string>0042E76209C0C5BE00183F90</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>0093D18F09B0744F0046F830</string> + <string>0042E76309C0C5BE00183F90</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -574,14 +572,9 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>0093D1D609B085CB0046F830</string> - <string>0093D1D709B085CB0046F830</string> - <string>00A3E93108243E5F003CD96A</string> - <string>0093D1C909B085AA0046F830</string> <string>00A3E66608242A87003CD96A</string> - <string>/Users/mick/openDev/KisMACng/KisMAC.xcodeproj</string> <string>1C0AD2B3069F1EA900FABCE6</string> - <string>1CD10A99069EF8BA00B06720</string> + <string>/Users/mick/openDev/KisMACng/KisMAC.xcodeproj</string> </array> <key>WindowString</key> <string>-4 92 1280 740 0 0 1280 832 </string> @@ -622,10 +615,12 @@ <string>341pt</string> </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> - <string>{{0, 28}, {1280, 324}}</string> + <string>{{0, 5}, {1280, 347}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> <key>PBXProjectModuleLabel</key> @@ -663,7 +658,7 @@ <key>TableOfContents</key> <array> <string>00A3E66608242A87003CD96A</string> - <string>0093D1BC09B0845A0046F830</string> + <string>0042E77509C0C72500183F90</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> @@ -785,7 +780,7 @@ <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -973,8 +968,8 @@ <string>yes</string> <key>sizes</key> <array> - <string>{{0, 0}, {367, 168}}</string> - <string>{{0, 173}, {367, 270}}</string> + <string>{{0, 0}, {491, 168}}</string> + <string>{{0, 173}, {491, 270}}</string> </array> </dict> <key>VerticalSplitView</key> @@ -1023,9 +1018,9 @@ <key>TableOfContents</key> <array> <string>1C0AD2B3069F1EA900FABCE6</string> - <string>0093D1BD09B0845A0046F830</string> + <string>0042E76709C0C5BE00183F90</string> <string>1CD0528B0623707200166675</string> - <string>0093D1BE09B0845A0046F830</string> + <string>0042E76809C0C5BE00183F90</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> Modified: KisMACng/KisMAC.xcodeproj/mick.pbxuser =================================================================== --- KisMACng/KisMAC.xcodeproj/mick.pbxuser 2006-03-06 06:58:16 UTC (rev 98) +++ KisMACng/KisMAC.xcodeproj/mick.pbxuser 2006-03-09 20:51:19 UTC (rev 99) @@ -94,66 +94,16 @@ sepNavVisRect = "{{0, 0}, {964, 689}}"; }; }; - 001F52780997D8BD00ED11F1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533EF06A5DD8500AB4577 /* PrefsWebService.m */; - name = "PrefsWebService.m: updateRestrictions"; - rLen = 0; - rLoc = 1057; - rType = 0; - vrLen = 1853; - vrLoc = 1519; - }; - 001F527B0997D8BD00ED11F1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AE06A5DD8500AB4577 /* ScanControllerScriptable.h */; - name = "ScanControllerScriptable.h: 1"; - rLen = 0; - rLoc = 2; - rType = 0; - vrLen = 1575; - vrLoc = 0; - }; - 001F527D0997D8BD00ED11F1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533EF06A5DD8500AB4577 /* PrefsWebService.m */; - name = "PrefsWebService.m: updateRestrictions"; - rLen = 0; - rLoc = 1057; - rType = 0; - vrLen = 1853; - vrLoc = 1519; - }; 001F527E0997D8BD00ED11F1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; name = "ScanController.m: 77"; rLen = 0; - rLoc = 3501; + rLoc = 3521; rType = 0; vrLen = 2409; vrLoc = 2194; }; - 001F527F0997D8BD00ED11F1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */; - name = "ScanControllerMenus.m: 719"; - rLen = 0; - rLoc = 24948; - rType = 0; - vrLen = 1303; - vrLoc = 24292; - }; - 001F52800997D8BD00ED11F1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AE06A5DD8500AB4577 /* ScanControllerScriptable.h */; - name = "ScanControllerScriptable.h: 1"; - rLen = 0; - rLoc = 2; - rType = 0; - vrLen = 1575; - vrLoc = 0; - }; 002E7DF506A86C6F00C9D931 /* DownloadMapController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {964, 657}}"; @@ -375,15 +325,15 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {932, 2814}}"; sepNavSelRange = "{1458, 0}"; - sepNavVisRect = "{{0, 642}, {932, 662}}"; + sepNavVisRect = "{{0, 616}, {932, 662}}"; sepNavWindowFrame = "{{15, 32}, {750, 795}}"; }; }; 003533AA06A5DD8500AB4577 /* ScanController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1430, 8358}}"; - sepNavSelRange = "{5065, 0}"; - sepNavVisRect = "{{0, 1617}, {1233, 309}}"; + sepNavIntBoundsRect = "{{0, 0}, {1430, 8372}}"; + sepNavSelRange = "{7300, 0}"; + sepNavVisRect = "{{0, 1928}, {932, 662}}"; sepNavWindowFrame = "{{15, 54}, {1172, 773}}"; }; }; @@ -419,9 +369,9 @@ }; 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1064, 7602}}"; - sepNavSelRange = "{15384, 0}"; - sepNavVisRect = "{{0, 6926}, {932, 662}}"; + sepNavIntBoundsRect = "{{0, 0}, {1064, 7616}}"; + sepNavSelRange = "{5097, 36}"; + sepNavVisRect = "{{0, 1958}, {932, 662}}"; sepNavWindowFrame = "{{15, 32}, {750, 795}}"; }; }; @@ -1095,26 +1045,364 @@ modificationTime = 162564338.213185; state = 1; }; - 0054927A08E6EF8200307083 /* PBXTextBookmark */ = { + 0042E75D09C0C4A500183F90 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + }; + 0042E76009C0C5BE00183F90 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 005B12670730051A00906C36 /* MapControlItem.m */; + }; + 0042E76109C0C5BE00183F90 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m */; - name = "WaveDriverAirportExtreme.m: 108"; + fRef = 005B12670730051A00906C36 /* MapControlItem.m */; + name = retain; + rLen = 6; + rLoc = 8694; + rType = 0; + vrLen = 1310; + vrLoc = 8021; + }; + 0042E76609C0C5BE00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 164"; rLen = 0; - rLoc = 3910; + rLoc = 6219; rType = 0; - vrLen = 1942; - vrLoc = 3196; + vrLen = 1627; + vrLoc = 4966; }; - 0054927C08E6EF8200307083 /* PBXTextBookmark */ = { + 0042E78809C0C7D700183F90 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m */; - name = "WaveDriverAirportExtreme.m: 108"; + fRef = 005B12670730051A00906C36 /* MapControlItem.m */; + name = "MapControlItem.m: 273"; rLen = 0; - rLoc = 3910; + rLoc = 8670; rType = 0; - vrLen = 1942; - vrLoc = 3196; + vrLen = 1310; + vrLoc = 8021; }; + 0042E78909C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; + name = "[_mappingView loadFromFile:filename]"; + rLen = 36; + rLoc = 5097; + rType = 0; + vrLen = 1561; + vrLoc = 3843; + }; + 0042E78A09C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 37"; + rLen = 0; + rLoc = 1339; + rType = 0; + vrLen = 1914; + vrLoc = 0; + }; + 0042E78B09C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 160"; + rLen = 0; + rLoc = 5905; + rType = 0; + vrLen = 2160; + vrLoc = 3705; + }; + 0042E78C09C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 005B12670730051A00906C36 /* MapControlItem.m */; + name = "MapControlItem.m: 273"; + rLen = 0; + rLoc = 8670; + rType = 0; + vrLen = 1310; + vrLoc = 8021; + }; + 0042E78D09C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 164"; + rLen = 0; + rLoc = 6219; + rType = 0; + vrLen = 1719; + vrLoc = 4966; + }; + 0042E78E09C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "@implementation ScanCo"; + rLen = 23; + rLoc = 2129; + rType = 0; + vrLen = 2519; + vrLoc = 1825; + }; + 0042E78F09C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; + name = "ScanControllerScriptable.m: 511"; + rLen = 0; + rLoc = 15384; + rType = 0; + vrLen = 1826; + vrLoc = 14537; + }; + 0042E79009C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 163"; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2706; + vrLoc = 5539; + }; + 0042E79109C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; + name = "[_mappingView loadFromFile:filename]"; + rLen = 36; + rLoc = 5097; + rType = 0; + vrLen = 1561; + vrLoc = 3843; + }; + 0042E79209C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 32"; + rLen = 0; + rLoc = 1191; + rType = 0; + vrLen = 1918; + vrLoc = 0; + }; + 0042E79309C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 160"; + rLen = 0; + rLoc = 5905; + rType = 0; + vrLen = 2185; + vrLoc = 3680; + }; + 0042E79409C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 37"; + rLen = 0; + rLoc = 1339; + rType = 0; + vrLen = 1914; + vrLoc = 0; + }; + 0042E79509C0C7D700183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 161"; + rLen = 0; + rLoc = 6070; + rType = 0; + vrLen = 2162; + vrLoc = 3705; + }; + 0042E7AF09C0C90F00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 136"; + rLen = 0; + rLoc = 5171; + rType = 0; + vrLen = 2162; + vrLoc = 3705; + }; + 0042E7B009C0C90F00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 136"; + rLen = 0; + rLoc = 5171; + rType = 0; + vrLen = 2162; + vrLoc = 3705; + }; + 0042E7B109C0C90F00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 166"; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2841; + vrLoc = 5485; + }; + 0042E7B409C0C92600183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 166"; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2754; + vrLoc = 5485; + }; + 0042E7BC09C0C97A00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "NSLog(@\"bla\");"; + rLen = 0; + rLoc = 5317; + rType = 0; + vrLen = 2164; + vrLoc = 3705; + }; + 0042E7BD09C0C97A00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533A906A5DD8500AB4577 /* ScanController.h */; + name = "ScanController.h: 52"; + rLen = 0; + rLoc = 1458; + rType = 0; + vrLen = 1910; + vrLoc = 1324; + }; + 0042E7BE09C0C97A00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = _mappingView; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2705; + vrLoc = 5703; + }; + 0042E7BF09C0C97A00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = _mappingView; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2705; + vrLoc = 5703; + }; + 0042E7C009C0C97A00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "NSLog(@\"bla\");"; + rLen = 0; + rLoc = 5317; + rType = 0; + vrLen = 2164; + vrLoc = 3705; + }; + 0042E7C109C0C97A00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = _mappingView; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2705; + vrLoc = 5703; + }; + 0042E7C209C0C97A00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533A906A5DD8500AB4577 /* ScanController.h */; + name = "ScanController.h: 52"; + rLen = 0; + rLoc = 1458; + rType = 0; + vrLen = 1910; + vrLoc = 1324; + }; + 0042E7C309C0C97A00183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 165"; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2714; + vrLoc = 5703; + }; + 0042E7DA09C0CB4500183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 164"; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2778; + vrLoc = 5485; + }; + 0042E7DB09C0CB4500183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 156"; + rLen = 0; + rLoc = 5846; + rType = 0; + vrLen = 1558; + vrLoc = 1466; + }; + 0042E7DC09C0CB4500183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 165"; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2754; + vrLoc = 5485; + }; + 0042E7DD09C0CB4500183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 156"; + rLen = 0; + rLoc = 5846; + rType = 0; + vrLen = 1558; + vrLoc = 1466; + }; + 0042E7DE09C0CB4500183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; + name = "ScanController.m: 164"; + rLen = 0; + rLoc = 7300; + rType = 0; + vrLen = 2778; + vrLoc = 5485; + }; + 0042E7DF09C0CB4500183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: ZOOMFACT"; + rLen = 0; + rLoc = 15918; + rType = 0; + vrLen = 987; + vrLoc = 15319; + }; + 0042E7E309C0CB8100183F90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; + name = "MapView.m: 86"; + rLen = 0; + rLoc = 2911; + rType = 0; + vrLen = 1721; + vrLoc = 1342; + }; 005B12660730051A00906C36 /* MapControlItem.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {964, 825}}"; @@ -1125,8 +1413,9 @@ 005B12670730051A00906C36 /* MapControlItem.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1124, 4326}}"; - sepNavSelRange = "{8694, 6}"; - sepNavVisRect = "{{0, 3603}, {939, 452}}"; + sepNavSelRange = "{8670, 0}"; + sepNavVisRect = "{{0, 3499}, {932, 662}}"; + sepNavWindowFrame = "{{15, 54}, {1172, 773}}"; }; }; 005E817006FDCFF20016F5E7 /* MapDownload.h */ = { @@ -1153,26 +1442,6 @@ vrLen = 1737; vrLoc = 3934; }; - 0076352C09A26CAB002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */; - name = "ScanControllerMenus.m: 706"; - rLen = 0; - rLoc = 24948; - rType = 0; - vrLen = 1577; - vrLoc = 24135; - }; - 0076352D09A26CAB002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533A806A5DD8500AB4577 /* InfoController.mm */; - name = "InfoController.mm: 100"; - rLen = 0; - rLoc = 2716; - rType = 0; - vrLen = 1322; - vrLoc = 1921; - }; 0076352E09A26CAB002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 0090B7CA07B2A43D005FEEB1 /* WaveStorageController.m */; @@ -1223,32 +1492,12 @@ vrLen = 1903; vrLoc = 12231; }; - 0076353309A26CAB002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = weakSchedulingAttackForKeyLen; - rLen = 29; - rLoc = 15828; - rType = 0; - vrLen = 1834; - vrLoc = 14755; - }; - 0076353409A26CAB002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F606A5DD8500AB4577 /* ScriptAdditions.m */; - name = "ScriptAdditions.m: 69"; - rLen = 0; - rLoc = 2392; - rType = 0; - vrLen = 1669; - vrLoc = 5675; - }; 0076353509A26CAB002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; name = "BOOL\t _errorSuppressed;"; rLen = 23; - rLoc = 2109; + rLoc = 2129; rType = 0; vrLen = 2571; vrLoc = 1754; @@ -1293,26 +1542,6 @@ vrLen = 1428; vrLoc = 0; }; - 0076353A09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = "ScriptController.m: 306"; - rLen = 0; - rLoc = 9931; - rType = 0; - vrLen = 1626; - vrLoc = 10722; - }; - 0076353B09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533A806A5DD8500AB4577 /* InfoController.mm */; - name = "InfoController.mm: 100"; - rLen = 0; - rLoc = 2716; - rType = 0; - vrLen = 1322; - vrLoc = 1921; - }; 0076353C09A26CAC002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */; @@ -1323,26 +1552,6 @@ vrLen = 1477; vrLoc = 740; }; - 0076353D09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */; - name = "ScanControllerMenus.m: 706"; - rLen = 0; - rLoc = 24948; - rType = 0; - vrLen = 1577; - vrLoc = 24135; - }; - 0076353E09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "- (BOOL)weakSchedulingAttackForKeyLen:(int)keyLen andKeyID:(int)keyID"; - rLen = 70; - rLoc = 15820; - rType = 0; - vrLen = 1785; - vrLoc = 14804; - }; 0076353F09A26CAC002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */; @@ -1353,76 +1562,6 @@ vrLen = 1409; vrLoc = 15247; }; - 0076354009A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; - name = "ScanController.m: 94"; - rLen = 0; - rLoc = 4345; - rType = 0; - vrLen = 1464; - vrLoc = 21121; - }; - 0076354109A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */; - name = "Menu.nib!\")]"; - rLen = 12; - rLoc = 16110; - rType = 0; - vrLen = 1409; - vrLoc = 15247; - }; - 0076354209A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */; - name = "ScanControllerMenus.m: 706"; - rLen = 0; - rLoc = 24948; - rType = 0; - vrLen = 1577; - vrLoc = 24135; - }; - 0076354309A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = weakSchedulingAttackForKeyLen; - rLen = 29; - rLoc = 15828; - rType = 0; - vrLen = 1834; - vrLoc = 14755; - }; - 0076354409A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */; - name = "ScanControllerMenus.m: 706"; - rLen = 0; - rLoc = 24948; - rType = 0; - vrLen = 1577; - vrLoc = 24135; - }; - 0076354509A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */; - name = "Menu.nib!\")]"; - rLen = 12; - rLoc = 16110; - rType = 0; - vrLen = 1409; - vrLoc = 15247; - }; - 0076354609A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533A806A5DD8500AB4577 /* InfoController.mm */; - name = "InfoController.mm: 100"; - rLen = 0; - rLoc = 2716; - rType = 0; - vrLen = 1322; - vrLoc = 1921; - }; 0076354709A26CAC002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533B106A5DD8500AB4577 /* TrafficController.mm */; @@ -1443,16 +1582,6 @@ vrLen = 1626; vrLoc = 10722; }; - 0076354909A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = weakSchedulingAttackForKeyLen; - rLen = 29; - rLoc = 15828; - rType = 0; - vrLen = 1834; - vrLoc = 14755; - }; 0076354A09A26CAC002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533F606A5DD8500AB4577 /* ScriptAdditions.m */; @@ -1493,26 +1622,6 @@ vrLen = 1264; vrLoc = 1449; }; - 0076354E09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = weakSchedulingAttackForKeyLen; - rLen = 29; - rLoc = 15828; - rType = 0; - vrLen = 1834; - vrLoc = 14755; - }; - 0076354F09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = "ScriptController.m: 352"; - rLen = 0; - rLoc = 11918; - rType = 0; - vrLen = 1626; - vrLoc = 10722; - }; 0076355009A26CAC002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 009B192206FC83A800E8883A /* ScriptingEngine.m */; @@ -1523,66 +1632,6 @@ vrLen = 1941; vrLoc = 0; }; - 0076355109A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = "ScriptController.m: 356"; - rLen = 0; - rLoc = 11937; - rType = 0; - vrLen = 1626; - vrLoc = 10722; - }; - 0076355209A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533B106A5DD8500AB4577 /* TrafficController.mm */; - name = graphData; - rLen = 9; - rLoc = 13279; - rType = 0; - vrLen = 1903; - vrLoc = 12231; - }; - 0076355309A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = weakSchedulingAttackForKeyLen; - rLen = 29; - rLoc = 15828; - rType = 0; - vrLen = 1834; - vrLoc = 14755; - }; - 0076355409A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F606A5DD8500AB4577 /* ScriptAdditions.m */; - name = "ScriptAdditions.m: 69"; - rLen = 0; - rLoc = 2392; - rType = 0; - vrLen = 1669; - vrLoc = 5675; - }; - 0076355509A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = wordlist104bitMD5; - rLen = 17; - rLoc = 8632; - rType = 0; - vrLen = 2212; - vrLoc = 8620; - }; - 0076355609A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */; - name = _errorSuppressed; - rLen = 16; - rLoc = 9514; - rType = 0; - vrLen = 2765; - vrLoc = 8888; - }; 0076355709A26CAC002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533A906A5DD8500AB4577 /* ScanController.h */; @@ -1593,86 +1642,6 @@ vrLen = 1910; vrLoc = 1232; }; - 0076355809A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; - name = "ScanController.m: 127"; - rLen = 0; - rLoc = 5088; - rType = 0; - vrLen = 1413; - vrLoc = 4301; - }; - 0076355909A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */; - name = _errorSuppressed; - rLen = 16; - rLoc = 9514; - rType = 0; - vrLen = 2750; - vrLoc = 8888; - }; - 0076355A09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = "ScriptController.m: 306"; - rLen = 0; - rLoc = 9931; - rType = 0; - vrLen = 1626; - vrLoc = 10722; - }; - 0076355B09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533A906A5DD8500AB4577 /* ScanController.h */; - name = "ScanController.h: 65"; - rLen = 0; - rLoc = 2329; - rType = 0; - vrLen = 1899; - vrLoc = 1258; - }; - 0076355C09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */; - name = "BOOL\t _errorSuppressed;"; - rLen = 23; - rLoc = 2109; - rType = 0; - vrLen = 2571; - vrLoc = 1754; - }; - 0076355D09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533A906A5DD8500AB4577 /* ScanController.h */; - name = "ScanController.h: 52"; - rLen = 0; - rLoc = 1458; - rType = 0; - vrLen = 1950; - vrLoc = 1335; - }; - 0076355E09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */; - name = "ScanControllerPrivate.m: 252"; - rLen = 0; - rLoc = 9335; - rType = 0; - vrLen = 1562; - vrLoc = 0; - }; - 0076355F09A26CAC002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */; - name = "ScanControllerPrivate.h: startActiveAttack"; - rLen = 0; - rLoc = 1491; - rType = 0; - vrLen = 1478; - vrLoc = 739; - }; 0076356009A26CAC002A5BEF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533F706A5DD8500AB4577 /* ScriptController.h */; @@ -1683,16 +1652,6 @@ vrLen = 1428; vrLoc = 0; }; - 0076356509A2FB83002A5BEF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = "ScriptController.m: 352"; - rLen = 0; - rLoc = 11837; - rType = 0; - vrLen = 1408; - vrLoc = 11048; - }; 0083C8AA08805F2900D895CB /* BISubView.m:129 */ = { isa = PBXFileBreakpoint; actions = ( @@ -1719,7 +1678,7 @@ modificationTime = 162564239.874679; state = 2; }; - 0083C8EC0880633A00D895CB /* MapView.m:196 */ = { + 0083C8EC0880633A00D895CB /* MapView.m:210 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1728,11 +1687,11 @@ fileReference = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; functionName = "-pdfData"; hitCount = 1; - lineNumber = 196; + lineNumber = 210; modificationTime = 162564239.874701; state = 2; }; - 0083C8EE0880633E00D895CB /* MapView.m:210 */ = { + 0083C8EE0880633E00D895CB /* MapView.m:224 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1741,7 +1700,7 @@ fileReference = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; functionName = "-pdfData"; hitCount = 1; - lineNumber = 210; + lineNumber = 224; modificationTime = 162564239.874718; state = 2; }; @@ -1758,7 +1717,7 @@ modificationTime = 162564239.874734; state = 2; }; - 0083C90E088064F700D895CB /* MapView.m:211 */ = { + 0083C90E088064F700D895CB /* MapView.m:225 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1767,7 +1726,7 @@ fileReference = 00CBA33F06DB8FDE000ACD19 /* MapView.m */; functionName = "-pdfData"; hitCount = 1; - lineNumber = 211; + lineNumber = 225; modificationTime = 162564239.87475; state = 2; }; @@ -1784,15 +1743,16 @@ 00412E8808265B3300E757BC /* WaveDriverViha.m:106 */, 0083C8AA08805F2900D895CB /* BISubView.m:129 */, 0083C8E1088062AF00D895CB /* BISubView.m:130 */, - 0083C8EC0880633A00D895CB /* MapView.m:196 */, - 0083C8EE0880633E00D895CB /* MapView.m:210 */, + 0083C8EC0880633A00D895CB /* MapView.m:210 */, + 0083C8EE0880633E00D895CB /* MapView.m:224 */, 0083C8FF088063B500D895CB /* BIView.m:58 */, - 0083C90E088064F700D895CB /* MapView.m:211 */, + 0083C90E088064F700D895CB /* MapView.m:225 */, 00DF45D208B1FFC1003F3C7E /* WaveDriverAirportExtreme.m:113 */, 00DF45E108B202D6003F3C7E /* WaveDriverAtheros.m:208 */, 00DF480508B23BB2003F3C7E /* WaveDriverAirportExtreme.m:110 */, 00DF481908B23DC8003F3C7E /* WaveDriverAirportExtreme.m:81 */, 000C1A4108B8BAC800464DAB /* WaveScanner.mm:217 */, + 0093D1EE09B08C370046F830 /* ScanControllerScriptable.m:508 */, ); }; 00875D190708ADB300CACFCB /* WaveHelper.h */ = { @@ -1887,66 +1847,6 @@ vrLen = 1671; vrLoc = 5673; }; - 0093D18509B0744F0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 00B6296707058E2B006FC563 /* WaveNetWEPWeakCrack.m */; - name = "WaveNetWEPWeakCrack.m: 83"; - rLen = 0; - rLoc = 2804; - rType = 0; - vrLen = 1235; - vrLoc = 1652; - }; - 0093D18609B0744F0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = 0xFFFFFFFF; - rLen = 8; - rLoc = 11667; - rType = 0; - vrLen = 1381; - vrLoc = 11040; - }; - 0093D18709B0744F0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = performCrackWEPWeakforKeyIDAndLen; - rLen = 33; - rLoc = 16488; - rType = 0; - vrLen = 1834; - vrLoc = 14755; - }; - 0093D18809B0744F0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = "ScriptController.m: 351"; - rLen = 0; - rLoc = 11837; - rType = 0; - vrLen = 1410; - vrLoc = 11046; - }; - 0093D18909B0744F0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F606A5DD8500AB4577 /* ScriptAdditions.m */; - name = "- (id)weakSchedulingAttack:(NSScriptCommand *)command"; - rLen = 54; - rLoc = 5676; - rType = 0; - vrLen = 1671; - vrLoc = 5673; - }; - 0093D18A09B0744F0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = performCrackWEPWeakforKeyIDAndLen; - rLen = 33; - rLoc = 16488; - rType = 0; - vrLen = 1834; - vrLoc = 14755; - }; 0093D18B09B0744F0046F830 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 00B6296707058E2B006FC563 /* WaveNetWEPWeakCrack.m */; @@ -1957,56 +1857,6 @@ vrLen = 1235; vrLoc = 1652; }; - 0093D18C09B0744F0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = 0xFFFFFFFF; - rLen = 8; - rLoc = 11667; - rType = 0; - vrLen = 1381; - vrLoc = 11040; - }; - 0093D18D09B0744F0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 531"; - rLen = 0; - rLoc = 16257; - rType = 0; - vrLen = 1858; - vrLoc = 14755; - }; - 0093D19209B0753E0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 532"; - rLen = 0; - rLoc = 16262; - rType = 0; - vrLen = 1858; - vrLoc = 14755; - }; - 0093D19309B0753E0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 532"; - rLen = 0; - rLoc = 16262; - rType = 0; - vrLen = 1858; - vrLoc = 14755; - }; - 0093D19409B0753E0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 00B6296707058E2B006FC563 /* WaveNetWEPWeakCrack.m */; - name = "WaveNetWEPWeakCrack.m: 86"; - rLen = 0; - rLoc = 2896; - rType = 0; - vrLen = 1221; - vrLoc = 1694; - }; 0093D1CF09B085CB0046F830 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 00B6296707058E2B006FC563 /* WaveNetWEPWeakCrack.m */; @@ -2027,26 +1877,6 @@ vrLen = 1194; vrLoc = 0; }; - 0093D1D109B085CB0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = 0xFFFFFFFF; - rLen = 8; - rLoc = 11667; - rType = 0; - vrLen = 1381; - vrLoc = 11040; - }; - 0093D1D209B085CB0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 00B6296707058E2B006FC563 /* WaveNetWEPWeakCrack.m */; - name = "WaveNetWEPWeakCrack.m: 67"; - rLen = 0; - rLoc = 2252; - rType = 0; - vrLen = 1221; - vrLoc = 1694; - }; 0093D1D309B085CB0046F830 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 00B6296607058E2B006FC563 /* WaveNetWEPWeakCrack.h */; @@ -2057,16 +1887,6 @@ vrLen = 1194; vrLoc = 0; }; - 0093D1D409B085CB0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = "ScriptController.m: 348"; - rLen = 0; - rLoc = 11670; - rType = 0; - vrLen = 1379; - vrLoc = 11040; - }; 0093D1DA09B086220046F830 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; @@ -2077,76 +1897,6 @@ vrLen = 1379; vrLoc = 11040; }; - 0093D1DB09B086220046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 532"; - rLen = 0; - rLoc = 16262; - rType = 0; - vrLen = 1858; - vrLoc = 14755; - }; - 0093D1DC09B086220046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */; - name = "ScriptController.m: 348"; - rLen = 0; - rLoc = 11670; - rType = 0; - vrLen = 1379; - vrLoc = 11040; - }; - 0093D1DD09B086220046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 530"; - rLen = 0; - rLoc = 16197; - rType = 0; - vrLen = 1856; - vrLoc = 14755; - }; - 0093D1DF09B0869B0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 511"; - rLen = 0; - rLoc = 15384; - rType = 0; - vrLen = 1856; - vrLoc = 14755; - }; - 0093D1E209B0872A0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 511"; - rLen = 0; - rLoc = 15384; - rType = 0; - vrLen = 1856; - vrLoc = 14755; - }; - 0093D1E309B0879C0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 511"; - rLen = 0; - rLoc = 15384; - rType = 0; - vrLen = 1856; - vrLoc = 14755; - }; - 0093D1EA09B0889D0046F830 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */; - name = "ScanControllerScriptable.m: 511"; - rLen = 0; - rLoc = 15384; - rType = 0; - vrLen = 1856; - vrLoc = 14755; - }; 0093D1EE09B08C370046F830 /* ScanControllerScriptable.m:508 */ = { isa = PBXFileBreakpoint; actions = ( @@ -2491,10 +2241,10 @@ }; 00CBA33F06DB8FDE000ACD19 /* MapView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1754, 8834}}"; - sepNavSelRange = "{7687, 0}"; - sepNavVisRect = "{{0, 2966}, {933, 452}}"; - sepNavWindowFrame = "{{38, 248}, {750, 558}}"; + sepNavIntBoundsRect = "{{0, 0}, {1754, 9002}}"; + sepNavSelRange = "{2911, 0}"; + sepNavVisRect = "{{0, 642}, {932, 662}}"; + sepNavWindowFrame = "{{38, 67}, {945, 765}}"; }; }; 00D135D00707EA3A00D85D30 /* AirCrackWrapper.h */ = { @@ -2687,7 +2437,7 @@ }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeBuildConfigurationName = Development; + activeBuildConfigurationName = Deployment; activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; activeExecutable = 009F5C5D06A5C8DF004BB18E /* KisMAC */; activeTarget = 8D1107260486CEB800E47090 /* KisMAC */; @@ -2705,10 +2455,10 @@ 00412E8808265B3300E757BC /* WaveDriverViha.m:106 */, 0083C8AA08805F2900D895CB /* BISubView.m:129 */, 0083C8E1088062AF00D895CB /* BISubView.m:130 */, - 0083C8EC0880633A00D895CB /* MapView.m:196 */, - 0083C8EE0880633E00D895CB /* MapView.m:210 */, + 0083C8EC0880633A00D895CB /* MapView.m:210 */, + 0083C8EE0880633E00D895CB /* MapView.m:224 */, 0083C8FF088063B500D895CB /* BIView.m:58 */, - 0083C90E088064F700D895CB /* MapView.m:211 */, + 0083C90E088064F700D895CB /* MapView.m:225 */, 00DF45D208B1FFC1003F3C7E /* WaveDriverAirportExtreme.m:113 */, 00DF45E108B202D6003F3C7E /* WaveDriverAtheros.m:208 */, 00DF480508B23BB2003F3C7E /* WaveDriverAirportExtreme.m:110 */, @@ -2874,7 +2624,7 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 162558394; + PBXPerProjectTemplateStateSaveDate = 163628024; PBXPrepackagedSmartGroups_v2 = ( { PBXTransientLocationAtTop = bottom; @@ -3305,99 +3055,75 @@ PBXModuleWindowStatusBarHidden = YES; RubberWindowFrame = "267 358 745 464 0 0 1280 832 "; }; - PBXWorkspaceStateSaveDate = 162558394; + PBXWorkspaceStateSaveDate = 163628024; }; perUserProjectItems = { - 001F52780997D8BD00ED11F1 = 001F52780997D8BD00ED11F1 /* PBXTextBookmark */; - 001F527B0997D8BD00ED11F1 = 001F527B0997D8BD00ED11F1 /* PBXTextBookmark */; - 001F527D0997D8BD00ED11F1 = 001F527D0997D8BD00ED11F1 /* PBXTextBookmark */; 001F527E0997D8BD00ED11F1 = 001F527E0997D8BD00ED11F1 /* PBXTextBookmark */; - 001F527F0997D8BD00ED11F1 = 001F527F0997D8BD00ED11F1 /* PBXTextBookmark */; - 001F52800997D8BD00ED11F1 = 001F52800997D8BD00ED11F1 /* PBXTextBookmark */; - 0054927A08E6EF8200307083 = 0054927A08E6EF8200307083 /* PBXTextBookmark */; - 0054927C08E6EF8200307083 = 0054927C08E6EF8200307083 /* PBXTextBookmark */; + 0042E75D09C0C4A500183F90 /* PBXBookmark */ = 0042E75D09C0C4A500183F90 /* PBXBookmark */; + 0042E76009C0C5BE00183F90 /* PBXBookmark */ = 0042E76009C0C5BE00183F90 /* PBXBookmark */; + 0042E76109C0C5BE00183F90 /* PBXTextBookmark */ = 0042E76109C0C5BE00183F90 /* PBXTextBookmark */; + 0042E76609C0C5BE00183F90 /* PBXTextBookmark */ = 0042E76609C0C5BE00183F90 /* PBXTextBookmark */; + 0042E78809C0C7D700183F90 /* PBXTextBookmark */ = 0042E78809C0C7D700183F90 /* PBXTextBookmark */; + 0042E78909C0C7D700183F90 /* PBXTextBookmark */ = 0042E78909C0C7D700183F90 /* PBXTextBookmark */; + 0042E78A09C0C7D700183F90 /* PBXTextBookmark */ = 0042E78A09C0C7D700183F90 /* PBXTextBookmark */; + 0042E78B09C0C7D700183F90 /* PBXTextBookmark */ = 0042E78B09C0C7D700183F90 /* PBXTextBookmark */; + 0042E78C09C0C7D700183F90 /* PBXTextBookmark */ = 0042E78C09C0C7D700183F90 /* PBXTextBookmark */; + 0042E78D09C0C7D700183F90 /* PBXTextBookmark */ = 0042E78D09C0C7D700183F90 /* PBXTextBookmark */; + 0042E78E09C0C7D700183F90 /* PBXTextBookmark */ = 0042E78E09C0C7D700183F90 /* PBXTextBookmark */; + 0042E78F09C0C7D700183F90 /* PBXTextBookmark */ = 0042E78F09C0C7D700183F90 /* PBXTextBookmark */; + 0042E79009C0C7D700183F90 /* PBXTextBookmark */ = 0042E79009C0C7D700183F90 /* PBXTextBookmark */; + 0042E79109C0C7D700183F90 /* PBXTextBookmark */ = 0042E79109C0C7D700183F90 /* PBXTextBookmark */; + 0042E79209C0C7D700183F90 /* PBXTextBookmark */ = 0042E79209C0C7D700183F90 /* PBXTextBookmark */; + 0042E79309C0C7D700183F90 /* PBXTextBookmark */ = 0042E79309C0C7D700183F90 /* PBXTextBookmark */; + 0042E79409C0C7D700183F90 /* PBXTextBookmark */ = 0042E79409C0C7D700183F90 /* PBXTextBookmark */; + 0042E79509C0C7D700183F90 /* PBXTextBookmark */ = 0042E79509C0C7D700183F90 /* PBXTextBookmark */; + 0042E7AF09C0C90F00183F90 /* PBXTextBookmark */ = 0042E7AF09C0C90F00183F90 /* PBXTextBookmark */; + 0042E7B009C0C90F00183F90 /* PBXTextBookmark */ = 0042E7B009C0C90F00183F90 /* PBXTextBookmark */; + 0042E7B109C0C90F00183F90 /* PBXTextBookmark */ = 0042E7B109C0C90F00183F90 /* PBXTextBookmark */; + 0042E7B409C0C92600183F90 /* PBXTextBookmark */ = 0042E7B409C0C92600183F90 /* PBXTextBookmark */; + 0042E7BC09C0C97A00183F90 /* PBXTextBookmark */ = 0042E7BC09C0C97A00183F90 /* PBXTextBookmark */; + 0042E7BD09C0C97A00183F90 /* PBXTextBookmark */ = 0042E7BD09C0C97A00183F90 /* PBXTextBookmark */; + 0042E7BE09C0C97A00183F90 /* PBXTextBookmark */ = 0042E7BE09C0C97A00183F90 /* PBXTextBookmark */; + 0042E7BF09C0C97A00183F90 /* PBXTextBookmark */ = 0042E7BF09C0C97A00183F90 /* PBXTextBookmark */; + 0042E7C009C0C97A00183F90 /* PBXTextBookmark */ = 0042E7C009C0C97A00183F90 /* PBXTextBookmark */; + 0042E7C109C0C97A00183F90 /* PBXTextBookmark */ = 0042E7C109C0C97A00183F90 /* PBXTextBookmark */; + 0042E7C209C0C97A00183F90 /* PBXTextBookmark */ = 0042E7C209C0C97A00183F90 /* PBXTextBookmark */; + 0042E7C309C0C97A00183F90 /* PBXTextBookmark */ = 0042E7C309C0C97A00183F90 /* PBXTextBookmark */; + 0042E7DA09C0CB4500183F90 /* PBXTextBookmark */ = 0042E7DA09C0CB4500183F90 /* PBXTextBookmark */; + 0042E7DB09C0CB4500183F90 /* PBXTextBookmark */ = 0042E7DB09C0CB4500183F90 /* PBXTextBookmark */; + 0042E7DC09C0CB4500183F90 /* PBXTextBookmark */ = 0042E7DC09C0CB4500183F90 /* PBXTextBookmark */; + 0042E7DD09C0CB4500183F90 /* PBXTextBookmark */ = 0042E7DD09C0CB4500183F90 /* PBXTextBookmark */; + 0042E7DE09C0CB4500183F90 /* PBXTextBookmark */ = 0042E7DE09C0CB4500183F90 /* PBXTextBookmark */; + 0042E7DF09C0CB4500183F90 /* PBXTextBookmark */ = 0042E7DF09C0CB4500183F90 /* PBXTextBookmark */; + 0042E7E309C0CB8100183F90 /* PBXTextBookmark */ = 0042E7E309C0CB8100183F90 /* PBXTextBookmark */; 0076350309A1B7B6002A5BEF = 0076350309A1B7B6002A5BEF /* PBXTextBookmark */; - 0076352C09A26CAB002A5BEF = 0076352C09A26CAB002A5BEF /* PBXTextBookmark */; - 0076352D09A26CAB002A5BEF = 0076352D09A26CAB002A5BEF /* PBXTextBookmark */; 0076352E09A26CAB002A5BEF = 0076352E09A26CAB002A5BEF /* PBXTextBookmark */; 0076352F09A26CAB002A5BEF = 0076352F09A26CAB002A5BEF /* PBXTextBookmark */; 0076353009A26CAB002A5BEF = 0076353009A26CAB002A5BEF /* PBXTextBookmark */; 0076353109A26CAB002A5BEF = 0076353109A26CAB002A5BEF /* PBXTextBookmark */; 0076353209A26CAB002A5BEF = 0076353209A26CAB002A5BEF /* PBXTextBookmark */; - 0076353309A26CAB002A5BEF = 0076353309A26CAB002A5BEF /* PBXTextBookmark */; - 0076353409A26CAB002A5BEF = 0076353409A26CAB002A5BEF /* PBXTextBookmark */; 0076353509A26CAB002A5BEF = 0076353509A26CAB002A5BEF /* PBXTextBookmark */; 0076353609A26CAB002A5BEF = 0076353609A26CAB002A5BEF /* PBXTextBookmark */; 0076353709A26CAB002A5BEF = 0076353709A26CAB002A5BEF /* PBXTextBookmark */; 0076353809A26CAC002A5BEF = 0076353809A26CAC002A5BEF /* PBXTextBookmark */; 0076353909A26CAC002A5BEF = 0076353909A26CAC002A5BEF /* PBXTextBookmark */; - 0076353A09A26CAC002A5BEF = 0076353A09A26CAC002A5BEF /* PBXTextBookmark */; - 0076353B09A26CAC002A5BEF = 0076353B09A26CAC002A5BEF /* PBXTextBookmark */; 0076353C09A26CAC002A5BEF = 0076353C09A26CAC002A5BEF /* PBXTextBookmark */; - 0076353D09A26CAC002A5BEF = 0076353D09A26CAC002A5BEF /* PBXTextBookmark */; - 0076353E09A26CAC002A5BEF = 0076353E09A26CAC002A5BEF /* PBXTextBookmark */; 0076353F09A26CAC002A5BEF = 0076353F09A26CAC002A5BEF /* PBXTextBookmark */; - 0076354009A26CAC002A5BEF = 0076354009A26CAC002A5BEF /* PBXTextBookmark */; - 0076354109A26CAC002A5BEF = 0076354109A26CAC002A5BEF /* PBXTextBookmark */; - 0076354209A26CAC002A5BEF = 0076354209A26CAC002A5BEF /* PBXTextBookmark */; - 0076354309A26CAC002A5BEF = 0076354309A26CAC002A5BEF /* PBXTextBookmark */; - 0076354409A26CAC002A5BEF = 0076354409A26CAC002A5BEF /* PBXTextBookmark */; - 0076354509A26CAC002A5BEF = 0076354509A26CAC002A5BEF /* PBXTextBookmark */; - 0076354609A26CAC002A5BEF = 0076354609A26CAC002A5BEF /* PBXTextBookmark */; 0076354709A26CAC002A5BEF = 0076354709A26CAC002A5BEF /* PBXTextBookmark */; 0076354809A26CAC002A5BEF = 0076354809A26CAC002A5BEF /* PBXTextBookmark */; - 0076354909A26CAC002A5BEF = 0076354909A26CAC002A5BEF /* PBXTextBookmark */; 0076354A09A26CAC002A5BEF = 0076354A09A26CAC002A5BEF /* PBXTextBookmark */; 0076354B09A26CAC002A5BEF = 0076354B09A26CAC002A5BEF /* PBXTextBookmark */; 0076354C09A26CAC002A5BEF = 0076354C09A26CAC002A5BEF /* PBXTextBookmark */; 0076354D09A26CAC002A5BEF = 0076354D09A26CAC002A5BEF /* PBXTextBookmark */; - 0076354E09A26CAC002A5BEF = 0076354E09A26CAC002A5BEF /* PBXTextBookmark */; - 0076354F09A26CAC002A5BEF = 0076354F09A26CAC002A5BEF /* PBXTextBookmark */; 0076355009A26CAC002A5BEF = 0076355009A26CAC002A5BEF /* PBXTextBookmark */; - 0076355109A26CAC002A5BEF = 0076355109A26CAC002A5BEF /* PBXTextBookmark */; - 0076355209A26CAC002A5BEF = 0076355209A26CAC002A5BEF /* PBXTextBookmark */; - 0076355309A26CAC002A5BEF = 0076355309A26CAC002A5BEF /* PBXTextBookmark */; - 0076355409A26CAC002A5BEF = 0076355409A26CAC002A5BEF /* PBXTextBookmark */; - 0076355509A26CAC002A5BEF = 0076355509A26CAC002A5BEF /* PBXTextBookmark */; - 0076355609A26CAC002A5BEF = 0076355609A26CAC002A5BEF /* PBXTextBookmark */; 0076355709A26CAC002A5BEF = 0076355709A26CAC002A5BEF /* PBXTextBookmark */; - 0076355809A26CAC002A5BEF = 0076355809A26CAC002A5BEF /* PBXTextBookmark */; - 0076355909A26CAC002A5BEF = 0076355909A26CAC002A5BEF /* PBXTextBookmark */; - 0076355A09A26CAC002A5BEF = 0076355A09A26CAC002A5BEF /* PBXTextBookmark */; - 0076355B09A26CAC002A5BEF = 0076355B09A26CAC002A5BEF /* PBXTextBookmark */; - 0076355C09A26CAC002A5BEF = 0076355C09A26CAC002A5BEF /* PBXTextBookmark */; - 0076355D09A26CAC002A5BEF = 0076355D09A26CAC002A5BEF /* PBXTextBookmark */; - 0076355E09A26CAC002A5BEF = 0076355E09A26CAC002A5BEF /* PBXTextBookmark */; - 0076355F09A26CAC002A5BEF = 0076355F09A26CAC002A5BEF /* PBXTextBookmark */; 0076356009A26CAC002A5BEF = 0076356009A26CAC002A5BEF /* PBXTextBookmark */; - 0076356509A2FB83002A5BEF = 0076356509A2FB83002A5BEF /* PBXTextBookmark */; - 0093D18409B0744F0046F830 /* PBXTextBookmark */ = 0093D18409B0744F0046F830 /* PBXTextBookmark */; - 0093D18509B0744F0046F830 /* PBXTextBookmark */ = 0093D18509B0744F0046F830 /* PBXTextBookmark */; - 0093D18609B0744F0046F830 /* PBXTextBookmark */ = 0093D18609B0744F0046F830 /* PBXTextBookmark */; - 0093D18709B0744F0046F830 /* PBXTextBookmark */ = 0093D18709B0744F0046F830 /* PBXTextBookmark */; - 0093D18809B0744F0046F830 /* PBXTextBookmark */ = 0093D18809B0744F0046F830 /* PBXTextBookmark */; - 0093D18909B0744F0046F830 /* PBXTextBookmark */ = 0093D18909B0744F0046F830 /* PBXTextBookmark */; - 0093D18A09B0744F0046F830 /* PBXTextBookmark */ = 0093D18A09B0744F0046F830 /* PBXTextBookmark */; - 0093D18B09B0744F0046F830 /* PBXTextBookmark */ = 0093D18B09B0744F0046F830 /* PBXTextBookmark */; - 0093D18C09B0744F0046F830 /* PBXTextBookmark */ = 0093D18C09B0744F0046F830 /* PBXTextBookmark */; - 0093D18D09B0744F0046F830 /* PBXTextBookmark */ = 0093D18D09B0744F0046F830 /* PBXTextBookmark */; - 0093D19209B0753E0046F830 /* PBXTextBookmark */ = 0093D19209B0753E0046F830 /* PBXTextBookmark */; - 0093D19309B0753E0046F830 /* PBXTextBookmark */ = 0093D19309B0753E0046F830 /* PBXTextBookmark */; - 0093D19409B0753E0046F830 /* PBXTextBookmark */ = 0093D19409B0753E0046F830 /* PBXTextBookmark */; - 0093D1CF09B085CB0046F830 /* PBXTextBookmark */ = 0093D1CF09B085CB0046F830 /* PBXTextBookmark */; - 0093D1D009B085CB0046F830 /* PBXTextBookmark */ = 0093D1D009B085CB0046F830 /* PBXTextBookmark */; - 0093D1D109B085CB0046F830 /* PBXTextBookmark */ = 0093D1D109B085CB0046F830 /* PBXTextBookmark */; - 0093D1D209B085CB0046F830 /* PBXTextBookmark */ = 0093D1D209B085CB0046F830 /* PBXTextBookmark */; - 0093D1D309B085CB0046F830 /* PBXTextBookmark */ = 0093D1D309B085CB0046F830 /* PBXTextBookmark */; - 0093D1D409B085CB0046F830 /* PBXTextBookmark */ = 0093D1D409B085CB0046F830 /* PBXTextBookmark */; - 0093D1DA09B086220046F830 /* PBXTextBookmark */ = 0093D1DA09B086220046F830 /* PBXTextBookmark */; - 0093D1DB09B086220046F830 /* PBXTextBookmark */ = 0093D1DB09B086220046F830 /* PBXTextBookmark */; - 0093D1DC09B086220046F830 /* PBXTextBookmark */ = 0093D1DC09B086220046F830 /* PBXTextBookmark */; - 0093D1DD09B086220046F830 /* PBXTextBookmark */ = 0093D1DD09B086220046F830 /* PBXTextBookmark */; - 0093D1DF09B0869B0046F830 /* PBXTextBookmark */ = 0093D1DF09B0869B0046F830 /* PBXTextBookmark */; - 0093D1E209B0872A0046F830 /* PBXTextBookmark */ = 0093D1E209B0872A0046F830 /* PBXTextBookmark */; - 0093D1E309B0879C0046F830 /* PBXTextBookmark */ = 0093D1E309B0879C0046F830 /* PBXTextBookmark */; - 0093D1EA09B0889D0046F830 /* PBXTextBookmark */ = 0093D1EA09B0889D0046F830 /* PBXTextBookmark */; + 0093D18409B0744F0046F830 = 0093D18409B0744F0046F830 /* PBXTextBookmark */; + 0093D18B09B0744F0046F830 = 0093D18B09B0744F0046F830 /* PBXTextBookmark */; + 0093D1CF09B085CB0046F830 = 0093D1CF09B085CB0046F830 /* PBXTextBookmark */; + 0093D1D009B085CB0046F830 = 0093D1D009B085CB0046F830 /* PBXTextBookmark */; + 0093D1D309B085CB0046F830 = 0093D1D309B085CB0046F830 /* PBXTextBookmark */; + 0093D1DA09B086220046F830 = 0093D1DA09B086220046F830 /* PBXTextBookmark */; }; sourceControlManager = 009F5C6006A5C8FF004BB18E /* Source Control */; userBuildSettings = { Modified: KisMACng/KisMAC.xcodeproj/project.pbxproj =================================================================== --- KisMACng/KisMAC.xcodeproj/project.pbxproj 2006-03-06 06:58:16 UTC (rev 98) +++ KisMACng/KisMAC.xcodeproj/project.pbxproj 2006-03-09 20:51:19 UTC (rev 99) @@ -199,6 +199,8 @@ 0035349C06A5DD8500AB4577 /* WayPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = 0035342506A5DD8500AB4577 /* WayPoint.m */; }; 00412E690826587C00E757BC /* viha_load.sh in Resources */ = {isa = PBXBuildFile; fileRef = 00412E680826587C00E757BC /* viha_load.sh */; }; 00412E6A0826587C00E757BC /* viha_load.sh in Resources */ = {isa = PBXBuildFile; fileRef = 00412E680826587C00E757BC /* viha_load.sh */; }; + 0042E7A609C0C8B600183F90 /* world.kismap in Resources */ = {isa = PBXBuildFile; fileRef = 0042E7A209C0C8B600183F90 /* world.kismap */; }; + 0042E7A709C0C8B600183F90 /* world.kismap in Resources */ = {isa = PBXBuildFile; fileRef = 0042E7A209C0C8B600183F90 /* world.kismap */; }; 005B12680730051A00906C36 /* MapControlItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 005B12660730051A00906C36 /* MapControlItem.h */; }; 005B12690730051A00906C36 /* MapControlItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 005B12670730051A00906C36 /* MapControlItem.m */; }; 005E817206FDCFF20016F5E7 /* MapDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 005E817006FDCFF20016F5E7 /* MapDownload.h */; }; @@ -720,6 +722,7 @@ 0035342406A5DD8500AB4577 /* WayPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WayPoint.h; sourceTree = "<group>"; }; 0035342506A5DD8500AB4577 /* WayPoint.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WayPoint.m; sourceTree = "<group>"; }; 00412E680826587C00E757BC /* viha_load.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = viha_load.sh; sourceTree = "<group>"; }; + 0042E7A209C0C8B600183F90 /* world.kismap */ = {isa = PBXFileReference; lastKnownFileType = folder; name = world.kismap; path = Resources/Map/world.kismap; sourceTree = "<group>"; }; 0054920D08E6E4C900307083 /* Spanish */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Spanish; path = Spanish.lproj/Crack.nib; sourceTree = "<group>"; }; 0054920E08E6E4C900307083 /* Spanish */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Spanish; path = Spanish.lproj/CrashReporter.nib; sourceTree = "<group>"; }; 0054920F08E6E4C900307083 /* Spanish */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Spanish; path = Spanish.lproj/DecryptDialog.nib; sourceTree = "<group>"; }; @@ -1365,6 +1368,8 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + 6C03D76F09B547F2005B2316 /* Growl.framework */, + 6CA3BCCA09B2A58F00DCB407 /* Accelerate.framework */, 000D3A3807C731D200485FDD /* UnitKit.framework */, 00F9C64E06DB37E200E357F0 /* Carbon.framework */, 00F9C64F06DB37E200E357F0 /* IOKit.framework */, @@ -1402,8 +1407,6 @@ 29B97314FDCFA39411CA2CEA /* KisMAC */ = { isa = PBXGroup; children = ( - 6C03D76F09B547F2005B2316 /* Growl.framework */, - 6CA3BCCA09B2A58F00DCB407 /* Accelerate.framework */, 00F57CAB06A8887F0035AE2F /* CHANGES */, 00F57CAC06A8887F0035AE2F /* TODO */, 080E96DDFE201D6D7F000001 /* Classes */, @@ -1427,6 +1430,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 0042E7A209C0C8B600183F90 /* world.kismap */, 0073142C06AC4B3C007FD51E /* Drivers */, 0035330306A5DD5700AB4577 /* Buttons */, 0035331206A5DD5700AB4577 /* CachedViews */, @@ -1798,6 +1802,7 @@ 008ACB1807C38ADF00A76ADA /* vendor.db in Resources */, 00A3EB170824E448003CD96A /* AirPortMenu in Resources */, 00412E690826587C00E757BC /* viha_load.sh in Resources */, + 0042E7A709C0C8B600183F90 /* world.kismap in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1901,6 +1906,7 @@ 002F1F17070071F4004F5FEF /* KisMACHelp in Resources */, 00A3EB180824E448003CD96A /* AirPortMenu in Resources */, 00412E6A0826587C00E757BC /* viha_load.sh in Resources */, + 0042E7A609C0C8B600183F90 /* world.kismap in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; Added: KisMACng/Resources/Map/world.kismap/map.jpg =================================================================== (Binary files differ) Property changes on: KisMACng/Resources/Map/world.kismap/map.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: KisMACng/Resources/Map/world.kismap/waypoints.plist =================================================================== --- KisMACng/Resources/Map/world.kismap/waypoints.plist 2006-03-06 06:58:16 UTC (rev 98) +++ KisMACng/Resources/Map/world.kismap/waypoints.plist 2006-03-09 20:51:19 UTC (rev 99) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";> +<plist version="1.0"> +<array> + <dict> + <key>latdir</key> + <string>N</string> + <key>latitude</key> + <real>90</real> + <key>longdir</key> + <string>W</string> + <key>longitude</key> + <real>180</real> + <key>xpoint</key> + <integer>0</integer> + <key>ypoint</key> + <integer>2048</integer> + </dict> + <dict> + <key>latdir</key> + <string>S</string> + <key>latitude</key> + <real>90</real> + <key>longdir</key> + <string>E</string> + <key>longitude</key> + <real>180</real> + <key>xpoint</key> + <integer>4096</integer> + <key>ypoint</key> + <integer>0</integer> + </dict> + <dict> + <key>fileName</key> + <string>map.jpg</string> + </dict> +</array> +</plist> Modified: KisMACng/Sources/Controller/ScanController.m =================================================================== --- KisMACng/Sources/Controller/ScanController.m 2006-03-06 06:58:16 UTC (rev 98) +++ KisMACng/Sources/Controller/ScanController.m 2006-03-09 20:51:19 UTC (rev 99) @@ -34,6 +34,7 @@ #import "../WaveDrivers/WaveDriver.h" #import "ScriptController.h" #import "SpinChannel.h" +#import "MapView.h" #import <sys/sysctl.h> #import <BIGeneric/BIGeneric.h> #import <BIGL/BIGL.h> Modified: KisMACng/Sources/Views/MapView.m =================================================================== --- KisMACng/Sources/Views/MapView.m 2006-03-06 06:58:16 UTC (rev 98) +++ KisMACng/Sources/Views/MapView.m 2006-03-09 20:51:19 UTC (rev 99) @@ -37,6 +37,8 @@ #import "WayPoint.h" #import "Trace.h" +#define ZOOMFACT 1.5 + @implementation MapView - (void)awakeFromNib { @@ -79,6 +81,11 @@ [self setNeedsDisplay:YES]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateGPSStatus:) name:KisMACGPSStatusChanged object:nil]; + + [self loadFromFile:[[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/world.kismap"]]; + _zoomFact = 1.0 / (ZOOMFACT * ZOOMFACT * ZOOMFACT * ZOOMFACT); + [self _alignNetworks]; + [self setNeedsDisplay:YES]; } #pragma mark - @@ -138,27 +145,11 @@ NSDictionary *wp; int i; NSData* data; - NSImage* img; + NSDictionary* settings; + NSImage* img = Nil; waypoint wpoint; - NS_DURING - img = [[NSImage alloc] initWithContentsOfFile:[mapName stringByAppendingPathComponent:@"map.pdf"]]; - if (!img) { - //fall back - img = [[NSImage alloc] initWithContentsOfFile:[mapName stringByAppendingPathComponent:@"map.png"]]; - if (!img) { - NSLog(@"Invalid KisMAP file"); - NS_VALUERETURN(NO, BOOL); - } - } - [self setMap:img]; - [img release]; - NS_HANDLER - NSLog(@"Could not open Image file from KisMAP bundle!"); - return NO; - NS_ENDHANDLER - - NS_DURING + NS_DURING data = [NSData dataWithContentsOfFile:[mapName stringByAppendingPathComponent:@"waypoints.plist"]]; wps = [NSPropertyListSerialization propertyListFromData:data mutabilityOption:NSPropertyListImmutable format:NULL errorDescription:&error]; NS_HANDLER @@ -171,6 +162,29 @@ return NO; } + NS_DURING + settings = [wps objectAtIndex:2]; + if ([settings objectForKey:@"fileName"]) { + img = [[NSImage alloc] initWithContentsOfFile:[mapName stringByAppendingPathComponent:[[wps objectAtIndex:2] objectForKey:@"fileName"]]]; + } + if (!img) { + img = [[NSImage alloc] initWithContentsOfFile:[mapName stringByAppendingPathComponent:@"map.pdf"]]; + } + if (!img) { + //fall back + img = [[NSImage alloc] initWithContentsOfFile:[mapName stringByAppendingPathComponent:@"map.png"]]; + } + if (!img) { + NSLog(@"Invalid KisMAP file"); + NS_VALUERETURN(NO, BOOL); + } + [self setMap:img]; + [img release]; + NS_HANDLER + NSLog(@"Could not open Image file from KisMAP bundle!"); + return NO; + NS_ENDHANDLER + for (i=1;i<=2;i++) { wp = [wps objectAtIndex:i-1]; @@ -467,8 +481,6 @@ } } -#define ZOOMFACT 1.5 - - (IBAction)zoomIn:(id)sender { if (_zoomFact > 20) { NSBeep();