Revert "Avoid removing portal platformtheme plugin in snap"
This reverts commit 12db51fe75
.
This commit is contained in:
parent
832cc6ac69
commit
85f013ebdb
|
@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
|
|
||||||
#include "platform/linux/linux_gtk_integration.h"
|
#include "platform/linux/linux_gtk_integration.h"
|
||||||
#include "platform/linux/specific_linux.h"
|
#include "platform/linux/specific_linux.h"
|
||||||
#include "storage/localstorage.h"
|
|
||||||
|
|
||||||
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
||||||
#include "platform/linux/linux_xdp_file_dialog.h"
|
#include "platform/linux/linux_xdp_file_dialog.h"
|
||||||
|
@ -18,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
|
|
||||||
#include <QtCore/QProcess>
|
#include <QtCore/QProcess>
|
||||||
#include <QtGui/QDesktopServices>
|
#include <QtGui/QDesktopServices>
|
||||||
#include <QtWidgets/QFileDialog>
|
|
||||||
|
|
||||||
#include <glibmm.h>
|
#include <glibmm.h>
|
||||||
#include <giomm.h>
|
#include <giomm.h>
|
||||||
|
@ -91,73 +89,6 @@ void UnsafeLaunch(const QString &filepath) {
|
||||||
} // namespace File
|
} // namespace File
|
||||||
|
|
||||||
namespace FileDialog {
|
namespace FileDialog {
|
||||||
namespace {
|
|
||||||
|
|
||||||
using Type = ::FileDialog::internal::Type;
|
|
||||||
|
|
||||||
bool GetQt(
|
|
||||||
QPointer<QWidget> parent,
|
|
||||||
QStringList &files,
|
|
||||||
QByteArray &remoteContent,
|
|
||||||
const QString &caption,
|
|
||||||
const QString &filter,
|
|
||||||
Type type,
|
|
||||||
QString startFile) {
|
|
||||||
if (cDialogLastPath().isEmpty()) {
|
|
||||||
InitLastPath();
|
|
||||||
}
|
|
||||||
|
|
||||||
QFileDialog dialog(parent, caption, QString(), filter);
|
|
||||||
|
|
||||||
dialog.setOptions(QFileDialog::DontUseNativeDialog);
|
|
||||||
dialog.setModal(true);
|
|
||||||
if (type == Type::ReadFile || type == Type::ReadFiles) {
|
|
||||||
dialog.setFileMode((type == Type::ReadFiles)
|
|
||||||
? QFileDialog::ExistingFiles
|
|
||||||
: QFileDialog::ExistingFile);
|
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptOpen);
|
|
||||||
} else if (type == Type::ReadFolder) {
|
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptOpen);
|
|
||||||
dialog.setFileMode(QFileDialog::Directory);
|
|
||||||
dialog.setOption(QFileDialog::ShowDirsOnly);
|
|
||||||
} else {
|
|
||||||
dialog.setFileMode(QFileDialog::AnyFile);
|
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
|
||||||
}
|
|
||||||
if (startFile.isEmpty() || startFile.at(0) != '/') {
|
|
||||||
startFile = cDialogLastPath() + '/' + startFile;
|
|
||||||
}
|
|
||||||
dialog.setDirectory(QFileInfo(startFile).absoluteDir().absolutePath());
|
|
||||||
if (type == Type::WriteFile) {
|
|
||||||
dialog.selectFile(startFile);
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto res = dialog.exec();
|
|
||||||
|
|
||||||
if (type != Type::ReadFolder) {
|
|
||||||
// Save last used directory for all queries except directory choosing.
|
|
||||||
const auto path = dialog.directory().absolutePath();
|
|
||||||
if (!path.isEmpty() && path != cDialogLastPath()) {
|
|
||||||
cSetDialogLastPath(path);
|
|
||||||
Local::writeSettings();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (res == QDialog::Accepted) {
|
|
||||||
if (type == Type::ReadFiles) {
|
|
||||||
files = dialog.selectedFiles();
|
|
||||||
} else {
|
|
||||||
files = dialog.selectedFiles().mid(0, 1);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
files = QStringList();
|
|
||||||
remoteContent = QByteArray();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Get(
|
bool Get(
|
||||||
QPointer<QWidget> parent,
|
QPointer<QWidget> parent,
|
||||||
|
@ -200,18 +131,6 @@ bool Get(
|
||||||
return *result;
|
return *result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// avoid situation when portals don't work
|
|
||||||
// and Qt tries to use portals as well
|
|
||||||
if (InFlatpak() || InSnap()) {
|
|
||||||
return GetQt(
|
|
||||||
parent,
|
|
||||||
files,
|
|
||||||
remoteContent,
|
|
||||||
caption,
|
|
||||||
filter,
|
|
||||||
type,
|
|
||||||
startFile);
|
|
||||||
}
|
|
||||||
return ::FileDialog::internal::GetDefault(
|
return ::FileDialog::internal::GetDefault(
|
||||||
parent,
|
parent,
|
||||||
files,
|
files,
|
||||||
|
|
|
@ -420,6 +420,8 @@ parts:
|
||||||
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/bin
|
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/bin
|
||||||
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/mkspecs
|
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/mkspecs
|
||||||
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/examples
|
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/examples
|
||||||
|
# Allow tdesktop's custom try-portal-and-fallback logic to work
|
||||||
|
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins/platformthemes/libqxdgdesktopportal.so
|
||||||
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.a
|
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.a
|
||||||
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.la
|
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.la
|
||||||
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.prl
|
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.prl
|
||||||
|
|
Loading…
Reference in New Issue