SkyGui.cpp   SkyGui.cpp 
skipping to change at line 124 skipping to change at line 124
: QGraphicsWidget(parent) : QGraphicsWidget(parent)
, btHorizAutoHide(NULL) , btHorizAutoHide(NULL)
, btVertAutoHide(NULL) , btVertAutoHide(NULL)
, 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, QPixmap(":/graphicGui/btbg-left. buttonBar = new BottomStelBar(this,
png"), QPixmap(":/graphicGui/btbg-right.png"), QPixmap(":/graphicGui/btbg-left.png"),
QPixmap(":/graphicGui/btbg-right.png")
QPixmap(":/graphicGui/b ,
tbg-middle.png"), QPixmap(":/graphicGui/btbg-single.png")); QPixmap(":/graphicGui/btbg-middle.png"
),
QPixmap(":/graphicGui/btbg-single.png"
));
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);
skipping to change at line 206 skipping to change at line 209
} }
void SkyGui::resizeEvent(QGraphicsSceneResizeEvent* event) void SkyGui::resizeEvent(QGraphicsSceneResizeEvent* event)
{ {
QGraphicsWidget::resizeEvent(event); QGraphicsWidget::resizeEvent(event);
updateBarsPos(); updateBarsPos();
} }
void SkyGui::hoverMoveEvent(QGraphicsSceneHoverEvent* event) void SkyGui::hoverMoveEvent(QGraphicsSceneHoverEvent* event)
{ {
const int hh = geometry().height(); const int hh = getSkyGuiHeight();
double x = event->pos().x(); double x = event->pos().x();
double y = event->pos().y(); double y = event->pos().y();
double maxX = winBar->boundingRect().width()+2.*buttonBarPath->getRo undSize(); double maxX = winBar->boundingRect().width()+2.*buttonBarPath->getRo undSize();
double maxY = hh-(winBar->boundingRect().height()+buttonBar->boundin gRect().height()+2.*buttonBarPath->getRoundSize()); double maxY = hh-(winBar->boundingRect().height()+buttonBar->boundin gRect().height()+2.*buttonBarPath->getRoundSize());
double minX = 0; double minX = 0;
if (x<=maxX && y>=maxY && animLeftBarTimeLine->state()==QTimeLine::N otRunning && winBar->pos().x()<minX) if (x<=maxX && y>=maxY && animLeftBarTimeLine->state()==QTimeLine::N otRunning && winBar->pos().x()<minX)
{ {
animLeftBarTimeLine->setDirection(QTimeLine::Forward); animLeftBarTimeLine->setDirection(QTimeLine::Forward);
 End of changes. 2 change blocks. 
6 lines changed or deleted 9 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/