kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Remove gtk file dialog option (#189)

Browse source 
Since gtk file dialog implementation was removed from tdesktop
This commit is contained in:
ilya-fedin 2021-07-20 01:04:07 +00:00 • committed by GitHub
parent 7f295113e0
commit f541e46147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Telegram/SourceFiles/kotato/json_settings.cpp
View file

@ -650,10 +650,13 @@ bool Manager::readCustomFile() {
}); });
ReadIntOption(settings, "file_dialog_type", [&](auto v) { ReadIntOption(settings, "file_dialog_type", [&](auto v) {
const auto typedValue = Platform::FileDialog::ImplementationType(v); using Platform::FileDialog::ImplementationType;
if (typedValue >= Platform::FileDialog::ImplementationType::Default if (v >= int(ImplementationType::Default)
&& typedValue < Platform::FileDialog::ImplementationType::Count) { && v < int(ImplementationType::Count)) {
SetFileDialogType(typedValue); SetFileDialogType(ImplementationType(v));
} else if (v >= int(ImplementationType::Count)) {
SetFileDialogType(ImplementationType(
int(ImplementationType::Count) - 1));
} }
}); });

9
Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
View file

@ -94,7 +94,6 @@ namespace FileDialog {
QString ImplementationTypeLabel(ImplementationType value) { QString ImplementationTypeLabel(ImplementationType value) {
switch (value) { switch (value) {
case ImplementationType::XDP: return qsl("XDG Desktop Portal"); case ImplementationType::XDP: return qsl("XDG Desktop Portal");
case ImplementationType::GTK: return qsl("GTK");
case ImplementationType::Qt: return qsl("Qt"); case ImplementationType::Qt: return qsl("Qt");
} }
Unexpected("Value in Platform::FileDialog::ImplementationTypeLabel."); Unexpected("Value in Platform::FileDialog::ImplementationTypeLabel.");
@ -105,14 +104,6 @@ QString ImplementationTypeDescription(ImplementationType value) {
#ifdef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifdef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
case ImplementationType::XDP: return tr::ktg_file_dialog_disabled_on_build(tr::now); case ImplementationType::XDP: return tr::ktg_file_dialog_disabled_on_build(tr::now);
#endif // DESKTOP_APP_DISABLE_DBUS_INTEGRATION #endif // DESKTOP_APP_DISABLE_DBUS_INTEGRATION
#ifdef DESKTOP_APP_DISABLE_GTK_INTEGRATION
case ImplementationType::GTK: return tr::ktg_file_dialog_disabled_on_build(tr::now);
#else // DESKTOP_APP_DISABLE_GTK_INTEGRATION
case ImplementationType::GTK:
return GtkIntegration::Instance()
? QString()
: tr::ktg_file_dialog_disabled_by_option(tr::now);
#endif // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
} }
return QString(); return QString();
} }

1
Telegram/SourceFiles/platform/linux/file_utilities_linux.h
View file

@ -30,7 +30,6 @@ namespace FileDialog {
enum class ImplementationType { enum class ImplementationType {
Default, Default,
XDP, XDP,
GTK,
Qt, Qt,
Count, Count,
}; };