StelGuiItems.cpp   StelGuiItems.cpp 
skipping to change at line 53 skipping to change at line 53
#include <QTimeLine> #include <QTimeLine>
#include <QMouseEvent> #include <QMouseEvent>
#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>
// Inspired by text-use-opengl-buffer branch: work around font problems in
GUI buttons.
// May be useful in other broken OpenGL font situations. RasPi necessity as
of 2016-03-26.
QPixmap getTextPixmap(const QString& str, QFont font)
{
// Render the text str into a QPixmap.
QRect strRect = QFontMetrics(font).boundingRect(str);
int w = strRect.width()+1+(int)(0.02f*strRect.width());
int h = strRect.height();
QPixmap strPixmap(w, h);
strPixmap.fill(Qt::transparent);
QPainter painter(&strPixmap);
font.setStyleStrategy(QFont::NoAntialias); // else: font problems on
RasPi20160326
painter.setFont(font);
//painter.setRenderHints(QPainter::TextAntialiasing);
painter.setPen(Qt::white);
painter.drawText(-strRect.x(), -strRect.y(), str);
return strPixmap;
}
void StelButton::initCtor(const QPixmap& apixOn, void StelButton::initCtor(const QPixmap& apixOn,
const QPixmap& apixOff, const QPixmap& apixOff,
const QPixmap& apixNoChange, const QPixmap& apixNoChange,
const QPixmap& apixHover, const QPixmap& apixHover,
StelAction* aaction, StelAction* aaction,
bool noBackground, bool noBackground,
bool isTristate) bool isTristate)
{ {
pixOn = apixOn; pixOn = apixOn;
pixOff = apixOff; pixOff = apixOff;
pixHover = apixHover; pixHover = apixHover;
pixNoChange = apixNoChange; pixNoChange = apixNoChange;
noBckground = noBackground; noBckground = !StelApp::getInstance().getSettings()->value("gui/flag _show_buttons_background", !noBackground).toBool();
isTristate_ = isTristate; isTristate_ = isTristate;
opacity = 1.; opacity = 1.;
hoverOpacity = 0.; hoverOpacity = 0.;
action = aaction; action = aaction;
checked = false; checked = false;
flagChangeFocus = false;
Q_ASSERT(!pixOn.isNull()); Q_ASSERT(!pixOn.isNull());
Q_ASSERT(!pixOff.isNull()); Q_ASSERT(!pixOff.isNull());
if (isTristate_) if (isTristate_)
{ {
Q_ASSERT(!pixNoChange.isNull()); Q_ASSERT(!pixNoChange.isNull());
} }
setShapeMode(QGraphicsPixmapItem::BoundingRectShape); setShapeMode(QGraphicsPixmapItem::BoundingRectShape);
skipping to change at line 180 skipping to change at line 201
timeLine->setDirection(QTimeLine::Backward); timeLine->setDirection(QTimeLine::Backward);
if (timeLine->state()!=QTimeLine::Running) if (timeLine->state()!=QTimeLine::Running)
timeLine->start(); timeLine->start();
emit(hoverChanged(false)); emit(hoverChanged(false));
} }
void StelButton::mouseReleaseEvent(QGraphicsSceneMouseEvent*) void StelButton::mouseReleaseEvent(QGraphicsSceneMouseEvent*)
{ {
if (action!=NULL && !action->isCheckable()) if (action!=NULL && !action->isCheckable())
setChecked(toggleChecked(checked)); setChecked(toggleChecked(checked));
if (flagChangeFocus) // true if button is on bottom bar
StelMainView::getInstance().setFocusOnSky(); // Change the f
ocus after clicking on button
} }
void StelButton::updateIcon() void StelButton::updateIcon()
{ {
if (opacity < 0.) if (opacity < 0.)
opacity = 0; opacity = 0;
QPixmap pix(pixOn.size()); QPixmap pix(pixOn.size());
pix.fill(QColor(0,0,0,0)); pix.fill(QColor(0,0,0,0));
QPainter painter(&pix); QPainter painter(&pix);
painter.setOpacity(opacity); painter.setOpacity(opacity);
skipping to change at line 227 skipping to change at line 251
void StelButton::setBackgroundPixmap(const QPixmap &newBackground) void StelButton::setBackgroundPixmap(const QPixmap &newBackground)
{ {
pixBackground = newBackground; pixBackground = newBackground;
updateIcon(); updateIcon();
} }
LeftStelBar::LeftStelBar(QGraphicsItem* parent) LeftStelBar::LeftStelBar(QGraphicsItem* parent)
: QGraphicsItem(parent) : QGraphicsItem(parent)
, hideTimeLine(NULL) , hideTimeLine(NULL)
, helpLabelPixmap(NULL)
{ {
// Create the help label // Create the help label
helpLabel = new QGraphicsSimpleTextItem("", this); helpLabel = new QGraphicsSimpleTextItem("", this);
helpLabel->setBrush(QBrush(QColor::fromRgbF(1,1,1,1))); helpLabel->setBrush(QBrush(QColor::fromRgbF(1,1,1,1)));
if (qApp->property("text_texture")==true) // CLI option -t given?
helpLabelPixmap=new QGraphicsPixmapItem(this);
} }
LeftStelBar::~LeftStelBar() LeftStelBar::~LeftStelBar()
{ {
if (helpLabelPixmap) { delete helpLabelPixmap; helpLabelPixmap=NULL; }
} }
void LeftStelBar::addButton(StelButton* button) void LeftStelBar::addButton(StelButton* button)
{ {
double posY = 0; double posY = 0;
if (QGraphicsItem::childItems().size()!=0) if (QGraphicsItem::childItems().size()!=0)
{ {
const QRectF& r = childrenBoundingRect(); const QRectF& r = childrenBoundingRect();
posY += r.bottom()-1; posY += r.bottom()-1;
} }
button->setParentItem(this); button->setParentItem(this);
button->setFocusOnSky(false);
button->prepareGeometryChange(); // could possibly be removed when q t 4.6 become stable button->prepareGeometryChange(); // could possibly be removed when q t 4.6 become stable
button->setPos(0., qRound(posY+10.5)); button->setPos(0., qRound(posY+10.5));
connect(button, SIGNAL(hoverChanged(bool)), this, SLOT(buttonHoverCh anged(bool))); connect(button, SIGNAL(hoverChanged(bool)), this, SLOT(buttonHoverCh anged(bool)));
} }
void LeftStelBar::paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget *) void LeftStelBar::paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget *)
{ {
} }
skipping to change at line 267 skipping to change at line 296
{ {
return childrenBoundingRect(); return childrenBoundingRect();
} }
QRectF LeftStelBar::boundingRectNoHelpLabel() const QRectF LeftStelBar::boundingRectNoHelpLabel() const
{ {
// Re-use original Qt code, just remove the help label // Re-use original Qt code, just remove the help label
QRectF childRect; QRectF childRect;
foreach (QGraphicsItem *child, QGraphicsItem::childItems()) foreach (QGraphicsItem *child, QGraphicsItem::childItems())
{ {
if (child==helpLabel) if ((child==helpLabel) || (child==helpLabelPixmap))
continue; continue;
QPointF childPos = child->pos(); QPointF childPos = child->pos();
QTransform matrix = child->transform() * QTransform().transl ate(childPos.x(), childPos.y()); QTransform matrix = child->transform() * QTransform().transl ate(childPos.x(), childPos.y());
childRect |= matrix.mapRect(child->boundingRect() | child->c hildrenBoundingRect()); childRect |= matrix.mapRect(child->boundingRect() | child->c hildrenBoundingRect());
} }
return childRect; return childRect;
} }
// Update the help label when a button is hovered // Update the help label when a button is hovered
void LeftStelBar::buttonHoverChanged(bool b) void LeftStelBar::buttonHoverChanged(bool b)
skipping to change at line 296 skipping to change at line 325
QString shortcut(button->action->getShortcut().toStr ing(QKeySequence::NativeText)); QString shortcut(button->action->getShortcut().toStr ing(QKeySequence::NativeText));
if (!shortcut.isEmpty()) if (!shortcut.isEmpty())
{ {
//XXX: this should be unnecessary since we u sed NativeText. //XXX: this should be unnecessary since we u sed NativeText.
if (shortcut == "Space") if (shortcut == "Space")
shortcut = q_("Space"); shortcut = q_("Space");
tip += " [" + shortcut + "]"; tip += " [" + shortcut + "]";
} }
helpLabel->setText(tip); helpLabel->setText(tip);
helpLabel->setPos(qRound(boundingRectNoHelpLabel().w idth()+15.5),qRound(button->pos().y()+button->pixmap().size().height()/2-8) ); helpLabel->setPos(qRound(boundingRectNoHelpLabel().w idth()+15.5),qRound(button->pos().y()+button->pixmap().size().height()/2-8) );
if (qApp->property("text_texture")==true)
{
helpLabel->setVisible(false);
helpLabelPixmap->setPixmap(getTextPixmap(tip
, helpLabel->font()));
helpLabelPixmap->setPos(helpLabel->pos());
helpLabelPixmap->setVisible(true);
}
} }
} }
else else
{ {
helpLabel->setText(""); helpLabel->setText("");
if (qApp->property("text_texture")==true)
helpLabelPixmap->setVisible(false);
} }
// Update the screen as soon as possible. // Update the screen as soon as possible.
StelMainView::getInstance().thereWasAnEvent(); StelMainView::getInstance().thereWasAnEvent();
} }
// Set the pen for all the sub elements // Set the pen for all the sub elements
void LeftStelBar::setColor(const QColor& c) void LeftStelBar::setColor(const QColor& c)
{ {
helpLabel->setBrush(c); helpLabel->setBrush(c);
} }
BottomStelBar::BottomStelBar(QGraphicsItem* parent, BottomStelBar::BottomStelBar(QGraphicsItem* parent,
const QPixmap& pixLeft, const QPixmap& pixLeft,
const QPixmap& pixRight, const QPixmap& pixRight,
const QPixmap& pixMiddle, const QPixmap& pixMiddle,
const QPixmap& pixSingle) : const QPixmap& pixSingle) :
QGraphicsItem(parent), QGraphicsItem(parent),
locationPixmap(NULL),
datetimePixmap(NULL),
fovPixmap(NULL),
fpsPixmap(NULL),
pixBackgroundLeft(pixLeft), pixBackgroundLeft(pixLeft),
pixBackgroundRight(pixRight), pixBackgroundRight(pixRight),
pixBackgroundMiddle(pixMiddle), pixBackgroundMiddle(pixMiddle),
pixBackgroundSingle(pixSingle) pixBackgroundSingle(pixSingle),
helpLabelPixmap(NULL)
{ {
// The text is dummy just for testing // The text is dummy just for testing
datetime = new QGraphicsSimpleTextItem("2008-02-06 17:33", this); datetime = new QGraphicsSimpleTextItem("2008-02-06 17:33", this);
location = new QGraphicsSimpleTextItem("Munich, Earth, 500m", this); location = new QGraphicsSimpleTextItem("Munich, Earth, 500m", this);
fov = new QGraphicsSimpleTextItem("FOV 43.45", this); fov = new QGraphicsSimpleTextItem("FOV 43.45", this);
fps = new QGraphicsSimpleTextItem("43.2 FPS", this); fps = new QGraphicsSimpleTextItem("43.2 FPS", this);
if (qApp->property("text_texture")==true) // CLI option -t given?
{
datetimePixmap=new QGraphicsPixmapItem(this);
locationPixmap=new QGraphicsPixmapItem(this);
fovPixmap=new QGraphicsPixmapItem(this);
fpsPixmap=new QGraphicsPixmapItem(this);
helpLabelPixmap=new QGraphicsPixmapItem(this);
}
// Create the help label // Create the help label
helpLabel = new QGraphicsSimpleTextItem("", this); helpLabel = new QGraphicsSimpleTextItem("", this);
helpLabel->setBrush(QBrush(QColor::fromRgbF(1,1,1,1))); helpLabel->setBrush(QBrush(QColor::fromRgbF(1,1,1,1)));
QColor color = QColor::fromRgbF(1,1,1,1); QColor color = QColor::fromRgbF(1,1,1,1);
setColor(color); setColor(color);
// Font size is 12 // Font size is 12
int baseFontSize = StelApp::getInstance().getBaseFontSize()-1; int baseFontSize = StelApp::getInstance().getBaseFontSize()-1;
skipping to change at line 367 skipping to change at line 418
{ {
foreach (StelButton* b, iter.value().elems) foreach (StelButton* b, iter.value().elems)
{ {
if (b->parentItem()==0) if (b->parentItem()==0)
{ {
delete b; delete b;
b=NULL; b=NULL;
} }
} }
} }
if (datetimePixmap) { delete datetimePixmap; datetimePixmap=NULL; }
if (locationPixmap) { delete locationPixmap; locationPixmap=NULL; }
if (fovPixmap) { delete fovPixmap; fovPixmap=NULL; }
if (fpsPixmap) { delete fpsPixmap; fpsPixmap=NULL; }
if (helpLabelPixmap) { delete helpLabelPixmap; helpLabelPixmap=NULL;
}
} }
void BottomStelBar::addButton(StelButton* button, const QString& groupName, const QString& beforeActionName) void BottomStelBar::addButton(StelButton* button, const QString& groupName, const QString& beforeActionName)
{ {
QList<StelButton*>& g = buttonGroups[groupName].elems; QList<StelButton*>& g = buttonGroups[groupName].elems;
bool done = false; bool done = false;
for (int i=0; i<g.size(); ++i) for (int i=0; i<g.size(); ++i)
{ {
if (g[i]->action && g[i]->action->objectName()==beforeAction Name) if (g[i]->action && g[i]->action->objectName()==beforeAction Name)
{ {
g.insert(i, button); g.insert(i, button);
done = true; done = true;
break; break;
} }
} }
if (done == false) if (done == false)
g.append(button); g.append(button);
button->setVisible(true); button->setVisible(true);
button->setParentItem(this); button->setParentItem(this);
button->setFocusOnSky(true);
updateButtonsGroups(); updateButtonsGroups();
connect(button, SIGNAL(hoverChanged(bool)), this, SLOT(buttonHoverCh anged(bool))); connect(button, SIGNAL(hoverChanged(bool)), this, SLOT(buttonHoverCh anged(bool)));
emit sizeChanged(); emit sizeChanged();
} }
StelButton* BottomStelBar::hideButton(const QString& actionName) StelButton* BottomStelBar::hideButton(const QString& actionName)
{ {
QString gName; QString gName;
StelButton* bToRemove = NULL; StelButton* bToRemove = NULL;
skipping to change at line 589 skipping to change at line 646
QString deltaTInfo = ""; QString deltaTInfo = "";
if (qAbs(deltaT)>60.) if (qAbs(deltaT)>60.)
deltaTInfo = QString("%1 (%2s)%3").arg(StelU tils::hoursToHmsStr(deltaT/3600.)).arg(deltaT, 5, 'f', 2).arg(validRangeMar ker); deltaTInfo = QString("%1 (%2s)%3").arg(StelU tils::hoursToHmsStr(deltaT/3600.)).arg(deltaT, 5, 'f', 2).arg(validRangeMar ker);
else else
deltaTInfo = QString("%1s%2").arg(deltaT, 3, 'f', 3).arg(validRangeMarker); deltaTInfo = QString("%1s%2").arg(deltaT, 3, 'f', 3).arg(validRangeMarker);
datetime->setToolTip(QString("<p style='white-space: pre'>%1T = %2 [n-dot @ -23.8946\"/cy%3%4]<br>%5</p>").arg(QChar(0x0394)).ar g(deltaTInfo).arg(QChar(0x00B2)).arg(sigmaInfo).arg(newDateAppx)); datetime->setToolTip(QString("<p style='white-space: pre'>%1T = %2 [n-dot @ -23.8946\"/cy%3%4]<br>%5</p>").arg(QChar(0x0394)).ar g(deltaTInfo).arg(QChar(0x00B2)).arg(sigmaInfo).arg(newDateAppx));
} }
else else
datetime->setToolTip(QString("%1").arg(newDateAppx)) ; datetime->setToolTip(QString("%1").arg(newDateAppx)) ;
if (qApp->property("text_texture")==true) // CLI option -t g
iven?
{
datetime->setVisible(false); // hide normal thingy.
datetimePixmap->setPixmap(getTextPixmap(newDateInfo,
datetime->font()));
}
} }
// build location tooltip // build location tooltip
QString newLocation = ""; QString newLocation = "";
const StelLocation* loc = &core->getCurrentLocation(); const StelLocation* loc = &core->getCurrentLocation();
const StelTranslator& trans = locmgr.getSkyTranslator(); const StelTranslator& trans = locmgr.getSkyTranslator();
if (getFlagShowLocation() && !loc->name.isEmpty()) if (getFlagShowLocation() && !loc->name.isEmpty())
{ {
newLocation = trans.qtranslate(loc->planetName) +", "+loc->n ame + ", "+q_("%1m").arg(loc->altitude); newLocation = trans.qtranslate(loc->planetName) +", "+loc->n ame + ", "+q_("%1m").arg(loc->altitude);
} }
skipping to change at line 634 skipping to change at line 696
lon *= -1; lon *= -1;
} }
lonStr = QString("%1%2%3").arg(pm).arg(lon).arg(QChar(0x00B0 )); lonStr = QString("%1%2%3").arg(pm).arg(lon).arg(QChar(0x00B0 ));
QString rho; QString rho;
if (core->getUseTopocentricCoordinates()) if (core->getUseTopocentricCoordinates())
rho = q_("planetocentric distance %1 km").arg(core-> getCurrentObserver()->getDistanceFromCenter() * AU); rho = q_("planetocentric distance %1 km").arg(core-> getCurrentObserver()->getDistanceFromCenter() * AU);
else else
rho = q_("planetocentric observer"); rho = q_("planetocentric observer");
location->setToolTip(QString("%1 %2; %3").arg(latStr).arg(lo nStr).arg(rho)); location->setToolTip(QString("%1 %2; %3").arg(latStr).arg(lo nStr).arg(rho));
if (qApp->property("text_texture")==true) // CLI option -t g
iven?
{
locationPixmap->setPixmap(getTextPixmap(newLocation,
location->font()));
location->setVisible(false);
}
} }
QString str; QString str;
// build fov tooltip // build fov tooltip
QTextStream wos(&str); QTextStream wos(&str);
if (getFlagFovDms()) if (getFlagFovDms())
{ {
wos << "FOV " << StelUtils::decDegToDmsStr(core->getMovement Mgr()->getCurrentFov()); wos << "FOV " << StelUtils::decDegToDmsStr(core->getMovement Mgr()->getCurrentFov());
} }
skipping to change at line 656 skipping to change at line 723
wos << "FOV " << qSetRealNumberPrecision(3) << core->getMove mentMgr()->getCurrentFov() << QChar(0x00B0); wos << "FOV " << qSetRealNumberPrecision(3) << core->getMove mentMgr()->getCurrentFov() << QChar(0x00B0);
} }
if (fov->text()!=str) if (fov->text()!=str)
{ {
updatePos = true; updatePos = true;
if (getFlagShowFov()) if (getFlagShowFov())
{ {
fov->setText(str); fov->setText(str);
fov->setToolTip(q_("Field of view")); fov->setToolTip(q_("Field of view"));
if (qApp->property("text_texture")==true) // CLI opt
ion -t given?
{
fovPixmap->setPixmap(getTextPixmap(str, fov-
>font()));
fov->setVisible(false);
}
} }
else else
{ {
fov->setText(""); fov->setText("");
fov->setToolTip(""); fov->setToolTip("");
} }
} }
str=""; str="";
// build fps tooltip // build fps tooltip
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;
if (getFlagShowFps()) if (getFlagShowFps())
{ {
fps->setText(str); fps->setText(str);
fps->setToolTip(q_("Frames per second")); fps->setToolTip(q_("Frames per second"));
if (qApp->property("text_texture")==true) // CLI opt
ion -t given?
{
fpsPixmap->setPixmap(getTextPixmap(str, fps-
>font()));
fps->setVisible(false);
}
} }
else else
{ {
fps->setText(""); fps->setText("");
fps->setToolTip(""); fps->setToolTip("");
} }
} }
if (updatePos) if (updatePos)
{ {
QRectF rectCh = getButtonsBoundingRect(); QRectF rectCh = getButtonsBoundingRect();
location->setPos(0, 0); location->setPos(0, 0);
int dtp = rectCh.right()-datetime->boundingRect().width()-5; int dtp = rectCh.right()-datetime->boundingRect().width()-5;
if ((dtp%2) == 1) dtp--; // make even pixel if ((dtp%2) == 1) dtp--; // make even pixel
datetime->setPos(dtp,0); datetime->setPos(dtp,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);
if (qApp->property("text_texture")==true) // CLI option -t g
iven?
{
locationPixmap->setPos(0,0);
int dtp = rectCh.right()-datetimePixmap->boundingRec
t().width()-5;
if ((dtp%2) == 1) dtp--; // make even pixel
datetimePixmap->setPos(dtp,0);
fovPixmap->setPos(datetime->x()-200, 0);
fpsPixmap->setPos(datetime->x()-95, 0);
}
} }
} }
void BottomStelBar::paint(QPainter*, const QStyleOptionGraphicsItem*, QWidg et*) void BottomStelBar::paint(QPainter*, const QStyleOptionGraphicsItem*, QWidg et*)
{ {
updateText(); updateText();
} }
QRectF BottomStelBar::boundingRect() const QRectF BottomStelBar::boundingRect() const
{ {
skipping to change at line 715 skipping to change at line 801
const QRectF& r = childrenBoundingRect(); const QRectF& r = childrenBoundingRect();
return QRectF(0, 0, r.width()-1, r.height()-1); return QRectF(0, 0, r.width()-1, r.height()-1);
} }
QRectF BottomStelBar::boundingRectNoHelpLabel() const QRectF BottomStelBar::boundingRectNoHelpLabel() const
{ {
// Re-use original Qt code, just remove the help label // Re-use original Qt code, just remove the help label
QRectF childRect; QRectF childRect;
foreach (QGraphicsItem *child, QGraphicsItem::childItems()) foreach (QGraphicsItem *child, QGraphicsItem::childItems())
{ {
if (child==helpLabel) if ((child==helpLabel) || (child==helpLabelPixmap))
continue; continue;
QPointF childPos = child->pos(); QPointF childPos = child->pos();
QTransform matrix = child->transform() * QTransform().transl ate(childPos.x(), childPos.y()); QTransform matrix = child->transform() * QTransform().transl ate(childPos.x(), childPos.y());
childRect |= matrix.mapRect(child->boundingRect() | child->c hildrenBoundingRect()); childRect |= matrix.mapRect(child->boundingRect() | child->c hildrenBoundingRect());
} }
return childRect; return childRect;
} }
// Set the pen for all the sub elements // Set the pen for all the sub elements
void BottomStelBar::setColor(const QColor& c) void BottomStelBar::setColor(const QColor& c)
skipping to change at line 756 skipping to change at line 842
if (!shortcut.isEmpty()) if (!shortcut.isEmpty())
{ {
//XXX: this should be unnecessary since we u sed NativeText. //XXX: this should be unnecessary since we u sed NativeText.
if (shortcut == "Space") if (shortcut == "Space")
shortcut = q_("Space"); shortcut = q_("Space");
tip += " [" + shortcut + "]"; tip += " [" + shortcut + "]";
} }
helpLabel->setText(tip); helpLabel->setText(tip);
//helpLabel->setPos(button->pos().x()+button->pixmap ().size().width()/2,-27); //helpLabel->setPos(button->pos().x()+button->pixmap ().size().width()/2,-27);
helpLabel->setPos(20,-27); helpLabel->setPos(20,-27);
if (qApp->property("text_texture")==true)
{
helpLabel->setVisible(false);
helpLabelPixmap->setPixmap(getTextPixmap(tip
, helpLabel->font()));
helpLabelPixmap->setPos(helpLabel->pos());
helpLabelPixmap->setVisible(true);
}
} }
} }
else else
{ {
helpLabel->setText(""); helpLabel->setText("");
if (qApp->property("text_texture")==true)
helpLabelPixmap->setVisible(false);
} }
// Update the screen as soon as possible. // Update the screen as soon as possible.
StelMainView::getInstance().thereWasAnEvent(); StelMainView::getInstance().thereWasAnEvent();
} }
StelBarsPath::StelBarsPath(QGraphicsItem* parent) : QGraphicsPathItem(paren t) StelBarsPath::StelBarsPath(QGraphicsItem* parent) : QGraphicsPathItem(paren t)
{ {
roundSize = 6; roundSize = 6;
QPen aPen(QColor::fromRgbF(0.7,0.7,0.7,0.5)); QPen aPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
aPen.setWidthF(1.); aPen.setWidthF(1.);
 End of changes. 24 change blocks. 
4 lines changed or deleted 116 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/