mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-10-07 13:46:05 +00:00
Code Issues Releases Wiki Activity

Updated TDesktop sources to 2.8.8

Browse Source
This commit is contained in:
RadRussianRus
2021-07-16 03:03:15 +03:00
parent 64e07f7c12 b69cac3ed6
commit f28b9ccf0c
473 changed files with 13707 additions and 7367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
View File

@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/linux/linux_gtk_integration.h"
#include "platform/linux/specific_linux.h"
#include "storage/localstorage.h"
#include "lang/lang_keys.h"
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
@@ -19,7 +18,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QProcess>
#include <QtGui/QDesktopServices>
#include <QtWidgets/QFileDialog>
#include <glibmm.h>
#include <giomm.h>
@@ -92,73 +90,6 @@ void UnsafeLaunch(const QString &filepath) {
} // namespace File
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;
}
}
QString ImplementationTypeLabel(ImplementationType value) {
switch (value) {
@@ -213,32 +144,6 @@ bool Get(
}
}
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
if (const auto integration = GtkIntegration::Instance()) {
const auto result = integration->getFileDialog(
parent,
files,
remoteContent,
caption,
filter,
type,
startFile);
if (result.has_value()) {
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(
parent,
files,