/branches/ScribusOIF/scribus/documentchecker.cpp |
---|
5,20 → 5,20 |
for which a new license (GPL+exception) is in place. |
*/ |
/*************************************************************************** |
begin : 2005 |
copyright : (C) 2005 by Franz Schmid |
email : Franz.Schmid@altmuehlnet.de |
copyright : (C) 2005 by Craig Bradney |
email : cbradney@zip.com.au |
begin : 2005 |
copyright : (C) 2005 by Franz Schmid |
email : Franz.Schmid@altmuehlnet.de |
copyright : (C) 2005 by Craig Bradney |
email : cbradney@zip.com.au |
***************************************************************************/ |
/*************************************************************************** |
* * |
* * |
* ScMW program is free software; you can redistribute it and/or modify * |
* it under the terms of the GNU General Public License as published by * |
* the Free Software Foundation; either version 2 of the License, or * |
* (at your option) any later version. * |
* * |
* the Free Software Foundation; either version 2 of the License, or * |
* (at your option) any later version. * |
* * |
***************************************************************************/ |
#include "commonstrings.h" |
36,6 → 36,16 |
#include <QList> |
bool isPartFilledImageFrame(PageItem * currItem) |
{ |
//qDebug() << "X" << currItem->width() << currItem->imageXScale() / 72.0 * currItem->pixm.imgInfo.xres * currItem->pixm.width(); |
//qDebug() << "Y" << currItem->height() << currItem->imageYScale() / 72.0 * currItem->pixm.imgInfo.yres * currItem->pixm.height(); |
return (currItem->height() > currItem->imageYScale() / 72.0 * currItem->pixm.imgInfo.yres * currItem->pixm.height() |
|| currItem->width() > currItem->imageXScale() / 72.0 * currItem->pixm.imgInfo.xres * currItem->pixm.width()); |
} |
bool DocumentChecker::checkDocument(ScribusDoc *currDoc) |
{ |
QString chstr; |
47,6 → 57,7 |
checkerSettings.checkOverflow = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkOverflow; |
checkerSettings.checkPictures = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkPictures; |
checkerSettings.checkResolution = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkResolution; |
checkerSettings.checkPartFilledImageFrames = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkPartFilledImageFrames; |
checkerSettings.checkTransparency = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkTransparency; |
checkerSettings.minResolution = currDoc->checkerProfiles()[currDoc->curCheckProfile()].minResolution; |
checkerSettings.maxResolution = currDoc->checkerProfiles()[currDoc->curCheckProfile()].maxResolution; |
167,6 → 178,13 |
if (currItem->asImageFrame()) |
#endif |
{ |
// check image vs. frame sizes |
if (checkerSettings.checkPartFilledImageFrames && isPartFilledImageFrame(currItem)) |
{ |
itemError.insert(PartFilledImageFrame, 0); |
} |
if ((!currItem->PictureIsAvailable) && (checkerSettings.checkPictures)) |
itemError.insert(MissingImage, 0); |
else |
184,14 → 202,6 |
if ((ext == "gif") && (checkerSettings.checkForGIF)) |
itemError.insert(ImageIsGIF, 0); |
//qDebug() << "MASTER: ImageUnderfullsFrame" << currItem->height() << currItem->imageYScale()*currItem->pixm.height() << currItem->width() << currItem->imageXScale()*currItem->pixm.width(); |
// check image vs. frame sizes |
if (currItem->height() > currItem->imageYScale() * currItem->pixm.height() |
|| currItem->width() > currItem->imageXScale() * currItem->pixm.width()) |
{ |
itemError.insert(PartFilledImageFrame, 0); |
} |
if (extensionIndicatesPDF(ext)) |
{ |
PDFAnalyzer analyst(currItem->Pfile); |
439,6 → 449,13 |
if (currItem->asImageFrame()) |
#endif |
{ |
// check image vs. frame sizes |
if (checkerSettings.checkPartFilledImageFrames && isPartFilledImageFrame(currItem)) |
{ |
itemError.insert(PartFilledImageFrame, 0); |
} |
if ((!currItem->PictureIsAvailable) && (checkerSettings.checkPictures)) |
itemError.insert(MissingImage, 0); |
else |
456,14 → 473,6 |
if ((ext == "gif") && (checkerSettings.checkForGIF)) |
itemError.insert(ImageIsGIF, 0); |
//qDebug() << "REGULAR: ImageUnderfullsFrame" << currItem->height() << currItem->imageYScale()*currItem->pixm.height() << currItem->width() << currItem->imageXScale()*currItem->pixm.width(); |
// check image vs. frame sizes |
if (currItem->height() > currItem->imageYScale() * currItem->pixm.height() |
|| currItem->width() > currItem->imageXScale() * currItem->pixm.width()) |
{ |
itemError.insert(PartFilledImageFrame, 0); |
} |
if (extensionIndicatesPDF(ext)) |
{ |
PDFAnalyzer analyst(currItem->Pfile); |
/branches/ScribusOIF/scribus/scimgdataloader_ps.cpp |
---|
696,7 → 696,7 |
m_imageInfoRecord.type = ImageType7; |
m_image.setDotsPerMeterX ((int) (xres / 0.0254)); |
m_image.setDotsPerMeterY ((int) (yres / 0.0254)); |
m_pixelFormat = Format_CMYK_8; |
m_pixelFormat = Format_YMCK_8; |
} |
else |
{ |
774,7 → 774,7 |
} |
m_imageInfoRecord.colorspace = ColorSpaceCMYK; |
m_imageInfoRecord.type = ImageType7; |
m_pixelFormat = Format_CMYK_8; |
m_pixelFormat = Format_YMCK_8; |
} |
else |
{ |
986,7 → 986,7 |
} |
} |
} |
m_pixelFormat = Format_CMYK_8; |
m_pixelFormat = Format_YMCK_8; |
} |
if ( cinfo.output_components == 1 ) |
{ |
1107,7 → 1107,7 |
} |
} |
} |
m_pixelFormat = Format_CMYK_8; |
m_pixelFormat = Format_YMCK_8; |
} |
if ( cinfo.output_components == 1 ) |
{ |
1250,7 → 1250,7 |
if (psMode == 4) |
{ |
m_imageInfoRecord.colorspace = ColorSpaceCMYK; |
m_pixelFormat = Format_CMYK_8; |
m_pixelFormat = Format_YMCK_8; |
} |
else |
{ |
1503,7 → 1503,7 |
m_imageInfoRecord.type = ImageType7; |
m_image.setDotsPerMeterX ((int) (xres / 0.0254)); |
m_image.setDotsPerMeterY ((int) (yres / 0.0254)); |
m_pixelFormat = Format_CMYK_8; |
m_pixelFormat = Format_YMCK_8; |
} |
void ScImgDataLoader_PS::loadDCS1(QString fn, int gsRes) |
1604,7 → 1604,7 |
m_imageInfoRecord.type = ImageType7; |
m_image.setDotsPerMeterX ((int) (xres / 0.0254)); |
m_image.setDotsPerMeterY ((int) (yres / 0.0254)); |
m_pixelFormat = Format_CMYK_8; |
m_pixelFormat = Format_YMCK_8; |
} |
void ScImgDataLoader_PS::blendImages(QImage &source, ScColor col) |
/branches/ScribusOIF/scribus/hyphenator.h |
---|
14,7 → 14,7 |
#include <QMap> |
#include "scribusapi.h" |
#include "hyphen.h" |
#include <hyphen.h> |
class ScribusDoc; |
class ScribusMainWindow; |
class PageItem; |
/branches/ScribusOIF/scribus/prefsmanager.cpp |
---|
5,17 → 5,17 |
for which a new license (GPL+exception) is in place. |
*/ |
/*************************************************************************** |
copyright : (C) 2005 by Craig Bradney |
email : cbradney@zip.com.au |
copyright : (C) 2005 by Craig Bradney |
email : cbradney@zip.com.au |
***************************************************************************/ |
/*************************************************************************** |
* * |
* * |
* This program is free software; you can redistribute it and/or modify * |
* it under the terms of the GNU General Public License as published by * |
* the Free Software Foundation; either version 2 of the License, or * |
* (at your option) any later version. * |
* * |
* the Free Software Foundation; either version 2 of the License, or * |
* (at your option) any later version. * |
* * |
***************************************************************************/ |
#include <QColor> |
119,7 → 119,7 |
if (importingFrom12) |
convert12Preferences(); |
//<<CB TODO Reset keyboard shortcuts of all 1.3 users as too many |
// have conflicts if they dont nuke their settings. |
// have conflicts if they dont nuke their settings. |
// - Remove for 1.3.0 release: importingFrom12=true; |
//>>CB |
} |
1573,6 → 1573,7 |
dcVerifierProfile.setAttribute("CheckOverflow", static_cast<int>(itcp.value().checkOverflow)); |
dcVerifierProfile.setAttribute("CheckPictures", static_cast<int>(itcp.value().checkPictures)); |
dcVerifierProfile.setAttribute("CheckResolution", static_cast<int>(itcp.value().checkResolution)); |
dcVerifierProfile.setAttribute("CheckPartFilledImageFrames", static_cast<int>(itcp.value().checkPartFilledImageFrames)); |
dcVerifierProfile.setAttribute("CheckTransparency", static_cast<int>(itcp.value().checkTransparency)); |
dcVerifierProfile.setAttribute("CheckAnnotations", static_cast<int>(itcp.value().checkAnnotations)); |
dcVerifierProfile.setAttribute("CheckRasterPDF", static_cast<int>(itcp.value().checkRasterPDF)); |
1897,11 → 1898,11 |
appPrefs.docSetupPrefs.margins.Left = ScCLocale::toDoubleC(dc.attribute("MarginLeft"), 9.0); |
appPrefs.docSetupPrefs.margins.Right = ScCLocale::toDoubleC(dc.attribute("MarginRight"), 9.0); |
appPrefs.docSetupPrefs.marginPreset = dc.attribute("MarginPreset", "0").toInt(); |
appPrefs.docSetupPrefs.pagePositioning = dc.attribute("PagePositioning", "0").toInt(); |
appPrefs.docSetupPrefs.AutoSave = static_cast<bool>(dc.attribute("AutoSave", "0").toInt()); |
appPrefs.docSetupPrefs.pagePositioning = dc.attribute("PagePositioning", "0").toInt(); |
appPrefs.docSetupPrefs.AutoSave = static_cast<bool>(dc.attribute("AutoSave", "0").toInt()); |
appPrefs.docSetupPrefs.AutoSaveTime = dc.attribute("AutoSaveTime", "600000").toInt(); |
appPrefs.docSetupPrefs.saveCompressed = static_cast<bool>(dc.attribute("SaveCompressed", "0").toInt()); |
appPrefs.docSetupPrefs.bleeds.Top = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0); |
appPrefs.docSetupPrefs.bleeds.Top = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0); |
appPrefs.docSetupPrefs.bleeds.Left = ScCLocale::toDoubleC(dc.attribute("BleedLeft"), 0.0); |
appPrefs.docSetupPrefs.bleeds.Right = ScCLocale::toDoubleC(dc.attribute("BleedRight"), 0.0); |
appPrefs.docSetupPrefs.bleeds.Bottom = ScCLocale::toDoubleC(dc.attribute("BleedBottom"), 0.0); |
1921,9 → 1922,9 |
appPrefs.displayPrefs.scratch.Bottom = ScCLocale::toDoubleC(dc.attribute("ScratchBottom"), 20.0); |
appPrefs.displayPrefs.scratch.Left = ScCLocale::toDoubleC(dc.attribute("ScratchLeft"), 100.0); |
appPrefs.displayPrefs.scratch.Right = ScCLocale::toDoubleC(dc.attribute("ScratchRight"), 100.0); |
appPrefs.displayPrefs.scratch.Top = ScCLocale::toDoubleC(dc.attribute("ScratchTop"), 20.0); |
appPrefs.displayPrefs.scratch.Top = ScCLocale::toDoubleC(dc.attribute("ScratchTop"), 20.0); |
appPrefs.displayPrefs.pageGapHorizontal = ScCLocale::toDoubleC(dc.attribute("PageGapHorizontal"), 0.0); |
appPrefs.displayPrefs.pageGapVertical = ScCLocale::toDoubleC(dc.attribute("PageGapVertical"), 40.0); |
appPrefs.displayPrefs.pageGapVertical = ScCLocale::toDoubleC(dc.attribute("PageGapVertical"), 40.0); |
appPrefs.displayPrefs.showPageShadow = static_cast<bool>(dc.attribute("ShowPageShadow", "1").toInt()); |
appPrefs.displayPrefs.paperColor = QColor(dc.attribute("PageColor")); |
if (dc.hasAttribute("ScratchColor")) |
2050,7 → 2051,7 |
appPrefs.itemToolPrefs.textDistances.Right = ScCLocale::toDoubleC(dc.attribute("TextDistanceRight"), 0.0); |
appPrefs.itemToolPrefs.shapeLineStyle = dc.attribute("ShapeLineStyle").toInt(); |
appPrefs.itemToolPrefs.lineStyle = dc.attribute("LineStyle").toInt(); |
appPrefs.itemToolPrefs.shapeLineWidth = ScCLocale::toDoubleC(dc.attribute("ShapeLineWidth"), 1.0); |
appPrefs.itemToolPrefs.shapeLineWidth = ScCLocale::toDoubleC(dc.attribute("ShapeLineWidth"), 1.0); |
appPrefs.itemToolPrefs.lineWidth = ScCLocale::toDoubleC(dc.attribute("LineWidth"), 1.0); |
appPrefs.itemToolPrefs.shapeLineColorShade = dc.attribute("ShapeLineColorShade").toInt(); |
appPrefs.itemToolPrefs.lineColorShade = dc.attribute("LineColorShade").toInt(); |
2261,6 → 2262,7 |
checkerSettings.checkOverflow = static_cast<bool>(dc.attribute("CheckOverflow", "1").toInt()); |
checkerSettings.checkPictures = static_cast<bool>(dc.attribute("CheckPictures", "1").toInt()); |
checkerSettings.checkResolution = static_cast<bool>(dc.attribute("CheckResolution", "1").toInt()); |
checkerSettings.checkPartFilledImageFrames = static_cast<bool>(dc.attribute("CheckPartFilledImageFrames", "0").toInt()); |
checkerSettings.checkTransparency = static_cast<bool>(dc.attribute("CheckTransparency", "1").toInt()); |
checkerSettings.minResolution = ScCLocale::toDoubleC(dc.attribute("MinimumResolution"), 144.0); |
checkerSettings.maxResolution = ScCLocale::toDoubleC(dc.attribute("MaximumResolution"), 4800.0); |
2424,7 → 2426,7 |
appPrefs.pdfPrefs.ImageProf = dc.attribute("ImageProfile", ""); |
appPrefs.pdfPrefs.PrintProf = dc.attribute("PrintProfile", ""); |
appPrefs.pdfPrefs.Info = dc.attribute("InfoString", ""); |
appPrefs.pdfPrefs.bleeds.Top = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0); |
appPrefs.pdfPrefs.bleeds.Top = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0); |
appPrefs.pdfPrefs.bleeds.Left = ScCLocale::toDoubleC(dc.attribute("BleedLeft"), 0.0); |
appPrefs.pdfPrefs.bleeds.Right = ScCLocale::toDoubleC(dc.attribute("BleedRight"), 0.0); |
appPrefs.pdfPrefs.bleeds.Bottom = ScCLocale::toDoubleC(dc.attribute("BleedBottom"), 0.0); |
2569,6 → 2571,7 |
checkerSettings.checkOverflow = true; |
checkerSettings.checkPictures = true; |
checkerSettings.checkResolution = true; |
checkerSettings.checkPartFilledImageFrames = false; |
checkerSettings.checkTransparency = true; |
checkerSettings.checkAnnotations = false; |
checkerSettings.checkRasterPDF = true; |
2593,15 → 2596,15 |
checkerSettings.checkAnnotations = true; |
checkerSettings.minResolution = 144.0; |
checkerSettings.checkDeviceColorsAndOutputIntend = true; |
cp->insert( CommonStrings::PDF_X3 , checkerSettings); |
cp->insert( CommonStrings::PDF_X3 , checkerSettings); |
checkerSettings.checkNotCMYKOrSpot = true; |
checkerSettings.checkDeviceColorsAndOutputIntend = false; |
cp->insert( CommonStrings::PDF_X1a , checkerSettings); |
cp->insert( CommonStrings::PDF_X1a , checkerSettings); |
checkerSettings.checkNotCMYKOrSpot = false; |
checkerSettings.checkDeviceColorsAndOutputIntend = true; |
checkerSettings.checkTransparency = false; |
checkerSettings.checkFontIsOpenType = false; |
cp->insert( CommonStrings::PDF_X4 , checkerSettings); |
cp->insert( CommonStrings::PDF_X4 , checkerSettings); |
} |
} |
/branches/ScribusOIF/scribus/prefsstructs.h |
---|
44,6 → 44,7 |
bool checkDeviceColorsAndOutputIntend; // unmanaged colors (device colors) must agree with output intend |
bool checkFontNotEmbedded; // embedded PDF might use fonts without embedding |
bool checkFontIsOpenType; // embedded PDF might use OpenType font program (only allowed in PDF/X-4 and PDF 1.6) |
bool checkPartFilledImageFrames; |
}; |
typedef QMap<QString, CheckerPrefs> CheckerPrefsList; |
93,7 → 94,7 |
QStringList RecentDocs; //! List of recent documents |
QString language; //! Language of the user interface |
bool useSmallWidgets; //! Use small widgets in the palettes |
bool useTabs; //! Use a tabbed MainWidget a la FireFox |
bool useTabs; //! Use a tabbed MainWidget a la FireFox |
bool showStartupDialog; //! Whether to show the startup dialog or not |
bool showSplashOnStartup; //! Whether to show the splashscreen or not |
bool stickyTools; //! Whether a user's tool section remains after use or the normal tool is reselected |
226,11 → 227,11 |
double calligrapicPenWidth; //! Width of the calligraphics Brush |
int calligrapicPenStyle; //! Line style of the calligraphics Brush |
/* Arc Tool */ |
double arcStartAngle; //! angle where the arc starts |
double arcSweepAngle; //! angle the arc spans |
double arcStartAngle; //! angle where the arc starts |
double arcSweepAngle; //! angle the arc spans |
/* Spiral Tool */ |
double spiralStartAngle; //! angle where the spiral starts |
double spiralEndAngle; //! angle where the spiral ends |
double spiralStartAngle; //! angle where the spiral starts |
double spiralEndAngle; //! angle where the spiral ends |
double spiralFactor; //! factor the spiral gets smaller |
}; |
390,13 → 391,12 |
// Image Cache |
struct ImageCachePrefs |
{ |
bool cacheEnabled; //!< Enable the image cache |
bool cacheEnabled; //!< Enable the image cache |
int maxCacheSizeMiB; //!< Maximum total size of image cache in MiB |
int maxCacheEntries; //!< Maximum number of cache entries |
int compressionLevel; //!< Cache image compression level (see QImage) |
}; |
struct ApplicationPrefs |
{ |
ColorPrefs colorPrefs; |
/branches/ScribusOIF/scribus/ui/about.cpp |
---|
112,8 → 112,8 |
buildID = new QLabel( tab ); |
buildID->setAlignment(Qt::AlignCenter); |
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse); |
QString BUILD_DAY = "27"; |
QString BUILD_MONTH = CommonStrings::january; |
QString BUILD_DAY = "14"; |
QString BUILD_MONTH = CommonStrings::february; |
QString BUILD_YEAR = "2011"; |
QString BUILD_TIME = ""; |
QString BUILD_TZ = ""; |
/branches/ScribusOIF/scribus/ui/prefs_preflightverifier.cpp |
---|
25,6 → 25,7 |
connect(checkTextOverflowCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkTransparenciesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkMissingImagesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkPartFilledImageFramesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkImageResolutionCheckBox, SIGNAL(toggled(bool)), this, SLOT(putProfile())); |
connect(checkPDFAnnotFieldsCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkPlacedPDFCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
64,6 → 65,7 |
checkTextOverflowCheckBox->setChecked(checkerProfile[prefProfile].checkOverflow); |
checkTransparenciesCheckBox->setChecked(checkerProfile[prefProfile].checkTransparency); |
checkMissingImagesCheckBox->setChecked(checkerProfile[prefProfile].checkPictures); |
checkPartFilledImageFramesCheckBox->setChecked(checkerProfile[prefProfile].checkPartFilledImageFrames); |
checkImageResolutionCheckBox->setChecked(checkerProfile[prefProfile].checkResolution); |
checkPDFAnnotFieldsCheckBox->setChecked(checkerProfile[prefProfile].checkAnnotations); |
checkPlacedPDFCheckBox->setChecked(checkerProfile[prefProfile].checkRasterPDF); |
98,6 → 100,7 |
checkerProfile[currentProfile].checkOrphans = checkItemsNotOnAPageCheckBox->isChecked(); |
checkerProfile[currentProfile].checkOverflow = checkTextOverflowCheckBox->isChecked(); |
checkerProfile[currentProfile].checkPictures = checkMissingImagesCheckBox->isChecked(); |
checkerProfile[currentProfile].checkPartFilledImageFrames = checkPartFilledImageFramesCheckBox->isChecked(); |
checkerProfile[currentProfile].checkResolution = checkImageResolutionCheckBox->isChecked(); |
checkerProfile[currentProfile].checkTransparency = checkTransparenciesCheckBox->isChecked(); |
checkerProfile[currentProfile].minResolution = minimumResolutionSpinBox->value(); |
133,6 → 136,7 |
disconnect(checkMissingGlyphsCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
disconnect(checkItemsNotOnAPageCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
disconnect(checkMissingImagesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
disconnect(checkPartFilledImageFramesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
disconnect(checkImageResolutionCheckBox, SIGNAL(toggled(bool)), this, SLOT(putProfile())); |
disconnect(checkTransparenciesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
disconnect(minimumResolutionSpinBox, SIGNAL(valueChanged(int)), this, SLOT(putProfile())); |
149,6 → 153,7 |
checkTextOverflowCheckBox->setChecked(checkerProfile[name].checkOverflow); |
checkTransparenciesCheckBox->setChecked(checkerProfile[name].checkTransparency); |
checkMissingImagesCheckBox->setChecked(checkerProfile[name].checkPictures); |
checkPartFilledImageFramesCheckBox->setChecked(checkerProfile[name].checkPartFilledImageFrames); |
checkImageResolutionCheckBox->setChecked(checkerProfile[name].checkResolution); |
minimumResolutionSpinBox->setValue( qRound(checkerProfile[name].minResolution) ); |
maximumResolutionSpinBox->setValue( qRound(checkerProfile[name].maxResolution) ); |
163,6 → 168,7 |
connect(checkMissingGlyphsCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkItemsNotOnAPageCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkMissingImagesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkPartFilledImageFramesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(checkImageResolutionCheckBox, SIGNAL(toggled(bool)), this, SLOT(putProfile())); |
connect(checkTransparenciesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile())); |
connect(minimumResolutionSpinBox, SIGNAL(valueChanged(int)), this, SLOT(putProfile())); |
183,6 → 189,7 |
checkerSettings.checkOrphans = checkItemsNotOnAPageCheckBox->isChecked(); |
checkerSettings.checkOverflow = checkTextOverflowCheckBox->isChecked(); |
checkerSettings.checkPictures = checkMissingImagesCheckBox->isChecked(); |
checkerSettings.checkPartFilledImageFrames = checkPartFilledImageFramesCheckBox->isChecked(); |
checkerSettings.checkResolution = checkImageResolutionCheckBox->isChecked(); |
checkerSettings.checkTransparency = checkTransparenciesCheckBox->isChecked(); |
checkerSettings.minResolution = minimumResolutionSpinBox->value(); |
/branches/ScribusOIF/scribus/ui/preview.cpp |
---|
584,6 → 584,8 |
bool useIC = UseICC->isChecked(); |
if (!doc->HasCMS) |
useIC = false; |
if ((doc->HasCMS) && (GsMinor >= 0) && (GsMajor >= 9)) |
useIC = false; |
PrintOptions options; |
options.pageNumbers.push_back(Seite+1); |
options.outputSeparations = false; |
649,6 → 651,11 |
args.append( "-dTextAlphaBits=4" ); |
args.append( "-dGraphicsAlphaBits=4" ); |
} |
if ((doc->HasCMS) && (GsMinor >= 0) && (GsMajor >= 9) && UseICC->isChecked()) |
{ |
args.append("-sDefaultCMYKProfile="+doc->DocInputCMYKProf.profilePath()); |
args.append("-sOutputICCProfile="+doc->DocPrinterProf.profilePath()); |
} |
// Add any extra font paths being used by Scribus to gs's font search path |
PrefsContext *pc = prefsManager->prefsFile->getContext("Fonts"); |
PrefsTable *extraFonts = pc->getTable("ExtraFontDirs"); |
689,6 → 696,8 |
bool useIC = UseICC->isChecked(); |
if (!doc->HasCMS) |
useIC = false; |
if ((doc->HasCMS) && (GsMinor >= 0) && (GsMajor >= 9)) |
useIC = false; |
PrintOptions options; |
options.pageNumbers.push_back(Seite+1); |
options.outputSeparations = false; |
737,6 → 746,11 |
args1.append("-dTextAlphaBits=4"); |
args1.append("-dGraphicsAlphaBits=4"); |
} |
if ((doc->HasCMS) && (GsMinor >= 0) && (GsMajor >= 9) && UseICC->isChecked()) |
{ |
args1.append("-sDefaultCMYKProfile="+doc->DocInputCMYKProf.profilePath()); |
args1.append("-sOutputICCProfile="+doc->DocPrinterProf.profilePath()); |
} |
// Add any extra font paths being used by Scribus to gs's font search path |
PrefsContext *pc = prefsManager->prefsFile->getContext("Fonts"); |
PrefsTable *extraFonts = pc->getTable("ExtraFontDirs"); |
/branches/ScribusOIF/scribus/ui/propertiespalette_text.cpp |
---|
916,7 → 916,9 |
advancedWidgetsItem->setText(0, tr("Advanced Settings")); |
flopItem->setText(0, tr("First Line Offset")); |
distanceItem->setText(0, tr("Columns & Text Distances")); |
optMarginsItem->setText(0, tr("Optical Margins")); |
pathTextItem->setText(0, tr("Path Text Properties")); |
int oldLineSpacingMode = lineSpacingModeCombo->currentIndex(); |
lineSpacingModeCombo->clear(); |
/branches/ScribusOIF/scribus/ui/prefs_preflightverifierbase.ui |
---|
88,8 → 88,8 |
<rect> |
<x>0</x> |
<y>0</y> |
<width>595</width> |
<height>543</height> |
<width>597</width> |
<height>545</height> |
</rect> |
</property> |
<layout class="QVBoxLayout" name="verticalLayout_2"> |
237,6 → 237,13 |
</widget> |
</item> |
<item> |
<widget class="QCheckBox" name="checkPartFilledImageFramesCheckBox"> |
<property name="text"> |
<string>Check for part filed image frames</string> |
</property> |
</widget> |
</item> |
<item> |
<widget class="QCheckBox" name="checkImageResolutionCheckBox"> |
<property name="text"> |
<string>Check image resolution</string> |
/branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/CalendarWizard.py |
---|
92,6 → 92,13 |
'Červen', 'Červenec', 'Srpen', 'Září', |
'Říjen', 'Listopad', 'Prosinec'], |
['Po', 'Út', 'St', 'Čt', 'Pá', 'So', 'Ne']], |
# Croatian by daweed |
'Croatian' : |
[['Siječanj', 'Veljača', 'Ožujak', 'Travanj', 'Svibanj', |
'Lipanj', 'Srpanj', 'Kolovoz', 'Rujan', |
'Listopad', 'Studeni', 'Prosinac'], |
['Ponedjeljak','Utorak','Srijeda','Četvrtak','Petak','Subota', 'Nedjelja']], |
'Dutch' : |
[['Januari', 'Februari', 'Maart', 'April', |
'Mei', 'Juni', 'Juli', 'Augustus', 'September', |
/branches/ScribusOIF/scribus/plugins/tools/pathstroker/pathstroker.cpp |
---|
145,7 → 145,7 |
stroke.setDashPattern(m_array); |
} |
stroke.setWidth(currItem->lineWidth()); |
QPainterPath result = stroke.createStroke(pp); |
QPainterPath result = stroke.createStroke(pp).simplified(); |
if (currItem->startArrowIndex() != 0) |
{ |
FPoint Start = currItem->PoLine.point(0); |
/branches/ScribusOIF/scribus/plugins/fileloader/scribus13format/scribus13format.cpp |
---|
483,6 → 483,7 |
checkerSettings.checkOrphans = static_cast<bool>(pg.attribute("checkOrphans", "1").toInt()); |
checkerSettings.checkOverflow = static_cast<bool>(pg.attribute("checkOverflow", "1").toInt()); |
checkerSettings.checkPictures = static_cast<bool>(pg.attribute("checkPictures", "1").toInt()); |
checkerSettings.checkPartFilledImageFrames = static_cast<bool>(pg.attribute("checkPartFilledImageFrames", "0").toInt()); |
checkerSettings.checkResolution = static_cast<bool>(pg.attribute("checkResolution", "1").toInt()); |
checkerSettings.checkTransparency = static_cast<bool>(pg.attribute("checkTransparency", "1").toInt()); |
checkerSettings.minResolution = ScCLocale::toDoubleC(pg.attribute("minResolution"), 72.0); |
/branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp |
---|
389,6 → 389,7 |
docu.writeAttribute("checkOrphans", static_cast<int>(itcp.value().checkOrphans)); |
docu.writeAttribute("checkOverflow", static_cast<int>(itcp.value().checkOverflow)); |
docu.writeAttribute("checkPictures", static_cast<int>(itcp.value().checkPictures)); |
docu.writeAttribute("checkPartFilledImageFrames", static_cast<int>(itcp.value().checkPartFilledImageFrames)); |
docu.writeAttribute("checkResolution", static_cast<int>(itcp.value().checkResolution)); |
docu.writeAttribute("checkTransparency", static_cast<int>(itcp.value().checkTransparency)); |
docu.writeAttribute("minResolution",itcp.value().minResolution); |
/branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp |
---|
1846,6 → 1846,7 |
checkerSettings.checkOrphans = attrs.valueAsBool("checkOrphans", true); |
checkerSettings.checkOverflow = attrs.valueAsBool("checkOverflow", true); |
checkerSettings.checkPictures = attrs.valueAsBool("checkPictures", true); |
checkerSettings.checkPartFilledImageFrames = attrs.valueAsBool("checkPartFilledImageFrames", false); |
checkerSettings.checkResolution = attrs.valueAsBool("checkResolution", true); |
checkerSettings.checkTransparency = attrs.valueAsBool("checkTransparency", true); |
checkerSettings.minResolution = attrs.valueAsDouble("minResolution", 72.0); |
/branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp |
---|
291,6 → 291,7 |
docu.writeAttribute("checkOrphans", static_cast<int>(itcp.value().checkOrphans)); |
docu.writeAttribute("checkOverflow", static_cast<int>(itcp.value().checkOverflow)); |
docu.writeAttribute("checkPictures", static_cast<int>(itcp.value().checkPictures)); |
docy.writeAttribute("checkPartFilledImageFrames", static_cast<int>(itcp.value().checkPartFilledImageFrames)); |
docu.writeAttribute("checkResolution", static_cast<int>(itcp.value().checkResolution)); |
docu.writeAttribute("checkTransparency", static_cast<int>(itcp.value().checkTransparency)); |
docu.writeAttribute("minResolution",itcp.value().minResolution); |
/branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp |
---|
1080,6 → 1080,7 |
checkerSettings.checkOrphans = attrs.valueAsBool("checkOrphans", true); |
checkerSettings.checkOverflow = attrs.valueAsBool("checkOverflow", true); |
checkerSettings.checkPictures = attrs.valueAsBool("checkPictures", true); |
checkerSettings.checkPartFilledImageFrames = attrs.valueAsBool("checkPartFilledImageFrames", false); |
checkerSettings.checkResolution = attrs.valueAsBool("checkResolution", true); |
checkerSettings.checkTransparency = attrs.valueAsBool("checkTransparency", true); |
checkerSettings.minResolution = attrs.valueAsDouble("minResolution", 72.0); |
/branches/ScribusOIF/scribus/CMakeLists.txt |
---|
507,8 → 507,6 |
guidesdelegate.cpp |
guidesmodel.cpp |
guidesview.cpp |
hnjalloc.c |
hyphen.c |
hyphenator.cpp |
ioapi.c |
KarbonCurveFit.cpp |
855,6 → 853,16 |
${SCRIBUS_GMAGICK_SRC} |
) |
IF(NOT HAVE_HYPHEN) |
SET(SCRIBUS_SOURCES |
${SCRIBUS_SOURCES} |
hnjalloc.c |
hyphen.c |
) |
ENDIF(NOT HAVE_HYPHEN) |
IF(WIN32) |
SET(SCRIBUS_MOC_WIN32_ONLY_CLASSES scprintengine_gdi.h) |
SET(SCRIBUS_WIN32_ONLY_SOURCES |
934,6 → 942,13 |
) |
ENDIF(HAVE_PODOFO) |
IF(HAVE_HYPHEN) |
TARGET_LINK_LIBRARIES(${EXE_NAME} |
${HYPHEN_LIBRARY} |
) |
ENDIF(HAVE_HYPHEN) |
IF(GESTURE_FRAME_PREVIEW) |
MESSAGE(STATUS "Enable gesture frame preview [experimental]") |
SET(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp) |
/branches/ScribusOIF/CMakeLists.txt |
---|
237,7 → 237,11 |
#MAN |
CMAKE_POLICY(SET CMP0005 OLD) |
SET(MANDIR "share/man/") |
SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/") |
IF(WANT_VERSIONING) |
SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/") |
ELSE(WANT_VERSIONING) |
SET(SHAREDIR "share/${MAIN_DIR_NAME}/") |
ENDIF(WANT_VERSIONING) |
ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") |
#SHARE - use the default on Apple as TAG_VERSION is empty |
247,7 → 251,11 |
IF(TAG_VERSION OR BUILD_OSX_BUNDLE) |
SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") |
ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) |
SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") |
IF(NOT WANT_VERSIONING) |
SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/") |
ELSE(NOT WANT_VERSIONING) |
SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") |
ENDIF(NOT WANT_VERSIONING) |
ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE) |
ENDIF (WIN32 OR OS2) |
ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") |
/branches/ScribusOIF/resources/loremipsum/lt.xml |
---|
0,0 → 1,14 |
<?xml version="1.0" encoding="utf8"?> |
<lorem> |
<name>lt</name> |
<author>pagal Antaną Biliūną</author> |
<url></url> |
<p>Jeigu manÄ™s kas paklaustų, kurioje pasaulio vietoje žmogui linksmiausiai Å¡vieÄia saulÄ—, gražiausiai žydi gÄ—lÄ—s, gieda paukÅ¡Äiai, oÅ¡ia medžiai, Å«kauja vÄ—jas, aÅ¡ atsakyÄiau – „TÄ—viÅ¡kÄ—je“. Jeigu manÄ™s kas paklaustų, kuriame visos žemÄ—s kampelyje žmogui gražiausias pavasaris, ramiausia vasara, spalvingiausias ruduo, balÄiausias ir puriausias žiemos sniegas, aÅ¡ taip pat atsakyÄiau – „TÄ—viÅ¡kÄ—je“. Jeigu manÄ™s kas paklaustų, su kuria vieta žmogų sieja gražiausi ir geriausi jo atsiminimai, aÅ¡ ir vÄ—l atsakyÄiau – su TÄ—viÅ¡ke, su tomis vietomis, kur mes gimÄ—me ir augome, iÅ¡ kurių prasidÄ—jo mÅ«sų gyvenimo kelias.</p> |
<p>Kad ir kur tik žmogus bÅ«tų, kad ir kur gyventų, kad ir kur keliautų, visur jį pasiveja greitasparnis TÄ—viÅ¡kÄ—s ilgesio paukÅ¡tis, vaikystÄ—s dienų klyksmu nusmelkdamas Å¡irdį ir nors mintimis sugrąžindamas į tÄ… žemÄ—s kampelį, kurio dulkių, kaip didžiausios Å¡ventenybÄ—s, po ilgų klajojimų nusilenkia paliesti sukepusiomis lÅ«pomis net rÅ«sÄiausios Å¡irdies žmonÄ—s.</p> |
<p>Taip galvojau vieną vaiskią rudens popietę, eidamas vingiuotu vieškeliu į savo senąją Tėviškę, kurios jau daug metų nebuvau matęs. Ėjau neskubėdamas, tarytum atsargiai nešdamas neramią savo širdį ir bijodamas išlieti iš jos nors bent vieną lašą to graudaus Tėviškės ilgesio, kurio ji buvo sklidina.</p> |
</lorem> |