Revision: 6993
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6993&view=rev
Author:   hofman
Date:     2010-12-19 22:34:39 +0000 (Sun, 19 Dec 2010)

Log Message:
-----------
don't set first and last page in printing, because that resets the Print All 
Pages flags, and with that flag the values are ignored

Modified Paths:
--------------
    trunk/SKMainDocument.m

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2010-12-19 22:26:09 UTC (rev 6992)
+++ trunk/SKMainDocument.m      2010-12-19 22:34:39 UTC (rev 6993)
@@ -209,6 +209,7 @@
     [printDict setValue:[NSNumber numberWithInteger:kPDFPrintPageScaleNone] 
forKey:@"PDFPrintScalingMode"];
     [printDict setValue:[NSNumber numberWithInteger:1] 
forKey:NSPrintFirstPage];
     [printDict setValue:[NSNumber numberWithInteger:1] forKey:NSPrintLastPage];
+    [printDict setValue:[NSNumber numberWithBool:YES] forKey:NSPrintAllPages];
     [self setPrintInfo:printInfo];
     
     [self setDataFromTmpData];
@@ -1751,15 +1752,10 @@
 
 - (NSPrintInfo *)printInfo {
     NSPrintInfo *printInfo = [super printInfo];
-    NSUInteger pageCount = [[self pdfDocument] pageCount];
-    if (pageCount) {
+    if ([[self pdfDocument] pageCount]) {
         PDFPage *page = [[self pdfDocument] pageAtIndex:0];
         NSSize pageSize = [page boundsForBox:kPDFDisplayBoxMediaBox].size;
         BOOL isLandscape = [page rotation] % 180 == 90 ? pageSize.height > 
pageSize.width : pageSize.width > pageSize.height;
-        
-        [[printInfo dictionary] setValue:[NSNumber numberWithInteger:1] 
forKey:NSPrintFirstPage];
-        [[printInfo dictionary] setValue:[NSNumber 
numberWithInteger:pageCount] forKey:NSPrintLastPage];
-        [[printInfo dictionary] setValue:[NSNumber numberWithBool:YES] 
forKey:@"PDFPrintAutoRotate"];
         [printInfo setOrientation:isLandscape ? NSLandscapeOrientation : 
NSPortraitOrientation];
     }
     return printInfo;
@@ -2036,8 +2032,13 @@
             [settings setObject:[NSNumber numberWithBool:[value intValue] == 
'lwdt'] forKey:NSPrintDetailedErrorReporting];
         if ((value = [settings objectForKey:NSPrintPrinterName]) && (value = 
[NSPrinter printerWithName:value]))
             [settings setObject:value forKey:NSPrintPrinter];
-        if ([settings objectForKey:NSPrintFirstPage] || [settings 
objectForKey:NSPrintLastPage])
+        if ([settings objectForKey:NSPrintFirstPage] || [settings 
objectForKey:NSPrintLastPage]) {
             [settings setObject:[NSNumber numberWithBool:NO] 
forKey:NSPrintAllPages];
+            if ([settings objectForKey:NSPrintFirstPage] == nil)
+                [settings setObject:[NSNumber numberWithInteger:1] 
forKey:NSPrintFirstPage];
+            if ([settings objectForKey:NSPrintLastPage] == nil)
+                [settings setObject:[NSNumber numberWithInteger:[[self 
pdfDocument] pageCount]] forKey:NSPrintLastPage];
+        }
         [[printInfo dictionary] addEntriesFromDictionary:settings];
     }
     


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to