OcularsGuiPanel.cpp   OcularsGuiPanel.cpp 
skipping to change at line 170 skipping to change at line 170
fieldCcdName->setTextWidth(maxWidth); fieldCcdName->setTextWidth(maxWidth);
fieldCcdDimensions->setTextWidth(maxWidth); fieldCcdDimensions->setTextWidth(maxWidth);
fieldCcdRotation->setTextWidth(maxWidth); fieldCcdRotation->setTextWidth(maxWidth);
fieldTelescopeName->setTextWidth(maxWidth); fieldTelescopeName->setTextWidth(maxWidth);
fieldMagnification->setTextWidth(maxWidth); fieldMagnification->setTextWidth(maxWidth);
fieldFov->setTextWidth(maxWidth); fieldFov->setTextWidth(maxWidth);
fieldLensName->setTextWidth(maxWidth); fieldLensName->setTextWidth(maxWidth);
fieldLensMultipler->setTextWidth(maxWidth); fieldLensMultipler->setTextWidth(maxWidth);
float scale = lineHeight*1.5; // TODO: change hardcoded 1.5 to edita ble value of scaling coefficient
QPixmap pa(":/graphicGui/btTimeRewind-on.png"); QPixmap pa(":/graphicGui/btTimeRewind-on.png");
QPixmap prevArrow = pa.scaledToHeight(lineHeight, Qt::SmoothTransfor mation); QPixmap prevArrow = pa.scaledToHeight(scale, Qt::SmoothTransformatio n);
QPixmap paOff(":/graphicGui/btTimeRewind-off.png"); QPixmap paOff(":/graphicGui/btTimeRewind-off.png");
QPixmap prevArrowOff = paOff.scaledToHeight(lineHeight, Qt::SmoothTr ansformation); QPixmap prevArrowOff = paOff.scaledToHeight(scale, Qt::SmoothTransfo rmation);
QPixmap na(":/graphicGui/btTimeForward-on.png"); QPixmap na(":/graphicGui/btTimeForward-on.png");
QPixmap nextArrow = na.scaledToHeight(lineHeight, Qt::SmoothTransfor mation); QPixmap nextArrow = na.scaledToHeight(scale, Qt::SmoothTransformatio n);
QPixmap naOff(":/graphicGui/btTimeForward-off.png"); QPixmap naOff(":/graphicGui/btTimeForward-off.png");
QPixmap nextArrowOff = naOff.scaledToHeight(lineHeight, Qt::SmoothTr ansformation); QPixmap nextArrowOff = naOff.scaledToHeight(scale, Qt::SmoothTransfo rmation);
StelAction* defaultAction = new StelAction(this); StelAction* defaultAction = new StelAction(this);
defaultAction->setCheckable(false); defaultAction->setCheckable(false);
prevOcularButton = new StelButton(ocularControls, prevOcularButton = new StelButton(ocularControls,
prevArrow, prevArrow,
prevArrowOff, prevArrowOff,
QPixmap(), QPixmap(),
defaultAction); defaultAction);
prevOcularButton->setToolTip(q_("Previous ocular")); prevOcularButton->setToolTip(q_("Previous ocular"));
nextOcularButton = new StelButton(ocularControls, nextOcularButton = new StelButton(ocularControls,
skipping to change at line 513 skipping to change at line 514
} }
fieldOcularName->setPlainText(fullName); fieldOcularName->setPlainText(fullName);
qreal posX = 0.; qreal posX = 0.;
qreal posY = 0.; qreal posY = 0.;
qreal widgetWidth = 0.; qreal widgetWidth = 0.;
qreal widgetHeight = 0.; qreal widgetHeight = 0.;
//Prev button //Prev button
qreal heightAdjustment = (fieldOcularName->boundingRect().height() - prevOcularButton->boundingRect().height()) / 2.; qreal heightAdjustment = (fieldOcularName->boundingRect().height() - prevOcularButton->boundingRect().height()) / 2.;
prevOcularButton->setPos(posX, qRound(posY + heightAdjustment)); prevOcularButton->setPos(posX, qRound(posY + heightAdjustment));
posX += prevOcularButton->boundingRect().width(); posX += prevOcularButton->boundingRect().width();
widgetWidth += prevOcularButton->boundingRect().width(); widgetWidth += prevOcularButton->boundingRect().width();
//Name field //Name field
fieldOcularName->setPos(posX, posY); fieldOcularName->setPos(posX, posY);
posX += fieldOcularName->boundingRect().width(); posX += fieldOcularName->boundingRect().width();
widgetWidth += fieldOcularName->boundingRect().width(); widgetWidth += fieldOcularName->boundingRect().width();
//Next button //Next button
nextOcularButton->setPos(posX, posY + heightAdjustment); nextOcularButton->setPos(posX, posY + heightAdjustment);
 End of changes. 6 change blocks. 
5 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/