Revision: 3215
http://skim-app.svn.sourceforge.net/skim-app/?rev=3215&view=rev
Author: hofman
Date: 2007-11-18 06:49:38 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Add menu actions to mark a page and go to the marked page.
Modified Paths:
--------------
trunk/Dutch.lproj/MainMenu.nib/classes.nib
trunk/Dutch.lproj/MainMenu.nib/info.nib
trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
trunk/English.lproj/MainMenu.nib/classes.nib
trunk/English.lproj/MainMenu.nib/info.nib
trunk/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/French.lproj/MainMenu.nib/classes.nib
trunk/French.lproj/MainMenu.nib/info.nib
trunk/French.lproj/MainMenu.nib/keyedobjects.nib
trunk/German.lproj/MainMenu.nib/classes.nib
trunk/German.lproj/MainMenu.nib/info.nib
trunk/German.lproj/MainMenu.nib/keyedobjects.nib
trunk/Italian.lproj/MainMenu.nib/classes.nib
trunk/Italian.lproj/MainMenu.nib/info.nib
trunk/Italian.lproj/MainMenu.nib/keyedobjects.nib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/Spanish.lproj/MainMenu.nib/classes.nib
trunk/Spanish.lproj/MainMenu.nib/info.nib
trunk/Spanish.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/MainMenu.nib/classes.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/Dutch.lproj/MainMenu.nib/classes.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -37,7 +37,8 @@
editBookmarks = id;
editNote = id;
getInfo = id;
- myAction = id;
+ goToMarkedPage = id;
+ markPage = id;
newDocumentFromClipboard = id;
orderFrontLineInspector = id;
orderFrontNotesPanel = id;
Modified: trunk/Dutch.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -7,11 +7,15 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>140 614 584 44 0 0 1440 938 </string>
+ <string>140 614 677 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>29</integer>
+ </array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8S165</string>
</dict>
</plist>
Modified: trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/English.lproj/MainMenu.nib/classes.nib 2007-11-18 01:27:25 UTC
(rev 3214)
+++ trunk/English.lproj/MainMenu.nib/classes.nib 2007-11-18 14:49:38 UTC
(rev 3215)
@@ -37,7 +37,8 @@
editBookmarks = id;
editNote = id;
getInfo = id;
- myAction = id;
+ goToMarkedPage = id;
+ markPage = id;
newDocumentFromClipboard = id;
orderFrontLineInspector = id;
orderFrontNotesPanel = id;
Modified: trunk/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/English.lproj/MainMenu.nib/info.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/English.lproj/MainMenu.nib/info.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -10,12 +10,12 @@
<string>140 614 584 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8S165</string>
</dict>
</plist>
Modified: trunk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/French.lproj/MainMenu.nib/classes.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/French.lproj/MainMenu.nib/classes.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -36,7 +36,8 @@
editBookmarks = id;
editNote = id;
getInfo = id;
- myAction = id;
+ goToMarkedPage = id;
+ markPage = id;
newDocumentFromClipboard = id;
orderFrontLineInspector = id;
orderFrontNotesPanel = id;
Modified: trunk/French.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/French.lproj/MainMenu.nib/info.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/French.lproj/MainMenu.nib/info.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -10,12 +10,12 @@
<string>140 614 645 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8S165</string>
</dict>
</plist>
Modified: trunk/French.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/German.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/German.lproj/MainMenu.nib/classes.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/German.lproj/MainMenu.nib/classes.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -37,7 +37,8 @@
editBookmarks = id;
editNote = id;
getInfo = id;
- myAction = id;
+ goToMarkedPage = id;
+ markPage = id;
newDocumentFromClipboard = id;
orderFrontLineInspector = id;
orderFrontNotesPanel = id;
Modified: trunk/German.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/German.lproj/MainMenu.nib/info.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/German.lproj/MainMenu.nib/info.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -7,10 +7,14 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>140 614 584 44 0 0 1440 938 </string>
+ <string>140 614 809 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>29</integer>
+ </array>
<key>IBSystem Version</key>
<string>8S165</string>
</dict>
Modified: trunk/German.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/MainMenu.nib/classes.nib 2007-11-18 01:27:25 UTC
(rev 3214)
+++ trunk/Italian.lproj/MainMenu.nib/classes.nib 2007-11-18 14:49:38 UTC
(rev 3215)
@@ -36,6 +36,8 @@
editBookmarks = id;
editNote = id;
getInfo = id;
+ goToMarkedPage = id;
+ markPage = id;
newDocumentFromClipboard = id;
orderFrontLineInspector = id;
orderFrontNotesPanel = id;
Modified: trunk/Italian.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainMenu.nib/info.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/Italian.lproj/MainMenu.nib/info.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -10,12 +10,12 @@
<string>140 614 696 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8S165</string>
</dict>
</plist>
Modified: trunk/Italian.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-11-18 01:27:25 UTC (rev 3214)
+++ trunk/SKMainWindowController.h 2007-11-18 14:49:38 UTC (rev 3215)
@@ -193,6 +193,8 @@
NSMutableArray *pageLabels;
+ unsigned int markedPageIndex;
+
NSMutableArray *lastViewedPages;
NSTimer *activityTimer;
@@ -236,6 +238,8 @@
- (IBAction)doGoBack:(id)sender;
- (IBAction)doGoForward:(id)sender;
- (IBAction)goBackOrForward:(id)sender;
+- (IBAction)goToMarkedPage:(id)sender;
+- (IBAction)markPage:(id)sender;
- (IBAction)doZoomIn:(id)sender;
- (IBAction)doZoomOut:(id)sender;
- (IBAction)doZoomToActualSize:(id)sender;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-11-18 01:27:25 UTC (rev 3214)
+++ trunk/SKMainWindowController.m 2007-11-18 14:49:38 UTC (rev 3215)
@@ -240,6 +240,7 @@
rightSidePaneState = SKNoteSidePaneState;
findPaneState = SKSingularFindPaneState;
temporaryAnnotations = CFSetCreateMutable(kCFAllocatorDefault, 0,
&kCFTypeSetCallBacks);
+ markedPageIndex = NSNotFound;
isAnimating = NO;
updatingColor = NO;
updatingFont = NO;
@@ -1508,6 +1509,18 @@
[pdfView goBack:sender];
}
+- (IBAction)goToMarkedPage:(id)sender {
+ PDFDocument *pdfDoc = [pdfView document];
+ if (markedPageIndex == NSNotFound || [pdfDoc isLocked] || [pdfDoc
pageCount] == 0);
+ NSBeep();
+ else
+ [pdfView goToPage:[pdfDoc pageAtIndex:MIN(markedPageIndex, [pdfDoc
pageCount] - 1)]];
+}
+
+- (IBAction)markPage:(id)sender {
+ markedPageIndex = [[pdfView currentPage] pageIndex];
+}
+
- (IBAction)doZoomIn:(id)sender {
[pdfView zoomIn:sender];
}
@@ -5107,6 +5120,8 @@
return [pdfView canGoBack];
} else if (action == @selector(doGoForward:)) {
return [pdfView canGoForward];
+ } else if (action == @selector(goToMarkedPage:)) {
+ return markedPageIndex != NSNotFound;
} else if (action == @selector(doZoomIn:)) {
return [self isPresentation] == NO && [pdfView canZoomIn];
} else if (action == @selector(doZoomOut:)) {
Modified: trunk/Spanish.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Spanish.lproj/MainMenu.nib/classes.nib 2007-11-18 01:27:25 UTC
(rev 3214)
+++ trunk/Spanish.lproj/MainMenu.nib/classes.nib 2007-11-18 14:49:38 UTC
(rev 3215)
@@ -36,7 +36,8 @@
editBookmarks = id;
editNote = id;
getInfo = id;
- myAction = id;
+ goToMarkedPage = id;
+ markPage = id;
newDocumentFromClipboard = id;
orderFrontLineInspector = id;
orderFrontNotesPanel = id;
Modified: trunk/Spanish.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Spanish.lproj/MainMenu.nib/info.nib 2007-11-18 01:27:25 UTC (rev
3214)
+++ trunk/Spanish.lproj/MainMenu.nib/info.nib 2007-11-18 14:49:38 UTC (rev
3215)
@@ -10,12 +10,12 @@
<string>140 614 699 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8S165</string>
</dict>
</plist>
Modified: trunk/Spanish.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
