[kismac] [binaervarianz] r149 - in trunk: . Resources/Generic Resources/Nibs/English.lproj/MainMenu.nib Sources/Controller Sources/ScriptingCore

  • From: svn@xxxxxxxxxxxxxxxx
  • To: kismac@xxxxxxxxxxxxx
  • Date: Tue, 23 May 2006 06:29:56 +0200

Author: gkruse
Date: 2006-05-23 06:29:56 +0200 (Tue, 23 May 2006)
New Revision: 149

Modified:
   trunk/CHANGES
   trunk/Resources/Generic/KisMAC.scriptSuite
   trunk/Resources/Generic/KisMAC.scriptTerminology
   trunk/Resources/Nibs/English.lproj/MainMenu.nib/classes.nib
   trunk/Resources/Nibs/English.lproj/MainMenu.nib/data.dependency
   trunk/Resources/Nibs/English.lproj/MainMenu.nib/info.nib
   trunk/Resources/Nibs/English.lproj/MainMenu.nib/keyedobjects.nib
   trunk/Sources/Controller/ScanController.h
   trunk/Sources/Controller/ScanControllerMenus.m
   trunk/Sources/Controller/ScanControllerScriptable.h
   trunk/Sources/Controller/ScanControllerScriptable.m
   trunk/Sources/ScriptingCore/ScriptAdditions.h
   trunk/Sources/ScriptingCore/ScriptAdditions.m
Log:
Add Apple Script support for ExportKML


Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES       2006-05-06 08:13:43 UTC (rev 148)
+++ trunk/CHANGES       2006-05-23 04:29:56 UTC (rev 149)
@@ -1,3 +1,5 @@
+R149: - added export KML to script library to support "Realtime" export of kml
+
 R147: - added prompt to enable persistent support for Airport Extreme passive. 
 User still has full control, but suitable warnings now accompany attempts to 
use AE passive without persistent support.
 
 R146: - themacuser's patch to remove the "airport" tool from Airport Extreme 
passive mode channel switching.  Large improvement in overall CPU load.

Modified: trunk/Resources/Generic/KisMAC.scriptSuite
===================================================================
--- trunk/Resources/Generic/KisMAC.scriptSuite  2006-05-06 08:13:43 UTC (rev 
148)
+++ trunk/Resources/Generic/KisMAC.scriptSuite  2006-05-23 04:29:56 UTC (rev 
149)
@@ -17,6 +17,7 @@
                 "KisMAC.ImportKisMAC"           = "importKisMAC:";
                 "KisMAC.ImportImageForMap"      = "importImageForMap:";
                 "KisMAC.ImportPCAP"             = "importPCAP:";
+                "KisMAC.ExportKML"             = "exportKML:";
                 "NSCoreSuite.Save"              = "save:";
                 "KisMAC.saveAs"                 = "saveAs:";
                 "KisMAC.SelectNetworkAtIndex"   = "selectNetworkAtIndex:";
@@ -90,6 +91,11 @@
             CommandClass = NSScriptCommand;
             UnnamedArgument = { Optional = NO; Type = "NSString<FilePath>"; };
         }; 
+        ExportKML = {
+            AppleEventCode = KKML; 
+            CommandClass = NSScriptCommand;
+            UnnamedArgument = { Optional = NO; Type = "NSString<FilePath>"; };
+        }; 
         DownloadMap = {
             AppleEventCode = KDMp;
             CommandClass = NSScriptCommand;

Modified: trunk/Resources/Generic/KisMAC.scriptTerminology
===================================================================
--- trunk/Resources/Generic/KisMAC.scriptTerminology    2006-05-06 08:13:43 UTC 
(rev 148)
+++ trunk/Resources/Generic/KisMAC.scriptTerminology    2006-05-23 04:29:56 UTC 
(rev 149)
@@ -54,6 +54,11 @@
             Description = "imports a PCAP file, with 802.11 packets and 
without prism headers";
             UnnamedArgument = { Description = "The file to be imported."; };
         };
+        ExportKML = {
+            Name = exportKML;
+            Description = "exports a Google Earth KML file";
+            UnnamedArgument = { Description = "The file to be exported."; };
+        };
         DownloadMap = {
             Name = downloadMapFrom;
             Description = "imports a map for a specific coordinate from some 
server";

Modified: trunk/Resources/Nibs/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Resources/Nibs/English.lproj/MainMenu.nib/classes.nib 2006-05-06 
08:13:43 UTC (rev 148)
+++ trunk/Resources/Nibs/English.lproj/MainMenu.nib/classes.nib 2006-05-23 
04:29:56 UTC (rev 149)
@@ -106,6 +106,7 @@
                 authFloodNetwork = id; 
                 changeSearchType = id; 
                 changeSearchValue = id; 
+                checkFilter = id; 
                 clearNetwork = id; 
                 closeActiveWindow = id; 
                 deautheticateAllNetworks = id; 
@@ -116,7 +117,7 @@
                 debugTestWPAHashingFunction = id; 
                 decryptPCAPFile = id; 
                 exportJPEG = id; 
-                exportKML = id; 
+                exportKMLFile = id; 
                 exportMacstumbler = id; 
                 exportNS = id; 
                 exportPDF = id; 
@@ -128,14 +129,12 @@
                 injectPackets = id; 
                 joinNetwork = id; 
                 openDonateURL = id; 
-                openPCAPInEthereal = id; 
                 openWebsiteURL = id; 
                 restartGPS = id; 
                 selChannel = id; 
                 selChannelRange = id; 
                 setAutoAdjustTimer = id; 
                 showAllNetArea = id; 
-                showClient = id; 
                 showContextHelp = id; 
                 showCurNetArea = id; 
                 showInfo = id; 
@@ -165,7 +164,7 @@
                 "_networksButton" = NSButton; 
                 "_scanButton" = AMRollOverButton; 
                 "_searchField" = NSSearchField; 
-                "_searchTypeMenu" = id; 
+                "_searchTypeMenu" = NSPopUpButton; 
                 "_showAllNetsInMap" = NSMenuItem; 
                 "_showDetails" = NSMenuItem; 
                 "_showHierarch" = NSMenuItem; 
@@ -186,12 +185,12 @@
                 aChannelMenu = NSMenu; 
                 aCrackMenu = NSMenu; 
                 aDetailsTable = ColoredRowTableView; 
+                aGrowlController = GrowlController; 
                 aInfoController = InfoController; 
                 aInjPacketsMenu = NSMenuItem; 
                 aNetworkMenu = NSMenu; 
                 aOutView = NSOutlineView; 
                 detailsView = NSView; 
-                myOutlet = id; 
                 prefsController = PrefsController; 
                 prefsWindow = NSWindow; 
                 scanner = WaveScanner; 

Modified: trunk/Resources/Nibs/English.lproj/MainMenu.nib/data.dependency
===================================================================
--- trunk/Resources/Nibs/English.lproj/MainMenu.nib/data.dependency     
2006-05-06 08:13:43 UTC (rev 148)
+++ trunk/Resources/Nibs/English.lproj/MainMenu.nib/data.dependency     
2006-05-23 04:29:56 UTC (rev 149)
@@ -4,8 +4,8 @@
 <dict>
        <key>IBPaletteDependency</key>
        <array>
+               <string>ASKPalette</string>
                <string>RollOverButtonPalette</string>
-               <string>ASKPalette</string>
        </array>
 </dict>
 </plist>

Modified: trunk/Resources/Nibs/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Resources/Nibs/English.lproj/MainMenu.nib/info.nib    2006-05-06 
08:13:43 UTC (rev 148)
+++ trunk/Resources/Nibs/English.lproj/MainMenu.nib/info.nib    2006-05-23 
04:29:56 UTC (rev 149)
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>49 125 612 460 0 0 1024 746 </string>
+       <string>230 99 612 460 0 0 1280 832 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1199</key>
-               <string>274 344 732 449 0 0 1280 832 </string>
+               <string>274 331 732 449 0 0 1280 832 </string>
                <key>1200</key>
                <string>274 344 731 449 0 0 1280 832 </string>
                <key>1201</key>
@@ -19,7 +19,7 @@
                <key>1446</key>
                <string>655 569 185 263 0 0 1280 832 </string>
                <key>29</key>
-               <string>90 690 530 44 0 0 1280 832 </string>
+               <string>180 788 530 44 0 0 1280 832 </string>
                <key>501</key>
                <string>521 414 237 309 0 0 1280 832 </string>
                <key>719</key>

Modified: trunk/Resources/Nibs/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/Sources/Controller/ScanController.h
===================================================================
--- trunk/Sources/Controller/ScanController.h   2006-05-06 08:13:43 UTC (rev 
148)
+++ trunk/Sources/Controller/ScanController.h   2006-05-23 04:29:56 UTC (rev 
149)
@@ -169,6 +169,7 @@
 - (IBAction)importMapFromServer:(id)sender;
 
 - (IBAction)exportNS:(id)sender;
+- (IBAction)exportKMLFile:(id)sender;
 - (IBAction)exportWarD:(id)sender;
 - (IBAction)exportMacstumbler:(id)sender;
 - (IBAction)exportToServer:(id)sender;

Modified: trunk/Sources/Controller/ScanControllerMenus.m
===================================================================
--- trunk/Sources/Controller/ScanControllerMenus.m      2006-05-06 08:13:43 UTC 
(rev 148)
+++ trunk/Sources/Controller/ScanControllerMenus.m      2006-05-23 04:29:56 UTC 
(rev 149)
@@ -123,7 +123,14 @@
        [[WaveHelper scanController] changeSearchValue:self];
 }
 
-- (IBAction)exportKML:(id)sender {
+- (void)performExportKML:(id)filename {
+    [_importController setTitle:[NSString 
stringWithFormat:NSLocalizedString(@"Exporting to %@...", "Status for busy 
dialog"), filename]];  
+
+    if (![WaveStorageController exportKMLToFile:filename 
withContainer:_container andImportController:_importController]) _asyncFailure 
= YES;
+    else _asyncFailure = NO;
+}
+
+- (IBAction)exportKMLFile:(id)sender {
     NSSavePanel *aSP;
     aSP=[NSSavePanel savePanel];
     [aSP setRequiredFileType:@"kml"];
@@ -131,16 +138,10 @@
     [aSP setTreatsFilePackagesAsDirectories:NO];
     if ([aSP runModal]==NSFileHandlingPanelOKButton) {
         [self showBusy:@selector(performExportKML:) withArg:[aSP filename]];
-        if (_asyncFailure) [self showExportFailureDialog];
+        [self performExportKML: [aSP filename]];
     }
 }
-- (void)performExportKML:(id)filename {
-    [_importController setTitle:[NSString 
stringWithFormat:NSLocalizedString(@"Exporting to %@...", "Status for busy 
dialog"), filename]];  
 
-    if (![WaveStorageController exportKMLToFile:filename 
withContainer:_container andImportController:_importController]) _asyncFailure 
= YES;
-    else _asyncFailure = NO;
-}
-
 - (IBAction)exportWarD:(id)sender {
     NSSavePanel *aSP;
     

Modified: trunk/Sources/Controller/ScanControllerScriptable.h
===================================================================
--- trunk/Sources/Controller/ScanControllerScriptable.h 2006-05-06 08:13:43 UTC 
(rev 148)
+++ trunk/Sources/Controller/ScanControllerScriptable.h 2006-05-23 04:29:56 UTC 
(rev 149)
@@ -46,6 +46,7 @@
 - (BOOL)importKisMAC:(NSString*)filename;
 - (BOOL)importImageForMap:(NSString*)filename;
 - (BOOL)importPCAP:(NSString*)filename;
+- (BOOL)exportKML:(NSString*)filename;
 - (BOOL)downloadMapFrom:(NSString*)server forPoint:(waypoint)w 
resolution:(NSSize)size zoomLevel:(int)zoom;
 - (BOOL)save:(NSString*)filename;
 - (BOOL)saveAs:(NSString*)filename;

Modified: trunk/Sources/Controller/ScanControllerScriptable.m
===================================================================
--- trunk/Sources/Controller/ScanControllerScriptable.m 2006-05-06 08:13:43 UTC 
(rev 148)
+++ trunk/Sources/Controller/ScanControllerScriptable.m 2006-05-23 04:29:56 UTC 
(rev 149)
@@ -266,6 +266,12 @@
     return NO;
 }
 
+- (BOOL)exportKML:(NSString*)filename {
+    [self showBusy:@selector(performExportKML:) withArg:filename];
+    if (_asyncFailure) [self showExportFailureDialog];
+    return !_asyncFailure;
+}
+
 - (BOOL)downloadMapFrom:(NSString*)server forPoint:(waypoint)w 
resolution:(NSSize)size zoomLevel:(int)zoom {
     NSImage *map;
     MapDownload *md;

Modified: trunk/Sources/ScriptingCore/ScriptAdditions.h
===================================================================
--- trunk/Sources/ScriptingCore/ScriptAdditions.h       2006-05-06 08:13:43 UTC 
(rev 148)
+++ trunk/Sources/ScriptingCore/ScriptAdditions.h       2006-05-23 04:29:56 UTC 
(rev 149)
@@ -42,6 +42,7 @@
 - (id)importKisMAC:(NSScriptCommand *)command;
 - (id)importImageForMap:(NSScriptCommand *)command;
 - (id)importPCAP:(NSScriptCommand *)command;
+- (id)exportKML:(NSScriptCommand *)command;
 - (id)downloadMap:(NSScriptCommand*)command;
 
 - (id)selectNetworkAtIndex:(NSScriptCommand *)command;

Modified: trunk/Sources/ScriptingCore/ScriptAdditions.m
===================================================================
--- trunk/Sources/ScriptingCore/ScriptAdditions.m       2006-05-06 08:13:43 UTC 
(rev 148)
+++ trunk/Sources/ScriptingCore/ScriptAdditions.m       2006-05-23 04:29:56 UTC 
(rev 149)
@@ -76,7 +76,11 @@
 - (id)importPCAP:(NSScriptCommand *)command {
     return [NSNumber numberWithBool:[(ScanController*)[NSApp delegate] 
importPCAP:[command directParameter]]];
 }
+- (id)exportKML:(NSScriptCommand *)command {
+    return [NSNumber numberWithBool:[(ScanController*)[NSApp delegate] 
exportKML:[command directParameter]]];
+}
 
+
 - (id)downloadMap:(NSScriptCommand*)command {
     NSDictionary *args = [command arguments];
     NSSize size;


Other related posts: