Revision: 6538
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6538&view=rev
Author:   hofman
Date:     2010-05-16 17:52:39 +0000 (Sun, 16 May 2010)

Log Message:
-----------
allow changing page index of bookmarks

Modified Paths:
--------------
    trunk/BookmarksWindow.xib
    trunk/SKBookmark.h
    trunk/SKBookmark.m
    trunk/SKBookmarkController.m

Modified: trunk/BookmarksWindow.xib
===================================================================
--- trunk/BookmarksWindow.xib   2010-05-16 16:41:39 UTC (rev 6537)
+++ trunk/BookmarksWindow.xib   2010-05-16 17:52:39 UTC (rev 6538)
@@ -202,6 +202,71 @@
                                                                                
                                <int key="NSCellFlags">337772096</int>
                                                                                
                                <int key="NSCellFlags2">2048</int>
                                                                                
                                <reference key="NSSupport" ref="198759373"/>
+                                                                               
                                <object class="NSNumberFormatter" 
key="NSFormatter" id="579474317">
+                                                                               
                                        <object class="NSMutableDictionary" 
key="NS.attributes">
+                                                                               
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                                               
                                                <object class="NSArray" 
key="dict.sortedKeys">
+                                                                               
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                                               
                                                        
<string>allowsFloats</string>
+                                                                               
                                                        
<string>formatterBehavior</string>
+                                                                               
                                                        <string>lenient</string>
+                                                                               
                                                        <string>minimum</string>
+                                                                               
                                                        
<string>negativeInfinitySymbol</string>
+                                                                               
                                                        
<string>nilSymbol</string>
+                                                                               
                                                        
<string>numberStyle</string>
+                                                                               
                                                        
<string>positiveInfinitySymbol</string>
+                                                                               
                                                </object>
+                                                                               
                                                <object class="NSMutableArray" 
key="dict.values">
+                                                                               
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                                               
                                                        <boolean value="YES"/>
+                                                                               
                                                        <integer value="1040"/>
+                                                                               
                                                        <boolean value="NO"/>
+                                                                               
                                                        <real value="1"/>
+                                                                               
                                                        <string>-∞</string>
+                                                                               
                                                        <string/>
+                                                                               
                                                        <integer value="0"/>
+                                                                               
                                                        <string>+∞</string>
+                                                                               
                                                </object>
+                                                                               
                                        </object>
+                                                                               
                                        <string 
key="NS.positiveformat">#</string>
+                                                                               
                                        <string 
key="NS.negativeformat">#</string>
+                                                                               
                                        <nil key="NS.positiveattrs"/>
+                                                                               
                                        <nil key="NS.negativeattrs"/>
+                                                                               
                                        <nil key="NS.zero"/>
+                                                                               
                                        <object class="NSAttributedString" 
key="NS.nil">
+                                                                               
                                                <string key="NSString"/>
+                                                                               
                                        </object>
+                                                                               
                                        <object class="NSAttributedString" 
key="NS.nan">
+                                                                               
                                                <string 
key="NSString">NaN</string>
+                                                                               
                                                <object class="NSDictionary" 
key="NSAttributes">
+                                                                               
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                                               
                                                        <reference 
key="dict.sortedKeys" ref="0"/>
+                                                                               
                                                        <object 
class="NSMutableArray" key="dict.values">
+                                                                               
                                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                                               
                                                        </object>
+                                                                               
                                                </object>
+                                                                               
                                        </object>
+                                                                               
                                        <real value="1" key="NS.min"/>
+                                                                               
                                        <object 
class="NSDecimalNumberPlaceholder" key="NS.max">
+                                                                               
                                                <int key="NS.exponent">0</int>
+                                                                               
                                                <int key="NS.length">0</int>
+                                                                               
                                                <bool 
key="NS.negative">YES</bool>
+                                                                               
                                                <bool key="NS.compact">NO</bool>
+                                                                               
                                                <int 
key="NS.mantissa.bo">1</int>
+                                                                               
                                                <bytes 
key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes>
+                                                                               
                                        </object>
+                                                                               
                                        <object class="NSDecimalNumberHandler" 
key="NS.rounding">
+                                                                               
                                                <int 
key="NS.roundingmode">3</int>
+                                                                               
                                                <bool 
key="NS.raise.overflow">YES</bool>
+                                                                               
                                                <bool 
key="NS.raise.underflow">YES</bool>
+                                                                               
                                                <bool 
key="NS.raise.dividebyzero">YES</bool>
+                                                                               
                                        </object>
+                                                                               
                                        <string key="NS.decimal">.</string>
+                                                                               
                                        <string key="NS.thousand">,</string>
+                                                                               
                                        <bool key="NS.hasthousands">NO</bool>
+                                                                               
                                        <bool key="NS.localized">YES</bool>
+                                                                               
                                        <bool key="NS.allowsfloats">YES</bool>
+                                                                               
                                </object>
                                                                                
                                <reference key="NSControlView" ref="9273418"/>
                                                                                
                                <object class="NSColor" key="NSBackgroundColor" 
id="211017390">
                                                                                
                                        <int key="NSColorSpace">6</int>
@@ -216,6 +281,7 @@
                                                                                
                        </object>
                                                                                
                        <int key="NSResizingMask">3</int>
                                                                                
                        <bool key="NSIsResizeable">YES</bool>
+                                                                               
                        <bool key="NSIsEditable">YES</bool>
                                                                                
                        <reference key="NSTableView" ref="9273418"/>
                                                                                
                </object>
                                                                                
        </object>
@@ -486,6 +552,10 @@
                                        <object class="IBObjectRecord">
                                                <int key="objectID">97</int>
                                                <reference key="object" 
ref="744363902"/>
+                                               <object class="NSMutableArray" 
key="children">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference 
ref="579474317"/>
+                                               </object>
                                                <reference key="parent" 
ref="705704323"/>
                                        </object>
                                        <object class="IBObjectRecord">
@@ -503,6 +573,11 @@
                                                <reference key="object" 
ref="304023328"/>
                                                <reference key="parent" 
ref="793888819"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">101</int>
+                                               <reference key="object" 
ref="579474317"/>
+                                               <reference key="parent" 
ref="744363902"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" 
key="flattenedProperties">
@@ -513,6 +588,9 @@
                                        <string>-3.ImportedFromIB2</string>
                                        <string>100.IBPluginDependency</string>
                                        
<string>100.IBShouldRemoveOnLegacySave</string>
+                                       
<string>101.IBNumberFormatterBehaviorMetadataKey</string>
+                                       
<string>101.IBNumberFormatterLocalizesFormatMetadataKey</string>
+                                       <string>101.IBPluginDependency</string>
                                        <string>37.IBPluginDependency</string>
                                        <string>37.ImportedFromIB2</string>
                                        
<string>5.IBEditorWindowLastContentRect</string>
@@ -552,7 +630,10 @@
                                        <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
+                                       <integer value="1041"/>
+                                       <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
                                        <string>{{42, 549}, {400, 250}}</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -602,7 +683,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">100</int>
+                       <int key="maxID">101</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" 
key="referencedPartialClassDescriptions">
@@ -1106,6 +1187,14 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string 
key="className">NSNumberFormatter</string>
+                                       <string 
key="superclassName">NSFormatter</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">Foundation.framework/Headers/NSNumberFormatter.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">NSObject</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBFrameworkSource</string>

Modified: trunk/SKBookmark.h
===================================================================
--- trunk/SKBookmark.h  2010-05-16 16:41:39 UTC (rev 6537)
+++ trunk/SKBookmark.h  2010-05-16 17:52:39 UTC (rev 6538)
@@ -72,8 +72,8 @@
 @property (nonatomic, retain) NSString *label;
 @property (nonatomic, readonly) NSImage *icon;
 @property (nonatomic, readonly) NSString *path;
-...@property (nonatomic, readonly) NSUInteger pageIndex;
-...@property (nonatomic, readonly) NSNumber *pageNumber;
+...@property (nonatomic) NSUInteger pageIndex;
+...@property (nonatomic, retain) NSNumber *pageNumber;
 @property (nonatomic, assign) SKBookmark *parent;
 
 - (NSArray *)children;

Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m  2010-05-16 16:41:39 UTC (rev 6537)
+++ trunk/SKBookmark.m  2010-05-16 17:52:39 UTC (rev 6538)
@@ -186,7 +186,9 @@
 
 - (NSString *)path { return nil; }
 - (NSUInteger)pageIndex { return NSNotFound; }
+- (void)setPageIndex:(NSUInteger)newPageIndex {}
 - (NSNumber *)pageNumber { return nil; }
+- (void)setPageNumber:(NSNumber *)newPageNumber {}
 
 - (NSArray *)session { return nil; }
 
@@ -373,10 +375,18 @@
     return pageIndex;
 }
 
+- (void)setPageIndex:(NSUInteger)newPageIndex { pageIndex = newPageIndex; }
+
 - (NSNumber *)pageNumber {
     return pageIndex == NSNotFound ? nil : [NSNumber 
numberWithUnsignedInteger:pageIndex + 1];
 }
 
+- (void)setPageNumber:(NSNumber *)newPageNumber {
+    NSUInteger newNumber = [newPageNumber unsignedIntegerValue];
+    if (newNumber > 0)
+        [self setPageIndex:newNumber - 1];
+}
+
 - (NSString *)label {
     return label ?: @"";
 }

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2010-05-16 16:41:39 UTC (rev 6537)
+++ trunk/SKBookmarkController.m        2010-05-16 17:52:39 UTC (rev 6538)
@@ -452,6 +452,7 @@
     for (SKBookmark *bm in newBookmarks) {
         if ([bm bookmarkType] != SKBookmarkTypeSeparator) {
             [bm addObserver:self forKeyPath:LABEL_KEY 
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld) 
context:&SKBookmarkPropertiesObservationContext];
+            [bm addObserver:self forKeyPath:PAGEINDEX_KEY 
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld) 
context:&SKBookmarkPropertiesObservationContext];
             if ([bm bookmarkType] == SKBookmarkTypeFolder) {
                 [bm addObserver:self forKeyPath:CHILDREN_KEY 
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld) 
context:&SKBookmarkPropertiesObservationContext];
                 [self startObservingBookmarks:[bm children]];
@@ -464,6 +465,7 @@
     for (SKBookmark *bm in oldBookmarks) {
         if ([bm bookmarkType] != SKBookmarkTypeSeparator) {
             [bm removeObserver:self forKeyPath:LABEL_KEY];
+            [bm removeObserver:self forKeyPath:PAGEINDEX_KEY];
             if ([bm bookmarkType] == SKBookmarkTypeFolder) {
                 [bm removeObserver:self forKeyPath:CHILDREN_KEY];
                 [self stopObservingBookmarks:[bm children]];
@@ -510,6 +512,8 @@
                     [[[self undoManager] prepareWithInvocationTarget:self] 
setChildren:[[oldValue copy] autorelease] ofBookmark:bookmark];
                 } else if ([keyPath isEqualToString:LABEL_KEY]) {
                     [[[self undoManager] prepareWithInvocationTarget:bookmark] 
setLabel:oldValue];
+                } else if ([keyPath isEqualToString:PAGEINDEX_KEY]) {
+                    [[[self undoManager] prepareWithInvocationTarget:bookmark] 
setPageIndex:[oldValue unsignedIntegerValue]];
                 }
                 break;
             case NSKeyValueChangeInsertion:
@@ -589,7 +593,7 @@
             return [item path];
         }
     } else if ([tcID isEqualToString:PAGE_COLUMNID]) {
-        return [[item pageNumber] stringValue];
+        return [item pageNumber];
     }
     return nil;
 }
@@ -600,6 +604,9 @@
         NSString *newlabel = [object valueForKey:SKTextWithIconCellStringKey] 
?: @"";
         if ([newlabel isEqualToString:[item label]] == NO)
             [item setLabel:newlabel];
+    } else if ([tcID isEqualToString:PAGE_COLUMNID]) {
+        if ([object isEqual:[item pageNumber]] == NO)
+            [item setPageNumber:object];
     }
 }
 
@@ -676,7 +683,12 @@
 }
 
 - (BOOL)outlineView:(NSOutlineView *)ov shouldEditTableColumn:(NSTableColumn 
*)tableColumn item:(id)item {
-    return [[tableColumn identifier] isEqualToString:LABEL_COLUMNID] && [item 
bookmarkType] != SKBookmarkTypeSeparator;
+    NSString *tcID = [tableColumn identifier];
+    if ([tcID isEqualToString:LABEL_COLUMNID])
+        return [item bookmarkType] != SKBookmarkTypeSeparator;
+    else if ([tcID isEqualToString:PAGE_COLUMNID])
+        return [item bookmarkType] == SKBookmarkTypeBookmark;
+    return NO;
 }
 
 - (NSString *)outlineView:(NSOutlineView *)ov toolTipForCell:(NSCell *)cell 
rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)tc item:(id)item 
mouseLocation:(NSPoint)mouseLocation {


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

------------------------------------------------------------------------------

_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to