diff --git a/lib/resize/resizeimagedialog.cpp b/lib/resize/resizeimagedialog.cpp index 7cc358c1..08be63dc 100644 --- a/lib/resize/resizeimagedialog.cpp +++ b/lib/resize/resizeimagedialog.cpp @@ -1,185 +1,187 @@ // vim: set tabstop=4 shiftwidth=4 expandtab: /* Gwenview: an image viewer Copyright 2010 Aurélien Gâteau This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA. */ // Self #include "resizeimagedialog.h" // Qt #include #include // KDE #include #include // Local #include namespace Gwenview { struct ResizeImageDialogPrivate : public Ui_ResizeImageWidget { bool mUpdateFromRatio; bool mUpdateFromSizeOrPercentage; QSize mOriginalSize; }; ResizeImageDialog::ResizeImageDialog(QWidget* parent) : QDialog(parent) , d(new ResizeImageDialogPrivate) { d->mUpdateFromRatio = false; d->mUpdateFromSizeOrPercentage = false; QVBoxLayout *mainLayout = new QVBoxLayout; setLayout(mainLayout); + mainLayout->setSizeConstraint(QLayout::SetFixedSize); + QWidget* content = new QWidget(this); d->setupUi(content); mainLayout->addWidget(content); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); connect(buttonBox, &QDialogButtonBox::accepted, this, &ResizeImageDialog::accept); connect(buttonBox, &QDialogButtonBox::rejected, this, &ResizeImageDialog::reject); mainLayout->addWidget(buttonBox); content->layout()->setMargin(0); KGuiItem::assign(okButton, KGuiItem(i18n("Resize"), "transform-scale")); setWindowTitle(content->windowTitle()); d->mWidthSpinBox->setFocus(); connect(d->mWidthSpinBox, static_cast(&QSpinBox::valueChanged), this, &ResizeImageDialog::slotWidthChanged); connect(d->mHeightSpinBox, static_cast(&QSpinBox::valueChanged), this, &ResizeImageDialog::slotHeightChanged); connect(d->mWidthPercentSpinBox, static_cast(&QDoubleSpinBox::valueChanged), this, &ResizeImageDialog::slotWidthPercentChanged); connect(d->mHeightPercentSpinBox, static_cast(&QDoubleSpinBox::valueChanged), this, &ResizeImageDialog::slotHeightPercentChanged); connect(d->mKeepAspectCheckBox, &QCheckBox::toggled, this, &ResizeImageDialog::slotKeepAspectChanged); } ResizeImageDialog::~ResizeImageDialog() { delete d; } 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()); } QSize ResizeImageDialog::size() const { return QSize( d->mWidthSpinBox->value(), d->mHeightSpinBox->value() ); } void ResizeImageDialog::slotWidthChanged(int width) { // Update width percentage to match width, only if this was a manual adjustment if (!d->mUpdateFromSizeOrPercentage && !d->mUpdateFromRatio) { d->mUpdateFromSizeOrPercentage = true; d->mWidthPercentSpinBox->setValue((double(width) / d->mOriginalSize.width()) * 100); d->mUpdateFromSizeOrPercentage = false; } if (!d->mKeepAspectCheckBox->isChecked() || d->mUpdateFromRatio) { return; } // Update height to keep ratio, only if ratio locked and this was a manual adjustment d->mUpdateFromRatio = true; d->mHeightSpinBox->setValue(d->mOriginalSize.height() * width / d->mOriginalSize.width()); d->mUpdateFromRatio = false; } void ResizeImageDialog::slotHeightChanged(int height) { // Update height percentage to match height, only if this was a manual adjustment if (!d->mUpdateFromSizeOrPercentage && !d->mUpdateFromRatio) { d->mUpdateFromSizeOrPercentage = true; d->mHeightPercentSpinBox->setValue((double(height) / d->mOriginalSize.height()) * 100); d->mUpdateFromSizeOrPercentage = false; } if (!d->mKeepAspectCheckBox->isChecked() || d->mUpdateFromRatio) { return; } // Update width to keep ratio, only if ratio locked and this was a manual adjustment d->mUpdateFromRatio = true; d->mWidthSpinBox->setValue(d->mOriginalSize.width() * height / d->mOriginalSize.height()); d->mUpdateFromRatio = false; } void ResizeImageDialog::slotWidthPercentChanged(double widthPercent) { // Update width to match width percentage, only if this was a manual adjustment if (!d->mUpdateFromSizeOrPercentage && !d->mUpdateFromRatio) { d->mUpdateFromSizeOrPercentage = true; d->mWidthSpinBox->setValue((widthPercent / 100) * d->mOriginalSize.width()); d->mUpdateFromSizeOrPercentage = false; } if (!d->mKeepAspectCheckBox->isChecked() || d->mUpdateFromRatio) { return; } // Keep height percentage in sync with width percentage, only if ratio locked and this was a manual adjustment d->mUpdateFromRatio = true; d->mHeightPercentSpinBox->setValue(d->mWidthPercentSpinBox->value()); d->mUpdateFromRatio = false; } void ResizeImageDialog::slotHeightPercentChanged(double heightPercent) { // Update height to match height percentage, only if this was a manual adjustment if (!d->mUpdateFromSizeOrPercentage && !d->mUpdateFromRatio) { d->mUpdateFromSizeOrPercentage = true; d->mHeightSpinBox->setValue((heightPercent / 100) * d->mOriginalSize.height()); d->mUpdateFromSizeOrPercentage = false; } if (!d->mKeepAspectCheckBox->isChecked() || d->mUpdateFromRatio) { return; } // Keep height percentage in sync with width percentage, only if ratio locked and this was a manual adjustment d->mUpdateFromRatio = true; d->mWidthPercentSpinBox->setValue(d->mHeightPercentSpinBox->value()); d->mUpdateFromRatio = false; } void ResizeImageDialog::slotKeepAspectChanged(bool value) { if (value) { d->mUpdateFromSizeOrPercentage = true; slotWidthChanged(d->mWidthSpinBox->value()); slotWidthPercentChanged(d->mWidthPercentSpinBox->value()); d->mUpdateFromSizeOrPercentage = false; } } } // namespace diff --git a/lib/resize/resizeimagewidget.ui b/lib/resize/resizeimagewidget.ui index 1c637202..4df962c8 100644 --- a/lib/resize/resizeimagewidget.ui +++ b/lib/resize/resizeimagewidget.ui @@ -1,199 +1,206 @@ ResizeImageWidget 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 true + + + + ⨯ + + + + + + + Width + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Height + + + + + mWidthSpinBox + mHeightSpinBox + mWidthPercentSpinBox + mHeightPercentSpinBox + mKeepAspectCheckBox + - + + + mKeepAspectCheckBox + toggled(bool) + mHeightPercentSpinBox + setDisabled(bool) + + + 177 + 139 + + + 264 + 119 + + + +