Duplicating theme now works and new docs properly init to theme

iCr · Nov 3, 2011 · e3f91f2 · e3f91f2
1 parent 68e407d
commit e3f91f2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/Strawberry/Document.h b/Strawberry/Document.h
@@ -49,4 +49,6 @@ DAMAGE.
 @property(readwrite, assign) NSStringEncoding encoding;
 @property(readwrite, copy) NSURL* url;
 
+- (void)updateTextView;
+
 @end
diff --git a/Strawberry/Document.m b/Strawberry/Document.m
@@ -41,7 +41,7 @@
 
 @implementation Document
 
-@synthesize content, encoding, url;
+@synthesize encoding, url, content;
 
 - (id)init
 {
@@ -65,20 +65,16 @@ - (void)updateTextView
 
     NSAttributedString* string = [[ThemeController sharedController] highlightCode:content withSuffix:[url pathExtension]];
     if (!string)
-        return;
+        string = [[[NSAttributedString alloc] init] autorelease];;
 
     NSTextView* textView = ((WindowController*) [[self windowControllers] objectAtIndex:0]).textView;
     [textView.textStorage setAttributedString:string];
     [textView setFont:[ThemeController sharedController].font];
+    [textView setBackgroundColor:[[ThemeController sharedController] colorForGeneralType:@"background"]];
 }
 
 - (void)themeChanged:(NSNotification*) notification
 {
-    if (![[self windowControllers] count])
-        return;
-
-    NSTextView* textView = ((WindowController*) [[self windowControllers] objectAtIndex:0]).textView;
-    [textView setBackgroundColor:[[ThemeController sharedController] colorForGeneralType:@"background"]];
     [self updateTextView];
 }
 
@@ -87,8 +83,6 @@ - (void)makeWindowControllers
     // FIXME: For now just make a DocumentWindowController. Later on we need to deal with ProjectWindowControllers
     DocumentWindowController* controller = [[DocumentWindowController alloc] initWithWindowNibName:@"Document"];
     [self addWindowController:controller];
-    [self updateTextView];
-    [self themeChanged:nil];
 }
 
 - (void)windowControllerDidLoadNib:(NSWindowController *)controller
@@ -98,8 +92,6 @@ - (void)windowControllerDidLoadNib:(NSWindowController *)controller
     // FIXME: For now assume a single WindowController
     if (self.content)
         [self updateTextView];
-
-    [super windowControllerDidLoadNib:controller];
 }
 
 + (BOOL)autosavesInPlace

diff --git a/Strawberry/DocumentWindowController.m b/Strawberry/DocumentWindowController.m
@@ -45,4 +45,10 @@ - (void) textDidChange: (NSNotification *) notification
     ((Document*) [self document]).content = [[m_textView textStorage] string];
 }
 
+- (void)windowDidLoad
+{
+    [super windowDidLoad];
+    [((Document*) [self document]) updateTextView];
+}
+
 @end
diff --git a/Strawberry/PrefThemesController.m b/Strawberry/PrefThemesController.m
@@ -124,7 +124,8 @@ - (IBAction)changeCaretColor:(id)sender
 }
 
 - (IBAction)duplicateTheme:(id)sender
-{    
+{
+    m_duplicateThemeName.stringValue = @"";
     [NSApp beginSheet:m_duplicateSheet modalForWindow:[m_view window] modalDelegate:self 
         didEndSelector:@selector(didEndDuplicateSheet:returnCode:contextInfo:) contextInfo:nil];
 }
@@ -142,8 +143,11 @@ - (IBAction)duplicateThemeCancel:(id)sender
 - (void)didEndDuplicateSheet:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
 {
     [m_duplicateSheet orderOut:self];
-    if (returnCode)
+    if (returnCode) {
         [[ThemeController sharedController] duplicateCurrentTheme:m_duplicateThemeName.stringValue];
+        [self populateThemeMenu];
+        [self showCurrentTheme];
+    }
 }
 
 - (IBAction)deleteTheme:(id)sender

diff --git a/Strawberry/ThemeController.m b/Strawberry/ThemeController.m
@@ -225,8 +225,10 @@ - (NSDictionary*)currentSyntaxTypes
 + (ThemeController*)sharedController
 {
     static ThemeController* controller;
-    if (!controller)
+    if (!controller) {
         controller = [[ThemeController alloc] init];
+        [[NSNotificationCenter defaultCenter] postNotificationName:NotifyThemeChanged object:nil];
+    }
     return controller;
 }