Support the delete key to remove elements from the playlist.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3b8561fac7a32fa3a14217a85ff8ff890cac23cb..f0a0341b89c0a758e0d61d325ac70a566d3b32eb 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -60,24 +60,37 @@ MainWindow::MainWindow()
 
        QShortcut *preview_1 = new QShortcut(QKeySequence(Qt::Key_1), this);
        connect(preview_1, &QShortcut::activated, ui->preview_1_btn, &QPushButton::click);
+       connect(ui->input1_display, &JPEGFrameView::clicked, ui->preview_1_btn, &QPushButton::click);
        connect(ui->preview_1_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(0); });
+       ui->input1_display->set_overlay("1");
 
        QShortcut *preview_2 = new QShortcut(QKeySequence(Qt::Key_2), this);
        connect(preview_2, &QShortcut::activated, ui->preview_2_btn, &QPushButton::click);
+       connect(ui->input2_display, &JPEGFrameView::clicked, ui->preview_2_btn, &QPushButton::click);
        connect(ui->preview_2_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(1); });
+       ui->input2_display->set_overlay("2");
 
        QShortcut *preview_3 = new QShortcut(QKeySequence(Qt::Key_3), this);
        connect(preview_3, &QShortcut::activated, ui->preview_3_btn, &QPushButton::click);
+       connect(ui->input3_display, &JPEGFrameView::clicked, ui->preview_3_btn, &QPushButton::click);
        connect(ui->preview_3_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(2); });
+       ui->input3_display->set_overlay("3");
 
        QShortcut *preview_4 = new QShortcut(QKeySequence(Qt::Key_4), this);
        connect(preview_4, &QShortcut::activated, ui->preview_4_btn, &QPushButton::click);
+       connect(ui->input4_display, &JPEGFrameView::clicked, ui->preview_4_btn, &QPushButton::click);
        connect(ui->preview_4_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(3); });
+       ui->input4_display->set_overlay("4");
 
        connect(ui->playlist_duplicate_btn, &QPushButton::clicked, this, &MainWindow::playlist_duplicate);
 
-       // TODO: support the delete key iff the widget has focus?
        connect(ui->playlist_remove_btn, &QPushButton::clicked, this, &MainWindow::playlist_remove);
+       QShortcut *delete_key = new QShortcut(QKeySequence(Qt::Key_Delete), ui->playlist);
+       connect(delete_key, &QShortcut::activated, [this] {
+               if (ui->playlist->hasFocus()) {
+                       playlist_remove();
+               }
+       });
 
        // TODO: support drag-and-drop.
        connect(ui->playlist_move_up_btn, &QPushButton::clicked, [this]{ playlist_move(-1); });
@@ -87,8 +100,8 @@ MainWindow::MainWindow()
                this, &MainWindow::playlist_selection_changed);
        playlist_selection_changed();  // First time set-up.
 
-       preview_player = new Player(ui->preview_display);
-       live_player = new Player(ui->live_display);
+       preview_player = new Player(ui->preview_display, /*also_output_to_stream=*/false);
+       live_player = new Player(ui->live_display, /*also_output_to_stream=*/true);
        live_player->set_done_callback([this]{
                post_to_main_thread([this]{
                        live_player_clip_done();