Changeset 148


Ignore:
Timestamp:
Mar 12, 2006, 3:06:18 PM (16 years ago)
Author:
titer
Message:

OS X design changes: merged the two cells into one

Location:
branches/new_api/macosx
Files:
2 added
5 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • branches/new_api/macosx/Controller.m

    r145 r148  
    2525#import "Controller.h"
    2626#import "Torrent.h"
    27 #import "NameCell.h"
    28 #import "ProgressCell.h"
     27#import "TorrentCell.h"
    2928#import "StringAdditions.h"
    3029#import "Utils.h"
     
    8988    [fWindow setDelegate: self];
    9089
    91     NSTableColumn * tableColumn;
    92     NameCell * nameCell = [[NameCell alloc] init];
    93     ProgressCell * progressCell = [[ProgressCell alloc] init];
    94 
    95     tableColumn  = [fTableView tableColumnWithIdentifier: @"Name"];
    96     [tableColumn setDataCell: nameCell];
    97 
    98     tableColumn  = [fTableView tableColumnWithIdentifier: @"Progress"];
    99     [tableColumn setDataCell: progressCell];
    100 
    101     [fTableView setAutosaveTableColumns: YES];
     90    [[fTableView tableColumnWithIdentifier: @"Torrent"] setDataCell:
     91        [[TorrentCell alloc] init]];
    10292
    10393    [fTableView registerForDraggedTypes: [NSArray arrayWithObjects:
  • branches/new_api/macosx/Torrent.h

    r146 r148  
    5757- (float)      progress;
    5858- (BOOL)       isActive;
     59- (BOOL)       isSeeding;
    5960- (BOOL)       isPaused;
    6061- (BOOL)       justFinished;
  • branches/new_api/macosx/Torrent.m

    r146 r148  
    230230}
    231231
     232- (BOOL) isSeeding
     233{
     234    return ( fStat->status == TR_STATUS_SEED );
     235}
     236
    232237- (BOOL) isPaused
    233238{
  • branches/new_api/macosx/Transmission.xcodeproj/project.pbxproj

    r141 r148  
    99/* Begin PBXBuildFile section */
    1010                4D043A7F090AE979009FEDA8 /* TransmissionDocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D043A7E090AE979009FEDA8 /* TransmissionDocument.icns */; };
    11                 4D096C12089FB4E20091B166 /* NameCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D096C0F089FB4E20091B166 /* NameCell.m */; };
    12                 4D096C13089FB4E20091B166 /* ProgressCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D096C11089FB4E20091B166 /* ProgressCell.m */; };
    1311                4D118E1A08CB46B20033958F /* PrefsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D118E1908CB46B20033958F /* PrefsController.m */; };
    1412                4D2784370905709500687951 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
     
    1816                4D6DAAC7090CE00500F43C22 /* RevealOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D6DAAC5090CE00500F43C22 /* RevealOn.png */; };
    1917                4D752E930913C949008EAAD4 /* Preferences.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D752E920913C949008EAAD4 /* Preferences.png */; };
    20                 4D813EB508AA43AC00191DB4 /* Progress.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D813EB408AA43AC00191DB4 /* Progress.png */; };
    2118                4D8CEF91095870E00063BAEA /* Network.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D8CEF90095870E00063BAEA /* Network.png */; };
    2219                4DA6FDBA0911233800450CB1 /* PauseOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB80911233800450CB1 /* PauseOn.png */; };
     
    2421                4DA6FDC5091141AD00450CB1 /* ResumeOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDC3091141AD00450CB1 /* ResumeOff.png */; };
    2522                4DA6FDC6091141AD00450CB1 /* ResumeOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDC4091141AD00450CB1 /* ResumeOn.png */; };
     23                4DCCBB3E09C3D71100D3CABF /* TorrentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */; };
    2624                4DDFDD22099A5D8E00189D81 /* DownloadBadge.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */; };
    2725                4DDFDD23099A5D8E00189D81 /* UploadBadge.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DDFDD21099A5D8E00189D81 /* UploadBadge.png */; };
     
    8179                32CA4F630368D1EE00C91783 /* Transmission_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Transmission_Prefix.pch; sourceTree = "<group>"; };
    8280                4D043A7E090AE979009FEDA8 /* TransmissionDocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = TransmissionDocument.icns; path = Images/TransmissionDocument.icns; sourceTree = "<group>"; };
    83                 4D096C0E089FB4E20091B166 /* NameCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NameCell.h; sourceTree = "<group>"; };
    84                 4D096C0F089FB4E20091B166 /* NameCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NameCell.m; sourceTree = "<group>"; };
    85                 4D096C10089FB4E20091B166 /* ProgressCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProgressCell.h; sourceTree = "<group>"; };
    86                 4D096C11089FB4E20091B166 /* ProgressCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProgressCell.m; sourceTree = "<group>"; };
    8781                4D118E1808CB46B20033958F /* PrefsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PrefsController.h; sourceTree = "<group>"; };
    8882                4D118E1908CB46B20033958F /* PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PrefsController.m; sourceTree = "<group>"; };
     
    9488                4D6DAAC5090CE00500F43C22 /* RevealOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealOn.png; path = Images/RevealOn.png; sourceTree = "<group>"; };
    9589                4D752E920913C949008EAAD4 /* Preferences.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Preferences.png; path = Images/Preferences.png; sourceTree = "<group>"; };
    96                 4D813EB408AA43AC00191DB4 /* Progress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Progress.png; path = Images/Progress.png; sourceTree = "<group>"; };
    9790                4D8CEF90095870E00063BAEA /* Network.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Network.png; path = Images/Network.png; sourceTree = "<group>"; };
    9891                4DA6FDB80911233800450CB1 /* PauseOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseOn.png; path = Images/PauseOn.png; sourceTree = "<group>"; };
     
    10093                4DA6FDC3091141AD00450CB1 /* ResumeOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeOff.png; path = Images/ResumeOff.png; sourceTree = "<group>"; };
    10194                4DA6FDC4091141AD00450CB1 /* ResumeOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeOn.png; path = Images/ResumeOn.png; sourceTree = "<group>"; };
     95                4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = TorrentCell.m; sourceTree = "<group>"; };
     96                4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TorrentCell.h; sourceTree = "<group>"; };
    10297                4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = Images/DownloadBadge.png; sourceTree = "<group>"; };
    10398                4DDFDD21099A5D8E00189D81 /* UploadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = UploadBadge.png; path = Images/UploadBadge.png; sourceTree = "<group>"; };
     
    139134                        isa = PBXGroup;
    140135                        children = (
    141                                 4D096C0E089FB4E20091B166 /* NameCell.h */,
    142                                 4D096C0F089FB4E20091B166 /* NameCell.m */,
    143                                 4D096C10089FB4E20091B166 /* ProgressCell.h */,
    144                                 4D096C11089FB4E20091B166 /* ProgressCell.m */,
    145136                                4DF0C5A90899190500DD8943 /* Controller.m */,
    146137                                4DF0C5AA0899190500DD8943 /* Controller.h */,
     
    155146                                4DFBC2DD09C0970D00D5C571 /* Torrent.h */,
    156147                                4DFBC2DE09C0970D00D5C571 /* Torrent.m */,
     148                                4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */,
     149                                4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */,
    157150                        );
    158151                        name = Classes;
     
    214207                                4D043A7E090AE979009FEDA8 /* TransmissionDocument.icns */,
    215208                                4DF7500808A103AD007B0D70 /* Info.png */,
    216                                 4D813EB408AA43AC00191DB4 /* Progress.png */,
    217209                                4DF7500708A103AD007B0D70 /* Open.png */,
    218210                                4DF7500908A103AD007B0D70 /* Remove.png */,
     
    310302                                4DF7500D08A103AD007B0D70 /* Info.png in Resources */,
    311303                                4DF7500E08A103AD007B0D70 /* Remove.png in Resources */,
    312                                 4D813EB508AA43AC00191DB4 /* Progress.png in Resources */,
    313304                                4D2784370905709500687951 /* Transmission.icns in Resources */,
    314305                                4D043A7F090AE979009FEDA8 /* TransmissionDocument.icns in Resources */,
     
    339330                                8D11072D0486CEB800E47090 /* main.m in Sources */,
    340331                                4DF0C5AB0899190500DD8943 /* Controller.m in Sources */,
    341                                 4D096C12089FB4E20091B166 /* NameCell.m in Sources */,
    342                                 4D096C13089FB4E20091B166 /* ProgressCell.m in Sources */,
    343332                                4D118E1A08CB46B20033958F /* PrefsController.m in Sources */,
    344333                                4D364DA0091FBB2C00377D12 /* TorrentTableView.m in Sources */,
     
    346335                                4DE5CCA70980735700BE280E /* Badger.m in Sources */,
    347336                                4DFBC2DF09C0970D00D5C571 /* Torrent.m in Sources */,
     337                                4DCCBB3E09C3D71100D3CABF /* TorrentCell.m in Sources */,
    348338                        );
    349339                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.