github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup of printer code

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1800 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-04-18 14:58:10 +00:00
parent 9ed8f5e191
commit ca14e8365c
2 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Greenshot/Forms/PrintOptionsDialog.cs
View file

@ -31,13 +31,6 @@ namespace Greenshot.Forms {
public partial class PrintOptionsDialog : BaseForm {
private static CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>();
public bool AllowPrintCenter;
public bool AllowPrintEnlarge;
public bool AllowPrintRotate;
public bool AllowPrintShrink;
public bool PrintDateTime;
public bool PrintInverted;
public PrintOptionsDialog() {
//
// The InitializeComponent() call is required for Windows Forms designer support.

32
Greenshot/Helpers/PrintHelper.cs
View file

@ -42,7 +42,6 @@ namespace Greenshot.Helpers {
private ICaptureDetails captureDetails;
private PrintDocument printDocument = new PrintDocument();
private PrintDialog printDialog = new PrintDialog();
private PrintOptionsDialog printOptionsDialog = null;
public PrintHelper(Image image, ICaptureDetails captureDetails) {
this.image = image;
@ -84,14 +83,10 @@ namespace Greenshot.Helpers {
if (printDialog != null) {
printDialog.Dispose();
}
if (printOptionsDialog != null) {
printOptionsDialog.Dispose();
}
}
image = null;
printDocument = null;
printDialog = null;
printOptionsDialog = null;
}
/// <summary>
@ -102,11 +97,12 @@ namespace Greenshot.Helpers {
public PrinterSettings PrintTo(string printerName) {
PrinterSettings returnPrinterSettings = null;
bool cancelled = false;
printOptionsDialog = new PrintOptionsDialog();
if (conf.OutputPrintPromptOptions) {
DialogResult result = printOptionsDialog.ShowDialog();
if (result != DialogResult.OK) {
cancelled = true;
using (PrintOptionsDialog printOptionsDialog = new PrintOptionsDialog()) {
DialogResult result = printOptionsDialog.ShowDialog();
if (result != DialogResult.OK) {
cancelled = true;
}
}
}
try {
@ -133,11 +129,12 @@ namespace Greenshot.Helpers {
PrinterSettings returnPrinterSettings = null;
if (printDialog.ShowDialog() == DialogResult.OK) {
bool cancelled = false;
printOptionsDialog = new PrintOptionsDialog();
if (conf.OutputPrintPromptOptions) {
DialogResult result = printOptionsDialog.ShowDialog();
if (result != DialogResult.OK) {
cancelled = true;
using (PrintOptionsDialog printOptionsDialog = new PrintOptionsDialog()) {
DialogResult result = printOptionsDialog.ShowDialog();
if (result != DialogResult.OK) {
cancelled = true;
}
}
}
try {
@ -157,8 +154,7 @@ namespace Greenshot.Helpers {
}
void DrawImageForPrint(object sender, PrintPageEventArgs e) {
PrintOptionsDialog pod = printOptionsDialog;
ContentAlignment alignment = pod.AllowPrintCenter ? ContentAlignment.MiddleCenter : ContentAlignment.TopLeft;
ContentAlignment alignment = conf.OutputPrintCenter ? ContentAlignment.MiddleCenter : ContentAlignment.TopLeft;
// prepare timestamp
float footerStringWidth = 0;
@ -181,7 +177,7 @@ namespace Greenshot.Helpers {
GraphicsUnit gu = GraphicsUnit.Pixel;
RectangleF imageRect = image.GetBounds(ref gu);
// rotate the image if it fits the page better
if (pod.AllowPrintRotate) {
if (conf.OutputPrintAllowRotate) {
if ((pageRect.Width > pageRect.Height && imageRect.Width < imageRect.Height) || (pageRect.Width < pageRect.Height && imageRect.Width > imageRect.Height)) {
image.RotateFlip(RotateFlipType.Rotate90FlipNone);
imageRect = image.GetBounds(ref gu);
@ -193,9 +189,9 @@ namespace Greenshot.Helpers {
RectangleF printRect = new RectangleF(0, 0, imageRect.Width, imageRect.Height);
// scale the image to fit the page better
if (pod.AllowPrintEnlarge || pod.AllowPrintShrink) {
if (conf.OutputPrintAllowEnlarge || conf.OutputPrintAllowShrink) {
SizeF resizedRect = ScaleHelper.GetScaledSize(imageRect.Size, pageRect.Size, false);
if ((pod.AllowPrintShrink && resizedRect.Width < printRect.Width) || pod.AllowPrintEnlarge && resizedRect.Width > printRect.Width) {
if ((conf.OutputPrintAllowShrink && resizedRect.Width < printRect.Width) || conf.OutputPrintAllowEnlarge && resizedRect.Width > printRect.Width) {
printRect.Size = resizedRect;
}
}