Changeset 8386


Ignore:
Timestamp:
May 12, 2009, 12:58:22 AM (12 years ago)
Author:
livings124
Message:

#2045 hold down option key on launch to start with all torrents paused

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r8383 r8386  
    11NEWS file for Transmission <http://www.transmissionbt.com/>
     2
     31.70 (2009/mm/dd)
     4<http://trac.transmissionbt.com/query?milestone=1.70&group=component&groupdesc=1&order=severity>
     5- Mac
     6   + Hold down the option key on launch to pause all transfers
    27
    381.61 (2009/05/11)
  • trunk/Transmission.xcodeproj/project.pbxproj

    r8305 r8386  
    8787                A226FDAC0D0CDF20005A7F71 /* libnatpmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C7A118D0D0B2EB800B5701F /* libnatpmp.a */; };
    8888                A22A8D560AEEAFA5007E9CB9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A22A8D540AEEAFA5007E9CB9 /* Localizable.strings */; };
     89                A22CFB820FB66EF30009BD3E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A22CFB810FB66EF30009BD3E /* Carbon.framework */; };
    8990                A22D3AA60D00D1790079CFED /* TurtleTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA30D00D1790079CFED /* TurtleTemplate.png */; };
    9091                A22E59A70DC11A1D00F4BE15 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A29EBE700DC06068006CEE80 /* libcurl.dylib */; };
     
    484485                A22CF7CF0FA6750E0009BD3E /* tr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = tr; path = macosx/tr.lproj/GroupRules.xib; sourceTree = "<group>"; };
    485486                A22CF7D10FA6A19B0009BD3E /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = macosx/ru.lproj/GroupRules.xib; sourceTree = "<group>"; };
     487                A22CFB810FB66EF30009BD3E /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
    486488                A22D3AA30D00D1790079CFED /* TurtleTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TurtleTemplate.png; path = macosx/Images/TurtleTemplate.png; sourceTree = "<group>"; };
    487489                A22F1E540E7DA8030065DB9D /* sparkle_dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = sparkle_dsa_pub.pem; path = macosx/sparkle_dsa_pub.pem; sourceTree = "<group>"; };
     
    802804                                A29EBE710DC06068006CEE80 /* libcurl.dylib in Frameworks */,
    803805                                A2E669790F5B8E5A00B4251A /* Security.framework in Frameworks */,
     806                                A22CFB820FB66EF30009BD3E /* Carbon.framework in Frameworks */,
    804807                        );
    805808                        runOnlyForDeploymentPostprocessing = 0;
     
    10631066                                29B97325FDCFA39411CA2CEA /* Foundation.framework */,
    10641067                                A2E669780F5B8E5A00B4251A /* Security.framework */,
     1068                                A22CFB810FB66EF30009BD3E /* Carbon.framework */,
    10651069                                A261F1DB0A69A1610002815A /* Growl.framework */,
    10661070                                A24F19070A3A790800C9C145 /* Sparkle.framework */,
  • trunk/macosx/Controller.h

    r8119 r8386  
    9898   
    9999    BOOL                            fUpdateInProgress;
     100    BOOL                            fPauseOnLaunch;
    100101   
    101102    Badger                          * fBadger;
  • trunk/macosx/Controller.m

    r8371 r8386  
    2525#import <IOKit/IOMessage.h>
    2626#import <IOKit/pwr_mgt/IOPMLib.h>
     27#import <Carbon/Carbon.h>
    2728
    2829#import "Controller.h"
     
    307308        [[SUUpdater sharedUpdater] setDelegate: self];
    308309        fUpdateInProgress = NO;
     310       
     311        fPauseOnLaunch = (GetCurrentKeyModifiers() & (optionKey | rightOptionKey)) != 0;
    309312    }
    310313    return self;
     
    402405        {
    403406            Torrent * torrent;
    404             if ((torrent = [[Torrent alloc] initWithHistory: historyItem lib: fLib]))
     407            if ((torrent = [[Torrent alloc] initWithHistory: historyItem lib: fLib forcePause: fPauseOnLaunch]))
    405408            {
    406409                [fTorrents addObject: torrent];
  • trunk/macosx/Torrent.h

    r8260 r8386  
    7676        lib: (tr_session *) lib;
    7777- (id) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_session *) lib;
    78 - (id) initWithHistory: (NSDictionary *) history lib: (tr_session *) lib;
     78- (id) initWithHistory: (NSDictionary *) history lib: (tr_session *) lib forcePause: (BOOL) pause;
    7979
    8080- (NSDictionary *) history;
  • trunk/macosx/Torrent.m

    r8260 r8386  
    117117}
    118118
    119 - (id) initWithHistory: (NSDictionary *) history lib: (tr_session *) lib
     119- (id) initWithHistory: (NSDictionary *) history lib: (tr_session *) lib forcePause: (BOOL) pause
    120120{
    121121    self = [self initWithHash: [history objectForKey: @"TorrentHash"]
     
    133133        //start transfer
    134134        NSNumber * active;
    135         if ((active = [history objectForKey: @"Active"]) && [active boolValue])
     135        if (!pause && (active = [history objectForKey: @"Active"]) && [active boolValue])
    136136        {
    137137            fStat = tr_torrentStat(fHandle);
Note: See TracChangeset for help on using the changeset viewer.