Changeset 4181

Timestamp:

06/02/06 17:30:41 (2 years ago)

Author:

morris

Message:

Do it like WiredClient? does

Files:

• WiredServer/trunk/PreferencePane/English.lproj/Wired.nib/classes.nib (modified) (1 diff)
• WiredServer/trunk/PreferencePane/English.lproj/Wired.nib/keyedobjects.nib (modified) (previous)
• WiredServer/trunk/PreferencePane/French.lproj/Wired.nib/classes.nib (modified) (1 diff)
• WiredServer/trunk/PreferencePane/French.lproj/Wired.nib/keyedobjects.nib (modified) (previous)
• WiredServer/trunk/PreferencePane/Japanese.lproj/Wired.nib/classes.nib (modified) (1 diff)
• WiredServer/trunk/PreferencePane/Japanese.lproj/Wired.nib/info.nib (modified) (1 diff)
• WiredServer/trunk/PreferencePane/Japanese.lproj/Wired.nib/keyedobjects.nib (modified) (previous)
• WiredServer/trunk/WCConfigController.h (modified) (1 diff)
• WiredServer/trunk/WCConfigController.m (modified) (5 diffs)

WiredServer/trunk/PreferencePane/English.lproj/Wired.nib/classes.nib

@@ -54 +54 @@
-            ACTIONS = {
-                addTracker = id; 
+                banner = id; 
-                clearBanner = id; 
-                createCertificate = id; 
-                deleteTracker = id; 
-                detectURL = id; 
-                selectBanner = id; 
-                selectFiles = id; 
-                selectLogFile = id; 

WiredServer/trunk/PreferencePane/French.lproj/Wired.nib/classes.nib

@@ -59 +59 @@
-            ACTIONS = {
-                addTracker = id; 
+                banner = id; 
-                clearBanner = id; 
-                createCertificate = id; 
-                deleteTracker = id; 
-                detectURL = id; 
-                selectBanner = id; 
-                selectFiles = id; 
-                selectLogFile = id; 

WiredServer/trunk/PreferencePane/Japanese.lproj/Wired.nib/classes.nib

@@ -59 +59 @@
-            ACTIONS = {
-                addTracker = id; 
+                banner = id; 
-                clearBanner = id; 
-                createCertificate = id; 
-                deleteTracker = id; 
-                detectURL = id; 
-                selectBanner = id; 
-                selectFiles = id; 
-                selectLogFile = id; 

WiredServer/trunk/PreferencePane/Japanese.lproj/Wired.nib/info.nib

@@ -6 +6 @@
-        <string>46 63 446 363 0 0 1280 832 </string>
-        <key>IBFramework Version</key>
-3.0
+6.1
-        <key>IBOpenObjects</key>
-        <array>

WiredServer/trunk/WCConfigController.h

@@ -113 +113 @@
-
-- (IBAction)touch:(id)sender;
+- (IBAction)banner:(id)sender;
-- (IBAction)setBanner:(id)sender;
-- (IBAction)selectBanner:(id)sender;
-- (IBAction)clearBanner:(id)sender;
-- (IBAction)selectFiles:(id)sender;

WiredServer/trunk/WCConfigController.m

@@ -48 +48 @@
-- (BOOL)_writeFlagsToFile:(NSString *)path;
-
+- (void)_setBanner:(NSImage *)banner;
-- (void)_setLaunchesAtBoot:(BOOL)value;
-- (void)_changeOwnerOfPrefixPathToUser:(NSString *)user group:(NSString *)group;
@@ -378 +379 @@
-#pragma mark -
-
+- (void)_setBanner:(NSImage *)banner {
+        NSData                                  *data;
+        NSString                                *path, *temp;
+        WCDashboardController   *controller;
+        BOOL                                    success = NO;
+
+        banner          = [banner scaledImageWithSize:NSMakeSize(200.0, 32.0)];
+        data            = [[NSBitmapImageRep imageRepWithData:[banner TIFFRepresentation]] representationUsingType:NSPNGFileType properties:NULL];
+        path            = WCExpandWiredPath(@"banner.png");
+        controller      = [WCDashboardController dashboardController];
+        temp            = [NSFileManager temporaryPathWithPrefix:@"banner" suffix:@"png"];
+        
+        if([data writeToFile:temp atomically:YES]) {
+                if([controller movePath:temp toPath:path]) {
+                        if([controller changeOwnerOfPath:path
+                                                                          toUser:[_config stringForKey:@"user"]
+                                                                           group:[_config stringForKey:@"group"]]) {
+                                [_config setString:path forKey:@"banner"];
+                                _touched = YES;
+                                success = YES;
+                        }
+                }
+        }
+        
+        [_bannerImageView setImage:success ? banner : NULL];
+}
+
+
+
-- (void)_setLaunchesAtBoot:(BOOL)value {
-        NSString                                *path;
@@ -596 +626 @@
-
-
-- (void)bannerPanelDidEnd:(NSOpenPanel *)openPanel returnCode:(int)returnCode contextInfo:(void  *)contextInfo {
-        if(returnCode == NSOKButton) {
-                [_bannerImageView setImage:[[[NSImage alloc] initWithContentsOfFile:
-                        [[openPanel filenames] objectAtIndex:0]] autorelease]];
-                [self setBanner:self];
-                
-                _touched = YES;
-        }
-}
-
-
-
-- (void)filesPanelDidEnd:(NSOpenPanel *)openPanel returnCode:(int)returnCode contextInfo:(void  *)contextInfo {
-        if(returnCode == NSOKButton) {
@@ -650 +668 @@
-
-
+- (IBAction)banner:(id)sender {
+        [self _setBanner:[_bannerImageView image]];
+}
+
+
+
-- (IBAction)setBanner:(id)sender {
-        NSImage                                 *image, *banner;
-        NSBitmapImageRep                *imageRep;
-        NSData                                  *data;
-        NSString                                *path, *temp;
-        WCDashboardController   *controller;
-        NSSize                                  size;
-        
-        image = [_bannerImageView image];
-        
-    if([image size].width <= 200 && [image size].height <= 32)
-        size = [image size];
-    else if([image size].width >= 200 && [image size].height <= 32)
-        size = NSMakeSize(200, [image size].height);
-    else if([image size].width <= 200 && [image size].height >= 32)
-        size = NSMakeSize([image size].height, 32);
-    else if([image size].width > [image size].height)
-        size = NSMakeSize(200, 32 * ([image size].width / [image size].height));
-    else
-        size = NSMakeSize(200 * ([image size].width / [image size].height), 32);
-        
-        if(!NSEqualSizes([image size], size)) {
-        banner = [[NSImage alloc] initWithSize:size];
-        [banner lockFocus];
-        [image setSize:size];
-        [image drawAtPoint:NSZeroPoint
-                  fromRect:NSMakeRect(0, 0, size.width, size.height)
-                 operation:NSCompositeCopy
-                  fraction:1.0];
-        [banner unlockFocus];
-                
-        [_bannerImageView setImage:banner];
-        [banner release];
-    }
-        
-        imageRep        = [NSBitmapImageRep imageRepWithData:[[_bannerImageView image] TIFFRepresentation]];
-        data            = [imageRep representationUsingType:NSPNGFileType properties:NULL];
-        path            = WCExpandWiredPath(@"banner.png");
-        controller      = [WCDashboardController dashboardController];
-        temp            = [NSFileManager temporaryPathWithPrefix:@"banner" suffix:@"png"];
-        
-        if([data writeToFile:temp atomically:YES]) {
-                if([controller movePath:temp toPath:path]) {
-                        if([controller changeOwnerOfPath:path
-                                                                          toUser:[_config stringForKey:@"user"]
-                                                                           group:[_config stringForKey:@"group"]]) {
-                                [_config setString:path forKey:@"banner"];
-                                _touched = YES;
-                        }
-                }
-        }
-}
-
-
-
-- (IBAction)selectBanner:(id)sender {
-        NSOpenPanel             *openPanel;
-        
@@ -718 +687 @@
-                                           didEndSelector:@selector(bannerPanelDidEnd:returnCode:contextInfo:)
-                                                  contextInfo:NULL];
+}
+
+
+
+- (void)bannerPanelDidEnd:(NSOpenPanel *)openPanel returnCode:(int)returnCode contextInfo:(void  *)contextInfo {
+        NSData          *data;
+        NSImage         *image;
+
+        if(returnCode == NSOKButton) {
+                data = [NSData dataWithContentsOfFile:[openPanel filename]];
+                image = [NSImage imageWithData:data];
+                
+                if(image)
+                        [self _setBanner:image];
+        }
-}
-