Changeset 4759

Timestamp:

05/13/07 01:32:31 (1 year ago)

Author:

morris

Message:

Make preferences apply directly upon changing them

Files:

• WiredClient/trunk/English.lproj/Preferences.nib/info.nib (modified) (1 diff)
• WiredClient/trunk/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
• WiredClient/trunk/English.lproj/ReleaseNotes.rtf (modified) (1 diff)
• WiredClient/trunk/WCPreferences.m (modified) (26 diffs)

WiredClient/trunk/English.lproj/Preferences.nib/info.nib

@@ -16 +16 @@
-        </array>
-        <key>IBSystem Version</key>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-</dict>
-</plist>

WiredClient/trunk/English.lproj/ReleaseNotes.rtf

@@ -40 +40 @@
-- Add function to overwrite existing file when starting a transfer\
-- Show ETA and path for transfers in user info\
+- Make preferences apply directly upon changing them\
-- Localization updates
-\f0\b \cf2 \

WiredClient/trunk/WCPreferences.m

@@ -36 +36 @@
-@interface WCPreferences(Private)
-
+- (void)_addTouchActionsToSubviewsInView:(NSView *)view;
+
-- (void)_validate;
-
@@ -46 +48 @@
-- (void)_loadSettings;
-- (void)_saveSettings;
+
-- (void)_selectBookmark;
-- (void)_unselectBookmark;
-updateEvents
+selectEvent
-- (void)_touchEvents;
-- (void)_selectTrackerBookmark;
-- (void)_unselectTrackerBookmark;
-
-- (void)_setIcon:(NSImage *)icon;
-
-@end
-
-
-@implementation WCPreferences(Private)
+
+- (void)_addTouchActionsToSubviewsInView:(NSView *)view {
+        NSEnumerator    *enumerator, *tabViewEnumerator;
+        NSTabViewItem   *tabViewItem;
+        id                              subview;
+        
+        enumerator = [[view subviews] objectEnumerator];
+        
+        while((subview = [enumerator nextObject])) {
+                if([subview isKindOfClass:[NSTabView class]]) {
+                        tabViewEnumerator = [[subview tabViewItems] objectEnumerator];
+                        
+                        while((tabViewItem = [tabViewEnumerator nextObject])) {
+                                [self _addTouchActionsToSubviewsInView:[tabViewItem view]];
+                        }
+                } else {
+                        if([subview isKindOfClass:[NSControl class]]) {
+                                if(![subview target]) {
+                                        [subview setTarget:self];
+                                        [subview setAction:@selector(touch:)];
+                                }
+                        }
+                        
+                        [self _addTouchActionsToSubviewsInView:subview];
+                }
+        }
+}
+
+
+
+#pragma mark -
-
-- (void)_validate {
@@ -406 +438 @@
-
-        // --- events
-updateEvents
+selectEvent
-        
-        // --- files
@@ -426 +458 @@
-
-- (void)_saveSettings {
+        NSMutableDictionary     *event;
+        NSImage                         *image;
+        NSString                        *string;
+        NSData                          *data;
+        int                                     tag;
+
-        // --- general
-        if(![[_nickTextField stringValue] isEqualToString:[WCSettings objectForKey:WCNick]]) {
@@ -435 +473 @@
-                [WCSettings setObject:[_statusTextField stringValue] forKey:WCStatus];
-                [[NSNotificationCenter defaultCenter] postNotificationName:WCStatusDidChange];
+        }
+        
+        image = [_iconImageView image];
+        
+        if(image) {
+                data    = [[NSBitmapImageRep imageRepWithData:[image TIFFRepresentation]] representationUsingType:NSPNGFileType properties:NULL];
+                string  = [data base64EncodedString];
+        } else {
+                string  = @"";
+        }
+        
+        if(![string isEqualToString:[WCSettings objectForKey:WCCustomIcon]]) {
+                [WCSettings setObject:string forKey:WCCustomIcon];
+                [[NSNotificationCenter defaultCenter] postNotificationName:WCIconDidChange];
-        }
-        
@@ -476 +528 @@
-        [WCSettings setObject:[_previewTextColorWell color] forKey:WCPreviewTextColor];
-        [WCSettings setObject:[_previewBackgroundColorWell color] forKey:WCPreviewBackgroundColor];
-
-        // --- bookmarks
-        [self _unselectBookmark];
-
-        // --- chat
@@ -494 +543 @@
-        
-        // --- events
-
+
+
+
+
+
+
+
+
+
+
-
-        // --- files
@@ -504 +562 @@
-        [WCSettings setBool:[_removeTransfersButton state] forKey:WCRemoveTransfers];
-
-        // --- trackers
-        [self _unselectTrackerBookmark];
-
-        [[NSNotificationCenter defaultCenter] postNotificationName:WCPreferencesDidChange object:self];
-}
-
-
+
+#pragma mark -
-
-- (void)_selectBookmark {
@@ -616 +673 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        
-        tag = [_eventsPopUpButton tagOfSelectedItem];
@@ -652 +696 @@
-
-        [self _touchEvents];
-        
-        _selectedEvent = tag;
-}
-
@@ -714 +756 @@
-        
-        [trackerBookmark release];
-}
-
-
-
-#pragma mark -
-
-- (void)_setIcon:(NSImage *)icon {
-        NSData          *data;
-
-        icon = [icon scaledImageWithSize:NSMakeSize(32.0, 32.0)];
-        
-        data = [[NSBitmapImageRep imageRepWithData:[icon TIFFRepresentation]] representationUsingType:NSPNGFileType properties:NULL];
-        [WCSettings setObject:[data base64EncodedString] forKey:WCCustomIcon];
-        
-        [[NSNotificationCenter defaultCenter] postNotificationName:WCIconDidChange];
-
-        [_iconImageView setImage:icon];
-}
-
@@ -803 +828 @@
-        [[self window] center];
-
+        [self _addTouchActionsToSubviewsInView:[[self window] contentView]];
+
-        [self _loadSettings];
-        [self _selectTab:@"General"];
-        
-NULL
-NULL
+self
+self
-}
-
@@ -813 +840 @@
-
-- (void)windowWillClose:(NSNotification *)notification {
-
+
+
-}
-
@@ -908 +936 @@
-#pragma mark -
-
+- (IBAction)showWindow:(id)sender {
+        [[self window] setTitle:[[_preferencesTabView selectedTabViewItem] label]];
+        
+        [super showWindow:self];
+}
+
+
+
+#pragma mark -
+
-- (void)selectToolbarItem:(id)sender {
-        NSTabViewItem   *item;
@@ -919 +957 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -1003 +964 @@
-
-- (IBAction)icon:(id)sender {
-etIcon:[_iconImageView image]
+aveSettings
-}
-
@@ -1034 +995 @@
-                image = [NSImage imageWithData:data];
-                
-
-
+
+
+
+
+
-        }
-}
@@ -1043 +1007 @@
-- (IBAction)clearIcon:(id)sender {
-        [_iconImageView setImage:NULL];
-
-
-
+
+
-}
-
@@ -1093 +1056 @@
-
-
+- (void)changeChatFont:(id)sender {
+        NSFont          *font;
+        
+        font = [sender convertFont:[WCSettings objectForKey:WCChatFont]];
+        [WCSettings setObject:font forKey:WCChatFont];
+        [_chatFontTextField setStringValue:[font displayNameWithSize]];
+        
+        [self _saveSettings];
+}
+
+
+
+- (void)changeChatUserListFont:(id)sender {
+        NSFont          *font;
+        
+        font = [sender convertFont:[WCSettings objectForKey:WCChatUserListFont]];
+        [WCSettings setObject:font forKey:WCChatUserListFont];
+        [_chatUserListFontTextField setStringValue:[font displayNameWithSize]];
+        
+        [self _saveSettings];
+}
+
+
+
+- (void)changeMessagesFont:(id)sender {
+        NSFont          *font;
+        
+        font = [sender convertFont:[WCSettings objectForKey:WCMessagesFont]];
+        [WCSettings setObject:font forKey:WCMessagesFont];
+        [_messagesFontTextField setStringValue:[font displayNameWithSize]];
+        
+        [self _saveSettings];
+}
+
+
+
+- (void)changeMessagesListFont:(id)sender {
+        NSFont          *font;
+        
+        font = [sender convertFont:[WCSettings objectForKey:WCMessagesListFont]];
+        [WCSettings setObject:font forKey:WCMessagesListFont];
+        [_messagesListFontTextField setStringValue:[font displayNameWithSize]];
+        
+        [self _saveSettings];
+}
+
+
+
+- (void)changeNewsFont:(id)sender {
+        NSFont          *font;
+        
+        font = [sender convertFont:[WCSettings objectForKey:WCNewsFont]];
+        [WCSettings setObject:font forKey:WCNewsFont];
+        [_newsFontTextField setStringValue:[font displayNameWithSize]];
+        
+        [WCSettings setObject:[font boldFont] forKey:WCNewsTitlesFont];
+        
+        [self _saveSettings];
+}
+
+
+
+- (void)changeFilesFont:(id)sender {
+        NSFont          *font;
+        
+        font = [sender convertFont:[WCSettings objectForKey:WCFilesFont]];
+        [WCSettings setObject:font forKey:WCFilesFont];
+        [_filesFontTextField setStringValue:[font displayNameWithSize]];
+        
+        [self _saveSettings];
+}
+
+
+
+- (void)changePreviewFont:(id)sender {
+        NSFont          *font;
+        
+        font = [sender convertFont:[WCSettings objectForKey:WCPreviewFont]];
+        [WCSettings setObject:font forKey:WCPreviewFont];
+        [_previewFontTextField setStringValue:[font displayNameWithSize]];
+        
+        [self _saveSettings];
+}
+
+
+
-- (IBAction)showColorPanel:(id)sender {
-        NSColorPanel    *colorPanel;
@@ -1104 +1153 @@
-        colorPanel = [NSColorPanel sharedColorPanel];
-        [colorPanel setTarget:self];
-select
+change
-        [colorPanel setColor:NSColorFromString([[WCSettings highlightAtIndex:row] objectForKey:WCHighlightsColor])];
-        [colorPanel makeKeyAndOrderFront:self];
@@ -1111 +1160 @@
-
-
-IBAction)select
+void)change
-        NSMutableDictionary             *highlight;
-        int                                             row;
@@ -1127 +1176 @@
-                
-                [_highlightsTableView reloadData];
+                
+                [self _saveSettings];
-        }
-}
@@ -1133 +1184 @@
-
-- (IBAction)selectEvent:(id)sender {
-updateEvents
+selectEvent
-}
-
@@ -1143 +1194 @@
-        if(sender == _playSoundButton && [_playSoundButton state])
-                [NSSound playSoundNamed:[_soundsPopUpButton titleOfSelectedItem]];
+        
+        [self _saveSettings];
-}
-
@@ -1149 +1202 @@
-- (IBAction)selectSound:(id)sender {
-        [NSSound playSoundNamed:[_soundsPopUpButton titleOfSelectedItem]];
+        
+        [self _saveSettings];
-}
-
@@ -1172 +1227 @@
-
-- (void)downloadFolderPanelDidEnd:(NSOpenPanel *)openPanel returnCode:(int)returnCode contextInfo:(void *)contextInfo {
-
+ {
-                [_downloadFolderTextField setStringValue:[[openPanel filename] stringByAbbreviatingWithTildeInPath]];
+        
+                [self _saveSettings];
+        }
-}
-