SolarSystemManagerWindow.cpp   SolarSystemManagerWindow.cpp 
skipping to change at line 41 skipping to change at line 41
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelTranslator.hpp" #include "StelTranslator.hpp"
#include "Planet.hpp" #include "Planet.hpp"
#include "SolarSystem.hpp" #include "SolarSystem.hpp"
#include <QFileDialog> #include <QFileDialog>
SolarSystemManagerWindow::SolarSystemManagerWindow() SolarSystemManagerWindow::SolarSystemManagerWindow()
{ {
ui = new Ui_solarSystemManagerWindow(); ui = new Ui_solarSystemManagerWindow();
dialogName = "SolarSystemEditor";
mpcImportWindow = new MpcImportWindow(); mpcImportWindow = new MpcImportWindow();
manualImportWindow = NULL; manualImportWindow = NULL;
ssoManager = GETSTELMODULE(SolarSystemEditor); ssoManager = GETSTELMODULE(SolarSystemEditor);
} }
SolarSystemManagerWindow::~SolarSystemManagerWindow() SolarSystemManagerWindow::~SolarSystemManagerWindow()
{ {
delete ui; delete ui;
skipping to change at line 72 skipping to change at line 73
//Kinetic scrolling for tablet pc and pc //Kinetic scrolling for tablet pc and pc
QList<QWidget *> addscroll; QList<QWidget *> addscroll;
addscroll << ui->listWidgetObjects; addscroll << ui->listWidgetObjects;
installKineticScrolling(addscroll); installKineticScrolling(addscroll);
#endif #endif
//Signals //Signals
connect(&StelApp::getInstance(), SIGNAL(languageChanged()), connect(&StelApp::getInstance(), SIGNAL(languageChanged()),
this, SLOT(retranslate())); this, SLOT(retranslate()));
connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ; connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ;
connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMove dTo(QPoint)));
connect(ui->pushButtonCopyFile, SIGNAL(clicked()), this, SLOT(copyCo nfiguration())); connect(ui->pushButtonCopyFile, SIGNAL(clicked()), this, SLOT(copyCo nfiguration()));
connect(ui->pushButtonReplaceFile, SIGNAL(clicked()), this, SLOT(rep laceConfiguration())); connect(ui->pushButtonReplaceFile, SIGNAL(clicked()), this, SLOT(rep laceConfiguration()));
connect(ui->pushButtonRemove, SIGNAL(clicked()), this, SLOT(removeOb ject())); connect(ui->pushButtonRemove, SIGNAL(clicked()), this, SLOT(removeOb ject()));
connect(ui->pushButtonImportMPC, SIGNAL(clicked()), this, SLOT(newIm portMPC())); connect(ui->pushButtonImportMPC, SIGNAL(clicked()), this, SLOT(newIm portMPC()));
//connect(ui->pushButtonManual, SIGNAL(clicked()), this, SLOT(newImp ortManual())); //connect(ui->pushButtonManual, SIGNAL(clicked()), this, SLOT(newImp ortManual()));
connect(ssoManager, SIGNAL(solarSystemChanged()), this, SLOT(populat eSolarSystemList())); connect(ssoManager, SIGNAL(solarSystemChanged()), this, SLOT(populat eSolarSystemList()));
connect(ui->pushButtonReset, SIGNAL(clicked()), ssoManager, SLOT(res etSolarSystemToDefault())); connect(ui->pushButtonReset, SIGNAL(clicked()), ssoManager, SLOT(res etSolarSystemToDefault()));
// bug #1350669 (https://bugs.launchpad.net/stellarium/+bug/1350669) // bug #1350669 (https://bugs.launchpad.net/stellarium/+bug/1350669)
skipping to change at line 185 skipping to change at line 187
QString ssoI18nName = ui->listWidgetObjects->currentItem()-> text(); QString ssoI18nName = ui->listWidgetObjects->currentItem()-> text();
QString ssoEnglishName = unlocalizedNames.value(ssoI18nName) ; QString ssoEnglishName = unlocalizedNames.value(ssoI18nName) ;
//qDebug() << ssoId; //qDebug() << ssoId;
//TODO: Ask for confirmation first? //TODO: Ask for confirmation first?
ssoManager->removeSsoWithName(ssoEnglishName); ssoManager->removeSsoWithName(ssoEnglishName);
} }
} }
void SolarSystemManagerWindow::copyConfiguration() void SolarSystemManagerWindow::copyConfiguration()
{ {
QString filePath = QFileDialog::getSaveFileName(0, "Save the Solar S ystem configuration file as...", StelFileMgr::getScreenshotDir()); QString filePath = QFileDialog::getSaveFileName(0, q_("Save the Sola r System configuration file as..."), StelFileMgr::getScreenshotDir());
ssoManager->copySolarSystemConfigurationFileTo(filePath); ssoManager->copySolarSystemConfigurationFileTo(filePath);
} }
void SolarSystemManagerWindow::replaceConfiguration() void SolarSystemManagerWindow::replaceConfiguration()
{ {
QString filePath = QFileDialog::getOpenFileName(0, "Select a file to QString filter = q_("Configuration files");
replace the Solar System configuration file", StelFileMgr::getScreenshotDi filter.append(" (*.ini)");
r(), QString("Configration files (*.ini)")); QString filePath = QFileDialog::getOpenFileName(0, q_("Select a file
to replace the Solar System configuration file"), StelFileMgr::getScreensh
otDir(), filter);
ssoManager->replaceSolarSystemConfigurationFileWith(filePath); ssoManager->replaceSolarSystemConfigurationFileWith(filePath);
} }
 End of changes. 4 change blocks. 
4 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/