fixed nesting bug and reveal in project with icon view bug

This commit is contained in:
itsmattkc
2018-12-31 01:23:20 +11:00
parent b43a9f560f
commit ac4fd70dc2
3 changed files with 6 additions and 2 deletions
+3
View File
@@ -1200,6 +1200,9 @@ void MainWindow::nest() {
panel_timeline->create_ghosts_from_media(sequence, earliest_point, media_list);
panel_timeline->add_clips_from_ghosts(ca, sequence);
panel_effect_controls->clear_effects(true);
sequence->selections.clear();
undo_stack.push(ca);
update_ui(true);
+1
View File
@@ -729,6 +729,7 @@ bool Project::reveal_media(Media *media, QModelIndex parent) {
tree_view->selectionModel()->select(sorted_index, QItemSelectionModel::Select);
} else if (config.project_view_type == PROJECT_VIEW_ICON) {
icon_view->setRootIndex(hierarchy);
icon_view->selectionModel()->select(sorted_index, QItemSelectionModel::Select);
set_up_dir_enabled();
}
+2 -2
View File
@@ -155,7 +155,7 @@ void TimelineWidget::show_context_menu(const QPoint& pos) {
connect(nestAction, SIGNAL(triggered(bool)), mainWindow, SLOT(nest()));
// stabilizer option
int video_clip_count = 0;
/*int video_clip_count = 0;
bool all_video_is_footage = true;
for (int i=0;i<selected_clips.size();i++) {
if (selected_clips.at(i)->track < 0) {
@@ -169,7 +169,7 @@ void TimelineWidget::show_context_menu(const QPoint& pos) {
if (video_clip_count == 1 && all_video_is_footage) {
QAction* stabilizerAction = menu.addAction("S&tabilizer");
connect(stabilizerAction, SIGNAL(triggered(bool)), this, SLOT(show_stabilizer_diag()));
}
}*/
// set autoscale arbitrarily to the first selected clip
autoscaleAction->setChecked(selected_clips.at(0)->autoscale);