Revision: 4685
http://skim-app.svn.sourceforge.net/skim-app/?rev=4685&view=rev
Author: hofman
Date: 2008-09-23 20:28:45 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Update notes panel and note type sheet for freehand notes
Modified Paths:
--------------
trunk/English.lproj/NoteTypeSheet.nib/info.nib
trunk/English.lproj/NoteTypeSheet.nib/keyedobjects.nib
trunk/English.lproj/NotesPanel.nib/classes.nib
trunk/English.lproj/NotesPanel.nib/info.nib
trunk/English.lproj/NotesPanel.nib/keyedobjects.nib
trunk/SKNoteOutlineView.m
Modified: trunk/English.lproj/NoteTypeSheet.nib/info.nib
===================================================================
--- trunk/English.lproj/NoteTypeSheet.nib/info.nib 2008-09-23 19:54:15 UTC
(rev 4684)
+++ trunk/English.lproj/NoteTypeSheet.nib/info.nib 2008-09-23 20:28:45 UTC
(rev 4685)
@@ -13,7 +13,7 @@
<integer>6</integer>
</array>
<key>IBSystem Version</key>
- <string>9E17</string>
+ <string>9F33</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
Modified: trunk/English.lproj/NotesPanel.nib/classes.nib
===================================================================
--- trunk/English.lproj/NotesPanel.nib/classes.nib 2008-09-23 19:54:15 UTC
(rev 4684)
+++ trunk/English.lproj/NotesPanel.nib/classes.nib 2008-09-23 20:28:45 UTC
(rev 4685)
@@ -1,12 +1,99 @@
-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- ACTIONS = {addNote = id; };
- CLASS = SKNotesPanelController;
- LANGUAGE = ObjC;
- SUPERCLASS = NSWindowController;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>NSWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSMenu</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>changeDashPattern</key>
+ <string>id</string>
+ <key>changeEndLineStyle</key>
+ <string>id</string>
+ <key>changeLineStyle</key>
+ <string>id</string>
+ <key>changeLineWidth</key>
+ <string>id</string>
+ <key>changeStartLineStyle</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>NSObject</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSWindow</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>addNote</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>SKNotesPanelController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Modified: trunk/English.lproj/NotesPanel.nib/info.nib
===================================================================
--- trunk/English.lproj/NotesPanel.nib/info.nib 2008-09-23 19:54:15 UTC (rev
4684)
+++ trunk/English.lproj/NotesPanel.nib/info.nib 2008-09-23 20:28:45 UTC (rev
4685)
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>672</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../Skim.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>5</integer>
+ <integer>6</integer>
</array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>9F33</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2008-09-23 19:54:15 UTC (rev 4684)
+++ trunk/SKNoteOutlineView.m 2008-09-23 20:28:45 UTC (rev 4685)
@@ -54,6 +54,9 @@
- (void)awakeFromNib {
[self noteTypeMenu]; // this sets the menu for the header view
+ id cell = [[[NSActionCell alloc] init] autorelease];
+ [cell setTag:-1];
+ [noteTypeMatrix putCell:cell atRow:4 column:0];
NSNumber *fontSize = [[NSUserDefaults standardUserDefaults]
objectForKey:SKTableFontSizeKey];
if (fontSize)
[self setFont:[NSFont systemFontOfSize:[fontSize floatValue]]];
@@ -246,7 +249,7 @@
NSMenu *menu = [self noteTypeMenu];
int i;
- for (i = 0; i < 8; i++) {
+ for (i = 0; i < 9; i++) {
NSMenuItem *item = [menu itemAtIndex:i];
if ([item state] == NSOnState)
[types addObject:[item representedObject]];
@@ -258,7 +261,7 @@
NSMenu *menu = [self noteTypeMenu];
int i;
- for (i = 0; i < 8; i++) {
+ for (i = 0; i < 9; i++) {
NSMenuItem *item = [menu itemAtIndex:i];
[item setState:[types containsObject:[item representedObject]] ?
NSOnState : NSOffState];
}
@@ -277,7 +280,7 @@
- (IBAction)displayAllNoteTypes:(id)sender {
NSMenu *menu = [self noteTypeMenu];
int i;
- for (i = 0; i < 8; i++)
+ for (i = 0; i < 9; i++)
[[menu itemAtIndex:i] setState:NSOnState];
[self noteTypesUpdated];
}
@@ -286,8 +289,8 @@
if (returnCode == NSOKButton) {
NSMenu *menu = [self noteTypeMenu];
int i;
- for (i = 0; i < 8; i++)
- [[menu itemAtIndex:i] setState:[[noteTypeMatrix cellAtRow:i % 4
column:i / 4] state]];
+ for (i = 0; i < 9; i++)
+ [[menu itemAtIndex:i] setState:[[noteTypeMatrix cellWithTag:i]
state]];
[self noteTypesUpdated];
}
}
@@ -300,8 +303,8 @@
NSMenu *menu = [self noteTypeMenu];
int i;
- for (i = 0; i < 8; i++)
- [[noteTypeMatrix cellAtRow:i % 4 column:i / 4] setState:[[menu
itemAtIndex:i] state]];
+ for (i = 0; i < 9; i++)
+ [[noteTypeMatrix cellWithTag:i] setState:[[menu itemAtIndex:i] state]];
[NSApp beginSheet:noteTypeSheet
modalForWindow:[[self delegate] respondsToSelector:@selector(window)] ?
[[self delegate] window] : [self window]
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
