Commit a033079c authored by Alexander Semke's avatar Alexander Semke

1. in worksheet.cpp postpone the session->setTypesettingEnabled() call after the login was done

2. removed obsolete setTypesettingEnabled() call in maximasession
3. Q_UNUSED for the path variable in juliaserver for julia 0.6.
parent f00157cb
......@@ -41,6 +41,7 @@ JuliaServer::~JuliaServer()
void JuliaServer::login(const QString &path) const
{
#if JULIA_VERSION_MINOR > 5
Q_UNUSED(path)
jl_init();
#else
QString dir_path = QFileInfo(path).dir().absolutePath();
......
......@@ -101,10 +101,6 @@ void MaximaSession::login()
m_expressionQueue.prepend(m_expressionQueue.takeLast());
}
//reset the typesetting state
setTypesettingEnabled(isTypesettingEnabled());
m_initState=MaximaSession::Initializing;
if(!MaximaSettings::self()->autorunScripts().isEmpty()){
......
......@@ -290,7 +290,6 @@ bool CommandEntry::evaluate(EvaluationOption evalOp)
QToolTip::hideText();
QString cmd = command();
qDebug()<<"evaluating: "<<cmd;
m_evaluationOption = evalOp;
if(cmd.isEmpty()) {
......
......@@ -72,11 +72,6 @@ Worksheet::Worksheet(Cantor::Backend* backend, QWidget* parent)
enableCompletion(Settings::self()->completionDefault());
enableExpressionNumbering(Settings::self()->expressionNumberingDefault());
enableAnimations(Settings::self()->animationDefault());
#ifdef WITH_EPS
session()->setTypesettingEnabled(Settings::self()->typesetDefault());
#else
session()->setTypesettingEnabled(false);
#endif
}
Worksheet::~Worksheet()
......@@ -92,6 +87,11 @@ Worksheet::~Worksheet()
void Worksheet::loginToSession()
{
m_session->login();
#ifdef WITH_EPS
session()->setTypesettingEnabled(Settings::self()->typesetDefault());
#else
session()->setTypesettingEnabled(false);
#endif
m_loginDone = true;
}
......@@ -657,8 +657,11 @@ WorksheetEntry* Worksheet::insertLatexEntryBefore(WorksheetEntry* current)
void Worksheet::interrupt()
{
m_session->interrupt();
emit updatePrompt();
if (m_session->status() == Cantor::Session::Running)
{
m_session->interrupt();
emit updatePrompt();
}
}
void Worksheet::interruptCurrentEntryEvaluation()
......
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