Changeset 4965

Show
Ignore:
Timestamp:
10/17/07 22:31:12 (1 year ago)
Author:
morris
Message:

Update handling of archived data in prefs for WiredAdditions?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • WiredClient/trunk/NSString-WCAdditions.m

    r4439 r4965  
    5656        } 
    5757 
    58         eventsTextColor                 = [WCSettings objectForKey:WCChatEventsColor]; 
    59         timestampEveryLineColor = [WCSettings objectForKey:WCTimestampEveryLineColor]; 
     58        eventsTextColor                 = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatEventsColor]]; 
     59        timestampEveryLineColor = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCTimestampEveryLineColor]]; 
    6060 
    6161        highlightPatterns               = [NSMutableArray array]; 

  • WiredClient/trunk/WCChat.m

    r4799 r4965  
    9090        NSColor         *color; 
    9191 
    92         font = [WCSettings objectForKey:WCChatFont]; 
     92        font = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatFont]]; 
    9393 
    9494        if(![[_chatOutputTextView font] isEqualTo:font]) { 
    …… 
    9898        } 
    9999         
    100         color = [WCSettings objectForKey:WCChatBackgroundColor]; 
     100        color = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatBackgroundColor]]; 
    101101 
    102102        if(![[_chatOutputTextView backgroundColor] isEqualTo:color]) { 
    …… 
    106106        } 
    107107 
    108         color = [WCSettings objectForKey:WCChatTextColor]; 
     108        color = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatTextColor]]; 
    109109 
    110110        if(![[_chatOutputTextView textColor] isEqualTo:color]) { 
    …… 
    119119         
    120120        [_chatOutputTextView setLinkTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys: 
    121                 [WCSettings objectForKey:WCChatURLsColor],                      NSForegroundColorAttributeName, 
    122                 [NSNumber numberWithInt:NSSingleUnderlineStyle],        NSUnderlineStyleAttributeName, 
     121                [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatURLsColor]], 
     122                        NSForegroundColorAttributeName, 
     123                [NSNumber numberWithInt:NSSingleUnderlineStyle], 
     124                        NSUnderlineStyleAttributeName, 
    123125                NULL]]; 
    124126 
    125         [_userListTableView setFont:[WCSettings objectForKey:WCChatUserListFont]]; 
     127        [_userListTableView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatUserListFont]]]; 
    126128        [_userListTableView setUsesAlternatingRowBackgroundColors:[WCSettings boolForKey:WCChatUserListAlternateRows]]; 
    127129         
    …… 
    13321334        if(textView == _setTopicTextView) { 
    13331335                value = [self topicTextView:textView doCommandBySelector:selector]; 
    1334                 [_setTopicTextView setFont:[WCSettings objectForKey:WCChatFont]]; 
     1336                [_setTopicTextView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatFont]]]; 
    13351337        } 
    13361338        else if(textView == _chatInputTextView) { 
    13371339                value = [self chatTextView:textView doCommandBySelector:selector]; 
    1338                 [_chatInputTextView setFont:[WCSettings objectForKey:WCChatFont]]; 
     1340                [_chatInputTextView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatFont]]]; 
    13391341        } 
    13401342         

  • WiredClient/trunk/WCFiles.m

    r4828 r4965  
    11291129        [cell setImage:[file iconWithWidth:16.0]]; 
    11301130        [cell setRepresentedObject:file]; 
    1131         [cell setFont:[WCSettings objectForKey:WCFilesFont]]; 
     1131        [cell setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCFilesFont]]]; 
    11321132} 
    11331133 

  • WiredClient/trunk/WCFilesController.m

    r4963 r4965  
    103103 
    104104- (void)update { 
    105         [_filesTableView setFont:[WCSettings objectForKey:WCFilesFont]]; 
     105        [_filesTableView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCFilesFont]]]; 
    106106         
    107107        [_filesTableView setUsesAlternatingRowBackgroundColors:[WCSettings boolForKey:WCFilesAlternateRows]]; 

  • WiredClient/trunk/WCMessages.m

    r4812 r4965  
    153153 
    154154- (void)_update { 
    155         [_messageTextView setFont:[WCSettings objectForKey:WCMessagesFont]]; 
    156         [_messageTextView setTextColor:[WCSettings objectForKey:WCMessagesTextColor]]; 
    157         [_messageTextView setBackgroundColor:[WCSettings objectForKey:WCMessagesBackgroundColor]]; 
     155        [_messageTextView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesFont]]]; 
     156        [_messageTextView setTextColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesTextColor]]]; 
     157        [_messageTextView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesBackgroundColor]]]; 
    158158        [_messageTextView setNeedsDisplay:YES]; 
    159159 
    160160        [_messageTextView setLinkTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys: 
    161                 [WCSettings objectForKey:WCChatURLsColor],                      NSForegroundColorAttributeName, 
    162                 [NSNumber numberWithInt:NSSingleUnderlineStyle],        NSUnderlineStyleAttributeName, 
     161                [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatURLsColor]], 
     162                        NSForegroundColorAttributeName, 
     163                [NSNumber numberWithInt:NSSingleUnderlineStyle], 
     164                        NSUnderlineStyleAttributeName, 
    163165                NULL]]; 
    164166         
    165         [_replyTextView setFont:[WCSettings objectForKey:WCMessagesFont]]; 
    166         [_replyTextView setTextColor:[WCSettings objectForKey:WCMessagesTextColor]]; 
    167         [_replyTextView setBackgroundColor:[WCSettings objectForKey:WCMessagesBackgroundColor]]; 
    168         [_replyTextView setInsertionPointColor:[WCSettings objectForKey:WCMessagesTextColor]]; 
     167        [_replyTextView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesFont]]]; 
     168        [_replyTextView setTextColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesTextColor]]]; 
     169        [_replyTextView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesBackgroundColor]]]; 
     170        [_replyTextView setInsertionPointColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesTextColor]]]; 
    169171        [_replyTextView setNeedsDisplay:YES]; 
    170172 
    171         [_broadcastTextView setFont:[WCSettings objectForKey:WCMessagesFont]]; 
    172         [_broadcastTextView setTextColor:[WCSettings objectForKey:WCMessagesTextColor]]; 
    173         [_broadcastTextView setBackgroundColor:[WCSettings objectForKey:WCMessagesBackgroundColor]]; 
    174         [_broadcastTextView setInsertionPointColor:[WCSettings objectForKey:WCMessagesTextColor]]; 
     173        [_broadcastTextView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesFont]]]; 
     174        [_broadcastTextView setTextColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesTextColor]]]; 
     175        [_broadcastTextView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesBackgroundColor]]]; 
     176        [_broadcastTextView setInsertionPointColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesTextColor]]]; 
    175177        [_broadcastTextView setNeedsDisplay:YES]; 
    176178         
    177179        [_messageTextView setString:[[_messageTextView textStorage] string] withFilter:_messageFilter]; 
    178180 
    179         [_messagesTableView setFont:[WCSettings objectForKey:WCMessagesListFont]]; 
     181        [_messagesTableView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesListFont]]]; 
    180182        [_messagesTableView setUsesAlternatingRowBackgroundColors:[WCSettings boolForKey:WCMessagesListAlternateRows]]; 
    181183        [_messagesTableView setNeedsDisplay:YES]; 

  • WiredClient/trunk/WCNews.m

    r4835 r4965  
    8484 
    8585- (void)_update { 
    86         [_newsTextView setBackgroundColor:[WCSettings objectForKey:WCNewsBackgroundColor]]; 
     86        [_newsTextView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsBackgroundColor]]]; 
    8787        [_newsTextView setNeedsDisplay:YES]; 
    8888 
    8989        [_newsTextView setLinkTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys: 
    90                 [WCSettings objectForKey:WCChatURLsColor],                      NSForegroundColorAttributeName, 
    91                 [NSNumber numberWithInt:NSSingleUnderlineStyle],        NSUnderlineStyleAttributeName, 
     90                [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatURLsColor]], 
     91                        NSForegroundColorAttributeName, 
     92                [NSNumber numberWithInt:NSSingleUnderlineStyle], 
     93                        NSUnderlineStyleAttributeName, 
    9294                NULL]]; 
    9395         
    94         [_postTextView setFont:[WCSettings objectForKey:WCNewsFont]]; 
    95         [_postTextView setTextColor:[WCSettings objectForKey:WCNewsTextColor]]; 
    96         [_postTextView setBackgroundColor:[WCSettings objectForKey:WCNewsBackgroundColor]]; 
    97         [_postTextView setInsertionPointColor:[WCSettings objectForKey:WCNewsTextColor]]; 
     96        [_postTextView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsFont]]]; 
     97        [_postTextView setTextColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsTextColor]]]; 
     98        [_postTextView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsBackgroundColor]]]; 
     99        [_postTextView setInsertionPointColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsTextColor]]]; 
    98100        [_postTextView setNeedsDisplay:YES]; 
    99101} 
    …… 
    145147         
    146148        attributes = [NSDictionary dictionaryWithObjectsAndKeys: 
    147                 [WCSettings objectForKey:WCNewsTitlesFont],             NSFontAttributeName, 
    148                 [WCSettings objectForKey:WCNewsTitlesColor],    NSForegroundColorAttributeName, 
     149                [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsTitlesFont]], 
     150                        NSFontAttributeName, 
     151                [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsTitlesColor]], 
     152                        NSForegroundColorAttributeName, 
    149153                NULL]; 
    150154        string = [NSSWF:NSLS(@"From %@ (%@):\n", @"News header (nick, time)"), 
    …… 
    154158         
    155159        attributes = [NSDictionary dictionaryWithObjectsAndKeys: 
    156                 [WCSettings objectForKey:WCNewsFont],                   NSFontAttributeName, 
    157                 [WCSettings objectForKey:WCNewsTextColor],              NSForegroundColorAttributeName, 
     160                [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsFont]], 
     161                        NSFontAttributeName, 
     162                [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsTextColor]], 
     163                        NSForegroundColorAttributeName, 
    158164                NULL]; 
    159165        entry = [NSAttributedString attributedStringWithString:message attributes:attributes]; 
    …… 
    413419        [_postPanel close]; 
    414420        [_postTextView setString:@""]; 
    415         [_postTextView setFont:[WCSettings objectForKey:WCNewsFont]]; 
     421        [_postTextView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsFont]]]; 
    416422} 
    417423 

  • WiredClient/trunk/WCPreferences.m

    r4831 r4965  
    377377         
    378378        // --- interface/chat 
    379         [_chatTextColorWell setColor:[WCSettings objectForKey:WCChatTextColor]]; 
    380         [_chatBackgroundColorWell setColor:[WCSettings objectForKey:WCChatBackgroundColor]]; 
    381         [_chatURLsColorWell setColor:[WCSettings objectForKey:WCChatURLsColor]]; 
    382         [_chatEventsColorWell setColor:[WCSettings objectForKey:WCChatEventsColor]]; 
    383         [_chatFontTextField setStringValue:[[WCSettings objectForKey:WCChatFont] displayNameWithSize]]; 
    384         [_chatUserListFontTextField setStringValue:[[WCSettings objectForKey:WCChatUserListFont] displayNameWithSize]]; 
     379        [_chatTextColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatTextColor]]]; 
     380        [_chatBackgroundColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatBackgroundColor]]]; 
     381        [_chatURLsColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatURLsColor]]]; 
     382        [_chatEventsColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatEventsColor]]]; 
     383        [_chatFontTextField setStringValue:[[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatFont]] displayNameWithSize]]; 
     384        [_chatUserListFontTextField setStringValue:[[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatUserListFont]] displayNameWithSize]]; 
    385385        [_chatUserListIconSizeMatrix selectCellWithTag:[WCSettings intForKey:WCChatUserListIconSize]]; 
    386386        [_chatUserListAlternateRowsButton setState:[WCSettings boolForKey:WCChatUserListAlternateRows]]; 
    387387 
    388388        // --- interface/messages 
    389         [_messagesTextColorWell setColor:[WCSettings objectForKey:WCMessagesTextColor]]; 
    390         [_messagesBackgroundColorWell setColor:[WCSettings objectForKey:WCMessagesBackgroundColor]]; 
    391         [_messagesFontTextField setStringValue:[[WCSettings objectForKey:WCMessagesFont] displayNameWithSize]]; 
    392         [_messagesListFontTextField setStringValue:[[WCSettings objectForKey:WCMessagesListFont] displayNameWithSize]]; 
     389        [_messagesTextColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesTextColor]]]; 
     390        [_messagesBackgroundColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesBackgroundColor]]]; 
     391        [_messagesFontTextField setStringValue:[[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesFont]] displayNameWithSize]]; 
     392        [_messagesListFontTextField setStringValue:[[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesListFont]] displayNameWithSize]]; 
    393393        [_messagesListAlternateRowsButton setState:[WCSettings boolForKey:WCMessagesListAlternateRows]]; 
    394394         
    395395        // --- interface/news 
    396         [_newsTextColorWell setColor:[WCSettings objectForKey:WCNewsTextColor]]; 
    397         [_newsTitlesColorWell setColor:[WCSettings objectForKey:WCNewsTitlesColor]]; 
    398         [_newsBackgroundColorWell setColor:[WCSettings objectForKey:WCNewsBackgroundColor]]; 
    399         [_newsFontTextField setStringValue:[[WCSettings objectForKey:WCNewsFont] displayNameWithSize]]; 
     396        [_newsTextColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsTextColor]]]; 
     397        [_newsTitlesColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsTitlesColor]]]; 
     398        [_newsBackgroundColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsBackgroundColor]]]; 
     399        [_newsFontTextField setStringValue:[[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsFont]] displayNameWithSize]]; 
    400400 
    401401        // --- interface/files 
    402         [_filesFontTextField setStringValue:[[WCSettings objectForKey:WCFilesFont] displayNameWithSize]]; 
     402        [_filesFontTextField setStringValue:[[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCFilesFont]] displayNameWithSize]]; 
    403403        [_filesAlternateRowsButton setState:[WCSettings boolForKey:WCFilesAlternateRows]]; 
    404404 
    …… 
    408408 
    409409        // --- interface/preview 
    410         [_previewTextColorWell setColor:[WCSettings objectForKey:WCPreviewTextColor]]; 
    411         [_previewBackgroundColorWell setColor:[WCSettings objectForKey:WCPreviewBackgroundColor]]; 
    412         [_previewFontTextField setStringValue:[[WCSettings objectForKey:WCPreviewFont] displayNameWithSize]]; 
     410        [_previewTextColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCPreviewTextColor]]]; 
     411        [_previewBackgroundColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCPreviewBackgroundColor]]]; 
     412        [_previewFontTextField setStringValue:[[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCPreviewFont]] displayNameWithSize]]; 
    413413         
    414414        // --- interface/trackers 
    …… 
    432432                [WCSettings doubleForKey:WCTimestampChatInterval] / 60.0]]; 
    433433        [_timestampEveryLineButton setState:[WCSettings boolForKey:WCTimestampEveryLine]]; 
    434         [_timestampEveryLineColorWell setColor:[WCSettings objectForKey:WCTimestampEveryLineColor]]; 
     434        [_timestampEveryLineColorWell setColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCTimestampEveryLineColor]]]; 
    435435        [_showSmileysButton setState:[WCSettings boolForKey:WCShowSmileys]]; 
    436436         
    …… 
    503503         
    504504        // --- interface/chat 
    505         [WCSettings setObject:[_chatTextColorWell color] forKey:WCChatTextColor]; 
    506         [WCSettings setObject:[_chatBackgroundColorWell color] forKey:WCChatBackgroundColor]; 
    507         [WCSettings setObject:[_chatURLsColorWell color] forKey:WCChatURLsColor]; 
    508         [WCSettings setObject:[_chatEventsColorWell color] forKey:WCChatEventsColor]; 
     505        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_chatTextColorWell color]] forKey:WCChatTextColor]; 
     506        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_chatBackgroundColorWell color]] forKey:WCChatBackgroundColor]; 
     507        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_chatURLsColorWell color]] forKey:WCChatURLsColor]; 
     508        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_chatEventsColorWell color]] forKey:WCChatEventsColor]; 
    509509        [WCSettings setInt:[[_chatUserListIconSizeMatrix selectedCell] tag] forKey:WCChatUserListIconSize]; 
    510510        [WCSettings setBool:[_chatUserListAlternateRowsButton state] forKey:WCChatUserListAlternateRows]; 
    511511 
    512512        // --- interface/messages 
    513         [WCSettings setObject:[_messagesTextColorWell color] forKey:WCMessagesTextColor]; 
    514         [WCSettings setObject:[_messagesBackgroundColorWell color] forKey:WCMessagesBackgroundColor]; 
     513        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_messagesTextColorWell color]] forKey:WCMessagesTextColor]; 
     514        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_messagesBackgroundColorWell color]] forKey:WCMessagesBackgroundColor]; 
    515515        [WCSettings setBool:[_messagesListAlternateRowsButton state] forKey:WCMessagesListAlternateRows]; 
    516516         
    517517        // --- interface/news 
    518         [WCSettings setObject:[_newsTextColorWell color] forKey:WCNewsTextColor]; 
    519         [WCSettings setObject:[_newsTitlesColorWell color] forKey:WCNewsTitlesColor]; 
    520         [WCSettings setObject:[_newsBackgroundColorWell color] forKey:WCNewsBackgroundColor]; 
     518        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_newsTextColorWell color]] forKey:WCNewsTextColor]; 
     519        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_newsTitlesColorWell color]] forKey:WCNewsTitlesColor]; 
     520        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_newsBackgroundColorWell color]] forKey:WCNewsBackgroundColor]; 
    521521 
    522522        // --- interface/files 
    …… 
    531531 
    532532        // --- interface/preview 
    533         [WCSettings setObject:[_previewTextColorWell color] forKey:WCPreviewTextColor]; 
    534         [WCSettings setObject:[_previewBackgroundColorWell color] forKey:WCPreviewBackgroundColor]; 
     533        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_previewTextColorWell color]] forKey:WCPreviewTextColor]; 
     534        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_previewBackgroundColorWell color]] forKey:WCPreviewBackgroundColor]; 
    535535 
    536536        // --- chat 
    …… 
    544544        [WCSettings setInt:[_timestampChatIntervalTextField intValue] * 60 forKey:WCTimestampChatInterval]; 
    545545        [WCSettings setBool:[_timestampEveryLineButton state] forKey:WCTimestampEveryLine]; 
    546         [WCSettings setObject:[_timestampEveryLineColorWell color] forKey:WCTimestampEveryLineColor]; 
     546        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[_timestampEveryLineColorWell color]] forKey:WCTimestampEveryLineColor]; 
    547547        [WCSettings setBool:[_showSmileysButton state] forKey:WCShowSmileys]; 
    548548         
    …… 
    10031003         
    10041004        if(sender == _chatFontButton) { 
    1005                 font = [WCSettings objectForKey:WCChatFont]; 
     1005                font = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatFont]]; 
    10061006                [fontManager setAction:@selector(changeChatFont:)]; 
    10071007        } 
    10081008        if(sender == _chatUserListFontButton) { 
    1009                 font = [WCSettings objectForKey:WCChatUserListFont]; 
     1009                font = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatUserListFont]]; 
    10101010                [fontManager setAction:@selector(changeChatUserListFont:)]; 
    10111011        } 
    10121012        else if(sender == _messagesFontButton) { 
    1013                 font = [WCSettings objectForKey:WCMessagesFont]; 
     1013                font = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesFont]]; 
    10141014                [fontManager setAction:@selector(changeMessagesFont:)]; 
    10151015        } 
    10161016        else if(sender == _messagesListFontButton) { 
    1017                 font = [WCSettings objectForKey:WCMessagesListFont]; 
     1017                font = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesListFont]]; 
    10181018                [fontManager setAction:@selector(changeMessagesListFont:)]; 
    10191019        } 
    10201020        else if(sender == _newsFontButton) { 
    1021                 font = [WCSettings objectForKey:WCNewsFont]; 
     1021                font = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsFont]]; 
    10221022                [fontManager setAction:@selector(changeNewsFont:)]; 
    10231023        } 
    10241024        else if(sender == _filesFontButton) { 
    1025                 font = [WCSettings objectForKey:WCFilesFont]; 
     1025                font = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCFilesFont]]; 
    10261026                [fontManager setAction:@selector(changeFilesFont:)]; 
    10271027        } 
    10281028        else if(sender == _previewFontButton) { 
    1029                 font = [WCSettings objectForKey:WCPreviewFont]; 
     1029                font = [NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCPreviewFont]]; 
    10301030                [fontManager setAction:@selector(changePreviewFont:)]; 
    10311031        } 
    …… 
    10421042        NSFont          *font; 
    10431043         
    1044         font = [sender convertFont:[WCSettings objectForKey:WCChatFont]]; 
    1045         [WCSettings setObject:font forKey:WCChatFont]; 
     1044        font = [sender convertFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatFont]]]; 
     1045        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:font] forKey:WCChatFont]; 
    10461046        [_chatFontTextField setStringValue:[font displayNameWithSize]]; 
    10471047         
    …… 
    10541054        NSFont          *font; 
    10551055         
    1056         font = [sender convertFont:[WCSettings objectForKey:WCChatUserListFont]]; 
    1057         [WCSettings setObject:font forKey:WCChatUserListFont]; 
     1056        font = [sender convertFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCChatUserListFont]]]; 
     1057        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:font] forKey:WCChatUserListFont]; 
    10581058        [_chatUserListFontTextField setStringValue:[font displayNameWithSize]]; 
    10591059         
    …… 
    10661066        NSFont          *font; 
    10671067         
    1068         font = [sender convertFont:[WCSettings objectForKey:WCMessagesFont]]; 
    1069         [WCSettings setObject:font forKey:WCMessagesFont]; 
     1068        font = [sender convertFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesFont]]]; 
     1069        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:font] forKey:WCMessagesFont]; 
    10701070        [_messagesFontTextField setStringValue:[font displayNameWithSize]]; 
    10711071         
    …… 
    10781078        NSFont          *font; 
    10791079         
    1080         font = [sender convertFont:[WCSettings objectForKey:WCMessagesListFont]]; 
    1081         [WCSettings setObject:font forKey:WCMessagesListFont]; 
     1080        font = [sender convertFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCMessagesListFont]]]; 
     1081        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:font] forKey:WCMessagesListFont]; 
    10821082        [_messagesListFontTextField setStringValue:[font displayNameWithSize]]; 
    10831083         
    …… 
    10901090        NSFont          *font; 
    10911091         
    1092         font = [sender convertFont:[WCSettings objectForKey:WCNewsFont]]; 
    1093         [WCSettings setObject:font forKey:WCNewsFont]; 
     1092        font = [sender convertFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCNewsFont]]]; 
     1093        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:font] forKey:WCNewsFont]; 
    10941094        [_newsFontTextField setStringValue:[font displayNameWithSize]]; 
    10951095         
    1096         [WCSettings setObject:[font boldFont] forKey:WCNewsTitlesFont]; 
     1096        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:[font boldFont]] forKey:WCNewsTitlesFont]; 
    10971097         
    10981098        [self _saveSettings]; 
    …… 
    11041104        NSFont          *font; 
    11051105         
    1106         font = [sender convertFont:[WCSettings objectForKey:WCFilesFont]]; 
    1107         [WCSettings setObject:font forKey:WCFilesFont]; 
     1106        font = [sender convertFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCFilesFont]]]; 
     1107        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:font] forKey:WCFilesFont]; 
    11081108        [_filesFontTextField setStringValue:[font displayNameWithSize]]; 
    11091109         
    …… 
    11161116        NSFont          *font; 
    11171117         
    1118         font = [sender convertFont:[WCSettings objectForKey:WCPreviewFont]]; 
    1119         [WCSettings setObject:font forKey:WCPreviewFont]; 
     1118        font = [sender convertFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCPreviewFont]]]; 
     1119        [WCSettings setObject:[NSArchiver archivedDataWithRootObject:font] forKey:WCPreviewFont]; 
    11201120        [_previewFontTextField setStringValue:[font displayNameWithSize]]; 
    11211121         

  • WiredClient/trunk/WCPreview.m

    r4775 r4965  
    7979 
    8080- (void)_update { 
    81         [_textView setFont:[WCSettings objectForKey:WCPreviewFont]]; 
    82         [_textView setTextColor:[WCSettings objectForKey:WCPreviewTextColor]]; 
    83         [_textView setBackgroundColor:[WCSettings objectForKey:WCPreviewBackgroundColor]]; 
     81        [_textView setFont:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCPreviewFont]]]; 
     82        [_textView setTextColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCPreviewTextColor]]]; 
     83        [_textView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[WCSettings objectForKey:WCPreviewBackgroundColor]]]; 
    8484} 
    8585 

  • WiredClient/trunk/WCSettings.m

    r4830 r4965  
    202202                 
    203203                // --- interface/chat 
    204                 [NSColor blackColor], 
     204                [NSArchiver archivedDataWithRootObject:[NSColor blackColor]], 
    205205                        WCChatTextColor, 
    206                 [NSColor whiteColor], 
     206                [NSArchiver archivedDataWithRootObject:[NSColor whiteColor]], 
    207207                        WCChatBackgroundColor, 
    208                 [NSColor redColor], 
     208                [NSArchiver archivedDataWithRootObject:[NSColor redColor]], 
    209209                        WCChatEventsColor, 
    210                 [NSColor blueColor], 
     210                [NSArchiver archivedDataWithRootObject:[NSColor blueColor]], 
    211211                        WCChatURLsColor, 
    212                 [NSFont userFixedPitchFontOfSize:9.0], 
     212                [NSArchiver archivedDataWithRootObject:[NSFont userFixedPitchFontOfSize:9.0]], 
    213213                        WCChatFont, 
    214                 [NSFont systemFontOfSize:12.0], 
     214                [NSArchiver archivedDataWithRootObject:[NSFont systemFontOfSize:12.0]], 
    215215                        WCChatUserListFont, 
    216216                [NSNumber numberWithInt:WCChatUserListIconSizeLarge], 
    …… 
    220220                 
    221221                // --- interface/messages 
    222                 [NSColor blackColor], 
     222                [NSArchiver archivedDataWithRootObject:[NSColor blackColor]], 
    223223                        WCMessagesTextColor, 
    224                 [NSColor whiteColor], 
     224                [NSArchiver archivedDataWithRootObject:[NSColor whiteColor]], 
    225225                        WCMessagesBackgroundColor, 
    226                 [NSFont userFixedPitchFontOfSize:9.0], 
     226                [NSArchiver archivedDataWithRootObject:[NSFont userFixedPitchFontOfSize:9.0]], 
    227227                        WCMessagesFont, 
    228                 [NSFont systemFontOfSize:12.0], 
     228                [NSArchiver archivedDataWithRootObject:[NSFont systemFontOfSize:12.0]], 
    229229                        WCMessagesListFont, 
    230230                [NSNumber numberWithBool:NO], 
    …… 
    232232                 
    233233                // --- interface/news 
    234                 [NSColor blackColor], 
     234                [NSArchiver archivedDataWithRootObject:[NSColor blackColor]], 
    235235                        WCNewsTextColor, 
    236                 [NSColor whiteColor], 
     236                [NSArchiver archivedDataWithRootObject:[NSColor whiteColor]], 
    237237                        WCNewsBackgroundColor, 
    238                 [NSColor grayColor], 
     238                [NSArchiver archivedDataWithRootObject:[NSColor grayColor]], 
    239239                        WCNewsTitlesColor, 
    240                 [NSFont fontWithName:@"Helvetica" size:12.0], 
     240                [NSArchiver archivedDataWithRootObject:[NSFont fontWithName:@"Helvetica" size:12.0]], 
    241241                        WCNewsFont, 
    242                 [NSFont fontWithName:@"Helvetica-Bold" size:12.0], 
     242                [NSArchiver archivedDataWithRootObject:[NSFont fontWithName:@"Helvetica-Bold" size:12.0]], 
    243243                        WCNewsTitlesFont, 
    244244                 
    245245                // --- interface/files 
    246                 [NSFont systemFontOfSize:12.0], 
     246                [NSArchiver archivedDataWithRootObject:[NSFont systemFontOfSize:12.0]], 
    247247                        WCFilesFont, 
    248248                [NSNumber numberWithBool:NO], 
    …… 
    256256 
    257257                // --- interface/preview 
    258                 [NSColor blackColor], 
     258                [NSArchiver archivedDataWithRootObject:[NSColor blackColor]], 
    259259                        WCPreviewTextColor, 
    260                 [NSColor whiteColor], 
     260                [NSArchiver archivedDataWithRootObject:[NSColor whiteColor]], 
    261261                        WCPreviewBackgroundColor, 
    262                 [NSFont fontWithName:@"Helvetica" size:12.0], 
     262                [NSArchiver archivedDataWithRootObject:[NSFont fontWithName:@"Helvetica" size:12.0]], 
    263263                        WCPreviewFont, 
    264264                 
    …… 
    288288                [NSNumber numberWithBool:NO], 
    289289                        WCTimestampEveryLine, 
    290                 [NSColor redColor], 
     290                [NSArchiver archivedDataWithRootObject:[NSColor redColor]], 
    291291                        WCTimestampEveryLineColor, 
    292292                [NSNumber numberWithBool:NO],