Changeset 2100


Ignore:
Timestamp:
Jun 16, 2007, 8:48:19 PM (15 years ago)
Author:
livings124
Message:

merge in what I have for torrent creation...not guaranteed to not crash or cause fires

Location:
branches/file_selection
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • branches/file_selection/Transmission.xcodeproj/project.pbxproj

    r2052 r2100  
    113113                A2D4F0830A915F6600890C32 /* RedDot.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D4F0820A915F6600890C32 /* RedDot.tiff */; };
    114114                A2D4F0850A915F7200890C32 /* GreenDot.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D4F0840A915F7200890C32 /* GreenDot.tiff */; };
     115                A2DF37060C220D03006523C1 /* CreatorWindowController.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2DF37040C220D03006523C1 /* CreatorWindowController.h */; };
     116                A2DF37070C220D03006523C1 /* CreatorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2DF37050C220D03006523C1 /* CreatorWindowController.m */; };
     117                A2DF377C0C222E2D006523C1 /* Creator.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2DF377A0C222E2D006523C1 /* Creator.nib */; };
    115118                A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
    116119                A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */; };
     
    246249                                A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */,
    247250                                A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */,
     251                                A2DF37060C220D03006523C1 /* CreatorWindowController.h in CopyFiles */,
    248252                        );
    249253                        runOnlyForDeploymentPostprocessing = 0;
     
    419423                A2D4F0820A915F6600890C32 /* RedDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = RedDot.tiff; path = macosx/Images/RedDot.tiff; sourceTree = "<group>"; };
    420424                A2D4F0840A915F7200890C32 /* GreenDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GreenDot.tiff; path = macosx/Images/GreenDot.tiff; sourceTree = "<group>"; };
     425                A2DF37040C220D03006523C1 /* CreatorWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CreatorWindowController.h; path = macosx/CreatorWindowController.h; sourceTree = "<group>"; };
     426                A2DF37050C220D03006523C1 /* CreatorWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CreatorWindowController.m; path = macosx/CreatorWindowController.m; sourceTree = "<group>"; };
     427                A2DF377B0C222E2D006523C1 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../Transmission/macosx/English.lproj/Creator.nib; sourceTree = SOURCE_ROOT; };
    421428                A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButton.png; path = macosx/Images/SpeedLimitButton.png; sourceTree = "<group>"; };
    422429                A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
     
    598605                                A256588A0A9A695400E8A03B /* MessageWindowController.h */,
    599606                                A256588B0A9A695400E8A03B /* MessageWindowController.m */,
     607                                A2DF37040C220D03006523C1 /* CreatorWindowController.h */,
     608                                A2DF37050C220D03006523C1 /* CreatorWindowController.m */,
    600609                                E1B6FBF80C0D719B0015FE4D /* Info Window */,
    601610                                E1B6FBFD0C0D72430015FE4D /* Prefs Window */,
     
    677686                                A200B9620A227FD0007BBB1E /* InfoWindow.nib */,
    678687                                A21567EB0A9A5034004DECD6 /* MessageWindow.nib */,
     688                                A2DF377A0C222E2D006523C1 /* Creator.nib */,
    679689                                A2C655640A04FEDC00E9FD82 /* BottomBorder.png */,
    680690                                A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */,
     
    11551165                                A24103070AF80E390001C8D0 /* FilterButtonPressedLeft.png in Resources */,
    11561166                                A241528B0C0261B8007DD3B4 /* Globe.tiff in Resources */,
     1167                                A2DF377C0C222E2D006523C1 /* Creator.nib in Resources */,
    11571168                        );
    11581169                        runOnlyForDeploymentPostprocessing = 0;
     
    12651276                                A24838820C0BA608005CC3FE /* FilterBarView.m in Sources */,
    12661277                                A215760B0C0D449A0057A26A /* BezierPathAdditions.m in Sources */,
     1278                                A2DF37070C220D03006523C1 /* CreatorWindowController.m in Sources */,
    12671279                        );
    12681280                        runOnlyForDeploymentPostprocessing = 0;
     
    14031415                        );
    14041416                        name = PrefsWindow.nib;
     1417                        sourceTree = "<group>";
     1418                };
     1419                A2DF377A0C222E2D006523C1 /* Creator.nib */ = {
     1420                        isa = PBXVariantGroup;
     1421                        children = (
     1422                                A2DF377B0C222E2D006523C1 /* English */,
     1423                        );
     1424                        name = Creator.nib;
    14051425                        sourceTree = "<group>";
    14061426                };
  • branches/file_selection/macosx/Controller.h

    r1992 r2100  
    117117- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo;
    118118
     119- (void) createFile: (id) sender;
     120
    119121- (void) resumeSelectedTorrents:    (id) sender;
    120122- (void) resumeAllTorrents:         (id) sender;
  • branches/file_selection/macosx/Controller.m

    r2081 r2100  
    2929#import "TorrentCell.h"
    3030#import "TorrentTableView.h"
     31#import "CreatorWindowController.h"
    3132#import "StringAdditions.h"
    3233#import "UKKQueue.h"
     
    3940#import <Sparkle/Sparkle.h>
    4041
     42#define TOOLBAR_CREATE          @"Toolbar Create"
    4143#define TOOLBAR_OPEN            @"Toolbar Open"
    4244#define TOOLBAR_REMOVE          @"Toolbar Remove"
     
    928930        [self performSelectorOnMainThread: @selector(openURL:) withObject: url waitUntilDone: NO];
    929931    }
     932}
     933
     934- (void) createFile: (id) sender
     935{
     936    [CreatorWindowController createTorrentFile];
    930937}
    931938
     
    23982405    NSToolbarItem * item = [[NSToolbarItem alloc] initWithItemIdentifier: ident];
    23992406
    2400     if ([ident isEqualToString: TOOLBAR_OPEN])
     2407    if ([ident isEqualToString: TOOLBAR_CREATE])
     2408    {
     2409        [item setLabel: NSLocalizedString(@"Create", "Create toolbar item -> label")];
     2410        [item setPaletteLabel: NSLocalizedString(@"Create Torrent File", "Create toolbar item -> palette label")];
     2411        [item setToolTip: NSLocalizedString(@"Create torrent file", "Create toolbar item -> tooltip")];
     2412        [item setImage: [NSImage imageNamed: @"Create.png"]];
     2413        [item setTarget: self];
     2414        [item setAction: @selector(createFile:)];
     2415        [item setAutovalidates: NO];
     2416    }
     2417    else if ([ident isEqualToString: TOOLBAR_OPEN])
    24012418    {
    24022419        [item setLabel: NSLocalizedString(@"Open", "Open toolbar item -> label")];
     
    24852502{
    24862503    return [NSArray arrayWithObjects:
    2487             TOOLBAR_OPEN, TOOLBAR_REMOVE,
     2504            TOOLBAR_CREATE, TOOLBAR_OPEN, TOOLBAR_REMOVE,
    24882505            TOOLBAR_PAUSE_SELECTED, TOOLBAR_RESUME_SELECTED,
    24892506            TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL, TOOLBAR_FILTER, TOOLBAR_INFO,
     
    24972514{
    24982515    return [NSArray arrayWithObjects:
    2499             TOOLBAR_OPEN, TOOLBAR_REMOVE,
     2516            TOOLBAR_CREATE, TOOLBAR_OPEN, TOOLBAR_REMOVE,
    25002517            NSToolbarSeparatorItemIdentifier,
    25012518            TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL,
  • branches/file_selection/macosx/English.lproj/MainMenu.nib/classes.nib

    r1976 r2100  
    88                applySpeedLimit = id;
    99                copyTorrentFiles = id;
     10                createFile = id;
    1011                doNothing = id;
    1112                linkForums = id;
     
    5859                fDownloadMenu = NSMenu;
    5960                fDownloadNoLimitItem = NSMenuItem;
    60                 fFilterBar = ImageBackgroundView;
     61                fFilterBar = FilterBarView;
    6162                fNameSortActionItem = NSMenuItem;
    6263                fNameSortItem = NSMenuItem;
  • branches/file_selection/macosx/English.lproj/MainMenu.nib/info.nib

    r1976 r2100  
    3333        <array>
    3434                <integer>21</integer>
    35                 <integer>1603</integer>
     35                <integer>29</integer>
    3636        </array>
    3737        <key>IBSystem Version</key>
  • branches/file_selection/macosx/Torrent.m

    r2092 r2100  
    347347    else if (tr_getIncomplete(fHandle))
    348348        [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
     349    else;
    349350   
    350351    //check to stop for ratio
     
    13711372    #warning when going seeding to download, update queue
    13721373    [self update];
    1373     [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
     1374    [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self]; //for paused torrents
    13741375}
    13751376
Note: See TracChangeset for help on using the changeset viewer.