Revision: 6379
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6379&view=rev
Author:   hofman
Date:     2010-03-26 12:31:38 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
get number of note types from menu

Modified Paths:
--------------
    trunk/SKNoteTypeSheetController.m

Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m   2010-03-25 22:24:14 UTC (rev 6378)
+++ trunk/SKNoteTypeSheetController.m   2010-03-26 12:31:38 UTC (rev 6379)
@@ -13,7 +13,6 @@
 #import "NSMenu_SKExtensions.h"
 #import <SKimNotes/SkimNotes.h>
 
-#define NUMBER_OF_TYPES 9
 
 @interface SKNoteTypeSheetController (Private)
 - (void)toggleDisplayNoteType:(id)sender;
@@ -47,8 +46,8 @@
 }
 
 - (void)windowDidLoad {
-    NSInteger i;
-    for (i = 0; i < NUMBER_OF_TYPES; i++)
+    NSUInteger i, iMax = [noteTypeMenu numberOfItems];
+    for (i = 0; i < iMax; i++)
         [[matrix cellWithTag:i] setTitle:[[noteTypeMenu itemAtIndex:i] title]];
     [matrix sizeToFit];
     
@@ -69,10 +68,7 @@
 
 - (NSArray *)noteTypes {
     NSMutableArray *types = [NSMutableArray array];
-    NSInteger i;
-    
-    for (i = 0; i < NUMBER_OF_TYPES; i++) {
-        NSMenuItem *item = [noteTypeMenu itemAtIndex:i];
+    for (NSMenuItem *item in [noteTypeMenu itemArray]) {
         if ([item state] == NSOnState)
             [types addObject:[item representedObject]];
     }
@@ -89,16 +85,16 @@
 }
 
 - (void)displayAllNoteTypes:(id)sender {
-    NSInteger i;
-    for (i = 0; i < NUMBER_OF_TYPES; i++)
+    NSUInteger i, iMax = [noteTypeMenu numberOfItems];
+    for (i = 0; i < iMax; i++)
         [[noteTypeMenu itemAtIndex:i] setState:NSOnState];
     [self noteTypesUpdated];
 }
 
 - (void)noteTypeSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode 
contextInfo:(void *)contextInfo {
     if (returnCode == NSOKButton) {
-        NSInteger i;
-        for (i = 0; i < NUMBER_OF_TYPES; i++)
+    NSUInteger i, iMax = [noteTypeMenu numberOfItems];
+        for (i = 0; i < iMax; i++)
             [[noteTypeMenu itemAtIndex:i] setState:[[matrix cellWithTag:i] 
state]];
         [self noteTypesUpdated];
     }
@@ -107,8 +103,8 @@
 - (void)selectNoteTypes:(id)sender {
     [self window];
     
-    NSInteger i;
-    for (i = 0; i < NUMBER_OF_TYPES; i++)
+    NSUInteger i, iMax = [noteTypeMenu numberOfItems];
+    for (i = 0; i < iMax; i++)
         [[matrix cellWithTag:i] setState:[[noteTypeMenu itemAtIndex:i] state]];
        
     [self beginSheetModalForWindow:[delegate 
windowForNoteTypeSheetController:self]


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

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to