mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

rearrange proxy prefs, and validate the proxy address value on entry

This commit is contained in:
Mitchell Livingston 2008-06-10 22:54:30 +00:00
parent 5158d6a38e
commit 5b80678dd0
4 changed files with 91 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
macosx/English.lproj/PrefsWindow.xib
View File

@ -2563,7 +2563,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="631967205">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{51, 34}, {90, 17}}</string>
<string key="NSFrame">{{52, 34}, {90, 17}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="514153614">
@ -2579,7 +2579,7 @@ AAABAAAAAQ</bytes>
<object class="NSButton" id="109684042">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{144, 33}, {357, 18}}</string>
<string key="NSFrame">{{145, 33}, {357, 18}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="127446013">
@ -2602,7 +2602,7 @@ AAABAAAAAQ</bytes>
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">1280</int>
<object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{316, 229}, {16, 16}}</string>
<string key="NSFrame">{{317, 253}, {16, 16}}</string>
<reference key="NSSuperview" ref="204700639"/>
<int key="NSpiFlags">28938</int>
<double key="NSMaxValue">1.000000e+02</double>
@ -2622,7 +2622,7 @@ AAABAAAAAQ</bytes>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{317, 230}, {14, 14}}</string>
<string key="NSFrame">{{318, 254}, {14, 14}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="270102740">
@ -2642,7 +2642,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="585772012">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{131, 229}, {124, 17}}</string>
<string key="NSFrame">{{132, 253}, {124, 17}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="941628063">
@ -2658,7 +2658,7 @@ AAABAAAAAQ</bytes>
<object class="NSButton" id="316696878">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{132, 207}, {171, 18}}</string>
<string key="NSFrame">{{133, 231}, {171, 18}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="633401664">
@ -2680,13 +2680,13 @@ AAABAAAAAQ</bytes>
<object class="NSButton" id="622323577">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{132, 150}, {149, 18}}</string>
<string key="NSFrame">{{133, 174}, {252, 18}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="20752657">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Use a tracker proxy:</string>
<string key="NSContents">Connect to tracker with HTTP proxy:</string>
<reference key="NSSupport" ref="86725571"/>
<reference key="NSControlView" ref="622323577"/>
<int key="NSButtonFlags">1211912703</int>
@ -2702,7 +2702,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="911608268">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{260, 227}, {50, 22}}</string>
<string key="NSFrame">{{261, 251}, {50, 22}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="453443006">
@ -2768,7 +2768,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="646636981">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{131, 191}, {238, 14}}</string>
<string key="NSFrame">{{132, 215}, {238, 14}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="67017561">
@ -2784,7 +2784,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="992746122">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{336, 229}, {154, 17}}</string>
<string key="NSFrame">{{337, 253}, {154, 17}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="931894024">
@ -2800,7 +2800,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="25993221">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{68, 230}, {61, 17}}</string>
<string key="NSFrame">{{69, 254}, {61, 17}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="475516915">
@ -2816,7 +2816,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="90035294">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{32, 151}, {97, 17}}</string>
<string key="NSFrame">{{33, 175}, {97, 17}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="582281809">
@ -2832,7 +2832,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="185775633">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{287, 149}, {138, 22}}</string>
<string key="NSFrame">{{242, 147}, {184, 22}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1051431853">
@ -2849,7 +2849,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="257109686">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{173, 73}, {68, 17}}</string>
<string key="NSFrame">{{174, 73}, {68, 17}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="954130018">
@ -2865,7 +2865,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="925265526">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{170, 101}, {71, 17}}</string>
<string key="NSFrame">{{171, 101}, {71, 17}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="108838744">
@ -2878,10 +2878,26 @@ AAABAAAAAQ</bytes>
<reference key="NSTextColor" ref="400627124"/>
</object>
</object>
<object class="NSTextField" id="995948995">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{151, 149}, {86, 17}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="677732006">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Proxy server:</string>
<reference key="NSSupport" ref="86725571"/>
<reference key="NSControlView" ref="995948995"/>
<reference key="NSBackgroundColor" ref="977951849"/>
<reference key="NSTextColor" ref="400627124"/>
</object>
</object>
<object class="NSButton" id="473194484">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{151, 125}, {187, 18}}</string>
<string key="NSFrame">{{152, 125}, {187, 18}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="296153825">
@ -2903,7 +2919,7 @@ AAABAAAAAQ</bytes>
<object class="NSSecureTextField" id="1043027599">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{246, 71}, {179, 22}}</string>
<string key="NSFrame">{{247, 71}, {179, 22}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="669471795">
@ -2924,7 +2940,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="876018656">
<reference key="NSNextResponder" ref="204700639"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{246, 99}, {179, 22}}</string>
<string key="NSFrame">{{247, 99}, {179, 22}}</string>
<reference key="NSSuperview" ref="204700639"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="731460553">
@ -2939,7 +2955,7 @@ AAABAAAAAQ</bytes>
</object>
</object>
</object>
<string key="NSFrameSize">{535, 269}</string>
<string key="NSFrameSize">{535, 293}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
@ -5746,22 +5762,6 @@ AAABAAAAAQ</bytes>
</object>
<int key="connectionID">1643</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: values.ProxyAddress</string>
<reference key="source" ref="185775633"/>
<reference key="destination" ref="356871564"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="185775633"/>
<reference key="NSDestination" ref="356871564"/>
<string key="NSLabel">value: values.ProxyAddress</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">values.ProxyAddress</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1646</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">setProxyEnabled:</string>
@ -5802,6 +5802,14 @@ AAABAAAAAQ</bytes>
</object>
<int key="connectionID">1651</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">fProxyAddressField</string>
<reference key="source" ref="511492310"/>
<reference key="destination" ref="185775633"/>
</object>
<int key="connectionID">1659</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -6305,6 +6313,7 @@ AAABAAAAAQ</bytes>
<reference ref="473194484"/>
<reference ref="1043027599"/>
<reference ref="876018656"/>
<reference ref="995948995"/>
</object>
<reference key="parent" ref="37013934"/>
<string key="objectName">Network</string>
@ -8004,6 +8013,20 @@ AAABAAAAAQ</bytes>
<reference key="object" ref="644224844"/>
<reference key="parent" ref="535988411"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1657</int>
<reference key="object" ref="995948995"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="677732006"/>
</object>
<reference key="parent" ref="204700639"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1658</int>
<reference key="object" ref="677732006"/>
<reference key="parent" ref="995948995"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -8172,6 +8195,8 @@ AAABAAAAAQ</bytes>
<string>163.ImportedFromIB2</string>
<string>1644.IBPluginDependency</string>
<string>1644.ImportedFromIB2</string>
<string>1657.IBPluginDependency</string>
<string>1657.ImportedFromIB2</string>
<string>190.IBPluginDependency</string>
<string>190.ImportedFromIB2</string>
<string>192.IBPluginDependency</string>
@ -8553,6 +8578,8 @@ AAABAAAAAQ</bytes>
<reference ref="761722050"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
<string>{{593, 449}, {182, 53}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
@ -8704,7 +8731,7 @@ AAABAAAAAQ</bytes>
<reference ref="761722050"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
<string>{{327, 403}, {535, 269}}</string>
<string>{{327, 403}, {535, 293}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
<string>{{281, 577}, {539, 315}}</string>
@ -8758,7 +8785,7 @@ AAABAAAAAQ</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1654</int>
<int key="maxID">1659</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -8952,6 +8979,7 @@ AAABAAAAAQ</bytes>
<string>fPortStatusField</string>
<string>fPortStatusImage</string>
<string>fPortStatusProgress</string>
<string>fProxyAddressField</string>
<string>fQueueDownloadField</string>
<string>fQueueSeedField</string>
<string>fRPCAccessTable</string>
@ -8986,6 +9014,7 @@ AAABAAAAAQ</bytes>
<string>NSProgressIndicator</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTableView</string>
<string>NSSegmentedControl</string>
<string>NSTextField</string>

6
macosx/PiecesView.m
View File

@ -29,10 +29,10 @@
#define MAX_ACROSS 18
#define BETWEEN 1.0
#define HIGH_PEERS 15
#define HIGH_PEERS 30
#define PIECE_NONE 0
#define PIECE_MIXED 1
#define PIECE_SOME 1
#define PIECE_HIGH_PEERS 2
#define PIECE_FINISHED 3
#define PIECE_FLASHING 4
@ -184,7 +184,7 @@
float percent = showAvailablity ? (float)pieces[index]/HIGH_PEERS : piecesPercent[index];
NSColor * fullColor = showAvailablity ? fGreenAvailabilityColor : fBluePieceColor;
pieceColor = [[NSColor whiteColor] blendedColorWithFraction: percent ofColor: fullColor];
fPieces[index] = PIECE_MIXED;
fPieces[index] = PIECE_SOME;
}
if (pieceColor)

1
macosx/PrefsController.h
View File

@ -56,6 +56,7 @@
IBOutlet NSProgressIndicator * fPortStatusProgress;
NSTimer * fPortStatusTimer;
int fPeerPort, fNatStatus;
IBOutlet NSTextField * fProxyAddressField;
IBOutlet NSTextField * fRPCPortField;
IBOutlet NSTableView * fRPCAccessTable;

21
macosx/PrefsController.m
View File

@ -184,6 +184,9 @@
[fQueueSeedField setIntValue: [fDefaults integerForKey: @"QueueSeedNumber"]];
[fStalledField setIntValue: [fDefaults integerForKey: @"StalledMinutes"]];
//set proxy address
[fProxyAddressField setStringValue: [fDefaults stringForKey: @"ProxyAddress"]];
//set blocklist
[self updateBlocklistFields];
@ -652,7 +655,23 @@
- (void) setProxyAddress: (id) sender
{
tr_sessionSetProxy(fHandle, [[fDefaults stringForKey: @"ProxyAddress"] UTF8String]);
NSString * address = [sender stringValue];
BOOL blank = [address isEqualToString: @""];
if (!blank && [address rangeOfString: @"://"].location == NSNotFound)
address = [@"http://" stringByAppendingString: address];
if (blank || tr_httpIsValidURL([address UTF8String]))
{
tr_sessionSetProxy(fHandle, [address UTF8String]);
[sender setStringValue: address];
[fDefaults setObject: address forKey: @"ProxyAddress"];
}
else
{
NSBeep();
[sender setStringValue: [fDefaults stringForKey: @"ProxyAddress"]];
}
}
- (void) setProxyAuthorize: (id) sender