diff options
Diffstat (limited to 'pictureviewer2.cpp')
| -rw-r--r-- | pictureviewer2.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp index ce02fc7..2640c2f 100644 --- a/pictureviewer2.cpp +++ b/pictureviewer2.cpp @@ -530,7 +530,7 @@ void PictureViewer2::hideEvent(QHideEvent *e){ void PictureViewer2::resizeEvent(QResizeEvent *event){ QGraphicsView::resizeEvent(event); - qreal ypos = event->size().height() / 2 - mBoundingRectItem->boundingRect().size().height() / 2; + qreal ypos = event->size().height() - mBoundingRectItem->boundingRect().size().height() - 10; mBoundingRectItem->setPos(width() - 15 - mBoundingRectItem->boundingRect().size().width(), ypos); showFile(mCurPicData); } @@ -677,7 +677,7 @@ void PictureViewer2::nextFromAll(){ } void PictureViewer2::constructControlItem(){ - QStringList controls = QStringList() << "Next (>)" << "Previous (<)" << "Skip forward (C->)" << "Skip back (C-<)" << "Shuffle (C->R)" << "Stop Slide <SP>" << "Slide <SP>" << "Slide all <C-SP>"; + QStringList controls = QStringList() << "Next (>)" << "Previous (<)" << "Skip forward (C->)" << "Skip back (C-<)" << "Shuffle (C-R)" << "Stop Slide <SP>" << "Slide <SP>" << "Slide all <C-SP>"; QFont f = QFont(); f.setPointSize(14); f.setBold(true); @@ -690,48 +690,53 @@ void PictureViewer2::constructControlItem(){ } } f.setBold(true); - mBoundingRectItem = new BoundingRectItem(QSize(width + 10, 16 * (controls.count() + 4))); + int lineLeftMargin = 10; + int lineLength = width + 10; + int textLeftMargin = 5; + int textFactor = 16; + mBoundingRectItem = new BoundingRectItem(QSize(width + 20, 16 * (controls.count() + 4) + 5)); mBoundingRectItem->setZValue(5); mScene->addItem(mBoundingRectItem); mNextC = new QGraphicsTextItem(mBoundingRectItem); mNextC->setFont(f); mNextC->setPlainText(controls.at(0)); + mNextC->moveBy(textLeftMargin, 0 * textFactor); mDefaultTextColor = mNextC->defaultTextColor(); mPreviousC = new QGraphicsTextItem(mBoundingRectItem); mPreviousC->setFont(f); mPreviousC->setPlainText(controls.at(1)); - mPreviousC->moveBy(0, 16); + mPreviousC->moveBy(textLeftMargin, 1 * textFactor); QGraphicsLineItem *l1 = new QGraphicsLineItem(mBoundingRectItem); - l1->setLine(QLine(QPoint(5, 48), QPoint(width, 48))); + l1->setLine(QLine(QPoint(lineLeftMargin, 3 * textFactor), QPoint(lineLength, 3 * textFactor))); mSkipForwardC = new QGraphicsTextItem(mBoundingRectItem); mSkipForwardC->setFont(f); mSkipForwardC->setPlainText(controls.at(2)); - mSkipForwardC->moveBy(0, 48); + mSkipForwardC->moveBy(textLeftMargin, 3 * textFactor); mSkipBackwardC = new QGraphicsTextItem(mBoundingRectItem); mSkipBackwardC->setFont(f); mSkipBackwardC->setPlainText(controls.at(3)); - mSkipBackwardC->moveBy(0, 64); + mSkipBackwardC->moveBy(textLeftMargin, 4 * textFactor); QGraphicsLineItem *l2 = new QGraphicsLineItem(mBoundingRectItem); - l2->setLine(QLine(QPoint(5, 96), QPoint(width, 96))); + l2->setLine(QLine(QPoint(lineLeftMargin, 6 * textFactor), QPoint(lineLength, 6 * textFactor))); mShuffleC = new QGraphicsTextItem(mBoundingRectItem); mShuffleC->setFont(f); mShuffleC->setPlainText(controls.at(4)); - mShuffleC->moveBy(0, 96); + mShuffleC->moveBy(textLeftMargin, 6 * textFactor); QGraphicsLineItem *l3 = new QGraphicsLineItem(mBoundingRectItem); - l3->setLine(QLine(QPoint(5, 128), QPoint(width, 128))); + l3->setLine(QLine(QPoint(lineLeftMargin, 8 * textFactor), QPoint(lineLength, 8 * textFactor))); mSlideStopC = new QGraphicsTextItem(mBoundingRectItem); mSlideStopC->setFont(f); mSlideStopC->setPlainText(controls.at(5)); mSlideStopC->setDefaultTextColor(Qt::darkGreen); - mSlideStopC->moveBy(0, 128); + mSlideStopC->moveBy(textLeftMargin, 8 * textFactor); mSlideC = new QGraphicsTextItem(mBoundingRectItem); mSlideC->setFont(f); mSlideC->setPlainText(controls.at(6)); - mSlideC->moveBy(0, 144); + mSlideC->moveBy(textLeftMargin, 9 * textFactor); mSlideAllC = new QGraphicsTextItem(mBoundingRectItem); mSlideAllC->setFont(f); mSlideAllC->setPlainText(controls.at(7)); - mSlideAllC->moveBy(0, 160); + mSlideAllC->moveBy(textLeftMargin, 10 * textFactor); } void PictureViewer2::setGradient(const QPixmap &pic){ |