Changeset 823 for trunk/macosx

Timestamp:

Aug 22, 2006, 7:50:45 PM (16 years ago)

Author:

livings124

Message:

Log window now indents none-first lines.

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• English.lproj/MessageWindow.nib/keyedobjects.nib (modified) (previous)
• MessageWindowController.m (modified) (3 diffs)

trunk/macosx/MessageWindowController.m

@@ -40 +40 @@
         fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
                     selector: @selector(updateLog:) userInfo: nil repeats: YES];
-        fAttributes = [[NSDictionary alloc] initWithObjectsAndKeys: [NSFont fontWithName: @"Monaco" size: 10],
-                                                                        NSFontAttributeName, nil];
+        
+        NSMutableParagraphStyle * paragraph = [[NSMutableParagraphStyle defaultParagraphStyle] mutableCopy];
+        [paragraph setHeadIndent: 20.0];
+        
+        fAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
+                        [NSFont fontWithName: @"Monaco" size: 10], NSFontAttributeName,
+                        paragraph, NSParagraphStyleAttributeName, nil];
         
         [[self window] update]; //make sure nib is loaded right away
@@ -86 +91 @@
     BOOL shouldScroll = [scroller floatValue] == 1.0 || [scroller isHidden] || [scroller knobProportion] == 1.0;
     
-    NSAttributedString * messageString;
-    NSString * levelString;
-    NSCalendarDate * dateString;
+    NSMutableAttributedString * messageString;
+    NSString * levelString, * dateString;
     for (currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
     {
@@ -107 +111 @@
         
         dateString = [[NSDate dateWithTimeIntervalSince1970: currentMessage->when]
-                            dateWithCalendarFormat: @"%1m/%d %H:%M:%S" timeZone: nil];
-        messageString = [[[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%@ %@ %s",
+                            descriptionWithCalendarFormat: @"%1m/%d %H:%M:%S" timeZone: nil locale: nil];
+        messageString = [[[NSMutableAttributedString alloc] initWithString: [NSString stringWithFormat: @"%@ %@ %s",
                             dateString, levelString, currentMessage->message] attributes: fAttributes] autorelease];