소스 검색

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.
Georges Basile Stavracas Neto 4 년 전
부모
커밋
58497e59d9
1개의 변경된 파일0개의 추가작업 그리고 25개의 파일을 삭제
  1. 0 25
      UI/qt-wrappers.cpp

+ 0 - 25
UI/qt-wrappers.cpp

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