Merge branch 'master' into imagesource_icon

io/previewgenerator.cpp

@@ -185,7 +185,14 @@ void PreviewGenerator::finalize_media() {
         double frame_rate = 30;
         if (!contains_still_image && media->video_tracks.size() > 0) frame_rate = media->video_tracks.at(0)->video_frame_rate;
         item->setText(1, frame_to_timecode(media->get_length_in_frames(frame_rate), config.timecode_view, frame_rate));
+      
+        if (media->video_tracks.size() > 0) {
+            item->setText(2, QString::number(frame_rate) + " FPS");
+        } else {
+            item->setText(2, QString::number(media->audio_tracks.at(0)->audio_frequency) + " Hz");
+        }
     }
+	}
 }
 
 void PreviewGenerator::generate_waveform() {

mainwindow.cpp

@@ -62,8 +62,12 @@ void MainWindow::setup_layout() {
     addDockWidget(Qt::TopDockWidgetArea, panel_sequence_viewer);
 	addDockWidget(Qt::BottomDockWidgetArea, panel_timeline);
 
-	// workaround for older versions of Qt (but not too old)
-	layout()->update();
+    layout()->update();
+
+    // workaround for strange Qt dock bug (see https://bugreports.qt.io/browse/QTBUG-65592)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    resizeDocks({panel_project}, {40}, Qt::Horizontal);
+#endif
 }
 
 MainWindow::MainWindow(QWidget *parent) :

panels/project.ui

@@ -78,6 +78,11 @@
         <string>Duration</string>
        </property>
       </column>
+      <column>
+       <property name="text">
+        <string>Rate</string>
+       </property>
+      </column>
      </widget>
     </item>
    </layout>