Revision: 18241
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18241&view=rev
Author: hofman
Date: 2011-11-26 13:02:58 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Safari style textfield for web group address
Modified Paths:
--------------
trunk/bibdesk/BDSKWebGroupViewController.h
trunk/bibdesk/BDSKWebGroupViewController.m
trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
trunk/bibdesk/English.lproj/BDSKWebGroupView.xib
trunk/bibdesk/French.lproj/BDSKWebGroupView.xib
trunk/bibdesk/German.lproj/BDSKWebGroupView.xib
Added Paths:
-----------
trunk/bibdesk/BDSKAddressTextField.h
trunk/bibdesk/BDSKAddressTextField.m
trunk/bibdesk/BDSKAddressTextFieldCell.h
trunk/bibdesk/BDSKAddressTextFieldCell.m
Added: trunk/bibdesk/BDSKAddressTextField.h
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.h (rev 0)
+++ trunk/bibdesk/BDSKAddressTextField.h 2011-11-26 13:02:58 UTC (rev
18241)
@@ -0,0 +1,44 @@
+//
+// BDSKAddressTextField.h
+// Bibdesk
+//
+// Created by Christiaan Hofman on 11/26/11.
+/*
+ This software is Copyright (c) 2011
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import "BDSKDragTextField.h"
+
+
+@interface BDSKAddressTextField : BDSKDragTextField
+@end
Added: trunk/bibdesk/BDSKAddressTextField.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.m (rev 0)
+++ trunk/bibdesk/BDSKAddressTextField.m 2011-11-26 13:02:58 UTC (rev
18241)
@@ -0,0 +1,80 @@
+//
+// BDSKAddressTextField.m
+// Bibdesk
+//
+// Created by Christiaan Hofman on 11/26/11.
+/*
+ This software is Copyright (c) 2011
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "BDSKAddressTextField.h"
+#import "BDSKAddressTextFieldCell.h"
+
+
+@implementation BDSKAddressTextField
+
++ (Class)cellClass {
+ return [BDSKAddressTextFieldCell class];
+}
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
+- (void)handleKeyOrMainStateChangedNotification:(NSNotification *)note {
+ [self setNeedsDisplay:YES];
+}
+
+- (void)viewWillMoveToWindow:(NSWindow *)newWindow {
+ NSWindow *window = [self window];
+ if (window) {
+ NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+ [nc removeObserver:self name:NSWindowDidBecomeMainNotification
object:window];
+ [nc removeObserver:self name:NSWindowDidResignMainNotification
object:window];
+ [nc removeObserver:self name:NSWindowDidBecomeKeyNotification
object:window];
+ [nc removeObserver:self name:NSWindowDidResignKeyNotification
object:window];
+ }
+}
+
+- (void)viewDidMoveToWindow {
+ NSWindow *window = [self window];
+ if (window) {
+ NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+ [nc addObserver:self
selector:@selector(handleKeyOrMainStateChangedNotification:)
name:NSWindowDidBecomeMainNotification object:window];
+ [nc addObserver:self
selector:@selector(handleKeyOrMainStateChangedNotification:)
name:NSWindowDidResignMainNotification object:window];
+ [nc addObserver:self
selector:@selector(handleKeyOrMainStateChangedNotification:)
name:NSWindowDidBecomeKeyNotification object:window];
+ [nc addObserver:self
selector:@selector(handleKeyOrMainStateChangedNotification:)
name:NSWindowDidResignKeyNotification object:window];
+ }
+}
+
+@end
Added: trunk/bibdesk/BDSKAddressTextFieldCell.h
===================================================================
--- trunk/bibdesk/BDSKAddressTextFieldCell.h (rev 0)
+++ trunk/bibdesk/BDSKAddressTextFieldCell.h 2011-11-26 13:02:58 UTC (rev
18241)
@@ -0,0 +1,44 @@
+//
+// BDSKAddressTextFieldCell.h
+// Bibdesk
+//
+// Created by Christiaan Hofman on 11/26/11.
+/*
+ This software is Copyright (c) 2011
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import "BDSKIconTextFieldCell.h"
+
+
+@interface BDSKAddressTextFieldCell : BDSKIconTextFieldCell
+@end
Added: trunk/bibdesk/BDSKAddressTextFieldCell.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextFieldCell.m (rev 0)
+++ trunk/bibdesk/BDSKAddressTextFieldCell.m 2011-11-26 13:02:58 UTC (rev
18241)
@@ -0,0 +1,97 @@
+//
+// BDSKAddressTextFieldCell.m
+// Bibdesk
+//
+// Created by Christiaan Hofman on 11/26/11.
+/*
+ This software is Copyright (c) 2011
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "BDSKAddressTextFieldCell.h"
+
+
+@implementation BDSKAddressTextFieldCell
+
+- (id)initWithCoder:(NSCoder *)coder {
+ self = [super initWithCoder:coder];
+ if (self) {
+ [self setDrawsBackground:NO];
+ }
+ return self;
+}
+
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
+ NSRect outlineRect, outerShadowRect, innerShadowRect, ignored;
+ NSGradient *gradient = nil;
+
+ NSDivideRect(cellFrame, &ignored, &outlineRect, 1.0, [controlView
isFlipped] ? NSMaxYEdge : NSMinYEdge);
+ NSDivideRect(cellFrame, &outerShadowRect, &ignored, 10.0, [controlView
isFlipped] ? NSMaxYEdge : NSMinYEdge);
+ NSDivideRect(NSInsetRect(cellFrame, 1.0, 1.0), &innerShadowRect, &ignored,
10.0, [controlView isFlipped] ? NSMinYEdge : NSMaxYEdge);
+
+ [[NSColor colorWithCalibratedWhite:1.0 alpha:0.394] set];
+ [[NSBezierPath bezierPathWithRoundedRect:outerShadowRect xRadius:3.6
yRadius:3.6] fill];
+
+ if ([NSApp isActive])
+ gradient = [[NSGradient alloc] initWithStartingColor:[NSColor
colorWithCalibratedWhite:0.24 alpha:1.0] endingColor:[NSColor
colorWithCalibratedWhite:0.374 alpha:1.0]];
+ else
+ gradient = [[NSGradient alloc] initWithStartingColor:[NSColor
colorWithCalibratedWhite:0.55 alpha:1.0] endingColor:[NSColor
colorWithCalibratedWhite:0.558 alpha:1.0]];
+ [gradient drawInBezierPath:[NSBezierPath
bezierPathWithRoundedRect:outlineRect xRadius:3.6 yRadius:3.6] angle:90];
+
+ [[NSColor colorWithCalibratedWhite:0.88 alpha:1.0] set];
+ [[NSBezierPath bezierPathWithRoundedRect:innerShadowRect xRadius:2.9
yRadius:2.9] fill];
+
+ [[NSColor whiteColor] set];
+ [[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(cellFrame, 1.0,
2.0) xRadius:2.6 yRadius:2.6] fill];
+
+ [super drawInteriorWithFrame:outlineRect inView:controlView];
+
+ if ([self showsFirstResponder]) {
+ [NSGraphicsContext saveGraphicsState];
+ NSSetFocusRingStyle(NSFocusRingOnly);
+ [[NSBezierPath bezierPathWithRoundedRect:outlineRect
xRadius:3.6 yRadius:3.6] fill];
+ [NSGraphicsContext restoreGraphicsState];
+ }
+}
+
+- (void)editWithFrame:(NSRect)aRect inView:(NSView *)controlView
editor:(NSText *)textObj delegate:(id)anObject event:(NSEvent *)theEvent {
+ NSRect ignored;
+ NSDivideRect(aRect, &ignored, &aRect, 1.0, [controlView isFlipped] ?
NSMaxYEdge : NSMinYEdge);
+ [super editWithFrame:aRect inView:controlView editor:textObj
delegate:anObject event:theEvent];
+}
+
+- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView
editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart
length:(NSInteger)selLength {
+ NSRect ignored;
+ NSDivideRect(aRect, &ignored, &aRect, 1.0, [controlView isFlipped] ?
NSMaxYEdge : NSMinYEdge);
+ [super selectWithFrame:aRect inView:controlView editor:textObj
delegate:anObject start:selStart length:selLength];
+}
+
+@end
Modified: trunk/bibdesk/BDSKWebGroupViewController.h
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.h 2011-11-26 07:38:16 UTC (rev
18240)
+++ trunk/bibdesk/BDSKWebGroupViewController.h 2011-11-26 13:02:58 UTC (rev
18241)
@@ -40,11 +40,11 @@
#import <Cocoa/Cocoa.h>
#import "BDSKWebView.h"
-@class BDSKCollapsibleView, BDSKEdgeView, BDSKDragTextField, BDSKFieldEditor;
+@class BDSKCollapsibleView, BDSKEdgeView, BDSKAddressTextField,
BDSKFieldEditor;
@interface BDSKWebGroupViewController : NSViewController <NSMenuDelegate,
BDSKWebViewNavigationDelegate> {
IBOutlet BDSKCollapsibleView *collapsibleView;
- IBOutlet BDSKDragTextField *urlField;
+ IBOutlet BDSKAddressTextField *urlField;
IBOutlet NSSegmentedControl *backForwardButton;
IBOutlet NSButton *stopOrReloadButton;
BDSKFieldEditor *fieldEditor;
Modified: trunk/bibdesk/BDSKWebGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.m 2011-11-26 07:38:16 UTC (rev
18240)
+++ trunk/bibdesk/BDSKWebGroupViewController.m 2011-11-26 13:02:58 UTC (rev
18241)
@@ -41,7 +41,7 @@
#import <WebKit/WebKit.h>
#import "BDSKCollapsibleView.h"
#import "BDSKEdgeView.h"
-#import "BDSKDragTextField.h"
+#import "BDSKAddressTextField.h"
#import "BDSKIconTextFieldCell.h"
#import "BDSKFieldEditor.h"
#import "BibDocument.h"
@@ -89,6 +89,11 @@
// update the buttons, we should not be retrieving at this point
[self webView:nil setLoading:NO];
+ NSRect rect = [urlField frame];
+ rect.origin.y -= 1.0;
+ rect.size.height += 1.0;
+ [urlField setFrame:rect];
+
[urlField registerForDraggedTypes:[NSArray
arrayWithObjects:NSURLPboardType, BDSKWeblocFilePboardType, nil]];
}
Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2011-11-26 07:38:16 UTC
(rev 18240)
+++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2011-11-26 13:02:58 UTC
(rev 18241)
@@ -212,6 +212,10 @@
CE969E340931E4F500EE3DFD /* NSTableHeaderView_BDSKExtensions.m
in Sources */ = {isa = PBXBuildFile; fileRef = CE969E320931E4F500EE3DFD /*
NSTableHeaderView_BDSKExtensions.m */; };
CE96DB7210C7288800F085F3 /* BDSKButtonBar.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE96DB7010C7288800F085F3 /* BDSKButtonBar.m */;
};
CE9F85410956A2C50073FCAD /* BDSKFieldEditor.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE9F853F0956A2C50073FCAD /* BDSKFieldEditor.m
*/; };
+ CEA498A11481183600AB81C5 /* BDSKAddressTextField.h in Headers
*/ = {isa = PBXBuildFile; fileRef = CEA4989F1481183600AB81C5 /*
BDSKAddressTextField.h */; };
+ CEA498A21481183600AB81C5 /* BDSKAddressTextField.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CEA498A01481183600AB81C5 /*
BDSKAddressTextField.m */; };
+ CEA498A51481185100AB81C5 /* BDSKAddressTextFieldCell.h in
Headers */ = {isa = PBXBuildFile; fileRef = CEA498A31481185100AB81C5 /*
BDSKAddressTextFieldCell.h */; };
+ CEA498A61481185100AB81C5 /* BDSKAddressTextFieldCell.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEA498A41481185100AB81C5 /*
BDSKAddressTextFieldCell.m */; };
CEAB9F5A0B4FF20800673AC2 /* BDSKCitationFormatter.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CEAB9F580B4FF20800673AC2 /*
BDSKCitationFormatter.m */; };
CEAC48510A96589A00B8DF43 /* BDSKTemplatedTextCommand.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEAC484F0A96589A00B8DF43 /*
BDSKTemplatedTextCommand.m */; };
CEAC51570A97730800B8DF43 /* BDSKExportUsingTemplateCommand.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEAC51550A97730800B8DF43 /*
BDSKExportUsingTemplateCommand.m */; };
@@ -1177,6 +1181,10 @@
CE9F853E0956A2C50073FCAD /* BDSKFieldEditor.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKFieldEditor.h; sourceTree = "<group>"; };
CE9F853F0956A2C50073FCAD /* BDSKFieldEditor.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKFieldEditor.m; sourceTree = "<group>"; };
CEA451600E47C88E00D161AD /* SkimNotes.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; path =
SkimNotes.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ CEA4989F1481183600AB81C5 /* BDSKAddressTextField.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKAddressTextField.h; sourceTree = "<group>"; };
+ CEA498A01481183600AB81C5 /* BDSKAddressTextField.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKAddressTextField.m; sourceTree = "<group>"; };
+ CEA498A31481185100AB81C5 /* BDSKAddressTextFieldCell.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = BDSKAddressTextFieldCell.h; sourceTree = "<group>"; };
+ CEA498A41481185100AB81C5 /* BDSKAddressTextFieldCell.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = BDSKAddressTextFieldCell.m; sourceTree = "<group>"; };
CEAB9F570B4FF20800673AC2 /* BDSKCitationFormatter.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKCitationFormatter.h; sourceTree = "<group>"; };
CEAB9F580B4FF20800673AC2 /* BDSKCitationFormatter.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKCitationFormatter.m; sourceTree = "<group>"; };
CEAC484E0A96589A00B8DF43 /* BDSKTemplatedTextCommand.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = BDSKTemplatedTextCommand.h; sourceTree = "<group>"; };
@@ -2041,6 +2049,8 @@
CE38FA7C091D20FB00BCB69D /* Views */ = {
isa = PBXGroup;
children = (
+ CEA498A01481183600AB81C5 /*
BDSKAddressTextField.m */,
+ CEA498A41481185100AB81C5 /*
BDSKAddressTextFieldCell.m */,
3D824AA707D099C300FB2F67 /*
BDSKBackgroundView.m */,
2730077707CF20B500F2E485 /*
BDSKBorderlessKeyWindow.m */,
CE96DB7010C7288800F085F3 /* BDSKButtonBar.m */,
@@ -2556,6 +2566,8 @@
isa = PBXGroup;
children = (
CE3011A00D5CC41C00C0B7FA /* BDSKAddCommand.h */,
+ CEA4989F1481183600AB81C5 /*
BDSKAddressTextField.h */,
+ CEA498A31481185100AB81C5 /*
BDSKAddressTextFieldCell.h */,
45DB3E470CAADFC3001EACDA /* BDSKACMDLParser.h
*/,
F920DAFA075C2B69000C5FCA /*
BDSKAppController+Scripting.h */,
F9022C5D075802E300C3F701 /* BDSKAppController.h
*/,
@@ -2952,6 +2964,8 @@
buildActionMask = 2147483647;
files = (
CE424A450D0F123500F824E7 /*
BDSKCompletionServerProtocol.h in Headers */,
+ CEA498A11481183600AB81C5 /*
BDSKAddressTextField.h in Headers */,
+ CEA498A51481185100AB81C5 /*
BDSKAddressTextFieldCell.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3795,6 +3809,8 @@
CE33D61C136AB8A700ACE924 /*
BDSKImportTextView.m in Sources */,
CE24BA69143F2A1900B3216B /*
BDSKRichTextForCommand.m in Sources */,
CE0CD73C1459812300488DE1 /*
NSAttributedString+Scripting.m in Sources */,
+ CEA498A21481183600AB81C5 /*
BDSKAddressTextField.m in Sources */,
+ CEA498A61481185100AB81C5 /*
BDSKAddressTextFieldCell.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/bibdesk/English.lproj/BDSKWebGroupView.xib
===================================================================
--- trunk/bibdesk/English.lproj/BDSKWebGroupView.xib 2011-11-26 07:38:16 UTC
(rev 18240)
+++ trunk/bibdesk/English.lproj/BDSKWebGroupView.xib 2011-11-26 13:02:58 UTC
(rev 18241)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">804</string>
+ <string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -391,7 +391,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>BDSKIconTextFieldCell</string>
+
<string>BDSKAddressTextFieldCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@@ -412,7 +412,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>BDSKDragTextField</string>
+ <string>BDSKAddressTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -441,6 +441,22 @@
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
+ <string
key="className">BDSKAddressTextField</string>
+ <string
key="superclassName">BDSKDragTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">BDSKAddressTextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKAddressTextFieldCell</string>
+ <string
key="superclassName">BDSKIconTextFieldCell</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">BDSKAddressTextFieldCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">BDSKCollapsibleView</string>
<string
key="superclassName">BDSKContainerView</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -595,7 +611,7 @@
<string>NSSegmentedControl</string>
<string>BDSKCollapsibleView</string>
<string>NSButton</string>
-
<string>BDSKDragTextField</string>
+
<string>BDSKAddressTextField</string>
</object>
</object>
<object class="NSMutableDictionary"
key="toOneOutletInfosByName">
@@ -623,7 +639,7 @@
</object>
<object
class="IBToOneOutletInfo">
<string
key="name">urlField</string>
- <string
key="candidateClassName">BDSKDragTextField</string>
+ <string
key="candidateClassName">BDSKAddressTextField</string>
</object>
</object>
</object>
@@ -674,14 +690,14 @@
<string
key="className">NSApplication</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BDSKRichTextFormat.h</string>
+ <string
key="minorKey">BDSKScriptMenu.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string
key="className">NSApplication</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BDSKScriptMenu.h</string>
+ <string
key="minorKey">NSAttributedString+Scripting.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
Modified: trunk/bibdesk/French.lproj/BDSKWebGroupView.xib
===================================================================
--- trunk/bibdesk/French.lproj/BDSKWebGroupView.xib 2011-11-26 07:38:16 UTC
(rev 18240)
+++ trunk/bibdesk/French.lproj/BDSKWebGroupView.xib 2011-11-26 13:02:58 UTC
(rev 18241)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">823</string>
+ <string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -33,7 +33,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="13637997">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -52,6 +52,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{75, 9}, {26, 25}}</string>
<reference key="NSSuperview" ref="735606656"/>
+
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="450647266">
<int key="NSCellFlags">604110336</int>
@@ -80,6 +81,7 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{109, 11}, {55, 22}}</string>
<reference key="NSSuperview" ref="735606656"/>
+
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="100059808">
<int key="NSCellFlags">-1804468671</int>
@@ -118,6 +120,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 9}, {57, 25}}</string>
<reference key="NSSuperview" ref="735606656"/>
+
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="238264941">
<int key="NSCellFlags">67239424</int>
@@ -158,17 +161,21 @@
</object>
<string
key="NSFrameSize">{174, 44}</string>
<reference
key="NSSuperview" ref="590748185"/>
+ <reference
key="NSWindow"/>
<string
key="NSClassName">BDSKGradientView</string>
<string
key="NSExtension">NSView</string>
</object>
</object>
<string key="NSFrameSize">{174,
44}</string>
<reference key="NSSuperview"
ref="13637997"/>
+ <reference key="NSWindow"/>
<string
key="NSClassName">BDSKCollapsibleView</string>
<string
key="NSExtension">NSView</string>
</object>
</object>
<string key="NSFrameSize">{174, 44}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">BDSKEdgeView</string>
<string key="NSExtension">NSView</string>
</object>
@@ -384,7 +391,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>BDSKIconTextFieldCell</string>
+
<string>BDSKAddressTextFieldCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@@ -405,7 +412,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>BDSKDragTextField</string>
+ <string>BDSKAddressTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -434,6 +441,22 @@
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
+ <string
key="className">BDSKAddressTextField</string>
+ <string
key="superclassName">BDSKDragTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">BDSKAddressTextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKAddressTextFieldCell</string>
+ <string
key="superclassName">BDSKIconTextFieldCell</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">BDSKAddressTextFieldCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">BDSKCollapsibleView</string>
<string
key="superclassName">BDSKContainerView</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -588,7 +611,7 @@
<string>NSSegmentedControl</string>
<string>BDSKCollapsibleView</string>
<string>NSButton</string>
-
<string>BDSKDragTextField</string>
+
<string>BDSKAddressTextField</string>
</object>
</object>
<object class="NSMutableDictionary"
key="toOneOutletInfosByName">
@@ -616,7 +639,7 @@
</object>
<object
class="IBToOneOutletInfo">
<string
key="name">urlField</string>
- <string
key="candidateClassName">BDSKDragTextField</string>
+ <string
key="candidateClassName">BDSKAddressTextField</string>
</object>
</object>
</object>
@@ -667,14 +690,14 @@
<string
key="className">NSApplication</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BDSKRichTextFormat.h</string>
+ <string
key="minorKey">BDSKScriptMenu.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string
key="className">NSApplication</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BDSKScriptMenu.h</string>
+ <string
key="minorKey">NSAttributedString+Scripting.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
Modified: trunk/bibdesk/German.lproj/BDSKWebGroupView.xib
===================================================================
--- trunk/bibdesk/German.lproj/BDSKWebGroupView.xib 2011-11-26 07:38:16 UTC
(rev 18240)
+++ trunk/bibdesk/German.lproj/BDSKWebGroupView.xib 2011-11-26 13:02:58 UTC
(rev 18241)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">823</string>
+ <string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -33,7 +33,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="13637997">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -52,6 +52,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{75, 9}, {26, 25}}</string>
<reference key="NSSuperview" ref="735606656"/>
+
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="450647266">
<int key="NSCellFlags">604110336</int>
@@ -80,6 +81,7 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{109, 11}, {55, 22}}</string>
<reference key="NSSuperview" ref="735606656"/>
+
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="100059808">
<int key="NSCellFlags">-1804468671</int>
@@ -118,6 +120,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 9}, {57, 25}}</string>
<reference key="NSSuperview" ref="735606656"/>
+
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="238264941">
<int key="NSCellFlags">67239424</int>
@@ -156,17 +159,21 @@
</object>
<string
key="NSFrameSize">{174, 44}</string>
<reference
key="NSSuperview" ref="590748185"/>
+ <reference
key="NSWindow"/>
<string
key="NSClassName">BDSKGradientView</string>
<string
key="NSExtension">NSView</string>
</object>
</object>
<string key="NSFrameSize">{174,
44}</string>
<reference key="NSSuperview"
ref="13637997"/>
+ <reference key="NSWindow"/>
<string
key="NSClassName">BDSKCollapsibleView</string>
<string
key="NSExtension">NSView</string>
</object>
</object>
<string key="NSFrameSize">{174, 44}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">BDSKEdgeView</string>
<string key="NSExtension">NSView</string>
</object>
@@ -382,7 +389,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>BDSKIconTextFieldCell</string>
+
<string>BDSKAddressTextFieldCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@@ -403,7 +410,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>BDSKDragTextField</string>
+ <string>BDSKAddressTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -432,6 +439,22 @@
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
+ <string
key="className">BDSKAddressTextField</string>
+ <string
key="superclassName">BDSKDragTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">BDSKAddressTextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKAddressTextFieldCell</string>
+ <string
key="superclassName">BDSKIconTextFieldCell</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">BDSKAddressTextFieldCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">BDSKCollapsibleView</string>
<string
key="superclassName">BDSKContainerView</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -586,7 +609,7 @@
<string>NSSegmentedControl</string>
<string>BDSKCollapsibleView</string>
<string>NSButton</string>
-
<string>BDSKDragTextField</string>
+
<string>BDSKAddressTextField</string>
</object>
</object>
<object class="NSMutableDictionary"
key="toOneOutletInfosByName">
@@ -614,7 +637,7 @@
</object>
<object
class="IBToOneOutletInfo">
<string
key="name">urlField</string>
- <string
key="candidateClassName">BDSKDragTextField</string>
+ <string
key="candidateClassName">BDSKAddressTextField</string>
</object>
</object>
</object>
@@ -665,14 +688,14 @@
<string
key="className">NSApplication</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BDSKRichTextFormat.h</string>
+ <string
key="minorKey">BDSKScriptMenu.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string
key="className">NSApplication</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BDSKScriptMenu.h</string>
+ <string
key="minorKey">NSAttributedString+Scripting.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit