Commit 3ca8a792 authored by Alexander Semke's avatar Alexander Semke
Browse files

Minor changes:

* renamed "Variable Manager" to "Variables"
* properly parse Maxima's output using the current locale
* search for 'julia' and not 'Julia' executable
parent 147d8dbf
Pipeline #114780 passed with stage
in 18 minutes and 45 seconds
......@@ -74,7 +74,7 @@ QUrl JuliaBackend::helpUrl() const
bool JuliaBackend::requirementsFullfilled(QString* const reason) const
{
const QString& path = JuliaSettings::self()->replPath().toLocalFile();
bool valid = Cantor::Backend::checkExecutable(QLatin1String("Julia"), path, reason);
bool valid = Cantor::Backend::checkExecutable(QLatin1String("julia"), path, reason);
if (!valid)
return false;
......
......@@ -116,7 +116,7 @@ void MaximaSession::logout()
Cantor::Expression* MaximaSession::evaluateExpression(const QString& cmd, Cantor::Expression::FinishingBehavior behave, bool internal)
{
qDebug() << "evaluating: " << cmd;
MaximaExpression* expr = new MaximaExpression(this, internal);
auto* expr = new MaximaExpression(this, internal);
expr->setFinishingBehavior(behave);
expr->setCommand(cmd);
expr->evaluate();
......@@ -129,18 +129,18 @@ void MaximaSession::readStdErr()
qDebug()<<"reading stdErr";
if (!m_process)
return;
QString out=QLatin1String(m_process->readAllStandardError());
QString out = QString::fromLocal8Bit(m_process->readAllStandardError());
if(expressionQueue().size()>0)
{
MaximaExpression* expr = static_cast<MaximaExpression*>(expressionQueue().first());
auto* expr = static_cast<MaximaExpression*>(expressionQueue().first());
expr->parseError(out);
}
}
void MaximaSession::readStdOut()
{
QString out = QLatin1String(m_process->readAllStandardOutput());
QString out = QString::fromLocal8Bit(m_process->readAllStandardOutput());
m_cache += out;
//collect the multi-line output until Maxima has finished the calculation and returns a new promt
......@@ -155,7 +155,7 @@ void MaximaSession::readStdOut()
return;
}
MaximaExpression* expr = static_cast<MaximaExpression*>(expressionQueue().first());
auto* expr = static_cast<MaximaExpression*>(expressionQueue().first());
if (!expr)
return; //should never happen
......@@ -203,7 +203,7 @@ void MaximaSession::runFirstExpression()
if(!expressionQueue().isEmpty())
{
MaximaExpression* expr = static_cast<MaximaExpression*>(expressionQueue().first());
auto* expr = static_cast<MaximaExpression*>(expressionQueue().first());
QString command=expr->internalCommand();
connect(expr, SIGNAL(statusChanged(Cantor::Expression::Status)), this, SLOT(currentExpressionChangedStatus(Cantor::Expression::Status)));
......
......@@ -32,7 +32,7 @@
"Icon": "",
"Id": "VariableManager",
"License": "GPL",
"Name": "Variable Manager",
"Name": "Variables",
"Name[ca@valencia]": "Gestor de variables",
"Name[ca]": "Gestor de variables",
"Name[cs]": "Správce proměnných",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment