Changeset 4789
- Timestamp:
- 05/26/07 13:08:42 (2 years ago)
- Files:
-
- WiredClient/trunk/English.lproj/Preferences.nib/classes.nib (modified) (4 diffs)
- WiredClient/trunk/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
- WiredClient/trunk/English.lproj/ReleaseNotes.rtf (modified) (1 diff)
- WiredClient/trunk/French.lproj/Preferences.nib/classes.nib (modified) (4 diffs)
- WiredClient/trunk/French.lproj/Preferences.nib/info.nib (modified) (1 diff)
- WiredClient/trunk/French.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
- WiredClient/trunk/German.lproj/Preferences.nib/classes.nib (modified) (4 diffs)
- WiredClient/trunk/German.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
- WiredClient/trunk/Japanese.lproj/Preferences.nib/classes.nib (modified) (4 diffs)
- WiredClient/trunk/Japanese.lproj/Preferences.nib/info.nib (modified) (1 diff)
- WiredClient/trunk/Japanese.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
- WiredClient/trunk/WCPreferences.h (modified) (2 diffs)
- WiredClient/trunk/WCPreferences.m (modified) (2 diffs)
- WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
WiredClient/trunk/English.lproj/Preferences.nib/classes.nib
r4631 r4789 16 16 addIgnore = id; 17 17 addTrackerBookmark = id; 18 clearIcon = id;19 18 deleteBookmark = id; 20 19 deleteHighlight = id; … … 25 24 selectEvent = id; 26 25 selectSound = id; 27 setIcon = id;28 26 showFontPanel = id; 29 27 touchEvent = id; … … 76 74 "_historyScrollbackButton" = NSButton; 77 75 "_historyScrollbackModifierPopUpButton" = NSPopUpButton; 78 "_iconImageView" = NSImageView;76 "_iconImageView" = WIImageViewWithImagePicker; 79 77 "_ignoresAddressTableColumn" = NSTableColumn; 80 78 "_ignoresLoginTableColumn" = NSTableColumn; … … 130 128 }, 131 129 { 130 CLASS = WIImageViewWithImagePicker; 131 LANGUAGE = ObjC; 132 SUPERCLASS = NSImageView; 133 }, 134 { 132 135 ACTIONS = {showViewOptions = id; }; 133 136 CLASS = WITableView; WiredClient/trunk/English.lproj/ReleaseNotes.rtf
r4782 r4789 42 42 - Make preferences apply directly upon changing them\ 43 43 - Remember half-composed messages and news posts when hiding a connection and bring them back when unhiding\ 44 - Use icon picker with iSight support from iChat/Address Book\ 44 45 - Localization updates 45 46 \f0\b \cf2 \ WiredClient/trunk/French.lproj/Preferences.nib/classes.nib
r4631 r4789 16 16 addIgnore = id; 17 17 addTrackerBookmark = id; 18 clearIcon = id;19 18 deleteBookmark = id; 20 19 deleteHighlight = id; … … 25 24 selectEvent = id; 26 25 selectSound = id; 27 setIcon = id;28 26 showFontPanel = id; 29 27 touchEvent = id; … … 76 74 "_historyScrollbackButton" = NSButton; 77 75 "_historyScrollbackModifierPopUpButton" = NSPopUpButton; 78 "_iconImageView" = NSImageView;76 "_iconImageView" = WIImageViewWithImagePicker; 79 77 "_ignoresAddressTableColumn" = NSTableColumn; 80 78 "_ignoresLoginTableColumn" = NSTableColumn; … … 130 128 }, 131 129 { 130 CLASS = WIImageViewWithImagePicker; 131 LANGUAGE = ObjC; 132 SUPERCLASS = NSImageView; 133 }, 134 { 132 135 ACTIONS = {showViewOptions = id; }; 133 136 CLASS = WITableView; WiredClient/trunk/French.lproj/Preferences.nib/info.nib
r4618 r4789 16 16 </array> 17 17 <key>IBSystem Version</key> 18 <string>8 L127</string>18 <string>8P2137</string> 19 19 </dict> 20 20 </plist> WiredClient/trunk/German.lproj/Preferences.nib/classes.nib
r4631 r4789 16 16 addIgnore = id; 17 17 addTrackerBookmark = id; 18 clearIcon = id;19 18 deleteBookmark = id; 20 19 deleteHighlight = id; … … 25 24 selectEvent = id; 26 25 selectSound = id; 27 setIcon = id;28 26 showFontPanel = id; 29 27 touchEvent = id; … … 76 74 "_historyScrollbackButton" = NSButton; 77 75 "_historyScrollbackModifierPopUpButton" = NSPopUpButton; 78 "_iconImageView" = NSImageView;76 "_iconImageView" = WIImageViewWithImagePicker; 79 77 "_ignoresAddressTableColumn" = NSTableColumn; 80 78 "_ignoresLoginTableColumn" = NSTableColumn; … … 130 128 }, 131 129 { 130 CLASS = WIImageViewWithImagePicker; 131 LANGUAGE = ObjC; 132 SUPERCLASS = NSImageView; 133 }, 134 { 132 135 ACTIONS = {showViewOptions = id; }; 133 136 CLASS = WITableView; WiredClient/trunk/Japanese.lproj/Preferences.nib/classes.nib
r4631 r4789 21 21 addIgnore = id; 22 22 addTrackerBookmark = id; 23 clearIcon = id;24 23 deleteBookmark = id; 25 24 deleteHighlight = id; … … 30 29 selectEvent = id; 31 30 selectSound = id; 32 setIcon = id;33 31 showFontPanel = id; 34 32 touchEvent = id; … … 81 79 "_historyScrollbackButton" = NSButton; 82 80 "_historyScrollbackModifierPopUpButton" = NSPopUpButton; 83 "_iconImageView" = NSImageView;81 "_iconImageView" = WIImageViewWithImagePicker; 84 82 "_ignoresAddressTableColumn" = NSTableColumn; 85 83 "_ignoresLoginTableColumn" = NSTableColumn; … … 135 133 }, 136 134 { 135 CLASS = WIImageViewWithImagePicker; 136 LANGUAGE = ObjC; 137 SUPERCLASS = NSImageView; 138 }, 139 { 137 140 ACTIONS = {showViewOptions = id; }; 138 141 CLASS = WITableView; WiredClient/trunk/Japanese.lproj/Preferences.nib/info.nib
r4769 r4789 4 4 <dict> 5 5 <key>IBDocumentLocation</key> 6 <string> 18 71 481 528 0 0 1680 1028 </string>6 <string>647 29 481 528 0 0 1920 1178 </string> 7 7 <key>IBFramework Version</key> 8 8 <string>446.1</string> WiredClient/trunk/WCPreferences.h
r4631 r4789 34 34 IBOutlet NSTextField *_nickTextField; 35 35 IBOutlet NSTextField *_statusTextField; 36 IBOutlet NSImageView*_iconImageView;36 IBOutlet WIImageViewWithImagePicker *_iconImageView; 37 37 IBOutlet NSButton *_showConnectAtStartupButton; 38 38 IBOutlet NSButton *_showDockAtStartupButton; … … 164 164 165 165 - (IBAction)icon:(id)sender; 166 - (IBAction)setIcon:(id)sender;167 - (IBAction)clearIcon:(id)sender;168 166 - (IBAction)showFontPanel:(id)sender; 169 167 - (IBAction)selectEvent:(id)sender; WiredClient/trunk/WCPreferences.m
r4772 r4789 796 796 NSString *path; 797 797 WIColorCell *colorCell; 798 799 [_iconImageView setMaxImageSize:NSMakeSize(32.0, 32.0)]; 800 [_iconImageView setDefaultImage:[NSImage imageNamed:@"DefaultIcon"]]; 798 801 799 802 colorCell = [[WIColorCell alloc] init]; … … 966 969 967 970 - (IBAction)icon:(id)sender { 968 [self _saveSettings];969 }970 971 972 973 - (IBAction)setIcon:(id)sender {974 NSOpenPanel *openPanel;975 976 openPanel = [NSOpenPanel openPanel];977 [openPanel setCanChooseDirectories:NO];978 [openPanel setCanChooseFiles:YES];979 [openPanel setAllowsMultipleSelection:NO];980 [openPanel beginSheetForDirectory:NULL981 file:NULL982 types:[NSImage imageFileTypes]983 modalForWindow:[self window]984 modalDelegate:self985 didEndSelector:@selector(iconPanelDidEnd:returnCode:contextInfo:)986 contextInfo:NULL];987 }988 989 990 991 - (void)iconPanelDidEnd:(NSOpenPanel *)openPanel returnCode:(int)returnCode contextInfo:(void *)contextInfo {992 NSData *data;993 NSImage *image;994 995 if(returnCode == NSOKButton) {996 data = [NSData dataWithContentsOfFile:[openPanel filename]];997 image = [NSImage imageWithData:data];998 999 if(image) {1000 [_iconImageView setImage:[image scaledImageWithSize:NSMakeSize(32.0, 32.0)]];1001 1002 [self _saveSettings];1003 }1004 }1005 }1006 1007 1008 1009 - (IBAction)clearIcon:(id)sender {1010 [_iconImageView setImage:NULL];1011 1012 971 [self _saveSettings]; 1013 972 } WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj
r4772 r4789 110 110 A545398905FB62F3005C82FE /* Locked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A545398805FB62F3005C82FE /* Locked.tiff */; }; 111 111 A545398B05FB6300005C82FE /* Unlocked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A545398A05FB6300005C82FE /* Unlocked.tiff */; }; 112 A54E14960C084A6900EF5FBF /* DefaultIcon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A54E14950C084A6900EF5FBF /* DefaultIcon.tiff */; }; 112 113 A55B1A4106B3952000201912 /* Remove.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A55B1A4006B3952000201912 /* Remove.tiff */; }; 113 114 A564407B0A2607AC00ADF4F5 /* WiredAdditions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A56440090A26079A00ADF4F5 /* WiredAdditions.framework */; }; … … 219 220 A5E22609057AB52A0037C7F9 /* Accounts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5E225D3057AB5290037C7F9 /* Accounts.tiff */; }; 220 221 A5E2260A057AB52A0037C7F9 /* Reload.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5E225D4057AB5290037C7F9 /* Reload.tiff */; }; 221 A5E3CCFB0BFB9CE20000BAC9 /* WiredAdditions in Resources */ = {isa = PBXBuildFile; fileRef = A5E3CAF20BFB9CE10000BAC9 /* WiredAdditions */; };222 222 A5E4A6D90791A3D400FA127F /* Folder12.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5E4A6D80791A3D400FA127F /* Folder12.tiff */; }; 223 223 A5E4A6DB0791A3DC00FA127F /* DropBox12.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5E4A6DA0791A3DC00FA127F /* DropBox12.tiff */; }; … … 353 353 A545398A05FB6300005C82FE /* Unlocked.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Unlocked.tiff; sourceTree = "<group>"; }; 354 354 A54D35FA0762565B00227EBE /* WiredAdditions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WiredAdditions.framework; path = WiredAdditions/build/WiredAdditions.framework; sourceTree = SOURCE_ROOT; }; 355 A54E14950C084A6900EF5FBF /* DefaultIcon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = DefaultIcon.tiff; sourceTree = "<group>"; }; 355 356 A55B1A4006B3952000201912 /* Remove.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Remove.tiff; sourceTree = "<group>"; }; 356 357 A56440090A26079A00ADF4F5 /* WiredAdditions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WiredAdditions.framework; sourceTree = BUILT_PRODUCTS_DIR; }; … … 1034 1035 A5E225CC057AB5290037C7F9 /* Console.tiff */, 1035 1036 77E556B30753887D009A7557 /* Conversation.tiff */, 1037 A54E14950C084A6900EF5FBF /* DefaultIcon.tiff */, 1036 1038 A5E225C6057AB5290037C7F9 /* Delete.tiff */, 1037 1039 A5E225D1057AB5290037C7F9 /* DeleteFile.tiff */, … … 1267 1269 7799518A0A122BBB00600320 /* Cool.tiff in Resources */, 1268 1270 7799518F0A122BBB00600320 /* Cry.tiff in Resources */, 1271 A54E14960C084A6900EF5FBF /* DefaultIcon.tiff in Resources */, 1269 1272 A5E225FC057AB52A0037C7F9 /* Delete.tiff in Resources */, 1270 1273 A5E22607057AB52A0037C7F9 /* DeleteFile.tiff in Resources */, … … 1343 1346 77E555C5075346F3009A7557 /* YellowDrop.tiff in Resources */, 1344 1347 779951820A122BBB00600320 /* Yuck.tiff in Resources */, 1345 A5E3CCFB0BFB9CE20000BAC9 /* WiredAdditions in Resources */,1346 1348 ); 1347 1349 runOnlyForDeploymentPostprocessing = 0;
