Revision: 7665
http://skim-app.svn.sourceforge.net/skim-app/?rev=7665&view=rev
Author: hofman
Date: 2012-02-22 12:57:54 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Use autosavename to save note outline config
Modified Paths:
--------------
trunk/NotesDocument.xib
trunk/RightSideView.xib
trunk/SKMainWindowController.m
trunk/SKMainWindowController_UI.m
trunk/SKNoteOutlineView.h
trunk/SKNoteOutlineView.m
trunk/SKNotesDocument.m
Modified: trunk/NotesDocument.xib
===================================================================
--- trunk/NotesDocument.xib 2012-02-22 12:41:02 UTC (rev 7664)
+++ trunk/NotesDocument.xib 2012-02-22 12:57:54 UTC (rev 7665)
@@ -45,7 +45,7 @@
<string
key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213,
107}</string>
<object class="NSView" key="NSWindowView"
id="651604019">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray"
key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -64,14 +64,12 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{480, 344}</string>
<reference key="NSSuperview" ref="57712247"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="343473479">
<reference key="NSNextResponder" ref="504885436"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{480, 17}</string>
<reference key="NSSuperview" ref="504885436"/>
-
<reference key="NSWindow"/>
<reference key="NSTableView" ref="977420889"/>
</object>
<object class="_NSCornerView" key="NSCornerView" id="401432550">
@@ -79,13 +77,12 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
<reference key="NSSuperview" ref="49078310"/>
-
<reference key="NSWindow"/>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="268771062">
<string key="NSIdentifier">note</string>
-
<double key="NSWidth">255</double>
+
<double key="NSWidth">367</double>
<double key="NSMinWidth">16</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -236,6 +233,7 @@
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<reference key="NSTableView" ref="977420889"/>
+
<bool key="NSHidden">YES</bool>
</object>
<object class="NSTableColumn" id="660585538">
<string key="NSIdentifier">author</string>
@@ -262,6 +260,7 @@
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<reference key="NSTableView" ref="977420889"/>
+
<bool key="NSHidden">YES</bool>
</object>
<object class="NSTableColumn" id="47190354">
<string key="NSIdentifier">date</string>
@@ -320,9 +319,10 @@
</object>
</object>
<double key="NSRowHeight">17</double>
-
<int key="NSTvFlags">-624951296</int>
+
<int key="NSTvFlags">-608174080</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
+
<string key="NSAutosaveName">SKNotesDocumentOutlineView</string>
<int key="NSColumnAutoresizingStyle">5</int>
<int key="NSDraggingSourceMaskForLocal">15</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
@@ -333,7 +333,6 @@
</object>
<string
key="NSFrame">{{0, 17}, {480, 344}}</string>
<reference key="NSSuperview" ref="49078310"/>
-
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="977420889"/>
<reference key="NSDocView" ref="977420889"/>
<reference key="NSBGColor" ref="58367748"/>
@@ -344,7 +343,6 @@
<int
key="NSvFlags">-2147483392</int>
<string
key="NSFrame">{{-30, 17}, {15, 300}}</string>
<reference key="NSSuperview" ref="49078310"/>
-
<reference key="NSWindow"/>
<reference key="NSTarget" ref="49078310"/>
<string
key="NSAction">_doScroller:</string>
<double
key="NSPercent">0.98872179999999998</double>
@@ -354,7 +352,6 @@
<int
key="NSvFlags">-2147483392</int>
<string
key="NSFrame">{{-100, -100}, {423, 15}}</string>
<reference key="NSSuperview" ref="49078310"/>
-
<reference key="NSWindow"/>
<int
key="NSsFlags">1</int>
<reference key="NSTarget" ref="49078310"/>
<string
key="NSAction">_doScroller:</string>
@@ -369,7 +366,6 @@
</object>
<string
key="NSFrameSize">{480, 17}</string>
<reference key="NSSuperview" ref="49078310"/>
-
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="343473479"/>
<reference key="NSDocView" ref="343473479"/>
<reference key="NSBGColor" ref="58367748"/>
@@ -379,7 +375,6 @@
</object>
<string
key="NSFrameSize">{480, 361}</string>
<reference
key="NSSuperview" ref="651604019"/>
- <reference
key="NSWindow"/>
<reference
key="NSNextKeyView" ref="57712247"/>
<int
key="NSsFlags">528</int>
<reference
key="NSVScroller" ref="581873432"/>
@@ -391,8 +386,6 @@
</object>
</object>
<string key="NSFrameSize">{480,
360}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440,
878}}</string>
<string key="NSMinSize">{213, 129}</string>
Modified: trunk/RightSideView.xib
===================================================================
--- trunk/RightSideView.xib 2012-02-22 12:41:02 UTC (rev 7664)
+++ trunk/RightSideView.xib 2012-02-22 12:57:54 UTC (rev 7665)
@@ -224,7 +224,7 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<object
class="NSTableColumn" id="729705595">
<string key="NSIdentifier">note</string>
-
<double key="NSWidth">37</double>
+
<double key="NSWidth">107</double>
<double key="NSMinWidth">33</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -378,6 +378,7 @@
<bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="138723689"/>
+
<bool key="NSHidden">YES</bool>
</object>
<object
class="NSTableColumn" id="1039168517">
<string key="NSIdentifier">date</string>
@@ -421,6 +422,7 @@
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<reference key="NSTableView" ref="138723689"/>
+
<bool key="NSHidden">YES</bool>
</object>
</object>
<double
key="NSIntercellSpacingWidth">3</double>
@@ -436,9 +438,10 @@
</object>
</object>
<double
key="NSRowHeight">17</double>
- <int
key="NSTvFlags">-624951296</int>
+ <int
key="NSTvFlags">-608174080</int>
<reference
key="NSDelegate"/>
<reference
key="NSDataSource"/>
+ <string
key="NSAutosaveName">SKNoteOutlineView</string>
<int
key="NSColumnAutoresizingStyle">5</int>
<int
key="NSDraggingSourceMaskForLocal">15</int>
<int
key="NSDraggingSourceMaskForNonLocal">0</int>
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2012-02-22 12:41:02 UTC (rev 7664)
+++ trunk/SKMainWindowController.m 2012-02-22 12:57:54 UTC (rev 7665)
@@ -479,13 +479,6 @@
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5)
[rightSideController.noteOutlineView setIndentationPerLevel:1.0];
- NSArray *columnIDs = [[NSUserDefaults standardUserDefaults]
stringArrayForKey:SKNoteColumnsKey];
- if (columnIDs)
- [rightSideController.noteOutlineView
setTableColumnIdentifiers:columnIDs];
- NSDictionary *columnWidths = [[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKNoteColumnWidthsKey];
- if (columnWidths)
- [rightSideController.noteOutlineView
setTableColumnWidths:columnWidths];
-
[rightSideController.noteOutlineView registerForDraggedTypes:[NSArray
arrayWithObjects:NSColorPboardType, nil]];
[pdfView setTypeSelectHelper:[leftSideController.thumbnailTableView
typeSelectHelper]];
@@ -2284,11 +2277,7 @@
if ([[note type] isEqualToString:SKNNoteString] && [keyPath
isEqualToString:SKNPDFAnnotationBoundsKey])
[pdfView resetPDFToolTipRects];
- NSArray *columnIDs = [rightSideController.noteOutlineView
tableColumnIdentifiers];
- if ([keyPath isEqualToString:SKNPDFAnnotationBoundsKey] ||
[keyPath isEqualToString:SKNPDFAnnotationStringKey] || [keyPath
isEqualToString:SKNPDFAnnotationTextKey] ||
- ([keyPath isEqualToString:SKNPDFAnnotationColorKey] &&
[columnIDs containsObject:COLOR_COLUMNID]) ||
- ([keyPath isEqualToString:SKNPDFAnnotationUserNameKey] &&
[columnIDs containsObject:AUTHOR_COLUMNID]) ||
- ([keyPath isEqualToString:SKNPDFAnnotationModificationDateKey]
&& [columnIDs containsObject:DATE_COLUMNID])) {
+ if ([keyPath isEqualToString:SKNPDFAnnotationBoundsKey] ||
[keyPath isEqualToString:SKNPDFAnnotationStringKey] || [keyPath
isEqualToString:SKNPDFAnnotationTextKey] || [keyPath
isEqualToString:SKNPDFAnnotationColorKey] || [keyPath
isEqualToString:SKNPDFAnnotationUserNameKey] || [keyPath
isEqualToString:SKNPDFAnnotationModificationDateKey]) {
[rightSideController.noteArrayController rearrangeObjects];
[rightSideController.noteOutlineView reloadData];
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2012-02-22 12:41:02 UTC (rev 7664)
+++ trunk/SKMainWindowController_UI.m 2012-02-22 12:57:54 UTC (rev 7665)
@@ -768,37 +768,6 @@
}
}
-- (void)outlineViewTableColumnsDidChange:(NSOutlineView *)ov {
- if ([ov isEqual:rightSideController.noteOutlineView] &&
mwcFlags.settingUpWindow == 0)
- [[NSUserDefaults standardUserDefaults]
setObject:[rightSideController.noteOutlineView tableColumnIdentifiers]
forKey:SKNoteColumnsKey];
-}
-
-- (void)outlineViewColumnDidMove:(NSNotification *)notification {
- if ([[notification object] isEqual:rightSideController.noteOutlineView] &&
mwcFlags.settingUpWindow == 0)
- [[NSUserDefaults standardUserDefaults]
setObject:[rightSideController.noteOutlineView tableColumnIdentifiers]
forKey:SKNoteColumnsKey];
-}
-
-- (void)outlineViewColumnDidResize:(NSNotification *)notification {
- if ([[notification object] isEqual:rightSideController.noteOutlineView]) {
- BOOL shouldSave = NO;
- if (mwcFlags.settingUpWindow == 0 && [self rightSidePaneIsOpen]) {
- if ([self interactionMode] == SKNormalMode) {
- if (mwcFlags.usesDrawers)
- shouldSave = [rightSideDrawer state] == NSDrawerOpenState;
- else
- shouldSave = ([splitView isAnimating] == NO);
- } else if ([self interactionMode] == SKFullScreenMode) {
- shouldSave = [rightSideWindow state] == NSDrawerOpenState;
- }
- }
- if (shouldSave) {
- NSMutableDictionary *dict = [NSMutableDictionary
dictionaryWithDictionary:[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKNoteColumnWidthsKey]];
- [dict
addEntriesFromDictionary:[rightSideController.noteOutlineView
tableColumnWidths]];
- [[NSUserDefaults standardUserDefaults] setObject:dict
forKey:SKNoteColumnWidthsKey];
- }
- }
-}
-
- (CGFloat)outlineView:(NSOutlineView *)ov heightOfRowByItem:(id)item {
if ([ov isEqual:rightSideController.noteOutlineView]) {
CGFloat rowHeight = [rowHeights floatForKey:item];
Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h 2012-02-22 12:41:02 UTC (rev 7664)
+++ trunk/SKNoteOutlineView.h 2012-02-22 12:57:54 UTC (rev 7665)
@@ -43,9 +43,6 @@
@interface SKNoteOutlineView : SKOutlineView
-@property (nonatomic, retain) NSArray *tableColumnIdentifiers;
-@property (nonatomic, retain) NSDictionary *tableColumnWidths;
-
- (void)toggleTableColumn:(id)sender;
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
@@ -62,6 +59,5 @@
- (BOOL)outlineView:(NSOutlineView *)anOutlineView canResizeRowByItem:(id)item;
- (void)outlineView:(NSOutlineView *)anOutlineView
setHeight:(CGFloat)newHeight ofRowByItem:(id)item;
- (void)outlineViewCommandKeyPressedDuringNavigation:(NSOutlineView
*)anOutlineView;
-- (void)outlineViewTableColumnsDidChange:(NSOutlineView *)anOutlineView;
@end
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2012-02-22 12:41:02 UTC (rev 7664)
+++ trunk/SKNoteOutlineView.m 2012-02-22 12:57:54 UTC (rev 7665)
@@ -57,8 +57,6 @@
@implementation SKNoteOutlineView
-@dynamic tableColumnIdentifiers, tableColumnWidths;
-
static inline NSString *titleForTableColumnIdentifier(NSString *identifier) {
if ([identifier isEqualToString:NOTE_COLUMNID])
return NSLocalizedString(@"Note", @"Table header title");
@@ -210,54 +208,11 @@
}
}
-- (NSArray *)shownTableColumns {
- NSMutableArray *tableColumns = [NSMutableArray array];
- for (NSTableColumn *tc in [self tableColumns])
- if ([tc isHidden] == NO)
- [tableColumns addObject:tc];
- return tableColumns;
-}
-
-- (NSArray *)tableColumnIdentifiers {
- return [[self shownTableColumns] valueForKey:@"identifier"];
-}
-
-- (void)setTableColumnIdentifiers:(NSArray *)identifiers {
- if ([identifiers isEqualToArray:[self tableColumnIdentifiers]] == NO) {
- for (NSTableColumn *tc in [self tableColumns])
- [tc setHidden:[identifiers containsObject:[tc identifier]] == NO];
- }
-}
-
-- (NSDictionary *)tableColumnWidths {
- NSArray *tableColumns = [self shownTableColumns];
- return [NSDictionary dictionaryWithObjects:[tableColumns
valueForKey:@"width"] forKeys:[tableColumns valueForKey:@"identifier"]];
-}
-
-- (void)setTableColumnWidths:(NSDictionary *)widths {
- if (widths) {
- BOOL didChange = NO;
- for (NSTableColumn *tc in [self shownTableColumns]) {
- if (([tc resizingMask] & NSTableColumnUserResizingMask)) {
- NSNumber *width = [widths objectForKey:[tc identifier]];
- if (width) {
- [tc setWidth:[width doubleValue]];
- didChange = YES;
- }
- }
- }
- if (didChange)
- [self sizeToFit];
- }
-}
-
- (void)toggleTableColumn:(id)sender {
NSTableColumn *tc = [self tableColumnWithIdentifier:[sender
representedObject]];
[tc setHidden:[tc isHidden] == NO];
if ([self outlineTableColumn] == tc && [tc isHidden])
[self collapseItem:nil collapseChildren:YES];
- if ([[self delegate]
respondsToSelector:@selector(outlineViewTableColumnsDidChange:)])
- [[self delegate] outlineViewTableColumnsDidChange:self];
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2012-02-22 12:41:02 UTC (rev 7664)
+++ trunk/SKNotesDocument.m 2012-02-22 12:57:54 UTC (rev 7665)
@@ -183,13 +183,6 @@
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5)
[outlineView setIndentationPerLevel:1.0];
- NSArray *columnIDs = [[NSUserDefaults standardUserDefaults]
stringArrayForKey:SKNotesDocumentColumnsKey];
- if (columnIDs)
- [outlineView setTableColumnIdentifiers:columnIDs];
- NSDictionary *columnWidths = [[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKNotesDocumentColumnWidthsKey];
- if (columnWidths)
- [outlineView setTableColumnWidths:columnWidths];
-
NSSortDescriptor *indexSortDescriptor = [[[NSSortDescriptor alloc]
initWithKey:SKNPDFAnnotationPageIndexKey ascending:YES] autorelease];
NSSortDescriptor *stringSortDescriptor = [[[NSSortDescriptor alloc]
initWithKey:SKNPDFAnnotationStringKey ascending:YES
selector:@selector(localizedCaseInsensitiveNumericCompare:)] autorelease];
[arrayController setSortDescriptors:[NSArray
arrayWithObjects:indexSortDescriptor, stringSortDescriptor, nil]];
@@ -654,24 +647,6 @@
[ov reloadData];
}
-- (void)outlineViewTableColumnsDidChange:(NSOutlineView *)ov {
- if (settingUpWindow == NO)
- [[NSUserDefaults standardUserDefaults] setObject:[outlineView
tableColumnIdentifiers] forKey:SKNotesDocumentColumnsKey];
-}
-
-- (void)outlineViewColumnDidMove:(NSNotification *)notification {
- if (settingUpWindow == NO)
- [[NSUserDefaults standardUserDefaults] setObject:[outlineView
tableColumnIdentifiers] forKey:SKNotesDocumentColumnsKey];
-}
-
-- (void)outlineViewColumnDidResize:(NSNotification *)notification {
- if (settingUpWindow == NO) {
- NSMutableDictionary *dict = [NSMutableDictionary
dictionaryWithDictionary:[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKNotesDocumentColumnWidthsKey]];
- [dict addEntriesFromDictionary:[outlineView tableColumnWidths]];
- [[NSUserDefaults standardUserDefaults] setObject:dict
forKey:SKNotesDocumentColumnWidthsKey];
- }
-}
-
- (void)outlineView:(NSOutlineView *)ov copyItems:(NSArray *)items {
NSPasteboard *pboard = [NSPasteboard generalPasteboard];
NSMutableArray *types = [NSMutableArray array];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
