github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

PrinterJob in Linux fix #1054

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8490 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-05-31 05:39:38 +00:00
parent 15044fed20
commit c2d8d8a76c
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/CtrlLib/CtrlUtil.h
View file

@ -68,8 +68,9 @@ class PrinterJob {
bool landscape;
String name;
String options;
bool Execute0(bool dodlg);
bool dlgSuccess;
bool Execute0();
public:
Draw& GetDraw();
operator Draw&() { return GetDraw(); }

30
uppsrc/CtrlLib/PrinterJob.cpp
View file

@ -220,6 +220,7 @@ public:
bool IsCanceled();
private:
void StandardizePrinterName(String& printerName);
void OnOK();
private:
@ -250,7 +251,7 @@ void PrinterDlg::FillOpt(const String& s, const char *id, DropList& dl, bool pgs
void PrinterDlg::SyncPrinterOptions()
{
Vector<String> l = Split(System("lpoptions -l -d " + String(~printer)), '\n');
Vector<String> l = Split(System("lpoptions -d " + String(~printer) + " -l"), '\n');
paper.Disable();
paper.Clear();
slot.Disable();
@ -286,6 +287,7 @@ PrinterDlg::PrinterDlg() : canceled(true)
int q = h.Find(':');
if(q >= 0) {
String p = h.Mid(q + 1);
StandardizePrinterName(p);
if(printer.HasKey(p)) {
printer <<= p;
SyncPrinterOptions();
@ -303,6 +305,13 @@ bool PrinterDlg::IsCanceled()
return canceled;
}
void PrinterDlg::StandardizePrinterName(String& printerName)
{
printerName.Replace(" ", "");
printerName.Replace("\r", "");
printerName.Replace("\n", "");
}
void PrinterDlg::OnOK()
{
canceled = false;
@ -351,13 +360,14 @@ PrinterJob::PrinterJob(const char *_name)
from = to = 0;
current = 0;
pgsz = GetDefaultPageSize();
dlgSuccess = false;
}
PrinterJob::~PrinterJob()
{
}
bool PrinterJob::Execute0(bool dodlg)
bool PrinterJob::Execute0()
{
PrinterDlg dlg;
dlg.from <<= from + 1;
@ -371,11 +381,11 @@ bool PrinterJob::Execute0(bool dodlg)
String h;
GetDefaultPageSize(&h);
h.IsEmpty() ? dlg.paper <<= "A4" : dlg.paper <<= h;
if(dodlg) {
dlg.Run();
if (!dlg.IsCanceled())
return false;
}
dlg.Run();
if(dlg.IsCanceled())
return false;
options.Clear();
options << "-d " << ~dlg.printer;
options << " -o media=";
@ -411,7 +421,8 @@ bool PrinterJob::Execute0(bool dodlg)
bool PrinterJob::Execute()
{
return Execute0(false);
dlgSuccess = Execute0();
return dlgSuccess;
}
struct PrinterDraw : PdfDraw {
@ -429,9 +440,8 @@ struct PrinterDraw : PdfDraw {
Draw& PrinterJob::GetDraw()
{
if(!draw) {
bool canceled = Execute0(true);
PrinterDraw *pd = new PrinterDraw(pgsz);
pd->canceled = canceled;
pd->canceled = !dlgSuccess;
pd->options = options;
draw = pd;
}