SkyGui.cpp   SkyGui.cpp 
skipping to change at line 91 skipping to change at line 91
if (conf->value("flag_show_galcoord", false).toBool()) if (conf->value("flag_show_galcoord", false).toBool())
infoTextFilters |= StelObject::GalacticCoord; infoTextFilters |= StelObject::GalacticCoord;
if (conf->value("flag_show_supergalcoord", false).toBool()) if (conf->value("flag_show_supergalcoord", false).toBool())
infoTextFilters |= StelObject::SupergalacticCoord; infoTextFilters |= StelObject::SupergalacticCoord;
if (conf->value("flag_show_eclcoordofdate", false).toBool()) if (conf->value("flag_show_eclcoordofdate", false).toBool())
infoTextFilters |= StelObject::EclipticCoordOfDate; infoTextFilters |= StelObject::EclipticCoordOfDate;
if (conf->value("flag_show_eclcoordj2000", false).toBool()) if (conf->value("flag_show_eclcoordj2000", false).toBool())
infoTextFilters |= StelObject::EclipticCoordJ2000; infoTextFilters |= StelObject::EclipticCoordJ2000;
if (conf->value("flag_show_constellation", false).toBool()) if (conf->value("flag_show_constellation", false).toBool())
infoTextFilters |= StelObject::IAUConstellation; infoTextFilters |= StelObject::IAUConstellation;
if (conf->value("flag_show_sidereal_time", false).toBool())
infoTextFilters |= StelObject::SiderealTime;
conf->endGroup(); 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);
} }
if (qApp->property("text_texture")==true) // CLI option -t given? if (qApp->property("text_texture")==true) // CLI option -t given?
infoPixmap=new QGraphicsPixmapItem(this); infoPixmap=new QGraphicsPixmapItem(this);
} }
skipping to change at line 207 skipping to change at line 209
} }
} }
const QString InfoPanel::getSelectedText(void) const QString InfoPanel::getSelectedText(void)
{ {
return toPlainText(); return toPlainText();
} }
SkyGui::SkyGui(QGraphicsItem * parent) SkyGui::SkyGui(QGraphicsItem * parent)
: QGraphicsWidget(parent) : QGraphicsWidget(parent)
, lastButtonbarWidth(0)
, btHorizAutoHide(NULL) , btHorizAutoHide(NULL)
, btVertAutoHide(NULL) , btVertAutoHide(NULL)
, autoHidebts(NULL)
, autoHideHorizontalButtonBar(true)
, autoHideVerticalButtonBar(true)
, stelGui(NULL) , stelGui(NULL)
{ {
setObjectName("StelSkyGui"); setObjectName("StelSkyGui");
// Construct the Windows buttons bar // Construct the Windows buttons bar
winBar = new LeftStelBar(this); winBar = new LeftStelBar(this);
// Construct the bottom buttons bar // Construct the bottom buttons bar
buttonBar = new BottomStelBar(this, buttonBar = new BottomStelBar(this,
QPixmap(":/graphicGui/btbg-left.png"), QPixmap(":/graphicGui/btbg-left.png"),
QPixmap(":/graphicGui/btbg-right.png") , QPixmap(":/graphicGui/btbg-right.png") ,
skipping to change at line 231 skipping to change at line 237
infoPanel = new InfoPanel(this); infoPanel = new InfoPanel(this);
// Used to display some progress bar in the lower right corner, e.g. when loading a file // Used to display some progress bar in the lower right corner, e.g. when loading a file
progressBarMgr = new StelProgressBarMgr(this); progressBarMgr = new StelProgressBarMgr(this);
connect(&StelApp::getInstance(), SIGNAL(progressBarAdded(const StelP rogressController*)), progressBarMgr, SLOT(addProgressBar(const StelProgres sController*))); connect(&StelApp::getInstance(), SIGNAL(progressBarAdded(const StelP rogressController*)), progressBarMgr, SLOT(addProgressBar(const StelProgres sController*)));
connect(&StelApp::getInstance(), SIGNAL(progressBarRemoved(const Ste lProgressController*)), progressBarMgr, SLOT(removeProgressBar(const StelPr ogressController*))); connect(&StelApp::getInstance(), SIGNAL(progressBarRemoved(const Ste lProgressController*)), progressBarMgr, SLOT(removeProgressBar(const StelPr ogressController*)));
// The path drawn around the button bars // The path drawn around the button bars
buttonBarPath = new StelBarsPath(this); buttonBarPath = new StelBarsPath(this);
lastButtonbarWidth = 0;
autoHidebts = NULL;
autoHideHorizontalButtonBar = true;
autoHideVerticalButtonBar = true;
animLeftBarTimeLine = new QTimeLine(200, this); animLeftBarTimeLine = new QTimeLine(200, this);
animLeftBarTimeLine->setCurveShape(QTimeLine::EaseInOutCurve); animLeftBarTimeLine->setCurveShape(QTimeLine::EaseInOutCurve);
connect(animLeftBarTimeLine, SIGNAL(valueChanged(qreal)), this, SLOT (updateBarsPos())); connect(animLeftBarTimeLine, SIGNAL(valueChanged(qreal)), this, SLOT (updateBarsPos()));
animBottomBarTimeLine = new QTimeLine(200, this); animBottomBarTimeLine = new QTimeLine(200, this);
animBottomBarTimeLine->setCurveShape(QTimeLine::EaseInOutCurve); animBottomBarTimeLine->setCurveShape(QTimeLine::EaseInOutCurve);
connect(animBottomBarTimeLine, SIGNAL(valueChanged(qreal)), this, SL OT(updateBarsPos())); connect(animBottomBarTimeLine, SIGNAL(valueChanged(qreal)), this, SL OT(updateBarsPos()));
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
} }
 End of changes. 4 change blocks. 
6 lines changed or deleted 6 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/