X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f1316dc97cd2bb1a8aff46fc5052c759968c7db..e96ec686d8f244bbd617c14aa0c62ff9ca0c2970:/src/generic/prntdlgg.cpp diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index c6bda3b8d3..9b9e3846c0 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -60,6 +60,8 @@ #include "wx/printdlg.h" #include "wx/paper.h" #include "wx/filename.h" +#include "wx/tokenzr.h" +#include "wx/imaglist.h" #include #include @@ -109,12 +111,12 @@ wxPostScriptPrintNativeData::~wxPostScriptPrintNativeData() { } -bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &data ) +bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &WXUNUSED(data) ) { return true; } -bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &data ) +bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &WXUNUSED(data) ) { return true; } @@ -153,7 +155,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, { if ( data ) m_printDialogData = *data; - + Init(parent); } @@ -301,7 +303,7 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER); } - + EndModal(wxID_OK); } @@ -397,10 +399,16 @@ bool wxGenericPrintDialog::TransferDataFromWindow() } if(m_rangeRadioBox) { - if (m_rangeRadioBox->GetSelection() == 0) - m_printDialogData.SetAllPages(true); - else - m_printDialogData.SetAllPages(false); + if (m_rangeRadioBox->GetSelection() == 0) + { + m_printDialogData.SetAllPages(true); + + // This means all pages, more or less + m_printDialogData.SetFromPage(1); + m_printDialogData.SetToPage(32000); + } + else + m_printDialogData.SetAllPages(false); } } else @@ -414,15 +422,10 @@ bool wxGenericPrintDialog::TransferDataFromWindow() m_printDialogData.SetNoCopies( res ); m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue()); - + return true; } -/* -TODO: collate and noCopies should be duplicated across dialog data and print data objects -(slightly different semantics on Windows but let's ignore this for a bit). -*/ - wxDC *wxGenericPrintDialog::GetPrintDC() { return new wxPostScriptDC(GetPrintDialogData().GetPrintData()); @@ -434,20 +437,153 @@ wxDC *wxGenericPrintDialog::GetPrintDC() IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog) +BEGIN_EVENT_TABLE(wxGenericPrintSetupDialog, wxDialog) + EVT_LIST_ITEM_ACTIVATED(wxPRINTID_PRINTER, wxGenericPrintSetupDialog::OnPrinter) +END_EVENT_TABLE() + wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data): wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL) { Init(data); } +/* XPM */ +static char * check_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 3 1", +/* colors */ +" s None c None", +"X c #000000", +". c #808080", +/* pixels */ +" ", +" ", +" ", +" .. ", +" XX ", +" XX. ", +" .XX ", +" XX ", +" X XX. ", +" XX .XX ", +" XX XX ", +" XXXX. ", +" XX. ", +" . ", +" ", +" " +}; + + void wxGenericPrintSetupDialog::Init(wxPrintData* data) { if ( data ) m_printData = *data; + m_targetData = data; wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); + // printer selection + + wxStaticBoxSizer *printer_sizer = new wxStaticBoxSizer( new wxStaticBox( this, -1, _("Printer") ), wxVERTICAL ); + main_sizer->Add( printer_sizer, 0, wxALL|wxGROW, 10 ); + + m_printerListCtrl = new wxListCtrl( this, wxPRINTID_PRINTER, + wxDefaultPosition, wxSize(-1,100), wxLC_REPORT|wxLC_SINGLE_SEL|wxSUNKEN_BORDER ); + wxImageList *image_list = new wxImageList; + image_list->Add( wxBitmap(check_xpm) ); + m_printerListCtrl->AssignImageList( image_list, wxIMAGE_LIST_SMALL ); + + m_printerListCtrl->InsertColumn( 0, wxT(" "), wxLIST_FORMAT_LEFT, 20 ); + m_printerListCtrl->InsertColumn( 1, wxT("Printer"), wxLIST_FORMAT_LEFT, 150 ); + m_printerListCtrl->InsertColumn( 2, wxT("Device"), wxLIST_FORMAT_LEFT, 150 ); + m_printerListCtrl->InsertColumn( 3, wxT("Status"), wxLIST_FORMAT_LEFT, 80 ); + + wxListItem item; + item.SetMask( wxLIST_MASK_TEXT ); + item.SetColumn( 1 ); + item.SetText( _("Default printer") ); + item.SetId( m_printerListCtrl->InsertItem( item ) ); + + if (data->GetPrinterName().IsEmpty()) + { + wxListItem item2; + item2.SetId( item.GetId() ); + item2.SetMask( wxLIST_MASK_IMAGE ); + item2.SetImage( 0 ); + m_printerListCtrl->SetItem( item2 ); + } + + item.SetId( 1+ item.GetId() ); + + wxArrayString errors; + wxArrayString output; + long res = wxExecute( wxT("lpstat -v"), output, errors ); + if (res >= 0 && errors.GetCount() == 0) + { + size_t i; + for (i = 0; i < output.GetCount(); i++) + { + wxStringTokenizer tok( output[i], wxT(" ") ); + wxString tmp = tok.GetNextToken(); // "device" + if (tmp != wxT("device")) + break; // the lpstat syntax must have changed. + tmp = tok.GetNextToken(); // "for" + if (tmp != wxT("for")) + break; // the lpstat syntax must have changed. + tmp = tok.GetNextToken(); // "hp_deskjet930c:" + if (tmp[tmp.Len()-1] == wxT(':')) + tmp.Remove(tmp.Len()-1,1); + wxString name = tmp; + item.SetText( name ); + item.SetId( m_printerListCtrl->InsertItem( item ) ); + tmp = tok.GetNextToken(); // "parallel:/dev/lp0" + item.SetColumn( 2 ); + item.SetText( tmp ); + m_printerListCtrl->SetItem( item ); + if (data->GetPrinterName() == name) + { + wxListItem item2; + item2.SetId( item.GetId() ); + item2.SetMask( wxLIST_MASK_IMAGE ); + item2.SetImage( 0 ); + m_printerListCtrl->SetItem( item2 ); + } + + wxString command = wxT("lpstat -p "); + command += name; + wxArrayString errors2; + wxArrayString output2; + res = wxExecute( command, output2, errors2 ); + if (res >= 0 && errors2.GetCount() == 0 && output2.GetCount() > 0) + { + tmp = output2[0]; // "printer hp_deskjet930c is idle. enable since ..." + int pos = tmp.Find( wxT('.') ); + if (pos != -1) + tmp.Remove( (size_t)pos, tmp.Len()-(size_t)pos ); + wxStringTokenizer tok2( tmp, wxT(" ") ); + tmp = tok2.GetNextToken(); // "printer" + tmp = tok2.GetNextToken(); // "hp_deskjet930c" + tmp = wxT(""); + while (tok2.HasMoreTokens()) + { + tmp += tok2.GetNextToken(); + tmp += wxT(" "); + } + item.SetColumn( 3 ); + item.SetText( tmp ); + m_printerListCtrl->SetItem( item ); + } + + item.SetColumn( 1 ); + item.SetId( 1+ item.GetId() ); + } + } + + + printer_sizer->Add( m_printerListCtrl, 0, wxALL|wxGROW, 5 ); + wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL ); main_sizer->Add( item1, 0, wxALL, 5 ); @@ -539,6 +675,32 @@ wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog() { } +void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event) +{ + // Delete check mark + long item; + for (item = 0; item < m_printerListCtrl->GetItemCount(); item++) + m_printerListCtrl->SetItemImage( item, -1 ); + + m_printerListCtrl->SetItemImage( event.GetIndex(), 0 ); + + if (event.GetIndex() == 0) + { + m_printerCommandText->SetValue( wxT("lpr") ); + } + else + { + wxString tmp = wxT("lpr -P"); + wxListItem item; + item.SetColumn( 1 ); + item.SetMask( wxLIST_MASK_TEXT ); + item.SetId( event.GetIndex() ); + m_printerListCtrl->GetItem( item ); + tmp += item.GetText(); + m_printerCommandText->SetValue( tmp ); + } +} + bool wxGenericPrintSetupDialog::TransferDataToWindow() { wxPostScriptPrintNativeData *data = @@ -566,6 +728,22 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow() wxPostScriptPrintNativeData *data = (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); + // find selected printer + long id = m_printerListCtrl->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); + if (id == 0) + { + m_printData.SetPrinterName( wxT("") ); + } + else + { + wxListItem item; + item.SetId( id ); + item.SetMask( wxLIST_MASK_TEXT ); + item.SetColumn( 1 ); + m_printerListCtrl->GetItem( item ); + m_printData.SetPrinterName( item.GetText() ); + } + if (m_printerCommandText) data->SetPrinterCommand(m_printerCommandText->GetValue()); if (m_printerOptionsText) @@ -591,6 +769,9 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow() } } + if (m_targetData) + *m_targetData = m_printData; + return true; } @@ -629,44 +810,15 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice() // Generic page setup dialog // ---------------------------------------------------------------------------- -IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog) +IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxPageSetupDialogBase) -BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog) +BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxPageSetupDialogBase) EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter) END_EVENT_TABLE() -void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event)) -{ - // We no longer query GetPrintMode, so we can eliminate the need - // to call SetPrintMode. - // This has the limitation that we can't explicitly call the PostScript - // print setup dialog from the generic Page Setup dialog under Windows, - // but since this choice would only happen when trying to do PostScript - // printing under Windows (and only in 16-bit Windows which - // doesn't have a Windows-specific page setup dialog) it's worth it. - - // First save the current settings, so the wxPrintData object is up to date. - TransferDataFromWindow(); - - // Transfer the current print settings from this dialog to the page setup dialog. - wxPrintDialogData data; - data = GetPageSetupData().GetPrintData(); - data.SetSetupDialog(true); - wxPrintDialog printDialog(this, & data); - printDialog.ShowModal(); - - // Transfer the page setup print settings from the page dialog to this dialog again, in case - // the page setup dialog changed something. - GetPageSetupData().GetPrintData() = printDialog.GetPrintDialogData().GetPrintData(); - GetPageSetupData().CalculatePaperSizeFromId(); // Make sure page size reflects the id in wxPrintData - - // Now update the dialog in case the page setup dialog changed some of our settings. - TransferDataToWindow(); -} - wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, - wxPageSetupData* data) - : wxDialog( parent, + wxPageSetupDialogData* data) + : wxPageSetupDialogBase( parent, wxID_ANY, _("Page Setup"), wxPoint(0, 0), @@ -753,10 +905,19 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, // 6) buttons wxSizer* buttonsizer = CreateButtonSizer( wxOK|wxCANCEL); - m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer...") ); - buttonsizer->Add( m_printerButton, 0, wxLEFT|wxRIGHT, 10 ); - if ( !m_pageData.GetEnablePrinter() ) - m_printerButton->Enable(false); + + if (wxPrintFactory::GetFactory()->HasPrintSetupDialog()) + { + m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer...") ); + buttonsizer->Add( m_printerButton, 0, wxLEFT|wxRIGHT, 10 ); + if ( !m_pageData.GetEnablePrinter() ) + m_printerButton->Enable(false); + } + else + { + m_printerButton = NULL; + } + // if (m_printData.GetEnableHelp()) // wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), wxDefaultCoord, wxDefaultCoord, buttonWidth, buttonHeight); mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 ); @@ -778,6 +939,11 @@ wxGenericPageSetupDialog::~wxGenericPageSetupDialog() { } +wxPageSetupDialogData& wxGenericPageSetupDialog::GetPageSetupDialogData() +{ + return m_pageData; +} + bool wxGenericPageSetupDialog::TransferDataToWindow() { if (m_marginLeftText) @@ -894,5 +1060,39 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) return choice; } +void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event)) +{ + // We no longer query GetPrintMode, so we can eliminate the need + // to call SetPrintMode. + // This has the limitation that we can't explicitly call the PostScript + // print setup dialog from the generic Page Setup dialog under Windows, + // but since this choice would only happen when trying to do PostScript + // printing under Windows (and only in 16-bit Windows which + // doesn't have a Windows-specific page setup dialog) it's worth it. + + // First save the current settings, so the wxPrintData object is up to date. + TransferDataFromWindow(); + + // Transfer the current print settings from this dialog to the page setup dialog. + +#if 0 + // Use print factory later + + wxPrintDialogData data; + data = GetPageSetupData().GetPrintData(); + data.SetSetupDialog(true); + wxPrintDialog printDialog(this, & data); + printDialog.ShowModal(); + + // Transfer the page setup print settings from the page dialog to this dialog again, in case + // the page setup dialog changed something. + GetPageSetupData().GetPrintData() = printDialog.GetPrintDialogData().GetPrintData(); + GetPageSetupData().CalculatePaperSizeFromId(); // Make sure page size reflects the id in wxPrintData + + // Now update the dialog in case the page setup dialog changed some of our settings. + TransferDataToWindow(); +#endif +} + #endif