Revision: 4368
http://skim-app.svn.sourceforge.net/skim-app/?rev=4368&view=rev
Author: hofman
Date: 2008-08-09 00:22:34 +0000 (Sat, 09 Aug 2008)
Log Message:
-----------
Bind controller in note window to the note rather than the owner, as binding to
the owner creates a retain cycle due to the binding-to-owner bug.
Modified Paths:
--------------
trunk/English.lproj/NoteWindow.nib/classes.nib
trunk/English.lproj/NoteWindow.nib/info.nib
trunk/English.lproj/NoteWindow.nib/keyedobjects.nib
trunk/Italian.lproj/NoteWindow.nib/classes.nib
trunk/Italian.lproj/NoteWindow.nib/info.nib
trunk/Italian.lproj/NoteWindow.nib/keyedobjects.nib
trunk/SKNoteWindowController.h
trunk/SKNoteWindowController.m
Modified: trunk/English.lproj/NoteWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/NoteWindow.nib/classes.nib 2008-08-08 20:17:17 UTC
(rev 4367)
+++ trunk/English.lproj/NoteWindow.nib/classes.nib 2008-08-09 00:22:34 UTC
(rev 4368)
@@ -165,7 +165,7 @@
<string>NSPopUpButton</string>
<key>imageView</key>
<string>BDSKDragImageView</string>
- <key>ownerController</key>
+ <key>noteController</key>
<string>NSObjectController</string>
<key>statusBar</key>
<string>SKStatusBar</string>
Modified: trunk/English.lproj/NoteWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/NoteWindow.nib/info.nib 2008-08-08 20:17:17 UTC (rev
4367)
+++ trunk/English.lproj/NoteWindow.nib/info.nib 2008-08-09 00:22:34 UTC (rev
4368)
@@ -10,8 +10,8 @@
<integer>4</integer>
<key>IBOpenObjects</key>
<array>
- <integer>113</integer>
<integer>114</integer>
+ <integer>39</integer>
</array>
<key>IBSystem Version</key>
<string>9E17</string>
Modified: trunk/Italian.lproj/NoteWindow.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/NoteWindow.nib/classes.nib 2008-08-08 20:17:17 UTC
(rev 4367)
+++ trunk/Italian.lproj/NoteWindow.nib/classes.nib 2008-08-09 00:22:34 UTC
(rev 4368)
@@ -14,19 +14,19 @@
</dict>
<dict>
<key>CLASS</key>
- <string>NSWindowController</string>
+ <string>NSMenu</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>NSResponder</string>
+ <string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
- <string>NSMenu</string>
+ <string>NSWindowController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>NSObject</string>
+ <string>NSResponder</string>
</dict>
<dict>
<key>ACTIONS</key>
@@ -165,7 +165,7 @@
<string>NSPopUpButton</string>
<key>imageView</key>
<string>BDSKDragImageView</string>
- <key>ownerController</key>
+ <key>noteController</key>
<string>NSObjectController</string>
<key>statusBar</key>
<string>SKStatusBar</string>
Modified: trunk/Italian.lproj/NoteWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/NoteWindow.nib/info.nib 2008-08-08 20:17:17 UTC (rev
4367)
+++ trunk/Italian.lproj/NoteWindow.nib/info.nib 2008-08-09 00:22:34 UTC (rev
4368)
@@ -10,8 +10,8 @@
<integer>4</integer>
<key>IBOpenObjects</key>
<array>
+ <integer>40</integer>
<integer>114</integer>
- <integer>112</integer>
</array>
<key>IBSystem Version</key>
<string>9E17</string>
Modified: trunk/SKNoteWindowController.h
===================================================================
--- trunk/SKNoteWindowController.h 2008-08-08 20:17:17 UTC (rev 4367)
+++ trunk/SKNoteWindowController.h 2008-08-09 00:22:34 UTC (rev 4368)
@@ -46,7 +46,7 @@
IBOutlet BDSKDragImageView *imageView;
IBOutlet SKStatusBar *statusBar;
IBOutlet NSPopUpButton *iconTypePopUpButton;
- IBOutlet NSObjectController *ownerController;
+ IBOutlet NSObjectController *noteController;
PDFAnnotation *note;
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2008-08-08 20:17:17 UTC (rev 4367)
+++ trunk/SKNoteWindowController.m 2008-08-09 00:22:34 UTC (rev 4368)
@@ -157,7 +157,7 @@
}
- (void)windowWillClose:(NSNotification *)aNotification {
- [ownerController commitEditing];
+ [noteController commitEditing];
if ([note respondsToSelector:@selector(setWindowIsOpen:)])
[(PDFAnnotationText *)note setWindowIsOpen:NO];
}
@@ -218,7 +218,7 @@
}
- (void)handleDocumentWillSaveNotification:(NSNotification *)notification {
- [ownerController commitEditing];
+ [noteController commitEditing];
}
- (NSUndoManager *)undoManagerForTextView:(NSTextView *)aTextView {
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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
