X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6777e6575eaf7bf47b72c5910e5a4b31efd97a1..c9ed413ab4f5673ffff00198dc6ce1397398bda4:/src/gtk/print.cpp diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp index fdc52767c9..18835a2d39 100644 --- a/src/gtk/print.cpp +++ b/src/gtk/print.cpp @@ -36,6 +36,7 @@ #include "wx/paper.h" #include +#include #if wxUSE_GRAPHICS_CONTEXT #include "wx/graphics.h" @@ -48,6 +49,8 @@ wxFORCE_LINK_THIS_MODULE(gtk_print) #include "wx/gtk/gnome/gprint.h" #endif +#include "wx/gtk/private/object.h" + // Usefull to convert angles from/to Rad to/from Deg. static const double RAD2DEG = 180.0 / M_PI; static const double DEG2RAD = M_PI / 180.0; @@ -222,11 +225,14 @@ IMPLEMENT_CLASS(wxGtkPrintNativeData, wxPrintNativeDataBase) wxGtkPrintNativeData::wxGtkPrintNativeData() { m_config = gtk_print_settings_new(); + m_job = gtk_print_operation_new(); + m_context = NULL; } wxGtkPrintNativeData::~wxGtkPrintNativeData() { - g_object_unref (m_config); + g_object_unref(m_job); + g_object_unref(m_config); } // Convert datas stored in m_config to a wxPrintData. @@ -386,6 +392,9 @@ bool wxGtkPrintNativeData::TransferTo( wxPrintData &data ) data.SetPaperId( wxPAPER_FANFOLD_LGL_GERMAN); else data.SetPaperId(wxPAPER_NONE); + + data.SetPrinterName(gtk_print_settings_get_printer(m_config)); + return true; } @@ -534,6 +543,8 @@ bool wxGtkPrintNativeData::TransferFrom( const wxPrintData &data ) default: break; } + gtk_print_settings_set_printer(m_config, data.GetPrinterName().utf8_str()); + return true; } @@ -629,17 +640,19 @@ int wxGtkPrintDialog::ShowModal() gtk_print_settings_set_page_ranges (settings, range, 1); } + GtkPrintOperation * const printOp = native->GetPrintJob(); + // If the settings are OK, we restore it. if (settings != NULL) - gtk_print_operation_set_print_settings (native->GetPrintJob(), settings); - gtk_print_operation_set_default_page_setup (native->GetPrintJob(), native->GetPageSetupFromSettings(settings)); + gtk_print_operation_set_print_settings (printOp, settings); + gtk_print_operation_set_default_page_setup (printOp, native->GetPageSetupFromSettings(settings)); // Show the dialog if needed. GError* gError = NULL; if (GetShowDialog()) - response = gtk_print_operation_run (native->GetPrintJob(), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget) ), &gError); + response = gtk_print_operation_run (printOp, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget) ), &gError); else - response = gtk_print_operation_run (native->GetPrintJob(), GTK_PRINT_OPERATION_ACTION_PRINT, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)), &gError); + response = gtk_print_operation_run (printOp, GTK_PRINT_OPERATION_ACTION_PRINT, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)), &gError); // Does everything went well? if (response == GTK_PRINT_OPERATION_RESULT_CANCEL) @@ -654,10 +667,16 @@ int wxGtkPrintDialog::ShowModal() } // Now get the settings and save it. - GtkPrintSettings* newSettings = gtk_print_operation_get_print_settings (native->GetPrintJob()); + GtkPrintSettings* newSettings = gtk_print_operation_get_print_settings(printOp); native->SetPrintConfig(newSettings); data.ConvertFromNative(); + // Set PrintDialogData variables + m_printDialogData.SetPrintData(data); + m_printDialogData.SetCollate(data.GetCollate()); + m_printDialogData.SetNoCopies(data.GetNoCopies()); + m_printDialogData.SetPrintToFile(data.GetPrinterName() == "Print to File"); + // Same problem as a few lines before. switch (gtk_print_settings_get_print_pages(newSettings)) { @@ -735,43 +754,80 @@ int wxGtkPageSetupDialog::ShowModal() } } - // Now show the dialog. - GtkPageSetup* newPageSetup = gtk_print_run_page_setup_dialog (GTK_WINDOW(m_parent->m_widget), - oldPageSetup, - nativeData); - int ret; - if (newPageSetup != oldPageSetup) - { - native->SetPageSetupToSettings(nativeData, newPageSetup); - m_pageDialogData.GetPrintData().ConvertFromNative(); + // Set selected printer + gtk_print_settings_set(nativeData, "format-for-printer", + gtk_print_settings_get_printer(nativeData)); - // Store custom paper format if any. - if (m_pageDialogData.GetPrintData().GetPaperId() == wxPAPER_NONE) - { - gdouble ml,mr,mt,mb,pw,ph; - ml = gtk_page_setup_get_left_margin (newPageSetup, GTK_UNIT_MM); - mr = gtk_page_setup_get_right_margin (newPageSetup, GTK_UNIT_MM); - mt = gtk_page_setup_get_top_margin (newPageSetup, GTK_UNIT_MM); - mb = gtk_page_setup_get_bottom_margin (newPageSetup, GTK_UNIT_MM); - - pw = gtk_page_setup_get_paper_width (newPageSetup, GTK_UNIT_MM); - ph = gtk_page_setup_get_paper_height (newPageSetup, GTK_UNIT_MM); + // Create custom dialog + wxString title(GetTitle()); + if ( title.empty() ) + title = _("Page Setup"); + GtkWidget * + dlg = gtk_page_setup_unix_dialog_new(title.utf8_str(), + GTK_WINDOW(m_parent->m_widget)); - m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) ); - m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) ); + gtk_page_setup_unix_dialog_set_print_settings( + GTK_PAGE_SETUP_UNIX_DIALOG(dlg), nativeData); + gtk_page_setup_unix_dialog_set_page_setup( + GTK_PAGE_SETUP_UNIX_DIALOG(dlg), oldPageSetup); - m_pageDialogData.SetPaperSize( wxSize( (int)(pw+0.5), (int)(ph+0.5) ) ); - } + int result = gtk_dialog_run(GTK_DIALOG(dlg)); + gtk_widget_hide(dlg); - ret = wxID_OK; - } - else + switch ( result ) { - ret = wxID_CANCEL; + case GTK_RESPONSE_OK: + case GTK_RESPONSE_APPLY: + { + // Store Selected Printer Name + gtk_print_settings_set_printer + ( + nativeData, + gtk_print_settings_get(nativeData, "format-for-printer") + ); + + wxGtkObject + newPageSetup(gtk_page_setup_unix_dialog_get_page_setup( + GTK_PAGE_SETUP_UNIX_DIALOG(dlg))); + native->SetPageSetupToSettings(nativeData, newPageSetup); + + m_pageDialogData.GetPrintData().ConvertFromNative(); + + // Store custom paper format if any. + if ( m_pageDialogData.GetPrintData().GetPaperId() == wxPAPER_NONE ) + { + gdouble ml,mr,mt,mb,pw,ph; + ml = gtk_page_setup_get_left_margin (newPageSetup, GTK_UNIT_MM); + mr = gtk_page_setup_get_right_margin (newPageSetup, GTK_UNIT_MM); + mt = gtk_page_setup_get_top_margin (newPageSetup, GTK_UNIT_MM); + mb = gtk_page_setup_get_bottom_margin (newPageSetup, GTK_UNIT_MM); + + pw = gtk_page_setup_get_paper_width (newPageSetup, GTK_UNIT_MM); + ph = gtk_page_setup_get_paper_height (newPageSetup, GTK_UNIT_MM); + + m_pageDialogData.SetMarginTopLeft(wxPoint((int)(ml+0.5), + (int)(mt+0.5))); + m_pageDialogData.SetMarginBottomRight(wxPoint((int)(mr+0.5), + (int)(mb+0.5))); + + m_pageDialogData.SetPaperSize(wxSize((int)(pw+0.5), + (int)(ph+0.5))); + } + + result = wxID_OK; + } + break; + + default: + case GTK_RESPONSE_CANCEL: + result = wxID_CANCEL; + break; } - return ret; + gtk_widget_destroy(dlg); + + return result; } //---------------------------------------------------------------------------- @@ -832,9 +888,7 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) wxPrintData printdata = GetPrintDialogData().GetPrintData(); wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) printdata.GetNativeData(); - GtkPrintOperation *printOp = gtk_print_operation_new (); - - native->SetPrintJob( printOp ); + GtkPrintOperation * const printOp = native->GetPrintJob(); wxPrinterToGtkData dataToSend; dataToSend.printer = this; @@ -863,8 +917,6 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) wxFAIL_MSG(_("The print dialog returned an error.")); } - g_object_unref (printOp); - return (sm_lastError == wxPRINTER_NO_ERROR); } @@ -2256,8 +2308,14 @@ void wxGtkPrintPreview::DetermineScaling() if (paper) { - m_previewPrintout->SetPPIScreen(wxGetDisplayPPI()); - m_previewPrintout->SetPPIPrinter( m_resolution, m_resolution ); + const wxSize screenPPI = wxGetDisplayPPI(); + int logPPIScreenX = screenPPI.GetWidth(); + int logPPIScreenY = screenPPI.GetHeight(); + int logPPIPrinterX = m_resolution; + int logPPIPrinterY = m_resolution; + + m_previewPrintout->SetPPIScreen( logPPIScreenX, logPPIScreenY ); + m_previewPrintout->SetPPIPrinter( logPPIPrinterX, logPPIPrinterY ); // Get width and height in points (1/72th of an inch) wxSize sizeDevUnits(paper->GetSizeDeviceUnits()); @@ -2284,8 +2342,8 @@ void wxGtkPrintPreview::DetermineScaling() m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight)); // At 100%, the page should look about page-size on the screen. - m_previewScaleX = 0.8 * 72.0 / (double)m_resolution; - m_previewScaleY = m_previewScaleX; + m_previewScaleX = float(logPPIScreenX) / logPPIPrinterX; + m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY; } }