ConfigurationDialog.cpp   ConfigurationDialog.cpp 
skipping to change at line 65 skipping to change at line 65
#include "ScreenImageMgr.hpp" #include "ScreenImageMgr.hpp"
#include "SkyGui.hpp" #include "SkyGui.hpp"
#include "StelJsonParser.hpp" #include "StelJsonParser.hpp"
#include "StelTranslator.hpp" #include "StelTranslator.hpp"
#include <QSettings> #include <QSettings>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QFileDialog> #include <QFileDialog>
#include <QComboBox> #include <QComboBox>
#include <QDir>
ConfigurationDialog::ConfigurationDialog(StelGui* agui) : StelDialog(agui), starCatalogDownloadReply(NULL), currentDownloadFile(NULL), progressBar(NUL L), gui(agui) ConfigurationDialog::ConfigurationDialog(StelGui* agui) : StelDialog(agui), starCatalogDownloadReply(NULL), currentDownloadFile(NULL), progressBar(NUL L), gui(agui)
{ {
ui = new Ui_configurationDialogForm; ui = new Ui_configurationDialogForm;
customDeltaTEquationDialog = NULL; customDeltaTEquationDialog = NULL;
hasDownloadedStarCatalog = false; hasDownloadedStarCatalog = false;
isDownloadingStarCatalog = false; isDownloadingStarCatalog = false;
savedProjectionType = StelApp::getInstance().getCore()->getCurrentPr ojectionType(); savedProjectionType = StelApp::getInstance().getCore()->getCurrentPr ojectionType();
} }
skipping to change at line 836 skipping to change at line 837
void ConfigurationDialog::aScriptHasStopped(void) void ConfigurationDialog::aScriptHasStopped(void)
{ {
ui->scriptStatusLabel->setText(q_("Running script: [none]")); ui->scriptStatusLabel->setText(q_("Running script: [none]"));
ui->runScriptButton->setEnabled(true); ui->runScriptButton->setEnabled(true);
ui->stopScriptButton->setEnabled(false); ui->stopScriptButton->setEnabled(false);
} }
#endif #endif
void ConfigurationDialog::setFixedDateTimeToCurrent(void) void ConfigurationDialog::setFixedDateTimeToCurrent(void)
{ {
ui->fixedDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(StelApp: StelCore* core = StelApp::getInstance().getCore();
:getInstance().getCore()->getJDay())); double JD = core->getJDay();
ui->fixedDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(JD+StelU
tils::getGMTShiftFromQT(JD)/24-core->getDeltaT(JD)/86400));
ui->fixedTimeRadio->setChecked(true); ui->fixedTimeRadio->setChecked(true);
setStartupTimeMode(); setStartupTimeMode();
} }
void ConfigurationDialog::resetStarCatalogControls() void ConfigurationDialog::resetStarCatalogControls()
{ {
const QVariantList& catalogConfig = GETSTELMODULE(StarMgr)->getCatal ogsDescription(); const QVariantList& catalogConfig = GETSTELMODULE(StarMgr)->getCatal ogsDescription();
nextStarCatalogToDownload.clear(); nextStarCatalogToDownload.clear();
int idx=0; int idx=0;
foreach (const QVariant& catV, catalogConfig) foreach (const QVariant& catV, catalogConfig)
skipping to change at line 952 skipping to change at line 955
Q_ASSERT(!nextStarCatalogToDownload.isEmpty()); Q_ASSERT(!nextStarCatalogToDownload.isEmpty());
Q_ASSERT(!isDownloadingStarCatalog); Q_ASSERT(!isDownloadingStarCatalog);
Q_ASSERT(starCatalogDownloadReply==NULL); Q_ASSERT(starCatalogDownloadReply==NULL);
Q_ASSERT(currentDownloadFile==NULL); Q_ASSERT(currentDownloadFile==NULL);
Q_ASSERT(progressBar==NULL); Q_ASSERT(progressBar==NULL);
QString path = StelFileMgr::getUserDir()+QString("/stars/default/")+ nextStarCatalogToDownload.value("fileName").toString(); QString path = StelFileMgr::getUserDir()+QString("/stars/default/")+ nextStarCatalogToDownload.value("fileName").toString();
currentDownloadFile = new QFile(path); currentDownloadFile = new QFile(path);
if (!currentDownloadFile->open(QIODevice::WriteOnly)) if (!currentDownloadFile->open(QIODevice::WriteOnly))
{ {
qWarning() << "Can't open a writable file for storing new st ar catalog: " << path; qWarning() << "Can't open a writable file for storing new st ar catalog: " << QDir::toNativeSeparators(path);
currentDownloadFile->deleteLater(); currentDownloadFile->deleteLater();
currentDownloadFile = NULL; currentDownloadFile = NULL;
ui->downloadLabel->setText(q_("Error downloading %1:\n%2").a rg(nextStarCatalogToDownload.value("id").toString()).arg(QString("Can't ope n a writable file for storing new star catalog: %1").arg(path))); ui->downloadLabel->setText(q_("Error downloading %1:\n%2").a rg(nextStarCatalogToDownload.value("id").toString()).arg(QString("Can't ope n a writable file for storing new star catalog: %1").arg(path)));
ui->downloadRetryButton->setVisible(true); ui->downloadRetryButton->setVisible(true);
return; return;
} }
isDownloadingStarCatalog = true; isDownloadingStarCatalog = true;
updateStarCatalogControlsText(); updateStarCatalogControlsText();
ui->downloadCancelButton->setVisible(true); ui->downloadCancelButton->setVisible(true);
skipping to change at line 1159 skipping to change at line 1162
// The dropdown label is too long for the string, and Meeus 1998 is very popular, this should be in the beginning of the tag. // The dropdown label is too long for the string, and Meeus 1998 is very popular, this should be in the beginning of the tag.
algorithms->addItem(q_("Meeus (1998) (with Chapront, Chapront-Touze & Francou (1997))"), "ChaprontMeeus"); algorithms->addItem(q_("Meeus (1998) (with Chapront, Chapront-Touze & Francou (1997))"), "ChaprontMeeus");
algorithms->addItem(q_("JPL Horizons"), "JPLHorizons"); algorithms->addItem(q_("JPL Horizons"), "JPLHorizons");
algorithms->addItem(q_("Meeus & Simons (2000)"), "MeeusSimons"); algorithms->addItem(q_("Meeus & Simons (2000)"), "MeeusSimons");
algorithms->addItem(q_("Montenbruck & Pfleger (2000)"), "Montenbruck Pfleger"); algorithms->addItem(q_("Montenbruck & Pfleger (2000)"), "Montenbruck Pfleger");
algorithms->addItem(q_("Reingold & Dershowitz (2002, 2007)"), "Reing oldDershowitz"); algorithms->addItem(q_("Reingold & Dershowitz (2002, 2007)"), "Reing oldDershowitz");
algorithms->addItem(q_("Morrison & Stephenson (2004, 2005)"), "Morri sonStephenson2004"); algorithms->addItem(q_("Morrison & Stephenson (2004, 2005)"), "Morri sonStephenson2004");
// Espenak & Meeus (2006) used by default // Espenak & Meeus (2006) used by default
algorithms->addItem(q_("Espenak & Meeus (2006)").append(" *"), "Espe nakMeeus"); algorithms->addItem(q_("Espenak & Meeus (2006)").append(" *"), "Espe nakMeeus");
algorithms->addItem(q_("Reijs (2006)"), "Reijs"); algorithms->addItem(q_("Reijs (2006)"), "Reijs");
algorithms->addItem(q_("Banjevic (2006)"), "Banjevic");
algorithms->addItem(q_("Islam, Sadiq & Qureshi (2008, 2013)"), "Isla
mSadiqQureshi");
algorithms->addItem(q_("Custom equation of %1T").arg(QChar(0x0394)), "Custom"); algorithms->addItem(q_("Custom equation of %1T").arg(QChar(0x0394)), "Custom");
//Restore the selection //Restore the selection
index = algorithms->findData(selectedAlgorithmId, Qt::UserRole, Qt:: MatchCaseSensitive); index = algorithms->findData(selectedAlgorithmId, Qt::UserRole, Qt:: MatchCaseSensitive);
algorithms->setCurrentIndex(index); algorithms->setCurrentIndex(index);
//algorithms->model()->sort(0); //algorithms->model()->sort(0);
algorithms->blockSignals(false); algorithms->blockSignals(false);
setDeltaTAlgorithmDescription(); setDeltaTAlgorithmDescription();
} }
 End of changes. 4 change blocks. 
3 lines changed or deleted 9 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/