procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use custom gtk file dialog only on gtk-based DEs

This commit is contained in:
Ilya Fedin 2020-06-01 12:33:24 +04:00 committed by John Preston
parent 1fb1d57a27
commit 7f29f57c3d
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/linux/linux_libs.h" #include "platform/linux/linux_libs.h"
#include "platform/linux/linux_gdk_helper.h" #include "platform/linux/linux_gdk_helper.h"
#include "platform/linux/linux_desktop_environment.h"
#include "platform/linux/specific_linux.h" #include "platform/linux/specific_linux.h"
#include "core/application.h" #include "core/application.h"
#include "mainwindow.h" #include "mainwindow.h"
@ -124,10 +125,15 @@ using Type = ::FileDialog::internal::Type;
#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
bool NativeSupported(Type type = Type::ReadFile) { bool NativeSupported(Type type = Type::ReadFile) {
#ifndef TDESKTOP_FORCE_GTK_FILE_DIALOG // use gtk file dialog on gtk-based desktop environments
return false; // or if QT_QPA_PLATFORMTHEME=(gtk2|gtk3)
#endif // TDESKTOP_FORCE_GTK_FILE_DIALOG // or if portals is used and operation is not to open folder
return (!Platform::UseXDGDesktopPortal() || type == Type::ReadFolder) // (it isn't supported by portals yet)
return Platform::UseGtkFileDialog()
&& (Platform::DesktopEnvironment::IsGtkBased()
|| Platform::IsGtkIntegrationForced()
|| Platform::UseXDGDesktopPortal())
&& (!Platform::UseXDGDesktopPortal() || type == Type::ReadFolder)
&& Platform::internal::GdkHelperLoaded() && Platform::internal::GdkHelperLoaded()
&& (Libs::gtk_widget_hide_on_delete != nullptr) && (Libs::gtk_widget_hide_on_delete != nullptr)
&& (Libs::gtk_clipboard_store != nullptr) && (Libs::gtk_clipboard_store != nullptr)

10
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@ -277,12 +277,12 @@ bool IsGtkIntegrationForced() {
return false; return false;
} }
bool IsGtkFileDialogForced() { bool UseGtkFileDialog() {
#ifdef TDESKTOP_FORCE_GTK_FILE_DIALOG #ifdef TDESKTOP_USE_GTK_FILE_DIALOG
return true; return true;
#else // TDESKTOP_FORCE_GTK_FILE_DIALOG #else // TDESKTOP_USE_GTK_FILE_DIALOG
return false; return false;
#endif // !TDESKTOP_FORCE_GTK_FILE_DIALOG #endif // !TDESKTOP_USE_GTK_FILE_DIALOG
} }
bool IsQtPluginsBundled() { bool IsQtPluginsBundled() {
@ -668,7 +668,7 @@ void start() {
if(IsStaticBinary() if(IsStaticBinary()
|| InAppImage() || InAppImage()
|| InSnap() || InSnap()
|| IsGtkFileDialogForced() || UseGtkFileDialog()
|| IsQtPluginsBundled()) { || IsQtPluginsBundled()) {
LOG(("Checking for XDG Desktop Portal...")); LOG(("Checking for XDG Desktop Portal..."));
// this can give us a chance to use a proper file dialog for current session // this can give us a chance to use a proper file dialog for current session

2
Telegram/SourceFiles/platform/linux/specific_linux.h
View File

@ -25,7 +25,7 @@ bool InSnap();
bool InAppImage(); bool InAppImage();
bool IsStaticBinary(); bool IsStaticBinary();
bool IsGtkIntegrationForced(); bool IsGtkIntegrationForced();
bool IsGtkFileDialogForced(); bool UseGtkFileDialog();
bool IsQtPluginsBundled(); bool IsQtPluginsBundled();
bool IsXDGDesktopPortalPresent(); bool IsXDGDesktopPortalPresent();

10
Telegram/cmake/telegram_options.cmake
View File

@ -5,7 +5,7 @@
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
option(TDESKTOP_USE_FONTCONFIG_FALLBACK "Use custom fonts.conf (Linux only)." OFF) option(TDESKTOP_USE_FONTCONFIG_FALLBACK "Use custom fonts.conf (Linux only)." OFF)
option(TDESKTOP_FORCE_GTK_FILE_DIALOG "Force using GTK file dialog (Linux only)." OFF) option(TDESKTOP_USE_GTK_FILE_DIALOG "Use custom code for GTK file dialog (Linux only)." OFF)
option(TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME "Disable automatic 'tg://' URL scheme handler registration." ${DESKTOP_APP_USE_PACKAGED}) option(TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME "Disable automatic 'tg://' URL scheme handler registration." ${DESKTOP_APP_USE_PACKAGED})
option(TDESKTOP_DISABLE_NETWORK_PROXY "Disable all code for working through Socks5 or MTProxy." OFF) option(TDESKTOP_DISABLE_NETWORK_PROXY "Disable all code for working through Socks5 or MTProxy." OFF)
option(TDESKTOP_USE_PACKAGED_TGVOIP "Find libtgvoip using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED}) option(TDESKTOP_USE_PACKAGED_TGVOIP "Find libtgvoip using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
@ -43,10 +43,10 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "")
endif() endif()
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED)
set(TDESKTOP_FORCE_GTK_FILE_DIALOG ON) set(TDESKTOP_USE_GTK_FILE_DIALOG ON)
endif() endif()
if (NOT TDESKTOP_FORCE_GTK_FILE_DIALOG) if (NOT TDESKTOP_USE_GTK_FILE_DIALOG)
set(TDESKTOP_DISABLE_GTK_INTEGRATION ON) set(TDESKTOP_DISABLE_GTK_INTEGRATION ON)
endif() endif()
@ -68,8 +68,8 @@ if (TDESKTOP_USE_FONTCONFIG_FALLBACK)
target_compile_definitions(Telegram PRIVATE TDESKTOP_USE_FONTCONFIG_FALLBACK) target_compile_definitions(Telegram PRIVATE TDESKTOP_USE_FONTCONFIG_FALLBACK)
endif() endif()
if (TDESKTOP_FORCE_GTK_FILE_DIALOG) if (TDESKTOP_USE_GTK_FILE_DIALOG)
target_compile_definitions(Telegram PRIVATE TDESKTOP_FORCE_GTK_FILE_DIALOG) target_compile_definitions(Telegram PRIVATE TDESKTOP_USE_GTK_FILE_DIALOG)
endif() endif()
if (TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME) if (TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME)