Merge branch 'master' into typos

2020-03-19 12:16:09 +11:00
parent 321e7d1606 30b4ef8f00
commit e5ac72fa9d
126 changed files with 2951 additions and 934 deletions
@@ -482,6 +482,18 @@ Folder *Core::GetSelectedFolderInActiveProject()
  }
 }

+Timecode::Display Core::GetTimecodeDisplay() const
+{
+  return static_cast<Timecode::Display>(Config::Current()["TimecodeDisplay"].toInt());
+}
+
+void Core::SetTimecodeDisplay(Timecode::Display d)
+{
+  Config::Current()["TimecodeDisplay"] = d;
+
+  emit TimecodeDisplayChanged(d);
+}
+
 void Core::SetProjectModified(bool e)
 {
  main_window()->setWindowModified(e);