Merge branch 'master' into rational_slider

app/panel/project/project.cpp

@@ -57,7 +57,6 @@ ProjectPanel::ProjectPanel(QWidget *parent) :
   explorer_ = new ProjectExplorer(this);
   layout->addWidget(explorer_);
   connect(explorer_, &ProjectExplorer::DoubleClickedItem, this, &ProjectPanel::ItemDoubleClickSlot);
-  connect(explorer_, &ProjectExplorer::ItemRemoved, this, &ProjectPanel::ItemRemoved);
 
   // Set toolbar's view to the explorer's view
   toolbar->SetView(explorer_->view_type());
@@ -233,16 +232,6 @@ void ProjectPanel::SaveConnectedProject()
   Core::instance()->SaveProject(this->project());
 }
 
-void ProjectPanel::ItemRemoved(Node *item)
-{
-  // Open this footage in a FootageViewer
-  FootageViewerPanel* panel = PanelManager::instance()->MostRecentlyFocused<FootageViewerPanel>();
-
-  if (panel->GetConnectedViewer() == item) {
-    panel->DisconnectViewerNode();
-  }
-}
-
 QVector<ViewerOutput *> ProjectPanel::GetSelectedFootage() const
 {
   QVector<Node*> items = SelectedItems();

app/panel/project/project.h

@@ -80,8 +80,6 @@ private slots:
 
   void SaveConnectedProject();
 
-  void ItemRemoved(Node* item);
-
 };
 
 }

app/panel/viewer/viewer.cpp

@@ -25,13 +25,13 @@ namespace olive {
 ViewerPanel::ViewerPanel(const QString &object_name, QWidget *parent) :
   ViewerPanelBase(object_name, parent)
 {
-  // Set ViewerWidget as the central widget
-  ViewerWidget* vw = new ViewerWidget();
-  connect(vw, &ViewerWidget::RequestScopePanel, this, &ViewerPanel::CreateScopePanel);
-  SetTimeBasedWidget(vw);
+  Init();
+}
 
-  // Set strings
-  Retranslate();
+ViewerPanel::ViewerPanel(QWidget *parent) :
+  ViewerPanelBase(QStringLiteral("ViewerPanel"), parent)
+{
+  Init();
 }
 
 void ViewerPanel::Retranslate()
@@ -41,4 +41,15 @@ void ViewerPanel::Retranslate()
   SetTitle(tr("Viewer"));
 }
 
+void ViewerPanel::Init()
+{
+  // Set ViewerWidget as the central widget
+  ViewerWidget* vw = new ViewerWidget();
+  connect(vw, &ViewerWidget::RequestScopePanel, this, &ViewerPanel::CreateScopePanel);
+  SetTimeBasedWidget(vw);
+
+  // Set strings
+  Retranslate();
+}
+
 }

app/panel/viewer/viewer.h

@@ -34,10 +34,14 @@ class ViewerPanel : public ViewerPanelBase {
   Q_OBJECT
 public:
   ViewerPanel(const QString& object_name, QWidget* parent);
+  ViewerPanel(QWidget* parent);
 
 protected:
   virtual void Retranslate() override;
 
+private:
+  void Init();
+
 };
 
 }