BookmarksDialog.cpp   BookmarksDialog.cpp 
skipping to change at line 63 skipping to change at line 63
void BookmarksDialog::retranslate() void BookmarksDialog::retranslate()
{ {
if (dialog) if (dialog)
{ {
ui->retranslateUi(dialog); ui->retranslateUi(dialog);
setBookmarksHeaderNames(); setBookmarksHeaderNames();
} }
} }
void BookmarksDialog::styleChanged()
{
// Nothing for now
}
void BookmarksDialog::createDialogContent() void BookmarksDialog::createDialogContent()
{ {
ui->setupUi(dialog); ui->setupUi(dialog);
//Signals and slots //Signals and slots
connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SL OT(retranslate())); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SL OT(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->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMove dTo(QPoint)));
connect(ui->addBookmarkButton, SIGNAL(clicked()), this, SLOT(addBook markButtonPressed())); connect(ui->addBookmarkButton, SIGNAL(clicked()), this, SLOT(addBook markButtonPressed()));
skipping to change at line 154 skipping to change at line 159
{ {
bool dateTimeFlag = ui->dateTimeCheckBox->isChecked( ); bool dateTimeFlag = ui->dateTimeCheckBox->isChecked( );
bool locationFlag = ui->locationCheckBox->isChecked( ); bool locationFlag = ui->locationCheckBox->isChecked( );
QString JDs = ""; QString JDs = "";
double JD = -1.; double JD = -1.;
if (dateTimeFlag) if (dateTimeFlag)
{ {
JD = core->getJD(); JD = core->getJD();
JDs = StelUtils::julianDayToISO8601String(JD + StelUtils::getGMTShiftFromQT(JD)/24.).replace("T", " "); JDs = StelUtils::julianDayToISO8601String(JD + core->getUTCOffset(JD)/24.).replace("T", " ");
} }
QString Location = ""; QString Location = "";
if (locationFlag) if (locationFlag)
{ {
StelLocation loc = core->getCurrentLocation( ); StelLocation loc = core->getCurrentLocation( );
if (loc.name.isEmpty()) if (loc.name.isEmpty())
Location = QString("%1, %2").arg(loc .latitude).arg(loc.longitude); Location = QString("%1, %2").arg(loc .latitude).arg(loc.longitude);
else else
Location = QString("%1, %2").arg(loc .name).arg(loc.country); Location = QString("%1, %2").arg(loc .name).arg(loc.country);
skipping to change at line 275 skipping to change at line 280
QString JDs = ""; QString JDs = "";
bm.name = bookmarkData.value("name").toString(); bm.name = bookmarkData.value("name").toString();
QString nameI18n = bookmarkData.value("nameI18n").toString() ; QString nameI18n = bookmarkData.value("nameI18n").toString() ;
if (!nameI18n.isEmpty()) if (!nameI18n.isEmpty())
bm.nameI18n = nameI18n; bm.nameI18n = nameI18n;
QString JD = bookmarkData.value("jd").toString(); QString JD = bookmarkData.value("jd").toString();
if (!JD.isEmpty()) if (!JD.isEmpty())
{ {
bm.jd = JD; bm.jd = JD;
JDs = StelUtils::julianDayToISO8601String(JD.toDoubl e() + StelUtils::getGMTShiftFromQT(JD.toDouble())/24.).replace("T", " "); JDs = StelUtils::julianDayToISO8601String(JD.toDoubl e() + core->getUTCOffset(JD.toDouble())/24.).replace("T", " ");
} }
QString Location = bookmarkData.value("location").toString() ; QString Location = bookmarkData.value("location").toString() ;
if (!Location.isEmpty()) if (!Location.isEmpty())
bm.location = Location; bm.location = Location;
bookmarksCollection.insert(bookmarkKey, bm); bookmarksCollection.insert(bookmarkKey, bm);
addModelRow(i, bookmarkKey, bm.name, bm.nameI18n, JDs, Locat ion); addModelRow(i, bookmarkKey, bm.name, bm.nameI18n, JDs, Locat ion);
i++; i++;
} }
} }
 End of changes. 3 change blocks. 
2 lines changed or deleted 7 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/