Revision: 24100
http://sourceforge.net/p/bibdesk/svn/24100
Author: hofman
Date: 2019-08-01 14:21:50 +0000 (Thu, 01 Aug 2019)
Log Message:
-----------
remove overlay window classes
Modified Paths:
--------------
trunk/bibdesk/BibDocument_Search.m
trunk/bibdesk/BibDocument_UI.m
trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/bibdesk/BDSKOverlayWindow.h
trunk/bibdesk/BDSKOverlayWindow.m
Deleted: trunk/bibdesk/BDSKOverlayWindow.h
===================================================================
--- trunk/bibdesk/BDSKOverlayWindow.h 2019-08-01 14:18:58 UTC (rev 24099)
+++ trunk/bibdesk/BDSKOverlayWindow.h 2019-08-01 14:21:50 UTC (rev 24100)
@@ -1,78 +0,0 @@
-//
-// BDSKOverlayWindow.h
-// Bibdesk
-//
-// Created by Christiaan Hofman on 9/8/05.
-//
-/*
- This software is Copyright (c) 2005-2019
- 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>
-
-
-@interface BDSKOverlayWindow : NSWindow {
- NSView *parentView;
-}
-/*!
- @method overlayView:
- @abstract Overlay aView with the receiver, automatically resizing
itself to the frame of aView.
- @discussion Removes itself from a previous parent view first. The
parent view should be in a window and should not be removed from its window
while the overlay is in place.
- @param aView The parent view to be overlayed.
-*/
-- (void)overlayView:(NSView *)aView;
-/*!
- @method remove
- @abstract Remove the receiver as an overlay from its parent view and
release its parent view.
- @discussion (discussion)
-*/
-- (void)remove;
-@end
-
-
-@interface BDSKOverlayPanel : NSPanel {
- NSView *parentView;
-}
-/*!
- @method overlayView:
- @abstract Overlay aView with the receiver, automatically resizing
itself to the frame of aView.
- @discussion Removes itself from a previous parent view first. The
parent view should be in a window and should not be removed from its window
while the overlay is in place.
- @param aView The parent view to be overlayed.
-*/
-- (void)overlayView:(NSView *)aView;
-/*!
- @method remove
- @abstract Remove the receiver as an overlay from its parent view and
release its parent view.
- @discussion (discussion)
-*/
-- (void)remove;
-@end
Deleted: trunk/bibdesk/BDSKOverlayWindow.m
===================================================================
--- trunk/bibdesk/BDSKOverlayWindow.m 2019-08-01 14:18:58 UTC (rev 24099)
+++ trunk/bibdesk/BDSKOverlayWindow.m 2019-08-01 14:21:50 UTC (rev 24100)
@@ -1,228 +0,0 @@
-//
-// BDSKOverlayWindow.m
-// Bibdesk
-//
-// Created by Christiaan Hofman on 9/8/05.
-//
-/*
- This software is Copyright (c) 2005-2019
- 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 "BDSKOverlayWindow.h"
-#import "NSView_BDSKExtensions.h"
-
-
-@implementation BDSKOverlayWindow
-
-// designated initializer of NSWindow
-- (id)initWithContentRect:(NSRect)contentRect
- styleMask:(NSWindowStyleMask)aStyle
- backing:(NSBackingStoreType)bufferingType
- defer:(BOOL)flag {
-
- if (self = [super initWithContentRect:contentRect
-
styleMask:NSBorderlessWindowMask
-
backing:bufferingType
-
defer:flag]) {
- parentView = nil;
- // we are transparent and ignore mouse events
- [self setBackgroundColor:[NSColor clearColor]];
- [self setOpaque:NO];
- [self setAlphaValue:.999];
- [self setIgnoresMouseEvents:YES];
- }
- return self;
-}
-
-- (void)dealloc {
- if (parentView)
- BDSKENSURE_MAIN_THREAD( [self remove]; );
- [super dealloc];
-}
-
-- (void)parentViewFrameChanged:(NSNotification *)notification {
- NSRect viewRect = [parentView convertRectToScreen:[parentView bounds]];
- [self setFrame:[self frameRectForContentRect:viewRect] display:YES];
-}
-
-- (void)parentWindowWillClose:(NSNotification *)notification {
- [self orderOut:nil];
-}
-
-- (void)orderFront:(id)sender{
- [super orderFront:sender];
- [self parentViewFrameChanged:nil];
-}
-
-- (void)overlayView:(NSView *)aView {
- if ([aView window] == nil)
- return; // we don't support overlay if the view is not in a
window
- if (parentView)
- [self remove]; // first remove from the old parentView
-
- parentView = [aView retain];
-
- NSWindow *parentWindow = [parentView window];
-
- [self setLevel:[parentWindow level]];
- [parentWindow addChildWindow:self ordered:NSWindowAbove];
-
- // resize ourselves to cover the view, and observe future frame changes
- [self parentViewFrameChanged:nil];
- [[NSNotificationCenter defaultCenter]
- addObserver:self
- selector:@selector(parentViewFrameChanged:)
- name:NSViewFrameDidChangeNotification
- object:parentView];
- [[NSNotificationCenter defaultCenter]
- addObserver:self
- selector:@selector(parentWindowWillClose:)
- name:NSWindowWillCloseNotification
- object:parentWindow];
-
- if ([parentWindow isVisible])
- [self orderFront:nil];
-}
-
-- (void)remove {
- if (parentView == nil)
- return;
-
- // stop observing our old parentView
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-
- [[self parentWindow] removeChildWindow:self];
- // we were on top, so it needs to redisplay
-
- [parentView setNeedsDisplay:YES];
- [parentView release];
- parentView = nil;
-
- [self orderOut:nil];
-}
-
-- (BOOL)accessiblityIsIgnored { return YES; }
-
-@end
-
-#pragma mark -
-
-@implementation BDSKOverlayPanel
-
-// designated initializer of NSWindow
-- (id)initWithContentRect:(NSRect)contentRect
- styleMask:(NSWindowStyleMask)aStyle
- backing:(NSBackingStoreType)bufferingType
- defer:(BOOL)flag {
-
- if (self = [super initWithContentRect:contentRect
-
styleMask:NSBorderlessWindowMask
-
backing:bufferingType
-
defer:flag]) {
- parentView = nil;
- // we are transparent and ignore mouse events
- [self setBackgroundColor:[NSColor clearColor]];
- [self setOpaque:NO];
- [self setAlphaValue:.999];
- [self setIgnoresMouseEvents:YES];
- }
- return self;
-}
-
-- (void)dealloc {
- if (parentView)
- BDSKENSURE_MAIN_THREAD( [self remove]; );
- [super dealloc];
-}
-
-- (void)parentViewFrameChanged:(NSNotification *)notification {
- NSRect viewRect = [parentView convertRectToScreen:[parentView bounds]];
- [self setFrame:[self frameRectForContentRect:viewRect] display:YES];
-}
-
-- (void)parentWindowWillClose:(NSNotification *)notification {
- [self orderOut:nil];
-}
-
-- (void)overlayView:(NSView *)aView {
- if ([aView window] == nil)
- return; // we don't support overlay if the view is not in a
window
- if (parentView)
- [self remove]; // first remove from the old parentView
-
- parentView = [aView retain];
-
- NSWindow *parentWindow = [parentView window];
-
- // if the parent is a floating panel, we also should be. Otherwise we
won't get on top.
- [self setFloatingPanel:([parentWindow
respondsToSelector:@selector(isFloatingPanel)] && [(NSPanel *)parentWindow
isFloatingPanel])];
- [self setHidesOnDeactivate:[parentWindow hidesOnDeactivate]];
- [self setLevel:[parentWindow level]];
- [parentWindow addChildWindow:self ordered:NSWindowAbove];
-
- // resize ourselves to cover the view, and observe future frame changes
- [self parentViewFrameChanged:nil];
- [[NSNotificationCenter defaultCenter]
- addObserver:self
- selector:@selector(parentViewFrameChanged:)
- name:NSViewFrameDidChangeNotification
- object:parentView];
- [[NSNotificationCenter defaultCenter]
- addObserver:self
- selector:@selector(parentWindowWillClose:)
- name:NSWindowWillCloseNotification
- object:parentWindow];
-
- if ([parentWindow isVisible])
- [self orderFront:nil];
-}
-
-- (void)remove {
- if (parentView == nil)
- return;
-
- // stop observing our old parentView
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-
- [[self parentWindow] removeChildWindow:self];
- // we were on top, so it needs to redisplay
-
- [parentView setNeedsDisplay:YES];
- [parentView release];
- parentView = nil;
-
- [self orderOut:nil];
-}
-
-- (BOOL)accessiblityIsIgnored { return YES; }
-
-@end
Modified: trunk/bibdesk/BibDocument_Search.m
===================================================================
--- trunk/bibdesk/BibDocument_Search.m 2019-08-01 14:18:58 UTC (rev 24099)
+++ trunk/bibdesk/BibDocument_Search.m 2019-08-01 14:21:50 UTC (rev 24100)
@@ -48,7 +48,6 @@
#import "BDSKPublicationsArray.h"
#import "BDSKZoomablePDFView.h"
#import "BDSKPreviewer.h"
-#import "BDSKOverlayWindow.h"
#import "BibDocument_Groups.h"
#import "BibDocument_DataSource.h"
#import "BibDocument_Toolbar.h"
Modified: trunk/bibdesk/BibDocument_UI.m
===================================================================
--- trunk/bibdesk/BibDocument_UI.m 2019-08-01 14:18:58 UTC (rev 24099)
+++ trunk/bibdesk/BibDocument_UI.m 2019-08-01 14:21:50 UTC (rev 24100)
@@ -54,7 +54,6 @@
#import "BDSKEdgeView.h"
#import "BDSKSplitView.h"
#import "BDSKPreviewer.h"
-#import "BDSKOverlayWindow.h"
#import "BDSKTeXTask.h"
#import "BDSKTemplateParser.h"
#import "BDSKTemplate.h"
Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2019-08-01 14:18:58 UTC
(rev 24099)
+++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2019-08-01 14:21:50 UTC
(rev 24100)
@@ -254,7 +254,6 @@
CE2A0A36224599F600A8F31C /* BDSKOpenAccessoryViewController.h
in Headers */ = {isa = PBXBuildFile; fileRef = CE2F056611B517E9001B0AE0 /*
BDSKOpenAccessoryViewController.h */; };
CE2A0A37224599F600A8F31C /* BDSKOrphanedFilesFinder.h in
Headers */ = {isa = PBXBuildFile; fileRef = CE22E1CB0A8CCF9C002CEFB8 /*
BDSKOrphanedFilesFinder.h */; };
CE2A0A38224599F600A8F31C /* BDSKOutlineView.h in Headers */ =
{isa = PBXBuildFile; fileRef = CE62E0BD0F4C4A5500BDF01E /* BDSKOutlineView.h
*/; };
- CE2A0A39224599F600A8F31C /* BDSKOverlayWindow.h in Headers */ =
{isa = PBXBuildFile; fileRef = F941B7E808AA574200F04ECD /* BDSKOverlayWindow.h
*/; };
CE2A0A3A224599F600A8F31C /* BDSKOwnerProtocol.h in Headers */ =
{isa = PBXBuildFile; fileRef = CEFA0F4C0AF1400900A3B4B1 /* BDSKOwnerProtocol.h
*/; };
CE2A0A3B224599F600A8F31C /* BDSKParentGroup.h in Headers */ =
{isa = PBXBuildFile; fileRef = CE1EF2910F8E0D54004E7AE8 /* BDSKParentGroup.h
*/; };
CE2A0A3C224599F600A8F31C /* BDSKParseFormatCommand.h in Headers
*/ = {isa = PBXBuildFile; fileRef = CED65DC60907A2FD003EED90 /*
BDSKParseFormatCommand.h */; };
@@ -787,7 +786,6 @@
F938408A0906DD1F00FC37F2 /* ScriptHookPreferences.tiff in
Resources */ = {isa = PBXBuildFile; fileRef = F93840890906DD1F00FC37F2 /*
ScriptHookPreferences.tiff */; };
F940D10A0B5568E400B5917A /* BDSKReferParser.m in Sources */ =
{isa = PBXBuildFile; fileRef = F940D1080B5568E400B5917A /* BDSKReferParser.m
*/; };
F941135509B549BF00EE8463 /* BDSKEditorTextView.m in Sources */
= {isa = PBXBuildFile; fileRef = F941135309B549BF00EE8463 /*
BDSKEditorTextView.m */; };
- F941B7EB08AA574200F04ECD /* BDSKOverlayWindow.m in Sources */ =
{isa = PBXBuildFile; fileRef = F941B7E908AA574200F04ECD /* BDSKOverlayWindow.m
*/; };
F945240C0B4B15A6000A5E12 /* searchDocIcon.icns in Resources */
= {isa = PBXBuildFile; fileRef = F945240B0B4B15A6000A5E12 /* searchDocIcon.icns
*/; };
F9463F4609436F7500CC4549 /* NSSet_BDSKExtensions.m in Sources
*/ = {isa = PBXBuildFile; fileRef = F9463F4409436F7500CC4549 /*
NSSet_BDSKExtensions.m */; };
F946DCE909FDC4B600D471DF /* BDSKAsynchronousDOServer.m in
Sources */ = {isa = PBXBuildFile; fileRef = F946DCE709FDC4B600D471DF /*
BDSKAsynchronousDOServer.m */; };
@@ -2001,8 +1999,6 @@
F940D1080B5568E400B5917A /* BDSKReferParser.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKReferParser.m; sourceTree = "<group>"; };
F941135209B549BF00EE8463 /* BDSKEditorTextView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKEditorTextView.h; sourceTree = "<group>"; };
F941135309B549BF00EE8463 /* BDSKEditorTextView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKEditorTextView.m; sourceTree = "<group>"; };
- F941B7E808AA574200F04ECD /* BDSKOverlayWindow.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKOverlayWindow.h; sourceTree = "<group>"; };
- F941B7E908AA574200F04ECD /* BDSKOverlayWindow.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKOverlayWindow.m; sourceTree = "<group>"; };
F945240B0B4B15A6000A5E12 /* searchDocIcon.icns */ = {isa =
PBXFileReference; lastKnownFileType = image.icns; path = searchDocIcon.icns;
sourceTree = "<group>"; };
F9463F4309436F7500CC4549 /* NSSet_BDSKExtensions.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
NSSet_BDSKExtensions.h; sourceTree = "<group>"; };
F9463F4409436F7500CC4549 /* NSSet_BDSKExtensions.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= NSSet_BDSKExtensions.m; sourceTree = "<group>"; };
@@ -2525,7 +2521,6 @@
CE15198014B62E47003AE698 /*
BDSKLineNumberView.m */,
CEF536691192EFE400027C3C /*
BDSKNotesOutlineView.m */,
CE62E0BE0F4C4A5500BDF01E /* BDSKOutlineView.m
*/,
- F941B7E908AA574200F04ECD /* BDSKOverlayWindow.m
*/,
CE62DE490F4B788800BDF01E /*
BDSKPreferenceIconButton.m */,
CE62DE410F4B77D600BDF01E /*
BDSKPreferenceIconView.m */,
CE62DE3A0F4B777800BDF01E /*
BDSKPreferenceWindow.m */,
@@ -3095,7 +3090,6 @@
CE2F056611B517E9001B0AE0 /*
BDSKOpenAccessoryViewController.h */,
CE22E1CB0A8CCF9C002CEFB8 /*
BDSKOrphanedFilesFinder.h */,
CE62E0BD0F4C4A5500BDF01E /* BDSKOutlineView.h
*/,
- F941B7E808AA574200F04ECD /* BDSKOverlayWindow.h
*/,
CEFA0F4C0AF1400900A3B4B1 /* BDSKOwnerProtocol.h
*/,
CE1EF2910F8E0D54004E7AE8 /* BDSKParentGroup.h
*/,
CED65DC60907A2FD003EED90 /*
BDSKParseFormatCommand.h */,
@@ -3556,7 +3550,6 @@
CE2A09E7224599DB00A8F31C /*
BDSKDublinCoreXMLParser.h in Headers */,
CE2A0A7722459A3100A8F31C /* BDSKSortCommand.h
in Headers */,
CE2A0A3D224599F600A8F31C /*
BDSKPasswordController.h in Headers */,
- CE2A0A39224599F600A8F31C /* BDSKOverlayWindow.h
in Headers */,
CE2A0A8F22459A3600A8F31C /* BDSKToken.h in
Headers */,
CE2A09CD2245997A00A8F31C /*
BDSKCiteKeyFormatter.h in Headers */,
CE2A0A9522459A3600A8F31C /*
BDSKTypeNameFormatter.h in Headers */,
@@ -4312,7 +4305,6 @@
F9E0BCB40895ACC9005E5FAA /* BibPref_Display.m
in Sources */,
F923501A089A813E00EFEB06 /*
NSDate_BDSKExtensions.m in Sources */,
F9DB895D08A54BBA00CB3D53 /* BDSKTeXTask.m in
Sources */,
- F941B7EB08AA574200F04ECD /* BDSKOverlayWindow.m
in Sources */,
CE23F8CD21E0EC3300276091 /* BDSKFontManager.m
in Sources */,
F9E43AD808AD8BDB00A0354B /*
BDSKErrorObjectController.m in Sources */,
F9EF21B708B1572600AAC9A9 /*
BDSKScrollableTextField.m in Sources */,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
