Revision: 7834
http://skim-app.svn.sourceforge.net/skim-app/?rev=7834&view=rev
Author: hofman
Date: 2012-12-10 18:27:44 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
No need to keep open panel accessory as ivar as it can be passed to the
callback block now
Modified Paths:
--------------
trunk/SKMainDocument.h
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.h
===================================================================
--- trunk/SKMainDocument.h 2012-12-10 18:25:39 UTC (rev 7833)
+++ trunk/SKMainDocument.h 2012-12-10 18:27:44 UTC (rev 7834)
@@ -45,9 +45,6 @@
@interface SKMainDocument : NSDocument <SKPDFSynchronizerDelegate>
{
- NSView *readNotesAccessoryView;
- NSButton *replaceNotesCheckButton;
-
SKMainWindowController *mainWindowController;
// variables to be saved:
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2012-12-10 18:25:39 UTC (rev 7833)
+++ trunk/SKMainDocument.m 2012-12-10 18:27:44 UTC (rev 7834)
@@ -190,7 +190,6 @@
SKDESTROY(fileUpdateChecker);
SKDESTROY(pdfData);
SKDESTROY(originalData);
- SKDESTROY(readNotesAccessoryView);
SKDESTROY(progressController);
SKDESTROY(tmpData);
[super dealloc];
@@ -978,17 +977,17 @@
- (IBAction)readNotes:(id)sender{
NSOpenPanel *oPanel = [NSOpenPanel openPanel];
NSURL *fileURL = [self fileURL];
+ NSButton *replaceNotesCheckButton = nil;
+ NSView *readNotesAccessoryView = nil;
if ([[[self mainWindowController] notes] count]) {
- if (readNotesAccessoryView == nil) {
- replaceNotesCheckButton = [[[NSButton alloc] init] autorelease];
- [replaceNotesCheckButton setButtonType:NSSwitchButton];
- [replaceNotesCheckButton setTitle:NSLocalizedString(@"Replace
existing notes", @"Check button title")];
- [replaceNotesCheckButton sizeToFit];
- [replaceNotesCheckButton setFrameOrigin:NSMakePoint(16.0, 8.0)];
- readNotesAccessoryView = [[NSView alloc]
initWithFrame:NSInsetRect([replaceNotesCheckButton frame], -16.0, -8.0)];
- [readNotesAccessoryView addSubview:replaceNotesCheckButton];
- }
+ replaceNotesCheckButton = [[[NSButton alloc] init] autorelease];
+ [replaceNotesCheckButton setButtonType:NSSwitchButton];
+ [replaceNotesCheckButton setTitle:NSLocalizedString(@"Replace existing
notes", @"Check button title")];
+ [replaceNotesCheckButton sizeToFit];
+ [replaceNotesCheckButton setFrameOrigin:NSMakePoint(16.0, 8.0)];
+ readNotesAccessoryView = [[NSView alloc]
initWithFrame:NSInsetRect([replaceNotesCheckButton frame], -16.0, -8.0)];
+ [readNotesAccessoryView addSubview:replaceNotesCheckButton];
[oPanel setAccessoryView:readNotesAccessoryView];
[replaceNotesCheckButton setState:NSOnState];
}
@@ -999,7 +998,7 @@
[oPanel beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSInteger result){
if (result == NSFileHandlingPanelOKButton) {
NSURL *notesURL = [[oPanel URLs] objectAtIndex:0];
- BOOL replace = ([[oPanel accessoryView]
isEqual:readNotesAccessoryView] && [replaceNotesCheckButton state] ==
NSOnState);
+ BOOL replace = (replaceNotesCheckButton &&
[replaceNotesCheckButton state] == NSOnState);
[self readNotesFromURL:notesURL replace:replace];
}
}];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
