rewrite nearly complete

This commit is contained in:
itsmattkc
2019-04-03 01:38:01 +11:00
parent 8989333e99
commit 2d4714547b
102 changed files with 3213 additions and 2892 deletions
+22 -19
View File
@@ -100,7 +100,7 @@ void FocusFilter::set_viewer_fullscreen() {
}
void FocusFilter::set_marker() {
if (olive::ActiveSequence != nullptr) {
if (Timeline::GetTopSequence() != nullptr) {
QDockWidget* focused_panel = get_focused_panel();
if (focused_panel == panel_footage_viewer) {
@@ -108,7 +108,7 @@ void FocusFilter::set_marker() {
} else if (focused_panel == panel_sequence_viewer) {
panel_sequence_viewer->set_marker();
} else {
panel_timeline->set_marker();
panel_timeline.first()->set_marker();
}
}
}
@@ -190,28 +190,31 @@ void FocusFilter::clear_inout() {
}
void FocusFilter::delete_function() {
if (panel_timeline->headers->hasFocus()) {
panel_timeline->headers->delete_markers();
if (panel_timeline.first()->headers->hasFocus()) {
panel_timeline.first()->headers->delete_markers();
} else if (panel_footage_viewer->headers->hasFocus()) {
panel_footage_viewer->headers->delete_markers();
} else if (panel_sequence_viewer->headers->hasFocus()) {
panel_sequence_viewer->headers->delete_markers();
} else if (panel_effect_controls->is_focused()) {
} else if (panel_effect_controls->focused()) {
panel_effect_controls->DeleteSelectedEffects();
} else if (panel_project->is_focused()) {
panel_project->delete_selected_media();
} else if (panel_effect_controls->keyframe_focus()) {
} else if (panel_project.first()->focused()) {
panel_project.first()->delete_selected_media();
} else if (panel_effect_controls->focused()) {
panel_effect_controls->delete_selected_keyframes();
} else if (panel_graph_editor->view_is_focused()) {
} else if (panel_graph_editor->focused()) {
panel_graph_editor->delete_selected_keys();
} else {
panel_timeline->delete_selection(olive::ActiveSequence->selections, false);
Sequence* top_sequence = Timeline::GetTopSequence().get();
ComboAction* ca = new ComboAction();
top_sequence->DeleteAreas(ca, top_sequence->Selections(), true);
olive::undo_stack.push(ca);
}
}
void FocusFilter::duplicate() {
if (panel_project->is_focused()) {
panel_project->duplicate_selected();
if (panel_project.first()->focused()) {
panel_project.first()->duplicate_selected();
}
}
@@ -220,7 +223,7 @@ void FocusFilter::select_all() {
if (focused_panel == panel_graph_editor) {
panel_graph_editor->select_all();
} else {
panel_timeline->select_all();
panel_timeline.first()->select_all();
}
}
@@ -233,7 +236,7 @@ void FocusFilter::zoom_in() {
} else if (focused_panel == panel_sequence_viewer) {
panel_sequence_viewer->set_zoom(true);
} else {
panel_timeline->zoom_in();
panel_timeline.first()->zoom_in();
}
}
@@ -246,28 +249,28 @@ void FocusFilter::zoom_out() {
} else if (focused_panel == panel_sequence_viewer) {
panel_sequence_viewer->set_zoom(false);
} else {
panel_timeline->zoom_out();
panel_timeline.first()->zoom_out();
}
}
void FocusFilter::cut() {
if (olive::ActiveSequence != nullptr) {
if (Timeline::GetTopSequence() != nullptr) {
QDockWidget* focused_panel = get_focused_panel();
if (panel_effect_controls == focused_panel) {
panel_effect_controls->copy(true);
} else {
panel_timeline->copy(true);
panel_timeline.first()->copy(true);
}
}
}
void FocusFilter::copy() {
if (olive::ActiveSequence != nullptr) {
if (Timeline::GetTopSequence() != nullptr) {
QDockWidget* focused_panel = get_focused_panel();
if (panel_effect_controls == focused_panel) {
panel_effect_controls->copy(false);
} else {
panel_timeline->copy(false);
panel_timeline.first()->copy(false);
}
}
}