jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Reinstate native dialogs on Linux with browser enabled 

After the recent CEF update, the GMainLoop-in-a-thread conflict seems to be
gone, which allows us to being back native dialogs.
master
Georges Basile Stavracas Neto 2021-01-28 19:18:33 -03:00 committed by Jim
parent c12ccd4e15
commit 58497e59d9
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
UI/qt-wrappers.cpp
View File

@ -351,16 +351,9 @@ void setThemeID(QWidget *widget, const QString &themeID)
QString SelectDirectory(QWidget *parent, QString title, QString path)
{
#if defined(BROWSER_AVAILABLE) && defined(__linux__)
QString dir = QFileDialog::getExistingDirectory(
parent, title, path,
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks |
QFileDialog::DontUseNativeDialog);
#else
QString dir = QFileDialog::getExistingDirectory(
parent, title, path,
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
#endif
return dir;
}
@ -368,14 +361,8 @@ QString SelectDirectory(QWidget *parent, QString title, QString path)
QString SaveFile(QWidget *parent, QString title, QString path,
QString extensions)
{
#if defined(BROWSER_AVAILABLE) && defined(__linux__)
QString file = QFileDialog::getSaveFileName(
parent, title, path, extensions, nullptr,
QFileDialog::DontUseNativeDialog);
#else
QString file =
QFileDialog::getSaveFileName(parent, title, path, extensions);
#endif
return file;
}
@ -383,14 +370,8 @@ QString SaveFile(QWidget *parent, QString title, QString path,
QString OpenFile(QWidget *parent, QString title, QString path,
QString extensions)
{
#if defined(BROWSER_AVAILABLE) && defined(__linux__)
QString file = QFileDialog::getOpenFileName(
parent, title, path, extensions, nullptr,
QFileDialog::DontUseNativeDialog);
#else
QString file =
QFileDialog::getOpenFileName(parent, title, path, extensions);
#endif
return file;
}
@ -398,14 +379,8 @@ QString OpenFile(QWidget *parent, QString title, QString path,
QStringList OpenFiles(QWidget *parent, QString title, QString path,
QString extensions)
{
#if defined(BROWSER_AVAILABLE) && defined(__linux__)
QStringList files = QFileDialog::getOpenFileNames(
parent, title, path, extensions, nullptr,
QFileDialog::DontUseNativeDialog);
#else
QStringList files =
QFileDialog::getOpenFileNames(parent, title, path, extensions);
#endif
return files;
}