Revision: 3418
http://skim-app.svn.sourceforge.net/skim-app/?rev=3418&view=rev
Author: hofman
Date: 2008-02-20 16:28:03 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
Combine action methods of some toolbar buttons.
Modified Paths:
--------------
trunk/English.lproj/MainWindow.nib/classes.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/English.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/classes.nib 2008-02-20 22:54:30 UTC
(rev 3417)
+++ trunk/English.lproj/MainWindow.nib/classes.nib 2008-02-21 00:28:03 UTC
(rev 3418)
@@ -136,10 +136,8 @@
exitFullScreen = id;
getInfo = id;
goBackOrForward = id;
- goToFirstOrPreviousPage = id;
goToMarkedPage = id;
- goToNextOrLastPage = id;
- goToPreviousOrNextPage = id;
+ goToPreviousNextFirstLastPage = id;
markPage = id;
password = id;
performFit = id;
@@ -167,7 +165,6 @@
toggleRightSidePane = id;
toggleStatusBar = id;
zoomInActualOut = id;
- zoomInOut = id;
};
CLASS = SKMainWindowController;
LANGUAGE = ObjC;
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2008-02-20 22:54:30 UTC (rev
3417)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2008-02-21 00:28:03 UTC (rev
3418)
@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>168</key>
- <string>531 414 377 405 0 0 1440 938 </string>
+ <string>531 460 368 359 0 0 1440 938 </string>
<key>224</key>
<string>610 386 220 442 0 0 1440 938 </string>
<key>256</key>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2008-02-20 22:54:30 UTC (rev 3417)
+++ trunk/SKMainWindowController.h 2008-02-21 00:28:03 UTC (rev 3418)
@@ -253,15 +253,13 @@
- (IBAction)changeDisplayBox:(id)sender;
- (IBAction)doGoToNextPage:(id)sender;
- (IBAction)doGoToPreviousPage:(id)sender;
-- (IBAction)goToPreviousOrNextPage:(id)sender;
- (IBAction)doGoToFirstPage:(id)sender;
- (IBAction)doGoToLastPage:(id)sender;
- (IBAction)allGoToNextPage:(id)sender;
- (IBAction)allGoToPreviousPage:(id)sender;
- (IBAction)allGoToFirstPage:(id)sender;
- (IBAction)allGoToLastPage:(id)sender;
-- (IBAction)goToFirstOrPreviousPage:(id)sender;
-- (IBAction)goToNextOrLastPage:(id)sender;
+- (IBAction)goToPreviousNextFirstLastPage:(id)sender;
- (IBAction)doGoToPage:(id)sender;
- (IBAction)doGoBack:(id)sender;
- (IBAction)doGoForward:(id)sender;
@@ -274,7 +272,6 @@
- (IBAction)doZoomToFit:(id)sender;
- (IBAction)alternateZoomToFit:(id)sender;
- (IBAction)doZoomToSelection:(id)sender;
-- (IBAction)zoomInOut:(id)sender;
- (IBAction)zoomInActualOut:(id)sender;
- (IBAction)doAutoScale:(id)sender;
- (IBAction)toggleAutoScale:(id)sender;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-02-20 22:54:30 UTC (rev 3417)
+++ trunk/SKMainWindowController.m 2008-02-21 00:28:03 UTC (rev 3418)
@@ -154,6 +154,7 @@
@interface NSSegmentedControl (SKExtensions)
- (void)makeCapsule;
- (void)makeTexturedRounded;
+- (NSInteger)selectedTag;
@end
@implementation NSSegmentedControl (SKExtensions)
@@ -178,6 +179,10 @@
}
}
+- (NSInteger)selectedTag {
+ return [[self cell] tagForSegment:[self selectedSegment]];
+}
+
@end
@interface NSResponder (SKExtensions)
@@ -1524,12 +1529,6 @@
[pdfView goToPreviousPage:sender];
}
-- (IBAction)goToPreviousOrNextPage:(id)sender {
- if ([sender selectedSegment] == 0)
- [pdfView goToPreviousPage:sender];
- else
- [pdfView goToNextPage:sender];
-}
- (IBAction)doGoToFirstPage:(id)sender {
[pdfView goToFirstPage:sender];
@@ -1555,18 +1554,17 @@
[[NSApp valueForKeyPath:@"orderedDocuments.pdfView"]
makeObjectsPerformSelector:@selector(goToLastPage:) withObject:sender];
}
-- (IBAction)goToFirstOrPreviousPage:(id)sender {
- if ([sender selectedSegment] == 0)
- [pdfView goToFirstPage:sender];
- else
+- (IBAction)goToPreviousNextFirstLastPage:(id)sender {
+ int tag = [sender selectedTag];
+ if (tag == -1)
[pdfView goToPreviousPage:sender];
-}
-
-- (IBAction)goToNextOrLastPage:(id)sender {
- if ([sender selectedSegment] == 0)
+ else if (tag == 1)
[pdfView goToNextPage:sender];
- else
+ else if (tag == -2)
+ [pdfView goToFirstPage:sender];
+ else if (tag == 2)
[pdfView goToLastPage:sender];
+
}
- (void)pageSheetDidEnd:(SKPageSheetController *)controller
returnCode:(int)returnCode contextInfo:(void *)contextInfo {
@@ -1697,19 +1695,13 @@
}
}
-- (IBAction)zoomInOut:(id)sender {
- if ([sender selectedSegment] == 0)
- [pdfView zoomOut:sender];
- else
- [pdfView zoomIn:sender];
-}
-
- (IBAction)zoomInActualOut:(id)sender {
- if ([sender selectedSegment] == 0)
+ int tag = [sender selectedTag];
+ if (tag == -1)
[pdfView zoomOut:sender];
- else if ([sender selectedSegment] == 1)
+ else if (tag == 0)
[pdfView setScaleFactor:1.0];
- else
+ else if (tag == 1)
[pdfView zoomIn:sender];
}
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 2008.
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
