merged with master

global/global.cpp

@@ -39,6 +39,7 @@
 #include "dialogs/speeddialog.h"
 #include "dialogs/actionsearch.h"
 #include "dialogs/loaddialog.h"
+#include "dialogs/autocutsilencedialog.h"
 #include "project/loadthread.h"
 #include "timeline/sequence.h"
 #include "ui/mediaiconservice.h"
@@ -91,7 +92,12 @@ void OliveGlobal::check_for_autorecovery_file() {
     // detect auto-recovery file
     autorecovery_filename = data_dir + "/autorecovery.ove";
     if (QFile::exists(autorecovery_filename)) {
-      if (QMessageBox::question(nullptr, tr("Auto-recovery"), tr("Olive didn't close properly and an autorecovery file was detected. Would you like to open it?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
+      if (QMessageBox::question(nullptr,
+                                tr("Auto-recovery"),
+                                tr("Olive didn't close properly and an autorecovery file "
+                                   "was detected. Would you like to open it?"),
+                                QMessageBox::Yes,
+                                QMessageBox::No) == QMessageBox::Yes) {
         enable_load_project_on_init = false;
         OpenProjectWorker(autorecovery_filename, true);
       }
@@ -166,18 +172,19 @@ void OliveGlobal::SetNativeStyling(QWidget *w)
 #endif
 }
 
-void OliveGlobal::LoadProject(const QString &fn, bool autorecovery, bool clear)
+void OliveGlobal::LoadProject(const QString &fn, bool autorecovery)
 {
-  // Normally, the user will be closing the previous project to load a new one, but just in case the user
-  // is importing a new project
+  // QSortFilterProxyModels are not thread-safe, and as we'll be loading in another thread, leaving it connected
+  // can cause glitches in its presentation. Therefore for the duration of the loading process, we disconnect it,
+  // and reconnect it later once the loading is complete.
 
-  if (clear) {
-    new_project();
-  }
+  panel_project->DisconnectFilterToModel();
 
   LoadDialog ld(olive::MainWindow);
 
-  LoadThread* lt = new LoadThread(fn, autorecovery, clear);
+  ld.open();
+
+  LoadThread* lt = new LoadThread(fn, autorecovery);
   connect(&ld, SIGNAL(cancel()), lt, SLOT(cancel()));
   connect(lt, SIGNAL(success()), &ld, SLOT(accept()));
   connect(lt, SIGNAL(error()), &ld, SLOT(reject()));
@@ -185,40 +192,46 @@ void OliveGlobal::LoadProject(const QString &fn, bool autorecovery, bool clear)
   connect(lt, SIGNAL(report_progress(int)), &ld, SLOT(setValue(int)));
   lt->start();
 
-  ld.exec();
+  panel_project->ConnectFilterToModel();
+}
+
+void OliveGlobal::ClearProject()
+{
+  // clear graph editor
+  panel_graph_editor->set_row(nullptr);
+
+  // clear effects panel
+  panel_effect_controls->Clear(true);
+
+  // clear existing project
+  olive::Global->set_sequence(nullptr);
+  panel_footage_viewer->set_media(nullptr);
+
+  // clear project contents (footage, sequences, etc.)
+  panel_project->clear();
+
+  // clear undo stack
+  olive::UndoStack.clear();
+
+  // empty current project filename
+  update_project_filename("");
+
+  // full update of all panels
+  update_ui(false);
+
+  // set to unmodified
+  olive::Global->set_modified(false);
 }
 
 void OliveGlobal::ImportProject(const QString &fn)
 {
-  LoadProject(fn, false, false);
+  LoadProject(fn, false);
+  set_modified(true);
 }
 
 void OliveGlobal::new_project() {
   if (can_close_project()) {
-    // clear graph editor
-    panel_graph_editor->set_row(nullptr);
-
-    // clear effects panel
-    panel_effect_controls->Clear(true);
-
-    // clear existing project
-    olive::Global->set_sequence(nullptr);
-    panel_footage_viewer->set_media(nullptr);
-
-    // clear project contents (footage, sequences, etc.)
-    panel_project->clear();
-
-    // clear undo stack
-    olive::UndoStack.clear();
-
-    // empty current project filename
-    update_project_filename("");
-
-    // full update of all panels
-    update_ui(false);
-
-    // set to unmodified
-    olive::Global->set_modified(false);
+    ClearProject();
   }
 }
 
@@ -289,12 +302,7 @@ bool OliveGlobal::can_close_project() {
 }
 
 void OliveGlobal::open_export_dialog() {
-  if (olive::ActiveSequence == nullptr) {
-    QMessageBox::information(olive::MainWindow,
-                             tr("No active sequence"),
-                             tr("Please open the sequence you wish to export."),
-                             QMessageBox::Ok);
-  } else {
+  if (CheckForActiveSequence()) {
     ExportDialog e(olive::MainWindow);
     e.exec();
   }
@@ -358,12 +366,29 @@ void OliveGlobal::set_sequence(SequencePtr s)
   panel_timeline->setFocus();
 }
 
-void OliveGlobal::OpenProjectWorker(const QString& fn, bool autorecovery) {
+void OliveGlobal::OpenProjectWorker(QString fn, bool autorecovery) {
+  ClearProject();
   update_project_filename(fn);
-  LoadProject(fn, autorecovery, true);
+  LoadProject(fn, autorecovery);
   olive::UndoStack.clear();
 }
 
+bool OliveGlobal::CheckForActiveSequence(bool show_msg)
+{
+  if (olive::ActiveSequence == nullptr) {
+
+    if (show_msg) {
+      QMessageBox::information(olive::MainWindow,
+                               tr("No active sequence"),
+                               tr("Please open the sequence to perform this action."),
+                               QMessageBox::Ok);
+    }
+
+    return false;
+  }
+  return true;
+}
+
 void OliveGlobal::undo() {
   // workaround to prevent crash (and also users should never need to do this)
   if (!panel_timeline->importing) {
@@ -413,6 +438,24 @@ void OliveGlobal::open_speed_dialog() {
   }
 }
 
+void OliveGlobal::open_autocut_silence_dialog() {
+  if (CheckForActiveSequence()) {
+
+    QVector<Clip*> selected_clips = olive::ActiveSequence->SelectedClips();
+
+    if (selected_clips.isEmpty()) {
+      QMessageBox::critical(olive::MainWindow,
+                            tr("No clips selected"),
+                            tr("Select the clips you wish to auto-cut"),
+                            QMessageBox::Ok);
+    } else {
+      AutoCutSilenceDialog s(olive::MainWindow, selected_clips);
+      s.exec();
+    }
+
+  }
+}
+
 void OliveGlobal::clear_undo_stack() {
   olive::UndoStack.clear();
 }