Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 241 → Rev 242

/trunk/Scribus/ChangeLogCVS
1,4 → 1,6
Changes since Version 1.1.6
04.04.2004 Fixed rounding problems with the Baseline Grid.
 
03.04.2004 Added a frame independent baseline setting for Textframes.
Updated the Finnish Translation.
 
/trunk/Scribus/scribus/guidemanager.cpp
58,10 → 58,10
setIcon(loadIcon("AppIcon.png"));
/* Initialise the global variables */
tp[0] = " pt";
tp[1] = " mm";
tp[2] = " in";
tp[3] = " p";
tp[0] = tr(" pt");
tp[1] = tr(" mm");
tp[2] = tr(" in");
tp[3] = tr(" p");
int dp[] = {100, 1000, 10000, 100};
Einheit = Einh;
94,7 → 94,7
Layout4 = new QHBoxLayout(0, 0, 6, "Layout4");
TextLabel2 = new QLabel(HorGroup, "TextLabel2");
TextLabel2->setText( tr("X-Pos:"));
TextLabel2->setText( tr("Y-Pos:"));
Layout4->addWidget(TextLabel2);
HorSpin = new MSpinBox(HorGroup, 4);
136,7 → 136,7
Layout2 = new QHBoxLayout(0, 0, 6, "Layout2");
TextLabel1 = new QLabel(VerGroup, "TextLabel1");
TextLabel1->setText( tr("Y-Pos:"));
TextLabel1->setText( tr("X-Pos:"));
Layout2->addWidget(TextLabel1);
VerSpin = new MSpinBox(VerGroup, 4);
/trunk/Scribus/scribus/pageitem.cpp
802,7 → 802,11
else
TopOffset = asce;
if (Doc->Vorlagen[hl->cab].BaseAdj)
CurY = ceil((Ypos + CurY - Doc->BaseOffs) / Doc->BaseGrid) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
{
int ol1 = qRound((Ypos + CurY - Doc->BaseOffs) * 10000.0);
int ol2 = static_cast<int>(ol1 / Doc->BaseGrid);
CurY = ceil( ol2 / 10000.0 ) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
}
pt1 = QPoint(static_cast<int>(ceil(CurX)), static_cast<int>(CurY+BotOffset));
pt2 = QPoint(static_cast<int>(ceil(CurX)), static_cast<int>(ceil(CurY-TopOffset)));
while ((!cl.contains(pf2.xForm(pt1))) || (!cl.contains(pf2.xForm(pt2))))
817,7 → 821,11
else
CurY += Doc->Vorlagen[hl->cab].LineSpa;
if (Doc->Vorlagen[hl->cab].BaseAdj)
CurY = ceil((Ypos + CurY - Doc->BaseOffs) / Doc->BaseGrid) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
{
int ol1 = qRound((Ypos + CurY - Doc->BaseOffs) * 10000.0);
int ol2 = static_cast<int>(ol1 / Doc->BaseGrid);
CurY = ceil( ol2 / 10000.0 ) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
}
CurX = ColBound.x();
if (CurY+BExtra+lineCorr > Height)
{
854,8 → 862,12
else
CurX += Doc->Vorlagen[hl->cab].Indent;
if (Doc->Vorlagen[hl->cab].BaseAdj)
CurY = ceil((Ypos + CurY - Doc->BaseOffs) / Doc->BaseGrid) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
{
int ol1 = qRound((Ypos + CurY - Doc->BaseOffs) * 10000.0);
int ol2 = static_cast<int>(ol1 / Doc->BaseGrid);
CurY = ceil( ol2 / 10000.0 ) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
}
}
else
{
nrc = a;
1178,8 → 1190,6
{
fromOut = false;
CurY += Doc->Vorlagen[hl->cab].LineSpa;
if (Doc->Vorlagen[hl->cab].BaseAdj)
CurY = ceil((Ypos + CurY - Doc->BaseOffs) / Doc->BaseGrid) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
if ((CurY+BExtra+lineCorr > Height) && (CurrCol+1 == Cols))
{
nrc = BuPos2;
1222,8 → 1232,6
CurY = maxDY;
}
CurY += Doc->Vorlagen[hl->cab].LineSpa;
if (Doc->Vorlagen[hl->cab].BaseAdj)
CurY = ceil((Ypos + CurY - Doc->BaseOffs) / Doc->BaseGrid) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
if (AbsHasDrop)
{
if (CurY > maxDY)
1241,8 → 1249,6
else
{
CurY += Doc->Vorlagen[hl->cab].Anach;
if (Doc->Vorlagen[hl->cab].BaseAdj)
CurY = ceil((Ypos + CurY - Doc->BaseOffs) / Doc->BaseGrid) * Doc->BaseGrid + Doc->BaseOffs - Ypos;
if (BuPos3 > 0)
BuPos3 -= 1;
}
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("03").arg("April").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("04").arg("April").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
4062,6 → 4062,7
/** Ansicht absolut zoomen */
void ScribusApp::slotZoomAbs(double z)
{
view->rememberPreviousSettings();
doc->Scale = z;
view->slotDoZoom();
}
4070,6 → 4071,7
{
double dx = (view->width()-50) / (doc->PageB+30);
double dy = (view->height()-70) / (doc->PageH+30);
view->rememberPreviousSettings();
if (dx > dy)
slotZoomAbs(dy);
else
/trunk/Scribus/scribus/page.cpp
7546,7 → 7546,7
{
b->pixmOrg = QImage();
proc = new QProcess(NULL);
cmd.append(ScApp->Prefs.gimp_exe);
cmd = QStringList::split(" ", ScApp->Prefs.gimp_exe);
cmd.append(b->Pfile);
proc->setArguments(cmd);
if ( !proc->start() )
/trunk/Scribus/scribus/scribusXml.cpp
3278,6 → 3278,7
dc.setAttribute("SHOWGUIDES", static_cast<int>(Vor->GuidesShown));
dc.setAttribute("FRV", static_cast<int>(Vor->FramesShown));
dc.setAttribute("SHOWMARGIN", static_cast<int>(Vor->MarginsShown));
dc.setAttribute("SHOWBASE", static_cast<int>(Vor->BaseShown));
elem.appendChild(dc);
QDomElement dc1=docu.createElement("GRID");
dc1.setAttribute("MINOR",Vor->DminGrid);
3536,6 → 3537,7
Vorein->GuidesShown = static_cast<bool>(QStoInt(dc.attribute("SHOWGUIDES","1")));
Vorein->FramesShown = static_cast<bool>(QStoInt(dc.attribute("FRV","1")));
Vorein->MarginsShown = static_cast<bool>(QStoInt(dc.attribute("SHOWMARGIN","1")));
Vorein->BaseShown = static_cast<bool>(QStoInt(dc.attribute("SHOWBASE","1")));
}
if (dc.tagName()=="GRID")
{
/trunk/Scribus/scribus/guidemanager.h
32,36 → 32,36
 
QValueList<double> LocHor;
QValueList<double> LocVer;
bool LocLocked;
bool LocLocked;
 
private:
double LocPageWidth;
double LocPageHeight;
double LocPageWidth;
double LocPageHeight;
int Einheit;
char *tp[4];
QString tp[4];
 
int selHor;
int selVer;
 
QGroupBox* VerGroup;
QListBox* VerList;
QLabel* TextLabel1;
MSpinBox* VerSpin;
QPushButton* VerSet;
QPushButton* VerDel;
QGroupBox* VerGroup;
QListBox* VerList;
QLabel* TextLabel1;
MSpinBox* VerSpin;
QPushButton* VerSet;
QPushButton* VerDel;
QGroupBox* HorGroup;
QListBox* HorList;
QLabel* TextLabel2;
MSpinBox* HorSpin;
QPushButton* HorSet;
QPushButton* HorDel;
QCheckBox* Lock;
QPushButton* OK;
QPushButton* Cancel;
 
QGroupBox* HorGroup;
QListBox* HorList;
QLabel* TextLabel2;
MSpinBox* HorSpin;
QPushButton* HorSet;
QPushButton* HorDel;
 
QCheckBox* Lock;
 
QPushButton* OK;
QPushButton* Cancel;
 
QString GetUnit();
void UnitChange();
 
68,18 → 68,18
void UpdateHorList();
void UpdateVerList();
 
QVBoxLayout* GuideManagerLayout;
QHBoxLayout* Layout6;
QVBoxLayout* VerGroupLayout;
QHBoxLayout* Layout2;
QHBoxLayout* Layout1;
QVBoxLayout* GuideManagerLayout;
QHBoxLayout* Layout6;
QVBoxLayout* VerGroupLayout;
QHBoxLayout* Layout2;
QHBoxLayout* Layout1;
QVBoxLayout* HorGroupLayout;
QHBoxLayout* Layout4;
QHBoxLayout* Layout3;
QHBoxLayout* Layout5;
 
QVBoxLayout* HorGroupLayout;
QHBoxLayout* Layout4;
QHBoxLayout* Layout3;
 
QHBoxLayout* Layout5;
 
private slots:
 
void DelHorVal();