Changeset 24052
- Timestamp:
- 06/23/2008 09:38:26 PM (7 months ago)
- Files:
-
- trunk/Plugins/Purple Service/AIMSNServicePreferences.h (modified) (1 diff)
- trunk/Plugins/Purple Service/AIMSNServicePreferences.m (modified) (2 diffs)
- trunk/Plugins/Purple Service/ESMSNService.h (modified) (1 diff)
- trunk/Plugins/Purple Service/ESPurpleMSNAccount.h (modified) (1 diff)
- trunk/Plugins/Purple Service/ESPurpleMSNAccount.m (modified) (3 diffs)
- trunk/Plugins/Purple Service/MSNServicePrefs.nib/info.nib (modified) (2 diffs)
- trunk/Plugins/Purple Service/MSNServicePrefs.nib/keyedobjects.nib (modified) (29 diffs)
- trunk/Plugins/Purple Service/PurpleDefaultsMSN.plist (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Plugins/Purple Service/AIMSNServicePreferences.h
r21807 r24052 18 18 19 19 @interface AIMSNServicePreferences : AIAdvancedPreferencePane { 20 IBOutlet NSButton *checkBox_treatDisplayNamesAsStatus;21 22 IBOutlet NSTextField *label_displayNames;23 IBOutlet NSTextField *label_displayNamesWarning;24 20 IBOutlet NSButton *checkBox_displayCustomEmoticons; 25 21 } trunk/Plugins/Purple Service/AIMSNServicePreferences.m
r21807 r24052 42 42 - (void)viewDidLoad 43 43 { 44 [checkBox_treatDisplayNamesAsStatus setState:[[[adium preferenceController] preferenceForKey:KEY_MSN_DISPLAY_NAMES_AS_STATUS45 group:PREF_GROUP_MSN_SERVICE] boolValue]];46 47 [checkBox_treatDisplayNamesAsStatus setLocalizedString:AILocalizedString(@"Show display names as status messages",nil)];48 49 [label_displayNames setLocalizedString:AILocalizedString(@"Display names (friendly names)",nil)];50 [label_displayNamesWarning setLocalizedString:AILocalizedString(@"(Takes effect the next time Adium launches)","Indicates a preference will not take effect until the next time Adium is loaded")];51 52 44 [checkBox_displayCustomEmoticons setState:[[[adium preferenceController] preferenceForKey:KEY_MSN_DISPLAY_CUSTOM_EMOTICONS 53 45 group:PREF_GROUP_MSN_SERVICE] boolValue]]; … … 57 49 - (IBAction)changePreference:(id)sender 58 50 { 59 if (sender == checkBox_treatDisplayNamesAsStatus) { 60 [[adium preferenceController] setPreference:[NSNumber numberWithBool:[sender state]] 61 forKey:KEY_MSN_DISPLAY_NAMES_AS_STATUS 62 group:PREF_GROUP_MSN_SERVICE]; 63 64 } 65 else if (sender == checkBox_displayCustomEmoticons) { 51 if (sender == checkBox_displayCustomEmoticons) { 66 52 [[adium preferenceController] setPreference:[NSNumber numberWithBool:[sender state]] 67 53 forKey:KEY_MSN_DISPLAY_CUSTOM_EMOTICONS trunk/Plugins/Purple Service/ESMSNService.h
r21807 r24052 19 19 20 20 #define PREF_GROUP_MSN_SERVICE @"MSN" 21 #define KEY_MSN_DISPLAY_NAMES_AS_STATUS @"Display Names As Status"22 21 #define KEY_MSN_DISPLAY_CUSTOM_EMOTICONS @"Display Custom Emoticons" 23 22 trunk/Plugins/Purple Service/ESPurpleMSNAccount.h
r24049 r24052 27 27 NSDate *lastFriendlyNameChange; 28 28 NSString *queuedFriendlyName; 29 30 BOOL displayNamesAsStatus;31 29 } 32 30 trunk/Plugins/Purple Service/ESPurpleMSNAccount.m
r24049 r24052 72 72 [super initAccount]; 73 73 lastFriendlyNameChange = nil; 74 75 [[adium preferenceController] registerPreferenceObserver:self forGroup:PREF_GROUP_MSN_SERVICE];76 74 } 77 75 78 76 - (void)dealloc { 79 [[adium preferenceController] unregisterPreferenceObserver:self];80 81 77 [lastFriendlyNameChange release]; 82 78 [queuedFriendlyName release]; … … 415 411 } 416 412 417 - (BOOL)useDisplayNameAsStatusMessage418 {419 return displayNamesAsStatus;420 }421 422 413 - (void)updateMobileStatus:(AIListContact *)theContact withData:(BOOL)isMobile 423 414 { … … 454 445 { 455 446 [super cancelFileTransfer:fileTransfer]; 456 }457 458 - (void)preferencesChangedForGroup:(NSString *)group key:(NSString *)key459 object:(AIListObject *)object preferenceDict:(NSDictionary *)prefDict firstTime:(BOOL)firstTime460 {461 [super preferencesChangedForGroup:group key:key object:object preferenceDict:prefDict firstTime:firstTime];462 463 if ([group isEqualToString:PREF_GROUP_MSN_SERVICE]) {464 displayNamesAsStatus = [[prefDict objectForKey:KEY_MSN_DISPLAY_NAMES_AS_STATUS] boolValue];465 }466 447 } 467 448 trunk/Plugins/Purple Service/MSNServicePrefs.nib/info.nib
r21807 r24052 4 4 <dict> 5 5 <key>IBDocumentLocation</key> 6 <string> 81 61 356 240 0 0 1440 878</string>6 <string>69 57 356 240 0 0 1280 832 </string> 7 7 <key>IBEditorPositions</key> 8 8 <dict> 9 9 <key>10</key> 10 <string> 239 419 381 185 0 0 1440 878</string>10 <string>447 563 381 84 0 0 1280 832 </string> 11 11 </dict> 12 12 <key>IBFramework Version</key> 13 <string>4 46.1</string>13 <string>482.0</string> 14 14 <key>IBOpenObjects</key> 15 15 <array> … … 17 17 </array> 18 18 <key>IBSystem Version</key> 19 <string>8 P2137</string>19 <string>8R218</string> 20 20 <key>IBUsesTextArchiving</key> 21 21 <true/> trunk/Plugins/Purple Service/MSNServicePrefs.nib/keyedobjects.nib
r21807 r24052 12 12 <dict> 13 13 <key>CF$UID</key> 14 <integer> 96</integer>14 <integer>64</integer> 15 15 </dict> 16 16 <key>NSAccessibilityConnectors</key> 17 17 <dict> 18 18 <key>CF$UID</key> 19 <integer> 93</integer>19 <integer>61</integer> 20 20 </dict> 21 21 <key>NSAccessibilityOidsKeys</key> 22 22 <dict> 23 23 <key>CF$UID</key> 24 <integer> 94</integer>24 <integer>62</integer> 25 25 </dict> 26 26 <key>NSAccessibilityOidsValues</key> 27 27 <dict> 28 28 <key>CF$UID</key> 29 <integer> 95</integer>29 <integer>63</integer> 30 30 </dict> 31 31 <key>NSClassesKeys</key> 32 32 <dict> 33 33 <key>CF$UID</key> 34 <integer> 78</integer>34 <integer>51</integer> 35 35 </dict> 36 36 <key>NSClassesValues</key> 37 37 <dict> 38 38 <key>CF$UID</key> 39 <integer> 79</integer>39 <integer>52</integer> 40 40 </dict> 41 41 <key>NSConnections</key> … … 57 57 <dict> 58 58 <key>CF$UID</key> 59 <integer> 71</integer>59 <integer>46</integer> 60 60 </dict> 61 61 <key>NSNamesValues</key> 62 62 <dict> 63 63 <key>CF$UID</key> 64 <integer> 72</integer>64 <integer>47</integer> 65 65 </dict> 66 66 <key>NSNextOid</key> … … 69 69 <dict> 70 70 <key>CF$UID</key> 71 <integer> 68</integer>71 <integer>43</integer> 72 72 </dict> 73 73 <key>NSObjectsValues</key> 74 74 <dict> 75 75 <key>CF$UID</key> 76 <integer> 70</integer>76 <integer>45</integer> 77 77 </dict> 78 78 <key>NSOidsKeys</key> 79 79 <dict> 80 80 <key>CF$UID</key> 81 <integer> 80</integer>81 <integer>53</integer> 82 82 </dict> 83 83 <key>NSOidsValues</key> 84 84 <dict> 85 85 <key>CF$UID</key> 86 <integer> 81</integer>86 <integer>54</integer> 87 87 </dict> 88 88 <key>NSRoot</key> … … 143 143 <dict> 144 144 <key>CF$UID</key> 145 <integer> 51</integer>145 <integer>31</integer> 146 146 </dict> 147 147 <key>NS.objects</key> … … 153 153 <dict> 154 154 <key>CF$UID</key> 155 <integer>58</integer> 156 </dict> 157 <dict> 158 <key>CF$UID</key> 159 <integer>60</integer> 160 </dict> 161 <dict> 162 <key>CF$UID</key> 163 <integer>63</integer> 164 </dict> 165 <dict> 166 <key>CF$UID</key> 167 <integer>65</integer> 168 </dict> 169 <dict> 170 <key>CF$UID</key> 171 <integer>67</integer> 172 </dict> 173 </array> 174 </dict> 175 <dict> 176 <key>$class</key> 177 <dict> 178 <key>CF$UID</key> 179 <integer>57</integer> 155 <integer>38</integer> 156 </dict> 157 <dict> 158 <key>CF$UID</key> 159 <integer>40</integer> 160 </dict> 161 </array> 162 </dict> 163 <dict> 164 <key>$class</key> 165 <dict> 166 <key>CF$UID</key> 167 <integer>37</integer> 180 168 </dict> 181 169 <key>NSDestination</key> … … 187 175 <dict> 188 176 <key>CF$UID</key> 189 <integer> 56</integer>177 <integer>36</integer> 190 178 </dict> 191 179 <key>NSSource</key> … … 199 187 <dict> 200 188 <key>CF$UID</key> 201 <integer> 55</integer>189 <integer>35</integer> 202 190 </dict> 203 191 <key>NSClassName</key> 204 192 <dict> 205 193 <key>CF$UID</key> 206 <integer> 53</integer>194 <integer>33</integer> 207 195 </dict> 208 196 <key>NSExtension</key> 209 197 <dict> 210 198 <key>CF$UID</key> 211 <integer> 54</integer>199 <integer>34</integer> 212 200 </dict> 213 201 <key>NSFrameSize</key> 214 202 <dict> 215 203 <key>CF$UID</key> 216 <integer> 52</integer>204 <integer>32</integer> 217 205 </dict> 218 206 <key>NSNextResponder</key> … … 233 221 <dict> 234 222 <key>CF$UID</key> 235 <integer> 51</integer>223 <integer>31</integer> 236 224 </dict> 237 225 <key>NS.objects</key> … … 240 228 <key>CF$UID</key> 241 229 <integer>12</integer> 242 </dict>243 <dict>244 <key>CF$UID</key>245 <integer>31</integer>246 </dict>247 <dict>248 <key>CF$UID</key>249 <integer>46</integer>250 230 </dict> 251 231 </array> … … 294 274 <string>AILocalizationButton</string> 295 275 <string>NSButton</string> 296 <string>{{4, 97}, {322, 16}}</string>276 <string>{{4, 18}, {322, 16}}</string> 297 277 <dict> 298 278 <key>$class</key> … … 349 329 </dict> 350 330 </dict> 351 <string>Show display names as status messages</string>331 <string>Show custom emoticons</string> 352 332 <dict> 353 333 <key>$class</key> … … 450 430 </dict> 451 431 <dict> 452 <key>$class</key>453 <dict>454 <key>CF$UID</key>455 <integer>30</integer>456 </dict>457 <key>NSCell</key>458 <dict>459 <key>CF$UID</key>460 <integer>35</integer>461 </dict>462 <key>NSClassName</key>463 <dict>464 <key>CF$UID</key>465 <integer>32</integer>466 </dict>467 <key>NSEnabled</key>468 <true/>469 <key>NSFrame</key>470 <dict>471 <key>CF$UID</key>472 <integer>34</integer>473 </dict>474 <key>NSNextResponder</key>475 <dict>476 <key>CF$UID</key>477 <integer>10</integer>478 </dict>479 <key>NSOriginalClassName</key>480 <dict>481 <key>CF$UID</key>482 <integer>33</integer>483 </dict>484 <key>NSSuperview</key>485 <dict>486 <key>CF$UID</key>487 <integer>10</integer>488 </dict>489 <key>NSvFlags</key>490 <integer>268</integer>491 </dict>492 <string>AILocalizationTextField</string>493 <string>NSTextField</string>494 <string>{{23, 52}, {304, 39}}</string>495 <dict>496 <key>$class</key>497 <dict>498 <key>CF$UID</key>499 <integer>45</integer>500 </dict>501 <key>NSBackgroundColor</key>502 <dict>503 <key>CF$UID</key>504 <integer>37</integer>505 </dict>506 <key>NSCellFlags</key>507 <integer>67239424</integer>508 <key>NSCellFlags2</key>509 <integer>4194304</integer>510 <key>NSContents</key>511 <dict>512 <key>CF$UID</key>513 <integer>36</integer>514 </dict>515 <key>NSControlView</key>516 <dict>517 <key>CF$UID</key>518 <integer>31</integer>519 </dict>520 <key>NSSupport</key>521 <dict>522 <key>CF$UID</key>523 <integer>18</integer>524 </dict>525 <key>NSTextColor</key>526 <dict>527 <key>CF$UID</key>528 <integer>42</integer>529 </dict>530 </dict>531 <string>(Takes effect the next time Adium launches)</string>532 <dict>533 <key>$class</key>534 <dict>535 <key>CF$UID</key>536 <integer>41</integer>537 </dict>538 <key>NSCatalogName</key>539 <dict>540 <key>CF$UID</key>541 <integer>38</integer>542 </dict>543 <key>NSColor</key>544 <dict>545 <key>CF$UID</key>546 <integer>40</integer>547 </dict>548 <key>NSColorName</key>549 <dict>550 <key>CF$UID</key>551 <integer>39</integer>552 </dict>553 <key>NSColorSpace</key>554 <integer>6</integer>555 </dict>556 <string>System</string>557 <string>controlColor</string>558 <dict>559 <key>$class</key>560 <dict>561 <key>CF$UID</key>562 <integer>41</integer>563 </dict>564 <key>NSColorSpace</key>565 <integer>3</integer>566 <key>NSWhite</key>567 <data>568 MC42NjY2NjY2OQA=569 </data>570 </dict>571 <dict>572 <key>$classes</key>573 <array>574 <string>NSColor</string>575 <string>NSObject</string>576 </array>577 <key>$classname</key>578 <string>NSColor</string>579 </dict>580 <dict>581 <key>$class</key>582 <dict>583 <key>CF$UID</key>584 <integer>41</integer>585 </dict>586 <key>NSCatalogName</key>587 <dict>588 <key>CF$UID</key>589 <integer>38</integer>590 </dict>591 <key>NSColor</key>592 <dict>593 <key>CF$UID</key>594 <integer>44</integer>595 </dict>596 <key>NSColorName</key>597 <dict>598 <key>CF$UID</key>599 <integer>43</integer>600 </dict>601 <key>NSColorSpace</key>602 <integer>6</integer>603 </dict>604 <string>controlTextColor</string>605 <dict>606 <key>$class</key>607 <dict>608 <key>CF$UID</key>609 <integer>41</integer>610 </dict>611 <key>NSColorSpace</key>612 <integer>3</integer>613 <key>NSWhite</key>614 <data>615 MAA=616 </data>617 </dict>618 <dict>619 <key>$classes</key>620 <array>621 <string>NSTextFieldCell</string>622 <string>NSActionCell</string>623 <string>NSCell</string>624 <string>NSObject</string>625 </array>626 <key>$classname</key>627 <string>NSTextFieldCell</string>628 </dict>629 <dict>630 <key>$class</key>631 <dict>632 <key>CF$UID</key>633 <integer>30</integer>634 </dict>635 <key>NSCell</key>636 <dict>637 <key>CF$UID</key>638 <integer>49</integer>639 </dict>640 <key>NSClassName</key>641 <dict>642 <key>CF$UID</key>643 <integer>13</integer>644 </dict>645 <key>NSEnabled</key>646 <true/>647 <key>NSFrame</key>648 <dict>649 <key>CF$UID</key>650 <integer>48</integer>651 </dict>652 <key>NSNextResponder</key>653 <dict>654 <key>CF$UID</key>655 <integer>10</integer>656 </dict>657 <key>NSOriginalClassName</key>658 <dict>659 <key>CF$UID</key>660 <integer>47</integer>661 </dict>662 <key>NSSuperview</key>663 <dict>664 <key>CF$UID</key>665 <integer>10</integer>666 </dict>667 <key>NSvFlags</key>668 <integer>268</integer>669 </dict>670 <string>NSButton</string>671 <string>{{4, 119}, {322, 16}}</string>672 <dict>673 <key>$class</key>674 <dict>675 <key>CF$UID</key>676 <integer>29</integer>677 </dict>678 <key>NSAlternateContents</key>679 <dict>680 <key>CF$UID</key>681 <integer>28</integer>682 </dict>683 <key>NSAlternateImage</key>684 <dict>685 <key>CF$UID</key>686 <integer>25</integer>687 </dict>688 <key>NSButtonFlags</key>689 <integer>1211912703</integer>690 <key>NSButtonFlags2</key>691 <integer>2</integer>692 <key>NSCellFlags</key>693 <integer>67239424</integer>694 <key>NSCellFlags2</key>695 <integer>131072</integer>696 <key>NSContents</key>697 <dict>698 <key>CF$UID</key>699 <integer>50</integer>700 </dict>701 <key>NSControlView</key>702 <dict>703 <key>CF$UID</key>704 <integer>46</integer>705 </dict>706 <key>NSKeyEquivalent</key>707 <dict>708 <key>CF$UID</key>709 <integer>28</integer>710 </dict>711 <key>NSNormalImage</key>712 <dict>713 <key>CF$UID</key>714 <integer>21</integer>715 </dict>716 <key>NSPeriodicDelay</key>717 <integer>200</integer>718 <key>NSPeriodicInterval</key>719 <integer>25</integer>720 <key>NSSupport</key>721 <dict>722 <key>CF$UID</key>723 <integer>18</integer>724 </dict>725 </dict>726 <string>Show custom emoticons</string>727 <dict>728 432 <key>$classes</key> 729 433 <array> … … 735 439 <string>NSMutableArray</string> 736 440 </dict> 737 <string>{361, 143}</string>441 <string>{361, 42}</string> 738 442 <string>NSView</string> 739 443 <string>NSResponder</string> … … 764 468 <dict> 765 469 <key>CF$UID</key> 766 <integer> 57</integer>470 <integer>37</integer> 767 471 </dict> 768 472 <key>NSDestination</key> … … 774 478 <dict> 775 479 <key>CF$UID</key> 776 <integer> 59</integer>480 <integer>39</integer> 777 481 </dict> 778 482 <key>NSSource</key> … … 782 486 </dict> 783 487 </dict> 784 <string>checkBox_ treatDisplayNamesAsStatus</string>785 <dict> 786 <key>$class</key> 787 <dict> 788 <key>CF$UID</key> 789 <integer> 62</integer>488 <string>checkBox_displayCustomEmoticons</string> 489 <dict> 490 <key>$class</key> 491 <dict> 492 <key>CF$UID</key> 493 <integer>42</integer> 790 494 </dict> 791 495 <key>NSDestination</key> … … 797 501 <dict> 798 502 <key>CF$UID</key> 799 <integer> 61</integer>503 <integer>41</integer> 800 504 </dict> 801 505 <key>NSSource</key> … … 820 524 <dict> 821 525 <key>CF$UID</key> 822 <integer>57</integer> 823 </dict> 824 &n