diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 0b30b3b247a680f6f9244688c1ac0cc5a540776f..537837efa3d3ac249c52963666e6fb3c2d586704 100644 (file)
/** \file
* Native PDF import using libpoppler.
- *
+ *
* Authors:
* miklos erdelyi
*
#include "Page.h"
#include "Catalog.h"
+#ifdef HAVE_POPPLER_CAIRO
+#include <poppler/glib/poppler.h>
+#include <poppler/glib/poppler-document.h>
+#include <poppler/glib/poppler-page.h>
+#endif
+
#include "pdf-input.h"
#include "extension/system.h"
#include "extension/input.h"
#include "document-private.h"
+#include "dialogs/dialog-events.h"
#include <gtk/gtkdialog.h>
namespace Inkscape {
Glib::ustring(_("art box"))
};
-PdfImportDialog::PdfImportDialog(PDFDoc *doc)
+PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
{
-
+#ifdef HAVE_POPPLER_CAIRO
+ _poppler_doc = NULL;
+#endif // HAVE_POPPLER_CAIRO
_pdf_doc = doc;
cancelbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-cancel")));
Gtk::Adjustment *_pageNumberSpin_adj = Gtk::manage(
new class Gtk::Adjustment(1, 1, _pdf_doc->getNumPages(), 1, 10, 0));
_pageNumberSpin = Gtk::manage(new class Gtk::SpinButton(*_pageNumberSpin_adj, 1, 1));
+ _labelTotalPages = Gtk::manage(new class Gtk::Label());
hbox2 = Gtk::manage(new class Gtk::HBox(false, 0));
// Disable the page selector when there's only one page
- if ( _pdf_doc->getCatalog()->getNumPages() == 1 ) {
+ int num_pages = _pdf_doc->getCatalog()->getNumPages();
+ if ( num_pages == 1 ) {
_pageNumberSpin->set_sensitive(false);
+ } else {
+ // Display total number of pages
+ gchar *label_text = g_strdup_printf(_("out of %i"), num_pages);
+ _labelTotalPages->set_label(label_text);
+ g_free(label_text);
}
// Crop settings
- _cropCheck = Gtk::manage(new class Gtk::CheckButton(_("Crop to:")));
+ _cropCheck = Gtk::manage(new class Gtk::CheckButton(_("Clip to:")));
_cropTypeCombo = Gtk::manage(new class Gtk::ComboBoxText());
int num_crop_choices = sizeof(crop_setting_choices) / sizeof(crop_setting_choices[0]);
for ( int i = 0 ; i < num_crop_choices ; i++ ) {
_cropTypeCombo->set_active_text(crop_setting_choices[0]);
_cropTypeCombo->set_sensitive(false);
- hbox3 = Gtk::manage(new class Gtk::HBox(false, 0));
- vbox2 = Gtk::manage(new class Gtk::VBox(false, 0));
+ hbox3 = Gtk::manage(new class Gtk::HBox(false, 4));
+ vbox2 = Gtk::manage(new class Gtk::VBox(false, 4));
alignment3 = Gtk::manage(new class Gtk::Alignment(0.5, 0.5, 1, 1));
- _labelPageSettings = Gtk::manage(new class Gtk::Label(_("Page Settings")));
+ _labelPageSettings = Gtk::manage(new class Gtk::Label(_("Page settings")));
_pageSettingsFrame = Gtk::manage(new class Gtk::Frame());
- _labelPrecision = Gtk::manage(new class Gtk::Label(_("Precision of approximation for gradient meshes:")));
-
+ _labelPrecision = Gtk::manage(new class Gtk::Label(_("Precision of approximating gradient meshes:")));
+ _labelPrecisionWarning = Gtk::manage(new class Gtk::Label(_("<b>Note</b>: setting the precision too high may result in a large SVG file and slow performance.")));
+
_fallbackPrecisionSlider_adj = Gtk::manage(new class Gtk::Adjustment(2, 1, 256, 1, 10, 10));
_fallbackPrecisionSlider = Gtk::manage(new class Gtk::HScale(*_fallbackPrecisionSlider_adj));
_fallbackPrecisionSlider->set_value(2.0);
_labelPrecisionComment = Gtk::manage(new class Gtk::Label(_("rough")));
- hbox6 = Gtk::manage(new class Gtk::HBox(false, 0));
+ hbox6 = Gtk::manage(new class Gtk::HBox(false, 4));
// Text options
_labelText = Gtk::manage(new class Gtk::Label(_("Text handling:")));
_textHandlingCombo = Gtk::manage(new class Gtk::ComboBoxText());
- _textHandlingCombo->append_text(_("import text as text"));
- _textHandlingCombo->set_active_text(_("import text as text"));
-
- hbox5 = Gtk::manage(new class Gtk::HBox(false, 0));
+ _textHandlingCombo->append_text(_("Import text as text"));
+ _textHandlingCombo->set_active_text(_("Import text as text"));
+
+ hbox5 = Gtk::manage(new class Gtk::HBox(false, 4));
_embedImagesCheck = Gtk::manage(new class Gtk::CheckButton(_("Embed images")));
- vbox3 = Gtk::manage(new class Gtk::VBox(false, 0));
+ vbox3 = Gtk::manage(new class Gtk::VBox(false, 4));
alignment4 = Gtk::manage(new class Gtk::Alignment(0.5, 0.5, 1, 1));
- _labelImportSettings = Gtk::manage(new class Gtk::Label(_("Import Settings")));
+ _labelImportSettings = Gtk::manage(new class Gtk::Label(_("Import settings")));
_importSettingsFrame = Gtk::manage(new class Gtk::Frame());
- vbox1 = Gtk::manage(new class Gtk::VBox(false, 0));
+ vbox1 = Gtk::manage(new class Gtk::VBox(false, 4));
_previewArea = Gtk::manage(new class Gtk::DrawingArea());
- hbox1 = Gtk::manage(new class Gtk::HBox(false, 0));
+ hbox1 = Gtk::manage(new class Gtk::HBox(false, 4));
cancelbutton->set_flags(Gtk::CAN_FOCUS);
cancelbutton->set_flags(Gtk::CAN_DEFAULT);
cancelbutton->set_relief(Gtk::RELIEF_NORMAL);
okbutton->set_relief(Gtk::RELIEF_NORMAL);
this->get_action_area()->property_layout_style().set_value(Gtk::BUTTONBOX_END);
_labelSelect->set_alignment(0.5,0.5);
- _labelSelect->set_padding(0,0);
+ _labelSelect->set_padding(4,0);
_labelSelect->set_justify(Gtk::JUSTIFY_LEFT);
_labelSelect->set_line_wrap(false);
_labelSelect->set_use_markup(false);
_pageNumberSpin->set_numeric(true);
_pageNumberSpin->set_digits(0);
_pageNumberSpin->set_wrap(false);
- hbox2->pack_start(*_labelSelect, Gtk::PACK_SHRINK, 0);
+ _labelTotalPages->set_alignment(0.5,0.5);
+ _labelTotalPages->set_padding(4,0);
+ _labelTotalPages->set_justify(Gtk::JUSTIFY_LEFT);
+ _labelTotalPages->set_line_wrap(false);
+ _labelTotalPages->set_use_markup(false);
+ _labelTotalPages->set_selectable(false);
+ hbox2->pack_start(*_labelSelect, Gtk::PACK_SHRINK, 4);
hbox2->pack_start(*_pageNumberSpin, Gtk::PACK_SHRINK, 4);
+ hbox2->pack_start(*_labelTotalPages, Gtk::PACK_SHRINK, 4);
_cropCheck->set_flags(Gtk::CAN_FOCUS);
_cropCheck->set_relief(Gtk::RELIEF_NORMAL);
_cropCheck->set_mode(true);
_cropCheck->set_active(false);
_cropTypeCombo->set_border_width(1);
- hbox3->pack_start(*_cropCheck, Gtk::PACK_SHRINK, 0);
- hbox3->pack_start(*_cropTypeCombo, Gtk::PACK_SHRINK, 4);
+ hbox3->pack_start(*_cropCheck, Gtk::PACK_SHRINK, 4);
+ hbox3->pack_start(*_cropTypeCombo, Gtk::PACK_SHRINK, 0);
vbox2->pack_start(*hbox2);
vbox2->pack_start(*hbox3);
alignment3->add(*vbox2);
_labelPageSettings->set_alignment(0.5,0.5);
- _labelPageSettings->set_padding(0,0);
+ _labelPageSettings->set_padding(4,0);
_labelPageSettings->set_justify(Gtk::JUSTIFY_LEFT);
_labelPageSettings->set_line_wrap(false);
_labelPageSettings->set_use_markup(true);
_pageSettingsFrame->set_label_align(0,0.5);
_pageSettingsFrame->add(*alignment3);
_pageSettingsFrame->set_label_widget(*_labelPageSettings);
- _labelPrecision->set_alignment(0.5,0.5);
- _labelPrecision->set_padding(0,0);
+ _labelPrecision->set_alignment(0,0.5);
+ _labelPrecision->set_padding(4,0);
_labelPrecision->set_justify(Gtk::JUSTIFY_LEFT);
- _labelPrecision->set_line_wrap(false);
+ _labelPrecision->set_line_wrap(true);
_labelPrecision->set_use_markup(false);
_labelPrecision->set_selectable(false);
+ _labelPrecisionWarning->set_alignment(0,0.5);
+ _labelPrecisionWarning->set_padding(4,0);
+ _labelPrecisionWarning->set_justify(Gtk::JUSTIFY_LEFT);
+ _labelPrecisionWarning->set_line_wrap(true);
+ _labelPrecisionWarning->set_use_markup(true);
+ _labelPrecisionWarning->set_selectable(false);
_fallbackPrecisionSlider->set_size_request(180,-1);
_fallbackPrecisionSlider->set_flags(Gtk::CAN_FOCUS);
_fallbackPrecisionSlider->set_update_policy(Gtk::UPDATE_CONTINUOUS);
_fallbackPrecisionSlider->set_value_pos(Gtk::POS_TOP);
_labelPrecisionComment->set_size_request(90,-1);
_labelPrecisionComment->set_alignment(0.5,0.5);
- _labelPrecisionComment->set_padding(0,0);
+ _labelPrecisionComment->set_padding(4,0);
_labelPrecisionComment->set_justify(Gtk::JUSTIFY_LEFT);
_labelPrecisionComment->set_line_wrap(false);
_labelPrecisionComment->set_use_markup(false);
_labelPrecisionComment->set_selectable(false);
hbox6->pack_start(*_fallbackPrecisionSlider, Gtk::PACK_SHRINK, 4);
- hbox6->pack_start(*_labelPrecisionComment, Gtk::PACK_SHRINK, 4);
+ hbox6->pack_start(*_labelPrecisionComment, Gtk::PACK_SHRINK, 0);
_labelText->set_alignment(0.5,0.5);
- _labelText->set_padding(0,0);
+ _labelText->set_padding(4,0);
_labelText->set_justify(Gtk::JUSTIFY_LEFT);
_labelText->set_line_wrap(false);
_labelText->set_use_markup(false);
_embedImagesCheck->set_relief(Gtk::RELIEF_NORMAL);
_embedImagesCheck->set_mode(true);
_embedImagesCheck->set_active(true);
- vbox3->pack_start(*_labelPrecision, Gtk::PACK_SHRINK, 4);
+ vbox3->pack_start(*_labelPrecision, Gtk::PACK_SHRINK, 0);
vbox3->pack_start(*hbox6, Gtk::PACK_SHRINK, 0);
- vbox3->pack_start(*hbox5);
+ vbox3->pack_start(*_labelPrecisionWarning, Gtk::PACK_SHRINK, 0);
+ vbox3->pack_start(*hbox5, Gtk::PACK_SHRINK, 4);
vbox3->pack_start(*_embedImagesCheck, Gtk::PACK_SHRINK, 0);
alignment4->add(*vbox3);
_labelImportSettings->set_alignment(0.5,0.5);
- _labelImportSettings->set_padding(0,0);
+ _labelImportSettings->set_padding(4,0);
_labelImportSettings->set_justify(Gtk::JUSTIFY_LEFT);
_labelImportSettings->set_line_wrap(false);
_labelImportSettings->set_use_markup(true);
this->get_vbox()->pack_start(*hbox1);
this->set_title(_("PDF Import Settings"));
this->set_modal(true);
+ sp_transientize((GtkWidget *)this->gobj()); //Make transient
this->property_window_position().set_value(Gtk::WIN_POS_NONE);
this->set_resizable(true);
this->property_destroy_with_parent().set_value(false);
okbutton->show();
_labelSelect->show();
_pageNumberSpin->show();
+ _labelTotalPages->show();
hbox2->show();
_cropCheck->show();
_cropTypeCombo->show();
_labelPageSettings->show();
_pageSettingsFrame->show();
_labelPrecision->show();
+ _labelPrecisionWarning->show();
_fallbackPrecisionSlider->show();
_labelPrecisionComment->show();
hbox6->show();
_render_thumb = false;
#ifdef HAVE_POPPLER_CAIRO
- // Create an OutputDev
- _preview_output_dev = new CairoOutputDev();
- _preview_output_dev->startDoc(_pdf_doc->getXRef());
_cairo_surface = NULL;
_render_thumb = true;
+ // Create PopplerDocument
+ gchar *doc_uri = g_filename_to_uri(uri, NULL, NULL);
+ if (doc_uri) {
+ _poppler_doc = poppler_document_new_from_file(doc_uri, NULL, NULL);
+ g_free(doc_uri);
+ }
#endif
// Set default preview size
// Init preview
_thumb_data = NULL;
_pageNumberSpin_adj->set_value(1.0);
+ _current_page = 1;
+ _setPreviewPage(_current_page);
+
+ set_default (*okbutton);
+ set_focus (*okbutton);
}
PdfImportDialog::~PdfImportDialog() {
#ifdef HAVE_POPPLER_CAIRO
- if (_preview_output_dev) {
- delete _preview_output_dev;
- }
if (_cairo_surface) {
cairo_surface_destroy(_cairo_surface);
}
+ if (_poppler_doc) {
+ g_object_unref(G_OBJECT(_poppler_doc));
+ }
#endif
if (_thumb_data) {
if (_render_thumb) {
}
}
}
+
#endif
/**
* \brief Updates the preview area with the previously rendered thumbnail
*/
-bool PdfImportDialog::_onExposePreview(GdkEventExpose *event) {
+bool PdfImportDialog::_onExposePreview(GdkEventExpose */*event*/) {
// Check if we have a thumbnail at all
if (!_thumb_data) {
_cairo_surface = cairo_image_surface_create_for_data(_thumb_data,
CAIRO_FORMAT_ARGB32, _thumb_width, _thumb_height, _thumb_rowstride);
cairo_t *cr = cairo_create(_cairo_surface);
+ cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 1.0); // Set fill color to white
+ cairo_paint(cr); // Clear it
cairo_scale(cr, scale_factor, scale_factor); // Use Cairo for resizing the image
- _preview_output_dev->setCairo(cr);
// Render page
- _previewed_page->displaySlice(_preview_output_dev,
- 72.0, 72.0, 0,
- FALSE, /* useMediaBox */
- TRUE, /* crop */
- 0, 0,
- (int)ceil(_previewed_page->getCropWidth()),
- (int)ceil(_previewed_page->getCropHeight()),
- FALSE, /* printing */
- _pdf_doc->getCatalog());
+ if (_poppler_doc != NULL) {
+ PopplerPage *poppler_page = poppler_document_get_page(_poppler_doc, page-1);
+ poppler_page_render(poppler_page, cr);
+ g_object_unref(G_OBJECT(poppler_page));
+ }
// Clean up
- _preview_output_dev->setCairo(NULL);
cairo_destroy(cr);
// Redraw preview area
_previewArea->set_size_request(_preview_width, _preview_height);
* Parses the selected page of the given PDF document using PdfParser.
*/
SPDocument *
-PdfInput::open(::Inkscape::Extension::Input * mod, const gchar * uri) {
+PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
// Initialize the globalParams variable for poppler
if (!globalParams) {
globalParams = new GlobalParams();
}
+ // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from glib gstdio.c
+#ifndef WIN32
GooString *filename_goo = new GooString(uri);
PDFDoc *pdf_doc = new PDFDoc(filename_goo, NULL, NULL, NULL); // TODO: Could ask for password
+ delete filename_goo;
+#else
+ wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (uri, -1, NULL, NULL, NULL);
+
+ if (wfilename == NULL) {
+ return NULL;
+ }
+
+ PDFDoc *pdf_doc = new PDFDoc(wfilename, wcslen(wfilename), NULL, NULL, NULL); // TODO: Could ask for password
+ g_free (wfilename);
+#endif
+
if (!pdf_doc->isOk()) {
int error = pdf_doc->getErrorCode();
delete pdf_doc;
if (error == errEncrypted) {
g_message("Document is encrypted.");
+ } else if (error == errOpenFile) {
+ g_message("couldn't open the PDF file.");
+ } else if (error == errBadCatalog) {
+ g_message("couldn't read the page catalog.");
+ } else if (error == errDamaged) {
+ g_message("PDF file was damaged and couldn't be repaired.");
+ } else if (error == errHighlightFile) {
+ g_message("nonexistent or invalid highlight file.");
+ } else if (error == errBadPrinter) {
+ g_message("invalid printer.");
+ } else if (error == errPrinting) {
+ g_message("Error during printing.");
+ } else if (error == errPermission) {
+ g_message("PDF file does not allow that operation.");
+ } else if (error == errBadPageNum) {
+ g_message("invalid page number.");
+ } else if (error == errFileIO) {
+ g_message("file IO error.");
} else {
g_message("Failed to load document from data (error %d)", error);
}
-
+
return NULL;
}
- PdfImportDialog *dlg = new PdfImportDialog(pdf_doc);
+ PdfImportDialog *dlg = new PdfImportDialog(pdf_doc, uri);
if (!dlg->showDialog()) {
delete dlg;
delete pdf_doc;
for ( int i = 1 ; i <= pdfNumShadingTypes ; i++ ) {
pdf_parser->setApproximationPrecision(i, color_delta, 6);
}
-
+
// Parse the document structure
Object obj;
page->getContents(&obj);
if (!obj.isNull()) {
pdf_parser->parse(&obj);
}
-
+
// Cleanup
obj.free();
delete pdf_parser;