[kismac] [binaervarianz] r105 - in KisMACng: KisMAC.xcodeproj Sources/Controller Sources/ScriptingCore Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj

  • From: svn@xxxxxxxxxxxxxxxx
  • To: kismac@xxxxxxxxxxxxx
  • Date: Tue, 14 Mar 2006 21:56:50 +0100

Author: mick
Date: 2006-03-14 21:56:49 +0100 (Tue, 14 Mar 2006)
New Revision: 105

Modified:
   KisMACng/KisMAC.xcodeproj/mick.mode1
   KisMACng/KisMAC.xcodeproj/mick.pbxuser
   KisMACng/Sources/Controller/ScanController.m
   KisMACng/Sources/Controller/ScanControllerMenus.m
   KisMACng/Sources/Controller/ScanControllerPrivate.m
   KisMACng/Sources/ScriptingCore/ScriptController.m
   KisMACng/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.mode1
   KisMACng/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.pbxuser
   KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj/project.pbxproj
Log:
fixed #23 - thanks for report



Modified: KisMACng/KisMAC.xcodeproj/mick.mode1
===================================================================
--- KisMACng/KisMAC.xcodeproj/mick.mode1        2006-03-14 19:04:50 UTC (rev 
104)
+++ KisMACng/KisMAC.xcodeproj/mick.mode1        2006-03-14 20:56:49 UTC (rev 
105)
@@ -266,14 +266,14 @@
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-                                                                       
<integer>19</integer>
+                                                                       
<integer>10</integer>
                                                                        
<integer>6</integer>
                                                                        
<integer>3</integer>
                                                                        
<integer>0</integer>
                                                                </array>
                                                        </array>
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-                                                       <string>{{0, 322}, 
{279, 681}}</string>
+                                                       <string>{{0, 0}, {279, 
681}}</string>
                                                </dict>
                                                <key>PBXTopSmartGroupGIDs</key>
                                                <array/>
@@ -312,7 +312,7 @@
                                                                
<key>PBXProjectModuleGUID</key>
                                                                
<string>1CE0B20306471E060097A5F4</string>
                                                                
<key>PBXProjectModuleLabel</key>
-                                                               
<string>GrowlController.m</string>
+                                                               
<string>ScanController.m</string>
                                                                
<key>PBXSplitModuleInNavigatorKey</key>
                                                                <dict>
                                                                        
<key>Split0</key>
@@ -320,54 +320,47 @@
                                                                                
<key>PBXProjectModuleGUID</key>
                                                                                
<string>1CE0B20406471E060097A5F4</string>
                                                                                
<key>PBXProjectModuleLabel</key>
-                                                                               
<string>GrowlController.m</string>
+                                                                               
<string>ScanController.m</string>
                                                                                
<key>_historyCapacity</key>
                                                                                
<integer>20</integer>
                                                                                
<key>bookmark</key>
-                                                                               
<string>00D566B109C74A0700FB787B</string>
+                                                                               
<string>00D5674309C764FE00FB787B</string>
                                                                                
<key>history</key>
                                                                                
<array>
-                                                                               
        <string>00D5633809C47AA400FB787B</string>
                                                                                
        <string>00D5633909C47AA400FB787B</string>
                                                                                
        <string>00D5633A09C47AA400FB787B</string>
-                                                                               
        <string>00D5638009C4834000FB787B</string>
-                                                                               
        <string>00D5638109C4834000FB787B</string>
-                                                                               
        <string>00D5638209C4834000FB787B</string>
                                                                                
        <string>00D5638309C4834000FB787B</string>
                                                                                
        <string>00D5638409C4834000FB787B</string>
                                                                                
        <string>00D5638509C4834000FB787B</string>
                                                                                
        <string>00D563DD09C4948100FB787B</string>
-                                                                               
        <string>00D5662409C733D800FB787B</string>
-                                                                               
        <string>00D5662C09C7343700FB787B</string>
                                                                                
        <string>00D5662D09C7343700FB787B</string>
                                                                                
        <string>00D5663B09C734DD00FB787B</string>
                                                                                
        <string>00D5668209C73C9000FB787B</string>
                                                                                
        <string>00D566A809C74A0700FB787B</string>
                                                                                
        <string>00D566A909C74A0700FB787B</string>
                                                                                
        <string>00D566AA09C74A0700FB787B</string>
-                                                                               
        <string>00D566AB09C74A0700FB787B</string>
-                                                                               
        <string>00D566AC09C74A0700FB787B</string>
+                                                                               
        <string>00D566C609C75C0100FB787B</string>
+                                                                               
        <string>00D566E709C760DE00FB787B</string>
+                                                                               
        <string>00D5671E09C7633600FB787B</string>
+                                                                               
        <string>00D5673909C764FE00FB787B</string>
+                                                                               
        <string>00D5673A09C764FE00FB787B</string>
+                                                                               
        <string>00D5673B09C764FE00FB787B</string>
+                                                                               
        <string>00D5673C09C764FE00FB787B</string>
+                                                                               
        <string>00D5673D09C764FE00FB787B</string>
                                                                                
</array>
                                                                                
<key>prevStack</key>
                                                                                
<array>
-                                                                               
        <string>001F527E0997D8BD00ED11F1</string>
                                                                                
        <string>0076353C09A26CAC002A5BEF</string>
-                                                                               
        <string>0076355709A26CAC002A5BEF</string>
                                                                                
        <string>00D5630509C44A4800FB787B</string>
                                                                                
        <string>00D5630809C44A4800FB787B</string>
-                                                                               
        <string>00D5634109C47AA400FB787B</string>
                                                                                
        <string>00D5634209C47AA400FB787B</string>
                                                                                
        <string>00D5634309C47AA400FB787B</string>
-                                                                               
        <string>00D5634409C47AA400FB787B</string>
                                                                                
        <string>00D5634A09C47AA400FB787B</string>
-                                                                               
        <string>00D5639009C4834000FB787B</string>
                                                                                
        <string>00D5639109C4834000FB787B</string>
                                                                                
        <string>00D5639209C4834000FB787B</string>
                                                                                
        <string>00D5639609C4834000FB787B</string>
                                                                                
        <string>00D5639A09C4834000FB787B</string>
                                                                                
        <string>00D563DF09C4948100FB787B</string>
-                                                                               
        <string>00D5662509C733D800FB787B</string>
-                                                                               
        <string>00D5662F09C7343700FB787B</string>
                                                                                
        <string>00D5663009C7343700FB787B</string>
                                                                                
        <string>00D5663D09C734DD00FB787B</string>
                                                                                
        <string>00D5663E09C734DD00FB787B</string>
@@ -378,7 +371,19 @@
                                                                                
        <string>00D566AD09C74A0700FB787B</string>
                                                                                
        <string>00D566AE09C74A0700FB787B</string>
                                                                                
        <string>00D566AF09C74A0700FB787B</string>
-                                                                               
        <string>00D566B009C74A0700FB787B</string>
+                                                                               
        <string>00D566C809C75C0100FB787B</string>
+                                                                               
        <string>00D566EB09C760DE00FB787B</string>
+                                                                               
        <string>00D566ED09C760DE00FB787B</string>
+                                                                               
        <string>00D566EE09C760DE00FB787B</string>
+                                                                               
        <string>00D5670D09C7628E00FB787B</string>
+                                                                               
        <string>00D5672009C7633600FB787B</string>
+                                                                               
        <string>00D5672109C7633600FB787B</string>
+                                                                               
        <string>00D5672309C7633600FB787B</string>
+                                                                               
        <string>00D5673E09C764FE00FB787B</string>
+                                                                               
        <string>00D5673F09C764FE00FB787B</string>
+                                                                               
        <string>00D5674009C764FE00FB787B</string>
+                                                                               
        <string>00D5674109C764FE00FB787B</string>
+                                                                               
        <string>00D5674209C764FE00FB787B</string>
                                                                                
</array>
                                                                        </dict>
                                                                        
<key>SplitCount</key>
@@ -574,8 +579,8 @@
        <array>
                <string>00A3E66608242A87003CD96A</string>
                <string>1C530D57069F1CE1000CFCEE</string>
+               <string>/Users/mick/openDev/KisMACng/KisMAC.xcodeproj</string>
                <string>1C0AD2B3069F1EA900FABCE6</string>
-               <string>/Users/mick/openDev/KisMACng/KisMAC.xcodeproj</string>
        </array>
        <key>WindowString</key>
        <string>-4 92 1280 740 0 0 1280 832 </string>
@@ -806,7 +811,7 @@
                                                                                
<key>PBXProjectModuleGUID</key>
                                                                                
<string>1CDD528C0622207200134675</string>
                                                                                
<key>PBXProjectModuleLabel</key>
-                                                                               
<string>ScanControllerMenus.m</string>
+                                                                               
<string>ScanControllerPrivate.m</string>
                                                                                
<key>StatusBarVisibility</key>
                                                                                
<true/>
                                                                        </dict>
@@ -872,7 +877,7 @@
                        <key>WindowToolGUID</key>
                        <string>1C530D57069F1CE1000CFCEE</string>
                        <key>WindowToolIsVisible</key>
-                       <true/>
+                       <false/>
                </dict>
                <dict>
                        <key>Identifier</key>

Modified: KisMACng/KisMAC.xcodeproj/mick.pbxuser
===================================================================
--- KisMACng/KisMAC.xcodeproj/mick.pbxuser      2006-03-14 19:04:50 UTC (rev 
104)
+++ KisMACng/KisMAC.xcodeproj/mick.pbxuser      2006-03-14 20:56:49 UTC (rev 
105)
@@ -358,24 +358,24 @@
        003533A906A5DD8500AB4577 /* ScanController.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {932, 2814}}";
-                       sepNavSelRange = "{2527, 12}";
-                       sepNavVisRect = "{{0, 616}, {932, 662}}";
+                       sepNavSelRange = "{2761, 44}";
+                       sepNavVisRect = "{{0, 794}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
        003533AA06A5DD8500AB4577 /* ScanController.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1430, 8484}}";
-                       sepNavSelRange = "{8027, 10}";
-                       sepNavVisRect = "{{0, 7822}, {932, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1430, 8512}}";
+                       sepNavSelRange = "{21767, 20}";
+                       sepNavVisRect = "{{0, 7754}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 54}, {1172, 773}}";
                };
        };
        003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1430, 10920}}";
-                       sepNavSelRange = "{13412, 14}";
-                       sepNavVisRect = "{{0, 5111}, {734, 180}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1430, 10948}}";
+                       sepNavSelRange = "{20233, 11}";
+                       sepNavVisRect = "{{0, 7656}, {932, 662}}";
                        sepNavWindowFrame = "{{107, 185}, {750, 558}}";
                };
        };
@@ -388,9 +388,9 @@
        };
        003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1976, 7924}}";
-                       sepNavSelRange = "{2432, 0}";
-                       sepNavVisRect = "{{0, 912}, {734, 180}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1976, 8022}}";
+                       sepNavSelRange = "{19269, 8}";
+                       sepNavVisRect = "{{0, 6436}, {705, 666}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
@@ -405,7 +405,7 @@
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1064, 7616}}";
                        sepNavSelRange = "{5097, 36}";
-                       sepNavVisRect = "{{0, 1958}, {932, 662}}";
+                       sepNavVisRect = "{{0, 1970}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
@@ -524,9 +524,10 @@
        };
        003533C406A5DD8500AB4577 /* WaveScanner.mm */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {968, 10920}}";
-                       sepNavSelRange = "{7595, 0}";
-                       sepNavVisRect = "{{0, 2698}, {933, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {968, 10934}}";
+                       sepNavSelRange = "{17458, 0}";
+                       sepNavVisRect = "{{0, 7613}, {900, 636}}";
+                       sepNavWindowFrame = "{{15, 62}, {945, 765}}";
                };
        };
        003533C606A5DD8500AB4577 /* LEAP.m */ = {
@@ -842,8 +843,8 @@
        003533F806A5DD8500AB4577 /* ScriptController.m */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1190, 5264}}";
-                       sepNavSelRange = "{11670, 0}";
-                       sepNavVisRect = "{{0, 4578}, {932, 662}}";
+                       sepNavSelRange = "{1578, 0}";
+                       sepNavVisRect = "{{0, 522}, {705, 429}}";
                        sepNavWindowFrame = "{{61, 227}, {750, 558}}";
                };
        };
@@ -1234,7 +1235,7 @@
                fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
                name = "ScanControllerPrivate.m: 252";
                rLen = 0;
-               rLoc = 9393;
+               rLoc = 9442;
                rType = 0;
                vrLen = 1562;
                vrLoc = 0;
@@ -1274,7 +1275,7 @@
                fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
                name = "Menu.nib!\")]";
                rLen = 12;
-               rLoc = 16168;
+               rLoc = 16267;
                rType = 0;
                vrLen = 1409;
                vrLoc = 15247;
@@ -1294,7 +1295,7 @@
                fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */;
                name = "ScriptController.m: 352";
                rLen = 0;
-               rLoc = 11918;
+               rLoc = 11915;
                rType = 0;
                vrLen = 1626;
                vrLoc = 10722;
@@ -1609,7 +1610,7 @@
                fRef = 003533F806A5DD8500AB4577 /* ScriptController.m */;
                name = "ScriptController.m: 348";
                rLen = 0;
-               rLoc = 11670;
+               rLoc = 11667;
                rType = 0;
                vrLen = 1379;
                vrLoc = 11040;
@@ -4192,6 +4193,510 @@
                vrLen = 2128;
                vrLoc = 2408;
        };
+       00D566C509C75BFE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = driverWithName;
+               rLen = 14;
+               rLoc = 13412;
+               rType = 0;
+               vrLen = 473;
+               vrLoc = 13275;
+       };
+       00D566C609C75C0100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 119";
+               rLen = 0;
+               rLoc = 4496;
+               rType = 0;
+               vrLen = 2037;
+               vrLoc = 2499;
+       };
+       00D566C709C75C0100FB787B /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00D566B209C74A8200FB787B /* growl-leap.png */;
+       };
+       00D566C809C75C0100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 119";
+               rLen = 0;
+               rLoc = 4496;
+               rType = 0;
+               vrLen = 2037;
+               vrLoc = 2499;
+       };
+       00D566C909C75C0100FB787B /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00D566B209C74A8200FB787B /* growl-leap.png */;
+       };
+       00D566E709C760DE00FB787B /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00D566B209C74A8200FB787B /* growl-leap.png */;
+       };
+       00D566E809C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m 
*/;
+               name = "[_mappingView loadFromFile:filename]";
+               rLen = 36;
+               rLoc = 5097;
+               rType = 0;
+               vrLen = 1561;
+               vrLoc = 3843;
+       };
+       00D566E909C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = whichDriver;
+               rLen = 11;
+               rLoc = 2277;
+               rType = 0;
+               vrLen = 1789;
+               vrLoc = 1487;
+       };
+       00D566EA09C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = startCrackDialogWithTitle;
+               rLen = 25;
+               rLoc = 18765;
+               rType = 0;
+               vrLen = 1892;
+               vrLoc = 17120;
+       };
+       00D566EB09C760DE00FB787B /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00D566B209C74A8200FB787B /* growl-leap.png */;
+       };
+       00D566EC09C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "ScanControllerMenus.m: 558";
+               rLen = 0;
+               rLoc = 19888;
+               rType = 0;
+               vrLen = 1638;
+               vrLoc = 18875;
+       };
+       00D566ED09C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m 
*/;
+               name = "[_mappingView loadFromFile:filename]";
+               rLen = 36;
+               rLoc = 5097;
+               rType = 0;
+               vrLen = 1561;
+               vrLoc = 3843;
+       };
+       00D566EE09C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = whichDriver;
+               rLen = 11;
+               rLoc = 2277;
+               rType = 0;
+               vrLen = 1789;
+               vrLoc = 1487;
+       };
+       00D566EF09C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = startCrackDialogWithTitle;
+               rLen = 25;
+               rLoc = 18765;
+               rType = 0;
+               vrLen = 1858;
+               vrLoc = 17120;
+       };
+       00D566F209C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               rLen = 1;
+               rLoc = 123;
+               rType = 1;
+       };
+       00D566F309C760DE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = endSheet;
+               rLen = 8;
+               rLoc = 19269;
+               rType = 0;
+               vrLen = 1543;
+               vrLoc = 17971;
+       };
+       00D566F809C7619F00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = driverWithName;
+               rLen = 14;
+               rLoc = 13412;
+               rType = 0;
+               vrLen = 473;
+               vrLoc = 13275;
+       };
+       00D5670309C7628800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "ScanControllerMenus.m: 612";
+               rLen = 0;
+               rLoc = 21711;
+               rType = 0;
+               vrLen = 342;
+               vrLoc = 21500;
+       };
+       00D5670409C7628800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               rLen = 13;
+               rLoc = 17920;
+               rType = 0;
+       };
+       00D5670509C7628800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "_importOpen--";
+               rLen = 13;
+               rLoc = 21659;
+               rType = 0;
+               vrLen = 341;
+               vrLoc = 21501;
+       };
+       00D5670609C7628800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "_importOpen--";
+               rLen = 13;
+               rLoc = 9339;
+               rType = 0;
+               vrLen = 307;
+               vrLoc = 9211;
+       };
+       00D5670709C7628800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "ScanControllerMenus.m: 612";
+               rLen = 0;
+               rLoc = 21711;
+               rType = 0;
+               vrLen = 342;
+               vrLoc = 21500;
+       };
+       00D5670809C7628800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 460";
+               rLen = 0;
+               rLoc = 18014;
+               rType = 0;
+               vrLen = 568;
+               vrLoc = 17624;
+       };
+       00D5670A09C7628E00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "_importOpen--";
+               rLen = 13;
+               rLoc = 20233;
+               rType = 0;
+               vrLen = 1731;
+               vrLoc = 19421;
+       };
+       00D5670B09C7628E00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = "ScanController.m: 576";
+               rLen = 0;
+               rLoc = 22067;
+               rType = 0;
+               vrLen = 1494;
+               vrLoc = 21481;
+       };
+       00D5670C09C7628E00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 457";
+               rLen = 0;
+               rLoc = 17912;
+               rType = 0;
+               vrLen = 1463;
+               vrLoc = 16684;
+       };
+       00D5670D09C7628E00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "_importOpen--";
+               rLen = 13;
+               rLoc = 20233;
+               rType = 0;
+               vrLen = 1731;
+               vrLoc = 19421;
+       };
+       00D5670E09C7628E00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = "ScanController.m: 576";
+               rLen = 0;
+               rLoc = 22067;
+               rType = 0;
+               vrLen = 1494;
+               vrLoc = 21481;
+       };
+       00D5670F09C7628E00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "_importOpen--";
+               rLen = 13;
+               rLoc = 9339;
+               rType = 0;
+               vrLen = 2298;
+               vrLoc = 8575;
+       };
+       00D5671009C7628E00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = endSheet;
+               rLen = 8;
+               rLoc = 19269;
+               rType = 0;
+               vrLen = 1522;
+               vrLoc = 18014;
+       };
+       00D5671109C762DA00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 460";
+               rLen = 0;
+               rLoc = 18014;
+               rType = 0;
+               vrLen = 568;
+               vrLoc = 17624;
+       };
+       00D5671C09C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _importOpen;
+               rLen = 11;
+               rLoc = 20233;
+               rType = 0;
+               vrLen = 1742;
+               vrLoc = 19421;
+       };
+       00D5671D09C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = _importOpen;
+               rLen = 11;
+               rLoc = 4907;
+               rType = 0;
+               vrLen = 1487;
+               vrLoc = 4119;
+       };
+       00D5671E09C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */;
+               name = "ScanControllerPrivate.h: menuSetEnabled:menu:";
+               rLen = 0;
+               rLoc = 1149;
+               rType = 0;
+               vrLen = 1594;
+               vrLoc = 0;
+       };
+       00D5671F09C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "_importOpen--";
+               rLen = 13;
+               rLoc = 9339;
+               rType = 0;
+               vrLen = 2298;
+               vrLoc = 8575;
+       };
+       00D5672009C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "_importOpen--";
+               rLen = 13;
+               rLoc = 9339;
+               rType = 0;
+               vrLen = 2298;
+               vrLoc = 8575;
+       };
+       00D5672109C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _importOpen;
+               rLen = 11;
+               rLoc = 20233;
+               rType = 0;
+               vrLen = 1742;
+               vrLoc = 19421;
+       };
+       00D5672209C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = _importOpen;
+               rLen = 11;
+               rLoc = 4907;
+               rType = 0;
+               vrLen = 1487;
+               vrLoc = 4119;
+       };
+       00D5672309C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */;
+               name = "ScanControllerPrivate.h: menuSetEnabled:menu:";
+               rLen = 0;
+               rLoc = 1149;
+               rType = 0;
+               vrLen = 1594;
+               vrLoc = 0;
+       };
+       00D5672409C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = _importOpen;
+               rLen = 11;
+               rLoc = 17922;
+               rType = 0;
+               vrLen = 1509;
+               vrLoc = 16732;
+       };
+       00D5672509C7633600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = endSheet;
+               rLen = 8;
+               rLoc = 19269;
+               rType = 0;
+               vrLen = 1545;
+               vrLoc = 18087;
+       };
+       00D5672809C763ED00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 458";
+               rLen = 0;
+               rLoc = 18014;
+               rType = 0;
+               vrLen = 430;
+               vrLoc = 17811;
+       };
+       00D5673209C764C000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 458";
+               rLen = 0;
+               rLoc = 18014;
+               rType = 0;
+               vrLen = 430;
+               vrLoc = 17811;
+       };
+       00D5673909C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 448";
+               rLen = 0;
+               rLoc = 17629;
+               rType = 0;
+               vrLen = 1509;
+               vrLoc = 16732;
+       };
+       00D5673A09C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533A906A5DD8500AB4577 /* ScanController.h */;
+               name = "ImportController    *_importController;";
+               rLen = 44;
+               rLoc = 2761;
+               rType = 0;
+               vrLen = 1901;
+               vrLoc = 1793;
+       };
+       00D5673B09C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m 
*/;
+               name = "[_mappingView loadFromFile:filename]";
+               rLen = 36;
+               rLoc = 5097;
+               rType = 0;
+               vrLen = 1526;
+               vrLoc = 3878;
+       };
+       00D5673C09C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _importOpen;
+               rLen = 11;
+               rLoc = 20233;
+               rType = 0;
+               vrLen = 1742;
+               vrLoc = 19421;
+       };
+       00D5673D09C764FE00FB787B /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+       };
+       00D5673E09C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 448";
+               rLen = 0;
+               rLoc = 17629;
+               rType = 0;
+               vrLen = 1509;
+               vrLoc = 16732;
+       };
+       00D5673F09C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _importOpen;
+               rLen = 11;
+               rLoc = 20233;
+               rType = 0;
+               vrLen = 1742;
+               vrLoc = 19421;
+       };
+       00D5674009C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533A906A5DD8500AB4577 /* ScanController.h */;
+               name = "ImportController    *_importController;";
+               rLen = 44;
+               rLoc = 2761;
+               rType = 0;
+               vrLen = 1901;
+               vrLoc = 1793;
+       };
+       00D5674109C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m 
*/;
+               name = "[_mappingView loadFromFile:filename]";
+               rLen = 36;
+               rLoc = 5097;
+               rType = 0;
+               vrLen = 1526;
+               vrLoc = 3878;
+       };
+       00D5674209C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _importOpen;
+               rLen = 11;
+               rLoc = 20233;
+               rType = 0;
+               vrLen = 1742;
+               vrLoc = 19421;
+       };
+       00D5674309C764FE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = showWantToSaveDialog;
+               rLen = 20;
+               rLoc = 21767;
+               rType = 0;
+               vrLen = 1655;
+               vrLoc = 21347;
+       };
        00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {932, 662}}";
@@ -5225,6 +5730,60 @@
                        00D566AF09C74A0700FB787B /* PBXTextBookmark */ = 
00D566AF09C74A0700FB787B /* PBXTextBookmark */;
                        00D566B009C74A0700FB787B /* PBXBookmark */ = 
00D566B009C74A0700FB787B /* PBXBookmark */;
                        00D566B109C74A0700FB787B /* PBXTextBookmark */ = 
00D566B109C74A0700FB787B /* PBXTextBookmark */;
+                       00D566C509C75BFE00FB787B /* PBXTextBookmark */ = 
00D566C509C75BFE00FB787B /* PBXTextBookmark */;
+                       00D566C609C75C0100FB787B /* PBXTextBookmark */ = 
00D566C609C75C0100FB787B /* PBXTextBookmark */;
+                       00D566C709C75C0100FB787B /* PBXBookmark */ = 
00D566C709C75C0100FB787B /* PBXBookmark */;
+                       00D566C809C75C0100FB787B /* PBXTextBookmark */ = 
00D566C809C75C0100FB787B /* PBXTextBookmark */;
+                       00D566C909C75C0100FB787B /* PBXBookmark */ = 
00D566C909C75C0100FB787B /* PBXBookmark */;
+                       00D566E709C760DE00FB787B /* PBXBookmark */ = 
00D566E709C760DE00FB787B /* PBXBookmark */;
+                       00D566E809C760DE00FB787B /* PBXTextBookmark */ = 
00D566E809C760DE00FB787B /* PBXTextBookmark */;
+                       00D566E909C760DE00FB787B /* PBXTextBookmark */ = 
00D566E909C760DE00FB787B /* PBXTextBookmark */;
+                       00D566EA09C760DE00FB787B /* PBXTextBookmark */ = 
00D566EA09C760DE00FB787B /* PBXTextBookmark */;
+                       00D566EB09C760DE00FB787B /* PBXBookmark */ = 
00D566EB09C760DE00FB787B /* PBXBookmark */;
+                       00D566EC09C760DE00FB787B /* PBXTextBookmark */ = 
00D566EC09C760DE00FB787B /* PBXTextBookmark */;
+                       00D566ED09C760DE00FB787B /* PBXTextBookmark */ = 
00D566ED09C760DE00FB787B /* PBXTextBookmark */;
+                       00D566EE09C760DE00FB787B /* PBXTextBookmark */ = 
00D566EE09C760DE00FB787B /* PBXTextBookmark */;
+                       00D566EF09C760DE00FB787B /* PBXTextBookmark */ = 
00D566EF09C760DE00FB787B /* PBXTextBookmark */;
+                       00D566F209C760DE00FB787B /* PBXTextBookmark */ = 
00D566F209C760DE00FB787B /* PBXTextBookmark */;
+                       00D566F309C760DE00FB787B /* PBXTextBookmark */ = 
00D566F309C760DE00FB787B /* PBXTextBookmark */;
+                       00D566F809C7619F00FB787B /* PBXTextBookmark */ = 
00D566F809C7619F00FB787B /* PBXTextBookmark */;
+                       00D5670309C7628800FB787B /* PBXTextBookmark */ = 
00D5670309C7628800FB787B /* PBXTextBookmark */;
+                       00D5670409C7628800FB787B /* PBXTextBookmark */ = 
00D5670409C7628800FB787B /* PBXTextBookmark */;
+                       00D5670509C7628800FB787B /* PBXTextBookmark */ = 
00D5670509C7628800FB787B /* PBXTextBookmark */;
+                       00D5670609C7628800FB787B /* PBXTextBookmark */ = 
00D5670609C7628800FB787B /* PBXTextBookmark */;
+                       00D5670709C7628800FB787B /* PBXTextBookmark */ = 
00D5670709C7628800FB787B /* PBXTextBookmark */;
+                       00D5670809C7628800FB787B /* PBXTextBookmark */ = 
00D5670809C7628800FB787B /* PBXTextBookmark */;
+                       00D5670A09C7628E00FB787B /* PBXTextBookmark */ = 
00D5670A09C7628E00FB787B /* PBXTextBookmark */;
+                       00D5670B09C7628E00FB787B /* PBXTextBookmark */ = 
00D5670B09C7628E00FB787B /* PBXTextBookmark */;
+                       00D5670C09C7628E00FB787B /* PBXTextBookmark */ = 
00D5670C09C7628E00FB787B /* PBXTextBookmark */;
+                       00D5670D09C7628E00FB787B /* PBXTextBookmark */ = 
00D5670D09C7628E00FB787B /* PBXTextBookmark */;
+                       00D5670E09C7628E00FB787B /* PBXTextBookmark */ = 
00D5670E09C7628E00FB787B /* PBXTextBookmark */;
+                       00D5670F09C7628E00FB787B /* PBXTextBookmark */ = 
00D5670F09C7628E00FB787B /* PBXTextBookmark */;
+                       00D5671009C7628E00FB787B /* PBXTextBookmark */ = 
00D5671009C7628E00FB787B /* PBXTextBookmark */;
+                       00D5671109C762DA00FB787B /* PBXTextBookmark */ = 
00D5671109C762DA00FB787B /* PBXTextBookmark */;
+                       00D5671C09C7633600FB787B /* PBXTextBookmark */ = 
00D5671C09C7633600FB787B /* PBXTextBookmark */;
+                       00D5671D09C7633600FB787B /* PBXTextBookmark */ = 
00D5671D09C7633600FB787B /* PBXTextBookmark */;
+                       00D5671E09C7633600FB787B /* PBXTextBookmark */ = 
00D5671E09C7633600FB787B /* PBXTextBookmark */;
+                       00D5671F09C7633600FB787B /* PBXTextBookmark */ = 
00D5671F09C7633600FB787B /* PBXTextBookmark */;
+                       00D5672009C7633600FB787B /* PBXTextBookmark */ = 
00D5672009C7633600FB787B /* PBXTextBookmark */;
+                       00D5672109C7633600FB787B /* PBXTextBookmark */ = 
00D5672109C7633600FB787B /* PBXTextBookmark */;
+                       00D5672209C7633600FB787B /* PBXTextBookmark */ = 
00D5672209C7633600FB787B /* PBXTextBookmark */;
+                       00D5672309C7633600FB787B /* PBXTextBookmark */ = 
00D5672309C7633600FB787B /* PBXTextBookmark */;
+                       00D5672409C7633600FB787B /* PBXTextBookmark */ = 
00D5672409C7633600FB787B /* PBXTextBookmark */;
+                       00D5672509C7633600FB787B /* PBXTextBookmark */ = 
00D5672509C7633600FB787B /* PBXTextBookmark */;
+                       00D5672809C763ED00FB787B /* PBXTextBookmark */ = 
00D5672809C763ED00FB787B /* PBXTextBookmark */;
+                       00D5673209C764C000FB787B /* PBXTextBookmark */ = 
00D5673209C764C000FB787B /* PBXTextBookmark */;
+                       00D5673909C764FE00FB787B /* PBXTextBookmark */ = 
00D5673909C764FE00FB787B /* PBXTextBookmark */;
+                       00D5673A09C764FE00FB787B /* PBXTextBookmark */ = 
00D5673A09C764FE00FB787B /* PBXTextBookmark */;
+                       00D5673B09C764FE00FB787B /* PBXTextBookmark */ = 
00D5673B09C764FE00FB787B /* PBXTextBookmark */;
+                       00D5673C09C764FE00FB787B /* PBXTextBookmark */ = 
00D5673C09C764FE00FB787B /* PBXTextBookmark */;
+                       00D5673D09C764FE00FB787B /* PBXBookmark */ = 
00D5673D09C764FE00FB787B /* PBXBookmark */;
+                       00D5673E09C764FE00FB787B /* PBXTextBookmark */ = 
00D5673E09C764FE00FB787B /* PBXTextBookmark */;
+                       00D5673F09C764FE00FB787B /* PBXTextBookmark */ = 
00D5673F09C764FE00FB787B /* PBXTextBookmark */;
+                       00D5674009C764FE00FB787B /* PBXTextBookmark */ = 
00D5674009C764FE00FB787B /* PBXTextBookmark */;
+                       00D5674109C764FE00FB787B /* PBXTextBookmark */ = 
00D5674109C764FE00FB787B /* PBXTextBookmark */;
+                       00D5674209C764FE00FB787B /* PBXTextBookmark */ = 
00D5674209C764FE00FB787B /* PBXTextBookmark */;
+                       00D5674309C764FE00FB787B /* PBXTextBookmark */ = 
00D5674309C764FE00FB787B /* PBXTextBookmark */;
                };
                sourceControlManager = 009F5C6006A5C8FF004BB18E /* Source 
Control */;
                userBuildSettings = {

Modified: KisMACng/Sources/Controller/ScanController.m
===================================================================
--- KisMACng/Sources/Controller/ScanController.m        2006-03-14 19:04:50 UTC 
(rev 104)
+++ KisMACng/Sources/Controller/ScanController.m        2006-03-14 20:56:49 UTC 
(rev 105)
@@ -481,7 +481,7 @@
 
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication 
*)sender {    
     if (![self isSaved]) {
-        [self 
showWantToSaveDialog:@selector(reallyQuitDidEnd:returnCode:contextInfo:)];
+               [self 
showWantToSaveDialog:@selector(reallyQuitDidEnd:returnCode:contextInfo:)];
         return NSTerminateLater;
     }
     
@@ -489,7 +489,8 @@
 }
 
 - (void)reallyQuitDidEnd:(NSWindow *)sheet returnCode:(int)returnCode 
contextInfo:(void *)contextInfo {
-    switch (returnCode) {
+    [self menuSetEnabled:YES menu:[NSApp mainMenu]];
+       switch (returnCode) {
     case NSAlertOtherReturn:
         [NSApp replyToApplicationShouldTerminate:NO];
         break;
@@ -575,7 +576,8 @@
     }
 }
 - (void)reallyCloseDidEnd:(NSWindow *)sheet returnCode:(int)returnCode 
contextInfo:(void *)contextInfo {
-    switch (returnCode) {
+       [self menuSetEnabled:YES menu:[NSApp mainMenu]];
+       switch (returnCode) {
     case NSAlertDefaultReturn:
         [NSNotificationCenter postNotification:KisMACTryToSave];
     case NSAlertOtherReturn:

Modified: KisMACng/Sources/Controller/ScanControllerMenus.m
===================================================================
--- KisMACng/Sources/Controller/ScanControllerMenus.m   2006-03-14 19:04:50 UTC 
(rev 104)
+++ KisMACng/Sources/Controller/ScanControllerMenus.m   2006-03-14 20:56:49 UTC 
(rev 105)
@@ -570,6 +570,7 @@
 - (void)showAreaDone:(NSWindow *)sheet returnCode:(int)returnCode 
contextInfo:(void *)contextInfo {
     _importOpen--;
        NSParameterAssert(_importOpen == 0);
+       [self menuSetEnabled:YES menu:[NSApp mainMenu]];
 
     [[_importController window] close];
     [_importController stopAnimation];
@@ -609,6 +610,7 @@
 - (void)showAreaAllDone:(NSWindow *)sheet returnCode:(int)returnCode 
contextInfo:(void *)contextInfo {
     _importOpen--;
        NSParameterAssert(_importOpen == 0);
+       [self menuSetEnabled:YES menu:[NSApp mainMenu]];
 
     [[_importController window] close];
     [_importController stopAnimation];

Modified: KisMACng/Sources/Controller/ScanControllerPrivate.m
===================================================================
--- KisMACng/Sources/Controller/ScanControllerPrivate.m 2006-03-14 19:04:50 UTC 
(rev 104)
+++ KisMACng/Sources/Controller/ScanControllerPrivate.m 2006-03-14 20:56:49 UTC 
(rev 105)
@@ -252,7 +252,8 @@
 - (void)crackDone:(NSWindow *)sheet returnCode:(int)returnCode 
contextInfo:(void *)contextInfo {
     _importOpen--;
        NSParameterAssert(_importOpen == 0);
-       
+       [self menuSetEnabled:YES menu:[NSApp mainMenu]];
+
        [aInfoController reloadData];
     
     [[_importController window] close];
@@ -320,13 +321,14 @@
     NSParameterAssert(title);
     NSParameterAssert(_importOpen == 0); //we are already busy
        _importOpen++;
+       [self menuSetEnabled:NO menu:[NSApp mainMenu]];
        
     if (stopScan) [self stopScan];
     
     _importController = [[ImportController alloc] 
initWithWindowNibName:@"Crack"];
     [_importController setTitle:title];
     [WaveHelper setImportController:_importController];
-
+       
     [NSApp beginSheet:[_importController window] modalForWindow:_window 
modalDelegate:self didEndSelector:@selector(crackDone:returnCode:contextInfo:) 
contextInfo:nil];
 }
 
@@ -433,9 +435,9 @@
 
 - (void)showBusyWithText:(NSString*)title andEndSelector:(SEL)didEndSelector 
andDialog:(NSString*)dialog {
     NSParameterAssert(title);
-    NSParameterAssert(dialog);
-       
+    NSParameterAssert(dialog); 
     if (_importOpen++ > 0) return; //we are already busy
+       [self menuSetEnabled:NO menu:[NSApp mainMenu]];
     
     _importController = [[ImportController alloc] 
initWithWindowNibName:dialog];
     if (!_importController) {
@@ -445,13 +447,15 @@
 
     [WaveHelper setImportController:_importController];
     [_importController setTitle:title];
+       
     [NSApp beginSheet:[_importController window] modalForWindow:_window 
modalDelegate:self didEndSelector:didEndSelector contextInfo:nil];
 }
 
 - (void)busyDone {
     if (_importOpen == 0) return; //the import controller was already closed!!
     if (--_importOpen > 0) return; //still retains
-    
+       [self menuSetEnabled:YES menu:[NSApp mainMenu]];
+       
     if (_importController) [NSApp endSheet:[_importController window]];
     [[_importController window] orderOut:self];
     [WaveHelper secureRelease:&_importController];   
@@ -468,12 +472,14 @@
     }
     _doModal = YES;
 
+       [self menuSetEnabled:NO menu:[NSApp mainMenu]];
     [NSApp beginSheet:[_importController window] modalForWindow:_window 
modalDelegate:self didEndSelector:nil contextInfo:nil];
       
     [self performSelector:_busyFunction withObject:obj];
         
     [obj release];
 
+    [self menuSetEnabled:YES menu:[NSApp mainMenu]];
     [NSApp endSheet: [_importController window]];        
     [[_importController window] close];
     [_importController stopAnimation];
@@ -486,7 +492,8 @@
     [self performSelector:_busyFunction withObject:anObject];
     
     _doModal = NO;
-    
+       
+       [self menuSetEnabled:YES menu:[NSApp mainMenu]];
     [NSApp endSheet: [_importController window]];        
     [[_importController window] orderOut:self];
     [[_importController window] close];
@@ -497,6 +504,7 @@
 #pragma mark -
 
 - (void)showWantToSaveDialog:(SEL)overrideFunction {
+    [self menuSetEnabled:NO menu:[NSApp mainMenu]];
     NSBeginAlertSheet(
         NSLocalizedString(@"Save Changes?", "Save changes dialog title"),
         NSLocalizedString(@"Save", "Save changes dialog button"),

Modified: KisMACng/Sources/ScriptingCore/ScriptController.m
===================================================================
--- KisMACng/Sources/ScriptingCore/ScriptController.m   2006-03-14 19:04:50 UTC 
(rev 104)
+++ KisMACng/Sources/ScriptingCore/ScriptController.m   2006-03-14 20:56:49 UTC 
(rev 105)
@@ -50,7 +50,7 @@
 #pragma mark -
 
 - (void)showWantToSaveDialog:(SEL)overrideFunction {
-    NSBeginAlertSheet(
+       NSBeginAlertSheet(
         NSLocalizedString(@"Save Changes?", "Save changes dialog title"),
         NSLocalizedString(@"Save", "Save changes dialog button"),
         NSLocalizedString(@"Don't Save", "Save changes dialog button"),

Modified: KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj/mick.mode1
===================================================================
--- KisMACng/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.mode1  
2006-03-14 19:04:50 UTC (rev 104)
+++ KisMACng/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.mode1  
2006-03-14 20:56:49 UTC (rev 105)
@@ -219,6 +219,8 @@
                        <key>Layout</key>
                        <array>
                                <dict>
+                                       <key>BecomeActive</key>
+                                       <true/>
                                        <key>ContentConfiguration</key>
                                        <dict>
                                                
<key>PBXBottomSmartGroupGIDs</key>
@@ -308,14 +310,12 @@
                                        <key>Dock</key>
                                        <array>
                                                <dict>
-                                                       <key>BecomeActive</key>
-                                                       <true/>
                                                        
<key>ContentConfiguration</key>
                                                        <dict>
                                                                
<key>PBXProjectModuleGUID</key>
                                                                
<string>1CE0B20306471E060097A5F4</string>
                                                                
<key>PBXProjectModuleLabel</key>
-                                                               
<string>InstallController.m</string>
+                                                               
<string>airportExtreme.png</string>
                                                                
<key>PBXSplitModuleInNavigatorKey</key>
                                                                <dict>
                                                                        
<key>Split0</key>
@@ -323,32 +323,25 @@
                                                                                
<key>PBXProjectModuleGUID</key>
                                                                                
<string>1CE0B20406471E060097A5F4</string>
                                                                                
<key>PBXProjectModuleLabel</key>
-                                                                               
<string>InstallController.m</string>
+                                                                               
<string>airportExtreme.png</string>
                                                                                
<key>_historyCapacity</key>
                                                                                
<integer>20</integer>
                                                                                
<key>bookmark</key>
-                                                                               
<string>00D5667F09C73C3700FB787B</string>
+                                                                               
<string>00D566D809C760A000FB787B</string>
                                                                                
<key>history</key>
                                                                                
<array>
                                                                                
        <string>0017842B09C1E48500530D82</string>
                                                                                
        <string>00B1200D09C1F95C00AD6B0D</string>
                                                                                
        <string>00D5632209C478C300FB787B</string>
-                                                                               
        <string>00D5667509C73B6D00FB787B</string>
-                                                                               
        <string>00D5667609C73B6D00FB787B</string>
+                                                                               
        <string>00D5667809C73B6D00FB787B</string>
                                                                                
</array>
                                                                                
<key>prevStack</key>
                                                                                
<array>
                                                                                
        <string>0054928308E6EF8800307083</string>
-                                                                               
        <string>0017842E09C1E48500530D82</string>
                                                                                
        <string>0017842F09C1E48500530D82</string>
-                                                                               
        <string>00D5632309C478C300FB787B</string>
                                                                                
        <string>00D5632409C478C300FB787B</string>
-                                                                               
        <string>00D5632509C478C300FB787B</string>
                                                                                
        <string>00D5632609C478C300FB787B</string>
-                                                                               
        <string>00D5632709C478C300FB787B</string>
                                                                                
        <string>00D5632809C478C300FB787B</string>
-                                                                               
        <string>00D5667709C73B6D00FB787B</string>
-                                                                               
        <string>00D5667809C73B6D00FB787B</string>
                                                                                
</array>
                                                                        </dict>
                                                                        
<key>SplitCount</key>
@@ -756,14 +749,12 @@
                                                        <key>Dock</key>
                                                        <array>
                                                                <dict>
-                                                                       
<key>BecomeActive</key>
-                                                                       <true/>
                                                                        
<key>ContentConfiguration</key>
                                                                        <dict>
                                                                                
<key>PBXProjectModuleGUID</key>
                                                                                
<string>1CDD528C0622207200134675</string>
                                                                                
<key>PBXProjectModuleLabel</key>
-                                                                               
<string>InstallController.m</string>
+                                                                               
<string>&lt;No Editor&gt;</string>
                                                                                
<key>StatusBarVisibility</key>
                                                                                
<true/>
                                                                        </dict>

Modified: KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj/mick.pbxuser
===================================================================
--- KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj/mick.pbxuser        2006-03-14 19:04:50 UTC (rev 104)
+++ KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj/mick.pbxuser        2006-03-14 20:56:49 UTC (rev 105)
@@ -717,7 +717,7 @@
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-                       PBXPerProjectTemplateStateSaveDate = 163711927;
+                       PBXPerProjectTemplateStateSaveDate = 164061357;
                        PBXPrepackagedSmartGroups_v2 = (
                                {
                                        PBXTransientLocationAtTop = bottom;
@@ -1196,7 +1196,7 @@
                                PBXModuleWindowStatusBarHidden = YES;
                                RubberWindowFrame = "267 358 745 464 0 0 1280 
832 ";
                        };
-                       PBXWorkspaceStateSaveDate = 163711927;
+                       PBXWorkspaceStateSaveDate = 164061357;
                };
                perUserProjectItems = {
                        0017842B09C1E48500530D82 = 0017842B09C1E48500530D82 /* 
PBXBookmark */;
@@ -1230,26 +1230,26 @@
                        00B1202D09C1FA1C00AD6B0D = 00B1202D09C1FA1C00AD6B0D /* 
PBXTextBookmark */;
                        00B1208E09C2064700AD6B0D = 00B1208E09C2064700AD6B0D /* 
PBXTextBookmark */;
                        00B1209C09C2087200AD6B0D = 00B1209C09C2087200AD6B0D /* 
PBXTextBookmark */;
-                       00D5631C09C4789500FB787B /* PBXTextBookmark */ = 
00D5631C09C4789500FB787B /* PBXTextBookmark */;
-                       00D5631D09C4789500FB787B /* PBXTextBookmark */ = 
00D5631D09C4789500FB787B /* PBXTextBookmark */;
-                       00D5632209C478C300FB787B /* PBXTextBookmark */ = 
00D5632209C478C300FB787B /* PBXTextBookmark */;
-                       00D5632309C478C300FB787B /* PBXTextBookmark */ = 
00D5632309C478C300FB787B /* PBXTextBookmark */;
-                       00D5632409C478C300FB787B /* PBXTextBookmark */ = 
00D5632409C478C300FB787B /* PBXTextBookmark */;
-                       00D5632509C478C300FB787B /* PBXTextBookmark */ = 
00D5632509C478C300FB787B /* PBXTextBookmark */;
-                       00D5632609C478C300FB787B /* PBXTextBookmark */ = 
00D5632609C478C300FB787B /* PBXTextBookmark */;
-                       00D5632709C478C300FB787B /* PBXTextBookmark */ = 
00D5632709C478C300FB787B /* PBXTextBookmark */;
-                       00D5632809C478C300FB787B /* PBXTextBookmark */ = 
00D5632809C478C300FB787B /* PBXTextBookmark */;
-                       00D5632909C478C300FB787B /* PBXTextBookmark */ = 
00D5632909C478C300FB787B /* PBXTextBookmark */;
-                       00D5632E09C4794500FB787B /* PBXTextBookmark */ = 
00D5632E09C4794500FB787B /* PBXTextBookmark */;
-                       00D5633109C4797400FB787B /* PBXTextBookmark */ = 
00D5633109C4797400FB787B /* PBXTextBookmark */;
-                       00D5666C09C73AB300FB787B /* PBXTextBookmark */ = 
00D5666C09C73AB300FB787B /* PBXTextBookmark */;
-                       00D5666E09C73AB900FB787B /* PBXTextBookmark */ = 
00D5666E09C73AB900FB787B /* PBXTextBookmark */;
-                       00D5667509C73B6D00FB787B /* PBXBookmark */ = 
00D5667509C73B6D00FB787B /* PBXBookmark */;
-                       00D5667609C73B6D00FB787B /* PBXTextBookmark */ = 
00D5667609C73B6D00FB787B /* PBXTextBookmark */;
-                       00D5667709C73B6D00FB787B /* PBXTextBookmark */ = 
00D5667709C73B6D00FB787B /* PBXTextBookmark */;
-                       00D5667809C73B6D00FB787B /* PBXBookmark */ = 
00D5667809C73B6D00FB787B /* PBXBookmark */;
-                       00D5667909C73B6D00FB787B /* PBXTextBookmark */ = 
00D5667909C73B6D00FB787B /* PBXTextBookmark */;
-                       00D5667F09C73C3700FB787B /* PBXTextBookmark */ = 
00D5667F09C73C3700FB787B /* PBXTextBookmark */;
+                       00D5631C09C4789500FB787B = 00D5631C09C4789500FB787B /* 
PBXTextBookmark */;
+                       00D5631D09C4789500FB787B = 00D5631D09C4789500FB787B /* 
PBXTextBookmark */;
+                       00D5632209C478C300FB787B = 00D5632209C478C300FB787B /* 
PBXTextBookmark */;
+                       00D5632309C478C300FB787B = 00D5632309C478C300FB787B /* 
PBXTextBookmark */;
+                       00D5632409C478C300FB787B = 00D5632409C478C300FB787B /* 
PBXTextBookmark */;
+                       00D5632509C478C300FB787B = 00D5632509C478C300FB787B /* 
PBXTextBookmark */;
+                       00D5632609C478C300FB787B = 00D5632609C478C300FB787B /* 
PBXTextBookmark */;
+                       00D5632709C478C300FB787B = 00D5632709C478C300FB787B /* 
PBXTextBookmark */;
+                       00D5632809C478C300FB787B = 00D5632809C478C300FB787B /* 
PBXTextBookmark */;
+                       00D5632909C478C300FB787B = 00D5632909C478C300FB787B /* 
PBXTextBookmark */;
+                       00D5632E09C4794500FB787B = 00D5632E09C4794500FB787B /* 
PBXTextBookmark */;
+                       00D5633109C4797400FB787B = 00D5633109C4797400FB787B /* 
PBXTextBookmark */;
+                       00D5666C09C73AB300FB787B = 00D5666C09C73AB300FB787B /* 
PBXTextBookmark */;
+                       00D5666E09C73AB900FB787B = 00D5666E09C73AB900FB787B /* 
PBXTextBookmark */;
+                       00D5667509C73B6D00FB787B = 00D5667509C73B6D00FB787B /* 
PBXBookmark */;
+                       00D5667609C73B6D00FB787B = 00D5667609C73B6D00FB787B /* 
PBXTextBookmark */;
+                       00D5667709C73B6D00FB787B = 00D5667709C73B6D00FB787B /* 
PBXTextBookmark */;
+                       00D5667809C73B6D00FB787B = 00D5667809C73B6D00FB787B /* 
PBXBookmark */;
+                       00D5667909C73B6D00FB787B = 00D5667909C73B6D00FB787B /* 
PBXTextBookmark */;
+                       00D5667F09C73C3700FB787B = 00D5667F09C73C3700FB787B /* 
PBXTextBookmark */;
                };
                sourceControlManager = 00B9E5E90647B7BD009FEF35 /* Source 
Control */;
                userBuildSettings = {

Modified: KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj/project.pbxproj
===================================================================
--- KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj/project.pbxproj     2006-03-14 19:04:50 UTC (rev 104)
+++ KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj/project.pbxproj     2006-03-14 20:56:49 UTC (rev 105)
@@ -111,7 +111,7 @@
                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; 
sourceTree = "<absolute>"; };
                32CA4F630368D1EE00C91783 /* KisMAC Installer_Prefix.pch */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
path = "KisMAC Installer_Prefix.pch"; sourceTree = "<group>"; };
                8D1107310486CEB800E47090 /* Info.plist */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = 
Info.plist; sourceTree = "<group>"; };
-               8D1107320486CEB800E47090 /* KisMAC Installer.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = "KisMAC Installer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+               8D1107320486CEB800E47090 /* KisMAC Installer.app */ = {isa = 
PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; 
path = "KisMAC Installer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */


Other related posts:

  • » [kismac] [binaervarianz] r105 - in KisMACng: KisMAC.xcodeproj Sources/Controller Sources/ScriptingCore Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj