From a979e7e2e81d281fed8989427a7e1663485059f4 Mon Sep 17 00:00:00 2001
From: alcomposer <alcomposer@users.noreply.github.com>
Date: Tue, 13 Nov 2018 21:24:43 +1030
Subject: [PATCH 1/4] Add Framerate Column

---
 panels/project.ui | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/panels/project.ui b/panels/project.ui
index 025479f87..3a68e41c0 100644
--- a/panels/project.ui
+++ b/panels/project.ui
@@ -78,6 +78,11 @@
         <string>Duration</string>
        </property>
       </column>
+      <column>
+       <property name="text">
+        <string>Framerate</string>
+       </property>
+      </column>
      </widget>
     </item>
    </layout>

From f243fa2062daf4c2b96887fb3a3389d595021391 Mon Sep 17 00:00:00 2001
From: alcomposer <alcomposer@users.noreply.github.com>
Date: Tue, 13 Nov 2018 21:26:26 +1030
Subject: [PATCH 2/4] Display frame_rate of media in Project Pannel

---
 io/previewgenerator.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/io/previewgenerator.cpp b/io/previewgenerator.cpp
index a6ce4f8ff..5a181f127 100644
--- a/io/previewgenerator.cpp
+++ b/io/previewgenerator.cpp
@@ -182,6 +182,7 @@ 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));
+	item->setText(2, QString::number(frame_rate));
 	}
 }
 

From a9caa742c374d0adb778eb38930e20af1454b77f Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 14 Nov 2018 21:11:22 +1100
Subject: [PATCH 3/4] reimplement workaround for qdockwidget bug

---
 mainwindow.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 66198b6d8..ce3d0da38 100644
--- a/mainwindow.cpp
+++ b/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) :

From 1c3fc815e3b90cc717f8621aaa1428fc0ddff46e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 14 Nov 2018 21:18:23 +1100
Subject: [PATCH 4/4] tweaked frame rate column in project panel

---
 io/previewgenerator.cpp | 7 ++++++-
 panels/project.ui       | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/io/previewgenerator.cpp b/io/previewgenerator.cpp
index af3b843c4..3fd3613e7 100644
--- a/io/previewgenerator.cpp
+++ b/io/previewgenerator.cpp
@@ -182,7 +182,12 @@ 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));
-	item->setText(2, QString::number(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");
+        }
 	}
 }
 
diff --git a/panels/project.ui b/panels/project.ui
index 3a68e41c0..cd064d9b0 100644
--- a/panels/project.ui
+++ b/panels/project.ui
@@ -80,7 +80,7 @@
       </column>
       <column>
        <property name="text">
-        <string>Framerate</string>
+        <string>Rate</string>
        </property>
       </column>
      </widget>