void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace various QDesktopService::openUrl with File::OpenUrl for correct operation on Linux

Browse source 
This also reverts commit bb94507af1.
This commit is contained in:
Ilya Fedin 2022-12-22 18:03:47 +04:00 • committed by John Preston
parent 0f3ec7893d
commit 3991be752c
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Telegram/SourceFiles/boxes/about_box.cpp
View file

@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h"
#include "base/platform/base_platform_info.h" #include "base/platform/base_platform_info.h"
#include "core/file_utilities.h"
#include "core/click_handler_types.h" #include "core/click_handler_types.h"
#include "core/update_checker.h" #include "core/update_checker.h"
#include "core/application.h" #include "core/application.h"
@ -116,7 +117,7 @@ void AboutBox::showVersionHistory() {
"version of Telegram Desktop was copied to the clipboard."), "version of Telegram Desktop was copied to the clipboard."),
Ui::LayerOption::CloseOther); Ui::LayerOption::CloseOther);
} else { } else {
UrlClickHandler::Open(Core::App().changelogLink()); File::OpenUrl(Core::App().changelogLink());
} }
} }

5
Telegram/SourceFiles/boxes/about_sponsored_box.cpp
View file

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "boxes/about_sponsored_box.h" #include "boxes/about_sponsored_box.h"
#include "core/file_utilities.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "ui/layers/generic_box.h" #include "ui/layers/generic_box.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
@ -14,8 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_layers.h" #include "styles/style_layers.h"
#include <QtGui/QDesktopServices>
namespace Ui { namespace Ui {
namespace { namespace {
@ -50,7 +49,7 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
(rowSize.height() - buttonSize.height()) / 2); (rowSize.height() - buttonSize.height()) / 2);
}, row->lifetime()); }, row->lifetime());
button->addClickHandler([=] { button->addClickHandler([=] {
QDesktopServices::openUrl({ kUrl.utf8() }); File::OpenUrl(kUrl.utf8());
}); });
}; };

4
Telegram/SourceFiles/history/history_location_manager.cpp
View file

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_location_manager.h" #include "history/history_location_manager.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "core/click_handler_types.h" #include "core/file_utilities.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "ui/image/image.h" #include "ui/image/image.h"
#include "data/data_file_origin.h" #include "data/data_file_origin.h"
@ -24,7 +24,7 @@ QString LocationClickHandler::copyToClipboardContextItemText() const {
void LocationClickHandler::onClick(ClickContext context) const { void LocationClickHandler::onClick(ClickContext context) const {
if (!psLaunchMaps(_point)) { if (!psLaunchMaps(_point)) {
UrlClickHandler::Open(_text); File::OpenUrl(_text);
} }
} }

5
Telegram/SourceFiles/settings/settings_main.cpp
View file

@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/username_box.h" #include "boxes/username_box.h"
#include "ui/boxes/confirm_box.h" #include "ui/boxes/confirm_box.h"
#include "boxes/about_box.h" #include "boxes/about_box.h"
#include "ui/basic_click_handlers.h"
#include "ui/wrap/vertical_layout.h" #include "ui/wrap/vertical_layout.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "ui/wrap/padding_wrap.h" #include "ui/wrap/padding_wrap.h"
@ -53,7 +54,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "info/profile/info_profile_values.h" #include "info/profile/info_profile_values.h"
#include "window/window_controller.h" #include "window/window_controller.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "core/click_handler_types.h" #include "core/file_utilities.h"
#include "core/application.h" #include "core/application.h"
#include "base/call_delayed.h" #include "base/call_delayed.h"
#include "base/platform/base_platform_info.h" #include "base/platform/base_platform_info.h"
@ -518,7 +519,7 @@ void SetupInterfaceScale(
} }
void OpenFaq() { void OpenFaq() {
UrlClickHandler::Open(telegramFaqLink()); File::OpenUrl(telegramFaqLink());
} }
void SetupFaq(not_null<Ui::VerticalLayout*> container, bool icon) { void SetupFaq(not_null<Ui::VerticalLayout*> container, bool icon) {

3
Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
View file

@ -32,7 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QJsonDocument> #include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject> #include <QtCore/QJsonObject>
#include <QtCore/QJsonArray> #include <QtCore/QJsonArray>
#include <QtGui/QDesktopServices>
namespace Ui::BotWebView { namespace Ui::BotWebView {
namespace { namespace {
@ -743,7 +742,7 @@ void Panel::openExternalLink(const QJsonObject &args) {
if (_mainButtonLastClick if (_mainButtonLastClick
&& _mainButtonLastClick + kProcessClickTimeout >= now) { && _mainButtonLastClick + kProcessClickTimeout >= now) {
_mainButtonLastClick = 0; _mainButtonLastClick = 0;
QDesktopServices::openUrl(url); File::OpenUrl(url);
} else { } else {
const auto string = EncodeForJs(url); const auto string = EncodeForJs(url);
_webview->window.eval(("window.open(\"" + string + "\");").toUtf8()); _webview->window.eval(("window.open(\"" + string + "\");").toUtf8());