StelGuiItems.cpp   StelGuiItems.cpp 
skipping to change at line 46 skipping to change at line 46
#include <QGraphicsTextItem> #include <QGraphicsTextItem>
#include <QTimeLine> #include <QTimeLine>
#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>
StelButton::StelButton(QGraphicsItem* parent, const QPixmap& apixOn, const QPixmap& apixOff, StelButton::StelButton(QGraphicsItem* parent, const QPixmap& apixOn, const QPixmap& apixOff,
const QPixmap& apixHover, QAction* aaction, bool noBackgroun d) : const QPixmap& apixHover, QAction* aaction, bool noBackgroun d) :
QGraphicsPixmapItem(apixOff, parent), pixOn(apixOn), pixOff(apixOff), pixHover(apixHover), QGraphicsPixmapItem(apixOff, parent), pixOn(apixOn), pixOff(apixOff), pixHover(apixHover),
checked(ButtonStateOff), action(aaction), noBckgroun d(noBackground), isTristate_(false), checked(ButtonStateOff), action(aaction), noBckgroun d(noBackground), isTristate_(false),
opacity(1.), hoverOpacity(0.) opacity(1.), hoverOpacity(0.)
{ {
Q_ASSERT(!pixOn.isNull()); Q_ASSERT(!pixOn.isNull());
Q_ASSERT(!pixOff.isNull()); Q_ASSERT(!pixOff.isNull());
skipping to change at line 545 skipping to change at line 546
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)
{ {
updatePos = true; updatePos = true;
location->setText(newLocation); location->setText(newLocation);
} }
QSettings* confSettings = StelApp::getInstance().getSettings();
QString str; QString str;
QTextStream wos(&str); QTextStream wos(&str);
wos << "FOV " << qSetRealNumberPrecision(3) << core->getMovementMgr( )->getCurrentFov() << QChar(0x00B0); wos << "FOV " << qSetRealNumberPrecision(3) << core->getMovementMgr( )->getCurrentFov() << QChar(0x00B0);
if (fov->text()!=str) if (fov->text()!=str)
{ {
updatePos = true; updatePos = true;
fov->setText(str); if (confSettings->value("gui/flag_show_fov", true).toBool())
{
fov->setText(str);
}
else
{
fov->setText("");
}
} }
str=""; str="";
QTextStream wos2(&str); QTextStream wos2(&str);
wos2 << qSetRealNumberPrecision(3) << StelApp::getInstance().getFps( ) << " FPS"; wos2 << qSetRealNumberPrecision(3) << StelApp::getInstance().getFps( ) << " FPS";
if (fps->text()!=str) if (fps->text()!=str)
{ {
updatePos = true; updatePos = true;
fps->setText(str); if (confSettings->value("gui/flag_show_fps", true).toBool())
{
fps->setText(str);
}
else
{
fps->setText("");
}
} }
if (updatePos) if (updatePos)
{ {
QRectF rectCh = getButtonsBoundingRect(); QRectF rectCh = getButtonsBoundingRect();
location->setPos(0, 0); location->setPos(0, 0);
datetime->setPos(rectCh.right()-datetime->boundingRect().wid th()-5,0); datetime->setPos(rectCh.right()-datetime->boundingRect().wid th()-5,0);
fov->setPos(datetime->x()-200, 0); fov->setPos(datetime->x()-200, 0);
fps->setPos(datetime->x()-95, 0); fps->setPos(datetime->x()-95, 0);
} }
 End of changes. 4 change blocks. 
2 lines changed or deleted 18 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/