Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

get the mac build compiling again

Browse Source
This commit is contained in:
Mitchell Livingston
2007-07-20 04:26:50 +00:00
parent 4ef1592e6b
commit ab163b908f
3 changed files with 116 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
macosx/InfoWindowController.m
View File

@@ -65,9 +65,6 @@
- (void) setWindowForTab: (NSString *) identifier animate: (BOOL) animate;
- (NSArray *) peerSortDescriptors;
- (int) stateSettingToPopUpIndex: (int) index;
- (int) popUpIndexToStateSetting: (int) index;
@end
@implementation InfoWindowController
@@ -457,51 +454,72 @@
{
Torrent * torrent;
//set bandwidth limits
//get bandwidth info
NSEnumerator * enumerator = [fTorrents objectEnumerator];
torrent = [enumerator nextObject]; //first torrent
int checkUpload = [torrent checkUpload],
checkDownload = [torrent checkDownload],
uploadLimit = [torrent uploadLimit],
downloadLimit = [torrent downloadLimit];
int uploadSpeedMode = [torrent uploadSpeedMode],
uploadSpeedLimit = [torrent uploadSpeedLimit],
downloadSpeedMode = [torrent downloadSpeedMode],
downloadSpeedLimit = [torrent downloadSpeedLimit];
while ((checkUpload != INVALID || uploadLimit != INVALID
|| checkDownload != INVALID || downloadLimit != INVALID)
while ((uploadSpeedMode != INVALID || uploadSpeedLimit != INVALID
|| downloadSpeedMode != INVALID || downloadSpeedLimit != INVALID)
&& (torrent = [enumerator nextObject]))
{
if (checkUpload != INVALID && checkUpload != [torrent checkUpload])
checkUpload = INVALID;
if (uploadSpeedMode != INVALID && uploadSpeedMode != [torrent uploadSpeedMode])
uploadSpeedMode = INVALID;
if (uploadLimit != INVALID && uploadLimit != [torrent uploadLimit])
uploadLimit = INVALID;
if (uploadSpeedLimit != INVALID && uploadSpeedLimit != [torrent uploadSpeedLimit])
uploadSpeedLimit = INVALID;
if (checkDownload != INVALID && checkDownload != [torrent checkDownload])
checkDownload = INVALID;
if (downloadSpeedMode != INVALID && downloadSpeedMode != [torrent downloadSpeedMode])
downloadSpeedMode = INVALID;
if (downloadLimit != INVALID && downloadLimit != [torrent downloadLimit])
downloadLimit = INVALID;
if (downloadSpeedLimit != INVALID && downloadSpeedLimit != [torrent downloadSpeedLimit])
downloadSpeedLimit = INVALID;
}
//set upload view
int index;
if (uploadSpeedMode == TR_SPEEDLIMIT_SINGLE)
index = OPTION_POPUP_LIMIT;
else if (uploadSpeedMode == TR_SPEEDLIMIT_UNLIMITED)
index = OPTION_POPUP_NO_LIMIT;
else if (uploadSpeedMode == TR_SPEEDLIMIT_GLOBAL)
index = OPTION_POPUP_GLOBAL;
else
index = -1;
[fUploadLimitPopUp selectItemAtIndex: index];
[fUploadLimitPopUp setEnabled: YES];
[fUploadLimitPopUp selectItemAtIndex: [self stateSettingToPopUpIndex: checkUpload]];
[fUploadLimitLabel setHidden: checkUpload != NSOnState];
[fUploadLimitField setHidden: checkUpload != NSOnState];
if (uploadLimit != INVALID)
[fUploadLimitField setIntValue: uploadLimit];
[fUploadLimitLabel setHidden: uploadSpeedMode != TR_SPEEDLIMIT_SINGLE];
[fUploadLimitField setHidden: uploadSpeedMode != TR_SPEEDLIMIT_SINGLE];
if (uploadSpeedLimit != INVALID)
[fUploadLimitField setIntValue: uploadSpeedLimit];
else
[fUploadLimitField setStringValue: @""];
//set download view
if (downloadSpeedMode == TR_SPEEDLIMIT_SINGLE)
index = OPTION_POPUP_LIMIT;
else if (downloadSpeedMode == TR_SPEEDLIMIT_UNLIMITED)
index = OPTION_POPUP_NO_LIMIT;
else if (downloadSpeedMode == TR_SPEEDLIMIT_GLOBAL)
index = OPTION_POPUP_GLOBAL;
else
index = -1;
[fDownloadLimitPopUp selectItemAtIndex: index];
[fDownloadLimitPopUp setEnabled: YES];
[fDownloadLimitPopUp selectItemAtIndex: [self stateSettingToPopUpIndex: checkDownload]];
[fDownloadLimitLabel setHidden: checkDownload != NSOnState];
[fDownloadLimitField setHidden: checkDownload != NSOnState];
if (downloadLimit != INVALID)
[fDownloadLimitField setIntValue: downloadLimit];
[fDownloadLimitLabel setHidden: downloadSpeedMode != TR_SPEEDLIMIT_SINGLE];
[fDownloadLimitField setHidden: downloadSpeedMode != TR_SPEEDLIMIT_SINGLE];
if (downloadSpeedLimit != INVALID)
[fDownloadLimitField setIntValue: downloadSpeedLimit];
else
[fDownloadLimitField setStringValue: @""];
//set ratio settings
//get ratio info
enumerator = [fTorrents objectEnumerator];
torrent = [enumerator nextObject]; //first torrent
@@ -518,8 +536,18 @@
ratioLimit = INVALID;
}
//set ratio view
if (checkRatio == NSOnState)
index = OPTION_POPUP_LIMIT;
else if (checkRatio == NSOffState)
index = OPTION_POPUP_NO_LIMIT;
else if (checkRatio == NSMixedState)
index = OPTION_POPUP_GLOBAL;
else
index = -1;
[fRatioPopUp selectItemAtIndex: index];
[fRatioPopUp setEnabled: YES];
[fRatioPopUp selectItemAtIndex: [self stateSettingToPopUpIndex: checkRatio]];
[fRatioLimitField setHidden: checkRatio != NSOnState];
if (ratioLimit != INVALID)
[fRatioLimitField setFloatValue: ratioLimit];
@@ -578,30 +606,6 @@
[self updateInfoSettings];
}
- (int) stateSettingToPopUpIndex: (int) index
{
if (index == NSOnState)
return OPTION_POPUP_LIMIT;
else if (index == NSOffState)
return OPTION_POPUP_NO_LIMIT;
else if (index == NSMixedState)
return OPTION_POPUP_GLOBAL;
else
return -1;
}
- (int) popUpIndexToStateSetting: (int) index
{
if (index == OPTION_POPUP_LIMIT)
return NSOnState;
else if (index == OPTION_POPUP_NO_LIMIT)
return NSOffState;
else if (index == OPTION_POPUP_GLOBAL)
return NSMixedState;
else
return INVALID;
}
- (BOOL) validateMenuItem: (NSMenuItem *) menuItem
{
SEL action = [menuItem action];
@@ -1091,28 +1095,35 @@
[fFileOutline reloadData];
}
#warning rename to mode
- (void) setLimitSetting: (id) sender
{
BOOL upload = sender == fUploadLimitPopUp;
int setting;
if ((setting = [self popUpIndexToStateSetting: [sender indexOfSelectedItem]]) == INVALID)
return;
int index = [sender indexOfSelectedItem], mode;
if (index == OPTION_POPUP_LIMIT)
mode = TR_SPEEDLIMIT_SINGLE;
else if (index == OPTION_POPUP_NO_LIMIT)
mode = TR_SPEEDLIMIT_UNLIMITED;
else
mode = TR_SPEEDLIMIT_GLOBAL;
Torrent * torrent;
NSEnumerator * enumerator = [fTorrents objectEnumerator];
while ((torrent = [enumerator nextObject]))
upload ? [torrent setCheckUpload: setting] : [torrent setCheckDownload: setting];
upload ? [torrent setUploadSpeedMode: mode] : [torrent setDownloadSpeedMode: mode];
NSTextField * field = upload ? fUploadLimitField : fDownloadLimitField;
[field setHidden: setting != NSOnState];
if (setting == NSOnState)
BOOL single = mode == TR_SPEEDLIMIT_SINGLE;
[field setHidden: !single];
if (single)
{
[field selectText: self];
[[self window] makeKeyAndOrderFront:self];
}
NSTextField * label = upload ? fUploadLimitLabel : fDownloadLimitLabel;
[label setHidden: setting != NSOnState];
[label setHidden: !single];
}
- (void) setSpeedLimit: (id) sender
@@ -1128,9 +1139,9 @@
NSBeep();
torrent = [enumerator nextObject]; //use first torrent
limit = upload ? [torrent uploadLimit] : [torrent downloadLimit];
limit = upload ? [torrent uploadSpeedLimit] : [torrent downloadSpeedLimit];
while ((torrent = [enumerator nextObject]))
if (limit != (upload ? [torrent uploadLimit] : [torrent downloadLimit]))
if (limit != (upload ? [torrent uploadSpeedLimit] : [torrent downloadSpeedLimit]))
{
[sender setStringValue: @""];
return;
@@ -1141,23 +1152,28 @@
else
{
while ((torrent = [enumerator nextObject]))
upload ? [torrent setUploadLimit: limit] : [torrent setDownloadLimit: limit];
upload ? [torrent setUploadSpeedLimit: limit] : [torrent setDownloadSpeedLimit: limit];
}
}
- (void) setRatioSetting: (id) sender
{
int setting;
if ((setting = [self popUpIndexToStateSetting: [sender indexOfSelectedItem]]) == INVALID)
return;
int index = [sender indexOfSelectedItem], setting;
if (index == OPTION_POPUP_LIMIT)
setting = NSOnState;
else if (index == OPTION_POPUP_NO_LIMIT)
setting = NSOffState;
else
setting = NSMixedState;
Torrent * torrent;
NSEnumerator * enumerator = [fTorrents objectEnumerator];
while ((torrent = [enumerator nextObject]))
[torrent setRatioSetting: setting];
[fRatioLimitField setHidden: setting != NSOnState];
if (setting == NSOnState)
BOOL single = setting == NSOnState;
[fRatioLimitField setHidden: !single];
if (single)
{
[fRatioLimitField selectText: self];
[[self window] makeKeyAndOrderFront:self];

22
macosx/Torrent.h
View File

@@ -56,9 +56,8 @@
tr_file_stat_t * fileStat;
NSArray * fFileList, * fFlatFileList;
int fUploadLimit, fDownloadLimit;
float fRatioLimit;
int fCheckUpload, fCheckDownload, fRatioSetting;
int fRatioSetting;
BOOL fFinishedSeeding, fWaitToStart, fError, fChecking, fStalled;
int fOrderValue;
@@ -103,16 +102,15 @@
- (float) actualStopRatio; //returns INVALID if will not stop
- (float) progressStopRatio;
- (int) checkUpload;
- (void) setCheckUpload: (int) setting;
- (int) uploadLimit;
- (void) setUploadLimit: (int) limit;
- (int) checkDownload;
- (void) setCheckDownload: (int) setting;
- (int) downloadLimit;
- (void) setDownloadLimit: (int) limit;
- (void) updateSpeedSetting;
#warning merge up and down?
- (int) uploadSpeedMode;
- (void) setUploadSpeedMode: (int) mode;
- (int) uploadSpeedLimit;
- (void) setUploadSpeedLimit: (int) limit;
- (int) downloadSpeedMode;
- (void) setDownloadSpeedMode: (int) mode;
- (int) downloadSpeedLimit;
- (void) setDownloadSpeedLimit: (int) limit;
- (void) setWaitToStart: (BOOL) wait;
- (BOOL) waitingToStart;

91
macosx/Torrent.m
View File

@@ -41,9 +41,6 @@ static int static_lastid = 0;
dateAdded: (NSDate *) dateAdded dateCompleted: (NSDate *) dateCompleted
dateActivity: (NSDate *) dateActivity
ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit
limitSpeedCustom: (NSNumber *) limitCustom
checkUpload: (NSNumber *) checkUpload uploadLimit: (NSNumber *) uploadLimit
checkDownload: (NSNumber *) checkDownload downloadLimit: (NSNumber *) downloadLimit
pex: (NSNumber *) pex
waitToStart: (NSNumber *) waitToStart orderValue: (NSNumber *) orderValue;
@@ -82,9 +79,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
dateAdded: nil dateCompleted: nil
dateActivity: nil
ratioSetting: nil ratioLimit: nil
limitSpeedCustom: nil
checkUpload: nil uploadLimit: nil
checkDownload: nil downloadLimit: nil
pex: nil
waitToStart: nil orderValue: nil];
@@ -109,11 +103,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
dateActivity: [history objectForKey: @"DateActivity"]
ratioSetting: [history objectForKey: @"RatioSetting"]
ratioLimit: [history objectForKey: @"RatioLimit"]
limitSpeedCustom: [history objectForKey: @"LimitSpeedCustom"]
checkUpload: [history objectForKey: @"CheckUpload"]
uploadLimit: [history objectForKey: @"UploadLimit"]
checkDownload: [history objectForKey: @"CheckDownload"]
downloadLimit: [history objectForKey: @"DownloadLimit"]
pex: [history objectForKey: @"Pex"]
waitToStart: [history objectForKey: @"WaitToStart"]
orderValue: [history objectForKey: @"OrderValue"]];
@@ -142,10 +131,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
fDateAdded, @"Date",
[NSNumber numberWithInt: fRatioSetting], @"RatioSetting",
[NSNumber numberWithFloat: fRatioLimit], @"RatioLimit",
[NSNumber numberWithInt: fCheckUpload], @"CheckUpload",
[NSNumber numberWithInt: fUploadLimit], @"UploadLimit",
[NSNumber numberWithInt: fCheckDownload], @"CheckDownload",
[NSNumber numberWithInt: fDownloadLimit], @"DownloadLimit",
[NSNumber numberWithBool: fWaitToStart], @"WaitToStart",
[self orderValue], @"OrderValue", nil];
@@ -267,12 +252,8 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
if (fUseIncompleteFolder && ![[self downloadFolder] isEqualToString: fDownloadFolder]
&& (canMove = [self alertForMoveFolderAvailable]))
{
#warning pause without actually stopping
//pause without actually stopping
tr_torrentEnableMaxSpeedUL(fHandle, 1);
tr_torrentSetMaxSpeedUL(fHandle, 0);
tr_torrentEnableMaxSpeedDL(fHandle, 1);
tr_torrentSetMaxSpeedDL(fHandle, 0);
if ([[NSFileManager defaultManager] movePath: [[self downloadFolder] stringByAppendingPathComponent: [self name]]
toPath: [fDownloadFolder stringByAppendingPathComponent: [self name]] handler: nil])
@@ -280,7 +261,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
else
canMove = NO;
[self updateSpeedSetting];
#warning unpause
}
if (!canMove)
@@ -640,57 +621,44 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
return 0;
}
- (int) checkUpload
- (int) uploadSpeedMode
{
return fCheckUpload;
return tr_torrentGetSpeedMode(fHandle, TR_UP);
}
- (void) setCheckUpload: (int) setting
- (void) setUploadSpeedMode: (int) mode
{
fCheckUpload = setting;
[self updateSpeedSetting];
tr_torrentSetSpeedMode(fHandle, TR_UP, mode);
}
- (int) uploadLimit
- (int) uploadSpeedLimit
{
return fUploadLimit;
return tr_torrentGetSpeedLimit(fHandle, TR_UP);
}
- (void) setUploadLimit: (int) limit
- (void) setUploadSpeedLimit: (int) limit
{
fUploadLimit = limit;
[self updateSpeedSetting];
tr_torrentSetSpeedLimit(fHandle, TR_UP, limit);
}
- (int) checkDownload
- (int) downloadSpeedMode
{
return fCheckDownload;
return tr_torrentGetSpeedMode(fHandle, TR_DOWN);
}
- (void) setCheckDownload: (int) setting
- (void) setDownloadSpeedMode: (int) mode
{
fCheckDownload = setting;
[self updateSpeedSetting];
tr_torrentSetSpeedMode(fHandle, TR_DOWN, mode);
}
- (int) downloadLimit
- (int) downloadSpeedLimit
{
return fDownloadLimit;
return tr_torrentGetSpeedLimit(fHandle, TR_DOWN);
}
- (void) setDownloadLimit: (int) limit
- (void) setDownloadSpeedLimit: (int) limit
{
fDownloadLimit = limit;
[self updateSpeedSetting];
}
- (void) updateSpeedSetting
{
tr_torrentEnableMaxSpeedUL(fHandle, fCheckUpload != NSMixedState);
tr_torrentSetMaxSpeedUL(fHandle, fCheckUpload == NSOnState ? fUploadLimit : -1);
tr_torrentEnableMaxSpeedDL(fHandle, fCheckDownload != NSMixedState);
tr_torrentSetMaxSpeedDL(fHandle, fCheckDownload == NSOnState ? fDownloadLimit : -1);
tr_torrentSetSpeedLimit(fHandle, TR_DOWN, limit);
}
- (void) setWaitToStart: (BOOL) wait
@@ -754,12 +722,8 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
return;
}
#warning pause without actually stopping
//pause without actually stopping
tr_torrentEnableMaxSpeedUL(fHandle, 1);
tr_torrentSetMaxSpeedUL(fHandle, 0);
tr_torrentEnableMaxSpeedDL(fHandle, 1);
tr_torrentSetMaxSpeedDL(fHandle, 0);
if ([[NSFileManager defaultManager] movePath: [oldFolder stringByAppendingPathComponent: [self name]]
toPath: [folder stringByAppendingPathComponent: [self name]] handler: nil])
@@ -775,11 +739,11 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateInfoSettings" object: nil];
[self updateSpeedSetting];
#warning unpause
}
else
{
[self updateSpeedSetting]; //restart before showing the alert
#warning unpause //restart before showing the alert
NSAlert * alert = [[NSAlert alloc] init];
[alert setMessageText: NSLocalizedString(@"There was an error moving the data file.", "Move error alert -> title")];
@@ -1523,9 +1487,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
dateAdded: (NSDate *) dateAdded dateCompleted: (NSDate *) dateCompleted
dateActivity: (NSDate *) dateActivity
ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit
limitSpeedCustom: (NSNumber *) limitCustom
checkUpload: (NSNumber *) checkUpload uploadLimit: (NSNumber *) uploadLimit
checkDownload: (NSNumber *) checkDownload downloadLimit: (NSNumber *) downloadLimit
pex: (NSNumber *) pex
waitToStart: (NSNumber *) waitToStart orderValue: (NSNumber *) orderValue;
{
@@ -1585,10 +1546,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
}
fInfo = tr_torrentInfo(fHandle);
NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
[nc addObserver: self selector: @selector(updateSpeedSetting:)
name: @"UpdateSpeedSetting" object: nil];
fDateAdded = dateAdded ? [dateAdded retain] : [[NSDate alloc] init];
if (dateCompleted)
@@ -1599,12 +1556,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
fRatioSetting = ratioSetting ? [ratioSetting intValue] : NSMixedState;
fRatioLimit = ratioLimit ? [ratioLimit floatValue] : [fDefaults floatForKey: @"RatioLimit"];
fFinishedSeeding = NO;
fCheckUpload = checkUpload ? [checkUpload intValue] : NSMixedState;
fUploadLimit = uploadLimit ? [uploadLimit intValue] : [fDefaults integerForKey: @"UploadLimit"];
fCheckDownload = checkDownload ? [checkDownload intValue] : NSMixedState;
fDownloadLimit = downloadLimit ? [downloadLimit intValue] : [fDefaults integerForKey: @"DownloadLimit"];
[self updateSpeedSetting];
if ([self privateTorrent])
fPex = NO;