Changeset 6157
- Timestamp:
- Jun 12, 2008, 3:59:55 AM (15 years ago)
- Location:
- trunk/macosx
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Controller.m
r6150 r6157 204 204 fLib = tr_sessionInitFull(NULL, /* use default config directory (Application Support) */ 205 205 "macosx", 206 "", /* download directory set when adding transfers */206 NULL, /* download directory set when adding transfers */ 207 207 [fDefaults boolForKey: @"PEXGlobal"], 208 208 [fDefaults boolForKey: @"NatTraversal"], -
trunk/macosx/Defaults.plist
r6150 r6157 107 107 <key>ProxyAuthorize</key> 108 108 <false/> 109 <key>ProxyPassword</key>110 <string></string>111 109 <key>ProxyType</key> 112 110 <string>HTTP</string> -
trunk/macosx/English.lproj/PrefsWindow.xib
r6152 r6157 360 360 </object> 361 361 <object class="NSCustomView" id="314557528"> 362 < referencekey="NSNextResponder"/>362 <nil key="NSNextResponder"/> 363 363 <int key="NSvFlags">256</int> 364 364 <object class="NSMutableArray" key="NSSubviews"> … … 369 369 <string key="NSFrame">{{13, 10}, {509, 272}}</string> 370 370 <reference key="NSSuperview" ref="314557528"/> 371 <reference key="NSWindow"/>372 371 <object class="NSMutableArray" key="NSTabViewItems"> 373 372 <bool key="EncodedWithXMLCoder">YES</bool> … … 383 382 <string key="NSFrame">{{280, 192}, {182, 26}}</string> 384 383 <reference key="NSSuperview" ref="833882848"/> 385 <reference key="NSWindow"/>386 384 <bool key="NSEnabled">YES</bool> 387 385 <object class="NSPopUpButtonCell" key="NSCell" id="90676977"> … … 487 485 <string key="NSFrame">{{104, 198}, {174, 17}}</string> 488 486 <reference key="NSSuperview" ref="833882848"/> 489 <reference key="NSWindow"/>490 487 <bool key="NSEnabled">YES</bool> 491 488 <object class="NSTextFieldCell" key="NSCell" id="17039439"> … … 504 501 <string key="NSFrame">{{40, 198}, {62, 17}}</string> 505 502 <reference key="NSSuperview" ref="833882848"/> 506 <reference key="NSWindow"/>507 503 <bool key="NSEnabled">YES</bool> 508 504 <object class="NSTextFieldCell" key="NSCell" id="928268714"> … … 521 517 <string key="NSFrame">{{105, 129}, {188, 18}}</string> 522 518 <reference key="NSSuperview" ref="833882848"/> 523 <reference key="NSWindow"/>524 519 <bool key="NSEnabled">YES</bool> 525 520 <object class="NSButtonCell" key="NSCell" id="617366714"> … … 544 539 <string key="NSFrame">{{105, 19}, {181, 18}}</string> 545 540 <reference key="NSSuperview" ref="833882848"/> 546 <reference key="NSWindow"/>547 541 <bool key="NSEnabled">YES</bool> 548 542 <object class="NSButtonCell" key="NSCell" id="43391012"> … … 567 561 <string key="NSFrame">{{289, 14}, {182, 26}}</string> 568 562 <reference key="NSSuperview" ref="833882848"/> 569 <reference key="NSWindow"/>570 563 <bool key="NSEnabled">YES</bool> 571 564 <object class="NSPopUpButtonCell" key="NSCell" id="325815098"> … … 640 633 <string key="NSFrame">{{36, 20}, {66, 17}}</string> 641 634 <reference key="NSSuperview" ref="833882848"/> 642 <reference key="NSWindow"/>643 635 <bool key="NSEnabled">YES</bool> 644 636 <object class="NSTextFieldCell" key="NSCell" id="89538612"> … … 657 649 <string key="NSFrame">{{105, 172}, {178, 18}}</string> 658 650 <reference key="NSSuperview" ref="833882848"/> 659 <reference key="NSWindow"/>660 651 <bool key="NSEnabled">YES</bool> 661 652 <object class="NSButtonCell" key="NSCell" id="631844593"> … … 680 671 <string key="NSFrame">{{286, 167}, {182, 26}}</string> 681 672 <reference key="NSSuperview" ref="833882848"/> 682 <reference key="NSWindow"/>683 673 <bool key="NSEnabled">YES</bool> 684 674 <object class="NSPopUpButtonCell" key="NSCell" id="706439761"> … … 753 743 <string key="NSFrame">{{105, 93}, {283, 18}}</string> 754 744 <reference key="NSSuperview" ref="833882848"/> 755 <reference key="NSWindow"/>756 745 <bool key="NSEnabled">YES</bool> 757 746 <object class="NSButtonCell" key="NSCell" id="737399332"> … … 776 765 <string key="NSFrame">{{105, 149}, {192, 18}}</string> 777 766 <reference key="NSSuperview" ref="833882848"/> 778 <reference key="NSWindow"/>779 767 <bool key="NSEnabled">YES</bool> 780 768 <object class="NSButtonCell" key="NSCell" id="698939556"> … … 799 787 <string key="NSFrame">{{124, 53}, {197, 18}}</string> 800 788 <reference key="NSSuperview" ref="833882848"/> 801 <reference key="NSWindow"/>802 789 <bool key="NSEnabled">YES</bool> 803 790 <object class="NSButtonCell" key="NSCell" id="728696603"> … … 822 809 <string key="NSFrame">{{17, 94}, {86, 17}}</string> 823 810 <reference key="NSSuperview" ref="833882848"/> 824 <reference key="NSWindow"/>825 811 <bool key="NSEnabled">YES</bool> 826 812 <object class="NSTextFieldCell" key="NSCell" id="184279790"> … … 839 825 <string key="NSFrame">{{124, 73}, {235, 18}}</string> 840 826 <reference key="NSSuperview" ref="833882848"/> 841 <reference key="NSWindow"/>842 827 <bool key="NSEnabled">YES</bool> 843 828 <object class="NSButtonCell" key="NSCell" id="735010614"> … … 860 845 <string key="NSFrame">{{10, 33}, {489, 226}}</string> 861 846 <reference key="NSSuperview" ref="463462813"/> 862 <reference key="NSWindow"/>863 847 </object> 864 848 <string key="NSLabel">Adding</string> … … 1530 1514 </object> 1531 1515 <string key="NSFrameSize">{535, 288}</string> 1532 <reference key="NSSuperview"/>1533 <reference key="NSWindow"/>1534 1516 <string key="NSClassName">NSView</string> 1535 1517 <string key="NSExtension">NSResponder</string> 1536 1518 </object> 1537 1519 <object class="NSCustomView" id="352903881"> 1538 < referencekey="NSNextResponder"/>1520 <nil key="NSNextResponder"/> 1539 1521 <int key="NSvFlags">256</int> 1540 1522 <object class="NSMutableArray" key="NSSubviews"> … … 1545 1527 <string key="NSFrame">{{295, 184}, {50, 22}}</string> 1546 1528 <reference key="NSSuperview" ref="352903881"/> 1547 <reference key="NSWindow"/>1548 1529 <bool key="NSEnabled">YES</bool> 1549 1530 <object class="NSTextFieldCell" key="NSCell" id="671472167"> … … 1610 1591 <string key="NSFrame">{{171, 159}, {100, 18}}</string> 1611 1592 <reference key="NSSuperview" ref="352903881"/> 1612 <reference key="NSWindow"/>1613 1593 <bool key="NSEnabled">YES</bool> 1614 1594 <object class="NSButtonCell" key="NSCell" id="157187468"> … … 1633 1613 <string key="NSFrame">{{295, 158}, {50, 22}}</string> 1634 1614 <reference key="NSSuperview" ref="352903881"/> 1635 <reference key="NSWindow"/>1636 1615 <bool key="NSEnabled">YES</bool> 1637 1616 <object class="NSTextFieldCell" key="NSCell" id="213372896"> … … 1698 1677 <string key="NSFrame">{{171, 185}, {118, 18}}</string> 1699 1678 <reference key="NSSuperview" ref="352903881"/> 1700 <reference key="NSWindow"/>1701 1679 <bool key="NSEnabled">YES</bool> 1702 1680 <object class="NSButtonCell" key="NSCell" id="651662374"> … … 1721 1699 <string key="NSFrame">{{350, 185}, {34, 17}}</string> 1722 1700 <reference key="NSSuperview" ref="352903881"/> 1723 <reference key="NSWindow"/>1724 1701 <bool key="NSEnabled">YES</bool> 1725 1702 <object class="NSTextFieldCell" key="NSCell" id="598167921"> … … 1738 1715 <string key="NSFrame">{{350, 159}, {34, 17}}</string> 1739 1716 <reference key="NSSuperview" ref="352903881"/> 1740 <reference key="NSWindow"/>1741 1717 <bool key="NSEnabled">YES</bool> 1742 1718 <object class="NSTextFieldCell" key="NSCell" id="366797017"> … … 1755 1731 <string key="NSFrame">{{25, 186}, {143, 17}}</string> 1756 1732 <reference key="NSSuperview" ref="352903881"/> 1757 <reference key="NSWindow"/>1758 1733 <bool key="NSEnabled">YES</bool> 1759 1734 <object class="NSTextFieldCell" key="NSCell" id="916691300"> … … 1772 1747 <string key="NSFrame">{{295, 116}, {50, 22}}</string> 1773 1748 <reference key="NSSuperview" ref="352903881"/> 1774 <reference key="NSWindow"/>1775 1749 <bool key="NSEnabled">YES</bool> 1776 1750 <object class="NSTextFieldCell" key="NSCell" id="521814699"> … … 1837 1811 <string key="NSFrame">{{295, 90}, {50, 22}}</string> 1838 1812 <reference key="NSSuperview" ref="352903881"/> 1839 <reference key="NSWindow"/>1840 1813 <bool key="NSEnabled">YES</bool> 1841 1814 <object class="NSTextFieldCell" key="NSCell" id="783238913"> … … 1902 1875 <string key="NSFrame">{{350, 117}, {34, 17}}</string> 1903 1876 <reference key="NSSuperview" ref="352903881"/> 1904 <reference key="NSWindow"/>1905 1877 <bool key="NSEnabled">YES</bool> 1906 1878 <object class="NSTextFieldCell" key="NSCell" id="826580374"> … … 1919 1891 <string key="NSFrame">{{350, 91}, {34, 17}}</string> 1920 1892 <reference key="NSSuperview" ref="352903881"/> 1921 <reference key="NSWindow"/>1922 1893 <bool key="NSEnabled">YES</bool> 1923 1894 <object class="NSTextFieldCell" key="NSCell" id="389698940"> … … 1936 1907 <string key="NSFrame">{{46, 118}, {122, 17}}</string> 1937 1908 <reference key="NSSuperview" ref="352903881"/> 1938 <reference key="NSWindow"/>1939 1909 <bool key="NSEnabled">YES</bool> 1940 1910 <object class="NSTextFieldCell" key="NSCell" id="162938096"> … … 1953 1923 <string key="NSFrame">{{170, 92}, {82, 17}}</string> 1954 1924 <reference key="NSSuperview" ref="352903881"/> 1955 <reference key="NSWindow"/>1956 1925 <bool key="NSEnabled">YES</bool> 1957 1926 <object class="NSTextFieldCell" key="NSCell" id="646507129"> … … 1970 1939 <string key="NSFrame">{{170, 118}, {100, 17}}</string> 1971 1940 <reference key="NSSuperview" ref="352903881"/> 1972 <reference key="NSWindow"/>1973 1941 <bool key="NSEnabled">YES</bool> 1974 1942 <object class="NSTextFieldCell" key="NSCell" id="1023099604"> … … 1987 1955 <string key="NSFrame">{{170, 72}, {339, 14}}</string> 1988 1956 <reference key="NSSuperview" ref="352903881"/> 1989 <reference key="NSWindow"/>1990 1957 <bool key="NSEnabled">YES</bool> 1991 1958 <object class="NSTextFieldCell" key="NSCell" id="229954658"> … … 2016 1983 <string key="NSFrame">{{28, 118}, {20, 14}}</string> 2017 1984 <reference key="NSSuperview" ref="352903881"/> 2018 <reference key="NSWindow"/>2019 1985 <bool key="NSEnabled">YES</bool> 2020 1986 <object class="NSImageCell" key="NSCell" id="916608870"> … … 2037 2003 <string key="NSFrame">{{171, 48}, {217, 18}}</string> 2038 2004 <reference key="NSSuperview" ref="352903881"/> 2039 <reference key="NSWindow"/>2040 2005 <bool key="NSEnabled">YES</bool> 2041 2006 <object class="NSButtonCell" key="NSCell" id="881251804"> … … 2060 2025 <string key="NSFrame">{{273, 22}, {28, 17}}</string> 2061 2026 <reference key="NSSuperview" ref="352903881"/> 2062 <reference key="NSWindow"/>2063 2027 <bool key="NSEnabled">YES</bool> 2064 2028 <object class="NSTextFieldCell" key="NSCell" id="314009658"> … … 2077 2041 <string key="NSFrame">{{185, 20}, {86, 27}}</string> 2078 2042 <reference key="NSSuperview" ref="352903881"/> 2079 <reference key="NSWindow"/>2080 2043 <bool key="NSEnabled">YES</bool> 2081 2044 <object class="NSDatePickerCell" key="NSCell" id="1041237499"> … … 2131 2094 <string key="NSFrame">{{306, 20}, {86, 27}}</string> 2132 2095 <reference key="NSSuperview" ref="352903881"/> 2133 <reference key="NSWindow"/>2134 2096 <bool key="NSEnabled">YES</bool> 2135 2097 <object class="NSDatePickerCell" key="NSCell" id="283024896"> … … 2151 2113 </object> 2152 2114 <string key="NSFrameSize">{535, 226}</string> 2153 <reference key="NSSuperview"/>2154 <reference key="NSWindow"/>2155 2115 <string key="NSClassName">NSView</string> 2156 2116 <string key="NSExtension">NSResponder</string> … … 3435 3395 <string key="NSFrame">{{1, 17}, {332, 95}}</string> 3436 3396 <reference key="NSSuperview" ref="122119447"/> 3397 <reference key="NSNextKeyView" ref="173651346"/> 3437 3398 <reference key="NSDocView" ref="173651346"/> 3438 3399 <reference key="NSBGColor" ref="729660797"/> … … 3467 3428 <string key="NSFrame">{{1, 0}, {332, 17}}</string> 3468 3429 <reference key="NSSuperview" ref="122119447"/> 3430 <reference key="NSNextKeyView" ref="520862816"/> 3469 3431 <reference key="NSDocView" ref="520862816"/> 3470 3432 <reference key="NSBGColor" ref="729660797"/> … … 3475 3437 <string key="NSFrame">{{102, 63}, {349, 113}}</string> 3476 3438 <reference key="NSSuperview" ref="810116101"/> 3439 <reference key="NSNextKeyView" ref="206862330"/> 3477 3440 <int key="NSsFlags">18</int> 3478 3441 <reference key="NSVScroller" ref="220703981"/> … … 3580 3543 </object> 3581 3544 <object class="NSUserDefaultsController" id="356871564"> 3582 <object class="NSMutableArray" key="NSDeclaredKeys">3583 <bool key="EncodedWithXMLCoder">YES</bool>3584 <string>Proxy</string>3585 </object>3586 3545 <bool key="NSSharedInstance">YES</bool> 3587 3546 </object> … … 5762 5721 </object> 5763 5722 <object class="IBConnectionRecord"> 5764 <object class="IBBindingConnection" key="connection">5765 <string key="label">value: values.ProxyPassword</string>5766 <reference key="source" ref="1043027599"/>5767 <reference key="destination" ref="356871564"/>5768 <object class="NSNibBindingConnector" key="connector">5769 <reference key="NSSource" ref="1043027599"/>5770 <reference key="NSDestination" ref="356871564"/>5771 <string key="NSLabel">value: values.ProxyPassword</string>5772 <string key="NSBinding">value</string>5773 <string key="NSKeyPath">values.ProxyPassword</string>5774 <int key="NSNibBindingConnectorVersion">2</int>5775 </object>5776 </object>5777 <int key="connectionID">1624</int>5778 </object>5779 <object class="IBConnectionRecord">5780 5723 <object class="IBOutletConnection" key="connection"> 5781 5724 <string key="label">nextKeyView</string> … … 5976 5919 </object> 5977 5920 <int key="connectionID">1671</int> 5921 </object> 5922 <object class="IBConnectionRecord"> 5923 <object class="IBOutletConnection" key="connection"> 5924 <string key="label">fProxyPasswordField</string> 5925 <reference key="source" ref="511492310"/> 5926 <reference key="destination" ref="1043027599"/> 5927 </object> 5928 <int key="connectionID">1673</int> 5978 5929 </object> 5979 5930 </object> … … 9030 8981 </object> 9031 8982 <nil key="sourceID"/> 9032 <int key="maxID">167 1</int>8983 <int key="maxID">1673</int> 9033 8984 </object> 9034 8985 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 9229 9180 <string>fPortStatusProgress</string> 9230 9181 <string>fProxyAddressField</string> 9182 <string>fProxyPasswordField</string> 9231 9183 <string>fProxyTypePopUp</string> 9232 9184 <string>fQueueDownloadField</string> … … 9263 9215 <string>NSProgressIndicator</string> 9264 9216 <string>NSTextField</string> 9217 <string>NSTextField</string> 9265 9218 <string>NSPopUpButton</string> 9266 9219 <string>NSTextField</string> -
trunk/macosx/GroupsController.h
r5982 r6157 24 24 25 25 #import <Cocoa/Cocoa.h> 26 27 @class CTGradient;28 26 29 27 @interface GroupsController : NSObject -
trunk/macosx/PrefsController.h
r6150 r6157 57 57 NSTimer * fPortStatusTimer; 58 58 int fPeerPort, fNatStatus; 59 IBOutlet NSTextField * fProxyAddressField; 59 60 IBOutlet NSTextField * fProxyAddressField, * fProxyPasswordField; 60 61 IBOutlet NSPopUpButton * fProxyTypePopUp; 62 NSString * fProxyPassword; 61 63 62 64 IBOutlet NSTextField * fRPCPortField; … … 123 125 - (void) setProxyEnabled: (id) sender; 124 126 - (void) setProxyAddress: (id) sender; 127 - (void) setProxyType: (id) sender; 128 - (void) updateProxyType; 125 129 - (void) setProxyAuthorize: (id) sender; 126 130 - (void) setProxyUsername: (id) sender; 127 131 - (void) setProxyPassword: (id) sender; 128 - (void) setProxyType: (id) sender; 129 - (void) updateProxyType; 132 - (void) updateProxyPassword; 130 133 131 134 - (void) setRPCEnabled: (id) sender; -
trunk/macosx/PrefsController.m
r6150 r6157 28 28 #import "NSStringAdditions.h" 29 29 #import "UKKQueue.h" 30 #import "EMKeychainProxy.h" 30 31 31 32 #define DOWNLOAD_FOLDER 0 … … 108 109 //set proxy type 109 110 [self updateProxyType]; 111 [self updateProxyPassword]; 110 112 111 113 //update rpc access list … … 127 129 - (void) dealloc 128 130 { 129 if (fPortStatusTimer) 130 [fPortStatusTimer invalidate]; 131 [fPortStatusTimer invalidate]; 131 132 if (fPortChecker) 132 133 { … … 134 135 [fPortChecker release]; 135 136 } 137 138 [fProxyPassword release]; 136 139 137 140 [fRPCAccessArray release]; … … 207 210 } 208 211 [fProxyTypePopUp selectItemAtIndex: proxyType]; 212 [fProxyPasswordField setStringValue: fProxyPassword]; 209 213 210 214 //set blocklist … … 695 699 } 696 700 697 - (void) setProxyAuthorize: (id) sender698 {699 tr_sessionSetProxyAuthEnabled(fHandle, [fDefaults boolForKey: @"ProxyAuthorize"]);700 }701 702 - (void) setProxyUsername: (id) sender703 {704 tr_sessionSetProxyUsername(fHandle, [[fDefaults stringForKey: @"ProxyUsername"] UTF8String]);705 }706 707 - (void) setProxyPassword: (id) sender708 {709 tr_sessionSetProxyPassword(fHandle, [[fDefaults stringForKey: @"ProxyPassword"] UTF8String]);710 }711 712 701 - (void) setProxyType: (id) sender 713 702 { … … 749 738 750 739 tr_sessionSetProxyType(fHandle, type); 740 } 741 742 - (void) setProxyAuthorize: (id) sender 743 { 744 tr_sessionSetProxyAuthEnabled(fHandle, [fDefaults boolForKey: @"ProxyAuthorize"]); 745 } 746 747 - (void) setProxyUsername: (id) sender 748 { 749 tr_sessionSetProxyUsername(fHandle, [[fDefaults stringForKey: @"ProxyUsername"] UTF8String]); 750 751 //new username means new password 752 [self updateProxyPassword]; 753 [fProxyPasswordField setStringValue: fProxyPassword]; 754 } 755 756 - (void) setProxyPassword: (id) sender 757 { 758 NSString * username = [fDefaults stringForKey: @"ProxyUsername"]; 759 760 //don't allow passwords to be set if no user name 761 if ([username isEqualToString: @""]) 762 { 763 NSBeep(); 764 [fProxyPasswordField setStringValue: @""]; 765 return; 766 } 767 768 [fProxyPassword release]; 769 fProxyPassword = [[sender stringValue] retain]; 770 771 EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission Proxy" 772 withUsername: username]; 773 if (keychainItem) 774 [keychainItem setPassword: fProxyPassword]; 775 else 776 [[EMKeychainProxy sharedProxy] addGenericKeychainItemForService: @"Transmission Proxy" withUsername: username 777 password: fProxyPassword]; 778 779 tr_sessionSetProxyPassword(fHandle, [fProxyPassword UTF8String]); 780 } 781 782 - (void) updateProxyPassword 783 { 784 [fProxyPassword release]; 785 786 NSString * username = [fDefaults stringForKey: @"ProxyUsername"]; 787 788 if (![username isEqualToString: @""]) 789 { 790 EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission Proxy" 791 withUsername: [fDefaults stringForKey: @"ProxyUsername"]]; 792 if (!(fProxyPassword = [keychainItem password])) 793 fProxyPassword = @""; 794 } 795 else 796 fProxyPassword = @""; 797 798 [fProxyPassword retain]; 799 800 tr_sessionSetProxyPassword(fHandle, [fProxyPassword UTF8String]); 751 801 } 752 802
Note: See TracChangeset
for help on using the changeset viewer.