[kismac] [binaervarianz] r124 - in KisMACng: . Resources/Nibs/English.lproj/PrefsGPS.nib Sources/Controller Sources/Preferences/PreferencePanes

Author: gkruse
Date: 2006-04-19 05:42:31 +0200 (Wed, 19 Apr 2006)
New Revision: 124

Modified:
   KisMACng/CHANGES
   KisMACng/Resources/Nibs/English.lproj/PrefsGPS.nib/info.nib
   KisMACng/Resources/Nibs/English.lproj/PrefsGPS.nib/objects.nib
   KisMACng/Sources/Controller/ScanController.m
   KisMACng/Sources/Preferences/PreferencePanes/PrefsAdvanced.m
Log:
R124: - Test -BEOFRE- committing!  


Modified: KisMACng/CHANGES
===================================================================
--- KisMACng/CHANGES    2006-04-18 13:17:56 UTC (rev 123)
+++ KisMACng/CHANGES    2006-04-19 03:42:31 UTC (rev 124)
@@ -1,3 +1,5 @@
+R124: - Test -BEOFRE- committing!
+
 R121: - Fix problem where advanced prefs wouldn't show up if they had never 
been set before
 
 R120: - Add Nibs I missed.  When creating new Nibs, be sure to remove the .svn 
dir from inside the .nib package if you copied an older nib

Modified: KisMACng/Resources/Nibs/English.lproj/PrefsGPS.nib/info.nib
===================================================================
--- KisMACng/Resources/Nibs/English.lproj/PrefsGPS.nib/info.nib 2006-04-18 
13:17:56 UTC (rev 123)
+++ KisMACng/Resources/Nibs/English.lproj/PrefsGPS.nib/info.nib 2006-04-19 
03:42:31 UTC (rev 124)
@@ -7,15 +7,15 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>109</key>
-               <string>448 433 384 272 0 0 1280 832 </string>
+               <string>448 420 384 272 0 0 1280 832 </string>
        </dict>
        <key>IBFramework Version</key>
-       <string>349.0</string>
+       <string>443.0</string>
        <key>IBOpenObjects</key>
        <array>
                <integer>109</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>7F44</string>
+       <string>8I127</string>
 </dict>
 </plist>

Modified: KisMACng/Resources/Nibs/English.lproj/PrefsGPS.nib/objects.nib
===================================================================
(Binary files differ)

Modified: KisMACng/Sources/Controller/ScanController.m
===================================================================
--- KisMACng/Sources/Controller/ScanController.m        2006-04-18 13:17:56 UTC 
(rev 123)
+++ KisMACng/Sources/Controller/ScanController.m        2006-04-19 03:42:31 UTC 
(rev 124)
@@ -97,6 +97,11 @@
                [NSNumber numberWithBool: NO], @"useWebService",
         [NSNumber numberWithBool: NO], @"useWebServiceAutomatically",
         @"", @"webServiceAccount",
+        [NSNumber numberWithInt:2], @"ac_ff", 
+        [NSNumber numberWithFloat:0.1], @"bf_interval",
+        @"wlt1", @"bpfdevice", 
+        @"/dev/bpf0", @"bpfloc",
+        [NSNumber numberWithInt:100], @"pr_interval",
         nil];
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:registrationDict];

Modified: KisMACng/Sources/Preferences/PreferencePanes/PrefsAdvanced.m
===================================================================
--- KisMACng/Sources/Preferences/PreferencePanes/PrefsAdvanced.m        
2006-04-18 13:17:56 UTC (rev 123)
+++ KisMACng/Sources/Preferences/PreferencePanes/PrefsAdvanced.m        
2006-04-19 03:42:31 UTC (rev 124)
@@ -11,48 +11,44 @@
 @implementation PrefsAdvanced
 
 -(void)updateUI {
-    if ([controller objectForKey:@"ac_ff"] == nil) {
-        [self setDefaults:self];
-        return;
-    }
-    [ac_ff setStringValue:[controller objectForKey:@"ac_ff"]];
-       [bf_interval setStringValue:[controller objectForKey:@"bf_interval"]];
+    [ac_ff setIntValue:[[controller objectForKey:@"ac_ff"]intValue]];
+       [bf_interval setFloatValue:[[controller objectForKey:@"bf_interval"] 
intValue]];
        [bpfdevice setStringValue:[controller objectForKey:@"bpfdevice"]];
        [bpfloc setStringValue:[controller objectForKey:@"bpfloc"]];
-       [pr_interval setStringValue:[controller objectForKey:@"pr_interval"]];
+       [pr_interval setIntValue:[[controller objectForKey:@"pr_interval"] 
intValue]];
 }
 
 -(BOOL)updateDictionary {
-       [controller setObject:[ac_ff stringValue] forKey:@"ac_ff"];
-       [controller setObject:[bf_interval stringValue] forKey:@"bf_interval"];
+       [controller setObject:[NSNumber numberWithInt:[ac_ff intValue]] 
forKey:@"ac_ff"];
+       [controller setObject:[NSNumber numberWithFloat:[bf_interval 
floatValue]] forKey:@"bf_interval"];
        [controller setObject:[bpfdevice stringValue] forKey:@"bpfdevice"];
        [controller setObject:[bpfloc stringValue] forKey:@"bpfloc"];
-       [controller setObject:[pr_interval stringValue] forKey:@"pr_interval"];
+       [controller setObject:[NSNumber numberWithInt:[pr_interval intValue]] 
forKey:@"pr_interval"];
     return YES;
 }
 
 -(IBAction)setValueForSender:(id)sender {
    if(sender == ac_ff) {
-       [controller setObject:[ac_ff stringValue] forKey:@"ac_ff"];
+       [controller setObject:[NSNumber numberWithInt:[ac_ff intValue]] 
forKey:@"ac_ff"];
     } else if(sender == bf_interval) {
-               [controller setObject:[bf_interval stringValue] 
forKey:@"bf_interval"];
+               [controller setObject:[NSNumber numberWithFloat:[bf_interval 
floatValue]] forKey:@"bf_interval"];
     } else if(sender == bpfdevice) {
                [controller setObject:[bpfdevice stringValue] 
forKey:@"bpfdevice"];
     } else if(sender == bpfloc) {
                [controller setObject:[bpfloc stringValue] forKey:@"bpfloc"];
     } else if(sender == pr_interval) {
-       [controller setObject:[pr_interval stringValue] forKey:@"pr_interval"];
+       [controller setObject:[NSNumber numberWithInt:[pr_interval intValue]] 
forKey:@"pr_interval"];
        } else {
         NSLog(@"Error: Invalid sender(%@) in setValueForSender:",sender);
     }
 }
 
 -(IBAction)setDefaults:(id)sender {
-       [ac_ff setStringValue:@"2"];
-       [bf_interval setStringValue:@"0.1"];
+       [ac_ff setIntValue:2];
+       [bf_interval setFloatValue:0.1];
        [bpfdevice setStringValue:@"wlt1"];
        [bpfloc setStringValue:@"/dev/bpf0"];
-       [pr_interval setStringValue:@"100"];
+       [pr_interval setIntValue:100];
 }
 
 @end
\ No newline at end of file

Other related posts: