From 462e7ba586ee9a42be347e72390a621b6ae4accb Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 12 Jan 2019 01:17:12 +1100 Subject: [PATCH] added close media for #304 --- panels/viewer.cpp | 8 ++++++++ panels/viewer.h | 2 ++ ui/viewerwidget.cpp | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/panels/viewer.cpp b/panels/viewer.cpp index eb713724d..be165cfd7 100644 --- a/panels/viewer.cpp +++ b/panels/viewer.cpp @@ -90,6 +90,10 @@ bool Viewer::is_focused() { || btnSkipToEnd->hasFocus(); } +bool Viewer::is_main_sequence() { + return main_sequence; +} + void Viewer::set_main_sequence() { clean_created_seq(); set_sequence(true, sequence); @@ -260,6 +264,10 @@ void Viewer::go_to_end() { if (seq != NULL) seek(seq->getEndFrame()); } +void Viewer::close_media() { + set_media(NULL); +} + void Viewer::go_to_in() { if (seq != NULL) { if (seq->using_workarea && seq->enable_workarea) { diff --git a/panels/viewer.h b/panels/viewer.h index e102c1f57..acb187559 100644 --- a/panels/viewer.h +++ b/panels/viewer.h @@ -29,6 +29,7 @@ public: ~Viewer(); bool is_focused(); + bool is_main_sequence(); void set_main_sequence(); void set_media(Media *m); void compose(); @@ -81,6 +82,7 @@ public slots: void next_frame(); void go_to_out(); void go_to_end(); + void close_media(); private slots: void update_playhead(); diff --git a/ui/viewerwidget.cpp b/ui/viewerwidget.cpp index 51467aacc..3783b563f 100644 --- a/ui/viewerwidget.cpp +++ b/ui/viewerwidget.cpp @@ -109,6 +109,10 @@ void ViewerWidget::show_context_menu() { connect(&zoom_menu, SIGNAL(triggered(QAction*)), this, SLOT(set_menu_zoom(QAction*))); menu.addMenu(&zoom_menu); + if (!viewer->is_main_sequence()) { + menu.addAction("Close Media", viewer, SLOT(close_media())); + } + menu.exec(QCursor::pos()); }