SkyGui.cpp   SkyGui.cpp 
skipping to change at line 52 skipping to change at line 52
else if (objectInfo == "short") else if (objectInfo == "short")
{ {
infoTextFilters = StelObject::InfoStringGroup(StelObject::Sh ortInfo); infoTextFilters = StelObject::InfoStringGroup(StelObject::Sh ortInfo);
} }
else if (objectInfo == "none") else if (objectInfo == "none")
{ {
infoTextFilters = StelObject::InfoStringGroup(0); infoTextFilters = StelObject::InfoStringGroup(0);
} }
else if (objectInfo == "custom") else if (objectInfo == "custom")
{ {
infoTextFilters = StelObject::InfoStringGroup(StelApp::getIn infoTextFilters = StelObject::InfoStringGroup(0);
stance().getStelObjectMgr().getCustomInfoString());
conf->beginGroup("custom_selected_info");
if (conf->value("flag_show_name", false).toBool())
infoTextFilters |= StelObject::Name;
if (conf->value("flag_show_catalognumber", false).toBool())
infoTextFilters |= StelObject::CatalogNumber;
if (conf->value("flag_show_magnitude", false).toBool())
infoTextFilters |= StelObject::Magnitude;
if (conf->value("flag_show_absolutemagnitude", false).toBool
())
infoTextFilters |= StelObject::AbsoluteMagnitude;
if (conf->value("flag_show_radecj2000", false).toBool())
infoTextFilters |= StelObject::RaDecJ2000;
if (conf->value("flag_show_radecofdate", false).toBool())
infoTextFilters |= StelObject::RaDecOfDate;
if (conf->value("flag_show_hourangle", false).toBool())
infoTextFilters |= StelObject::HourAngle;
if (conf->value("flag_show_altaz", false).toBool())
infoTextFilters |= StelObject::AltAzi;
if (conf->value("flag_show_distance", false).toBool())
infoTextFilters |= StelObject::Distance;
if (conf->value("flag_show_size", false).toBool())
infoTextFilters |= StelObject::Size;
if (conf->value("flag_show_extra1", false).toBool())
infoTextFilters |= StelObject::Extra1;
if (conf->value("flag_show_extra2", false).toBool())
infoTextFilters |= StelObject::Extra2;
if (conf->value("flag_show_extra3", false).toBool())
infoTextFilters |= StelObject::Extra3;
conf->endGroup();
} }
else else
{ {
qWarning() << "config.ini option gui/selected_object_info is invalid, using \"all\""; qWarning() << "config.ini option gui/selected_object_info is invalid, using \"all\"";
infoTextFilters = StelObject::InfoStringGroup(StelObject::Al lInfo); infoTextFilters = StelObject::InfoStringGroup(StelObject::Al lInfo);
} }
} }
void InfoPanel::setTextFromObjects(const QList<StelObjectP>& selected) void InfoPanel::setTextFromObjects(const QList<StelObjectP>& selected)
{ {
skipping to change at line 252 skipping to change at line 281
// Update position of the auto-hide buttons // Update position of the auto-hide buttons
autoHidebts->setPos(0, hh-autoHidebts->childrenBoundingRect().height ()+1); autoHidebts->setPos(0, hh-autoHidebts->childrenBoundingRect().height ()+1);
double opacity = qMax(animLeftBarTimeLine->currentValue(), animBotto mBarTimeLine->currentValue()); double opacity = qMax(animLeftBarTimeLine->currentValue(), animBotto mBarTimeLine->currentValue());
autoHidebts->setOpacity(opacity < 0.01 ? 0.01 : opacity); // W ork around a qt bug autoHidebts->setOpacity(opacity < 0.01 ? 0.01 : opacity); // W ork around a qt bug
} }
void SkyGui::setStelStyle(const QString& style) void SkyGui::setStelStyle(const QString& style)
{ {
if (style == "night_color") if (style == "night_color")
{ {
buttonBarPath->setPen(QColor::fromRgbF(0.7,0.2,0.2,0.5)); buttonBarPath->setPen(QColor::fromRgbF(0.7,0.0,0.0,0.5));
buttonBarPath->setBrush(QColor::fromRgbF(0.23, 0.13, 0.03, 0 buttonBarPath->setBrush(QColor::fromRgbF(0.23, 0.0, 0.00, 0.
.2)); 2));
buttonBar->setColor(QColor::fromRgbF(0.9, 0.33, 0.33, 0.9)); buttonBar->setColor(QColor::fromRgbF(0.9, 0.0, 0.0, 0.9));
winBar->setColor(QColor::fromRgbF(0.9, 0.33, 0.33, 0.9)); winBar->setColor(QColor::fromRgbF(0.9, 0.0, 0.0, 0.9));
winBar->setRedMode(true); winBar->setRedMode(true);
buttonBar->setRedMode(true); buttonBar->setRedMode(true);
btHorizAutoHide->setRedMode(true); btHorizAutoHide->setRedMode(true);
btVertAutoHide->setRedMode(true); btVertAutoHide->setRedMode(true);
} }
else else
{ {
buttonBarPath->setPen(QColor::fromRgbF(0.7,0.7,0.7,0.5)); buttonBarPath->setPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
buttonBarPath->setBrush(QColor::fromRgbF(0.15, 0.16, 0.19, 0 .2)); buttonBarPath->setBrush(QColor::fromRgbF(0.15, 0.16, 0.19, 0 .2));
buttonBar->setColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9)); buttonBar->setColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
 End of changes. 2 change blocks. 
7 lines changed or deleted 36 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/