From a31a3d8c759ddba126d2b9fdf5e3f931b9d689e1 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 7 Jul 2018 00:12:03 +0100 Subject: [PATCH] fixing hilarious linking bug --- .gitignore | 3 +- olive.pro.user | 654 ++++++++++++++++++++++-------------------- ui/timelinewidget.cpp | 28 +- 3 files changed, 352 insertions(+), 333 deletions(-) diff --git a/.gitignore b/.gitignore index a91ab86c3..c1b62a8a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -olive.pro.* +*.pro.user +*.pro.user.* diff --git a/olive.pro.user b/olive.pro.user index 1bd70650a..4a19494e0 100644 --- a/olive.pro.user +++ b/olive.pro.user @@ -1,318 +1,336 @@ - - - - - - EnvironmentId - {3af06612-75ce-48d7-b444-7dc372f1566d} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.11.0 MSVC2017 64bit - Desktop Qt 5.11.0 MSVC2017 64bit - qt.qt5.5110.win64_msvc2017_64_kit - 0 - 0 - 0 - - C:/Users/Matt/Desktop/build-olive-Desktop_Qt_5_11_0_MSVC2017_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/Matt/Desktop/build-olive-Desktop_Qt_5_11_0_MSVC2017_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - C:/Users/Matt/Desktop/build-olive-Desktop_Qt_5_11_0_MSVC2017_64bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - olive - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Matt/Desktop/olive/olive.pro - true - - olive.pro - false - - C:/Users/Matt/Desktop/build-olive-Desktop_Qt_5_11_0_MSVC2017_64bit-Debug - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - + + + + + + EnvironmentId + {be57d5b1-e5ae-4026-9f48-bb6e01f50d4e} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 2 + true + true + 1 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.5.1 GCC 64bit + Desktop Qt 5.5.1 GCC 64bit + qt.55.gcc_64_kit + 0 + 0 + 0 + + /home/matt/Documents/build-olive-Desktop_Qt_5_5_1_GCC_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/matt/build-olive-Desktop_Qt_5_5_1_GCC_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/matt/build-olive-Desktop_Qt_5_5_1_GCC_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + olive + + Qt4ProjectManager.Qt4RunConfiguration:/home/matt/olive/olive.pro + true + + olive.pro + false + + /home/matt/Documents/build-olive-Desktop_Qt_5_5_1_GCC_64bit-Debug + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp index 1dc04d7d2..383259ad0 100644 --- a/ui/timelinewidget.cpp +++ b/ui/timelinewidget.cpp @@ -153,7 +153,7 @@ void TimelineWidget::dropEvent(QDropEvent* event) { for (int j=0;jget_clip(added_clips.at(j)); if (c != cc && c->media == cc->media) { - c->linked.append(j); + c->linked.append(added_clips.at(j)); } } } @@ -216,19 +216,18 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) { panel_timeline->moving_init = true; } else { if (clip_index >= 0) { - Clip* c = sequence->get_clip(clip_index); - if (panel_timeline->is_clip_selected(c)) { - if (shift) { - // TODO if shift is down, deselect it - } - } else { - // if "shift" is not down - if (!shift) { - panel_timeline->selections.clear(); - } + Clip* clip = sequence->get_clip(clip_index); + if (clip != NULL) { + if (panel_timeline->is_clip_selected(clip)) { + if (shift) { + // TODO if shift is down, deselect it + } + } else { + // if "shift" is not down + if (!shift) { + panel_timeline->selections.clear(); + } - Clip* clip = sequence->get_clip(clip_index); - if (clip != NULL) { Selection s; s.in = clip->timeline_in; s.out = clip->timeline_out; @@ -242,7 +241,7 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) { // if alt is not down, select links if (!(event->modifiers() & Qt::AltModifier)) { for (int i=0;ilinked.size();i++) { - Clip* link = sequence->get_clip(c->linked.at(i)); + Clip* link = sequence->get_clip(clip->linked.at(i)); if (!panel_timeline->is_clip_selected(link)) { Selection ss; ss.in = link->timeline_in; @@ -254,6 +253,7 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) { } } } + panel_timeline->moving_init = true; } else { // if "shift" is not down