aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Little fixes

Browse Source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2016-03-28 13:08:20 +03:00
parent b22c5b656a
commit bb98eeb54b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/valentina/dialogs/dialogpatternproperties.cpp
View File

@ -635,7 +635,7 @@ void DialogPatternProperties::InitImage()
ui->imageLabel->setContextMenuPolicy(Qt::CustomContextMenu); ui->imageLabel->setContextMenuPolicy(Qt::CustomContextMenu);
ui->imageLabel->setScaledContents(true); ui->imageLabel->setScaledContents(true);
connect(ui->changeImageButton, &QPushButton::clicked, this, &DialogPatternProperties::SetNewImage); connect(ui->changeImageButton, &QPushButton::clicked, this, &DialogPatternProperties::ChangeImage);
connect(ui->deleteImageButton, &QPushButton::clicked, this, &DialogPatternProperties::DeleteImage); connect(ui->deleteImageButton, &QPushButton::clicked, this, &DialogPatternProperties::DeleteImage);
connect(ui->imageLabel, &QWidget::customContextMenuRequested, this, &DialogPatternProperties::ShowContextMenu); connect(ui->imageLabel, &QWidget::customContextMenuRequested, this, &DialogPatternProperties::ShowContextMenu);
@ -644,13 +644,13 @@ void DialogPatternProperties::InitImage()
saveImageAction = new QAction(tr("Save image to file"), this); saveImageAction = new QAction(tr("Save image to file"), this);
showImageAction = new QAction(tr("Show image"), this); showImageAction = new QAction(tr("Show image"), this);
connect(deleteAction, &QAction::triggered, this, &DialogPatternProperties::DeleteImage); connect(deleteAction, &QAction::triggered, this, &DialogPatternProperties::DeleteImage);
connect(changeImageAction, &QAction::triggered, this, &DialogPatternProperties::SetNewImage); connect(changeImageAction, &QAction::triggered, this, &DialogPatternProperties::ChangeImage);
connect(saveImageAction, &QAction::triggered, this, &DialogPatternProperties::SaveImage); connect(saveImageAction, &QAction::triggered, this, &DialogPatternProperties::SaveImage);
connect(showImageAction, &QAction::triggered, this, &DialogPatternProperties::ShowImage); connect(showImageAction, &QAction::triggered, this, &DialogPatternProperties::ShowImage);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogPatternProperties::SetNewImage() void DialogPatternProperties::ChangeImage()
{ {
const QString fileName = QFileDialog::getOpenFileName(this, tr("Image for pattern"), QString(), const QString fileName = QFileDialog::getOpenFileName(this, tr("Image for pattern"), QString(),
tr("Images (*.png *.jpg *.jpeg *.bmp)")); tr("Images (*.png *.jpg *.jpeg *.bmp)"));
@ -701,7 +701,7 @@ void DialogPatternProperties::SaveImage()
byteArray.append(doc->GetImage().toUtf8()); byteArray.append(doc->GetImage().toUtf8());
QByteArray ba = QByteArray::fromBase64(byteArray); QByteArray ba = QByteArray::fromBase64(byteArray);
const QString extension = "." + doc->GetImageExtension(); const QString extension = "." + doc->GetImageExtension();
QString filter = tr("Images (*") + extension + ")"; QString filter = tr("Images") + " (*" + extension + ")";
QString filename = QFileDialog::getSaveFileName(this, tr("Save File"), tr("untitled"), filter, &filter); QString filename = QFileDialog::getSaveFileName(this, tr("Save File"), tr("untitled"), filter, &filter);
if (not filename.isEmpty()) if (not filename.isEmpty())
{ {

2
src/app/valentina/dialogs/dialogpatternproperties.h
View File

@ -57,7 +57,7 @@ public slots:
void CheckStateHeight(int state); void CheckStateHeight(int state);
void CheckStateSize(int state); void CheckStateSize(int state);
void DescEdited(); void DescEdited();
void SetNewImage(); void ChangeImage();
void ShowContextMenu(); void ShowContextMenu();
protected: protected:
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;