SearchDialog.cpp   SearchDialog.cpp 
skipping to change at line 241 skipping to change at line 241
connect(ui->piPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLet terClicked())); connect(ui->piPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLet terClicked()));
connect(ui->rhoPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked())); connect(ui->rhoPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked()));
connect(ui->sigmaPushButton, SIGNAL(clicked(bool)), this, SLOT(greek LetterClicked())); connect(ui->sigmaPushButton, SIGNAL(clicked(bool)), this, SLOT(greek LetterClicked()));
connect(ui->tauPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked())); connect(ui->tauPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked()));
connect(ui->upsilonPushButton, SIGNAL(clicked(bool)), this, SLOT(gre ekLetterClicked())); connect(ui->upsilonPushButton, SIGNAL(clicked(bool)), this, SLOT(gre ekLetterClicked()));
connect(ui->phiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked())); connect(ui->phiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked()));
connect(ui->chiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked())); connect(ui->chiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked()));
connect(ui->psiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked())); connect(ui->psiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLe tterClicked()));
connect(ui->omegaPushButton, SIGNAL(clicked(bool)), this, SLOT(greek LetterClicked())); connect(ui->omegaPushButton, SIGNAL(clicked(bool)), this, SLOT(greek LetterClicked()));
connect(ui->checkBoxUseSimbad, SIGNAL(clicked(bool)), connect(ui->checkBoxUseSimbad, SIGNAL(clicked(bool)), this, SLOT(ena
this, SLOT(enableSimbadSearch(bool))); bleSimbadSearch(bool)));
ui->checkBoxUseSimbad->setChecked(useSimbad); ui->checkBoxUseSimbad->setChecked(useSimbad);
populateSimbadServerList(); populateSimbadServerList();
int idx = ui->serverListComboBox->findData(simbadServerUrl, Qt::User Role, Qt::MatchCaseSensitive); int idx = ui->serverListComboBox->findData(simbadServerUrl, Qt::User Role, Qt::MatchCaseSensitive);
if (idx==-1) if (idx==-1)
{ {
// Use University of Strasbourg as default // Use University of Strasbourg as default
idx = ui->serverListComboBox->findData(QVariant(DEF_SIMBAD_U RL), Qt::UserRole, Qt::MatchCaseSensitive); idx = ui->serverListComboBox->findData(QVariant(DEF_SIMBAD_U RL), Qt::UserRole, Qt::MatchCaseSensitive);
} }
ui->serverListComboBox->setCurrentIndex(idx); ui->serverListComboBox->setCurrentIndex(idx);
connect(ui->serverListComboBox, SIGNAL(currentIndexChanged(int)), connect(ui->serverListComboBox, SIGNAL(currentIndexChanged(int)), th
this, SLOT(selectSimbadServer(int))); is, SLOT(selectSimbadServer(int)));
// list views initialization // list views initialization
connect(ui->objectTypeComboBox, SIGNAL(activated(int)), this, SLOT(u pdateListWidget(int))); connect(ui->objectTypeComboBox, SIGNAL(activated(int)), this, SLOT(u pdateListWidget(int)));
connect(ui->searchInListLineEdit, SIGNAL(textChanged(QString)), this , SLOT(searchListChanged(QString))); connect(ui->searchInListLineEdit, SIGNAL(textChanged(QString)), this , SLOT(searchListChanged(QString)));
connect(ui->searchInEnglishCheckBox, SIGNAL(toggled(bool)), this, SL OT(updateListTab())); connect(ui->searchInEnglishCheckBox, SIGNAL(toggled(bool)), this, SL OT(updateListTab()));
updateListTab(); updateListTab();
} }
void SearchDialog::setHasSelectedFlag() void SearchDialog::setHasSelectedFlag()
{ {
skipping to change at line 339 skipping to change at line 337
simbadReply = simbadSearcher->lookup(simbadServerUrl , trimmedText, 3); simbadReply = simbadSearcher->lookup(simbadServerUrl , trimmedText, 3);
onSimbadStatusChanged(); onSimbadStatusChanged();
connect(simbadReply, SIGNAL(statusChanged()), this, SLOT(onSimbadStatusChanged())); connect(simbadReply, SIGNAL(statusChanged()), this, SLOT(onSimbadStatusChanged()));
} }
QString greekText = substituteGreek(trimmedText); QString greekText = substituteGreek(trimmedText);
QStringList matches; QStringList matches;
if(greekText != trimmedText) { if(greekText != trimmedText) {
matches = objectMgr->listMatchingObjectsI18n(trimmed Text, 3); matches = objectMgr->listMatchingObjectsI18n(trimmed Text, 3);
matches += objectMgr->listMatchingObjects(trimmedTex t, 3); matches += objectMgr->listMatchingObjects(trimmedTex t, 3);
matches += objectMgr->listMatchingObjectsI18n(greekT ext, (5 - matches.size())); matches += objectMgr->listMatchingObjectsI18n(greekT ext, (8 - matches.size()));
} else { } else {
matches = objectMgr->listMatchingObjectsI18n(trimmed Text, 5); matches = objectMgr->listMatchingObjectsI18n(trimmed Text, 5);
matches += objectMgr->listMatchingObjects(trimmedTex t, 5); matches += objectMgr->listMatchingObjects(trimmedTex t, 5);
} }
// remove possible duplicates from completion list // remove possible duplicates from completion list
matches.removeDuplicates(); matches.removeDuplicates();
ui->completionLabel->setValues(matches); ui->completionLabel->setValues(matches);
ui->completionLabel->selectFirst(); ui->completionLabel->selectFirst();
skipping to change at line 433 skipping to change at line 431
StelMovementMgr* mvmgr = GETSTELMODULE(StelMovementMgr); StelMovementMgr* mvmgr = GETSTELMODULE(StelMovementMgr);
if (simbadResults.contains(nameI18n)) if (simbadResults.contains(nameI18n))
{ {
close(); close();
Vec3d pos = simbadResults[nameI18n]; Vec3d pos = simbadResults[nameI18n];
objectMgr->unSelect(); objectMgr->unSelect();
mvmgr->moveToJ2000(pos, mvmgr->getAutoMoveDuration()); mvmgr->moveToJ2000(pos, mvmgr->getAutoMoveDuration());
ui->lineEditSearchSkyObject->clear(); ui->lineEditSearchSkyObject->clear();
ui->completionLabel->clearValues(); ui->completionLabel->clearValues();
} }
else if (objectMgr->findAndSelectI18n(nameI18n) or objectMgr->findAn dSelect(nameI18n)) else if (objectMgr->findAndSelectI18n(nameI18n) || objectMgr->findAn dSelect(nameI18n))
{ {
const QList<StelObjectP> newSelected = objectMgr->getSelecte dObject(); const QList<StelObjectP> newSelected = objectMgr->getSelecte dObject();
if (!newSelected.empty()) if (!newSelected.empty())
{ {
close(); close();
ui->lineEditSearchSkyObject->clear(); ui->lineEditSearchSkyObject->clear();
ui->completionLabel->clearValues(); ui->completionLabel->clearValues();
// Can't point to home planet // Can't point to home planet
if (newSelected[0]->getEnglishName()!=StelApp::getIn stance().getCore()->getCurrentLocation().planetName) if (newSelected[0]->getEnglishName()!=StelApp::getIn stance().getCore()->getCurrentLocation().planetName)
{ {
skipping to change at line 588 skipping to change at line 586
else else
{ {
ui->searchInEnglishCheckBox->show(); ui->searchInEnglishCheckBox->show();
} }
ui->objectTypeComboBox->clear(); ui->objectTypeComboBox->clear();
QMap<QString, QString> modulesMap = objectMgr->objectModulesMap(); QMap<QString, QString> modulesMap = objectMgr->objectModulesMap();
for (QMap<QString, QString>::const_iterator it = modulesMap.begin(); it != modulesMap.end(); ++it) for (QMap<QString, QString>::const_iterator it = modulesMap.begin(); it != modulesMap.end(); ++it)
{ {
if (!objectMgr->listAllModuleObjects(it.key(), ui->searchInE nglishCheckBox->isChecked()).isEmpty()) if (!objectMgr->listAllModuleObjects(it.key(), ui->searchInE nglishCheckBox->isChecked()).isEmpty())
{ {
QString moduleName = (ui->searchInEnglishCheckBox->i QString moduleName = (ui->searchInEnglishCheckBox->i
sChecked() ? sChecked() ? it.value(): q_(it.value()));
it.value(): q_(it.value()));
ui->objectTypeComboBox->addItem(moduleName, QVariant (it.key())); ui->objectTypeComboBox->addItem(moduleName, QVariant (it.key()));
} }
} }
updateListWidget(ui->objectTypeComboBox->currentIndex()); updateListWidget(ui->objectTypeComboBox->currentIndex());
} }
 End of changes. 5 change blocks. 
10 lines changed or deleted 8 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/