r18412 by jghali - #11689: PDF Option "Embed PDF & EPS files" not saved with document

[scribus-commit]

Author: jghali
Date: Sat Aug  3 23:33:10 2013
New Revision: 18412

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18412
Log:
#11689: PDF Option "Embed PDF & EPS files" not saved with document

Modified:
    
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/ui/prefs_pdfexport.cpp

Modified: 
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18412&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- 
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp 
(original)
+++ 
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp 
Sat Aug  3 23:33:10 2013
@@ -1509,6 +1509,7 @@
        doc->pdfOptions().CompressMethod = 
(PDFOptions::PDFCompression)attrs.valueAsInt("CMethod", 0);
        doc->pdfOptions().Quality    = attrs.valueAsInt("Quality", 0);
        doc->pdfOptions().RecalcPic  = attrs.valueAsBool("RecalcPic");
+       doc->pdfOptions().embedPDF   = attrs.valueAsBool("EmbedPDF", false);
        doc->pdfOptions().Bookmarks  = attrs.valueAsBool("Bookmarks");
        doc->pdfOptions().MirrorH    = attrs.valueAsBool("MirrorH", false);
        doc->pdfOptions().MirrorV    = attrs.valueAsBool("MirrorV", false);

Modified: 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18412&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp 
(original)
+++ 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp 
Sat Aug  3 23:33:10 2013
@@ -3048,6 +3048,7 @@
        doc->pdfOptions().CompressMethod = 
(PDFOptions::PDFCompression)attrs.valueAsInt("CMethod", 0);
        doc->pdfOptions().Quality    = attrs.valueAsInt("Quality", 0);
        doc->pdfOptions().RecalcPic  = attrs.valueAsBool("RecalcPic");
+       doc->pdfOptions().embedPDF   = attrs.valueAsBool("EmbedPDF", false);
        doc->pdfOptions().Bookmarks  = attrs.valueAsBool("Bookmarks");
        doc->pdfOptions().MirrorH    = attrs.valueAsBool("MirrorH", false);
        doc->pdfOptions().MirrorV    = attrs.valueAsBool("MirrorV", false);

Modified: 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18412&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
 (original)
+++ 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
 Sat Aug  3 23:33:10 2013
@@ -1070,6 +1070,7 @@
        docu.writeAttribute("Compress", 
static_cast<int>(m_Doc->pdfOptions().Compress));
        docu.writeAttribute("CMethod", m_Doc->pdfOptions().CompressMethod);
        docu.writeAttribute("Quality", m_Doc->pdfOptions().Quality);
+       docu.writeAttribute("EmbedPDF", 
static_cast<int>(m_Doc->pdfOptions().embedPDF));
        docu.writeAttribute("MirrorH", 
static_cast<int>(m_Doc->pdfOptions().MirrorH));
        docu.writeAttribute("MirrorV", 
static_cast<int>(m_Doc->pdfOptions().MirrorV));
        docu.writeAttribute("Clip", 
static_cast<int>(m_Doc->pdfOptions().doClip));

Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18412&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp Sat Aug  3 23:33:10 2013
@@ -641,6 +641,7 @@
        prefsData->pdfPrefs.Resolution = epsExportResolutionSpinBox->value();
        prefsData->pdfPrefs.RecalcPic = maxResolutionLimitCheckBox->isChecked();
        prefsData->pdfPrefs.PicRes = maxExportResolutionSpinBox->value();
+       prefsData->pdfPrefs.embedPDF = embedPDFAndEPSFilesCheckBox->isChecked();
        prefsData->pdfPrefs.Bookmarks = includeBookmarksCheckBox->isChecked();
        prefsData->pdfPrefs.Binding = pageBindingComboBox->currentIndex();
        prefsData->pdfPrefs.MirrorH = 
pageMirrorHorizontalToolButton->isChecked();


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit