Revision: 11873
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=11873&view=rev
Author:   amaxwell
Date:     2007-12-11 21:56:34 -0800 (Tue, 11 Dec 2007)

Log Message:
-----------
Connect cite key field delegate to file's owner.

Modified Paths:
--------------
    trunk/bibdesk/BDSKEditor.m
    trunk/bibdesk/English.lproj/BDSKEditor.nib/classes.nib
    trunk/bibdesk/English.lproj/BDSKEditor.nib/info.nib
    trunk/bibdesk/English.lproj/BDSKEditor.nib/keyedobjects.nib

Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m  2007-12-12 05:40:53 UTC (rev 11872)
+++ trunk/bibdesk/BDSKEditor.m  2007-12-12 05:56:34 UTC (rev 11873)
@@ -1682,6 +1682,7 @@
 }
 
 // send when the user wants to end editing
+// @@ why is this delegate method used instead of an action?  is this layer of 
validation called after the formatter succeeds?
 - (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText 
*)fieldEditor{
     BOOL endEdit = YES;
     
@@ -1710,6 +1711,7 @@
                 message = NSLocalizedString(@"Cannot set this cite key as this 
would lead to a crossreff chain.", @"Informative text in alert dialog");
         }
         
+        // @@ fixme: button titles don't correspond to message options
         if (message) {
             BDSKAlert *alert = [BDSKAlert 
alertWithMessageText:NSLocalizedString(@"Invalid Value", @"Message in alert 
dialog when entering an invalid value") 
                                                  
defaultButton:NSLocalizedString(@"OK", @"Button title")

Modified: trunk/bibdesk/English.lproj/BDSKEditor.nib/classes.nib
===================================================================
--- trunk/bibdesk/English.lproj/BDSKEditor.nib/classes.nib      2007-12-12 
05:40:53 UTC (rev 11872)
+++ trunk/bibdesk/English.lproj/BDSKEditor.nib/classes.nib      2007-12-12 
05:56:34 UTC (rev 11873)
@@ -1,126 +1,372 @@
-{
-    IBClasses = (
-        {
-            CLASS = BDSKContainerView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {contentView = id; }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {CLASS = BDSKDragWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }, 
-        {CLASS = BDSKEdgeView; LANGUAGE = ObjC; SUPERCLASS = 
BDSKContainerView; }, 
-        {
-            ACTIONS = {
-                addLinkedFileFromMenuItem = id; 
-                addRemoteURLFromMenuItem = id; 
-                bibTypeDidChange = id; 
-                changeFlag = id; 
-                changeRating = id; 
-                chooseLocalFile = id; 
-                chooseRemoteURL = id; 
-                consolidateLinkedFiles = id; 
-                copyNotesForLinkedFile = id; 
-                createNewPubUsingCrossrefAction = id; 
-                dismissChooseURLSheet = id; 
-                duplicateTitleToBooktitle = id; 
-                editSelectedFieldAsRawBibTeX = id; 
-                generateCiteKey = id; 
-                openLinkedFile = id; 
-                openLinkedURL = id; 
-                openParentItemAction = id; 
-                raiseAddField = id; 
-                raiseChangeFieldName = id; 
-                raiseDelField = id; 
-                revealLinkedFile = id; 
-                selectCrossrefParentAction = id; 
-                showCiteKeyWarning = id; 
-                showNotesForLinkedFile = id; 
-                showPersonDetailCmd = id; 
-                toggleStatusBar = id; 
-                trashLocalFile = id; 
-            }; 
-            CLASS = BDSKEditor; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                abstractView = NSTextView; 
-                actionButton = BDSKImagePopUpButton; 
-                actionMenu = NSMenu; 
-                addFieldButton = NSButton; 
-                authorTableView = NSTableView; 
-                bibTypeButton = NSPopUpButton; 
-                chooseURLField = NSTextField; 
-                chooseURLSheet = NSWindow; 
-                citeKeyField = NSTextField; 
-                citeKeyTitle = NSTextField; 
-                citeKeyWarningButton = NSButton; 
-                extraBibFields = NSMatrix; 
-                fieldSplitView = BDSKSplitView; 
-                fileSplitView = BDSKSplitView; 
-                fileView = FileView; 
-                mainSplitView = BDSKSplitView; 
-                notesView = NSTextView; 
-                rssDescriptionView = NSTextView; 
-                statusBar = BDSKStatusBar; 
-                tabView = NSTabView; 
-                tableView = BDSKEditorTableView; 
-            }; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {CLASS = BDSKEditorTableView; LANGUAGE = ObjC; SUPERCLASS = 
NSTableView; }, 
-        {
-            CLASS = BDSKEditorTextFieldCell; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {buttonTarget = id; }; 
-            SUPERCLASS = NSTextFieldCell; 
-        }, 
-        {CLASS = BDSKEditorTextView; LANGUAGE = ObjC; SUPERCLASS = NSTextView; 
}, 
-        {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
-        {
-            CLASS = BDSKImagePopUpButton; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {delegate = id; }; 
-            SUPERCLASS = NSPopUpButton; 
-        }, 
-        {
-            CLASS = BDSKLabelTextFieldCell; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSTextFieldCell; 
-        }, 
-        {CLASS = BDSKSplitView; LANGUAGE = ObjC; SUPERCLASS = OASplitView; }, 
-        {
-            ACTIONS = {startAnimation = id; stopAnimation = id; }; 
-            CLASS = BDSKStatusBar; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {delegate = id; textCell = id; }; 
-            SUPERCLASS = BDSKGradientView; 
-        }, 
-        {CLASS = BDSKTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, 
-        {
-            ACTIONS = {delete = id; selectNextIcon = id; selectPreviousIcon = 
id; }; 
-            CLASS = FileView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {dataSource = id; delegate = id; dragDataSource = id; }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = NSControl; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
-        {CLASS = NSMenu; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = NSMenuItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = NSObject; LANGUAGE = ObjC; }, 
-        {
-            ACTIONS = {changeFont = id; invertSelection = id; }; 
-            CLASS = NSTableView; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSControl; 
-        }, 
-        {CLASS = NSTextView; LANGUAGE = ObjC; SUPERCLASS = NSText; }, 
-        {CLASS = NSWindow; LANGUAGE = ObjC; SUPERCLASS = NSResponder; }, 
-        {
-            ACTIONS = {hideWindow = id; toggleShowingWindow = id; }; 
-            CLASS = NSWindowController; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSResponder; 
-        }, 
-        {CLASS = OASplitView; LANGUAGE = ObjC; SUPERCLASS = NSSplitView; }
-    ); 
-    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>BDSKGradientView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKDragWindow</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSWindow</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSMenu</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSControl</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSView</string>
+               </dict>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>hideWindow</key>
+                               <string>id</string>
+                               <key>toggleShowingWindow</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>NSWindowController</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSResponder</string>
+               </dict>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>delete</key>
+                               <string>id</string>
+                               <key>selectNextIcon</key>
+                               <string>id</string>
+                               <key>selectPreviousIcon</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>FileView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>dataSource</key>
+                               <string>id</string>
+                               <key>delegate</key>
+                               <string>id</string>
+                               <key>dragDataSource</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSObject</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKEdgeView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>BDSKContainerView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKTabView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSTabView</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>addLinkedFileFromMenuItem</key>
+                               <string>NSMenuItem</string>
+                               <key>addRemoteURLFromMenuItem</key>
+                               <string>NSMenuItem</string>
+                               <key>bibTypeDidChange</key>
+                               <string>id</string>
+                               <key>changeFlag</key>
+                               <string>id</string>
+                               <key>changeRating</key>
+                               <string>id</string>
+                               <key>chooseLocalFile</key>
+                               <string>id</string>
+                               <key>chooseRemoteURL</key>
+                               <string>id</string>
+                               <key>consolidateLinkedFiles</key>
+                               <string>id</string>
+                               <key>copyNotesForLinkedFile</key>
+                               <string>id</string>
+                               <key>createNewPubUsingCrossrefAction</key>
+                               <string>id</string>
+                               <key>dismissChooseURLSheet</key>
+                               <string>id</string>
+                               <key>duplicateTitleToBooktitle</key>
+                               <string>id</string>
+                               <key>editSelectedFieldAsRawBibTeX</key>
+                               <string>id</string>
+                               <key>generateCiteKey</key>
+                               <string>id</string>
+                               <key>openLinkedFile</key>
+                               <string>id</string>
+                               <key>openLinkedURL</key>
+                               <string>id</string>
+                               <key>openParentItemAction</key>
+                               <string>id</string>
+                               <key>raiseAddField</key>
+                               <string>id</string>
+                               <key>raiseChangeFieldName</key>
+                               <string>id</string>
+                               <key>raiseDelField</key>
+                               <string>id</string>
+                               <key>revealLinkedFile</key>
+                               <string>id</string>
+                               <key>selectCrossrefParentAction</key>
+                               <string>id</string>
+                               <key>showCiteKeyWarning</key>
+                               <string>id</string>
+                               <key>showNotesForLinkedFile</key>
+                               <string>id</string>
+                               <key>showPersonDetailCmd</key>
+                               <string>id</string>
+                               <key>toggleStatusBar</key>
+                               <string>id</string>
+                               <key>trashLocalFile</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>BDSKEditor</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>abstractView</key>
+                               <string>NSTextView</string>
+                               <key>actionButton</key>
+                               <string>BDSKImagePopUpButton</string>
+                               <key>actionMenu</key>
+                               <string>NSMenu</string>
+                               <key>addFieldButton</key>
+                               <string>NSButton</string>
+                               <key>authorTableView</key>
+                               <string>NSTableView</string>
+                               <key>bibTypeButton</key>
+                               <string>NSPopUpButton</string>
+                               <key>chooseURLField</key>
+                               <string>NSTextField</string>
+                               <key>chooseURLSheet</key>
+                               <string>NSWindow</string>
+                               <key>citeKeyField</key>
+                               <string>NSTextField</string>
+                               <key>citeKeyTitle</key>
+                               <string>NSTextField</string>
+                               <key>citeKeyWarningButton</key>
+                               <string>NSButton</string>
+                               <key>extraBibFields</key>
+                               <string>NSMatrix</string>
+                               <key>fieldSplitView</key>
+                               <string>BDSKSplitView</string>
+                               <key>fileSplitView</key>
+                               <string>BDSKSplitView</string>
+                               <key>fileView</key>
+                               <string>FileView</string>
+                               <key>mainSplitView</key>
+                               <string>BDSKSplitView</string>
+                               <key>notesView</key>
+                               <string>NSTextView</string>
+                               <key>rssDescriptionView</key>
+                               <string>NSTextView</string>
+                               <key>statusBar</key>
+                               <string>BDSKStatusBar</string>
+                               <key>tabView</key>
+                               <string>NSTabView</string>
+                               <key>tableView</key>
+                               <string>BDSKEditorTableView</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSWindowController</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSScrollView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSMenuItem</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKEditorTableView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSTableView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>OASplitView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSSplitView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKSplitView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>OASplitView</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>BDSKLabelTextFieldCell</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSTextFieldCell</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKEditorTextView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSTextView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKImagePopUpButton</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>delegate</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSPopUpButton</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSTextView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSText</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKContainerView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>contentView</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSView</string>
+               </dict>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>startAnimation</key>
+                               <string>id</string>
+                               <key>stopAnimation</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>BDSKStatusBar</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>delegate</key>
+                               <string>id</string>
+                               <key>textCell</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>BDSKGradientView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>BDSKEditorTextFieldCell</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>buttonTarget</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSTextFieldCell</string>
+               </dict>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>changeFont</key>
+                               <string>id</string>
+                               <key>invertSelection</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>NSTableView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSControl</string>
+               </dict>
+       </array>
+       <key>IBVersion</key>
+       <string>1</string>
+</dict>
+</plist>

Modified: trunk/bibdesk/English.lproj/BDSKEditor.nib/info.nib
===================================================================
--- trunk/bibdesk/English.lproj/BDSKEditor.nib/info.nib 2007-12-12 05:40:53 UTC 
(rev 11872)
+++ trunk/bibdesk/English.lproj/BDSKEditor.nib/info.nib 2007-12-12 05:56:34 UTC 
(rev 11873)
@@ -1,34 +1,19 @@
 <?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>74 74 356 240 0 0 1440 938 </string>
-       <key>IBEditorPositions</key>
-       <dict>
-               <key>726</key>
-               <string>75 324 256 237 0 0 1440 938 </string>
-               <key>759</key>
-               <string>446 435 547 412 0 0 1440 938 </string>
-               <key>805</key>
-               <string>460 430 520 422 0 0 1440 938 </string>
-       </dict>
        <key>IBFramework Version</key>
-       <string>489.0</string>
+       <string>629</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../../Bibdesk.xcodeproj</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>805</integer>
-               <integer>74</integer>
-               <integer>726</integer>
-               <integer>759</integer>
-               <integer>877</integer>
+               <integer>821</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>8S165</string>
+       <string>9B18</string>
        <key>targetFramework</key>
        <string>IBCocoaFramework</string>
 </dict>

Modified: trunk/bibdesk/English.lproj/BDSKEditor.nib/keyedobjects.nib
===================================================================
(Binary files differ)


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

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit

Reply via email to