mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-10 14:13:23 +00:00
Code Issues Releases Wiki Activity

attempt number one of fixing 10.5 support

Browse source
This commit is contained in:
Mitchell Livingston 2009-10-10 13:21:27 +00:00
parent 7aa6a2b20a
commit a292153b26
8 changed files with 51 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
macosx/Controller.m
View file

@ -696,18 +696,18 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
//remember window states and close all windows
[fDefaults setBool: [[fInfoController window] isVisible] forKey: @"InfoVisible"];
const BOOL quickLookOpen = [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanel sharedPreviewPanelExists]
&& [[QLPreviewPanel sharedPreviewPanel] isVisible];
const BOOL quickLookOpen = [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists]
&& [[QLPreviewPanelSL sharedPreviewPanel] isVisible];
for (NSWindow * window in [NSApp windows])
{
if (!quickLookOpen || window != [QLPreviewPanel sharedPreviewPanel]) //hide quicklook window last to avoid animation
if (!quickLookOpen || window != [QLPreviewPanelSL sharedPreviewPanel]) //hide quicklook window last to avoid animation
[window orderOut: nil];
}
if (quickLookOpen)
{
[[QLPreviewPanel sharedPreviewPanel] updateController];
[[QLPreviewPanel sharedPreviewPanel] orderOut: nil];
[[QLPreviewPanelSL sharedPreviewPanel] updateController];
[[QLPreviewPanelSL sharedPreviewPanel] orderOut: nil];
}
[self showStatusBar: NO animate: NO];
@ -1522,8 +1522,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
{
[fInfoController setInfoForTorrents: [fTableView selectedTorrents]];
if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible])
[[QLPreviewPanel sharedPreviewPanel] reloadData];
if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists] && [[QLPreviewPanelSL sharedPreviewPanel] isVisible])
[[QLPreviewPanelSL sharedPreviewPanel] reloadData];
}
- (void) setInfoTab: (id) sender
@ -4024,10 +4024,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if (![NSApp isOnSnowLeopardOrBetter])
return;
if ([[QLPreviewPanel sharedPreviewPanel] isVisible])
[[QLPreviewPanel sharedPreviewPanel] orderOut: nil];
if ([[QLPreviewPanelSL sharedPreviewPanel] isVisible])
[[QLPreviewPanelSL sharedPreviewPanel] orderOut: nil];
else
[[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront: nil];
[[QLPreviewPanelSL sharedPreviewPanel] makeKeyAndOrderFront: nil];
}
- (void) linkHomepage: (id) sender

7
macosx/FileOutlineController.m
View file

@ -132,10 +132,11 @@ typedef enum
- (void) outlineViewSelectionDidChange: (NSNotification *) notification
{
if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible])
if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists]
&& [[QLPreviewPanelSL sharedPreviewPanel] isVisible])
{
[[QLPreviewPanel sharedPreviewPanel] reloadData];
[[QLPreviewPanel sharedPreviewPanel] updateController];
[[QLPreviewPanelSL sharedPreviewPanel] reloadData];
[[QLPreviewPanelSL sharedPreviewPanel] updateController];
}
}

9
macosx/FileOutlineView.m
View file

@ -91,12 +91,13 @@
const unichar firstChar = [[event charactersIgnoringModifiers] characterAtIndex: 0];
//don't allow quick look on add window
if ([NSApp isOnSnowLeopardOrBetter] && firstChar == ' ' && [[[self window] windowController] conformsToProtocol: @protocol(QLPreviewPanelDataSource)])
#warning get rid of conversion of protocol and replace with @protocol(QLPreviewPanelDataSource)
if ([NSApp isOnSnowLeopardOrBetter] && firstChar == ' ' && [[[self window] windowController] conformsToProtocol: NSProtocolFromString(@"QLPreviewPanelDataSource")])
{
if ([[QLPreviewPanel sharedPreviewPanel] isVisible])
[[QLPreviewPanel sharedPreviewPanel] orderOut: nil];
if ([[QLPreviewPanelSL sharedPreviewPanel] isVisible])
[[QLPreviewPanelSL sharedPreviewPanel] orderOut: nil];
else
[[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront: nil];
[[QLPreviewPanelSL sharedPreviewPanel] makeKeyAndOrderFront: nil];
}
[super keyDown: event];

6
macosx/InfoWindowController.h
View file

@ -32,7 +32,8 @@
@class FileOutlineController;
@class PiecesView;
@interface InfoWindowController : NSWindowController <QLPreviewPanelDataSource, QLPreviewPanelDelegate>
#warning uncomment
@interface InfoWindowController : NSWindowController //<QLPreviewPanelDataSource, QLPreviewPanelDelegate>
{
NSArray * fTorrents;
@ -78,7 +79,8 @@
NSString * fInitialString;
QLPreviewPanel * fPreviewPanel;
#warning change to QLPreviewPanel
id fPreviewPanel;
}
- (void) setInfoForTorrents: (NSArray *) torrents;

23
macosx/InfoWindowController.m
View file

@ -814,8 +814,8 @@ typedef enum
[view setHidden: NO];
if ([NSApp isOnSnowLeopardOrBetter] && (fCurrentTabTag == TAB_FILES_TAG || oldTabTag == TAB_FILES_TAG)
&& ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]))
[[QLPreviewPanel sharedPreviewPanel] updateController];
&& ([QLPreviewPanelSL sharedPreviewPanelExists] && [[QLPreviewPanelSL sharedPreviewPanel] isVisible]))
[[QLPreviewPanelSL sharedPreviewPanel] updateController];
}
- (void) setNextTab
@ -1114,35 +1114,36 @@ typedef enum
return [[fTrackers objectAtIndex: i] intValue] == 0;
}*/
- (BOOL) acceptsPreviewPanelControl: (QLPreviewPanel *) panel
#warning change to QLPreviewPanel
- (BOOL) acceptsPreviewPanelControl: (id) panel
{
return fCurrentTabTag == TAB_FILES_TAG && [self canQuickLook];
}
- (void) beginPreviewPanelControl: (QLPreviewPanel *) panel
- (void) beginPreviewPanelControl: (id) panel
{
fPreviewPanel = [panel retain];
fPreviewPanel.delegate = self;
fPreviewPanel.dataSource = self;
[fPreviewPanel setDelegate: self];
[fPreviewPanel setDataSource: self];
}
- (void) endPreviewPanelControl: (QLPreviewPanel *) panel
- (void) endPreviewPanelControl: (id) panel
{
[fPreviewPanel release];
fPreviewPanel = nil;
}
- (NSInteger) numberOfPreviewItemsInPreviewPanel: (QLPreviewPanel *) panel
- (NSInteger) numberOfPreviewItemsInPreviewPanel: (id) panel
{
return [[self quickLookURLs] count];
}
- (id <QLPreviewItem>) previewPanel: (QLPreviewPanel *)panel previewItemAtIndex: (NSInteger) index
- (id /*<QLPreviewItem>*/) previewPanel: (id)panel previewItemAtIndex: (NSInteger) index
{
return [[self quickLookURLs] objectAtIndex: index];
}
- (BOOL) previewPanel: (QLPreviewPanel *) panel handleEvent: (NSEvent *) event
- (BOOL) previewPanel: (id) panel handleEvent: (NSEvent *) event
{
if ([event type] == NSKeyDown)
{
@ -1153,7 +1154,7 @@ typedef enum
return NO;
}
- (NSRect) previewPanel: (QLPreviewPanel *) panel sourceFrameOnScreenForPreviewItem: (id <QLPreviewItem>) item
- (NSRect) previewPanel: (id) panel sourceFrameOnScreenForPreviewItem: (id /*<QLPreviewItem>*/) item
{
FileOutlineView * fileOutlineView = [fFileController outlineView];

2
macosx/NSApplicationAdditions.h
View file

@ -22,6 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#define QLPreviewPanelSL NSClassFromString(@"QLPreviewPanel")
@interface NSApplication (NSApplicationAdditions)
- (BOOL) isOnSnowLeopardOrBetter;

6
macosx/TorrentTableView.h
View file

@ -31,7 +31,8 @@
#define GROUP_SEPARATOR_HEIGHT 18.0
@interface TorrentTableView : NSOutlineView <QLPreviewPanelDataSource, QLPreviewPanelDelegate>
#warning revert
@interface TorrentTableView : NSOutlineView //<QLPreviewPanelDataSource, QLPreviewPanelDelegate>
{
IBOutlet Controller * fController;
@ -53,7 +54,8 @@
CGFloat fPiecesBarPercent;
NSAnimation * fPiecesBarAnimation;
QLPreviewPanel * fPreviewPanel;
#warning change to QLPreviewPanel
id fPreviewPanel;
}
- (BOOL) isGroupCollapsed: (NSInteger) value;

19
macosx/TorrentTableView.m
View file

@ -874,35 +874,36 @@
return fPiecesBarPercent;
}
- (BOOL) acceptsPreviewPanelControl: (QLPreviewPanel *) panel
#warning change from id to QLPreviewPanel
- (BOOL) acceptsPreviewPanelControl: (id) panel
{
return YES;
}
- (void) beginPreviewPanelControl: (QLPreviewPanel *) panel
- (void) beginPreviewPanelControl: (id) panel
{
fPreviewPanel = [panel retain];
fPreviewPanel.delegate = self;
fPreviewPanel.dataSource = self;
[fPreviewPanel setDelegate: self];
[fPreviewPanel setDataSource: self];
}
- (void) endPreviewPanelControl: (QLPreviewPanel *) panel
- (void) endPreviewPanelControl: (id) panel
{
[fPreviewPanel release];
fPreviewPanel = nil;
}
- (NSInteger) numberOfPreviewItemsInPreviewPanel: (QLPreviewPanel *) panel
- (NSInteger) numberOfPreviewItemsInPreviewPanel: (id) panel
{
return [[self quickLookableTorrents] count];
}
- (id <QLPreviewItem>) previewPanel: (QLPreviewPanel *)panel previewItemAtIndex: (NSInteger) index
- (id /*<QLPreviewItem>*/) previewPanel: (id) panel previewItemAtIndex: (NSInteger) index
{
return [[self quickLookableTorrents] objectAtIndex: index];
}
- (BOOL) previewPanel: (QLPreviewPanel *) panel handleEvent: (NSEvent *) event
- (BOOL) previewPanel: (id) panel handleEvent: (NSEvent *) event
{
if ([event type] == NSKeyDown)
{
@ -913,7 +914,7 @@
return NO;
}
- (NSRect) previewPanel: (QLPreviewPanel *) panel sourceFrameOnScreenForPreviewItem: (id <QLPreviewItem>) item
- (NSRect) previewPanel: (id) panel sourceFrameOnScreenForPreviewItem: (id /*<QLPreviewItem>*/) item
{
const NSInteger row = [self rowForItem: item];
if (row == -1)