Revision: 12969
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12969&view=rev
Author: hofman
Date: 2008-03-05 02:45:36 -0800 (Wed, 05 Mar 2008)
Log Message:
-----------
Fix printing for new preview setup and remove/comment out some old preview code.
Modified Paths:
--------------
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_Actions.m
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2008-03-05 10:30:59 UTC (rev 12968)
+++ trunk/bibdesk/BibDocument.m 2008-03-05 10:45:36 UTC (rev 12969)
@@ -435,10 +435,12 @@
[templatePreviewMenu setDelegate:self];
[previewButton setMenu:templatePreviewMenu forSegment:0];
[previewButton setEnabled:[pw boolForKey:BDSKUsesTeXKey]
forSegment:BDSKPreviewDisplayTeX];
+ [previewButton selectSegmentWithTag:previewDisplay];
sideTemplatePreviewMenu = [[[NSMenu allocWithZone:[NSMenu menuZone]] init]
autorelease];
[sideTemplatePreviewMenu setDelegate:self];
[sidePreviewButton setMenu:sideTemplatePreviewMenu forSegment:0];
+ [sidePreviewButton selectSegmentWithTag:sidePreviewDisplay];
// This must also be done before we resize the window and the splitViews
[groupCollapsibleView setCollapseEdges:BDSKMinXEdgeMask];
@@ -2719,9 +2721,9 @@
}
- (void)handlePreviewDisplayChangedNotification:(NSNotification *)notification{
- return;
// note: this is only supposed to handle the pretty-printed preview, /not/
the TeX preview
// don't update if the note was posted by editors that don't belong to us
+ /*
if ([notification object] == self || [notification object] == nil) {
[self updatePreviewPane];
[self updateSidePreviewPane];
@@ -2733,6 +2735,7 @@
tag = BDSKPDFPreviewDisplay;
[previewButton selectSegmentWithTag:tag];
}
+ */
}
- (void)handleTeXPreviewNeedsUpdateNotification:(NSNotification *)notification{
@@ -3819,29 +3822,24 @@
}
- (NSView *)printableView{
- int displayType = [[OFPreferenceWrapper sharedPreferenceWrapper]
integerForKey:BDSKPreviewDisplayKey];
- if(displayType == BDSKPDFPreviewDisplay || displayType ==
BDSKLinkedFilePreviewDisplay){
+ id printableView = nil;
+ if(previewDisplay == BDSKPreviewDisplayTeX){
// we don't reach this, we let the pdfView do the printing
- return currentPreviewView;
- }else if(displayType == BDSKRTFPreviewDisplay){
- // user reported an NSBigMutableString nil replacement exception when
printing; it's not immediately clear which view he was printing, or under what
conditions it returns nil, so we'll check for this and print an error
- BDSKPrintableView *printableView = [[BDSKPrintableView alloc]
initForScreenDisplay:NO];
- NSTextStorage *ts = [[previewer textView] textStorage];
- if (ts)
- [printableView setAttributedString:ts];
+ printableView = [previewer pdfView];
+ }else if(previewDisplay == BDSKPreviewDisplayTemplate ||
sidePreviewDisplay == BDSKPreviewDisplayTemplate){
+ printableView = [[[BDSKPrintableView alloc] initForScreenDisplay:NO]
autorelease];
+ NSTextStorage *ts = nil;
+ if (previewDisplay == BDSKPreviewDisplayTemplate)
+ ts = [previewTextView textStorage];
else
- [printableView setString:NSLocalizedString(@"Error: nothing to
print from latex2rtf preview", @"printing error")];
- return [printableView autorelease];
- }else{
- BDSKPrintableView *printableView = [[BDSKPrintableView alloc]
initForScreenDisplay:NO];
- NSTextStorage *ts = [previewTextView textStorage];
+ 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]];
- return [printableView autorelease];
}
+ return printableView;
}
- (NSPrintOperation *)printOperationWithSettings:(NSDictionary *)printSettings
error:(NSError **)outError {
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2008-03-05 10:30:59 UTC (rev 12968)
+++ trunk/bibdesk/BibDocument_Actions.m 2008-03-05 10:45:36 UTC (rev 12969)
@@ -1081,26 +1081,8 @@
if (firstResponder != groupTableView)
[documentWindow makeFirstResponder:groupTableView];
}
-/*
+
- (IBAction)changePreviewDisplay:(id)sender{
- int tag = [sender tag];
- NSString *style = [sender representedObject];
- OFPreferenceWrapper *pw = [OFPreferenceWrapper sharedPreferenceWrapper];
- BOOL didChange = NO;
-
- if(tag != [pw integerForKey:BDSKPreviewDisplayKey]){
- [pw setInteger:tag forKey:BDSKPreviewDisplayKey];
- didChange = YES;
- }
- if(BDSKTemplatePreviewDisplay == tag && NO == [style isEqualToString:[pw
stringForKey:BDSKPreviewTemplateStyleKey]]){
- [pw setObject:style forKey:BDSKPreviewTemplateStyleKey];
- didChange = YES;
- }
- if (didChange)
- [[NSNotificationCenter defaultCenter]
postNotificationName:BDSKPreviewDisplayChangedNotification object:nil];
-}
-*/
-- (IBAction)changePreviewDisplay:(id)sender{
int tag = [sender respondsToSelector:@selector(selectedSegment)] ?
[[sender cell] tagForSegment:[sender selectedSegment]] : [sender tag];
NSString *style = [sender respondsToSelector:@selector(representedObject)]
? [sender representedObject] : nil;
BOOL changed = NO;
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
