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

Added showImage to context menu

Browse Source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2016-03-27 14:22:16 +03:00
parent ae53e505c4
commit 5fda012b86
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -610,7 +610,7 @@ void DialogPatternProperties::InitComboBox(QComboBox *box, const QMap<GVal, bool
}
//---------------------------------------------------------------------------------------------------------------------
void DialogPatternProperties::InitImage()
QImage DialogPatternProperties::GetImage()
{
// we set an image from file.val
QImage image;
@ -624,9 +624,14 @@ void DialogPatternProperties::InitImage()
{
extension = "PNG";
}
image.load(&buffer, extension.toLatin1().data()); // writes image into ba in PNG format
image.load(&buffer, extension.toLatin1().data()); // writes image into ba in 'extension' format
return image;
}
ui->imageLabel->setPixmap(QPixmap::fromImage(image));
//---------------------------------------------------------------------------------------------------------------------
void DialogPatternProperties::InitImage()
{
ui->imageLabel->setPixmap(QPixmap::fromImage(GetImage()));
ui->imageLabel->setContextMenuPolicy(Qt::CustomContextMenu);
ui->imageLabel->setScaledContents(true);
@ -641,6 +646,7 @@ void DialogPatternProperties::InitImage()
connect(deleteAction, &QAction::triggered, this, &DialogPatternProperties::DeleteImage);
connect(changeImageAction, &QAction::triggered, this, &DialogPatternProperties::SetNewImage);
connect(saveImageAction, &QAction::triggered, this, &DialogPatternProperties::SaveImage);
connect(showImageAction, &QAction::triggered, this, &DialogPatternProperties::ShowImage);
}
//---------------------------------------------------------------------------------------------------------------------
@ -695,7 +701,7 @@ void DialogPatternProperties::SaveImage()
byteArray.append(doc->GetImage().toUtf8());
QByteArray ba = QByteArray::fromBase64(byteArray);
QString extension = "." + doc->GetImageExtension();
QString filter = "Images (*" + extension + ")";
QString filter = tr("Images (*") + extension + ")";
QString filename = QFileDialog::getSaveFileName(this, tr("Save File"), "untitled", filter, &filter);
if (not filename.endsWith(extension.toUpper()))
{
@ -709,6 +715,16 @@ void DialogPatternProperties::SaveImage()
}
}
//---------------------------------------------------------------------------------------------------------------------
void DialogPatternProperties::ShowImage()
{
QLabel *label = new QLabel(this, Qt::Window);
QImage image = GetImage();
label->setPixmap(QPixmap::fromImage(image));
label->setGeometry(QRect(QCursor::pos(), image.size()));
label->show();
}
//---------------------------------------------------------------------------------------------------------------------
void DialogPatternProperties::ShowContextMenu()
{

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

@ -67,6 +67,7 @@ private slots:
void SecurityValueChanged();
void DeleteImage();
void SaveImage();
void ShowImage();
private:
Q_DISABLE_COPY(DialogPatternProperties)
Ui::DialogPatternProperties *ui;
@ -108,6 +109,7 @@ private:
void UpdateDefHeight();
void UpdateDefSize();
void InitImage();
QImage GetImage();
};
#endif // DIALOGPATTERNPROPERTIES_H