New upstream version 26.0.0+dfsg1

This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions

View file

@ -25,6 +25,7 @@
#include <QMessageBox>
#include <QDataStream>
#include <QKeyEvent>
#include <QFileDialog>
#if !defined(_WIN32) && !defined(__APPLE__)
#include <QX11Info>
@ -168,6 +169,7 @@ QDataStream &operator>>(QDataStream &in, OBSScene &scene)
obs_source_t *source = obs_get_source_by_name(QT_TO_UTF8(sceneName));
scene = obs_scene_from_source(source);
obs_source_release(source);
return in;
}
@ -264,7 +266,7 @@ void ExecuteFuncSafeBlockMsgBox(std::function<void()> func,
dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowCloseButtonHint);
dlg.setWindowTitle(title);
dlg.setText(text);
dlg.setStandardButtons(0);
dlg.setStandardButtons(QMessageBox::StandardButtons());
auto wait = [&]() {
func();
@ -335,3 +337,64 @@ void setThemeID(QWidget *widget, const QString &themeID)
widget->setStyleSheet(qss);
}
}
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;
}
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;
}
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;
}
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;
}