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

[scribus-commit]

Author: jghali
Date: Sat Aug  3 23:31:44 2013
New Revision: 18411

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

Modified:
    branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
    branches/Version14x/Scribus/scribus/tabpdfoptions.cpp

Modified: branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18411&path=/branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Sat Aug  3 23:31:44 2013
@@ -676,6 +676,7 @@
 				m_Doc->PDF_Options.CompressMethod = (PDFOptions::PDFCompression) pg.attribute("CMethod", "0").toInt();
 				m_Doc->PDF_Options.Quality = pg.attribute("Quality", "0").toInt();
 				m_Doc->PDF_Options.RecalcPic = static_cast<bool>(pg.attribute("RecalcPic").toInt());
+				m_Doc->PDF_Options.embedPDF = pg.attribute("EmbedPDF", "0").toInt();
 				m_Doc->PDF_Options.Bookmarks = static_cast<bool>(pg.attribute("Bookmarks").toInt());
 				if (pg.hasAttribute("firstUse"))
 					m_Doc->PDF_Options.firstUse = static_cast<bool>(pg.attribute("firstUse").toInt());

Modified: branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18411&path=/branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp Sat Aug  3 23:31:44 2013
@@ -660,6 +660,7 @@
 	docu.writeAttribute("Compress", static_cast<int>(m_Doc->PDF_Options.Compress));
 	docu.writeAttribute("CMethod", m_Doc->PDF_Options.CompressMethod);
 	docu.writeAttribute("Quality", m_Doc->PDF_Options.Quality);
+	docu.writeAttribute("EmbedPDF", static_cast<int>(m_Doc->PDF_Options.embedPDF));
 	docu.writeAttribute("MirrorH", static_cast<int>(m_Doc->PDF_Options.MirrorH));
 	docu.writeAttribute("MirrorV", static_cast<int>(m_Doc->PDF_Options.MirrorV));
 	docu.writeAttribute("Clip", static_cast<int>(m_Doc->PDF_Options.doClip));

Modified: branches/Version14x/Scribus/scribus/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18411&path=/branches/Version14x/Scribus/scribus/tabpdfoptions.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/tabpdfoptions.cpp (original)
+++ branches/Version14x/Scribus/scribus/tabpdfoptions.cpp Sat Aug  3 23:31:44 2013
@@ -1407,6 +1407,7 @@
 	pdfOptions.Resolution = Resolution->value();
 	pdfOptions.RecalcPic = DSColor->isChecked();
 	pdfOptions.PicRes = ValC->value();
+	pdfOptions.embedPDF  = EmbedPDF->isChecked();
 	pdfOptions.Bookmarks = CheckBM->isChecked();
 	pdfOptions.Binding = ComboBind->currentIndex();
 	pdfOptions.MirrorH = MirrorH->isChecked();