StelGuiItems.cpp   StelGuiItems.cpp 
skipping to change at line 48 skipping to change at line 48
#include <QMouseEvent> #include <QMouseEvent>
#include <QAction> #include <QAction>
#include <QRegExp> #include <QRegExp>
#include <QPixmapCache> #include <QPixmapCache>
#include <QProgressBar> #include <QProgressBar>
#include <QGraphicsWidget> #include <QGraphicsWidget>
#include <QGraphicsProxyWidget> #include <QGraphicsProxyWidget>
#include <QGraphicsLinearLayout> #include <QGraphicsLinearLayout>
#include <QSettings> #include <QSettings>
#ifdef _MSC_BUILD
#define round(dbl) dbl >= 0.0 ? (int)(dbl + 0.5) : ((dbl - (double)(int)dbl
) <= -0.5 ? (int)dbl : (int)(dbl - 0.5))
#endif
StelButton::StelButton(QGraphicsItem* parent, StelButton::StelButton(QGraphicsItem* parent,
const QPixmap& apixOn, const QPixmap& apixOn,
const QPixmap& apixOff, const QPixmap& apixOff,
const QPixmap& apixHover, const QPixmap& apixHover,
QAction* aaction, QAction* aaction,
bool noBackground) : bool noBackground) :
QGraphicsPixmapItem(apixOff, parent), QGraphicsPixmapItem(apixOff, parent),
pixOn(apixOn), pixOn(apixOn),
pixOff(apixOff), pixOff(apixOff),
pixHover(apixHover), pixHover(apixHover),
skipping to change at line 607 skipping to change at line 611
if (datetime->text()!=newDate) if (datetime->text()!=newDate)
{ {
updatePos = true; updatePos = true;
datetime->setText(newDate); datetime->setText(newDate);
if (displayDeltaT && core->getCurrentDeltaTAlgorithm()!=Stel Core::WithoutCorrection) if (displayDeltaT && core->getCurrentDeltaTAlgorithm()!=Stel Core::WithoutCorrection)
{ {
if (sigma>0) if (sigma>0)
sigmaInfo = QString("; %1(%2T) = %3s").arg(Q Char(0x03c3)).arg(QChar(0x0394)).arg(sigma, 3, 'f', 1); sigmaInfo = QString("; %1(%2T) = %3s").arg(Q Char(0x03c3)).arg(QChar(0x0394)).arg(sigma, 3, 'f', 1);
if (std::abs(deltaT)>60.) if (std::abs(deltaT)>60.)
datetime->setToolTip(QString("%1T = %2 (%3s) %8 [%4 @ -23.8946%5/cy%6%7]").arg(QChar(0x0394)).arg(StelUtils::hoursToHmsS tr(deltaT/3600.)).arg(deltaT, 5, 'f', 2).arg(QChar(0x1e45)).arg(QChar(0x203 3)).arg(QChar(0x00B2)).arg(sigmaInfo).arg(validRangeInfo)); datetime->setToolTip(QString("%1T = %2 (%3s) %6 [n-dot @ -23.8946\"/cy%4%5]").arg(QChar(0x0394)).arg(StelUtils::hoursToH msStr(deltaT/3600.)).arg(deltaT, 5, 'f', 2).arg(QChar(0x00B2)).arg(sigmaInf o).arg(validRangeInfo));
else else
datetime->setToolTip(QString("%1T = %2s%7 [% 3 @ -23.8946%4/cy%5%6]").arg(QChar(0x0394)).arg(deltaT, 3, 'f', 3).arg(QCha r(0x1e45)).arg(QChar(0x2033)).arg(QChar(0x00B2)).arg(sigmaInfo).arg(validRa ngeInfo)); datetime->setToolTip(QString("%1T = %2s%5 [n -dot @ -23.8946\"/cy%3%4]").arg(QChar(0x0394)).arg(deltaT, 3, 'f', 3).arg(Q Char(0x00B2)).arg(sigmaInfo).arg(validRangeInfo));
} }
else else
datetime->setToolTip(""); datetime->setToolTip("");
} }
QString newLocation = flagShowLocation ? q_(core->getCurrentLocation ().planetName) +", " QString newLocation = flagShowLocation ? q_(core->getCurrentLocation ().planetName) +", "
+core->getCurrentLocation().name + ", " +core->getCurrentLocation().name + ", "
// xgettext:no-c-format // xgettext:no-c-format
+q_("%1m").arg(core->getCurrentLocation().altitude) : " "; +q_("%1m").arg(core->getCurrentLocation().altitude) : " ";
if (location->text()!=newLocation) if (location->text()!=newLocation)
 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/