Changeset 807


Ignore:
Timestamp:
Aug 21, 2006, 10:07:08 PM (15 years ago)
Author:
livings124
Message:

Message Log window, accessible from the Transmission menu.

Location:
trunk
Files:
6 added
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Transmission.xcodeproj/project.pbxproj

    r794 r807  
    7979                A200B9B60A22893D007BBB1E /* InfoWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A200B9620A227FD0007BBB1E /* InfoWindow.nib */; };
    8080                A20AB97B0A5C622A004F81FA /* SmallTurtle.png in Resources */ = {isa = PBXBuildFile; fileRef = A20AB97A0A5C622A004F81FA /* SmallTurtle.png */; };
     81                A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A21567EB0A9A5034004DECD6 /* MessageWindow.nib */; };
    8182                A21610FC0A050B1700E8E4C1 /* MenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A21610FB0A050B1700E8E4C1 /* MenuButton.m */; };
    8283                A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */; };
     
    130131                A2D4F0830A915F6600890C32 /* RedDot.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D4F0820A915F6600890C32 /* RedDot.tiff */; };
    131132                A2D4F0850A915F7200890C32 /* GreenDot.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D4F0840A915F7200890C32 /* GreenDot.tiff */; };
     133                A2E78FC10A9967FE005B28CE /* MessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */; };
    132134                A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
    133135                A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */; };
     
    258260                4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; };
    259261                4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; };
    260                 4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
     262                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
    261263                4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; };
    262264                4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; };
     
    283285                A200B9630A227FD0007BBB1E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/InfoWindow.nib; sourceTree = "<group>"; };
    284286                A20AB97A0A5C622A004F81FA /* SmallTurtle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SmallTurtle.png; path = macosx/Images/SmallTurtle.png; sourceTree = "<group>"; };
     287                A21567EC0A9A5034004DECD6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/MessageWindow.nib; sourceTree = "<group>"; };
    285288                A21610FA0A050B1700E8E4C1 /* MenuButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MenuButton.h; path = macosx/MenuButton.h; sourceTree = "<group>"; };
    286289                A21610FB0A050B1700E8E4C1 /* MenuButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MenuButton.m; path = macosx/MenuButton.m; sourceTree = "<group>"; };
     
    335338                A2D4F0820A915F6600890C32 /* RedDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = RedDot.tiff; path = macosx/Images/RedDot.tiff; sourceTree = "<group>"; };
    336339                A2D4F0840A915F7200890C32 /* GreenDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GreenDot.tiff; path = macosx/Images/GreenDot.tiff; sourceTree = "<group>"; };
     340                A2E78FBE0A9967FE005B28CE /* MessageWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageWindowController.h; sourceTree = "<group>"; };
     341                A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageWindowController.m; sourceTree = "<group>"; };
    337342                A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButton.png; path = macosx/Images/SpeedLimitButton.png; sourceTree = "<group>"; };
    338343                A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
     
    375380                        isa = PBXGroup;
    376381                        children = (
     382                                A2E78FBE0A9967FE005B28CE /* MessageWindowController.h */,
     383                                A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */,
    377384                                A200B8390A2263BA007BBB1E /* InfoWindowController.h */,
    378385                                A200B83A0A2263BA007BBB1E /* InfoWindowController.m */,
     
    477484                                29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
    478485                                A200B9620A227FD0007BBB1E /* InfoWindow.nib */,
     486                                A21567EB0A9A5034004DECD6 /* MessageWindow.nib */,
    479487                                A2C655640A04FEDC00E9FD82 /* BottomBorder.png */,
    480488                                A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */,
     
    767775                                A2D4F0830A915F6600890C32 /* RedDot.tiff in Resources */,
    768776                                A2D4F0850A915F7200890C32 /* GreenDot.tiff in Resources */,
     777                                A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */,
    769778                        );
    770779                        runOnlyForDeploymentPostprocessing = 0;
     
    821830                                A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */,
    822831                                A2710E770A86796000CE4F7D /* PrefsWindow.m in Sources */,
     832                                A2E78FC10A9967FE005B28CE /* MessageWindowController.m in Sources */,
    823833                        );
    824834                        runOnlyForDeploymentPostprocessing = 0;
     
    862872                        );
    863873                        name = InfoWindow.nib;
     874                        sourceTree = "<group>";
     875                };
     876                A21567EB0A9A5034004DECD6 /* MessageWindow.nib */ = {
     877                        isa = PBXVariantGroup;
     878                        children = (
     879                                A21567EC0A9A5034004DECD6 /* English */,
     880                        );
     881                        name = MessageWindow.nib;
    864882                        sourceTree = "<group>";
    865883                };
  • trunk/macosx/Controller.h

    r756 r807  
    3030#import "PrefsController.h"
    3131#import "InfoWindowController.h"
     32#import "MessageWindowController.h"
    3233#import "Badger.h"
    3334#import "ImageBackgroundView.h"
     
    4849    NSUserDefaults                  * fDefaults;
    4950    InfoWindowController            * fInfoController;
     51    MessageWindowController         * fMessageController;
    5052
    5153    IBOutlet NSWindow               * fWindow;
     
    136138- (void) setInfoTab: (id) sender;
    137139
     140- (void) showMessageWindow: (id) sender;
     141
    138142- (void) updateControlTint: (NSNotification *) notification;
    139143
  • trunk/macosx/Controller.m

    r787 r807  
    6868@implementation Controller
    6969
     70+ (void) initialize
     71{
     72    [[NSUserDefaults standardUserDefaults] registerDefaults: [NSDictionary dictionaryWithContentsOfFile:
     73        [[NSBundle mainBundle] pathForResource: @"Defaults" ofType: @"plist"]]];
     74}
     75
    7076- (id) init
    7177{
     
    7884       
    7985        fDefaults = [NSUserDefaults standardUserDefaults];
     86       
     87        fMessageController = [[MessageWindowController alloc] initWithWindowNibName: @"MessageWindow"];
    8088        fInfoController = [[InfoWindowController alloc] initWithWindowNibName: @"InfoWindow"];
    8189        fPrefsController = [[PrefsController alloc] initWithWindowNibName: @"PrefsWindow" handle: fLib];
     90       
    8291        fBadger = [[Badger alloc] init];
    8392       
     
    909918    else
    910919        [fInfoController setPreviousTab];
     920}
     921
     922- (void) showMessageWindow: (id) sender
     923{
     924    [fMessageController showWindow: nil];
    911925}
    912926
  • trunk/macosx/Defaults.plist

    r778 r807  
    4747        <key>InfoVisible</key>
    4848        <false/>
     49        <key>MessageLevel</key>
     50        <integer>1</integer>
    4951        <key>MoveChoice</key>
    5052        <string>Constant</string>
  • trunk/macosx/English.lproj/MainMenu.nib/classes.nib

    r716 r807  
    2727                showInfo = id;
    2828                showMainWindow = id;
     29                showMessageWindow = id;
    2930                showPreferenceWindow = id;
    3031                stopAllTorrents = id;
  • trunk/macosx/English.lproj/MainMenu.nib/info.nib

    r745 r807  
    1414                <string>337 545 477 67 0 0 1152 842 </string>
    1515                <key>29</key>
    16                 <string>104 684 520 44 0 0 1152 842 </string>
     16                <string>104 684 451 44 0 0 1152 842 </string>
    1717                <key>456</key>
    1818                <string>396 374 216 206 0 0 1152 842 </string>
  • trunk/macosx/InfoWindowController.m

    r806 r807  
    8383    [self setWindowForTab: identifier animate: NO];
    8484   
     85    //initially sort peer table by IP
    8586    if ([[fPeerTable sortDescriptors] count] == 0)
    8687        [fPeerTable setSortDescriptors: [NSArray arrayWithObject: [[fPeerTable tableColumnWithIdentifier: @"IP"]
     
    424425        [window setFrame: frame display: YES];
    425426   
    426     [window setMinSize: NSMakeSize(MIN_WINDOW_WIDTH, frame.size.height)];
    427     [window setMaxSize: NSMakeSize(MAX_WINDOW_WIDTH, frame.size.height)];
     427    NSSize windowSize = NSMakeSize(MIN_WINDOW_WIDTH, frame.size.height);
     428    [window setMinSize: windowSize];
     429    [window setMaxSize: windowSize];
    428430}
    429431
  • trunk/macosx/PrefsController.m

    r802 r807  
    6565@implementation PrefsController
    6666
    67 + (void) initialize
    68 {
    69     [[NSUserDefaults standardUserDefaults] registerDefaults: [NSDictionary dictionaryWithContentsOfFile:
    70         [[NSBundle mainBundle] pathForResource: @"Defaults" ofType: @"plist"]]];
    71 }
    72 
    7367- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle
    7468{
Note: See TracChangeset for help on using the changeset viewer.