Rebase on master

This commit is contained in:
flurick 2022-11-24 22:03:40 +01:00 committed by manongjohn
parent d958733ddb
commit f3edf29233
2 changed files with 2 additions and 6 deletions

View file

@ -2273,6 +2273,8 @@ void MainWindow::defineActions() {
createMenuWindowsAction(MI_OpenFileBrowser, QT_TR_NOOP("&File Browser"), "",
"filebrowser");
createMenuWindowsAction(MI_OpenPreproductionBoard, QT_TR_NOOP("&Preproduction Board"), "",
"scenebrowser");
createMenuWindowsAction(MI_OpenFileViewer, QT_TR_NOOP("&Flipbook"), "",
"flipbook");
createMenuWindowsAction(MI_OpenFunctionEditor, QT_TR_NOOP("&Function Editor"),

View file

@ -103,12 +103,6 @@ QMutex levelFileMutex;
} // namespace
inline bool isMultipleFrameType(std::string type) {
return (type == "tlv" || type == "tzl" || type == "pli" || type == "mov" ||
type == "avi" || type == "3gp" || type == "gif" || type == "mp4" ||
type == "webm");
}
//=============================================================================
//
// SceneBrowserButtonBar