Revision: 4724
http://skim-app.svn.sourceforge.net/skim-app/?rev=4724&view=rev
Author: hofman
Date: 2008-10-01 18:31:56 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
Set double click actions explicitly rather than using bindings in all cases, as
binding is buggy.
Modified Paths:
--------------
trunk/MainWindow.nib/classes.nib
trunk/MainWindow.nib/info.nib
trunk/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKMainWindowController_UI.m
Modified: trunk/MainWindow.nib/classes.nib
===================================================================
--- trunk/MainWindow.nib/classes.nib 2008-10-01 17:17:40 UTC (rev 4723)
+++ trunk/MainWindow.nib/classes.nib 2008-10-01 18:31:56 UTC (rev 4724)
@@ -79,6 +79,22 @@
<string>SKOutlineView</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>NSWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
<key>ACTIONS</key>
<dict>
<key>addBookmark</key>
@@ -419,22 +435,6 @@
<string>NSWindowController</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>NSWindowController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
<key>ACTIONS</key>
<dict>
<key>changeDashPattern</key>
@@ -518,11 +518,11 @@
</dict>
<dict>
<key>CLASS</key>
- <string>NSSegmentedControl</string>
+ <string>SKAnnotationTypeImageCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>NSControl</string>
+ <string>NSImageCell</string>
</dict>
<dict>
<key>ACTIONS</key>
@@ -565,11 +565,11 @@
</dict>
<dict>
<key>CLASS</key>
- <string>SKAnnotationTypeImageCell</string>
+ <string>NSSegmentedControl</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>NSImageCell</string>
+ <string>NSControl</string>
</dict>
<dict>
<key>CLASS</key>
@@ -603,6 +603,19 @@
<string>NSObject</string>
</dict>
<dict>
+ <key>CLASS</key>
+ <string>BDSKContainerView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>contentView</key>
+ <string>id</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
<key>ACTIONS</key>
<dict>
<key>addAnnotation</key>
@@ -653,19 +666,6 @@
</dict>
<dict>
<key>CLASS</key>
- <string>BDSKContainerView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>contentView</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSView</string>
- </dict>
- <dict>
- <key>CLASS</key>
<string>NSCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
Modified: trunk/MainWindow.nib/info.nib
===================================================================
--- trunk/MainWindow.nib/info.nib 2008-10-01 17:17:40 UTC (rev 4723)
+++ trunk/MainWindow.nib/info.nib 2008-10-01 18:31:56 UTC (rev 4724)
@@ -9,9 +9,7 @@
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
- <array>
- <integer>514</integer>
- </array>
+ <array/>
<key>IBSystem Version</key>
<string>9F33</string>
<key>targetFramework</key>
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2008-10-01 17:17:40 UTC (rev 4723)
+++ trunk/SKMainWindowController.h 2008-10-01 18:31:56 UTC (rev 4724)
@@ -339,7 +339,6 @@
- (void)showSnapshotAtPageNumber:(int)pageNum forRect:(NSRect)rect
scaleFactor:(float)scaleFactor autoFits:(BOOL)autoFits;
- (void)showSnapshotWithSetups:(NSArray *)setups;
-- (void)toggleSnapshots:(NSArray *)snapshotArray;
- (void)showNote:(PDFAnnotation *)annotation;
- (SKPDFView *)pdfView;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-10-01 17:17:40 UTC (rev 4723)
+++ trunk/SKMainWindowController.m 2008-10-01 18:31:56 UTC (rev 4724)
@@ -184,10 +184,12 @@
- (void)activityTimerFired:(NSTimer *)timer;
- (void)goToFindResults:(NSArray *)findResults scrollToVisible:(BOOL)scroll;
-- (void)goToFindResults:(NSArray *)findResults;
+- (void)goToSelectedFindResults:(id)sender;
- (void)updateFindResultHighlights:(BOOL)scroll;
- (void)selectSelectedNote:(id)sender;
+- (void)goToSelectedOutlineItem:(id)sender;
+- (void)toggleSelectedSnapshots:(id)sender;
- (void)updateNoteFilterPredicate;
@@ -355,6 +357,14 @@
[noteOutlineView setDoubleAction:@selector(selectSelectedNote:)];
[noteOutlineView setTarget:self];
+ [outlineView setDoubleAction:@selector(goToSelectedOutlineItem:)];
+ [outlineView setTarget:self];
+ [snapshotTableView setDoubleAction:@selector(toggleSelectedSnapshots:)];
+ [snapshotTableView setTarget:self];
+ [findTableView setDoubleAction:@selector(goToSelectedFindResults:)];
+ [findTableView setTarget:self];
+ [groupedFindTableView setDoubleAction:@selector(goToSelectedFindResults:)];
+ [groupedFindTableView setTarget:self];
[pdfView setFrame:[[pdfEdgeView contentView] bounds]];
@@ -1334,6 +1344,18 @@
} else NSBeep();
}
+- (void)goToSelectedOutlineItem:(id)sender {
+ SKPDFOutline *outlineItem = [outlineView itemAtRow:[outlineView
selectedRow]];
+ if ([outlineItem destination])
+ [self goToDestination:[outlineItem destination]];
+ else if ([outlineItem action])
+ [pdfView performAction:[outlineItem action]];
+}
+
+- (IBAction):(id)sender {
+
+}
+
- (IBAction)editNote:(id)sender{
if ([pdfView hideNotes] == NO) {
[pdfView editActiveAnnotation:sender];
@@ -2951,8 +2973,8 @@
[pdfView setCurrentSelection:currentSel];
}
-- (void)goToFindResults:(NSArray *)findResults {
- [self goToFindResults:findResults scrollToVisible:YES];
+- (void)goToSelectedFindResults:(id)sender {
+ [self updateFindResultHighlights:YES];
}
- (void)updateFindResultHighlights:(BOOL)scroll {
@@ -3202,9 +3224,9 @@
}
}
-- (void)toggleSnapshots:(NSArray *)snapshotArray {
+- (void)toggleSelectedSnapshots:(id)sender {
// there should only be a single snapshot
- SKSnapshotWindowController *controller = [snapshotArray lastObject];
+ SKSnapshotWindowController *controller = [[snapshotArrayController
selectedObjects] lastObject];
if ([[controller window] isVisible])
[controller miniaturize];
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2008-10-01 17:17:40 UTC (rev 4723)
+++ trunk/SKMainWindowController_UI.m 2008-10-01 18:31:56 UTC (rev 4724)
@@ -76,7 +76,8 @@
@interface SKMainWindowController (SKPrivateMain)
-- (IBAction)selectSelectedNote:(id)sender;
+- (void)selectSelectedNote:(id)sender;
+- (void)goToSelectedOutlineItem:(id)sender;
- (void)updateLeftStatus;
- (void)updateRightStatus;
@@ -632,12 +633,8 @@
- (void)outlineViewSelectionDidChange:(NSNotification *)notification{
// Get the destination associated with the search result list. Tell the
PDFView to go there.
if ([[notification object] isEqual:outlineView] &&
(updatingOutlineSelection == NO)){
- SKPDFOutline *outlineItem = [outlineView itemAtRow: [outlineView
selectedRow]];
updatingOutlineSelection = YES;
- if ([outlineItem destination])
- [self goToDestination:[outlineItem destination]];
- else if ([outlineItem action])
- [pdfView performAction:[outlineItem action]];
+ [self goToSelectedOutlineItem:nil];
updatingOutlineSelection = NO;
if ([self isPresentation] && [[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoHidePresentationContentsKey])
[self hideLeftSideWindow];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
