mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-15 16:29:34 +00:00
Code Issues Releases Wiki Activity

get rid of the unneeded ImageBackgroundView

Browse source
This commit is contained in:
Mitchell Livingston 2007-11-07 02:23:35 +00:00
parent 906c5d6f1f
commit 98c1d4bb62
12 changed files with 275 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macosx/Controller.h
View file

@ -29,7 +29,6 @@
#import "MessageWindowController.h"
#import "DragOverlayWindow.h"
#import "Badger.h"
#import "ImageBackgroundView.h"
#import "StatusBarView.h"
#import "IPCController.h"
@ -56,7 +55,6 @@
IBOutlet NSMenuItem * fOpenIgnoreDownloadFolder;
IBOutlet ImageBackgroundView * fBottomBar;
IBOutlet NSButton * fActionButton, * fSpeedLimitButton;
NSTimer * fSpeedLimitTimer;

2
macosx/Controller.m
View file

@ -187,8 +187,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
- (void) awakeFromNib
{
[fBottomBar setBackgroundImage: [NSImage imageNamed: @"BottomBorder.png"]];
NSToolbar * toolbar = [[NSToolbar alloc] initWithIdentifier: @"Transmission Toolbar"];
[toolbar setDelegate: self];
[toolbar setAllowsUserCustomization: YES];

362
macosx/English.lproj/InfoWindow.nib/classes.nib generated
View file

@ -1,99 +1,263 @@
{
IBClasses = (
{CLASS = FileOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = ImageBackgroundView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = InfoTabButtonCell; LANGUAGE = ObjC; SUPERCLASS = NSButtonCell; },
{
ACTIONS = {
revealDataFile = id;
revealFile = id;
revealTorrentFile = id;
setCheck = id;
setOnlySelectedCheck = id;
setPex = id;
setPiecesView = id;
setPriority = id;
setRatioLimit = id;
setRatioSetting = id;
setSpeedLimit = id;
setSpeedMode = id;
setTab = id;
};
CLASS = InfoWindowController;
LANGUAGE = ObjC;
OUTLETS = {
fActivityView = NSView;
fCommentView = NSTextView;
fCompletedFromTrackerField = NSTextField;
fConnectedPeersField = NSTextField;
fCreatorField = NSTextField;
fDataLocationField = NSTextField;
fDateActivityField = NSTextField;
fDateAddedField = NSTextField;
fDateCompletedField = NSTextField;
fDateCreatedField = NSTextField;
fDownloadLimitField = NSTextField;
fDownloadLimitLabel = NSTextField;
fDownloadLimitPopUp = NSPopUpButton;
fDownloadedTotalField = NSTextField;
fDownloadingFromField = NSTextField;
fErrorMessageView = NSTextView;
fFailedHashField = NSTextField;
fFileCheckItem = NSMenuItem;
fFileOutline = FileOutlineView;
fFilePriorityHigh = NSMenuItem;
fFilePriorityLow = NSMenuItem;
fFilePriorityNormal = NSMenuItem;
fFileTableStatusField = NSTextField;
fFileUncheckItem = NSMenuItem;
fFilesView = NSView;
fHashField = NSTextField;
fHaveField = NSTextField;
fImageView = NSImageView;
fInfoView = NSView;
fKnownField = NSTextField;
fLeechersField = NSTextField;
fNameField = NSTextField;
fOptionsView = NSView;
fPeerTable = NSTableView;
fPeersView = NSView;
fPexCheck = NSButton;
fPiecesControl = NSSegmentedControl;
fPiecesField = NSTextField;
fPiecesView = PiecesView;
fProgressField = NSTextField;
fRatioField = NSTextField;
fRatioLimitField = NSTextField;
fRatioPopUp = NSPopUpButton;
fRevealDataButton = NSButton;
fRevealTorrentButton = NSButton;
fSecureField = NSTextField;
fSeedersField = NSTextField;
fSizeField = NSTextField;
fStateField = NSTextField;
fSwarmSpeedField = NSTextField;
fTabBackBar = ImageBackgroundView;
fTabMatrix = NSMatrix;
fTorrentLocationField = NSTextField;
fTrackerField = NSTextField;
fUploadLimitField = NSTextField;
fUploadLimitLabel = NSTextField;
fUploadLimitPopUp = NSPopUpButton;
fUploadedTotalField = NSTextField;
fUploadingToField = NSTextField;
};
SUPERCLASS = NSWindowController;
},
{CLASS = NSLevelIndicatorCell; LANGUAGE = ObjC; SUPERCLASS = NSActionCell; },
{CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; },
{
CLASS = PeerProgressIndicatorCell;
LANGUAGE = ObjC;
SUPERCLASS = NSLevelIndicatorCell;
},
{CLASS = PeerTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; },
{CLASS = PiecesView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }
);
IBVersion = 1;
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBClasses</key>
<array>
<dict>
<key>CLASS</key>
<string>NSSegmentedControl</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSControl</string>
</dict>
<dict>
<key>CLASS</key>
<string>PiecesView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSImageView</string>
</dict>
<dict>
<key>CLASS</key>
<string>PeerProgressIndicatorCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSLevelIndicatorCell</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSLevelIndicatorCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSActionCell</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSApplication</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSResponder</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSMenu</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>PeerTableView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSTableView</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSObject</string>
<key>LANGUAGE</key>
<string>ObjC</string>
</dict>
<dict>
<key>CLASS</key>
<string>InfoTabButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSButtonCell</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>revealDataFile</key>
<string>id</string>
<key>revealFile</key>
<string>id</string>
<key>revealTorrentFile</key>
<string>id</string>
<key>setCheck</key>
<string>id</string>
<key>setOnlySelectedCheck</key>
<string>id</string>
<key>setPex</key>
<string>id</string>
<key>setPiecesView</key>
<string>id</string>
<key>setPriority</key>
<string>id</string>
<key>setRatioLimit</key>
<string>id</string>
<key>setRatioSetting</key>
<string>id</string>
<key>setSpeedLimit</key>
<string>id</string>
<key>setSpeedMode</key>
<string>id</string>
<key>setTab</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>InfoWindowController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>fActivityView</key>
<string>NSView</string>
<key>fCommentView</key>
<string>NSTextView</string>
<key>fCompletedFromTrackerField</key>
<string>NSTextField</string>
<key>fConnectedPeersField</key>
<string>NSTextField</string>
<key>fCreatorField</key>
<string>NSTextField</string>
<key>fDataLocationField</key>
<string>NSTextField</string>
<key>fDateActivityField</key>
<string>NSTextField</string>
<key>fDateAddedField</key>
<string>NSTextField</string>
<key>fDateCompletedField</key>
<string>NSTextField</string>
<key>fDateCreatedField</key>
<string>NSTextField</string>
<key>fDownloadLimitField</key>
<string>NSTextField</string>
<key>fDownloadLimitLabel</key>
<string>NSTextField</string>
<key>fDownloadLimitPopUp</key>
<string>NSPopUpButton</string>
<key>fDownloadedTotalField</key>
<string>NSTextField</string>
<key>fDownloadingFromField</key>
<string>NSTextField</string>
<key>fErrorMessageView</key>
<string>NSTextView</string>
<key>fFailedHashField</key>
<string>NSTextField</string>
<key>fFileCheckItem</key>
<string>NSMenuItem</string>
<key>fFileOutline</key>
<string>FileOutlineView</string>
<key>fFilePriorityHigh</key>
<string>NSMenuItem</string>
<key>fFilePriorityLow</key>
<string>NSMenuItem</string>
<key>fFilePriorityNormal</key>
<string>NSMenuItem</string>
<key>fFileTableStatusField</key>
<string>NSTextField</string>
<key>fFileUncheckItem</key>
<string>NSMenuItem</string>
<key>fFilesView</key>
<string>NSView</string>
<key>fHashField</key>
<string>NSTextField</string>
<key>fHaveField</key>
<string>NSTextField</string>
<key>fImageView</key>
<string>NSImageView</string>
<key>fInfoView</key>
<string>NSView</string>
<key>fKnownField</key>
<string>NSTextField</string>
<key>fLeechersField</key>
<string>NSTextField</string>
<key>fNameField</key>
<string>NSTextField</string>
<key>fOptionsView</key>
<string>NSView</string>
<key>fPeerTable</key>
<string>NSTableView</string>
<key>fPeersView</key>
<string>NSView</string>
<key>fPexCheck</key>
<string>NSButton</string>
<key>fPiecesControl</key>
<string>NSSegmentedControl</string>
<key>fPiecesField</key>
<string>NSTextField</string>
<key>fPiecesView</key>
<string>PiecesView</string>
<key>fProgressField</key>
<string>NSTextField</string>
<key>fRatioField</key>
<string>NSTextField</string>
<key>fRatioLimitField</key>
<string>NSTextField</string>
<key>fRatioPopUp</key>
<string>NSPopUpButton</string>
<key>fRevealDataButton</key>
<string>NSButton</string>
<key>fRevealTorrentButton</key>
<string>NSButton</string>
<key>fSecureField</key>
<string>NSTextField</string>
<key>fSeedersField</key>
<string>NSTextField</string>
<key>fSizeField</key>
<string>NSTextField</string>
<key>fStateField</key>
<string>NSTextField</string>
<key>fSwarmSpeedField</key>
<string>NSTextField</string>
<key>fTabBackBar</key>
<string>ImageBackgroundView</string>
<key>fTabMatrix</key>
<string>NSMatrix</string>
<key>fTorrentLocationField</key>
<string>NSTextField</string>
<key>fTrackerField</key>
<string>NSTextField</string>
<key>fUploadLimitField</key>
<string>NSTextField</string>
<key>fUploadLimitLabel</key>
<string>NSTextField</string>
<key>fUploadLimitPopUp</key>
<string>NSPopUpButton</string>
<key>fUploadedTotalField</key>
<string>NSTextField</string>
<key>fUploadingToField</key>
<string>NSTextField</string>
</dict>
<key>SUPERCLASS</key>
<string>NSWindowController</string>
</dict>
<dict>
<key>CLASS</key>
<string>FileOutlineView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSOutlineView</string>
</dict>
<dict>
<key>CLASS</key>
<string>ImageBackgroundView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSView</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>

38
macosx/English.lproj/InfoWindow.nib/info.nib generated
View file

@ -1,38 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>58 88 356 240 0 0 1680 1028 </string>
<key>IBEditorPositions</key>
<dict>
<key>1030</key>
<string>297 229 360 384 0 0 1680 1028 </string>
<key>1057</key>
<string>505 337 360 389 0 0 1680 1028 </string>
<key>1066</key>
<string>665 601 349 202 0 0 1680 1028 </string>
<key>549</key>
<string>870 359 174 149 0 0 1680 1028 </string>
<key>965</key>
<string>229 571 370 310 0 0 1680 1028 </string>
<key>995</key>
<string>301 527 370 332 0 0 1680 1028 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBLockedObjects</key>
<array/>
<key>IBLockedTabItems</key>
<array>
<integer>332</integer>
</array>
<string>629</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../../../Transmission.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>1066</integer>
<integer>5</integer>
<integer>6</integer>
</array>
<key>IBSystem Version</key>
<string>8R4031</string>
<string>9A581</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
</plist>

BIN
macosx/English.lproj/InfoWindow.nib/keyedobjects.nib generated
View file

Binary file not shown.

2
macosx/English.lproj/MainMenu.nib/classes.nib generated
View file

@ -145,8 +145,6 @@
<dict>
<key>fActionButton</key>
<string>NSButton</string>
<key>fBottomBar</key>
<string>ImageBackgroundView</string>
<key>fDateSortActionItem</key>
<string>NSMenuItem</string>
<key>fDateSortItem</key>

2
macosx/English.lproj/MainMenu.nib/info.nib generated
View file

@ -10,7 +10,7 @@
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>1603</integer>
<integer>2</integer>
</array>
<key>IBSystem Version</key>
<string>9A581</string>

BIN
macosx/English.lproj/MainMenu.nib/keyedobjects.nib generated
View file

Binary file not shown.

34
macosx/ImageBackgroundView.h
View file

@ -1,34 +0,0 @@
/******************************************************************************
* $Id$
*
* Copyright (c) 2006-2007 Transmission authors and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#import <Cocoa/Cocoa.h>
@interface ImageBackgroundView : NSView
{
NSColor * fBackgroundColor;
}
- (void) setBackgroundImage: (NSImage *) image;
@end

60
macosx/ImageBackgroundView.m
View file

@ -1,60 +0,0 @@
/******************************************************************************
* $Id$
*
* Copyright (c) 2006-2007 Transmission authors and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#warning class needed?
#import "ImageBackgroundView.h"
@implementation ImageBackgroundView
- (void) setBackgroundImage: (NSImage *) image
{
[fBackgroundColor release];
fBackgroundColor = [[NSColor colorWithPatternImage: image] retain];
[self setNeedsDisplay: YES];
}
- (BOOL) isOpaque
{
return fBackgroundColor != nil;
}
- (void) dealloc
{
[fBackgroundColor release];
[super dealloc];
}
- (void) drawRect: (NSRect) rect
{
if (fBackgroundColor)
{
[fBackgroundColor set];
[[NSGraphicsContext currentContext] setPatternPhase: [self frame].origin];
NSRectFill([self bounds]);
}
}
@end

2
macosx/InfoWindowController.h
View file

@ -25,7 +25,6 @@
#import <Cocoa/Cocoa.h>
#import "Torrent.h"
#import "FileOutlineView.h"
#import "ImageBackgroundView.h"
#import "PiecesView.h"
#import <transmission.h>
@ -36,7 +35,6 @@
IBOutlet NSView * fInfoView, * fActivityView, * fPeersView, * fFilesView, * fOptionsView;
int fCurrentTabTag;
IBOutlet NSMatrix * fTabMatrix;
IBOutlet ImageBackgroundView * fTabBackBar;
IBOutlet NSImageView * fImageView;
IBOutlet NSTextField * fNameField, * fSizeField, * fTrackerField,

3
macosx/InfoWindowController.m
View file

@ -75,7 +75,7 @@ typedef enum
return [super initWithWindowNibName: @"InfoWindow"];
}
- (void) awakeFromNib
- (void) awakeFromNib 334 16
{
//window location and size
NSPanel * window = (NSPanel *)[self window];
@ -94,7 +94,6 @@ typedef enum
[window setAcceptsMouseMovedEvents: YES];
//set tab images and tooltips
[fTabBackBar setBackgroundImage: [NSImage imageNamed: @"InfoTabBorder.png"]];
[[fTabMatrix cellWithTag: TAB_INFO_TAG] setIcon: [NSImage imageNamed: @"InfoGeneral.png"]];
[[fTabMatrix cellWithTag: TAB_ACTIVITY_TAG] setIcon: [NSImage imageNamed: @"InfoActivity.png"]];
[[fTabMatrix cellWithTag: TAB_PEERS_TAG] setIcon: [NSImage imageNamed: @"InfoPeers.png"]];