Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 116 → Rev 117

/trunk/Scribus/configure.in
13,7 → 13,7
AC_ARG_PROGRAM
 
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(scribus,1.1.3)
AM_INIT_AUTOMAKE(scribus,1.1.4cvs)
 
dnl KDE_SET_PREFIX
 
/trunk/Scribus/ChangeLogCVS
1,61 → 1,4
Changes since Version 1.1.2
28.11.2003 Fixed Bug that prevented proper recognition of User Defined ICC-Profile Directorys.
Changes since Version 1.1.3
29.11.2003 Added Button for importing Styles for other Documents to the Style Editor.
You can now switch Blackpoint Compensation on or off in the CMS Preferences.
 
27.11.2003 Fixed Bug that caused Scribus to hang when importing the same Page twice.
 
26.11.2003 Fixed Crash when loading Documents.
 
24.11.2003 Fixed duplication of Styles when importing Pages or Objects.
 
23.11.2003 Added a "Revert to Saved" Option to the File Menu.
Changed Behaviour of the Home and End Key in the Story Editor.
Fixed Item Name issues.
 
22.11.2003 Added Group/Ungroup Items to Right Mouse Click Context Menu.
The Fontsize is now a float, you can have now Fontsize like 12.3 pt
Managed Guides is now available for Template Pages too.
21.11.2003 The Linewith of a Textframe is now honoured in the Distances of the
Text to the Frameborders when the Borderline is visible.
 
20.11.2003 Fixed Bug in the PDF and Postscript Export with linked Frames.
Increased the maximum Linewidth to 36 pts.
Fixed Segfault when deleting more than one Page at once.
 
19.11.2003 Fixed Bug in the Story Editor with linked Textframes.
You can now edit Texts on a Path with the Story Editor too.
 
18.11.2003 Fixed Segfault when opening certain Documents.
Improved the Hyphenator.
 
17.11.2003 Fixed Segfault when creating Template Pages.
The Story Editor can handle now linked Textframes correctly.
 
16.11.2003 Improved the Story Editor.
Fixed some issues with Copy and Paste.
 
15.11.2003 Added first version of the Story Editor.
 
12.11.2003 Fixed Bug with TIFF-Images.
 
10.11.2003 Added Web-Links to the PDF-Export.
Fixed compilation issues with Python 2.3
 
09.11.2003 Fixed compilation issues with the Scripter-Plugin.
Fixed wrong colors for Gradients in PDF.
 
08.11.2003 You can now insert Pictures by simply dragging them to a Page.
Setting the Textflow works again for Lines.
Added an absolute coordinate Mode to the Node-Palette.
Fixed Bug with Pathtexts.
 
06.11.2003 Added a --without-python option to ./configure for
those who don't have a use for the Scripter-Plugin.
 
05.11.2003 Improved the Preview in the charselect plugin.
 
04.11.2003 When you resize a Textframe with the Mouse and press
CTRL+SHIFT the Text is scaled accordingly.
 
02.11.2003 Reenabled the Fontpreview in the Preferences.
Fixed Bug in the "SetText" Command of the Scripter.
/trunk/Scribus/scribus/editformats.h
17,6 → 17,7
~StilFormate() {};
 
QListBox* ListBox1;
QPushButton* LoadS;
QPushButton* NewB;
QPushButton* EditB;
QPushButton* DublicateB;
35,6 → 36,7
void neuesFormat();
void dupFormat();
void deleteFormat();
void loadStyles();
 
protected:
QHBoxLayout* StilFormateLayout;
/trunk/Scribus/scribus/cmsprefs.cpp
164,6 → 164,12
GamutC->setText( tr( "Mark Colors out of Gamut" ) );
GamutC->setChecked(Vor->GamutCheck);
CMSPrefsLayout->addWidget( GamutC );
 
BlackP = new QCheckBox( this, "Black" );
BlackP->setText( tr( "Use Blackpoint Compensation" ) );
BlackP->setChecked(Vor->BlackPoint);
CMSPrefsLayout->addWidget( BlackP );
 
if (!CheckBox1->isChecked())
{
Simulate->setEnabled( false );
207,6 → 213,7
(Prefs->DefaultIntentMonitor != MonitorI->currentItem()) ||
(Prefs->SoftProofOn != Simulate->isChecked()) ||
(Prefs->GamutCheck != GamutC->isChecked()) ||
(Prefs->BlackPoint != BlackP->isChecked()) ||
(Prefs->CMSinUse != CheckBox1->isChecked()))
Changed = true;
Prefs->DefaultInputProfile = InputP->currentText();
219,6 → 226,7
Prefs->SoftProofOn = Simulate->isChecked();
Prefs->GamutCheck = GamutC->isChecked();
Prefs->CMSinUse = CheckBox1->isChecked();
Prefs->BlackPoint = BlackP->isChecked();
accept();
}
 
/trunk/Scribus/scribus/scribusdoc.h
208,6 → 208,7
bool CMSinUse;
bool SoftProofOn;
bool GamutCheck;
bool BlackPoint;
} ;
 
struct UndoData {
/trunk/Scribus/scribus/libabout/about.cpp
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(28).arg("November").arg(2003);
QString bu = tr("%1. %2 %3 ").arg(29).arg("November").arg(2003);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/cmsprefs.h
45,6 → 45,7
QLabel* Text21;
QCheckBox* Simulate;
QCheckBox* GamutC;
QCheckBox* BlackP;
QPushButton* Cancel;
QPushButton* OK;
CMSset *Prefs;
/trunk/Scribus/scribus/scribus.cpp
319,6 → 319,7
Prefs.DCMSset.CMSinUse = false;
Prefs.DCMSset.SoftProofOn = false;
Prefs.DCMSset.GamutCheck = false;
Prefs.DCMSset.BlackPoint = true;
Prefs.DCMSset.DefaultIntentMonitor = 1;
Prefs.DCMSset.DefaultIntentMonitor2 = 1;
Prefs.DCMSset.DefaultIntentPrinter = 0;
1479,6 → 1480,7
doc->CMSSettings.DefaultIntentMonitor2 = Prefs.DCMSset.DefaultIntentMonitor2;
doc->CMSSettings.SoftProofOn = Prefs.DCMSset.SoftProofOn;
doc->CMSSettings.GamutCheck = Prefs.DCMSset.GamutCheck;
doc->CMSSettings.BlackPoint = Prefs.DCMSset.BlackPoint;
doc->CMSSettings.CMSinUse = Prefs.DCMSset.CMSinUse;
doc->PDF_Optionen.SolidProf = doc->CMSSettings.DefaultInputProfile2;
doc->PDF_Optionen.ImageProf = doc->CMSSettings.DefaultInputProfile;
2373,6 → 2375,7
doc->CMSSettings.DefaultIntentMonitor2 = Prefs.DCMSset.DefaultIntentMonitor2;
doc->CMSSettings.SoftProofOn = Prefs.DCMSset.SoftProofOn;
doc->CMSSettings.GamutCheck = Prefs.DCMSset.GamutCheck;
doc->CMSSettings.BlackPoint = Prefs.DCMSset.BlackPoint;
doc->CMSSettings.CMSinUse = false;
}
if (CMSavail)
/trunk/Scribus/scribus/editformats.cpp
2,6 → 2,8
#include "editformats.moc"
#include "edit1format.h"
#include <qmessagebox.h>
#include "customfdialog.h"
#include "scribusXml.h"
extern QPixmap loadIcon(QString nam);
 
StilFormate::StilFormate( QWidget* parent, ScribusDoc *doc, preV *avail)
24,6 → 26,10
Layout15->setSpacing( 6 );
Layout15->setMargin( 0 );
 
LoadS = new QPushButton( this, "LoadF" );
LoadS->setText( tr( "Append" ) );
Layout15->addWidget( LoadS );
 
NewB = new QPushButton( this, "NewB" );
NewB->setText( tr( "New" ) );
Layout15->addWidget( NewB );
60,6 → 66,7
connect(SaveB, SIGNAL(clicked()), this, SLOT(accept()));
connect(EditB, SIGNAL(clicked()), this, SLOT(editFormat()));
connect(NewB, SIGNAL(clicked()), this, SLOT(neuesFormat()));
connect(LoadS, SIGNAL(clicked()), this, SLOT(loadStyles()));
connect(DublicateB, SIGNAL(clicked()), this, SLOT(dupFormat()));
connect(DeleteB, SIGNAL(clicked()), this, SLOT(deleteFormat()));
connect(ListBox1, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selFormat(QListBoxItem*)));
141,6 → 148,43
}
}
 
void StilFormate::loadStyles()
{
QString fileName;
#ifdef HAVE_LIBZ
CustomFDialog dia(this, tr("Open"), tr("Documents (*.sla *.sla.gz *.scd *.scd.gz);;All Files (*)"));
#else
CustomFDialog dia(this, tr("Open"), tr("Documents (*.sla *.scd);;All Files (*)"));
#endif
if (dia.exec() == QDialog::Accepted)
fileName = dia.selectedFile();
else
return;
if (!fileName.isEmpty())
{
ScriXmlDoc *ss = new ScriXmlDoc();
if (ss->ReadStyles(fileName, Docu, fon))
{
for (uint xx=0; xx<ss->Vorlagen.count(); ++xx)
{
struct StVorL sty;
sty.Vname = ss->Vorlagen[xx].Vname;
sty.LineSpa = ss->Vorlagen[xx].LineSpa;
sty.Ausri = ss->Vorlagen[xx].Ausri;
sty.Indent = ss->Vorlagen[xx].Indent;
sty.First = ss->Vorlagen[xx].First;
sty.Avor = ss->Vorlagen[xx].Avor;
sty.Anach = ss->Vorlagen[xx].Anach;
sty.Font = ss->Vorlagen[xx].Font;
sty.FontSize = ss->Vorlagen[xx].FontSize;
TempVorl.append(sty);
}
delete ss;
UpdateFList();
}
}
}
 
void StilFormate::UpdateFList()
{
ListBox1->clear();
/trunk/Scribus/scribus/scribuswin.cpp
120,8 → 120,11
else
dcmsFlags |= cmsFLAGS_SOFTPROOFING;
#ifdef cmsFLAGS_BLACKPOINTCOMPENSATION
dcmsFlags2 |= cmsFLAGS_BLACKPOINTCOMPENSATION;
dcmsFlags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
if (doc->CMSSettings.BlackPoint)
{
dcmsFlags2 |= cmsFLAGS_BLACKPOINTCOMPENSATION;
dcmsFlags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
}
#endif
stdProof = cmsCreateProofingTransform(doc->DocInputProf, TYPE_RGB_16,
doc->DocOutputProf, TYPE_RGB_16,
/trunk/Scribus/scribus/scribusXml.h
21,6 → 21,7
ScriXmlDoc() {};
~ScriXmlDoc() {};
QString ReadDatei(QString fileName);
bool ReadStyles(QString fileName, ScribusDoc* doc, preV *Prefs);
bool ReadColors(QString fileName);
int ReadPageCount(QString fileName);
bool ReadPage(QString fileName, SCFonts &avail, ScribusDoc *doc, ScribusView *view, int PageToLoad);
33,6 → 34,7
void WritePref(preV *Vor, QString ho);
bool ReadPref(struct preV *Vorein, QString ho);
CListe Farben;
QValueList<StVorL> Vorlagen;
struct Linked { int Start;
int StPag;
};
/trunk/Scribus/scribus/scribusXml.cpp
72,6 → 72,104
/** end changes */
}
 
bool ScriXmlDoc::ReadStyles(QString fileName, ScribusDoc* doc, preV *Prefs)
{
struct StVorL vg;
QMap<QString,QString> DoFonts;
QDomDocument docu("scridoc");
QString f = "";
QString tmpf;
QFont fo;
bool fou;
Vorlagen.clear();
DoFonts.clear();
f = ReadDatei(fileName);
if (f == "")
return false;
if(!docu.setContent(f))
return false;
QDomElement elem=docu.documentElement();
if ((elem.tagName() != "SCRIBUS") && (elem.tagName() != "SCRIBUSUTF8"))
return false;
QDomNode DOC=elem.firstChild();
while(!DOC.isNull())
{
QDomElement dc=DOC.toElement();
QDomNode PAGE=DOC.firstChild();
while(!PAGE.isNull())
{
QDomElement pg=PAGE.toElement();
if(pg.tagName()=="FONT")
{
tmpf = pg.attribute("NAME");
if ((!Prefs->AvailFonts.find(tmpf)) || (!Prefs->AvailFonts[tmpf]->UseFont))
{
if ((!Prefs->GFontSub.contains(tmpf)) || (!Prefs->AvailFonts[Prefs->GFontSub[tmpf]]->UseFont))
{
qApp->setOverrideCursor(QCursor(arrowCursor), true);
DmF *dia = new DmF(0, tmpf, Prefs);
dia->exec();
tmpf = dia->Ersatz;
delete dia;
qApp->setOverrideCursor(QCursor(waitCursor), true);
Prefs->GFontSub[pg.attribute("NAME")] = tmpf;
}
else
tmpf = Prefs->GFontSub[tmpf];
}
fo = Prefs->AvailFonts[tmpf]->Font;
fo.setPointSize(qRound(doc->Dsize / 10.0));
doc->AddFont(tmpf, fo);
DoFonts[pg.attribute("NAME")] = tmpf;
}
if(pg.tagName()=="STYLE")
{
fou = false;
vg.Vname = pg.attribute("NAME");
vg.LineSpa = QStodouble(pg.attribute("LINESP"));
vg.Indent = QStodouble(pg.attribute("INDENT","0"));
vg.First = QStodouble(pg.attribute("FIRST","0"));
vg.Ausri = QStoInt(pg.attribute("ALIGN"));
vg.Avor = QStodouble(pg.attribute("VOR","0"));
vg.Anach = QStodouble(pg.attribute("NACH","0"));
if (pg.hasAttribute("FONT"))
vg.Font = DoFonts[pg.attribute("FONT")];
else
vg.Font = DoFonts[doc->Dfont];
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10.0);
for (uint xx=0; xx<Vorlagen.count(); ++xx)
{
if (vg.Vname == Vorlagen[xx].Vname)
{
if ((vg.LineSpa == Vorlagen[xx].LineSpa) &&
(vg.Indent == Vorlagen[xx].Indent) &&
(vg.First == Vorlagen[xx].First) &&
(vg.Ausri == Vorlagen[xx].Ausri) &&
(vg.Avor == Vorlagen[xx].Avor) &&
(vg.Anach == Vorlagen[xx].Anach) &&
(vg.Font == Vorlagen[xx].Font) &&
(vg.FontSize == Vorlagen[xx].FontSize))
{
fou = true;
}
else
{
vg.Vname = "Copy of "+Vorlagen[xx].Vname;
fou = false;
}
break;
}
}
if (!fou)
Vorlagen.append(vg);
}
PAGE=PAGE.nextSibling();
}
DOC=DOC.nextSibling();
}
return true;
}
 
bool ScriXmlDoc::ReadColors(QString fileName)
{
QDomDocument docu("scridoc");
717,6 → 815,7
doc->CMSSettings.SoftProofOn = static_cast<bool>(QStoInt(dc.attribute("DPSo","0")));
doc->CMSSettings.CMSinUse = static_cast<bool>(QStoInt(dc.attribute("DPuse","0")));
doc->CMSSettings.GamutCheck = static_cast<bool>(QStoInt(dc.attribute("DPgam","0")));
doc->CMSSettings.BlackPoint = static_cast<bool>(QStoInt(dc.attribute("DPbla","1")));
doc->CMSSettings.DefaultMonitorProfile = dc.attribute("DPMo","");
doc->CMSSettings.DefaultPrinterProfile = dc.attribute("DPPr","");
doc->CMSSettings.DefaultInputProfile = dc.attribute("DPIn","");
2451,6 → 2550,7
dc.setAttribute("DPSo", static_cast<int>(doc->CMSSettings.SoftProofOn));
dc.setAttribute("DPuse", static_cast<int>(doc->CMSSettings.CMSinUse));
dc.setAttribute("DPgam", static_cast<int>(doc->CMSSettings.GamutCheck));
dc.setAttribute("DPbla", static_cast<int>(doc->CMSSettings.BlackPoint));
dc.setAttribute("DPMo",doc->CMSSettings.DefaultMonitorProfile);
dc.setAttribute("DPPr",doc->CMSSettings.DefaultPrinterProfile);
dc.setAttribute("DPIn",doc->CMSSettings.DefaultInputProfile);
2790,6 → 2890,7
dc81.setAttribute("DPSo", static_cast<int>(Vor->DCMSset.SoftProofOn));
dc81.setAttribute("DPuse", static_cast<int>(Vor->DCMSset.CMSinUse));
dc81.setAttribute("DPgam", static_cast<int>(Vor->DCMSset.GamutCheck));
dc81.setAttribute("DPbla", static_cast<int>(Vor->DCMSset.BlackPoint));
dc81.setAttribute("DPMo",Vor->DCMSset.DefaultMonitorProfile);
dc81.setAttribute("DPPr",Vor->DCMSset.DefaultPrinterProfile);
dc81.setAttribute("DPIn",Vor->DCMSset.DefaultInputProfile);
3017,6 → 3118,7
Vorein->DCMSset.SoftProofOn = static_cast<bool>(QStoInt(dc.attribute("DPSo","0")));
Vorein->DCMSset.CMSinUse = static_cast<bool>(QStoInt(dc.attribute("DPuse","0")));
Vorein->DCMSset.GamutCheck = static_cast<bool>(QStoInt(dc.attribute("DPgam","0")));
Vorein->DCMSset.BlackPoint = static_cast<bool>(QStoInt(dc.attribute("DPbla","1")));
Vorein->DCMSset.DefaultMonitorProfile = dc.attribute("DPMo","");
Vorein->DCMSset.DefaultPrinterProfile = dc.attribute("DPPr","");
Vorein->DCMSset.DefaultInputProfile = dc.attribute("DPIn","");