|
@@ -54,17 +54,18 @@ MediaControls::MediaControls(QWidget *parent)
|
|
|
ui->stopButton->setProperty("themeID", "stopIcon");
|
|
|
setFocusPolicy(Qt::StrongFocus);
|
|
|
|
|
|
- connect(&mediaTimer, SIGNAL(timeout()), this,
|
|
|
- SLOT(SetSliderPosition()));
|
|
|
- connect(&seekTimer, SIGNAL(timeout()), this, SLOT(SeekTimerCallback()));
|
|
|
- connect(ui->slider, SIGNAL(sliderPressed()), this,
|
|
|
- SLOT(MediaSliderClicked()));
|
|
|
- connect(ui->slider, SIGNAL(mediaSliderHovered(int)), this,
|
|
|
- SLOT(MediaSliderHovered(int)));
|
|
|
- connect(ui->slider, SIGNAL(sliderReleased()), this,
|
|
|
- SLOT(MediaSliderReleased()));
|
|
|
- connect(ui->slider, SIGNAL(sliderMoved(int)), this,
|
|
|
- SLOT(MediaSliderMoved(int)));
|
|
|
+ connect(&mediaTimer, &QTimer::timeout, this,
|
|
|
+ &MediaControls::SetSliderPosition);
|
|
|
+ connect(&seekTimer, &QTimer::timeout, this,
|
|
|
+ &MediaControls::SeekTimerCallback);
|
|
|
+ connect(ui->slider, &MediaSlider::sliderPressed, this,
|
|
|
+ &MediaControls::MediaSliderClicked);
|
|
|
+ connect(ui->slider, &MediaSlider::mediaSliderHovered, this,
|
|
|
+ &MediaControls::MediaSliderHovered);
|
|
|
+ connect(ui->slider, &MediaSlider::sliderReleased, this,
|
|
|
+ &MediaControls::MediaSliderReleased);
|
|
|
+ connect(ui->slider, &MediaSlider::sliderMoved, this,
|
|
|
+ &MediaControls::MediaSliderMoved);
|
|
|
|
|
|
countDownTimer = config_get_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
"MediaControlsCountdownTimer");
|
|
@@ -72,27 +73,28 @@ MediaControls::MediaControls(QWidget *parent)
|
|
|
QAction *restartAction = new QAction(this);
|
|
|
restartAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
|
|
restartAction->setShortcut({Qt::Key_R});
|
|
|
- connect(restartAction, SIGNAL(triggered()), this, SLOT(RestartMedia()));
|
|
|
+ connect(restartAction, &QAction::triggered, this,
|
|
|
+ &MediaControls::RestartMedia);
|
|
|
addAction(restartAction);
|
|
|
|
|
|
QAction *sliderFoward = new QAction(this);
|
|
|
sliderFoward->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
|
|
- connect(sliderFoward, SIGNAL(triggered()), this,
|
|
|
- SLOT(MoveSliderFoward()));
|
|
|
+ connect(sliderFoward, &QAction::triggered, this,
|
|
|
+ &MediaControls::MoveSliderFoward);
|
|
|
sliderFoward->setShortcut({Qt::Key_Right});
|
|
|
addAction(sliderFoward);
|
|
|
|
|
|
QAction *sliderBack = new QAction(this);
|
|
|
sliderBack->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
|
|
- connect(sliderBack, SIGNAL(triggered()), this,
|
|
|
- SLOT(MoveSliderBackwards()));
|
|
|
+ connect(sliderBack, &QAction::triggered, this,
|
|
|
+ &MediaControls::MoveSliderBackwards);
|
|
|
sliderBack->setShortcut({Qt::Key_Left});
|
|
|
addAction(sliderBack);
|
|
|
|
|
|
QAction *playPause = new QAction(this);
|
|
|
playPause->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
|
|
- connect(playPause, SIGNAL(triggered()), this,
|
|
|
- SLOT(on_playPauseButton_clicked()));
|
|
|
+ connect(playPause, &QAction::triggered, this,
|
|
|
+ &MediaControls::on_playPauseButton_clicked);
|
|
|
playPause->setShortcut({Qt::Key_Space});
|
|
|
addAction(playPause);
|
|
|
}
|