Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 864 → Rev 865

/branches/Version13x/Scribus/ChangeLogCVS
1,5 → 1,15
Changes since 1.2
 
10.12.2004
* bug # 931: Insert Special should be disabled when not usable
* bug #1100: libfreetype not found by ./configure
* bug #1328: SVG Import: incorrect units
* bug #1361: after attaching text to path the shape cannot be resized without dissappearing
* bug #1369: Crash when using <esc> to end line drawing
* bug #1370: Bezier tool does not set document changed when escaped pressed to end drawing.
* bug #1372: Change of Translator email-adress.
* bug #1373: Updated nb_NO translation.
 
09.12.2004
* bug # 984: Can Search/Replace dialog remember from last time?
* bug #1135: Page number in TTF font doesn't print
/branches/Version13x/Scribus/scribus/scribusXml.cpp
3138,7 → 3138,7
Vorein->Dbrush = dc.attribute("BRUSH");
Vorein->DpenLine = dc.attribute("PENLINE");
Vorein->DpenText = dc.attribute("PENTEXT");
Vorein->DstrokeText = dc.attribute("StrokeText");
Vorein->DstrokeText = dc.attribute("StrokeText", Vorein->DpenText);
Vorein->DCols = QStoInt(dc.attribute("TEXTCOL", "1"));
Vorein->DGap = QStodouble(dc.attribute("TEXTGAP", "0.0"));
Vorein->DLineArt = QStoInt(dc.attribute("STIL"));
/branches/Version13x/Scribus/scribus/scribusview.cpp
10845,6 → 10845,7
double dy = bb->Ypos - b->Ypos;
MoveItem(dx, dy, b);
b->Rot = bb->Rot;
b->FrameType = 3;
Deselect(true);
SelectItemNr(bb->ItemNr);
DeleteItem();
/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("09").arg("December").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("10").arg("December").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
161,7 → 161,7
else if (!docElem.attribute("height").isEmpty())
getDefaultUnit(docElem.attribute( "height" ));
else
Conversion = 1.0 / 1.25;
Conversion = 0.8;
if (Prog->DLLinput != "")
{
Prog->doc->setPage(width, height, 0, 0, 0, 0, 0, 0, false, false);
656,10 → 656,10
else if( un == "px" )
{
unitval.replace( "px", "" );
Conversion = 1.0 / 1.25;
Conversion = 0.8;
}
if (unitval == unit)
Conversion = 1.0 / 1.25;
Conversion = 0.8;
}
/*!
\fn double SVGPlug::parseUnit(const QString &unit)
695,9 → 695,9
else if( unit.right( 2 ) == "in" )
value = value * 72;
else if( unit.right( 2 ) == "px" )
value = value / 1.25;
value = value * 0.8;
else if(noUnit)
value = value / 1.25;
value = value * 0.8;
return value;
}