Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5932 → Rev 5933

/branches/Version13x/Scribus/scribusversions.xml
7,5 → 7,5
<release stability="unstable" platform="Win32" version="1.3.3.2"/>
<release stability="unstable" platform="MacOSX" version="1.3.3.2"/>
<release stability="unstablecvs" platform="MacOSX" version="1.3.4cvs"/>
<message lang="en">Scribus 1.2.5 is the last expected release in the 1.2.x series. We have stabilised 1.3.3.x for those wishing to use some new features but needing more stability.</message>
<message lang="en"> - Scribus 1.2.5 is the last expected release in the 1.2.x series.<![CDATA[<br>]]> - We have stabilised 1.3.3.x for those wishing to use some new features of the 1.3.x series but need more stability.<![CDATA[<br>]]> </message>
</scribus>
/branches/Version13x/Scribus/scribus/upgradechecker.cpp
79,7 → 79,7
getter->setHost("www.scribus.net");
if (retrieveError)
return true;
outputText(tr("Attempting to get the Scribus version update file"));
outputText(tr("<b>Attempting to get the Scribus version update file</b>"));
outputText(tr("(No data on your computer will be sent to an external location)"));
if(!file.open(IO_ReadWrite))
return true;
100,12 → 100,12
bool errorOccurred=false;
if (waitCount>=10)
{
outputText(tr("Timed out when attempting to get update file."));
outputText(tr("<b>Timed out when attempting to get update file.</b>"));
errorOccurred=true;
}
if (retrieveError || getter->error()!=QHttp::NoError)
{
outputText(tr("Error when attempting to get update file: %1").arg(getter->errorString()));
outputText(tr("<b>Error when attempting to get update file: %1</b>").arg(getter->errorString()));
errorOccurred=true;
}
if (errorOccurred)
135,9 → 135,9
if ( !doc.setContent( data, &errorMsg, &eline, &ecol ))
{
if (data.lower().contains("404 not found"))
outputText(tr("File not found on server"));
outputText(tr("<b>File not found on server</b>"));
else
outputText(tr("Could not open version file: %1\nError:%2 at line: %3, row: %4").arg(dataFile.name()).arg(errorMsg).arg(eline).arg(ecol));
outputText(tr("<b>Could not open version file: %1\nError:%2 at line: %3, row: %4</b>").arg(dataFile.name()).arg(errorMsg).arg(eline).arg(ecol));
return false;
}
177,7 → 177,7
else
if (e.tagName()=="message")
{
message=e.text();
message+=e.text();
}
}
n = n.nextSibling();
194,14 → 194,14
{
if (error)
{
outputText(tr("An error occurred while looking for updates for Scribus, please check your internet connection."));
outputText(tr("<b>An error occurred while looking for updates for Scribus, please check your internet connection.</b>"));
return;
}
if (updates.isEmpty())
outputText(tr("No updates are available for your version of Scribus %1").arg(version));
outputText(tr("<b>No updates are available for your version of Scribus %1</b>").arg(version));
else
{
outputText(tr("One or more updates for your version of Scribus (%1) are available:").arg(version));
outputText(tr("<b>One or more updates for your version of Scribus (%1) are available:</b>").arg(version));
for ( QStringList::Iterator it = updates.begin(); it != updates.end(); ++it )
outputText(*it);
229,7 → 229,14
 
void UpgradeChecker::outputText(QString text)
{
qDebug("%s", text.remove("<b>").remove("</b>").remove("<i>").remove("</i>").local8Bit().data());
QString outText(text);
outText.remove("<b>");
outText.remove("</b>");
outText.remove("<i>");
outText.remove("</i>");
outText.replace("<br>","\n");
outText.replace("<br/>","\n");
qDebug("%s", outText.local8Bit().data());
}
 
UpgradeCheckerGUI::UpgradeCheckerGUI(QWidget *widget)
248,9 → 255,10
TextBrowser* w=dynamic_cast<TextBrowser*>(outputWidget);
if (w)
{
QString wText=w->text();
QString wText(w->text());
wText.replace("\n","<br>");
wText.remove("<qt>");
wText.remove("</qt>");
w->setText("<qt>"+wText+text+"<br/>"+"</qt>");
w->setText("<qt>"+wText+text+"<br>"+"</qt>");
}
}