Merge branch 'master' of https://github.com/olive-editor/olive into frconform

This commit is contained in:
itsmattkc
2019-01-06 17:01:46 +11:00
5 changed files with 109 additions and 9 deletions
+3 -4
View File
@@ -506,9 +506,8 @@ void Viewer::setup_ui() {
playback_control_layout->addWidget(btnRewind);
btnPlay = new QPushButton(playback_controls);
QIcon playIcon;
playIcon.addFile(QStringLiteral(":/icons/play.png"), QSize(), QIcon::Normal, QIcon::Off);
playIcon.addFile(QStringLiteral(":/icons/play-disabled.png"), QSize(), QIcon::Disabled, QIcon::Off);
playIcon.addFile(QStringLiteral(":/icons/play.png"), QSize(), QIcon::Normal, QIcon::On);
playIcon.addFile(QStringLiteral(":/icons/play-disabled.png"), QSize(), QIcon::Disabled, QIcon::On);
btnPlay->setIcon(playIcon);
connect(btnPlay, SIGNAL(clicked(bool)), this, SLOT(toggle_play()));
playback_control_layout->addWidget(btnPlay);
@@ -725,5 +724,5 @@ void Viewer::set_sequence(bool main, Sequence *s) {
}
void Viewer::set_playpause_icon(bool play) {
btnPlay->setIcon(QIcon((play) ? ":/icons/play.png" : ":/icons/pause.png"));
btnPlay->setIcon(play ? playIcon : QIcon(":/icons/pause.png"));
}