root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
Files correlati     : xvaga.dll
Ricompilazione Demo : [ ]
Commento            :
Migliorata finestra di elaborazione PDF:
ora riporta il nome del file in corso di generazione


git-svn-id: svn://10.65.10.50/trunk@19037 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2009-06-16 14:37:01 +00:00
parent 16a2016858
commit ad6b1097e8
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xvaga/xvtextra.cpp
View File

@ -1,6 +1,7 @@
#include "wxinc.h" #include "wxinc.h"
#include "wx/print.h" #include <wx/print.h>
#include "wx/tokenzr.h" #include <wx/tokenzr.h>
#include <wx/filename.h>
#include "xvt.h" #include "xvt.h"
@ -224,11 +225,14 @@ wxDC* TwxPrintOut::CreateDC(const TPRINT_RCD* prcd, const char* title)
wxWindow* pStatic = pAbort->FindWindow(wxID_STATIC); wxWindow* pStatic = pAbort->FindWindow(wxID_STATIC);
if (pStatic != NULL) if (pStatic != NULL)
{ {
wxString strPrompt = wxT("Stampa su "); wxString strPrompt
if (IsPDF()) if (IsPDF())
strPrompt += wxT("PDF"); {
const wxFileName fn(title);
strPrompt << wxT("Generazione di ") << fn.GetFullName();
}
else else
strPrompt += PrinterName(); strPrompt << wxT("Stampa su ") << PrinterName();
pStatic->SetLabel(strPrompt); pStatic->SetLabel(strPrompt);
} }
} }
@ -764,13 +768,17 @@ void TwxPrintAbortDialog::Pulse()
} }
TwxPrintAbortDialog::TwxPrintAbortDialog() TwxPrintAbortDialog::TwxPrintAbortDialog()
: wxPrintAbortDialog(NULL, wxT("Stampa"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) : wxPrintAbortDialog(NULL, wxT("Stampa"),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
{ {
wxBoxSizer *button_sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *button_sizer = new wxBoxSizer( wxVERTICAL );
button_sizer->Add(new wxStaticText(this, wxID_STATIC, wxT("Stampa in corso..."), wxDefaultPosition, wxSize(320,-1)), 0, wxALL, 10 ); button_sizer->Add(new wxStaticText(this, wxID_STATIC, wxT("Stampa in corso..."),
button_sizer->Add(new wxGauge(this, wxID_FORWARD, 1, wxDefaultPosition, wxSize(320,-1)), 0, wxALL, 10 ); wxDefaultPosition, wxSize(480,-1)), 0, wxALL, 10 );
button_sizer->Add(new wxButton(this, wxID_CANCEL, wxT("Annulla") ), 0, wxALL | wxALIGN_CENTER, 10 ); button_sizer->Add(new wxGauge(this, wxID_FORWARD, 1, wxDefaultPosition, wxSize(480,-1)), 0, wxALL, 10 );
//button_sizer->Add(new wxButton(this, wxID_CANCEL, wxT("Annulla") ), 0, wxALL | wxALIGN_CENTER, 10 );
button_sizer->Add(new wxBitmapButton(this, wxID_CANCEL, _GetToolResource(102,32) ), 0, wxALL | wxALIGN_CENTER, 10 );
SetAutoLayout(true); SetAutoLayout(true);
SetSizer(button_sizer); SetSizer(button_sizer);

3
xvaga/xvtpdf.h
View File

@ -99,7 +99,8 @@ public:
void SetPrintData(const wxPrintData& data) { m_printData = data; } void SetPrintData(const wxPrintData& data) { m_printData = data; }
virtual int GetDepth() const { return 24; } virtual int GetDepth() const { return 24; }
const wxString& OutputFile() const { return m_fileName; }
protected: protected:
void SetFontColor(const wxColor& color) const; void SetFontColor(const wxColor& color) const;