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

save the value of the speed limit day without conversion

This commit is contained in:
Mitchell Livingston 2009-04-05 20:13:16 +00:00
parent 248a0c7fcb
commit 293524e9ca
5 changed files with 39 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macosx/Controller.m
View File

@ -221,7 +221,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
}
tr_benc settings;
tr_bencInitDict(&settings, 32);
tr_bencInitDict(&settings, 33);
tr_sessionGetDefaultSettings(&settings);
const BOOL usesSpeedLimitSched = [fDefaults boolForKey: @"SpeedLimitAuto"];
@ -236,6 +236,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[fDefaults objectForKey: @"SpeedLimitAutoOnDate"]]);
tr_bencDictAddInt(&settings, TR_PREFS_KEY_ALT_SPEED_TIME_END, [PrefsController dateToTimeSum:
[fDefaults objectForKey: @"SpeedLimitAutoOffDate"]]);
tr_bencDictAddInt(&settings, TR_PREFS_KEY_ALT_SPEED_TIME_DAY, [fDefaults integerForKey: @"SpeedLimitAutoDay"]);
tr_bencDictAddInt(&settings, TR_PREFS_KEY_DSPEED, [fDefaults integerForKey: @"DownloadLimit"]);
tr_bencDictAddBool(&settings, TR_PREFS_KEY_DSPEED_ENABLED, [fDefaults boolForKey: @"CheckDownload"]);

2
macosx/Defaults.plist
View File

@ -163,7 +163,7 @@
<key>SpeedLimitAutoOnDate</key>
<date>2000-01-01T03:00:00Z</date>
<key>SpeedLimitAutoDay</key>
<string>ALL</string>
<integer>127</integer>
<key>SpeedLimitDownloadLimit</key>
<integer>10</integer>
<key>SpeedLimitUploadLimit</key>

1
macosx/PrefsController.h
View File

@ -118,7 +118,6 @@
- (void) setAutoSpeedLimit: (id) sender;
- (void) setAutoSpeedLimitTime: (id) sender;
- (void) setAutoSpeedLimitDay: (id) sender;
- (void) updateAutoSpeedLimitDay;
+ (NSInteger) dateToTimeSum: (NSDate *) date;
+ (NSDate *) timeSumToDate: (NSInteger) sum;

132
macosx/PrefsController.m
View File

@ -36,17 +36,6 @@
#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
@ -111,9 +100,6 @@ tr_session * fHandle;
[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"];
@ -201,42 +187,6 @@ tr_session * fHandle;
[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;
@ -661,79 +611,7 @@ tr_session * fHandle;
- (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
@ -1184,7 +1062,6 @@ tr_session * fHandle;
inBook: [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleHelpBookName"]];
}
#warning probably needs to be updated
- (void) rpcUpdatePrefs
{
//encryption
@ -1257,7 +1134,8 @@ tr_session * fHandle;
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);
@ -1298,9 +1176,7 @@ tr_session * 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];

60
macosx/en.lproj/PrefsWindow.xib
View File

@ -1548,7 +1548,7 @@
<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>
@ -1567,7 +1567,6 @@
<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"/>
@ -3069,7 +3068,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
</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"/>
@ -3080,7 +3078,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3090,7 +3087,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3100,7 +3096,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
</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"/>
@ -3113,7 +3108,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3152,7 +3146,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3170,7 +3163,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3194,7 +3186,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
</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">
@ -3207,7 +3198,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3280,7 +3270,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3303,7 +3292,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3320,7 +3308,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3343,7 +3330,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3364,7 +3350,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
<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>
@ -3378,8 +3363,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
</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">
@ -3998,6 +3981,7 @@ AAABAAAAAQ</bytes>
<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>
@ -4015,7 +3999,7 @@ AAABAAAAAQ</bytes>
<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">
@ -4027,7 +4011,7 @@ AAABAAAAAQ</bytes>
<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">
@ -4052,7 +4036,7 @@ AAABAAAAAQ</bytes>
<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">
@ -4076,7 +4060,7 @@ AAABAAAAAQ</bytes>
<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">
@ -4088,7 +4072,7 @@ AAABAAAAAQ</bytes>
<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">
@ -4100,7 +4084,7 @@ AAABAAAAAQ</bytes>
<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">
@ -4112,7 +4096,7 @@ AAABAAAAAQ</bytes>
<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">
@ -4124,7 +4108,7 @@ AAABAAAAAQ</bytes>
<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>
@ -5692,6 +5676,10 @@ AAABAAAAAQ</bytes>
<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">
@ -8932,6 +8920,22 @@ AAABAAAAAQ</bytes>
</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">
@ -12604,7 +12608,7 @@ AAABAAAAAQ</bytes>
<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>
@ -12843,7 +12847,7 @@ AAABAAAAAQ</bytes>
</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">