Revision: 6582
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6582&view=rev
Author:   hofman
Date:     2010-06-09 14:21:50 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
eliminate some local variables

Modified Paths:
--------------
    trunk/SKMainToolbarController.m
    trunk/SKMainWindowController_Actions.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m     2010-06-09 13:13:35 UTC (rev 6581)
+++ trunk/SKMainToolbarController.m     2010-06-09 14:21:50 UTC (rev 6582)
@@ -930,29 +930,33 @@
 }
 
 - (IBAction)changeDisplaySinglePages:(id)sender {
-    PDFDisplayMode tag = [sender selectedTag];
     PDFDisplayMode displayMode = [mainController.pdfView displayMode];
-    if (displayMode == kPDFDisplaySinglePage && tag == kPDFDisplayTwoUp) 
-        [mainController.pdfView setDisplayMode:kPDFDisplayTwoUp];
-    else if (displayMode == kPDFDisplaySinglePageContinuous && tag == 
kPDFDisplayTwoUp)
-        [mainController.pdfView setDisplayMode:kPDFDisplayTwoUpContinuous];
-    else if (displayMode == kPDFDisplayTwoUp && tag == kPDFDisplaySinglePage)
-        [mainController.pdfView setDisplayMode:kPDFDisplaySinglePage];
-    else if (displayMode == kPDFDisplayTwoUpContinuous && tag == 
kPDFDisplaySinglePage)
-        [mainController.pdfView 
setDisplayMode:kPDFDisplaySinglePageContinuous];
+    if ([sender selectedTag] == kPDFDisplaySinglePage) {
+        if (displayMode == kPDFDisplayTwoUp)
+            [mainController.pdfView setDisplayMode:kPDFDisplaySinglePage];
+        else if (displayMode == kPDFDisplayTwoUpContinuous)
+            [mainController.pdfView 
setDisplayMode:kPDFDisplaySinglePageContinuous];
+    } else {
+        if (displayMode == kPDFDisplaySinglePage) 
+            [mainController.pdfView setDisplayMode:kPDFDisplayTwoUp];
+        else if (displayMode == kPDFDisplaySinglePageContinuous)
+            [mainController.pdfView setDisplayMode:kPDFDisplayTwoUpContinuous];
+    }
 }
 
 - (IBAction)changeDisplayContinuous:(id)sender {
-    PDFDisplayMode tag = [sender selectedTag];
     PDFDisplayMode displayMode = [mainController.pdfView displayMode];
-    if (displayMode == kPDFDisplaySinglePage && tag == 
kPDFDisplaySinglePageContinuous)
-        [mainController.pdfView 
setDisplayMode:kPDFDisplaySinglePageContinuous];
-    else if (displayMode == kPDFDisplaySinglePageContinuous && tag == 
kPDFDisplaySinglePage)
-        [mainController.pdfView setDisplayMode:kPDFDisplaySinglePage];
-    else if (displayMode == kPDFDisplayTwoUp && tag == 
kPDFDisplaySinglePageContinuous)
-        [mainController.pdfView setDisplayMode:kPDFDisplayTwoUpContinuous];
-    else if (displayMode == kPDFDisplayTwoUpContinuous && tag == 
kPDFDisplaySinglePage)
-        [mainController.pdfView setDisplayMode:kPDFDisplayTwoUp];
+    if ([sender selectedTag] == kPDFDisplaySinglePage) {
+        if (displayMode == kPDFDisplaySinglePageContinuous)
+            [mainController.pdfView setDisplayMode:kPDFDisplaySinglePage];
+        else if (displayMode == kPDFDisplayTwoUpContinuous)
+            [mainController.pdfView setDisplayMode:kPDFDisplayTwoUp];
+    } else {
+        if (displayMode == kPDFDisplaySinglePage)
+            [mainController.pdfView 
setDisplayMode:kPDFDisplaySinglePageContinuous];
+        else if (displayMode == kPDFDisplayTwoUp)
+            [mainController.pdfView setDisplayMode:kPDFDisplayTwoUpContinuous];
+    }
 }
 
 - (IBAction)changeDisplayMode:(id)sender {

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2010-06-09 13:13:35 UTC (rev 
6581)
+++ trunk/SKMainWindowController_Actions.m      2010-06-09 14:21:50 UTC (rev 
6582)
@@ -146,10 +146,9 @@
 }
 
 - (IBAction)createNewNote:(id)sender{
-    if ([pdfView hideNotes] == NO) {
-        NSInteger type = [sender tag];
-        [pdfView addAnnotationWithType:type];
-    } else NSBeep();
+    if ([pdfView hideNotes] == NO)
+        [pdfView addAnnotationWithType:[sender tag]];
+    else NSBeep();
 }
 
 - (void)selectSelectedNote:(id)sender{
@@ -207,34 +206,37 @@
 }
 
 - (IBAction)changeDisplaySinglePages:(id)sender {
-    PDFDisplayMode tag = [sender tag];
     PDFDisplayMode displayMode = [pdfView displayMode];
-    if (displayMode == kPDFDisplaySinglePage && tag == kPDFDisplayTwoUp) 
-        [pdfView setDisplayMode:kPDFDisplayTwoUp];
-    else if (displayMode == kPDFDisplaySinglePageContinuous && tag == 
kPDFDisplayTwoUp)
-        [pdfView setDisplayMode:kPDFDisplayTwoUpContinuous];
-    else if (displayMode == kPDFDisplayTwoUp && tag == kPDFDisplaySinglePage)
-        [pdfView setDisplayMode:kPDFDisplaySinglePage];
-    else if (displayMode == kPDFDisplayTwoUpContinuous && tag == 
kPDFDisplaySinglePage)
-        [pdfView setDisplayMode:kPDFDisplaySinglePageContinuous];
+    if ([sender tag] == kPDFDisplaySinglePage) {
+        if (displayMode == kPDFDisplayTwoUp)
+            [pdfView setDisplayMode:kPDFDisplaySinglePage];
+        else if (displayMode == kPDFDisplayTwoUpContinuous)
+            [pdfView setDisplayMode:kPDFDisplaySinglePageContinuous];
+    } else {
+        if (displayMode == kPDFDisplaySinglePage) 
+            [pdfView setDisplayMode:kPDFDisplayTwoUp];
+        else if (displayMode == kPDFDisplaySinglePageContinuous)
+            [pdfView setDisplayMode:kPDFDisplayTwoUpContinuous];
+    }
 }
 
 - (IBAction)changeDisplayContinuous:(id)sender {
-    PDFDisplayMode tag = [sender tag];
     PDFDisplayMode displayMode = [pdfView displayMode];
-    if (displayMode == kPDFDisplaySinglePage && tag == 
kPDFDisplaySinglePageContinuous)
-        [pdfView setDisplayMode:kPDFDisplaySinglePageContinuous];
-    else if (displayMode == kPDFDisplaySinglePageContinuous && tag == 
kPDFDisplaySinglePage)
-        [pdfView setDisplayMode:kPDFDisplaySinglePage];
-    else if (displayMode == kPDFDisplayTwoUp && tag == 
kPDFDisplaySinglePageContinuous)
-        [pdfView setDisplayMode:kPDFDisplayTwoUpContinuous];
-    else if (displayMode == kPDFDisplayTwoUpContinuous && tag == 
kPDFDisplaySinglePage)
-        [pdfView setDisplayMode:kPDFDisplayTwoUp];
+    if ([sender tag] == kPDFDisplaySinglePage) {
+        if (displayMode == kPDFDisplaySinglePageContinuous)
+            [pdfView setDisplayMode:kPDFDisplaySinglePage];
+        else if (displayMode == kPDFDisplayTwoUpContinuous)
+            [pdfView setDisplayMode:kPDFDisplayTwoUp];
+    } else {
+        if (displayMode == kPDFDisplaySinglePage)
+            [pdfView setDisplayMode:kPDFDisplaySinglePageContinuous];
+        else if (displayMode == kPDFDisplayTwoUp)
+            [pdfView setDisplayMode:kPDFDisplayTwoUpContinuous];
+    }
 }
 
 - (IBAction)changeDisplayMode:(id)sender {
-    PDFDisplayMode displayMode = [sender tag];
-    [pdfView setDisplayMode:displayMode];
+    [pdfView setDisplayMode:[sender tag]];
 }
 
 - (IBAction)toggleDisplayAsBook:(id)sender {
@@ -246,8 +248,7 @@
 }
 
 - (IBAction)changeDisplayBox:(id)sender {
-    PDFDisplayBox displayBox = [sender tag];
-    [pdfView setDisplayBox:displayBox];
+    [pdfView setDisplayBox:[sender tag]];
 }
 
 - (IBAction)doGoToNextPage:(id)sender {
@@ -689,8 +690,7 @@
 }
 
 - (IBAction)changeToolMode:(id)sender {
-    NSInteger newToolMode = [sender tag];
-    [pdfView setToolMode:newToolMode];
+    [pdfView setToolMode:[sender tag]];
 }
 
 - (IBAction)changeAnnotationMode:(id)sender {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to