Changeset 842 for trunk

Timestamp:

Sep 3, 2006, 5:06:43 PM (16 years ago)

Author:

livings124

Message:

Display a warning when in debug mode.

Location:

trunk/macosx

Files:

• English.lproj/MessageWindow.nib/classes.nib (modified) (1 diff)
• English.lproj/MessageWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.m (modified) (1 diff)
• MessageWindowController.h (modified) (1 diff)
• MessageWindowController.m (modified) (5 diffs)
• Torrent.m (modified) (3 diffs)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/English.lproj/MessageWindow.nib/classes.nib

@@ -7 +7 @@
             LANGUAGE = ObjC; 
             OUTLETS = {
+                fDebugWarningField = NSTextField; 
+                fDebugWarningIcon = NSImageView; 
                 fLevelButton = NSPopUpButton; 
                 fScrollView = NSScrollView; 

trunk/macosx/InfoWindowController.m

@@ -64 +64 @@
     
     fTorrents = [[NSArray alloc] init];
-    fPeers = [[NSMutableArray alloc] initWithCapacity: 6];
+    fPeers = [[NSMutableArray alloc] initWithCapacity: 30];
     fFiles = [[NSMutableArray alloc] initWithCapacity: 6];
     [fFileTable setDoubleAction: @selector(revealFile:)];

trunk/macosx/MessageWindowController.h

@@ -36 +36 @@
     
     int fLines;
+    
+    IBOutlet NSTextField * fDebugWarningField;
+    IBOutlet NSImageView * fDebugWarningIcon;
 }
 

trunk/macosx/MessageWindowController.m

@@ -30 +30 @@
 #define LEVEL_DEBUG 2
 
-#define UPDATE_SECONDS  0.35
+#define UPDATE_SECONDS  0.4
 #define MAX_LINES       1000
+
+@interface MessageWindowController (Private)
+
+- (void) setDebugWarningHidden: (BOOL) hide;
+
+@end
 
 @implementation MessageWindowController
@@ -80 +86 @@
         [[NSUserDefaults standardUserDefaults] setInteger: level forKey: @"MessageLevel"];
     }
+    
+    [self setDebugWarningHidden: level != TR_MSG_DBG];
     
     tr_setMessageLevel(level);
@@ -116 +124 @@
         if (fLines == MAX_LINES)
         {
-            NSString * text = [fTextView string];
-            unsigned int loc = [text rangeOfString: @"\n"].location;
+            unsigned int loc = [[fTextView string] rangeOfString: @"\n"].location;
             if (loc != NSNotFound)
                 [[fTextView textStorage] deleteCharactersInRange: NSMakeRange(0, loc + 1)];
@@ -145 +152 @@
     else
         level = TR_MSG_ERR;
+    
+    [self setDebugWarningHidden: level != TR_MSG_DBG];
     
     tr_setMessageLevel(level);
@@ -188 +197 @@
 }
 
+- (void) setDebugWarningHidden: (BOOL) hide
+{
+    [fDebugWarningField setHidden: hide];
+    [fDebugWarningIcon setHidden: hide];
+}
+
 @end

trunk/macosx/Torrent.m

@@ -437 +437 @@
 - (NSString *) torrentLocationString
 {
-    return fPrivateTorrent ? @"Transmission Support Folder"
-            : [fPublicTorrentLocation stringByAbbreviatingWithTildeInPath];
+    return fPrivateTorrent ? @"Transmission Support Folder" : [fPublicTorrentLocation stringByAbbreviatingWithTildeInPath];
 }
 
@@ -531 +530 @@
     {
         peer = peers[i];
-        
         [peerDics addObject: [NSDictionary dictionaryWithObjectsAndKeys:
             [NSNumber numberWithBool: peer.isConnected], @"Connected",
@@ -641 +639 @@
     {
         file = fInfo->files[i];
-        [files addObject: [NSDictionary dictionaryWithObjectsAndKeys: [[self downloadFolder]
-            stringByAppendingPathComponent: [NSString stringWithUTF8String: file.name]], @"Name",
+        [files addObject: [NSDictionary dictionaryWithObjectsAndKeys:
+            [[self downloadFolder] stringByAppendingPathComponent: [NSString stringWithUTF8String: file.name]], @"Name",
             [NSNumber numberWithUnsignedLongLong: file.length], @"Size", nil]];
     }

trunk/macosx/TorrentCell.m

@@ -91 +91 @@
         fProgressEndAdvanced = [NSImage imageNamed: @"ProgressBarEndAdvanced.png"];
         
-        fErrorImage = [NSImage imageNamed: @"Error.tiff"];
+        fErrorImage = [[NSImage imageNamed: @"Error.tiff"] copy];
         [fErrorImage setFlipped: YES];
     }
     return self;
+}
+
+- (void) dealloc
+{
+    [fErrorImage release];
+    [super dealloc];
 }