RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't use WebView embed in Windows before 8.1.

This commit is contained in:
John Preston 2022-04-20 11:42:03 +04:00
parent 2529bd3f44
commit df533f2efe
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/Resources/langs/lang.strings
View File

@ -2148,6 +2148,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkit2gtk-5.0/webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
"lng_payments_webview_switch_mutter" = "Qt's window embedding doesn't work well with Mutter window manager. Please switch to another window manager or desktop environment.";
"lng_payments_webview_switch_wayland" = "There is no way to embed WebView window on Wayland. Please switch to X11.";
"lng_payments_webview_update_windows" = "Please update your system to Windows 8.1 or later.";
"lng_payments_sure_close" = "Are you sure you want to close this payment form? The changes you made will be lost.";
"lng_payments_receipt_label" = "Receipt";
"lng_payments_receipt_label_test" = "Test receipt";

3
Telegram/SourceFiles/payments/ui/payments_panel.cpp
View File

@ -776,6 +776,9 @@ void Panel::showWebviewError(
case Error::Wayland:
rich.append(tr::lng_payments_webview_switch_wayland(tr::now));
break;
case Error::OldWindows:
rich.append(tr::lng_payments_webview_update_windows(tr::now));
break;
default:
rich.append(QString::fromStdString(information.details));
break;

2
Telegram/lib_webview

@ -1 +1 @@
Subproject commit cc510d306b51ea83360fd0c0a41ec87fbf698535
Subproject commit 0e9c8d86cfeec886ec75196adebfd003bde194ab