Changeset 889


Ignore:
Timestamp:
Sep 22, 2006, 2:55:48 PM (15 years ago)
Author:
livings124
Message:

Include image with the nat status. It still needs an image for success.

Location:
branches/nat-traversal
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/nat-traversal/Transmission.xcodeproj/project.pbxproj

    r885 r889  
    103103                A232D29E0A70903E00973B12 /* Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = A232D29D0A70903E00973B12 /* Filter.png */; };
    104104                A23BBEB70A9BBE77003F7274 /* BarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A27431D90A68538400FA780A /* BarButton.m */; };
     105                A24172A20AC4307A0080F7F9 /* Check.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A24172A10AC4307A0080F7F9 /* Check.tiff */; };
    105106                A246004D0A6DCE4600D19088 /* SpeedLimitButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */; };
    106107                A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */; };
     
    322323                A2305AA80A3DCCEF00AB2D77 /* ProgressBarEndGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGray.png; path = macosx/Images/ProgressBarEndGray.png; sourceTree = "<group>"; };
    323324                A232D29D0A70903E00973B12 /* Filter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Filter.png; path = macosx/Images/Filter.png; sourceTree = "<group>"; };
     325                A24172A10AC4307A0080F7F9 /* Check.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Check.tiff; path = macosx/Images/Check.tiff; sourceTree = "<group>"; };
    324326                A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonPressed.png; path = macosx/Images/SpeedLimitButtonPressed.png; sourceTree = "<group>"; };
    325327                A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonBlue.png; path = macosx/Images/SpeedLimitButtonBlue.png; sourceTree = "<group>"; };
     
    491493                                A2305A7F0A3DC9E400AB2D77 /* ProgressBarGreen.png */,
    492494                                A260C9AB0AA3B8D700FDC1B7 /* Error.tiff */,
     495                                A24172A10AC4307A0080F7F9 /* Check.tiff */,
    493496                                A2D4F0840A915F7200890C32 /* GreenDot.tiff */,
    494497                                A2D4F0820A915F6600890C32 /* RedDot.tiff */,
     
    828831                                A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */,
    829832                                A260C9AC0AA3B8D700FDC1B7 /* Error.tiff in Resources */,
     833                                A24172A20AC4307A0080F7F9 /* Check.tiff in Resources */,
    830834                        );
    831835                        runOnlyForDeploymentPostprocessing = 0;
  • branches/nat-traversal/macosx/English.lproj/PrefsWindow.nib/classes.nib

    r888 r889  
    4949                fNatCheck = NSButton;
    5050                fNatStatusField = NSTextField;
     51                fNatStatusImage = NSImageView;
    5152                fNetworkView = NSView;
    5253                fPlayDownloadSoundCheck = NSButton;
  • branches/nat-traversal/macosx/English.lproj/PrefsWindow.nib/info.nib

    r888 r889  
    1212                <string>88 406 582 290 0 0 1152 842 </string>
    1313                <key>41</key>
    14                 <string>287 428 577 302 0 0 1152 842 </string>
     14                <string>264 263 577 302 0 0 1152 842 </string>
    1515                <key>66</key>
    16                 <string>181 326 577 182 0 0 1152 842 </string>
     16                <string>183 495 577 144 0 0 1152 842 </string>
    1717        </dict>
    1818        <key>IBFramework Version</key>
     
    2525        <array>
    2626                <integer>66</integer>
    27                 <integer>41</integer>
    2827        </array>
    2928        <key>IBSystem Version</key>
  • branches/nat-traversal/macosx/PrefsController.h

    r888 r889  
    5353    IBOutlet NSTextField    * fPortField, * fNatStatusField;
    5454    IBOutlet NSButton       * fNatCheck;
     55    IBOutlet NSImageView    * fNatStatusImage;
    5556    NSTimer                 * fNatStatusTimer;
    5657   
  • branches/nat-traversal/macosx/PrefsController.m

    r888 r889  
    132132   
    133133    [fNatStatusField setHidden: !natShouldEnable];
     134    [fNatStatusImage setHidden: !natShouldEnable];
    134135    [self updateNatStatus];
    135136    fNatStatusTimer = [NSTimer scheduledTimerWithTimeInterval: 5.0 target: self
     
    370371   
    371372    [fNatStatusField setHidden: !enable];
     373    [fNatStatusImage setHidden: !enable];
    372374    [self updateNatStatus];
    373375}
     
    380382    int status = tr_natTraversalStatus(fHandle);
    381383    if (status == 2)
    382         [fNatStatusField setStringValue: @"Ports have been successfully mapped."];
     384    {
     385        [fNatStatusField setStringValue: @"Ports have been successfully mapped"];
     386        [fNatStatusImage setImage: nil];
     387    }
    383388    else if (status == 3 || status == 4)
    384         [fNatStatusField setStringValue: @"Error mapping ports."];
    385     else
     389    {
     390        [fNatStatusField setStringValue: @"Error mapping ports"];
     391        [fNatStatusImage setImage: [NSImage imageNamed: @"Error.tiff"]];
     392    }
     393    else
     394    {
    386395        [fNatStatusField setStringValue: @""];
     396        [fNatStatusImage setImage: nil];
     397    }
    387398}
    388399
Note: See TracChangeset for help on using the changeset viewer.