diff --git a/lib/resize/resizeimagedialog.cpp b/lib/resize/resizeimagedialog.cpp --- a/lib/resize/resizeimagedialog.cpp +++ b/lib/resize/resizeimagedialog.cpp @@ -51,6 +51,8 @@ QVBoxLayout *mainLayout = new QVBoxLayout; setLayout(mainLayout); + mainLayout->setSizeConstraint(QLayout::SetFixedSize); + QWidget* content = new QWidget(this); d->setupUi(content); mainLayout->addWidget(content); @@ -82,8 +84,8 @@ void ResizeImageDialog::setOriginalSize(const QSize& size) { d->mOriginalSize = size; - d->mOriginalWidthLabel->setText(QString::number(size.width())); - d->mOriginalHeightLabel->setText(QString::number(size.height())); + d->mOriginalWidthLabel->setText(QString::number(size.width()) + QStringLiteral(" px")); + d->mOriginalHeightLabel->setText(QString::number(size.height()) + QStringLiteral(" px")); d->mWidthSpinBox->setValue(size.width()); d->mHeightSpinBox->setValue(size.height()); } diff --git a/lib/resize/resizeimagewidget.ui b/lib/resize/resizeimagewidget.ui --- a/lib/resize/resizeimagewidget.ui +++ b/lib/resize/resizeimagewidget.ui @@ -6,183 +6,142 @@ 0 0 - 269 - 155 + 302 + 158 - Image Resizing + Resize Image - - - - - Enter the new size for this image. - - - + - - - true - - Current size: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - true - - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - true - - - - - - - - - - - - true - - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + px + + + 1 + + + 99999 + + - - + + - New Size: + - - mWidthSpinBox + + + + + + false + + + % + + + 0 + + + 1.000000000000000 + + + 1000.000000000000000 - - - - - - 1 - - - 100000 - - - - - - - - - - - - - - 1 - - - 100000 - - - - + + + + + + - - + + - Percentage: + + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + px + + + 1 + + + 99999 + + + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + New size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter mWidthSpinBox - - - - - - - - 1 - - - 999 - - - % - - - 2 - - - - - - - - - - - - - - - - - 1 - - - 999 - - - % - - - 2 - - - - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + % + + + 0 + + + 1.000000000000000 + + + 1000.000000000000000 + + - + Keep aspect ratio @@ -192,8 +151,56 @@ + + + + + + + + + + + Width + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Height + + + + + mWidthSpinBox + mHeightSpinBox + mWidthPercentSpinBox + mHeightPercentSpinBox + mKeepAspectCheckBox + - + + + mKeepAspectCheckBox + toggled(bool) + mHeightPercentSpinBox + setDisabled(bool) + + + 177 + 139 + + + 264 + 119 + + + +