diff --git a/saorimediaview.cpp b/saorimediaview.cpp index e4c4f8a..231156f 100644 --- a/saorimediaview.cpp +++ b/saorimediaview.cpp @@ -34,7 +34,6 @@ ui(new Ui::SaoriMediaView) { ui->setupUi(this); - m_fit = true; } SaoriMediaView::~SaoriMediaView() @@ -48,7 +47,7 @@ ui->media->setPixmap(QPixmap::fromImage(m_image)); ui->scrollArea->setWidgetResizable(true); ui->media->adjustSize(); - if (m_fit) fit(); + if (ui->actionFit->isChecked()) fit(); } void SaoriMediaView::setUrls(QList urls, uint current) @@ -70,5 +69,11 @@ void SaoriMediaView::resizeEvent(QResizeEvent *event) { QWidget::resizeEvent(event); - if(m_fit) fit(); + if (ui->actionFit->isChecked()) fit(); +} + +void SaoriMediaView::on_actionFit_changed() +{ + setImage(m_image); + if (ui->actionFit->isChecked()) fit(); } diff --git a/saorimediaview.h b/saorimediaview.h index d868325..3d62f16 100644 --- a/saorimediaview.h +++ b/saorimediaview.h @@ -58,6 +58,9 @@ bool m_fit; QImage m_image; +private slots: + void on_actionFit_changed(); + private: Ui::SaoriMediaView *ui; }; diff --git a/saorimediaview.ui b/saorimediaview.ui index d8e681d..95c8344 100644 --- a/saorimediaview.ui +++ b/saorimediaview.ui @@ -47,6 +47,8 @@ + + @@ -54,7 +56,7 @@ - :/icons/ionicons-md/md-arrow-round-up.svg:/icons/ionicons-md/md-arrow-round-up.svg + :/icons/ionicons-md/md-arrow-round-back.svg:/icons/ionicons-md/md-arrow-round-back.svg Prev @@ -63,7 +65,7 @@ - :/icons/ionicons-md/md-arrow-round-down.svg:/icons/ionicons-md/md-arrow-round-down.svg + :/icons/ionicons-md/md-arrow-round-forward.svg:/icons/ionicons-md/md-arrow-round-forward.svg Next @@ -78,6 +80,33 @@ Save + + + true + + + + :/icons/ionicons-md/md-resize.svg:/icons/ionicons-md/md-resize.svg + + + Fit + + + Fit + + + + + true + + + + :/icons/ionicons-md/md-play.svg:/icons/ionicons-md/md-play.svg + + + Play + +