Revision: 18262
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18262&view=rev
Author: hofman
Date: 2011-11-30 12:55:13 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
add stop/reload button as subview to web group address field
Modified Paths:
--------------
trunk/bibdesk/BDSKAddressTextField.h
trunk/bibdesk/BDSKAddressTextField.m
trunk/bibdesk/BDSKAddressTextFieldCell.m
trunk/bibdesk/BDSKWebGroupViewController.h
trunk/bibdesk/BDSKWebGroupViewController.m
trunk/bibdesk/English.lproj/BDSKWebGroupView.xib
trunk/bibdesk/build_config.txt
Modified: trunk/bibdesk/BDSKAddressTextField.h
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.h 2011-11-30 07:35:32 UTC (rev
18261)
+++ trunk/bibdesk/BDSKAddressTextField.h 2011-11-30 12:55:13 UTC (rev
18262)
@@ -40,5 +40,10 @@
#import "BDSKDragTextField.h"
-@interface BDSKAddressTextField : BDSKDragTextField
+@interface BDSKAddressTextField : BDSKDragTextField {
+ NSButton *button;
+}
+
+- (NSButton *)button;
+
@end
Modified: trunk/bibdesk/BDSKAddressTextField.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.m 2011-11-30 07:35:32 UTC (rev
18261)
+++ trunk/bibdesk/BDSKAddressTextField.m 2011-11-30 12:55:13 UTC (rev
18262)
@@ -39,6 +39,8 @@
#import "BDSKAddressTextField.h"
#import "BDSKAddressTextFieldCell.h"
+#define BUTTON_SIZE 16.0
+#define BUTTON_MARGIN 3.0
@implementation BDSKAddressTextField
@@ -46,11 +48,53 @@
return [BDSKAddressTextFieldCell class];
}
+- (void)makeButton {
+ NSRect rect, bounds = [self bounds];
+ rect.origin.x = NSMaxX(bounds) - BUTTON_SIZE - BUTTON_MARGIN;
+ rect.origin.y = [self isFlipped] ? NSMinY(bounds) + BUTTON_MARGIN :
NSMaxY(bounds) - BUTTON_SIZE - BUTTON_MARGIN;
+ rect.size.width = rect.size.height = BUTTON_SIZE;
+ button = [[NSButton alloc] initWithFrame:rect];
+ [button setButtonType:NSMomentaryChangeButton];
+ [button setBordered:NO];
+ [button setImagePosition:NSImageOnly];
+ [[button cell] setImageScaling:NSImageScaleProportionallyDown];
+ [button setAutoresizingMask:NSViewMinXMargin | NSViewMaxYMargin];
+ [self addSubview:button];
+}
+
+- (id)initWithFrame:(NSRect)frameRect {
+ self = [super initWithFrame:frameRect];
+ if (self) {
+ [self makeButton];
+ }
+ return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+ self = [super initWithCoder:aDecoder];
+ if (self) {
+ button = [[aDecoder decodeObjectForKey:@"button"] retain];
+ if (button == nil)
+ [self makeButton];
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+ [super encodeWithCoder:aCoder];
+ [aCoder encodeConditionalObject:button forKey:@"button"];
+}
+
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
+ BDSKDESTROY(button);
[super dealloc];
}
+- (NSButton *)button {
+ return button;
+}
+
- (void)handleKeyOrMainStateChangedNotification:(NSNotification *)note {
[self setNeedsDisplay:YES];
}
Modified: trunk/bibdesk/BDSKAddressTextFieldCell.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextFieldCell.m 2011-11-30 07:35:32 UTC (rev
18261)
+++ trunk/bibdesk/BDSKAddressTextFieldCell.m 2011-11-30 12:55:13 UTC (rev
18262)
@@ -89,6 +89,12 @@
}
}
+- (NSRect)textRectForBounds:(NSRect)aRect {
+ NSRect ignored, rect = [super textRectForBounds:aRect];
+ NSDivideRect(rect, &ignored, &rect, 17.0, NSMaxXEdge);
+ return rect;
+}
+
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
[super drawInteriorWithFrame:adjustedFrame(cellFrame, controlView)
inView:controlView];
}
Modified: trunk/bibdesk/BDSKWebGroupViewController.h
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.h 2011-11-30 07:35:32 UTC (rev
18261)
+++ trunk/bibdesk/BDSKWebGroupViewController.h 2011-11-30 12:55:13 UTC (rev
18262)
@@ -46,7 +46,6 @@
IBOutlet BDSKCollapsibleView *collapsibleView;
IBOutlet BDSKAddressTextField *urlField;
IBOutlet NSSegmentedControl *backForwardButton;
- IBOutlet NSButton *stopOrReloadButton;
BDSKFieldEditor *fieldEditor;
}
Modified: trunk/bibdesk/BDSKWebGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.m 2011-11-30 07:35:32 UTC (rev
18261)
+++ trunk/bibdesk/BDSKWebGroupViewController.m 2011-11-30 12:55:13 UTC (rev
18262)
@@ -95,6 +95,10 @@
[urlField setFrame:rect];
[urlField registerForDraggedTypes:[NSArray
arrayWithObjects:NSURLPboardType, BDSKWeblocFilePboardType, nil]];
+
+ [[urlField button] setTarget:self];
+ [[urlField button] setAction:@selector(stopOrReloadAction:)];
+ [[urlField button] setKeyEquivalentModifierMask:NSCommandKeyMask];
}
#pragma mark Accessors
@@ -172,15 +176,15 @@
WebView *webView = [self webView];
[backForwardButton setEnabled:[webView canGoBack]
forSegment:BACK_SEGMENT_INDEX];
[backForwardButton setEnabled:[webView canGoForward]
forSegment:FORWARD_SEGMENT_INDEX];
- [stopOrReloadButton setEnabled:YES];
+ [[urlField button] setEnabled:YES];
if (loading) {
- [stopOrReloadButton setImage:[NSImage
imageNamed:NSImageNameStopProgressTemplate]];
- [stopOrReloadButton setToolTip:NSLocalizedString(@"Cancel download",
@"Tool tip message")];
- [stopOrReloadButton setKeyEquivalent:@"."];
+ [[urlField button] setImage:[NSImage
imageNamed:NSImageNameStopProgressTemplate]];
+ [[urlField button] setToolTip:NSLocalizedString(@"Cancel download",
@"Tool tip message")];
+ [[urlField button] setKeyEquivalent:@"."];
} else {
- [stopOrReloadButton setImage:[NSImage
imageNamed:NSImageNameRefreshTemplate]];
- [stopOrReloadButton setToolTip:NSLocalizedString(@"Reload page",
@"Tool tip message")];
- [stopOrReloadButton setKeyEquivalent:@"r"];
+ [[urlField button] setImage:[NSImage
imageNamed:NSImageNameRefreshTemplate]];
+ [[urlField button] setToolTip:NSLocalizedString(@"Reload page", @"Tool
tip message")];
+ [[urlField button] setKeyEquivalent:@"r"];
}
}
Modified: trunk/bibdesk/English.lproj/BDSKWebGroupView.xib
===================================================================
--- trunk/bibdesk/English.lproj/BDSKWebGroupView.xib 2011-11-30 07:35:32 UTC
(rev 18261)
+++ trunk/bibdesk/English.lproj/BDSKWebGroupView.xib 2011-11-30 12:55:13 UTC
(rev 18262)
@@ -33,7 +33,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="13637997">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -47,41 +47,11 @@
<int
key="NSvFlags">274</int>
<object
class="NSMutableArray" key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <object
class="NSButton" id="410965959">
-
<reference key="NSNextResponder" ref="735606656"/>
-
<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>
-
<int key="NSCellFlags2">134217728</int>
-
<string key="NSContents"/>
-
<object class="NSFont" key="NSSupport">
-
<string key="NSName">LucidaGrande</string>
-
<double key="NSSize">10</double>
-
<int key="NSfFlags">2843</int>
-
</object>
-
<reference key="NSControlView" ref="410965959"/>
-
<int key="NSButtonFlags">-2033975041</int>
-
<int key="NSButtonFlags2">402653219</int>
-
<object class="NSCustomResource" key="NSNormalImage">
-
<string key="NSClassName">NSImage</string>
-
<string key="NSResourceName">NSRefreshTemplate</string>
-
</object>
-
<string key="NSAlternateContents"/>
-
<string key="NSKeyEquivalent">r</string>
-
<int key="NSPeriodicDelay">200</int>
-
<int key="NSPeriodicInterval">25</int>
-
</object>
-
</object>
<object
class="NSTextField" id="613952324">
<reference key="NSNextResponder" ref="735606656"/>
<int key="NSvFlags">266</int>
-
<string key="NSFrame">{{109, 11}, {55, 22}}</string>
+
<string key="NSFrame">{{75, 11}, {54, 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>
@@ -120,7 +90,6 @@
<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>
@@ -159,23 +128,19 @@
</object>
</object>
</object>
- <string
key="NSFrameSize">{174, 44}</string>
+ <string
key="NSFrameSize">{140, 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>
+ <string key="NSFrameSize">{140,
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="NSFrameSize">{140, 44}</string>
<string key="NSClassName">BDSKEdgeView</string>
<string key="NSExtension">NSView</string>
</object>
@@ -201,22 +166,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection"
key="connection">
- <string
key="label">stopOrReloadButton</string>
- <reference key="source"
ref="606120312"/>
- <reference key="destination"
ref="410965959"/>
- </object>
- <int key="connectionID">72</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection"
key="connection">
- <string
key="label">stopOrReloadAction:</string>
- <reference key="source"
ref="606120312"/>
- <reference key="destination"
ref="410965959"/>
- </object>
- <int key="connectionID">75</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection"
key="connection">
<string
key="label">urlField</string>
<reference key="source"
ref="606120312"/>
<reference key="destination"
ref="613952324"/>
@@ -309,22 +258,12 @@
<reference key="object"
ref="735606656"/>
<object class="NSMutableArray"
key="children">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <reference
ref="410965959"/>
<reference
ref="613952324"/>
<reference
ref="37995786"/>
</object>
<reference key="parent"
ref="590748185"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">65</int>
- <reference key="object"
ref="410965959"/>
- <object class="NSMutableArray"
key="children">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <reference
ref="450647266"/>
- </object>
- <reference key="parent"
ref="735606656"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">92</int>
<reference key="object"
ref="613952324"/>
<object class="NSMutableArray"
key="children">
@@ -343,11 +282,6 @@
<reference key="parent"
ref="735606656"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">109</int>
- <reference key="object"
ref="450647266"/>
- <reference key="parent"
ref="410965959"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">110</int>
<reference key="object"
ref="100059808"/>
<reference key="parent"
ref="613952324"/>
@@ -365,7 +299,6 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
- <string>109.IBPluginDependency</string>
<string>110.CustomClassName</string>
<string>110.IBPluginDependency</string>
<string>111.IBPluginDependency</string>
@@ -375,9 +308,6 @@
<string>5.IBEditorWindowLastContentRect</string>
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
-
<string>65.IBAttributePlaceholdersKey</string>
- <string>65.IBPluginDependency</string>
- <string>65.ImportedFromIB2</string>
<string>7.IBPluginDependency</string>
<string>7.ImportedFromIB2</string>
<string>92.CustomClassName</string>
@@ -390,28 +320,17 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>BDSKAddressTextFieldCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{21, 778}, {174, 44}}</string>
+ <string>{{21, 778}, {140, 44}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <object class="NSMutableDictionary">
- <string
key="NS.key.0">ToolTip</string>
- <object
class="IBToolTipAttribute" key="NS.object.0">
- <string
key="name">ToolTip</string>
- <reference key="object"
ref="410965959"/>
- <string
key="toolTip">Reload page</string>
- </object>
- </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>BDSKAddressTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@@ -603,14 +522,12 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>backForwardButton</string>
<string>collapsibleView</string>
-
<string>stopOrReloadButton</string>
<string>urlField</string>
</object>
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>NSSegmentedControl</string>
<string>BDSKCollapsibleView</string>
-
<string>NSButton</string>
<string>BDSKAddressTextField</string>
</object>
</object>
@@ -620,7 +537,6 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>backForwardButton</string>
<string>collapsibleView</string>
-
<string>stopOrReloadButton</string>
<string>urlField</string>
</object>
<object class="NSMutableArray"
key="dict.values">
@@ -634,10 +550,6 @@
<string
key="candidateClassName">BDSKCollapsibleView</string>
</object>
<object
class="IBToOneOutletInfo">
- <string
key="name">stopOrReloadButton</string>
- <string
key="candidateClassName">NSButton</string>
- </object>
- <object
class="IBToOneOutletInfo">
<string
key="name">urlField</string>
<string
key="candidateClassName">BDSKAddressTextField</string>
</object>
@@ -859,22 +771,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string
key="className">NSButton</string>
- <string
key="superclassName">NSControl</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBFrameworkSource</string>
- <string
key="minorKey">AppKit.framework/Headers/NSButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSButtonCell</string>
- <string
key="superclassName">NSActionCell</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBFrameworkSource</string>
- <string
key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSCell</string>
<string
key="superclassName">NSObject</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1456,13 +1352,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSGoLeftTemplate</string>
<string>NSGoRightTemplate</string>
- <string>NSRefreshTemplate</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{9, 9}</string>
<string>{9, 9}</string>
- <string>{10, 12}</string>
</object>
</object>
</data>
Modified: trunk/bibdesk/build_config.txt
===================================================================
--- trunk/bibdesk/build_config.txt 2011-11-30 07:35:32 UTC (rev 18261)
+++ trunk/bibdesk/build_config.txt 2011-11-30 12:55:13 UTC (rev 18262)
@@ -1 +1 @@
-disableLocalizations 0
+disableLocalizations 1
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
