Changeset 3031

Timestamp:

Sep 10, 2007, 6:39:54 PM (15 years ago)

Author:

livings124

Message:

stage one of the updated message viewer

Location:

trunk/macosx

Files:

• English.lproj/MessageWindow.nib/classes.nib (modified) (1 diff)
• English.lproj/MessageWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/MessageWindow.nib/keyedobjects.nib (modified) (previous)
• MessageWindowController.h (modified) (1 diff)
• MessageWindowController.m (modified) (10 diffs)

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

@@ -10 +10 @@
                 fDebugWarningIcon = NSImageView; 
                 fLevelButton = NSPopUpButton; 
+                fMessageView = NSTableView; 
                 fScrollView = NSScrollView; 
-                fTextView = NSTextView; 
             }; 
             SUPERCLASS = NSWindowController; 

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

@@ -4 +4 @@
 <dict>
         <key>IBDocumentLocation</key>
-        <string>25 72 356 240 0 0 1152 842 </string>
+        <string>42 94 356 240 0 0 1680 1028 </string>
         <key>IBFramework Version</key>
         <string>446.1</string>
@@ -12 +12 @@
         </array>
         <key>IBSystem Version</key>
-        <string>8P135</string>
+        <string>8R4031</string>
 </dict>
 </plist>

trunk/macosx/MessageWindowController.h

@@ -27 +27 @@
 @interface MessageWindowController : NSWindowController
 {
-    IBOutlet NSTextView * fTextView;
+    //IBOutlet NSTextView * fTextView;
+    IBOutlet NSTableView * fMessageView;
     IBOutlet NSScrollView * fScrollView;
     
     IBOutlet NSPopUpButton * fLevelButton;
     
+    NSMutableArray * fMessages;
+    
     NSTimer * fTimer;
-    NSDictionary * fAttributes;
-    
-    int fLines;
     
     IBOutlet NSTextField * fDebugWarningField;

trunk/macosx/MessageWindowController.m

@@ -31 +31 @@
 
 #define UPDATE_SECONDS  0.6
-#define MAX_LINES       2500
+//#define MAX_LINES       2500
 
 @interface MessageWindowController (Private)
@@ -45 +45 @@
     if ((self = [super initWithWindowNibName: name]))
     {
-        NSMutableParagraphStyle * paragraph = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-        [paragraph setHeadIndent: 20.0];
-        
-        fAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
-                        [NSFont fontWithName: @"Monaco" size: 10], NSFontAttributeName,
-                        paragraph, NSParagraphStyleAttributeName, nil];
-        [paragraph release];
-        
-        fLines = 0;
+        fMessages = [[NSMutableArray alloc] init];
         
         fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
                     selector: @selector(updateLog:) userInfo: nil repeats: YES];
         
-        [[self window] update]; //make sure nib is loaded right away
+        int level = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"];
+        if (level == TR_MSG_ERR)
+            [fLevelButton selectItemAtIndex: LEVEL_ERROR];
+        else if (level == TR_MSG_INF)
+            [fLevelButton selectItemAtIndex: LEVEL_INFO];
+        else if (level == TR_MSG_DBG)
+            [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
+        else
+        {
+            level = TR_MSG_ERR;
+            [fLevelButton selectItemAtIndex: LEVEL_ERROR];
+            [[NSUserDefaults standardUserDefaults] setInteger: level forKey: @"MessageLevel"];
+        }
+        
+        tr_setMessageLevel(level);
+        tr_setMessageQueuing(1);
     }
     return self;
@@ -66 +73 @@
 {
     [fTimer invalidate];
-    [fAttributes release];
+    [fMessages release];
     
     [super dealloc];
@@ -75 +82 @@
     [[self window] center];
     
-    int level = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"];
+    int level = tr_getMessageLevel();
     if (level == TR_MSG_ERR)
         [fLevelButton selectItemAtIndex: LEVEL_ERROR];
@@ -90 +97 @@
     
     [self setDebugWarningHidden: level != TR_MSG_DBG];
-    
-    tr_setMessageLevel(level);
-    tr_setMessageQueuing(1);
 }
 
@@ -118 +122 @@
             levelString = @"???";
         
-        dateString = [[NSDate dateWithTimeIntervalSince1970: currentMessage->when]
-                            descriptionWithCalendarFormat: @"%1m/%d %H:%M:%S" timeZone: nil locale: nil];
-        messageString = [NSString stringWithFormat: @"%s%@ %@ %s",
-                            fLines > 0 ? "\n" : "", dateString, levelString, currentMessage->message];
-        
         //remove the first line if at max number of lines
-        if (fLines == MAX_LINES)
+        /*if (fLines == MAX_LINES)
         {
             unsigned int loc = [[fTextView string] rangeOfString: @"\n"].location;
@@ -134 +133 @@
         
         [[fTextView textStorage] appendAttributedString: [[[NSAttributedString alloc] initWithString:
-                                        messageString attributes: fAttributes] autorelease]];
-    }
+                                        messageString attributes: fAttributes] autorelease]];*/
+        
+        #warning remove old messages?
+        
+        [fMessages addObject: [NSDictionary dictionaryWithObjectsAndKeys:
+                                [NSString stringWithUTF8String: currentMessage->message], @"Message",
+                                [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
+                                levelString, @"Level", nil]];
+    }
+    
+    [fMessageView reloadData];
     
     tr_freeMessageList(messages);
     
-    if (shouldScroll)
-        [fTextView scrollRangeToVisible: NSMakeRange([[fTextView string] length], 0)];
+    /*if (shouldScroll)
+        [fTextView scrollRangeToVisible: NSMakeRange([[fTextView string] length], 0)];*/
+}
+
+- (int) numberOfRowsInTableView: (NSTableView *) tableView
+{
+    return [fMessages count];
+}
+
+- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: (int) row
+{
+    NSString * ident = [column identifier];
+    NSDictionary * message = [fMessages objectAtIndex: row];
+
+    if ([ident isEqualToString: @"Date"])
+        return [message objectForKey: @"Date"];
+    else if ([ident isEqualToString: @"Level"])
+        return [message objectForKey: @"Level"];
+    else
+        return [message objectForKey: @"Message"];
 }
 
@@ -163 +189 @@
 - (void) clearLog: (id) sender
 {
-    [fTextView setString: @""];
-    fLines = 0;
+    [fMessages removeAllObjects];
+    [fMessageView reloadData];
 }
 
 - (void) writeToFile: (id) sender
 {
-    NSString * string = [[fTextView string] retain];
+    /*NSString * string = [[fTextView string] retain];
     
     NSSavePanel * panel = [NSSavePanel savePanel];
@@ -177 +203 @@
     [panel beginSheetForDirectory: nil file: NSLocalizedString(@"untitled", "Save log panel -> default file name")
             modalForWindow: [self window] modalDelegate: self
-            didEndSelector: @selector(writeToFileSheetClosed:returnCode:contextInfo:) contextInfo: string];
+            didEndSelector: @selector(writeToFileSheetClosed:returnCode:contextInfo:) contextInfo: string];*/
 }
 
 - (void) writeToFileSheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (NSString *) string
 {
-    if (code == NSOKButton)
+    /*if (code == NSOKButton)
     {
         if (![string writeToFile: [panel filename] atomically: YES encoding: NSUTF8StringEncoding error: nil])
@@ -200 +226 @@
     }
     
-    [string release];
+    [string release];*/
 }