/branches/Version13x/Scribus/scribus/util.cpp |
---|
1646,7 → 1646,7 |
args.append("-sOutputFile="+tmpFile); |
args.append("-dFirstPage=1"); |
args.append("-dLastPage=1"); |
args.append(fn); |
args.append("\""+fn+"\""); |
ret = callGS(args); |
if (ret == 0) |
{ |
1721,7 → 1721,7 |
args.append("-r"+QString::number(gsRes)); |
args.append("-sOutputFile="+tmpFile); |
args.append("-g"+tmp.setNum(qRound(b))+"x"+tmp2.setNum(qRound(h))); |
args.append(fn); |
args.append("\""+fn+"\""); |
ret = callGS(args); |
if (ret == 0) |
{ |
2063,7 → 2063,8 |
{ |
unsigned int *ptr = (unsigned int *) img.scanLine(i); |
unsigned char c, m, y ,k; |
if ((cinfo.saw_Adobe_marker) && (cinfo.Adobe_transform == 2)) |
// if ((cinfo.saw_Adobe_marker) && (cinfo.Adobe_transform == 2)) |
if (cinfo.jpeg_color_space != cinfo.out_color_space) |
{ |
for (int j = 0; j < img.width(); j++) |
{ |
2483,7 → 2484,7 |
args.append("-sOutputFile="+tmpFile); |
args.append("-dFirstPage="+tmp); |
args.append("-dLastPage="+tmp); |
args.append(fn); |
args.append("\""+fn+"\""); |
ret = callGS(args); |
if (ret == 0) |
{ |
/branches/Version13x/Scribus/scribus/checkDocument.cpp |
---|
140,6 → 140,14 |
reportDisplay->header()->setResizeEnabled( false, reportDisplay->header()->count() - 1 ); |
reportDisplay->setSorting(-1); |
checkDocumentLayout->addWidget( reportDisplay ); |
layout2 = new QHBoxLayout( 0, 0, 5, "layou2"); |
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
layout2->addItem( spacer ); |
ignoreErrors = new QPushButton( tr( "&Ignore Errors" ), this, "ignoreErrors" ); |
layout2->addWidget( ignoreErrors ); |
checkDocumentLayout->addLayout( layout2 ); |
ignoreErrors->hide(); |
noButton = true; |
languageChange(); |
itemMap.clear(); |
pageMap.clear(); |
147,6 → 155,7 |
templateItemMap.clear(); |
resize( QSize(306, 259).expandedTo(minimumSizeHint()) ); |
clearWState( WState_Polished ); |
connect(ignoreErrors, SIGNAL(clicked()), this, SIGNAL(ignoreAllErrors())); |
connect(curCheckProfile, SIGNAL(activated(const QString&)), this, SLOT(newScan(const QString&))); |
} |
/* |
638,9 → 647,20 |
item->setText( 1, tr( "Problems found" ) ); |
item->setOpen( true ); |
} |
if (noButton) |
ignoreErrors->hide(); |
else |
ignoreErrors->show(); |
connect(reportDisplay, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotSelect(QListViewItem*))); |
} |
void CheckDocument::hide() |
{ |
noButton = true; |
ignoreErrors->hide(); |
ScrPaletteBase::hide(); |
} |
/* |
* Sets the strings of the subwidgets using the current |
* language. |
/branches/Version13x/Scribus/scribus/about.cpp |
---|
49,7 → 49,7 |
tabLayout1->addWidget( pixmapLabel1 ); |
buildID = new QLabel( tab, "BB" ); |
buildID->setAlignment(Qt::AlignCenter); |
QString bu = tr("%1 %2 %3 ").arg("1").arg("April").arg("2005"); |
QString bu = tr("%1 %2 %3 ").arg("2").arg("April").arg("2005"); |
#ifdef HAVE_CMS |
bu += "C"; |
#else |
/branches/Version13x/Scribus/scribus/scribus.cpp |
---|
8462,7 → 8462,6 |
void ScribusApp::SaveAsPDF() |
{ |
QString fn; |
if (doc->checkerProfiles[doc->curCheckProfile].autoCheck) |
{ |
scanDocument(); |
8478,6 → 8477,8 |
} |
else |
{ |
connect(docCheckerPalette, SIGNAL(ignoreAllErrors()), this, SLOT(doSaveAsPDF())); |
docCheckerPalette->noButton = false; |
docCheckerPalette->buildErrorList(doc); |
docCheckerPalette->show(); |
scrActions["toolsPreflightVerifier"]->setOn(true); |
8485,6 → 8486,18 |
} |
} |
} |
doSaveAsPDF(); |
} |
void ScribusApp::doSaveAsPDF() |
{ |
if (!docCheckerPalette->noButton) |
{ |
docCheckerPalette->hide(); |
scrActions["toolsPreflightVerifier"]->setOn(false); |
disconnect(docCheckerPalette, SIGNAL(ignoreAllErrors()), this, SLOT(doSaveAsPDF())); |
} |
QString fn; |
int Components = 3; |
QString nam = ""; |
/* if (bookmarkPalette->BView->childCount() == 0) |
/branches/Version13x/Scribus/scribus/scribus.h |
---|
442,6 → 442,7 |
void SelectFromOutlS(int Page); |
void SaveAsEps(); |
void SaveAsPDF(); |
void doSaveAsPDF(); |
void Aktiv(); |
void setItemHoch(int h); |
void setStilvalue(int s); |
/branches/Version13x/Scribus/scribus/checkDocument.h |
---|
15,6 → 15,7 |
class QListViewItem; |
class QComboBox; |
class QLabel; |
class QPushButton; |
class ScribusDoc; |
class CheckDocument : public ScrPaletteBase |
26,6 → 27,7 |
~CheckDocument() {}; |
void clearErrorList(); |
void buildErrorList(ScribusDoc *doc); |
void hide(); |
/* |
void closeEvent(QCloseEvent *ce); |
void keyPressEvent(QKeyEvent *ke); |
33,10 → 35,12 |
QComboBox* curCheckProfile; |
QLabel* textLabel1; |
QListView* reportDisplay; |
QPushButton* ignoreErrors; |
QMap<QListViewItem*, int> itemMap; |
QMap<QListViewItem*, int> pageMap; |
QMap<QListViewItem*, QString> templatePageMap; |
QMap<QListViewItem*, int> templateItemMap; |
bool noButton; |
public slots: |
void slotSelect(QListViewItem* ite); |
50,10 → 54,12 |
void selectTemplatePage(QString); |
void selectTemplateElement(QString, int); |
void selectNormal(); |
void ignoreAllErrors(); |
protected: |
QVBoxLayout* checkDocumentLayout; |
QHBoxLayout* layout1; |
QHBoxLayout* layout2; |
protected slots: |
virtual void languageChange(); |