oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge?

Browse Source
This commit is contained in:
itsmattkc
2018-08-05 14:12:20 +10:00
parent 43d7e80b9e b8b99901d8
commit 3d2534a299
3 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/sourcetable.cpp
+6
View File
@@ -36,10 +36,16 @@ void SourceTable::show_context_menu(const QPoint& pos) {
} else {
if (selectedItems().size() == 1) {
// replace footage
<<<<<<< HEAD
int type = get_type_from_tree(selectedItems().at(0));
if (type == MEDIA_TYPE_FOOTAGE) {
QAction* replace_action = menu.addAction("Replace/Relink Media");
connect(replace_action, SIGNAL(triggered(bool)), panel_project, SLOT(replace_selected_file()));
=======
if (get_type_from_tree(selectedItems().at(0)) == MEDIA_TYPE_FOOTAGE) {
QAction* replace_action = menu.addAction("Replace/Relink Media");
connect(replace_action, SIGNAL(triggered(bool)), panel_project, SLOT(replace_media()));
>>>>>>> b8b99901d8f71ebc1583cb9b7c49e26d38e01ec9
}
if (type != MEDIA_TYPE_FOLDER) {
QAction* replace_clip_media = menu.addAction("Replace Clips Using This Media");