#define DOWNLOAD_FOLDER 0
#define DOWNLOAD_TORRENT 2
-#define SCHED_ALL_TAG 0
-#define SCHED_WEEKDAY_TAG 1
-#define SCHED_WEEKEND_TAG 2
-#define SCHED_MON_TAG 3
-#define SCHED_TUES_TAG 4
-#define SCHED_WED_TAG 5
-#define SCHED_THURS_TAG 6
-#define SCHED_FRI_TAG 7
-#define SCHED_SAT_TAG 8
-#define SCHED_SUN_TAG 9
-
#define PROXY_HTTP 0
#define PROXY_SOCKS4 1
#define PROXY_SOCKS5 2
[fDefaults removeObjectForKey: @"DownloadChoice"];
}
- //set auto speed limit day
- [self updateAutoSpeedLimitDay];
-
//save a new random port
if ([fDefaults boolForKey: @"RandomPort"])
[fDefaults setInteger: tr_sessionGetPeerPort(fHandle) forKey: @"BindPort"];
[fSpeedLimitUploadField setIntValue: [fDefaults integerForKey: @"SpeedLimitUploadLimit"]];
[fSpeedLimitDownloadField setIntValue: [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]];
- int schedDay;
- switch (tr_sessionGetAltSpeedDay(fHandle))
- {
- case TR_SCHED_ALL:
- schedDay = SCHED_ALL_TAG;
- break;
- case TR_SCHED_WEEKDAY:
- schedDay = SCHED_WEEKDAY_TAG;
- break;
- case TR_SCHED_WEEKEND:
- schedDay = SCHED_WEEKEND_TAG;
- break;
- case TR_SCHED_MON:
- schedDay = SCHED_MON_TAG;
- break;
- case TR_SCHED_TUES:
- schedDay = SCHED_TUES_TAG;
- break;
- case TR_SCHED_WED:
- schedDay = SCHED_WED_TAG;
- break;
- case TR_SCHED_THURS:
- schedDay = SCHED_THURS_TAG;
- break;
- case TR_SCHED_FRI:
- schedDay = SCHED_FRI_TAG;
- break;
- case TR_SCHED_SAT:
- schedDay = SCHED_SAT_TAG;
- break;
- case TR_SCHED_SUN:
- schedDay = SCHED_SUN_TAG;
- break;
- }
- [fAutoSpeedDayTypePopUp selectItemWithTag: schedDay];
-
//set port
[fPortField setIntValue: [fDefaults integerForKey: @"BindPort"]];
fNatStatus = -1;
- (void) setAutoSpeedLimitDay: (id) sender
{
- NSString * day;
- switch ([[sender selectedItem] tag])
- {
- case SCHED_ALL_TAG:
- day = @"ALL";
- break;
- case SCHED_WEEKDAY_TAG:
- day = @"WEEKDAY";
- break;
- case SCHED_WEEKEND_TAG:
- day = @"WEEKEND";
- break;
- case SCHED_MON_TAG:
- day = @"MON";
- break;
- case SCHED_TUES_TAG:
- day = @"TUES";
- break;
- case SCHED_WED_TAG:
- day = @"WED";
- break;
- case SCHED_THURS_TAG:
- day = @"THURS";
- break;
- case SCHED_FRI_TAG:
- day = @"FRI";
- break;
- case SCHED_SAT_TAG:
- day = @"SAT";
- break;
- case SCHED_SUN_TAG:
- day = @"SUN";
- break;
- }
-
- [fDefaults setObject: day forKey: @"SpeedLimitAutoDay"];
- [self updateAutoSpeedLimitDay];
-}
-
-- (void) updateAutoSpeedLimitDay
-{
- NSString * dayString = [fDefaults stringForKey: @"SpeedLimitAutoDay"];
- tr_sched_day day;
- if ([dayString isEqualToString: @"WEEKDAY"])
- day = TR_SCHED_WEEKDAY;
- else if ([dayString isEqualToString: @"WEEKEND"])
- day = TR_SCHED_WEEKEND;
- else if ([dayString isEqualToString: @"MON"])
- day = TR_SCHED_MON;
- else if ([dayString isEqualToString: @"TUES"])
- day = TR_SCHED_TUES;
- else if ([dayString isEqualToString: @"WED"])
- day = TR_SCHED_WED;
- else if ([dayString isEqualToString: @"THURS"])
- day = TR_SCHED_THURS;
- else if ([dayString isEqualToString: @"FRI"])
- day = TR_SCHED_FRI;
- else if ([dayString isEqualToString: @"SAT"])
- day = TR_SCHED_SAT;
- else if ([dayString isEqualToString: @"SUN"])
- day = TR_SCHED_SUN;
- else
- {
- //safety
- if (![dayString isEqualToString: @"ALL"])
- {
- dayString = @"ALL";
- [fDefaults setObject: dayString forKey: @"SpeedLimitAutoDay"];
- }
- day = TR_SCHED_ALL;
- }
-
- tr_sessionSetAltSpeedDay(fHandle, day);
+ tr_sessionSetAltSpeedDay(fHandle, [[sender selectedItem] tag]);
}
+ (NSInteger) dateToTimeSum: (NSDate *) date
inBook: [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleHelpBookName"]];
}
-#warning probably needs to be updated
- (void) rpcUpdatePrefs
{
//encryption
NSDate * limitEndDate = [PrefsController timeSumToDate: tr_sessionGetAltSpeedEnd(fHandle)];
[fDefaults setObject: limitEndDate forKey: @"SpeedLimitAutoOffDate"];
- #warning refactor how to work with schedule day
+ const int limitDay = tr_sessionGetAltSpeedDay(fHandle);
+ [fDefaults setInteger: limitDay forKey: @"SpeedLimitAutoDay"];
//blocklist
const BOOL blocklist = tr_blocklistIsEnabled(fHandle);
//speed limit schedule handled by bindings
- //speed limit schedule times handled by bindings
-
- #warning need to set schedule day
+ //speed limit schedule times and day handled by bindings
[self updateBlocklistFields];
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="284666863">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{141, 169}</string>
<reference key="NSSuperview" ref="568562479"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
</object>
<string key="NSFrame">{{1, 1}, {141, 169}}</string>
<reference key="NSSuperview" ref="544077474"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="638525082"/>
<reference key="NSDocView" ref="638525082"/>
<reference key="NSBGColor" ref="729660797"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{184, 1}, {15, 188}}</string>
<reference key="NSSuperview" ref="544077474"/>
- <reference key="NSWindow"/>
<reference key="NSTarget" ref="544077474"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">9.949238e-01</double>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{-100, -100}, {470, 15}}</string>
<reference key="NSSuperview" ref="544077474"/>
- <reference key="NSWindow"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="544077474"/>
<string key="NSAction">_doScroller:</string>
</object>
<string key="NSFrame">{{20, 49}, {143, 171}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="568562479"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="287972127"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 19}, {67, 23}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="116288466">
<int key="NSCellFlags">67239424</int>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{231, 173}, {291, 22}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="227628947">
<int key="NSCellFlags">-1804468671</int>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{228, 203}, {88, 17}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="810991095">
<int key="NSCellFlags">68288064</int>
</object>
<string key="NSFrame">{{171, 173}, {52, 47}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
<int key="NSvFlags">256</int>
<string key="NSFrame">{{302, 136}, {182, 26}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1012387126">
<int key="NSCellFlags">-2076049856</int>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{169, 141}, {130, 18}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="725735591">
<int key="NSCellFlags">67239424</int>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{187, 121}, {292, 14}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="12341917">
<int key="NSCellFlags">67239424</int>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{169, 85}, {323, 18}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="23936638">
<int key="NSCellFlags">-2080244224</int>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{400, 47}, {96, 32}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="565625533">
<int key="NSCellFlags">67239424</int>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{187, 51}, {214, 28}}</string>
<reference key="NSSuperview" ref="284666863"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="660134747">
<int key="NSCellFlags">67239424</int>
</object>
</object>
<string key="NSFrameSize">{542, 240}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="352903881">
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">127</int>
<reference key="NSTarget" ref="159778332"/>
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">1</int>
+ <int key="NSTag">62</int>
<reference key="NSTarget" ref="159778332"/>
</object>
<object class="NSMenuItem" id="916784179">
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">2</int>
+ <int key="NSTag">65</int>
<reference key="NSTarget" ref="159778332"/>
</object>
<object class="NSMenuItem" id="1000099804">
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">3</int>
+ <int key="NSTag">2</int>
<reference key="NSTarget" ref="159778332"/>
</object>
<object class="NSMenuItem" id="197091967">
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">5</int>
+ <int key="NSTag">8</int>
<reference key="NSTarget" ref="159778332"/>
</object>
<object class="NSMenuItem" id="436039952">
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">6</int>
+ <int key="NSTag">16</int>
<reference key="NSTarget" ref="159778332"/>
</object>
<object class="NSMenuItem" id="6729843">
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">7</int>
+ <int key="NSTag">32</int>
<reference key="NSTarget" ref="159778332"/>
</object>
<object class="NSMenuItem" id="734333048">
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">8</int>
+ <int key="NSTag">64</int>
<reference key="NSTarget" ref="159778332"/>
</object>
<object class="NSMenuItem" id="575736191">
<reference key="NSOnImage" ref="550412468"/>
<reference key="NSMixedImage" ref="32510707"/>
<string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">9</int>
+ <int key="NSTag">1</int>
<reference key="NSTarget" ref="159778332"/>
</object>
</object>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSUserDefaultsController" id="356871564">
+ <object class="NSMutableArray" key="NSDeclaredKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>SpeedLimitAutoDay</string>
+ </object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomObject" id="981493640">
</object>
<int key="connectionID">1923</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">selectedTag: values.SpeedLimitAutoDay</string>
+ <reference key="source" ref="290463241"/>
+ <reference key="destination" ref="356871564"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="290463241"/>
+ <reference key="NSDestination" ref="356871564"/>
+ <string key="NSLabel">selectedTag: values.SpeedLimitAutoDay</string>
+ <string key="NSBinding">selectedTag</string>
+ <string key="NSKeyPath">values.SpeedLimitAutoDay</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">1924</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<reference ref="761722050"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{398, 423}, {145, 213}}</string>
+ <string>{{474, 423}, {145, 213}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1923</int>
+ <int key="maxID">1924</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
projects / transmission / commitdiff