Revision: 12975
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12975&view=rev
Author: hofman
Date: 2008-03-05 11:41:18 -0800 (Wed, 05 Mar 2008)
Log Message:
-----------
Rename ivars for outlets. Fix printing and search in previews for recent
changes.
Modified Paths:
--------------
trunk/bibdesk/BibDocument+Menus.m
trunk/bibdesk/BibDocument+Scripting.m
trunk/bibdesk/BibDocument.h
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_Actions.m
trunk/bibdesk/BibDocument_Search.m
trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib
trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
Modified: trunk/bibdesk/BibDocument+Menus.m
===================================================================
--- trunk/bibdesk/BibDocument+Menus.m 2008-03-05 19:12:47 UTC (rev 12974)
+++ trunk/bibdesk/BibDocument+Menus.m 2008-03-05 19:41:18 UTC (rev 12975)
@@ -280,14 +280,12 @@
return NO;
// even if there is a selection, we may have an error condition with
nothing to print
// see comments on exception in -printableView, which is the main
motivation for this validation
- else if([currentPreviewView isEqual:previewerBox])
+ else if(bottomPreviewDisplay == BDSKPreviewDisplayTeX)
return [[previewer pdfView] document] != nil;
- else if ([currentPreviewView isEqual:previewBox])
- return [previewPdfView document] != nil;
- else if ([[previewer textView] isEqual:previewBox])
- return [[previewer textView] textStorage] != nil;
+ else if (bottomPreviewDisplay == BDSKPreviewDisplayText)
+ return [bottomPreviewTextView textStorage] != nil;
else
- return [previewTextView textStorage] != nil;
+ return NO;
}
- (BOOL) validateToggleToggleCustomCiteDrawerMenuItem:(NSMenuItem*) menuItem {
@@ -532,10 +530,10 @@
- (BOOL)validateChangePreviewDisplayMenuItem:(NSMenuItem *)menuItem {
int tag = [menuItem tag], state = NSOffState;
NSString *style = [menuItem representedObject];
- if (tag == previewDisplay && tag != BDSKPreviewDisplayText) {
+ if (tag == bottomPreviewDisplay && tag != BDSKPreviewDisplayText) {
state = NSOnState;
- } else if (tag == BDSKPreviewDisplayText && [style
isEqualToString:previewDisplayTemplate]) {
- if (tag == previewDisplay || [menuItem menu] == templatePreviewMenu)
+ } else if (tag == BDSKPreviewDisplayText && [style
isEqualToString:bottomPreviewDisplayTemplate]) {
+ if (tag == bottomPreviewDisplay || [menuItem menu] ==
bottomTemplatePreviewMenu)
state = NSOnState;
}
[menuItem setState:state];
Modified: trunk/bibdesk/BibDocument+Scripting.m
===================================================================
--- trunk/bibdesk/BibDocument+Scripting.m 2008-03-05 19:12:47 UTC (rev
12974)
+++ trunk/bibdesk/BibDocument+Scripting.m 2008-03-05 19:41:18 UTC (rev
12975)
@@ -138,7 +138,7 @@
}
- (id)handlePrintScriptCommand:(NSScriptCommand *)command {
- if([currentPreviewView isEqual:previewerBox] || [currentPreviewView
isEqual:previewBox]) {
+ if (bottomPreviewDisplay == BDSKPreviewDisplayTeX) {
// we let the PDFView handle printing
NSDictionary *args = [command evaluatedArguments];
@@ -146,7 +146,7 @@
// PDFView does not allow printing without showing the dialog, so we
just ignore that setting
NSPrintInfo *printInfo = [self printInfo];
- PDFView *pdfView = (PDFView *)[(NSBox *)currentPreviewView
contentView];
+ PDFView *pdfView = [previewer pdfView];
if ([settings isKindOfClass:[NSDictionary class]]) {
settings = [[settings mutableCopy] autorelease];
Modified: trunk/bibdesk/BibDocument.h
===================================================================
--- trunk/bibdesk/BibDocument.h 2008-03-05 19:12:47 UTC (rev 12974)
+++ trunk/bibdesk/BibDocument.h 2008-03-05 19:41:18 UTC (rev 12975)
@@ -139,9 +139,9 @@
IBOutlet BDSKGradientView *groupGradientView;
NSString *currentGroupField;
-#pragma mark File pane variables
+#pragma mark Side preview variables
- IBOutlet FileView *fileView;
+ IBOutlet FileView *sideFileView;
NSTextView *sidePreviewTextView;
NSView *currentSidePreviewView;
IBOutlet BDSKCollapsibleView *fileCollapsibleView;
@@ -155,21 +155,21 @@
IBOutlet NSSegmentedControl *sidePreviewButton;
NSMenu *sideTemplatePreviewMenu;
-#pragma mark Preview variables
+#pragma mark Bottom preview variables
- IBOutlet NSTextView *previewTextView;
- IBOutlet NSView *currentPreviewView;
+ IBOutlet NSTextView *bottomPreviewTextView;
+ IBOutlet NSView *currentBottomPreviewView;
BDSKPreviewer *previewer;
BDSKEdgeView *previewerBox;
BDSKZoomablePDFView *previewPdfView;
BDSKEdgeView *previewBox;
FileView *bottomFileView;
- int previewDisplay;
- NSString *previewDisplayTemplate;
+ int bottomPreviewDisplay;
+ NSString *bottomPreviewDisplayTemplate;
- IBOutlet NSSegmentedControl *previewButton;
- NSMenu *templatePreviewMenu;
+ IBOutlet NSSegmentedControl *bottomPreviewButton;
+ NSMenu *bottomTemplatePreviewMenu;
#pragma mark Toolbar variables
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2008-03-05 19:12:47 UTC (rev 12974)
+++ trunk/bibdesk/BibDocument.m 2008-03-05 19:41:18 UTC (rev 12975)
@@ -225,8 +225,8 @@
pboardHelper = [[BDSKItemPasteboardHelper alloc] init];
[pboardHelper setDelegate:self];
- previewDisplay = BDSKPreviewDisplayText;
- previewDisplayTemplate = [[[OFPreferenceWrapper
sharedPreferenceWrapper] stringForKey:BDSKPreviewTemplateStyleKey] retain];
+ bottomPreviewDisplay = BDSKPreviewDisplayText;
+ bottomPreviewDisplayTemplate = [[[OFPreferenceWrapper
sharedPreferenceWrapper] stringForKey:BDSKPreviewTemplateStyleKey] retain];
sidePreviewDisplay = BDSKPreviewDisplayFiles;
sidePreviewDisplayTemplate = [[[OFPreferenceWrapper
sharedPreferenceWrapper] stringForKey:BDSKPreviewTemplateStyleKey] retain];
@@ -305,14 +305,14 @@
[toolbarItems release];
[statusBar release];
[[tableView enclosingScrollView] release];
- [[previewTextView enclosingScrollView] release];
+ [[bottomPreviewTextView enclosingScrollView] release];
[[bottomFileView enclosingScrollView] release];
- [[fileView enclosingScrollView] release];
+ [[sideFileView enclosingScrollView] release];
[[sidePreviewTextView enclosingScrollView] release];
[previewer release];
[previewerBox release];
[previewBox release];
- [previewDisplayTemplate release];
+ [bottomPreviewDisplayTemplate release];
[sidePreviewDisplayTemplate release];
[macroWC release];
[infoWC release];
@@ -429,13 +429,13 @@
[[mainBox superview] addSubview:statusBar
positioned:NSWindowBelow relativeTo:nil];
}
[statusBar
setProgressIndicatorStyle:BDSKProgressIndicatorSpinningStyle];
- [statusBar setTextOffset:NSMaxX([previewButton frame]) - 2.0];
+ [statusBar setTextOffset:NSMaxX([bottomPreviewButton frame]) - 2.0];
- templatePreviewMenu = [[[NSMenu allocWithZone:[NSMenu menuZone]] init]
autorelease];
- [templatePreviewMenu setDelegate:self];
- [previewButton setMenu:templatePreviewMenu forSegment:0];
- [previewButton setEnabled:[pw boolForKey:BDSKUsesTeXKey]
forSegment:BDSKPreviewDisplayTeX];
- [previewButton selectSegmentWithTag:previewDisplay];
+ bottomTemplatePreviewMenu = [[[NSMenu allocWithZone:[NSMenu menuZone]]
init] autorelease];
+ [bottomTemplatePreviewMenu setDelegate:self];
+ [bottomPreviewButton setMenu:bottomTemplatePreviewMenu forSegment:0];
+ [bottomPreviewButton setEnabled:[pw boolForKey:BDSKUsesTeXKey]
forSegment:BDSKPreviewDisplayTeX];
+ [bottomPreviewButton selectSegmentWithTag:bottomPreviewDisplay];
sideTemplatePreviewMenu = [[[NSMenu allocWithZone:[NSMenu menuZone]] init]
autorelease];
[sideTemplatePreviewMenu setDelegate:self];
@@ -489,7 +489,7 @@
[[tableView enclosingScrollView] retain];
[[tableView enclosingScrollView] setFrame:[mainView bounds]];
- [[previewTextView enclosingScrollView] retain];
+ [[bottomPreviewTextView enclosingScrollView] retain];
// TableView setup
[tableView removeAllTableColumns];
@@ -511,18 +511,18 @@
[tableView registerForDraggedTypes:dragTypes];
[groupTableView registerForDraggedTypes:dragTypes];
- [fileView setBackgroundColor:[[fileView enclosingScrollView]
backgroundColor]];
+ [sideFileView setBackgroundColor:[[sideFileView enclosingScrollView]
backgroundColor]];
[fileCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask];
[fileCollapsibleView setMinSize:NSMakeSize(65.0, 20.0)];
[fileGradientView setUpperColor:[NSColor colorWithCalibratedWhite:0.9
alpha:1.0]];
[fileGradientView setLowerColor:[NSColor colorWithCalibratedWhite:0.75
alpha:1.0]];
- [fileView setIconScale:[[OFPreferenceWrapper sharedPreferenceWrapper]
floatForKey:BDSKMainFileViewIconScaleKey]];
- [fileView setAutoScales:YES];
- [fileView addObserver:self forKeyPath:@"iconScale" options:0 context:NULL];
+ [sideFileView setIconScale:[[OFPreferenceWrapper sharedPreferenceWrapper]
floatForKey:BDSKMainFileViewIconScaleKey]];
+ [sideFileView setAutoScales:YES];
+ [sideFileView addObserver:self forKeyPath:@"iconScale" options:0
context:NULL];
- currentSidePreviewView = [fileView enclosingScrollView];
+ currentSidePreviewView = [sideFileView enclosingScrollView];
[currentSidePreviewView retain];
// ImagePopUpButtons setup
@@ -632,9 +632,9 @@
[pboardHelper release];
pboardHelper = nil;
- [fileView removeObserver:self forKeyPath:@"iconScale"];
- [fileView setDataSource:nil];
- [fileView setDelegate:nil];
+ [sideFileView removeObserver:self forKeyPath:@"iconScale"];
+ [sideFileView setDataSource:nil];
+ [sideFileView setDelegate:nil];
// safety call here, in case the pasteboard is retaining the document; we
don't want notifications after the window closes, since all the pointers to UI
elements will be garbage
[[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -2733,7 +2733,7 @@
tag = BDSKDetailsPreviewDisplay;
else if (tag == BDSKRTFPreviewDisplay)
tag = BDSKPDFPreviewDisplay;
- [previewButton selectSegmentWithTag:tag];
+ [bottomPreviewButton selectSegmentWithTag:tag];
}
*/
}
@@ -2748,7 +2748,7 @@
}
- (void)handleUsesTeXChangedNotification:(NSNotification *)notification{
- [previewButton setEnabled:[[OFPreferenceWrapper sharedPreferenceWrapper]
boolForKey:BDSKUsesTeXKey] forSegment:BDSKPreviewDisplayTeX];
+ [bottomPreviewButton setEnabled:[[OFPreferenceWrapper
sharedPreferenceWrapper] boolForKey:BDSKUsesTeXKey]
forSegment:BDSKPreviewDisplayTeX];
}
- (void)handleBibItemAddDelNotification:(NSNotification *)notification{
@@ -2999,8 +2999,8 @@
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (object == fileView && [keyPath isEqualToString:@"iconScale"]) {
- [[OFPreferenceWrapper sharedPreferenceWrapper] setFloat:[fileView
iconScale] forKey:BDSKMainFileViewIconScaleKey];
+ if (object == sideFileView && [keyPath isEqualToString:@"iconScale"]) {
+ [[OFPreferenceWrapper sharedPreferenceWrapper] setFloat:[sideFileView
iconScale] forKey:BDSKMainFileViewIconScaleKey];
} else {
[super observeValueForKeyPath:keyPath ofObject:object change:change
context:context];
}
@@ -3057,11 +3057,11 @@
// may be the pdflatex or latex2rtf generated preview
NSView *view = (NSView *)previewerBox;
- if(currentPreviewView != view){
- [view setFrame:[currentPreviewView frame]];
- [[currentPreviewView superview] replaceSubview:currentPreviewView
with:view];
- currentPreviewView = view;
- [[previewer progressOverlay] overlayView:currentPreviewView];
+ if(currentBottomPreviewView != view){
+ [view setFrame:[currentBottomPreviewView frame]];
+ [[currentBottomPreviewView superview]
replaceSubview:currentBottomPreviewView with:view];
+ currentBottomPreviewView = view;
+ [[previewer progressOverlay] overlayView:currentBottomPreviewView];
}
[self updatePreviewer:previewer];
@@ -3070,22 +3070,22 @@
- (void)displayErrorMessageInPreviewTextView:(NSString *)errorMessage{
NSParameterAssert(errorMessage != nil);
// make sure we have the correct view in place (NSTextView)
- NSView *view = [previewTextView enclosingScrollView];
+ NSView *view = [bottomPreviewTextView enclosingScrollView];
[[previewer progressOverlay] remove];
[previewer updateWithBibTeXString:nil];
- if(currentPreviewView != view){
- [view setFrame:[currentPreviewView frame]];
- [[currentPreviewView superview] replaceSubview:currentPreviewView
with:view];
- currentPreviewView = view;
+ if(currentBottomPreviewView != view){
+ [view setFrame:[currentBottomPreviewView frame]];
+ [[currentBottomPreviewView superview]
replaceSubview:currentBottomPreviewView with:view];
+ currentBottomPreviewView = view;
}
NSFont *font = [NSFontManager bodyFontForFamily:[[OFPreferenceWrapper
sharedPreferenceWrapper] objectForKey:BDSKPreviewPaneFontFamilyKey]];
NSAttributedString *attrString = [[NSAttributedString alloc]
initWithString:errorMessage attributeName:NSFontAttributeName
attributeValue:font];
- [[previewTextView textStorage] setAttributedString:attrString];
+ [[bottomPreviewTextView textStorage] setAttributedString:attrString];
[attrString release];
}
- (void)displayLinkedFileInPreviewPane{
- NSView *view = [previewTextView enclosingScrollView];
+ NSView *view = [bottomPreviewTextView enclosingScrollView];
[[previewer progressOverlay] remove];
[previewer updateWithBibTeXString:nil];
@@ -3109,10 +3109,10 @@
[previewPdfView release];
}
view = previewBox;
- if(currentPreviewView != view){
- [view setFrame:[currentPreviewView frame]];
- [[currentPreviewView superview]
replaceSubview:currentPreviewView with:view];
- currentPreviewView = view;
+ if(currentBottomPreviewView != view){
+ [view setFrame:[currentBottomPreviewView frame]];
+ [[currentBottomPreviewView superview]
replaceSubview:currentBottomPreviewView with:view];
+ currentBottomPreviewView = view;
}
// if it's an image, first convert it to PDF
@@ -3167,10 +3167,10 @@
} else {
// if it's not PDF/PS or an image, try reading it with
NSAttributedString, which handles a variety of common formats
- if(currentPreviewView != view){
- [view setFrame:[currentPreviewView frame]];
- [[currentPreviewView superview]
replaceSubview:currentPreviewView with:view];
- currentPreviewView = view;
+ if(currentBottomPreviewView != view){
+ [view setFrame:[currentBottomPreviewView frame]];
+ [[currentBottomPreviewView superview]
replaceSubview:currentBottomPreviewView with:view];
+ currentBottomPreviewView = view;
}
NSError *nsError;
@@ -3178,7 +3178,7 @@
if (nil == attrString) {
[self displayErrorMessageInPreviewTextView:([nsError
localizedFailureReason] ? [nsError localizedFailureReason] : [nsError
localizedDescription])];
} else {
- [[previewTextView textStorage] setAttributedString:attrString];
+ [[bottomPreviewTextView textStorage]
setAttributedString:attrString];
[attrString release];
}
}
@@ -3213,12 +3213,12 @@
}
NSView *view = [bottomFileView enclosingScrollView];
- if(currentPreviewView != view){
+ if(currentBottomPreviewView != view){
[[previewer progressOverlay] remove];
[previewer updateWithBibTeXString:nil];
- [view setFrame:[currentPreviewView frame]];
- [[currentPreviewView superview] replaceSubview:currentPreviewView
with:view];
- currentPreviewView = view;
+ [view setFrame:[currentBottomPreviewView frame]];
+ [[currentBottomPreviewView superview]
replaceSubview:currentBottomPreviewView with:view];
+ currentBottomPreviewView = view;
}
}
@@ -3227,17 +3227,17 @@
//int displayType = [[OFPreferenceWrapper sharedPreferenceWrapper]
integerForKey:BDSKPreviewDisplayKey];
- NSView *view = [previewTextView enclosingScrollView];
+ NSView *view = [bottomPreviewTextView enclosingScrollView];
- if(currentPreviewView != view){
+ if(currentBottomPreviewView != view){
[[previewer progressOverlay] remove];
[previewer updateWithBibTeXString:nil];
- [view setFrame:[currentPreviewView frame]];
- [[currentPreviewView superview] replaceSubview:currentPreviewView
with:view];
- currentPreviewView = view;
+ [view setFrame:[currentBottomPreviewView frame]];
+ [[currentBottomPreviewView superview]
replaceSubview:currentBottomPreviewView with:view];
+ currentBottomPreviewView = view;
}
- if(NSIsEmptyRect([previewTextView visibleRect]))
+ if(NSIsEmptyRect([bottomPreviewTextView visibleRect]))
return;
/*
@@ -3260,13 +3260,13 @@
if (maxItems > 0 && [items count] > maxItems)
items = [items subarrayWithRange:NSMakeRange(0, maxItems)];
- NSTextStorage *textStorage = [previewTextView textStorage];
+ NSTextStorage *textStorage = [bottomPreviewTextView textStorage];
// do this _before_ messing with the text storage; otherwise you can have
a leftover selection that ends up being out of range
NSRange zeroRange = NSMakeRange(0, 0);
static NSArray *zeroRanges = nil;
if(!zeroRanges) zeroRanges = [[NSArray alloc] initWithObjects:[NSValue
valueWithRange:zeroRange], nil];
- [previewTextView setSelectedRanges:zeroRanges];
+ [bottomPreviewTextView setSelectedRanges:zeroRanges];
NSLayoutManager *layoutManager = [[textStorage layoutManagers] lastObject];
[layoutManager retain];
@@ -3324,7 +3324,7 @@
case BDSKTemplatePreviewDisplay:
*/
{
- BDSKTemplate *template = [BDSKTemplate
templateForStyle:previewDisplayTemplate];
+ BDSKTemplate *template = [BDSKTemplate
templateForStyle:bottomPreviewDisplayTemplate];
if (template == nil)
template = [BDSKTemplate templateForStyle:[BDSKTemplate
defaultStyleNameForFileType:@"rtf"]];
NSAttributedString *templateString;
@@ -3352,13 +3352,13 @@
[layoutManager release];
if([NSString isEmptyString:[searchField stringValue]] == NO)
- [previewTextView highlightComponentsOfSearchString:[searchField
stringValue]];
+ [bottomPreviewTextView highlightComponentsOfSearchString:[searchField
stringValue]];
}
- (void)updatePreviewPane{
- if(previewDisplay == BDSKPreviewDisplayTeX){
+ if(bottomPreviewDisplay == BDSKPreviewDisplayTeX){
[self displayTeXPreviewInPreviewPane];
- }else if(previewDisplay == BDSKPreviewDisplayFiles){
+ }else if(bottomPreviewDisplay == BDSKPreviewDisplayFiles){
[self displayFileViewInPreviewPane];
}else{
[self displayAttributedTextPreviewInPreviewPane];
@@ -3366,7 +3366,7 @@
}
- (void)displayFileViewInSidePreviewPane{
- NSView *view = [fileView enclosingScrollView];
+ NSView *view = [sideFileView enclosingScrollView];
if(currentSidePreviewView != view){
[view setFrame:[currentSidePreviewView frame]];
[[currentSidePreviewView superview]
replaceSubview:currentSidePreviewView with:view];
@@ -3511,7 +3511,7 @@
[shownFiles release];
shownFiles = nil;
- [fileView reloadIcons];
+ [sideFileView reloadIcons];
[bottomFileView reloadIcons];
}
@@ -3786,7 +3786,7 @@
#pragma mark Template Menu
- (void)menuNeedsUpdate:(NSMenu *)menu {
- if (menu == templatePreviewMenu || menu == sideTemplatePreviewMenu) {
+ if (menu == bottomTemplatePreviewMenu || menu == sideTemplatePreviewMenu) {
NSMutableArray *styles = [NSMutableArray arrayWithArray:[BDSKTemplate
allStyleNamesForFileType:@"rtf"]];
[styles addObjectsFromArray:[BDSKTemplate
allStyleNamesForFileType:@"rtfd"]];
[styles addObjectsFromArray:[BDSKTemplate
allStyleNamesForFileType:@"doc"]];
@@ -3798,7 +3798,7 @@
NSEnumerator *styleEnum = [styles objectEnumerator];
NSString *style;
NSMenuItem *item;
- SEL action = menu == templatePreviewMenu ?
@selector(changePreviewDisplay:) : @selector(changeSidePreviewDisplay:);
+ SEL action = menu == bottomTemplatePreviewMenu ?
@selector(changePreviewDisplay:) : @selector(changeSidePreviewDisplay:);
while (style = [styleEnum nextObject]) {
item = [menu addItemWithTitle:style action:action
keyEquivalent:@""];
@@ -3813,31 +3813,29 @@
#pragma mark Printing support
- (IBAction)printDocument:(id)sender{
- if([currentPreviewView isEqual:previewerBox])
- [[previewer pdfView] printWithInfo:[self printInfo] autoRotate:NO];
- else if([currentPreviewView isEqual:previewBox])
- [previewPdfView printWithInfo:[self printInfo] autoRotate:NO];
+ if (bottomPreviewDisplay == BDSKPreviewDisplayTeX)
+ [[previewer pdfView] printWithInfo:[self printInfo] autoRotate:YES];
else
[super printDocument:sender];
}
- (NSView *)printableView{
id printableView = nil;
- if(previewDisplay == BDSKPreviewDisplayTeX){
+ if (bottomPreviewDisplay == BDSKPreviewDisplayTeX) {
// we don't reach this, we let the pdfView do the printing
printableView = [previewer pdfView];
- }else if(previewDisplay == BDSKPreviewDisplayText || sidePreviewDisplay ==
BDSKPreviewDisplayText){
+ } else if(bottomPreviewDisplay == BDSKPreviewDisplayText ||
sidePreviewDisplay == BDSKPreviewDisplayText) {
printableView = [[[BDSKPrintableView alloc] initForScreenDisplay:NO]
autorelease];
NSTextStorage *ts = nil;
- if (previewDisplay == BDSKPreviewDisplayText)
- ts = [previewTextView textStorage];
+ if (bottomPreviewDisplay == BDSKPreviewDisplayText)
+ ts = [bottomPreviewTextView textStorage];
else
ts = [sidePreviewTextView textStorage];
if (ts)
[printableView setAttributedString:ts];
else
[printableView setString:NSLocalizedString(@"Error: nothing to
print from document preview", @"printing error")];
- [printableView setAttributedString:[previewTextView textStorage]];
+ [printableView setAttributedString:[bottomPreviewTextView
textStorage]];
}
return printableView;
}
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2008-03-05 19:12:47 UTC (rev 12974)
+++ trunk/bibdesk/BibDocument_Actions.m 2008-03-05 19:41:18 UTC (rev 12975)
@@ -1087,19 +1087,19 @@
NSString *style = [sender respondsToSelector:@selector(representedObject)]
? [sender representedObject] : nil;
BOOL changed = NO;
- if (previewDisplay != tag) {
- previewDisplay = tag;
+ if (bottomPreviewDisplay != tag) {
+ bottomPreviewDisplay = tag;
changed = YES;
}
- if (tag == BDSKPreviewDisplayText && style && NO == [style
isEqualToString:previewDisplayTemplate]) {
- [previewDisplayTemplate release];
- previewDisplayTemplate = [style retain];
+ if (tag == BDSKPreviewDisplayText && style && NO == [style
isEqualToString:bottomPreviewDisplayTemplate]) {
+ [bottomPreviewDisplayTemplate release];
+ bottomPreviewDisplayTemplate = [style retain];
changed = YES;
}
if (changed) {
[self updatePreviewPane];
- if ([sender isEqual:previewButton] == NO)
- [previewButton selectSegmentWithTag:previewDisplay];
+ if ([sender isEqual:bottomPreviewButton] == NO)
+ [bottomPreviewButton selectSegmentWithTag:bottomPreviewDisplay];
}
}
@@ -1127,12 +1127,12 @@
- (void)pageDownInPreview:(id)sender{
NSScrollView *scrollView = nil;
- if([currentPreviewView isEqual:previewerBox])
+ if (bottomPreviewDisplay == BDSKPreviewDisplayText)
+ scrollView = [bottomPreviewTextView enclosingScrollView];
+ else if (bottomPreviewDisplay == BDSKPreviewDisplayFiles)
+ scrollView = [bottomFileView scrollView];
+ else if (bottomPreviewDisplay == BDSKPreviewDisplayTeX)
scrollView = [(BDSKZoomablePDFView *)[previewer pdfView] scrollView];
- else if([currentPreviewView isEqual:previewBox])
- scrollView = [previewPdfView scrollView];
- else
- scrollView = (NSScrollView *)currentPreviewView;
NSPoint p = [[scrollView documentView] scrollPositionAsPercentage];
@@ -1152,12 +1152,12 @@
- (void)pageUpInPreview:(id)sender{
NSScrollView *scrollView = nil;
- if([currentPreviewView isEqual:previewerBox])
+ if (bottomPreviewDisplay == BDSKPreviewDisplayText)
+ scrollView = [bottomPreviewTextView enclosingScrollView];
+ else if (bottomPreviewDisplay == BDSKPreviewDisplayFiles)
+ scrollView = [bottomFileView scrollView];
+ else if (bottomPreviewDisplay == BDSKPreviewDisplayTeX)
scrollView = [(BDSKZoomablePDFView *)[previewer pdfView] scrollView];
- else if([currentPreviewView isEqual:previewBox])
- scrollView = [previewPdfView scrollView];
- else
- scrollView = (NSScrollView *)currentPreviewView;
NSPoint p = [[scrollView documentView] scrollPositionAsPercentage];
Modified: trunk/bibdesk/BibDocument_Search.m
===================================================================
--- trunk/bibdesk/BibDocument_Search.m 2008-03-05 19:12:47 UTC (rev 12974)
+++ trunk/bibdesk/BibDocument_Search.m 2008-03-05 19:41:18 UTC (rev 12975)
@@ -359,14 +359,11 @@
- (NSString *)selectedStringForFind;
{
- if([currentPreviewView isHidden])
- return nil;
- if([currentPreviewView isEqual:previewerBox]){
+ // @@ check for hidden?
+ if (bottomPreviewDisplay == BDSKPreviewDisplayTeX) {
return [[[previewer pdfView] currentSelection] string];
- }else if([currentPreviewView isEqual:previewBox]){
- return [[previewPdfView currentSelection] string];
- }else{
- NSTextView *textView = (NSTextView *)[(NSScrollView
*)currentPreviewView documentView];
+ } else if (bottomPreviewDisplay == BDSKPreviewDisplayText ||
sidePreviewDisplay == BDSKPreviewDisplayText) {
+ NSTextView *textView = bottomPreviewDisplay == BDSKPreviewDisplayText
? bottomPreviewTextView : sidePreviewTextView;
NSRange selRange = [textView selectedRange];
if (selRange.location == NSNotFound)
return nil;
@@ -378,8 +375,10 @@
// OAFindControllerAware informal protocol
- (id <OAFindControllerTarget>)omniFindControllerTarget;
{
- if([currentPreviewView isKindOfClass:[NSScrollView class]] &&
[currentPreviewView isHidden] == NO)
- return [(NSScrollView *)currentPreviewView documentView];
+ if (bottomPreviewDisplay == BDSKPreviewDisplayText)
+ return bottomPreviewTextView;
+ else if (sidePreviewDisplay == BDSKPreviewDisplayText)
+ return sidePreviewTextView;
else
return nil;
}
@@ -391,8 +390,10 @@
case NSFindPanelActionShowFindPanel:
case NSFindPanelActionNext:
case NSFindPanelActionPrevious:
- if([currentPreviewView isKindOfClass:[NSScrollView class]] &&
[currentPreviewView isHidden] == NO)
- [(NSTextView *)[(NSScrollView *)currentPreviewView
documentView] performFindPanelAction:sender];
+ if (bottomPreviewDisplay == BDSKPreviewDisplayText)
+ [bottomPreviewTextView performFindPanelAction:sender];
+ else if (sidePreviewDisplay == BDSKPreviewDisplayText)
+ [sidePreviewTextView performFindPanelAction:sender];
else
NSBeep();
break;
@@ -406,7 +407,10 @@
[searchField selectText:nil];
} else {
[[BDSKFindController sharedFindController]
setFindString:selString];
- [previewTextView performFindPanelAction:sender];
+ if (bottomPreviewDisplay == BDSKPreviewDisplayText)
+ [bottomPreviewTextView performFindPanelAction:sender];
+ else if (sidePreviewDisplay == BDSKPreviewDisplayText)
+ [sidePreviewTextView performFindPanelAction:sender];
}
break;
default:
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib 2008-03-05
19:12:47 UTC (rev 12974)
+++ trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib 2008-03-05
19:41:18 UTC (rev 12975)
@@ -175,13 +175,14 @@
OUTLETS = {
actionMenu = NSMenu;
actionMenuButton = BDSKImagePopUpButton;
- currentPreviewView = NSView;
+ bottomPreviewButton = NSSegmentedControl;
+ bottomPreviewTextView = NSTextView;
+ currentBottomPreviewView = NSView;
documentWindow = NSWindow;
exportAccessoryView = NSView;
exportSelectionCheckButton = NSButton;
fileCollapsibleView = BDSKCollapsibleView;
fileGradientView = BDSKGradientView;
- fileView = FileView;
groupActionButton = BDSKImagePopUpButton;
groupActionMenuButton = BDSKImagePopUpButton;
groupAddButton = NSButton;
@@ -192,14 +193,13 @@
groupTableView = BDSKGroupTableView;
mainBox = BDSKColoredBox;
mainView = NSView;
- previewButton = NSSegmentedControl;
- previewTextView = NSTextView;
saveAccessoryView = NSView;
saveTextEncodingPopupButton = BDSKEncodingPopUpButton;
searchBookmarkField = NSTextField;
searchBookmarkPopUp = NSPopUpButton;
searchBookmarkSheet = NSWindow;
searchField = NSSearchField;
+ sideFileView = FileView;
sidePreviewButton = NSSegmentedControl;
splitView = BDSKSplitView;
statusBar = BDSKStatusBar;
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.nib/info.nib 2008-03-05
19:12:47 UTC (rev 12974)
+++ trunk/bibdesk/English.lproj/BibDocument.nib/info.nib 2008-03-05
19:41:18 UTC (rev 12975)
@@ -20,8 +20,8 @@
<key>IBOpenObjects</key>
<array>
<integer>433</integer>
+ <integer>5</integer>
<integer>819</integer>
- <integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>9C31</string>
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
