← Back to branch summary

~ubuntu-branches/ubuntu/maverick/scribus-ng/maverick-backports

« back to all changes in this revision

Viewing changes to scribus/reformdoc.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Oleksandr Moskalenko
  • Date: 2009-10-30 20:00:37 UTC
  • mfrom: (0.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20091030200037-tes6nzts7t35gg5h
Tags: 1.3.5.dfsg+svn20091030-1
http://bugs.debian.org/534510
http://bugs.debian.org/552026
* Upstream svn update with bugfixes. Prepare the tarball for uploading into
  Debian (Closes: #534510, #552026).
* debian/control:
  - Refresh arch list.
  - Update Standards-Version to 3.8.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/reformdoc.cpp
145
145
        tabView->gapHorizontal->setValue(currDoc->GapHorizontal); // * unitRatio);
146
146
        tabView->gapVertical->setValue(currDoc->GapVertical); // * unitRatio);
147
147
        tabView->setPaperColor(currDoc->papColor);
 
148
        tabView->setMarginColored(currDoc->marginColored);
148
149
        tabHyphenator->restoreDefaults(currDoc);
149
150
        tabGuides->restoreDefaults(&currDoc->guidesSettings, &currDoc->typographicSettings, docUnitIndex);
150
151
        tabTypo->restoreDefaults(&currDoc->typographicSettings);
258
259
                if (tabPage->marginGroup->getMarginsForAllPages())
259
260
                {
260
261
                        pp->initialMargins=updatedMargins;
 
262
                        pp->marginPreset=currDoc->marginPreset;
261
263
                }
262
264
                else
263
265
                if (tabPage->marginGroup->getMarginsForAllMasterPages())
273
275
                                pp->initialMargins.Bottom == mp->initialMargins.Bottom)
274
276
                        {
275
277
                                pp->initialMargins=updatedMargins;
 
278
                                pp->marginPreset=currDoc->marginPreset;
276
279
                        }
277
280
                }
278
281
        }
291
294
                if (tabPage->marginGroup->getMarginsForAllMasterPages())
292
295
                {
293
296
                        pp->initialMargins=updatedMargins;
 
297
                        pp->marginPreset=currDoc->marginPreset;
294
298
                }
295
299
                pp->setXOffset(currDoc->scratch.Left);
296
300
                pp->setYOffset(currDoc->scratch.Top);
433
437
                                                                        &currDoc->toolSettings.polyCurvature);
434
438
        currDoc->AutoSave = tabPage->GroupAS->isChecked();
435
439
        currDoc->AutoSaveTime = tabPage->ASTime->value() * 60 * 1000;
 
440
        currDoc->autoSaveTimer->stop();
436
441
        if (currDoc->AutoSave)
437
 
        {
438
 
                currDoc->autoSaveTimer->stop();
439
442
                currDoc->autoSaveTimer->start(currDoc->AutoSaveTime);
440
 
        }
 
443
 
441
444
/*      FIXME: scribus determines dict by charstyle now, so this setting should go into the doc's default charstyle
442
445
                currDoc->docHyphenator->slotNewDict(ScMW->GetLang(tabHyphenator->language->currentText()));
443
446
*/
533
536
        currDoc->PDF_Options.Compress = tabPDF->Compression->isChecked();
534
537
        currDoc->PDF_Options.CompressMethod = (PDFOptions::PDFCompression) tabPDF->CMethod->currentIndex();
535
538
        currDoc->PDF_Options.Quality = tabPDF->CQuality->currentIndex();
 
539
        currDoc->PDF_Options.embedPDF = tabPDF->EmbedPDF->isChecked();
536
540
        currDoc->PDF_Options.Resolution = tabPDF->Resolution->value();
537
541
        currDoc->PDF_Options.RecalcPic = tabPDF->DSColor->isChecked();
538
542
        currDoc->PDF_Options.PicRes = tabPDF->ValC->value();