Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1197 → Rev 1198

/branches/Version13x/Scribus/scribus/pageitem.cpp
2162,8 → 2162,9
else
{
p->setLineWidth(1);
p->setPen(black);
p->setFillMode(0);
p->setPen(red);
p->setBrush(red);
p->setFillMode(1);
p->drawRect(hl->xco, hl->yco-(hl->Siz / 10.0), (hl->Siz / 10.0)*(hl->scale / 100.0), (hl->Siz / 10.0));
}
}
/branches/Version13x/Scribus/scribus/libabout/about.cpp
65,7 → 65,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("16").arg("January").arg("2005");
QString bu = tr("%1. %2 %3 ").arg("17").arg("January").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scribus.cpp
4398,12 → 4398,13
bool ScribusApp::doPrint(PrintOptions *options)
{
bool retw = false;
fileWatcher->forceScan();
fileWatcher->stop();
QMap<QString,QFont> ReallyUsed;
QString filename = options->filename;
ReallyUsed.clear();
GetUsedFonts(&ReallyUsed);
if (!GetUsedFonts(&ReallyUsed))
return false;
fileWatcher->forceScan();
fileWatcher->stop();
PSLib *dd = getPSDriver(true, Prefs.AvailFonts, ReallyUsed, doc->PageColors, false);
if (dd != NULL)
{
7443,8 → 7444,6
 
bool ScribusApp::DoSaveAsEps(QString fn)
{
fileWatcher->forceScan();
fileWatcher->stop();
bool return_value = true;
std::vector<int> pageNs;
pageNs.push_back(doc->currentPage->PageNr+1);
7452,7 → 7451,10
qApp->setOverrideCursor(QCursor(waitCursor), true);
QMap<QString,QFont> ReallyUsed;
ReallyUsed.clear();
GetUsedFonts(&ReallyUsed);
if (!GetUsedFonts(&ReallyUsed))
return false;
fileWatcher->forceScan();
fileWatcher->stop();
PSLib *dd = getPSDriver(false, Prefs.AvailFonts, ReallyUsed, doc->PageColors, false);
if (dd != NULL)
{
7542,7 → 7544,8
doc->PDF_Optionen.Bookmarks = false; */
QMap<QString,QFont> ReallyUsed;
ReallyUsed.clear();
GetUsedFonts(&ReallyUsed);
if (!GetUsedFonts(&ReallyUsed))
return;
if (doc->PDF_Optionen.EmbedList.count() != 0)
{
QValueList<QString> tmpEm;
9245,11 → 9248,14
buildFontMenu();
}
 
void ScribusApp::GetUsedFonts(QMap<QString,QFont> *Really)
bool ScribusApp::GetUsedFonts(QMap<QString,QFont> *Really)
{
PageItem* it;
FPointArray gly;
QString chx;
bool missing = false;
bool ret = true;
QMap<QString, QString> missingPlace;
for (uint d = 0; d < doc->MasterItems.count(); ++d)
{
it = doc->MasterItems.at(d);
9277,6 → 9283,16
gly = (*doc->AllFonts)[it->itemText.at(e)->cfont]->GlyphArray[numco].Outlines.copy();
(*doc->AllFonts)[it->itemText.at(e)->cfont]->RealGlyphs.insert(numco, gly);
}
else
{
QString tmp;
missing = true;
if (it->OwnPage == -1)
tmp = tr("Free Object");
else
tmp = "on Template Page " + doc->MasterPages.at(it->OwnPage)->PageNam;
missingPlace.insert(it->AnName, tmp);
}
}
continue;
}
9285,6 → 9301,16
gly = (*doc->AllFonts)[it->itemText.at(e)->cfont]->GlyphArray[chr].Outlines.copy();
(*doc->AllFonts)[it->itemText.at(e)->cfont]->RealGlyphs.insert(chr, gly);
}
else
{
QString tmp;
missing = true;
if (it->OwnPage == -1)
tmp = tr("Free Object");
else
tmp = "on Template Page " + doc->MasterPages.at(it->OwnPage)->PageNam;
missingPlace.insert(it->AnName, tmp);
}
}
}
}
9315,6 → 9341,16
gly = (*doc->AllFonts)[it->itemText.at(e)->cfont]->GlyphArray[numco].Outlines.copy();
(*doc->AllFonts)[it->itemText.at(e)->cfont]->RealGlyphs.insert(numco, gly);
}
else
{
QString tmp, tmp2;
missing = true;
if (it->OwnPage == -1)
tmp = tr("Free Object");
else
tmp = "on Page " + tmp2.setNum(it->OwnPage+1);
missingPlace.insert(it->AnName, tmp);
}
}
continue;
}
9323,9 → 9359,38
gly = (*doc->AllFonts)[it->itemText.at(e)->cfont]->GlyphArray[chr].Outlines.copy();
(*doc->AllFonts)[it->itemText.at(e)->cfont]->RealGlyphs.insert(chr, gly);
}
else
{
QString tmp, tmp2;
missing = true;
if (it->OwnPage == -1)
tmp = tr("Free Object");
else
tmp = "on Page " + tmp2.setNum(it->OwnPage+1);
missingPlace.insert(it->AnName, tmp);
}
}
}
}
if (missing)
{
qApp->setOverrideCursor(QCursor(arrowCursor), true);
QString mess = tr("Detected some Objects with missing Glyphs:")+"\n\n";
QMap<QString,QString>::Iterator it;
for (it = missingPlace.begin(); it != missingPlace.end(); ++it)
{
mess += it.key() + " "+ it.data() +"\n";
}
mess += "\n"+ tr("Do you really want to continue?");
int t = QMessageBox::warning(this, tr("Warning"), mess, tr("No"), tr("Yes"), 0, 0, 0);
if (t == 0)
ret = false;
else
ret = true;
}
else
ret = true;
return ret;
}
 
void ScribusApp::HaveRaster(bool art)
/branches/Version13x/Scribus/scribus/scribus.h
126,7 → 126,7
void RestoreBookMarks();
void AdjustBM();
void ReorgFonts();
void GetUsedFonts(QMap<QString,QFont> *Really);
bool GetUsedFonts(QMap<QString,QFont> *Really);
void ToggleAllGuides();
static void defaultCrashHandler (int sig);
void emergencySave();