Attachment #93808 for bug #224387

Lines 49-54 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/PrintHelper.java (+9 lines)
49		49
50	options.setCopies(1);	50	options.setCopies(1);
51	options.setCollate(false);	51	options.setCollate(false);
		52
		53	options.setQualityHigh(true);
		54	options.setSideOneSided(true);
		55	options.setChromaticityColor(true);
		56
52	}	57	}
53		58
54	/*	59	/*
Lines 134-138 Link Here
134	// TODO Not supported by the JPS dialog	139	// TODO Not supported by the JPS dialog
135	return false;	140	return false;
136	}	141	}
		142
		143	public PrintOptions getPrintOptions(){
		144	return options;
		145	}
137		146
138	}	147	}

Lines 33-38 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintOptions.java (+127 lines)
33		33
34	public static String PROPERTY_COPIES = "copies"; //$NON-NLS-1$	34	public static String PROPERTY_COPIES = "copies"; //$NON-NLS-1$
35	public static String PROPERTY_COLLATE = "collate"; //$NON-NLS-1$	35	public static String PROPERTY_COLLATE = "collate"; //$NON-NLS-1$
		36
		37	public static String PROPERTY_QUALITY_HIGH = "qualityHigh"; //$NON-NLS-1$
		38	public static String PROPERTY_QUALITY_LOW = "qualityLow"; //$NON-NLS-1$
		39	public static String PROPERTY_QUALITY_MED = "qualityMed"; //$NON-NLS-1$
		40	public static String PROPERTY_CHROMATICITY_MONO = "chromaticityMono"; //$NON-NLS-1$
		41	public static String PROPERTY_CHROMATICITY_COLOR = "chromaticityColor"; //$NON-NLS-1$
		42	public static String PROPERTY_SIDES_ONESIDED = "sideOneSided"; //$NON-NLS-1$
		43	public static String PROPERTY_SIDES_TUMBLE = "sideTumble"; //$NON-NLS-1$
		44	public static String PROPERTY_SIDES_DUPLEX = "sideDuplex"; //$NON-NLS-1$
		45
		46	public static String PROPERTY_JOB_NAME = "jobName"; //$NON-NLS-1$
		47	public static String PROPERTY_USER_NAME = "userName"; //$NON-NLS-1$
36		48
37	private PrintDestination destination;	49	private PrintDestination destination;
38		50
Lines 48-53 Link Here
48	private int copies;	60	private int copies;
49	private boolean collate;	61	private boolean collate;
50		62
		63	private boolean qualityHigh;
		64	private boolean qualityLow;
		65	private boolean qualityMed;
		66
		67	private boolean chromaticityColor;
		68	private boolean chromaticityMono;
		69
		70	private boolean sideOneSided;
		71	private boolean sideTumble;
		72	private boolean sideDuplex;
		73
		74	private String jobName;
		75	private String userName;
		76
51	public PrintOptions() {	77	public PrintOptions() {
52	super();	78	super();
53	}	79	}
Lines 71-76 Link Here
71	this.percentScaling = percentScaling;	97	this.percentScaling = percentScaling;
72	firePropertyChange(PROPERTY_PERCENT_SCALING, oldScaling, percentScaling);	98	firePropertyChange(PROPERTY_PERCENT_SCALING, oldScaling, percentScaling);
73	}	99	}
		100	public String getJobName() {
		101	return jobName;
		102	}
		103
		104	public void setJobName(String name) {
		105	String oldName = this.jobName;
		106	this.jobName = name;
		107	firePropertyChange(PROPERTY_JOB_NAME, oldName, name);
		108	}
		109
		110	public String getUserName() {
		111	return userName;
		112	}
		113
		114	public void setUserName(String name) {
		115	String oldName = this.userName;
		116	this.userName = name;
		117	firePropertyChange(PROPERTY_USER_NAME, oldName, name);
		118	}
		119
		120	public boolean isQualityHigh() {
		121	return this.qualityHigh;
		122	}
		123
		124	public void setQualityHigh(boolean qualityHigh) {
		125	boolean oldQualityHigh = this.qualityHigh;
		126	this.qualityHigh = qualityHigh;
		127	firePropertyChange(PROPERTY_QUALITY_HIGH, oldQualityHigh, qualityHigh);
		128	}
		129
		130	public boolean isQualityLow() {
		131	return this.qualityLow;
		132	}
		133
		134	public void setQualityLow(boolean qualityLow) {
		135	boolean oldQualityLow = this.qualityLow;
		136	this.qualityLow = qualityLow;
		137	firePropertyChange(PROPERTY_QUALITY_LOW, oldQualityLow, this.qualityLow);
		138	}
		139
		140	public boolean isQualityMed() {
		141	return this.qualityMed;
		142	}
		143
		144	public void setQualityMed(boolean qualityMed) {
		145	boolean oldQualityMed = this.qualityMed;
		146	this.qualityMed = qualityMed;
		147	firePropertyChange(PROPERTY_QUALITY_MED, oldQualityMed, this.qualityMed);
		148	}
		149
74		150
75	public int getScaleFactor() {	151	public int getScaleFactor() {
76	return scaleFactor;	152	return scaleFactor;
Lines 151-154 Link Here
151	this.collate = collate;	227	this.collate = collate;
152	firePropertyChange(PROPERTY_COLLATE, oldCollate, collate);	228	firePropertyChange(PROPERTY_COLLATE, oldCollate, collate);
153	}	229	}
		230
		231
		232	public boolean isChromaticityColor() {
		233	return this.chromaticityColor;
		234	}
		235
		236	public void setChromaticityColor(boolean chromaticityColor) {
		237	boolean oldChromaticityColor = this.chromaticityColor;
		238	this.chromaticityColor = chromaticityColor;
		239	firePropertyChange(PROPERTY_CHROMATICITY_COLOR, oldChromaticityColor, this.chromaticityColor);
		240	}
		241
		242	public boolean isChromaticityMono() {
		243	return this.chromaticityMono;
		244	}
		245
		246	public void setChromaticityMono(boolean chromaticityMono) {
		247	boolean oldChromaticityMono = this.chromaticityMono;
		248	this.chromaticityMono = chromaticityMono;
		249	firePropertyChange(PROPERTY_CHROMATICITY_MONO, oldChromaticityMono, this.chromaticityMono);
		250	}
		251
		252	public boolean isSideOneSided() {
		253	return this.sideOneSided;
		254	}
		255
		256	public void setSideOneSided(boolean sideOneSided) {
		257	boolean oldSideOneSided = this.sideOneSided;
		258	this.sideOneSided = sideOneSided;
		259	firePropertyChange(PROPERTY_SIDES_ONESIDED, oldSideOneSided, this.sideOneSided);
		260	}
		261
		262	public boolean isSideTumble() {
		263	return this.sideTumble;
		264	}
		265
		266	public void setSideTumble(boolean sideTumble) {
		267	boolean oldSideTumble = this.sideTumble;
		268	this.sideTumble = sideTumble;
		269	firePropertyChange(PROPERTY_SIDES_TUMBLE, oldSideTumble, this.sideTumble);
		270	}
		271
		272	public boolean isSideDuplex() {
		273	return this.sideDuplex;
		274	}
		275
		276	public void setSideDuplex(boolean sideDuplex) {
		277	boolean oldSideDuplex = this.sideDuplex;
		278	this.sideDuplex = sideDuplex;
		279	firePropertyChange(PROPERTY_SIDES_DUPLEX, oldSideDuplex, this.sideDuplex);
		280	}
154	}	281	}





package org.eclipse.gmf.runtime.diagram.ui.printing.render.internal;

import java.awt.BasicStroke;
import java.awt.print.PageFormat;
import java.awt.print.PrinterException;
import java.util.Iterator;

import javax.print.attribute.HashPrintRequestAttributeSet;
import javax.print.attribute.HashPrintServiceAttributeSet;
import javax.print.attribute.PrintRequestAttributeSet;
import javax.print.attribute.standard.Chromaticity;
import javax.print.attribute.standard.Copies;
import javax.print.attribute.standard.JobName;
import javax.print.attribute.standard.Media;

import javax.print.attribute.standard.MediaSize;
import javax.print.attribute.standard.MediaSizeName;
import javax.print.attribute.standard.OrientationRequested;
import javax.print.attribute.standard.PrintQuality;
import javax.print.attribute.standard.PrinterName;
import javax.print.attribute.standard.SheetCollate;
import javax.print.attribute.standard.Sides;

import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.geometry.Rectangle;

import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter;
import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.PrintHelperUtil;
import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
import org.eclipse.gmf.runtime.diagram.ui.printing.render.util.PrintHelper;
import org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil;
import org.eclipse.gmf.runtime.diagram.ui.util.DiagramEditorUtil;
import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;
import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScaledGraphics;
import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor;
import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedScaledGraphics;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.IPreferenceStore;

 */
public class JPSDiagramPrinter extends DiagramPrinter implements
		java.awt.print.Printable {
	
	// A constant that takes into account screen display DPI and the graphic DPI
	// 72.0 DPI is an AWT constant @see java.awt.Graphics2D
	private static double AWT_DPI_CONST = 72.0;
	
	// The print service used during printing.
	private PrintService printService;
	
	// Page information that is collected up front and used during the async printing calls.
	private PageData[] pages;
	
	// The print helper contains page information.
	private IPrintHelper printHelper;
	

	public JPSDiagramPrinter(PreferencesHint preferencesHint, IMapMode mm) {
		super(preferencesHint, mm);
		this.preferencesHint = preferencesHint;

			return java.awt.print.Printable.NO_SUCH_PAGE;
		}

		try {
			swtGraphics = new GraphicsToGraphics2DAdaptor(
					(java.awt.Graphics2D) printGraphics, new Rectangle(0, 0,
							(int) pageFormat.getWidth(), (int) pageFormat
									.getHeight())) {
				/*
				 * (non-Javadoc)
				 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor#setLineWidth(int)
				 */
				public void setLineWidth(int width) {
					super.setLineWidth(width);

					BasicStroke scaledStroke = getStroke();
					//
					// Make a special case for line thickness to take the printer
					// resolution into account.
					//
					scaledStroke = new BasicStroke(
							(float) (width * AWT_DPI_CONST / 100), 
							scaledStroke.getEndCap(),
							scaledStroke.getLineJoin(), 
							scaledStroke.getMiterLimit(), 
							scaledStroke.getDashArray(), 0);

					getGraphics2D().setStroke(scaledStroke);
				}
			};
			
			graphics = createMapModeGraphics(createPrinterGraphics(swtGraphics));
			graphics.scale(AWT_DPI_CONST / display_dpi.x);
			// Take into account screen display DPI and the graphic DPI
			// 72.0 DPI is an AWT constant @see java.awt.Graphics2D
			//
			graphics.scale(72.0 / display_dpi.x);

			drawPage(pages[pageIndex]);
			
		}  finally {
		} finally {
			dispose();
		}


		return new RenderedMapModeGraphics(theGraphics, getMapMode());
	}

	protected ScaledGraphics createPrinterGraphics(Graphics theGraphics) {
		return new ScaledGraphics(theGraphics);
		return new RenderedScaledGraphics(theGraphics);
	}
		
	
	/**
	 * Set printing options in a format that is suitable for the Java print
	 * service

			String jobName,
			IPreferenceStore fPreferences) {

		PrintOptions advancedOptions = ((PrintHelper) (printHelper)).getPrintOptions();

		PrintRequestAttributeSet printRequestAttributeSet = new HashPrintRequestAttributeSet();

		if (fPreferences

			printRequestAttributeSet.add(MediaSizeName.ISO_B5);
		}

		if (advancedOptions.isQualityLow()) {
			printRequestAttributeSet.add(PrintQuality.DRAFT);
		} else if (advancedOptions.isQualityMed()) {
			printRequestAttributeSet.add(PrintQuality.NORMAL);
		} else if (advancedOptions.isQualityHigh()) {
			printRequestAttributeSet.add(PrintQuality.HIGH);
		}
		if (advancedOptions.isSideDuplex()) {
			printRequestAttributeSet.add(Sides.DUPLEX);
		} else if (advancedOptions.isSideOneSided()) {
			printRequestAttributeSet.add(Sides.ONE_SIDED);
		} else if (advancedOptions.isSideTumble()) {
			printRequestAttributeSet.add(Sides.TUMBLE);
		}

		if (advancedOptions.isChromaticityColor()) {
			printRequestAttributeSet.add(Chromaticity.COLOR);
		} else {
			printRequestAttributeSet.add(Chromaticity.MONOCHROME);
		}

		MediaSizeName media = (MediaSizeName) printRequestAttributeSet
				.get(Media.class);
		MediaSize mediaSize = MediaSize.getMediaSizeForName(media);

		printRequestAttributeSet.add(new MediaPrintableArea((float) 0.0,
				(float) 0.0, (mediaSize.getX(MediaSize.INCH)), (mediaSize
						.getY(MediaSize.INCH)), MediaPrintableArea.INCH));

		printRequestAttributeSet.add(new Copies(printHelper
				.getDlgNumberOfCopies()));


			printRequestAttributeSet.add(SheetCollate.UNCOLLATED);
		}

		String userJobName = advancedOptions.getJobName();
		if (userJobName != null && userJobName.length() > 0) {
			jobName = userJobName;
		}
		printRequestAttributeSet.add(new JobName(jobName, Locale.getDefault()));

		return printRequestAttributeSet;




    private CopiesBlock copiesBlock;
    private ActionsBlock actionsBlock;
    
    private final DialogBlock.IDialogUnitConverter dluConverter = new DialogBlock.IDialogUnitConverter() {

		public int convertHorizontalDLUsToPixels(int dlus) {
			return JPSPrintDialog.this.convertHorizontalDLUsToPixels(dlus);
		}

		public Shell getShell() {
			return JPSPrintDialog.this.getShell();
		}
	};
    
    public JPSPrintDialog(IShellProvider parentShell, PrintOptions options) {
        super(parentShell);

        this.options = options;
    }

    /*
     * (non-Javadoc)
     * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
     */
    protected void configureShell(Shell newShell) {
        super.configureShell(newShell);
        

	}
    
    protected void createExtensibleBlockArea(Composite result) {
    	  // meant to be overridden by subclasses to add additional blocks.
  	}
    
        




import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
import org.eclipse.jface.databinding.viewers.ViewersObservables;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;

import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.PlatformUI;

/**
 * A section of the JPS print dialog that adds printer options.

		// until a workaround can be discovered.
		//
		
		//		 combo.addSelectionChangedListener(new ISelectionChangedListener() {
		//		
		//		 public void selectionChanged(SelectionChangedEvent event) {
		//				if (event != null) {
		//					handlePrinterSelectionChanged(event);
		//				}
		//			}
		//		});

		layoutFillHorizontal(combo.getControl());

		Button propertiesButton = button(result,
				DiagramUIPrintingMessages.JPSPrintDialog_Properties);
		propertiesButton.setEnabled(true);

		propertiesButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				 openPrintOptionsDialog();
			}
		});



				PrintServiceAttributeSet printServiceAttributes = printService
						.getAttributes();
				
				PrinterState printerState = (PrinterState) printServiceAttributes
						.get(PrinterState.class);


			return ((PrintDestination) element).getName();
		}
	}
		
	private void openPrintOptionsDialog() {

		JPSOptionsDialog dlg = new JPSOptionsDialog(PlatformUI.getWorkbench()
				.getActiveWorkbenchWindow().getShell(), bindings, options);
		dlg.open();

	}
}




/******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation 
 ****************************************************************************/

package org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs;

import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;

/**
 * A section of the options print dialog that handles the duplex/single sided printing.
 * 
 * @author James Bruck (jbruck)
 */
public class SidesBlock extends DialogBlock {

	private final DataBindingContext bindings;
	private final PrintOptions options;

	SidesBlock(IDialogUnitConverter dluConverter, DataBindingContext bindings,
			PrintOptions options) {
		super(dluConverter);

		this.bindings = bindings;
		this.options = options;
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
	 */
	public Control createContents(Composite parent) {
		final Realm realm = bindings.getValidationRealm();

		Composite result = group(parent,
				DiagramUIPrintingMessages.JPSOptionsDialog_Sides);
		layout(result, 2);

		Button oneSideRadio = radio(result,
				DiagramUIPrintingMessages.JPSOptionsDialog_SidesOneSided);
		layoutSpanHorizontal(oneSideRadio, 4);

		Button tumbleRadio = radio(result,
				DiagramUIPrintingMessages.JPSOptionsDialog_SidesTumble);
		layoutSpanHorizontal(tumbleRadio, 4);

		Button duplexRadio = radio(result,
				DiagramUIPrintingMessages.JPSOptionsDialog_SidesDuplex);
		layoutSpanHorizontal(duplexRadio, 4);

		bindings.bindValue(SWTObservables.observeSelection(oneSideRadio),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_SIDES_ONESIDED), null, null);

		bindings.bindValue(SWTObservables.observeSelection(tumbleRadio),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_SIDES_TUMBLE), null, null);

		bindings.bindValue(SWTObservables.observeSelection(duplexRadio),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_SIDES_DUPLEX), null, null);

		return result;
	}

}




/******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation 
 ****************************************************************************/

package org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs;

import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;

/**
 * A section of the options print dialog that handles the job attributes.
 * 
 * @author James Bruck (jbruck)
 */
public class JobAttributesBlock extends DialogBlock {
	private final DataBindingContext bindings;
	private final PrintOptions options;

	JobAttributesBlock(IDialogUnitConverter dluConverter,
			DataBindingContext bindings, PrintOptions options) {
		super(dluConverter);

		this.bindings = bindings;
		this.options = options;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
	 */
	public Control createContents(Composite parent) {
		final Realm realm = bindings.getValidationRealm();

		Composite result = group(parent,
				DiagramUIPrintingMessages.JPSOptionsDialog_JobAttributes);
		layout(result, 2);

		layoutHorizontalIndent(layoutAlignRight(label(result,
				DiagramUIPrintingMessages.JPSOptionsDialog_JobName)));
		Text jobName = text(result, 80);

		bindings.bindValue(SWTObservables.observeText(jobName, SWT.Modify),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_JOB_NAME), null, null);

		return result;
	}
}




/******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation 
 ****************************************************************************/

package org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs;

import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;

/**
 * A section of the options print dialog that handles the print quality.
 * 
 * @author James Bruck (jbruck)
 */
public class QualityBlock extends DialogBlock {

	private final DataBindingContext bindings;
	private final PrintOptions options;

	QualityBlock(IDialogUnitConverter dluConverter,
			DataBindingContext bindings, PrintOptions options) {
		super(dluConverter);

		this.bindings = bindings;
		this.options = options;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
	 */
	public Control createContents(Composite parent) {
		final Realm realm = bindings.getValidationRealm();

		Composite result = group(parent,
				DiagramUIPrintingMessages.JPSOptionsDialog_Quality);
		layout(result, 2);

		Button highRadio = radio(result,
				DiagramUIPrintingMessages.JPSOptionsDialog_QualityHigh);
		layoutSpanHorizontal(highRadio, 4);

		Button mediumRadio = radio(result,
				DiagramUIPrintingMessages.JPSOptionsDialog_QualityMedium);
		layoutSpanHorizontal(mediumRadio, 4);

		Button lowRadio = radio(result,
				DiagramUIPrintingMessages.JPSOptionsDialog_QualityLow);
		layoutSpanHorizontal(lowRadio, 4);

		bindings.bindValue(SWTObservables.observeSelection(highRadio),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_QUALITY_HIGH), null, null);

		bindings.bindValue(SWTObservables.observeSelection(mediumRadio),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_QUALITY_MED), null, null);

		bindings.bindValue(SWTObservables.observeSelection(lowRadio),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_QUALITY_LOW), null, null);

		return result;
	}
}




/******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation 
 ****************************************************************************/

package org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs;

import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.jface.window.IShellProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;

/**
 * A dialog that presents advanced printer options to the user.
 * 
 * @author James Bruck (jbruck)
 */
public class JPSOptionsDialog extends TrayDialog {

	private DataBindingContext bindings;
	public final PrintOptions options;

	private QualityBlock qualityBlock;
	private ColorBlock colorBlock;
	private SidesBlock sidesBlock;
	private JobAttributesBlock jobAttributesBlock;

	private final DialogBlock.IDialogUnitConverter dluConverter = new DialogBlock.IDialogUnitConverter() {

		public int convertHorizontalDLUsToPixels(int dlus) {
			return JPSOptionsDialog.this.convertHorizontalDLUsToPixels(dlus);
		}

		public Shell getShell() {
			return JPSOptionsDialog.this.getShell();
		}
	};

	protected JPSOptionsDialog(Shell shell, DataBindingContext bindings,
			PrintOptions options) {
		super(shell);
		this.options = options;
		this.bindings = bindings;
	}

	public JPSOptionsDialog(IShellProvider parentShell,
			DataBindingContext bindings, PrintOptions options) {
		super(parentShell);
		this.options = options;
		this.bindings = bindings;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
	 */
	protected void configureShell(Shell newShell) {
		
		super.configureShell(newShell);
		newShell
				.setText(DiagramUIPrintingMessages.JPSOptionsDialog_AdvancedOptions);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createDialogArea(Composite parent) {

		Composite result = new Composite(parent, SWT.NONE);
		DialogBlock.layout(result, 2);

		createColorBlockArea(result);
		createQualityBlockArea(result);
		createSidesBlockArea(result);
		createJobAttributesBlockArea(result);

		return result;
	}

	protected void createQualityBlockArea(Composite result) {
		qualityBlock = new QualityBlock(dluConverter, bindings, options);
		qualityBlock.createContents(result);
	}

	protected void createColorBlockArea(Composite result) {
		colorBlock = new ColorBlock(dluConverter, bindings, options);
		colorBlock.createContents(result);
	}

	protected void createSidesBlockArea(Composite result) {
		sidesBlock = new SidesBlock(dluConverter, bindings, options);
		sidesBlock.createContents(result);
	}

	protected void createJobAttributesBlockArea(Composite result) {
		jobAttributesBlock = new JobAttributesBlock(dluConverter, bindings,
				options);
		jobAttributesBlock.createContents(result);
	}
}




/******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation 
 ****************************************************************************/

package org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs;

import java.util.Locale;

import javax.print.DocFlavor;
import javax.print.PrintService;
import javax.print.PrintServiceLookup;
import javax.print.attribute.AttributeSet;
import javax.print.attribute.HashPrintServiceAttributeSet;
import javax.print.attribute.PrintServiceAttributeSet;
import javax.print.attribute.standard.ColorSupported;
import javax.print.attribute.standard.PrinterName;

import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;

/**
 * A section of the options print dialog that handles the print color options.
 * 
 * @author James Bruck (jbruck)
 */
public class ColorBlock extends DialogBlock {

	private final DataBindingContext bindings;
	private final PrintOptions options;

	private Button colorRadio;
	private Button monoRadio;

	ColorBlock(IDialogUnitConverter dluConverter, DataBindingContext bindings,
			PrintOptions options) {
		super(dluConverter);

		this.bindings = bindings;
		this.options = options;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
	 */
	public Control createContents(Composite parent) {
		final Realm realm = bindings.getValidationRealm();

		Composite result = group(parent,
				DiagramUIPrintingMessages.JPSOptionsDialog_Color);
		layout(result, 2);

		colorRadio = radio(result,
				DiagramUIPrintingMessages.JPSOptionsDialog_ChromaticityColor);
		layoutSpanHorizontal(colorRadio, 4);

		monoRadio = radio(
				result,
				DiagramUIPrintingMessages.JPSOptionsDialog_ChromaticityMonochrome);
		layoutSpanHorizontal(monoRadio, 4);

		bindings.bindValue(SWTObservables.observeSelection(colorRadio),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_CHROMATICITY_COLOR), null, null);

		bindings.bindValue(SWTObservables.observeSelection(monoRadio),
				BeansObservables.observeValue(realm, options,
						PrintOptions.PROPERTY_CHROMATICITY_MONO), null, null);

		initializeControls(options.getDestination().getName());

		return result;
	}

	/**
	 * Initialize the enabled state of the controls based on the printer
	 * capabilities.
	 * 
	 * @param printerName
	 */
	private void initializeControls(String printerName) {

		AttributeSet attributes = new HashPrintServiceAttributeSet(
				new PrinterName(printerName, Locale.getDefault()));

		PrintService[] services = PrintServiceLookup.lookupPrintServices(
				DocFlavor.SERVICE_FORMATTED.PRINTABLE, attributes);

		PrintService printService = services[0];

		PrintServiceAttributeSet printServiceAttributes = printService
				.getAttributes();

		ColorSupported colorSupported = (ColorSupported) printServiceAttributes
				.get(ColorSupported.class);
		
		if (colorSupported == ColorSupported.SUPPORTED) {
			options.setChromaticityColor(true);
			options.setChromaticityMono(false);
			colorRadio.setEnabled(true);
		} else {
			options.setChromaticityColor(false);
			options.setChromaticityMono(true);
			colorRadio.setEnabled(false);
		}
	}

}

Lines 24-35 Link Here

(-)plugin.xml (-2 / +4 lines)
24	</extension>	24	</extension>
25		25
26	<extension id="printingExperimentalContributionItemProvider" name="Printing_Experimental" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">	26	<extension id="printingExperimentalContributionItemProvider" name="Printing_Experimental" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
27	<contributionItemProvider class="org.eclipse.gmf.runtime.diagram.ui.render.internal.providers.PrintingExperimentalContributionItemProvider">	27	<contributionItemProvider
		28	checkPluginLoaded="false"
		29	class="org.eclipse.gmf.runtime.diagram.ui.render.internal.providers.PrintingExperimentalContributionItemProvider">
28	<Priority name="Medium">	30	<Priority name="Medium">
29	</Priority>	31	</Priority>
30	<partContribution class="org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart">	32	<partContribution class="org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart">
31	<partAction	33	<partAction
32	global="false"	34	global="true"
33	id="printExperimentalAction"	35	id="printExperimentalAction"
34	menubarPath="/file/print">	36	menubarPath="/file/print">
35	</partAction>	37	</partAction>

Lines 1-5 Link Here

(-)src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java (-3 / +18 lines)
1	/******************************************************************************	1	/******************************************************************************
2	* Copyright (c) 2004, 2007 IBM Corporation and others.	2	* Copyright (c) 2004, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 461-467 Link Here
461	int w2,	461	int w2,
462	int h2) {	462	int h2) {
463		463
464	drawImage(srcImage, x2, y2);	464	x2 += transX;
		465	y2 += transY;
		466
		467	BufferedImage toDraw = ImageConverter.convert(srcImage);
		468	checkState();
		469	getGraphics2D().drawImage(toDraw, x2, y2, w2, h2, null);
465	}	470	}
466		471
467	/*	472	/*
Lines 1227-1231 Link Here
1227	getGraphics2D().setComposite(newComposite);	1232	getGraphics2D().setComposite(newComposite);
1228	}	1233	}
1229	}	1234	}
1230		1235
		1236	protected BasicStroke getStroke(){
		1237	return stroke;
		1238	}
		1239
		1240	protected void setStroke(BasicStroke stroke){
		1241	this.stroke = stroke;
		1242	getGraphics2D().setStroke(stroke);
		1243	}
		1244
		1245
1231	}	1246	}




/*******************************************************************************
 * Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	public static String JPSPrintDialog_PagesTall;
	public static String JPSDiagramPrinterUtil_ErrorTitle;
	public static String JPSDiagramPrinterUtil_ErrorMessage;
	public static String JPSOptionsDialog_Quality;
	public static String JPSOptionsDialog_QualityHigh;
	public static String JPSOptionsDialog_QualityMedium;
	public static String JPSOptionsDialog_QualityLow;
	public static String JPSOptionsDialog_Color;
	public static String JPSOptionsDialog_ChromaticityColor;
	public static String JPSOptionsDialog_ChromaticityMonochrome;
	public static String JPSOptionsDialog_JobAttributes;
	public static String JPSOptionsDialog_JobName;
	public static String JPSOptionsDialog_Sides;
	public static String JPSOptionsDialog_SidesOneSided;
	public static String JPSOptionsDialog_SidesTumble;
	public static String JPSOptionsDialog_SidesDuplex;
	public static String JPSOptionsDialog_AdvancedOptions;
				
	static {
		NLS.initializeMessages(BUNDLE_NAME, DiagramUIPrintingMessages.class);




JPSPrintDialog_PagesWide=Pages &wide:
JPSPrintDialog_PagesTall=Pages &tall:

JPSOptionsDialog_Quality=Quality
JPSOptionsDialog_QualityHigh=&High
JPSOptionsDialog_QualityMedium=&Medium
JPSOptionsDialog_QualityLow=&Low
JPSOptionsDialog_Color=Color
JPSOptionsDialog_ChromaticityColor=&Color
JPSOptionsDialog_ChromaticityMonochrome=&Monochrome
JPSOptionsDialog_JobAttributes=Job Attributes
JPSOptionsDialog_JobName=Job &Name
JPSOptionsDialog_Sides=Sides
JPSOptionsDialog_SidesOneSided=&One Sided
JPSOptionsDialog_SidesTumble=&Tumble
JPSOptionsDialog_SidesDuplex=&Duplex
JPSOptionsDialog_AdvancedOptions=Advanced Options


# DiagramPrinterUtil related resource strings
# ================================ BEGIN ==================================================
DiagramPrinterUtil_DLLErrorTitle=Error loading printing library

Return to bug 224387

Lines 11-16 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/JPSDiagramPrinter.java (-22 / +76 lines)
11		11
12	package org.eclipse.gmf.runtime.diagram.ui.printing.render.internal;	12	package org.eclipse.gmf.runtime.diagram.ui.printing.render.internal;
13		13
		14	import java.awt.BasicStroke;
14	import java.awt.print.PageFormat;	15	import java.awt.print.PageFormat;
15	import java.awt.print.PrinterException;	16	import java.awt.print.PrinterException;
16	import java.util.Iterator;	17	import java.util.Iterator;
Lines 29-34 Link Here
29	import javax.print.attribute.HashPrintRequestAttributeSet;	30	import javax.print.attribute.HashPrintRequestAttributeSet;
30	import javax.print.attribute.HashPrintServiceAttributeSet;	31	import javax.print.attribute.HashPrintServiceAttributeSet;
31	import javax.print.attribute.PrintRequestAttributeSet;	32	import javax.print.attribute.PrintRequestAttributeSet;
		33	import javax.print.attribute.standard.Chromaticity;
32	import javax.print.attribute.standard.Copies;	34	import javax.print.attribute.standard.Copies;
33	import javax.print.attribute.standard.JobName;	35	import javax.print.attribute.standard.JobName;
34	import javax.print.attribute.standard.Media;	36	import javax.print.attribute.standard.Media;
Lines 36-43 Link Here
36	import javax.print.attribute.standard.MediaSize;	38	import javax.print.attribute.standard.MediaSize;
37	import javax.print.attribute.standard.MediaSizeName;	39	import javax.print.attribute.standard.MediaSizeName;
38	import javax.print.attribute.standard.OrientationRequested;	40	import javax.print.attribute.standard.OrientationRequested;
		41	import javax.print.attribute.standard.PrintQuality;
39	import javax.print.attribute.standard.PrinterName;	42	import javax.print.attribute.standard.PrinterName;
40	import javax.print.attribute.standard.SheetCollate;	43	import javax.print.attribute.standard.SheetCollate;
		44	import javax.print.attribute.standard.Sides;
41		45
42	import org.eclipse.draw2d.Graphics;	46	import org.eclipse.draw2d.Graphics;
43	import org.eclipse.draw2d.geometry.Rectangle;	47	import org.eclipse.draw2d.geometry.Rectangle;
Lines 62-75 Link Here
62	import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;	66	import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
63	import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter;	67	import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter;
64	import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.PrintHelperUtil;	68	import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.PrintHelperUtil;
		69	import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
		70	import org.eclipse.gmf.runtime.diagram.ui.printing.render.util.PrintHelper;
65	import org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil;	71	import org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil;
66	import org.eclipse.gmf.runtime.diagram.ui.util.DiagramEditorUtil;	72	import org.eclipse.gmf.runtime.diagram.ui.util.DiagramEditorUtil;
67	import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;	73	import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;
		74	import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScaledGraphics;
68	import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;	75	import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
69	import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;	76	import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
70	import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor;	77	import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor;
71	import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;	78	import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
72	import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedScaledGraphics;
73	import org.eclipse.gmf.runtime.notation.Diagram;	79	import org.eclipse.gmf.runtime.notation.Diagram;
74	import org.eclipse.jface.dialogs.MessageDialog;	80	import org.eclipse.jface.dialogs.MessageDialog;
75	import org.eclipse.jface.preference.IPreferenceStore;	81	import org.eclipse.jface.preference.IPreferenceStore;
Lines 90-102 Link Here
90	*/	96	*/
91	public class JPSDiagramPrinter extends DiagramPrinter implements	97	public class JPSDiagramPrinter extends DiagramPrinter implements
92	java.awt.print.Printable {	98	java.awt.print.Printable {
93		99
94		100	// A constant that takes into account screen display DPI and the graphic DPI
		101	// 72.0 DPI is an AWT constant @see java.awt.Graphics2D
		102	private static double AWT_DPI_CONST = 72.0;
		103
		104	// The print service used during printing.
95	private PrintService printService;	105	private PrintService printService;
		106
		107	// Page information that is collected up front and used during the async printing calls.
96	private PageData[] pages;	108	private PageData[] pages;
		109
		110	// The print helper contains page information.
97	private IPrintHelper printHelper;	111	private IPrintHelper printHelper;
98		112
99
100	public JPSDiagramPrinter(PreferencesHint preferencesHint, IMapMode mm) {	113	public JPSDiagramPrinter(PreferencesHint preferencesHint, IMapMode mm) {
101	super(preferencesHint, mm);	114	super(preferencesHint, mm);
102	this.preferencesHint = preferencesHint;	115	this.preferencesHint = preferencesHint;
Lines 347-369 Link Here
347	return java.awt.print.Printable.NO_SUCH_PAGE;	360	return java.awt.print.Printable.NO_SUCH_PAGE;
348	}	361	}
349		362
350	try {	363	try {
351	swtGraphics = new GraphicsToGraphics2DAdaptor(	364	swtGraphics = new GraphicsToGraphics2DAdaptor(
352	(java.awt.Graphics2D) printGraphics, new Rectangle(0, 0,	365	(java.awt.Graphics2D) printGraphics, new Rectangle(0, 0,
353	(int) pageFormat.getWidth(), (int) pageFormat	366	(int) pageFormat.getWidth(), (int) pageFormat
354	.getHeight()));	367	.getHeight())) {
		368	/*
		369	* (non-Javadoc)
		370	* @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor#setLineWidth(int)
		371	*/
		372	public void setLineWidth(int width) {
		373	super.setLineWidth(width);
		374
		375	BasicStroke scaledStroke = getStroke();
		376	//
		377	// Make a special case for line thickness to take the printer
		378	// resolution into account.
		379	//
		380	scaledStroke = new BasicStroke(
		381	(float) (width * AWT_DPI_CONST / 100),
		382	scaledStroke.getEndCap(),
		383	scaledStroke.getLineJoin(),
		384	scaledStroke.getMiterLimit(),
		385	scaledStroke.getDashArray(), 0);
355		386
		387	getGraphics2D().setStroke(scaledStroke);
		388	}
		389	};
		390
356	graphics = createMapModeGraphics(createPrinterGraphics(swtGraphics));	391	graphics = createMapModeGraphics(createPrinterGraphics(swtGraphics));
357	//	392	graphics.scale(AWT_DPI_CONST / display_dpi.x);
358	// Take into account screen display DPI and the graphic DPI
359	// 72.0 DPI is an AWT constant @see java.awt.Graphics2D
360	//
361	graphics.scale(72.0 / display_dpi.x);
362
363	drawPage(pages[pageIndex]);	393	drawPage(pages[pageIndex]);
364	} catch (Exception e) {	394
365	System.out.println(e);	395	} finally {
366	} finally {
367	dispose();	396	dispose();
368	}	397	}
369		398
Lines 378-389 Link Here
378	return new RenderedMapModeGraphics(theGraphics, getMapMode());	407	return new RenderedMapModeGraphics(theGraphics, getMapMode());
379	}	408	}
380		409
381		410	protected ScaledGraphics createPrinterGraphics(Graphics theGraphics) {
382	protected RenderedScaledGraphics createPrinterGraphics(Graphics theGraphics) {	411	return new ScaledGraphics(theGraphics);
383	return new RenderedScaledGraphics(theGraphics);
384	}	412	}
385		413
386
387	/**	414	/**
388	* Set printing options in a format that is suitable for the Java print	415	* Set printing options in a format that is suitable for the Java print
389	* service	416	* service
Lines 398-403 Link Here
398	String jobName,	425	String jobName,
399	IPreferenceStore fPreferences) {	426	IPreferenceStore fPreferences) {
400		427
		428	PrintOptions advancedOptions = ((PrintHelper) (printHelper)).getPrintOptions();
		429
401	PrintRequestAttributeSet printRequestAttributeSet = new HashPrintRequestAttributeSet();	430	PrintRequestAttributeSet printRequestAttributeSet = new HashPrintRequestAttributeSet();
402		431
403	if (fPreferences	432	if (fPreferences
Lines 428-441 Link Here
428	printRequestAttributeSet.add(MediaSizeName.ISO_B5);	457	printRequestAttributeSet.add(MediaSizeName.ISO_B5);
429	}	458	}
430		459
		460	if (advancedOptions.isQualityLow()) {
		461	printRequestAttributeSet.add(PrintQuality.DRAFT);
		462	} else if (advancedOptions.isQualityMed()) {
		463	printRequestAttributeSet.add(PrintQuality.NORMAL);
		464	} else if (advancedOptions.isQualityHigh()) {
		465	printRequestAttributeSet.add(PrintQuality.HIGH);
		466	}
		467	if (advancedOptions.isSideDuplex()) {
		468	printRequestAttributeSet.add(Sides.DUPLEX);
		469	} else if (advancedOptions.isSideOneSided()) {
		470	printRequestAttributeSet.add(Sides.ONE_SIDED);
		471	} else if (advancedOptions.isSideTumble()) {
		472	printRequestAttributeSet.add(Sides.TUMBLE);
		473	}
		474
		475	if (advancedOptions.isChromaticityColor()) {
		476	printRequestAttributeSet.add(Chromaticity.COLOR);
		477	} else {
		478	printRequestAttributeSet.add(Chromaticity.MONOCHROME);
		479	}
		480
431	MediaSizeName media = (MediaSizeName) printRequestAttributeSet	481	MediaSizeName media = (MediaSizeName) printRequestAttributeSet
432	.get(Media.class);	482	.get(Media.class);
433	MediaSize mediaSize = MediaSize.getMediaSizeForName(media);	483	MediaSize mediaSize = MediaSize.getMediaSizeForName(media);
434		484
435	printRequestAttributeSet.add(new MediaPrintableArea((float) 0.0,	485	printRequestAttributeSet.add(new MediaPrintableArea((float) 0.0,
436	(float) 0.0, (mediaSize.getX(MediaSize.INCH)), (mediaSize	486	(float) 0.0, (mediaSize.getX(MediaSize.INCH)), (mediaSize
437	.getY(MediaSize.INCH)), MediaPrintableArea.INCH));	487	.getY(MediaSize.INCH)), MediaPrintableArea.INCH));
438		488
439	printRequestAttributeSet.add(new Copies(printHelper	489	printRequestAttributeSet.add(new Copies(printHelper
440	.getDlgNumberOfCopies()));	490	.getDlgNumberOfCopies()));
441		491
Lines 445-450 Link Here
445	printRequestAttributeSet.add(SheetCollate.UNCOLLATED);	495	printRequestAttributeSet.add(SheetCollate.UNCOLLATED);
446	}	496	}
447		497
		498	String userJobName = advancedOptions.getJobName();
		499	if (userJobName != null && userJobName.length() > 0) {
		500	jobName = userJobName;
		501	}
448	printRequestAttributeSet.add(new JobName(jobName, Locale.getDefault()));	502	printRequestAttributeSet.add(new JobName(jobName, Locale.getDefault()));
449		503
450	return printRequestAttributeSet;	504	return printRequestAttributeSet;

Lines 45-60 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JPSPrintDialog.java (-11 / +15 lines)
45	private CopiesBlock copiesBlock;	45	private CopiesBlock copiesBlock;
46	private ActionsBlock actionsBlock;	46	private ActionsBlock actionsBlock;
47		47
48	private final DialogBlock.IDialogUnitConverter dluConverter =	48	private final DialogBlock.IDialogUnitConverter dluConverter = new DialogBlock.IDialogUnitConverter() {
49	new DialogBlock.IDialogUnitConverter() {	49
50		50	public int convertHorizontalDLUsToPixels(int dlus) {
51	public int convertHorizontalDLUsToPixels(int dlus) {	51	return JPSPrintDialog.this.convertHorizontalDLUsToPixels(dlus);
52	return JPSPrintDialog.this.convertHorizontalDLUsToPixels(dlus);	52	}
53	}	53
54		54	public Shell getShell() {
55	public Shell getShell() {	55	return JPSPrintDialog.this.getShell();
56	return JPSPrintDialog.this.getShell();	56	}
57	}};	57	};
58		58
59	public JPSPrintDialog(IShellProvider parentShell, PrintOptions options) {	59	public JPSPrintDialog(IShellProvider parentShell, PrintOptions options) {
60	super(parentShell);	60	super(parentShell);
Lines 66-71 Link Here
66	this.options = options;	66	this.options = options;
67	}	67	}
68		68
		69	/*
		70	* (non-Javadoc)
		71	* @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
		72	*/
69	protected void configureShell(Shell newShell) {	73	protected void configureShell(Shell newShell) {
70	super.configureShell(newShell);	74	super.configureShell(newShell);
71		75
Lines 119-125 Link Here
119	}	123	}
120		124
121	protected void createExtensibleBlockArea(Composite result) {	125	protected void createExtensibleBlockArea(Composite result) {
122	// meant to be overiden by subclasses to add additional blocks.	126	// meant to be overridden by subclasses to add additional blocks.
123	}	127	}
124		128
125		129

Added Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/SidesBlock.java (+80 lines)
1	/******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	****************************************************************************/
11
12	package org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs;
13
14	import org.eclipse.core.databinding.DataBindingContext;
15	import org.eclipse.core.databinding.beans.BeansObservables;
16	import org.eclipse.core.databinding.observable.Realm;
17	import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
18	import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
19	import org.eclipse.jface.databinding.swt.SWTObservables;
20	import org.eclipse.swt.widgets.Button;
21	import org.eclipse.swt.widgets.Composite;
22	import org.eclipse.swt.widgets.Control;
23
24	/**
25	* A section of the options print dialog that handles the duplex/single sided printing.
26	*
27	* @author James Bruck (jbruck)
28	*/
29	public class SidesBlock extends DialogBlock {
30
31	private final DataBindingContext bindings;
32	private final PrintOptions options;
33
34	SidesBlock(IDialogUnitConverter dluConverter, DataBindingContext bindings,
35	PrintOptions options) {
36	super(dluConverter);
37
38	this.bindings = bindings;
39	this.options = options;
40	}
41
42	/*
43	* (non-Javadoc)
44	* @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
45	*/
46	public Control createContents(Composite parent) {
47	final Realm realm = bindings.getValidationRealm();
48
49	Composite result = group(parent,
50	DiagramUIPrintingMessages.JPSOptionsDialog_Sides);
51	layout(result, 2);
52
53	Button oneSideRadio = radio(result,
54	DiagramUIPrintingMessages.JPSOptionsDialog_SidesOneSided);
55	layoutSpanHorizontal(oneSideRadio, 4);
56
57	Button tumbleRadio = radio(result,
58	DiagramUIPrintingMessages.JPSOptionsDialog_SidesTumble);
59	layoutSpanHorizontal(tumbleRadio, 4);
60
61	Button duplexRadio = radio(result,
62	DiagramUIPrintingMessages.JPSOptionsDialog_SidesDuplex);
63	layoutSpanHorizontal(duplexRadio, 4);
64
65	bindings.bindValue(SWTObservables.observeSelection(oneSideRadio),
66	BeansObservables.observeValue(realm, options,
67	PrintOptions.PROPERTY_SIDES_ONESIDED), null, null);
68
69	bindings.bindValue(SWTObservables.observeSelection(tumbleRadio),
70	BeansObservables.observeValue(realm, options,
71	PrintOptions.PROPERTY_SIDES_TUMBLE), null, null);
72
73	bindings.bindValue(SWTObservables.observeSelection(duplexRadio),
74	BeansObservables.observeValue(realm, options,
75	PrintOptions.PROPERTY_SIDES_DUPLEX), null, null);
76
77	return result;
78	}
79
80	}

Lines 58-63 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.properties (+16 lines)
58	JPSPrintDialog_PagesWide=Pages &wide:	58	JPSPrintDialog_PagesWide=Pages &wide:
59	JPSPrintDialog_PagesTall=Pages &tall:	59	JPSPrintDialog_PagesTall=Pages &tall:
60		60
		61	JPSOptionsDialog_Quality=Quality
		62	JPSOptionsDialog_QualityHigh=&High
		63	JPSOptionsDialog_QualityMedium=&Medium
		64	JPSOptionsDialog_QualityLow=&Low
		65	JPSOptionsDialog_Color=Color
		66	JPSOptionsDialog_ChromaticityColor=&Color
		67	JPSOptionsDialog_ChromaticityMonochrome=&Monochrome
		68	JPSOptionsDialog_JobAttributes=Job Attributes
		69	JPSOptionsDialog_JobName=Job &Name
		70	JPSOptionsDialog_Sides=Sides
		71	JPSOptionsDialog_SidesOneSided=&One Sided
		72	JPSOptionsDialog_SidesTumble=&Tumble
		73	JPSOptionsDialog_SidesDuplex=&Duplex
		74	JPSOptionsDialog_AdvancedOptions=Advanced Options
		75
		76
61	# DiagramPrinterUtil related resource strings	77	# DiagramPrinterUtil related resource strings
62	# ================================ BEGIN ==================================================	78	# ================================ BEGIN ==================================================
63	DiagramPrinterUtil_DLLErrorTitle=Error loading printing library	79	DiagramPrinterUtil_DLLErrorTitle=Error loading printing library