SatellitesDialog.cpp   SatellitesDialog.cpp 
skipping to change at line 96 skipping to change at line 96
void SatellitesDialog::createDialogContent() void SatellitesDialog::createDialogContent()
{ {
ui->setupUi(dialog); ui->setupUi(dialog);
ui->tabs->setCurrentIndex(0); ui->tabs->setCurrentIndex(0);
ui->labelAutoAdd->setVisible(false); ui->labelAutoAdd->setVisible(false);
connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ; connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ;
connect(&StelApp::getInstance(), SIGNAL(languageChanged()), connect(&StelApp::getInstance(), SIGNAL(languageChanged()),
this, SLOT(retranslate())); this, SLOT(retranslate()));
Satellites* plugin = GETSTELMODULE(Satellites); Satellites* plugin = GETSTELMODULE(Satellites);
#ifdef Q_OS_WIN
//Kinetic scrolling for tablet pc and pc //Kinetic scrolling for tablet pc and pc
QList<QWidget *> addscroll; QList<QWidget *> addscroll;
addscroll << ui->satellitesList << ui->sourceList << ui->aboutTextBr owser; addscroll << ui->satellitesList << ui->sourceList << ui->aboutTextBr owser;
installKineticScrolling(addscroll); installKineticScrolling(addscroll);
#endif
// Settings tab / updates group // Settings tab / updates group
// These controls are refreshed by updateSettingsPage(), which in // These controls are refreshed by updateSettingsPage(), which in
// turn is triggered by setting any of these values. Because // turn is triggered by setting any of these values. Because
// clicked() is issued only by user input, there's no endless loop. // clicked() is issued only by user input, there's no endless loop.
connect(ui->internetUpdatesCheckbox, SIGNAL(clicked(bool)), connect(ui->internetUpdatesCheckbox, SIGNAL(clicked(bool)),
plugin, SLOT(enableInternetUpdates(bool))); plugin, SLOT(enableInternetUpdates(bool)));
connect(ui->checkBoxAutoAdd, SIGNAL(clicked(bool)), connect(ui->checkBoxAutoAdd, SIGNAL(clicked(bool)),
plugin, SLOT(enableAutoAdd(bool))); plugin, SLOT(enableAutoAdd(bool)));
connect(ui->checkBoxAutoRemove, SIGNAL(clicked(bool)), connect(ui->checkBoxAutoRemove, SIGNAL(clicked(bool)),
skipping to change at line 208 skipping to change at line 210
// Sources tab // Sources tab
connect(ui->sourceList, SIGNAL(currentTextChanged(const QString&)), ui->sourceEdit, SLOT(setText(const QString&))); connect(ui->sourceList, SIGNAL(currentTextChanged(const QString&)), ui->sourceEdit, SLOT(setText(const QString&)));
connect(ui->sourceList, SIGNAL(itemChanged(QListWidgetItem*)), connect(ui->sourceList, SIGNAL(itemChanged(QListWidgetItem*)),
this, SLOT(saveSourceList())); this, SLOT(saveSourceList()));
connect(ui->sourceEdit, SIGNAL(editingFinished()), connect(ui->sourceEdit, SIGNAL(editingFinished()),
this, SLOT(saveEditedSource())); this, SLOT(saveEditedSource()));
connect(ui->deleteSourceButton, SIGNAL(clicked()), this, SLOT(delete SourceRow())); connect(ui->deleteSourceButton, SIGNAL(clicked()), this, SLOT(delete SourceRow()));
connect(ui->addSourceButton, SIGNAL(clicked()), this, SLOT(addSource Row())); connect(ui->addSourceButton, SIGNAL(clicked()), this, SLOT(addSource Row()));
connect(plugin, SIGNAL(settingsChanged()), connect(plugin, SIGNAL(settingsChanged()),
this, SLOT(toggleCheckableSources())); this, SLOT(toggleCheckableSources()));
connect(ui->sourceList, SIGNAL(currentRowChanged(int)), this, SLOT(r epaintSourceList()));
// About tab // About tab
populateAboutPage(); populateAboutPage();
populateFilterMenu(); populateFilterMenu();
populateSourcesList(); populateSourcesList();
} }
void SatellitesDialog::repaintSourceList()
{
// Enable force repaint sourceList to avoiding artifacts
// Seems bug in Qt5. Details: https://bugs.launchpad.net/stellarium/
+bug/1350669
ui->sourceList->repaint();
}
void SatellitesDialog::filterListByGroup(int index) void SatellitesDialog::filterListByGroup(int index)
{ {
if (index < 0) if (index < 0)
return; return;
QString groupId = ui->groupFilterCombo->itemData(index).toString(); QString groupId = ui->groupFilterCombo->itemData(index).toString();
if (groupId == "all") if (groupId == "all")
filterModel->setSecondaryFilters(QString(), SatNoFlags); filterModel->setSecondaryFilters(QString(), SatNoFlags);
else if (groupId == "[displayed]") else if (groupId == "[displayed]")
filterModel->setSecondaryFilters(QString(), SatDisplayed); filterModel->setSecondaryFilters(QString(), SatDisplayed);
skipping to change at line 287 skipping to change at line 297
ui->nameEdit->setText(index.data(Qt::DisplayRole).toString() ); ui->nameEdit->setText(index.data(Qt::DisplayRole).toString() );
ui->noradNumberEdit->setText(index.data(Qt::UserRole).toStri ng()); ui->noradNumberEdit->setText(index.data(Qt::UserRole).toStri ng());
// NOTE: Description is deliberately displayed untranslated! // NOTE: Description is deliberately displayed untranslated!
ui->descriptionTextEdit->setText(index.data(SatDescriptionRo le).toString()); ui->descriptionTextEdit->setText(index.data(SatDescriptionRo le).toString());
ui->tleFirstLineEdit->setText(index.data(FirstLineRole).toSt ring()); ui->tleFirstLineEdit->setText(index.data(FirstLineRole).toSt ring());
ui->tleFirstLineEdit->setCursorPosition(0); ui->tleFirstLineEdit->setCursorPosition(0);
ui->tleSecondLineEdit->setText(index.data(SecondLineRole).to String()); ui->tleSecondLineEdit->setText(index.data(SecondLineRole).to String());
ui->tleSecondLineEdit->setCursorPosition(0); ui->tleSecondLineEdit->setCursorPosition(0);
} }
// Enable force repaint satellitesList to avoiding artifacts
// Seems bug in Qt5. Details: https://bugs.launchpad.net/stellarium/
+bug/1350669
ui->satellitesList->repaint();
// TODO: Fix the comms button... // TODO: Fix the comms button...
// ui->commsButton->setEnabled(sat->comms.count()>0); // ui->commsButton->setEnabled(sat->comms.count()>0);
// Things that are cumulative in a multi-selection // Things that are cumulative in a multi-selection
GroupSet globalGroups = GETSTELMODULE(Satellites)->getGroups(); GroupSet globalGroups = GETSTELMODULE(Satellites)->getGroups();
GroupSet groupsUsedBySome; GroupSet groupsUsedBySome;
GroupSet groupsUsedByAll = globalGroups; GroupSet groupsUsedByAll = globalGroups;
ui->displayedCheckbox->setChecked(false); ui->displayedCheckbox->setChecked(false);
ui->orbitCheckbox->setChecked(false); ui->orbitCheckbox->setChecked(false);
ui->userCheckBox->setChecked(false); ui->userCheckBox->setChecked(false);
 End of changes. 5 change blocks. 
0 lines changed or deleted 16 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/