From a53c40e03bb9f9d0a8869477a65a2697bc1b3ae7 Mon Sep 17 00:00:00 2001 From: ZavaruKitsu Date: Mon, 5 Jun 2023 17:23:17 +0300 Subject: [PATCH] feat: linux improvements Co-authored-by: Dr4iv3rNope --- .gitmodules | 2 +- Telegram/CMakeLists.txt | 8 ++++---- Telegram/Resources/qrc/telegram/telegram.qrc | 2 +- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 8 ++++---- Telegram/lib_ui | 2 +- cmake | 2 +- ...ram.desktop.desktop => org.ayugram.desktop.desktop} | 6 +++--- ...p.metainfo.xml => org.ayugram.desktop.metainfo.xml} | 10 +++++----- snap/snapcraft.yaml | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) rename lib/xdg/{org.telegram.desktop.desktop => org.ayugram.desktop.desktop} (82%) rename lib/xdg/{org.telegram.desktop.metainfo.xml => org.ayugram.desktop.metainfo.xml} (96%) diff --git a/.gitmodules b/.gitmodules index 2de5f5b1f..ef7404256 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,7 +27,7 @@ url = https://github.com/desktop-app/codegen.git [submodule "Telegram/lib_ui"] path = Telegram/lib_ui - url = https://github.com/desktop-app/lib_ui.git + url = https://github.com/AyuGram/lib_ui.git [submodule "Telegram/lib_lottie"] path = Telegram/lib_lottie url = https://github.com/desktop-app/lib_lottie.git diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 56b04f734..450f7aeb4 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1747,8 +1747,8 @@ endif() if (LINUX AND DESKTOP_APP_USE_PACKAGED) include(GNUInstallDirs) - configure_file("../lib/xdg/org.telegram.desktop.metainfo.xml" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" @ONLY) - generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml") + configure_file("../lib/xdg/org.ayugram.desktop.metainfo.xml" "${CMAKE_CURRENT_BINARY_DIR}/org.ayugram.desktop.metainfo.xml" @ONLY) + generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.ayugram.desktop.metainfo.xml") install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}") install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "telegram.png") install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "telegram.png") @@ -1757,6 +1757,6 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED) install(FILES "Resources/art/icon128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "telegram.png") install(FILES "Resources/art/icon256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "telegram.png") install(FILES "Resources/art/icon512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "telegram.png") - install(FILES "../lib/xdg/org.telegram.desktop.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") + install(FILES "../lib/xdg/org.ayugram.desktop.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.ayugram.desktop.metainfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") endif() diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc index 8eac62c66..88f161e8e 100644 --- a/Telegram/Resources/qrc/telegram/telegram.qrc +++ b/Telegram/Resources/qrc/telegram/telegram.qrc @@ -54,6 +54,6 @@ ../../default_shortcuts-custom.json - ../../../../lib/xdg/org.telegram.desktop.desktop + ../../../../lib/xdg/org.ayugram.desktop.desktop diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 817997802..e865ecec7 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -110,7 +110,7 @@ static void t_desktop_application_init(TDesktopApplication *application) { namespace Platform { namespace { -constexpr auto kDesktopFile = ":/misc/org.telegram.desktop.desktop"_cs; +constexpr auto kDesktopFile = ":/misc/org.ayugram.desktop.desktop"_cs; bool PortalAutostart(bool start, bool silent) { if (cExeName().isEmpty()) { @@ -485,7 +485,7 @@ bool GenerateDesktopFile( hashMd5Hex(exePath.constData(), exePath.size(), md5Hash); } - QFile::remove(u"%1org.telegram.desktop.%2.desktop"_q.arg( + QFile::remove(u"%1org.ayugram.desktop.%2.desktop"_q.arg( targetPath, md5Hash)); } @@ -686,11 +686,11 @@ void start() { md5Hash.data()); } - return u"org.telegram.desktop._%1.desktop"_q.arg( + return u"org.ayugram.desktop._%1.desktop"_q.arg( md5Hash.constData()); } - return u"org.telegram.desktop.desktop"_q; + return u"org.ayugram.desktop.desktop"_q; }()); LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName())); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 83cab52cd..435b884b8 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 83cab52cd6ba93e9292405b23358d8dde3f95567 +Subproject commit 435b884b8bc05457b2d9b46a84c05d44f10dace9 diff --git a/cmake b/cmake index a41fa6e14..1c07a71d6 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit a41fa6e14006204f3fea7993a775e14f8fdde9fc +Subproject commit 1c07a71d6fde4e71ca9f98d343d09d7503ef15d2 diff --git a/lib/xdg/org.telegram.desktop.desktop b/lib/xdg/org.ayugram.desktop.desktop similarity index 82% rename from lib/xdg/org.telegram.desktop.desktop rename to lib/xdg/org.ayugram.desktop.desktop index 663d7d67f..5d0f0cd7b 100644 --- a/lib/xdg/org.telegram.desktop.desktop +++ b/lib/xdg/org.ayugram.desktop.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Name=AyuGram Desktop Comment=Unofficial desktop version of Telegram messaging app -TryExec=telegram-desktop -Exec=telegram-desktop -- %u +TryExec=ayugram-desktop +Exec=DESKTOPINTEGRATION=1 ayugram-desktop -- %u Icon=telegram Terminal=false StartupWMClass=AyuGram @@ -16,6 +16,6 @@ X-GNOME-UsesNotifications=true X-GNOME-SingleWindow=true [Desktop Action quit] -Exec=telegram-desktop -quit +Exec=ayugram-desktop -quit Name=Quit Telegram Icon=application-exit diff --git a/lib/xdg/org.telegram.desktop.metainfo.xml b/lib/xdg/org.ayugram.desktop.metainfo.xml similarity index 96% rename from lib/xdg/org.telegram.desktop.metainfo.xml rename to lib/xdg/org.ayugram.desktop.metainfo.xml index d787eada9..531e5568d 100644 --- a/lib/xdg/org.telegram.desktop.metainfo.xml +++ b/lib/xdg/org.ayugram.desktop.metainfo.xml @@ -1,10 +1,10 @@ - org.telegram.desktop + org.ayugram.desktop CC0-1.0 GPL-3.0 - Telegram Desktop - Fast. Secure. Powerful. + AyuGram Desktop + Unofficial desktop version of Telegram messaging app

Pure instant messaging — simple, fast, secure, and synced across all your devices. One of the world's top 10 most downloaded apps with over 500 million active users.

FAST: Telegram is the fastest messaging app on the market, connecting people via a unique, distributed network of data centers around the globe.

@@ -83,8 +83,8 @@ none moderate - org.telegram.desktop.desktop + org.ayugram.desktop.desktop - telegram-desktop + ayugram-desktop diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 335911817..1e7ab390c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -19,7 +19,7 @@ apps: command-chain: - bin/desktop-launch common-id: org.telegram.desktop - desktop: usr/share/applications/org.telegram.desktop.desktop + desktop: usr/share/applications/org.ayugram.desktop.desktop autostart: telegram-desktop_telegram-desktop.desktop plugs: - alsa @@ -91,7 +91,7 @@ parts: plugin: cmake source: . source-type: git - parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml] + parse-info: [usr/share/metainfo/org.ayugram.desktop.metainfo.xml] build-environment: - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s