ScriptConsole.cpp   ScriptConsole.cpp 
skipping to change at line 93 skipping to change at line 93
connect(ui->saveButton, SIGNAL(clicked()), this, SLOT(saveScript())) ; connect(ui->saveButton, SIGNAL(clicked()), this, SLOT(saveScript())) ;
connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clearButtonPr essed())); connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clearButtonPr essed()));
connect(ui->preprocessSSCButton, SIGNAL(clicked()), this, SLOT(prepr ocessScript())); connect(ui->preprocessSSCButton, SIGNAL(clicked()), this, SLOT(prepr ocessScript()));
connect(ui->runButton, SIGNAL(clicked()), this, SLOT(runScript())); connect(ui->runButton, SIGNAL(clicked()), this, SLOT(runScript()));
connect(ui->stopButton, SIGNAL(clicked()), &StelApp::getInstance().g etScriptMgr(), SLOT(stopScript())); connect(ui->stopButton, SIGNAL(clicked()), &StelApp::getInstance().g etScriptMgr(), SLOT(stopScript()));
connect(ui->includeBrowseButton, SIGNAL(clicked()), this, SLOT(inclu deBrowse())); connect(ui->includeBrowseButton, SIGNAL(clicked()), this, SLOT(inclu deBrowse()));
connect(ui->quickrunCombo, SIGNAL(currentIndexChanged(int)), this, S LOT(quickRun(int))); connect(ui->quickrunCombo, SIGNAL(currentIndexChanged(int)), this, S LOT(quickRun(int)));
connect(&StelApp::getInstance().getScriptMgr(), SIGNAL(scriptStopped ()), this, SLOT(scriptEnded())); connect(&StelApp::getInstance().getScriptMgr(), SIGNAL(scriptStopped ()), this, SLOT(scriptEnded()));
connect(&StelApp::getInstance().getScriptMgr(), SIGNAL(scriptDebug(c onst QString&)), this, SLOT(appendLogLine(const QString&))); connect(&StelApp::getInstance().getScriptMgr(), SIGNAL(scriptDebug(c onst QString&)), this, SLOT(appendLogLine(const QString&)));
connect(&StelApp::getInstance().getScriptMgr(), SIGNAL(scriptOutput( const QString&)), this, SLOT(appendOutputLine(const QString&))); connect(&StelApp::getInstance().getScriptMgr(), SIGNAL(scriptOutput( const QString&)), this, SLOT(appendOutputLine(const QString&)));
#ifndef ENABLE_STRATOSCRIPT_COMPAT
ui->preprocessSTSButton->setHidden(true);
#else
connect(ui->preprocessSTSButton, SIGNAL(clicked()), this, SLOT(prepr
ocessScript()));
#endif
ui->tabs->setCurrentIndex(0); ui->tabs->setCurrentIndex(0);
ui->scriptEdit->setFocus(); ui->scriptEdit->setFocus();
} }
void ScriptConsole::loadScript() void ScriptConsole::loadScript()
{ {
QString fileName = QFileDialog::getOpenFileName(&StelMainView::getIn stance(), QString fileName = QFileDialog::getOpenFileName(&StelMainView::getIn stance(),
tr("Load Script"), tr("Load Script"),
StelFileMgr::getInst allationDir() + "/scripts", StelFileMgr::getInst allationDir() + "/scripts",
tr("Script Files") + " " + getFileMask()); tr("Script Files") + " " + getFileMask());
skipping to change at line 166 skipping to change at line 161
{ {
QTextStream out(&src); QTextStream out(&src);
out << ui->scriptEdit->toPlainText(); out << ui->scriptEdit->toPlainText();
srcName = src.fileName(); srcName = src.fileName();
if (sender() == ui->preprocessSSCButton) if (sender() == ui->preprocessSSCButton)
{ {
qDebug() << "Preprocessing with SSC proprocessor"; qDebug() << "Preprocessing with SSC proprocessor";
StelApp::getInstance().getScriptMgr().preprocessScri pt(src, dest, ui->includeEdit->text()); StelApp::getInstance().getScriptMgr().preprocessScri pt(src, dest, ui->includeEdit->text());
} }
#ifdef ENABLE_STRATOSCRIPT_COMPAT
else if (sender() == ui->preprocessSTSButton)
{
qDebug() << "Preprocessing with STS proprocessor";
StelApp::getInstance().getScriptMgr().preprocessStra
toScript(src, dest, ui->includeEdit->text());
}
#endif
else else
qWarning() << "WARNING: unknown preprocessor type"; qWarning() << "WARNING: unknown preprocessor type";
ui->scriptEdit->setPlainText(dest); ui->scriptEdit->setPlainText(dest);
src.close(); src.close();
} }
ui->tabs->setCurrentIndex(0); ui->tabs->setCurrentIndex(0);
} }
void ScriptConsole::runScript() void ScriptConsole::runScript()
skipping to change at line 315 skipping to change at line 303
} }
void ScriptConsole::rowColumnChanged() void ScriptConsole::rowColumnChanged()
{ {
ui->rowColumnLabel->setText(QString("R:%1 C:%2").arg(ui->scriptEdit- >textCursor().blockNumber()) ui->rowColumnLabel->setText(QString("R:%1 C:%2").arg(ui->scriptEdit- >textCursor().blockNumber())
.arg(ui->scriptEdit- >textCursor().columnNumber())); .arg(ui->scriptEdit- >textCursor().columnNumber()));
} }
QString ScriptConsole::getFileMask() QString ScriptConsole::getFileMask()
{ {
#ifdef ENABLE_STRATOSCRIPT_COMPAT
return "(*.ssc *.sts *.inc)";
#else
return "(*.ssc *.inc)"; return "(*.ssc *.inc)";
#endif
} }
 End of changes. 4 change blocks. 
18 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/