Merge branch 'olive-editor:master' into av1

app/dialog/export/codec/cineformsection.cpp

@@ -30,7 +30,7 @@ CineformSection::CineformSection(QWidget *parent) :
 {
   QGridLayout *layout = new QGridLayout(this);
 
-  layout->setMargin(0);
+  layout->setContentsMargins(0, 0, 0, 0);
 
   int row = 0;
 

app/dialog/export/codec/h264section.cpp

@@ -39,7 +39,7 @@ H264Section::H264Section(int default_crf, QWidget *parent) :
   CodecSection(parent)
 {
   QGridLayout* layout = new QGridLayout(this);
-  layout->setMargin(0);
+  layout->setContentsMargins(0, 0, 0, 0);
 
   int row = 0;
   layout->addWidget(new QLabel(tr("Encode Speed:")), row, 0);
@@ -173,7 +173,7 @@ H264CRFSection::H264CRFSection(int default_crf, QWidget *parent) :
   QWidget(parent)
 {
   QHBoxLayout* layout = new QHBoxLayout(this);
-  layout->setMargin(0);
+  layout->setContentsMargins(0, 0, 0, 0);
 
   crf_slider_ = new QSlider(Qt::Horizontal);
   crf_slider_->setMinimum(kMinimumCRF);
@@ -207,7 +207,7 @@ H264BitRateSection::H264BitRateSection(QWidget *parent) :
   QWidget(parent)
 {
   QGridLayout* layout = new QGridLayout(this);
-  layout->setMargin(0);
+  layout->setContentsMargins(0, 0, 0, 0);
 
   int row = 0;
 
@@ -261,7 +261,7 @@ H264FileSizeSection::H264FileSizeSection(QWidget *parent) :
   QWidget(parent)
 {
   QGridLayout* layout = new QGridLayout(this);
-  layout->setMargin(0);
+  layout->setContentsMargins(0, 0, 0, 0);
 
   int row = 0;
 

app/dialog/export/codec/imagesection.cpp

@@ -29,7 +29,7 @@ ImageSection::ImageSection(QWidget* parent) :
   CodecSection(parent)
 {
   QGridLayout* layout = new QGridLayout(this);
-  layout->setMargin(0);
+  layout->setContentsMargins(0, 0, 0, 0);
 
   int row = 0;
 
@@ -47,6 +47,7 @@ ImageSection::ImageSection(QWidget* parent) :
   frame_slider_->SetMinimum(0);
   frame_slider_->SetValue(0);
   frame_slider_->SetDisplayType(RationalSlider::kTime);
+  connect(frame_slider_, &RationalSlider::ValueChanged, this, &ImageSection::TimeChanged);
   layout->addWidget(frame_slider_, row, 1);
 }
 

app/dialog/export/codec/imagesection.h

@@ -59,6 +59,9 @@ public:
     frame_slider_->SetValue(t);
   }
 
+signals:
+  void TimeChanged(const rational &t);
+
 private:
   QCheckBox* image_sequence_checkbox_;
 

app/dialog/export/export.cpp

@@ -58,7 +58,7 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, bool stills_only_mode, QWi
 
   preferences_area_ = new QWidget();
   QGridLayout* preferences_layout = new QGridLayout(preferences_area_);
-  preferences_layout->setMargin(0);
+  preferences_layout->setContentsMargins(0, 0, 0, 0);
 
   int row = 0;
 
@@ -148,6 +148,11 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, bool stills_only_mode, QWi
   video_tab_ = new ExportVideoTab(color_manager_);
   AddPreferencesTab(video_tab_, tr("Video"));
 
+  // Set video tab time and make connections
+  connect(viewer_node, &ViewerOutput::PlayheadChanged, video_tab_, &ExportVideoTab::SetTime);
+  connect(video_tab_, &ExportVideoTab::TimeChanged, viewer_node, &ViewerOutput::SetPlayhead);
+  video_tab_->SetTime(viewer_node->GetPlayhead());
+
   audio_tab_ = new ExportAudioTab();
   AddPreferencesTab(audio_tab_, tr("Audio"));
 
@@ -183,7 +188,7 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, bool stills_only_mode, QWi
   row++;
 
   QHBoxLayout *btn_layout = new QHBoxLayout();
-  btn_layout->setMargin(0);
+  btn_layout->setContentsMargins(0, 0, 0, 0);
   preferences_layout->addLayout(btn_layout, row, 0, 1, 4);
 
   btn_layout->addStretch();
@@ -206,7 +211,6 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, bool stills_only_mode, QWi
   preview_viewer_ = new ViewerWidget();
   preview_viewer_->ruler()->SetMarkerEditingEnabled(false);
   preview_viewer_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-  connect(preview_viewer_, &ViewerWidget::TimeChanged, video_tab_, &ExportVideoTab::SetTime);
   preview_layout->addWidget(preview_viewer_);
   splitter->addWidget(preview_area);
 
@@ -391,7 +395,7 @@ void ExportDialog::ExportFinished()
     // If this task was cancelled, we stay open so the user can potentially queue another export
   } else {
     // Accept this dialog and close
-    if (import_file_after_export_) {
+    if (import_file_after_export_->isEnabled() && import_file_after_export_->isChecked()) {
       QString filename = filename_edit_->text().trimmed();
       emit RequestImportFile(filename);
     }
@@ -437,7 +441,7 @@ void ExportDialog::PresetComboBoxChanged()
   if (loading_presets_) {
     return;
   }
-  
+
   QComboBox *c = static_cast<QComboBox *>(sender());
 
   int preset_number = c->currentData().toInt();

app/dialog/export/export.h

@@ -51,14 +51,6 @@ public:
   rational GetSelectedTimebase() const;
   void SetSelectedTimebase(const rational &r);
 
-  void SetTime(const rational &time)
-  {
-    preview_viewer_->SetAudioScrubbingEnabled(false);
-    preview_viewer_->SetTime(time);
-    video_tab_->SetTime(time);
-    preview_viewer_->SetAudioScrubbingEnabled(true);
-  }
-
   EncodingParams GenerateParams() const;
   void SetParams(const EncodingParams &e);
 

app/dialog/export/exportvideotab.cpp

@@ -184,6 +184,7 @@ QWidget *ExportVideoTab::SetupCodecSection()
   codec_layout->addWidget(codec_stack_, row, 0, 1, 2);
 
   image_section_ = new ImageSection();
+  connect(image_section_, &ImageSection::TimeChanged, this, &ExportVideoTab::TimeChanged);
   codec_stack_->addWidget(image_section_);
 
   h264_section_ = new H264Section();

app/dialog/export/exportvideotab.h

@@ -167,6 +167,8 @@ signals:
 
   void ImageSequenceCheckBoxChanged(bool e);
 
+  void TimeChanged(const rational &time);
+
 private:
   QWidget* SetupResolutionSection();
   QWidget* SetupColorSection();