diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ec62b158..4beb508c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,8 @@ endif() project(Telegram LANGUAGES ${project_langs} VERSION ${desktop_app_version_cmake} - DESCRIPTION "Official Telegram Desktop messenger" - HOMEPAGE_URL "https://desktop.telegram.org" + DESCRIPTION "AyuGram Desktop" + HOMEPAGE_URL "https://ayugram.one" ) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 81651cec4..57ee25a5e 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -104,6 +104,8 @@ PRIVATE ayu/ayu_constants.h ayu/utils/telegram_helpers.cpp ayu/utils/telegram_helpers.h + ayu/utils/windows_utils.cpp + ayu/utils/windows_utils.h ayu/ui/ayu_lottie.cpp ayu/ui/ayu_lottie.h ayu/ui/ayu_assets.cpp diff --git a/Telegram/Resources/art/ayu/alt/logo256_no_margin.ico b/Telegram/Resources/art/ayu/alt/logo256_no_margin.ico new file mode 100644 index 000000000..0c36fcfee Binary files /dev/null and b/Telegram/Resources/art/ayu/alt/logo256_no_margin.ico differ diff --git a/Telegram/Resources/art/ayu/default/logo256.png b/Telegram/Resources/art/ayu/default/logo256.png new file mode 100644 index 000000000..82a26d502 Binary files /dev/null and b/Telegram/Resources/art/ayu/default/logo256.png differ diff --git a/Telegram/Resources/art/ayu/default/logo256_no_margin.ico b/Telegram/Resources/art/ayu/default/logo256_no_margin.ico new file mode 100644 index 000000000..30a610a9b Binary files /dev/null and b/Telegram/Resources/art/ayu/default/logo256_no_margin.ico differ diff --git a/Telegram/Resources/art/ayu/default/logo256_no_margin.png b/Telegram/Resources/art/ayu/default/logo256_no_margin.png new file mode 100644 index 000000000..d75f58b81 Binary files /dev/null and b/Telegram/Resources/art/ayu/default/logo256_no_margin.png differ diff --git a/Telegram/Resources/art/ayu/nothing/logo256_no_margin.ico b/Telegram/Resources/art/ayu/nothing/logo256_no_margin.ico new file mode 100644 index 000000000..ce4bc0cbf Binary files /dev/null and b/Telegram/Resources/art/ayu/nothing/logo256_no_margin.ico differ diff --git a/Telegram/Resources/art/icon128.png b/Telegram/Resources/art/icon128.png index 472a26c14..2da9ed972 100644 Binary files a/Telegram/Resources/art/icon128.png and b/Telegram/Resources/art/icon128.png differ diff --git a/Telegram/Resources/art/icon128@2x.png b/Telegram/Resources/art/icon128@2x.png index 82a26d502..d75f58b81 100644 Binary files a/Telegram/Resources/art/icon128@2x.png and b/Telegram/Resources/art/icon128@2x.png differ diff --git a/Telegram/Resources/art/icon16.png b/Telegram/Resources/art/icon16.png index 3bdd748df..2e99d9305 100644 Binary files a/Telegram/Resources/art/icon16.png and b/Telegram/Resources/art/icon16.png differ diff --git a/Telegram/Resources/art/icon16@2x.png b/Telegram/Resources/art/icon16@2x.png index 443ba1d3d..e4afdca78 100644 Binary files a/Telegram/Resources/art/icon16@2x.png and b/Telegram/Resources/art/icon16@2x.png differ diff --git a/Telegram/Resources/art/icon256.ico b/Telegram/Resources/art/icon256.ico index 07187bdbc..30a610a9b 100644 Binary files a/Telegram/Resources/art/icon256.ico and b/Telegram/Resources/art/icon256.ico differ diff --git a/Telegram/Resources/art/icon256.png b/Telegram/Resources/art/icon256.png index 82a26d502..d75f58b81 100644 Binary files a/Telegram/Resources/art/icon256.png and b/Telegram/Resources/art/icon256.png differ diff --git a/Telegram/Resources/art/icon256@2x.png b/Telegram/Resources/art/icon256@2x.png index d54f24b36..6a3dfa641 100644 Binary files a/Telegram/Resources/art/icon256@2x.png and b/Telegram/Resources/art/icon256@2x.png differ diff --git a/Telegram/Resources/art/icon32.png b/Telegram/Resources/art/icon32.png index 443ba1d3d..e4afdca78 100644 Binary files a/Telegram/Resources/art/icon32.png and b/Telegram/Resources/art/icon32.png differ diff --git a/Telegram/Resources/art/icon32@2x.png b/Telegram/Resources/art/icon32@2x.png index 82f260e42..b57b6e3bb 100644 Binary files a/Telegram/Resources/art/icon32@2x.png and b/Telegram/Resources/art/icon32@2x.png differ diff --git a/Telegram/Resources/art/icon48.png b/Telegram/Resources/art/icon48.png index b09a9fcdc..180ddb23b 100644 Binary files a/Telegram/Resources/art/icon48.png and b/Telegram/Resources/art/icon48.png differ diff --git a/Telegram/Resources/art/icon48@2x.png b/Telegram/Resources/art/icon48@2x.png index cbdd581e4..1cbe69319 100644 Binary files a/Telegram/Resources/art/icon48@2x.png and b/Telegram/Resources/art/icon48@2x.png differ diff --git a/Telegram/Resources/art/icon512.png b/Telegram/Resources/art/icon512.png index d54f24b36..6a3dfa641 100644 Binary files a/Telegram/Resources/art/icon512.png and b/Telegram/Resources/art/icon512.png differ diff --git a/Telegram/Resources/art/icon512@2x.png b/Telegram/Resources/art/icon512@2x.png index 2ddf8709b..2cfa90401 100644 Binary files a/Telegram/Resources/art/icon512@2x.png and b/Telegram/Resources/art/icon512@2x.png differ diff --git a/Telegram/Resources/art/icon64.png b/Telegram/Resources/art/icon64.png index 82f260e42..b57b6e3bb 100644 Binary files a/Telegram/Resources/art/icon64.png and b/Telegram/Resources/art/icon64.png differ diff --git a/Telegram/Resources/art/icon64@2x.png b/Telegram/Resources/art/icon64@2x.png index 472a26c14..2da9ed972 100644 Binary files a/Telegram/Resources/art/icon64@2x.png and b/Telegram/Resources/art/icon64@2x.png differ diff --git a/Telegram/Resources/art/icon_round512@2x.png b/Telegram/Resources/art/icon_round512@2x.png index 2ddf8709b..2cfa90401 100644 Binary files a/Telegram/Resources/art/icon_round512@2x.png and b/Telegram/Resources/art/icon_round512@2x.png differ diff --git a/Telegram/Resources/art/logo_256.png b/Telegram/Resources/art/logo_256.png index 82a26d502..d75f58b81 100644 Binary files a/Telegram/Resources/art/logo_256.png and b/Telegram/Resources/art/logo_256.png differ diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 08845090d..5592445c5 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -4063,8 +4063,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_DontSendOnlinePackets" = "Don't send online"; "ayu_DontSendUploadProgress" = "Don't send typing"; "ayu_SendOfflinePacketAfterOnline" = "Immediate offline after online"; -"ayu_MarkReadAfterSend" = "Send read status after reply"; +"ayu_MarkReadAfterAction" = "Mark read after actions"; +"ayu_MarkReadAfterSend" = "Send"; +"ayu_MarkReadAfterReaction" = "Reaction"; +"ayu_MarkReadAfterPoll" = "Poll"; "ayu_UseScheduledMessages" = "Schedule messages"; +"ayu_SuggestGhostModeBeforeViewingStory" = "Alert before opening story"; "ayu_SpyEssentialsHeader" = "Spy essentials"; "ayu_SaveDeletedMessages" = "Save deleted messages"; "ayu_SaveMessagesHistory" = "Save edits history"; @@ -4102,6 +4106,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_RegexFilters" = "Message Filters"; "ayu_RegexFiltersAmount" = "filters"; "ayu_RegexFiltersHeader" = "Filters"; +"ayu_FiltersHideFromBlocked" = "Hide from blocked users"; "ayu_RegexFiltersEnableInChats" = "Enable in chats"; "ayu_RegexFiltersCaseInsensitive" = "Case insensitive expressions"; "ayu_RegexFiltersAdd" = "Add filter"; @@ -4156,11 +4161,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_DisableStreamerModeTray" = "Disable Streamer Mode"; "ayu_EditsHistoryTitle" = "Edits history"; "ayu_EditsHistoryMenuText" = "History"; +"ayu_ClearDeletedMenuText" = "Clear Deleted"; "ayu_ReadUntilMenuText" = "Read Message"; "ayu_DeleteKeepLocally" = "Keep locally"; "ayu_BoxActionReset" = "Reset"; "ayu_ReadConfirmationBoxQuestion" = "Do you want to read all messages?"; "ayu_ReadConfirmationBoxActionText" = "Read"; +"ayu_ClearDeletedMessagesTitle" = "Clear deleted messages"; +"ayu_ClearDeletedMessagesText" = "Are you sure you want to clear all deleted messages in this chat?"; +"ayu_ClearDeletedMessagesActionText" = "Clear"; +"ayu_SuggestGhostModeTitle" = "Ghost Mode"; +"ayu_SuggestGhostModeStoryText" = "Do you want to enable Ghost Mode before viewing the story?"; +"ayu_SuggestGhostModeStoryActionText" = "Enable"; +"ayu_HideNextViewsDescriptionAyu" = "Hide my views forever, until Ghost Mode disabled."; +"ayu_EnableGhostModeStories" = "Enable Ghost Mode"; +"ayu_GhostModeIsActive" = "Ghost Mode Is Active"; "ayu_AyuForwardStatusForwarding" = "Forwarding messages…"; "ayu_AyuForwardStatusLoadingMedia" = "Loading media…"; "ayu_AyuForwardForwardingDescription" = "Please keep this window open while AyuGram is forwarding your messages."; @@ -4175,5 +4190,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_ContextCopyCallbackData" = "Copy Callback Data"; "ayu_LocalPremiumNotice" = "You're using **local** Telegram Premium.\nIt **won't** give you any benefits, except translator.\n**Enjoy the star near your nickname!**"; "ayu_SettingsWatermark" = "AyuGram developed and maintained by Radolyn Labs."; +"ayu_IntroAbout" = "Welcome to the AyuGram Desktop.\nIt's cool and looks less ugly."; +"ayu_AboutText1" = "Just a cool Telegram client based on {api_link}."; "ayu_UpdateAyuGram" = "Update AyuGram"; "ayu_UtilityRestartRequired" = "App will close in 5 seconds."; diff --git a/Telegram/Resources/qrc/ayu/ayu.qrc b/Telegram/Resources/qrc/ayu/ayu.qrc index 13808cbc7..dbabcdb5b 100644 --- a/Telegram/Resources/qrc/ayu/ayu.qrc +++ b/Telegram/Resources/qrc/ayu/ayu.qrc @@ -1,8 +1,13 @@ + ../../art/ayu/default/logo256.png + ../../art/ayu/default/logo256_no_margin.png + ../../art/ayu/default/logo256_no_margin.ico ../../art/ayu/alt/logo256.png ../../art/ayu/alt/logo256_no_margin.png + ../../art/ayu/alt/logo256_no_margin.ico ../../art/ayu/nothing/logo256.png ../../art/ayu/nothing/logo256_no_margin.png + ../../art/ayu/nothing/logo256_no_margin.ico diff --git a/Telegram/SourceFiles/ayu/ui/ayu_assets.cpp b/Telegram/SourceFiles/ayu/ui/ayu_assets.cpp index 5b5c6fc6b..b0e0d89dc 100644 --- a/Telegram/SourceFiles/ayu/ui/ayu_assets.cpp +++ b/Telegram/SourceFiles/ayu/ui/ayu_assets.cpp @@ -8,9 +8,25 @@ #include "ayu_assets.h" #include "ayu/ayu_settings.h" -QString LAST_LOADED_NAME; -QImage LAST_LOADED; -QImage LAST_LOADED_NO_MARGIN; +static QString LAST_LOADED_NAME; +static QImage LAST_LOADED; +static QImage LAST_LOADED_NO_MARGIN; + +void loadAppIco() { + auto settings = &AyuSettings::getInstance(); + + QString appDataPath = QDir::fromNativeSeparators(qgetenv("APPDATA")); + QString tempIconPath = appDataPath + "/AyuGram.ico"; + + // workaround for read-only file + auto f = QFile(tempIconPath); + if (f.exists()) { + f.setPermissions(QFile::WriteOther); + f.remove(); + } + f.close(); + QFile::copy(qsl(":/gui/art/ayu/%1/logo256_no_margin.ico").arg(settings->appIcon), tempIconPath); +} void loadIcons() { @@ -18,59 +34,27 @@ void loadIcons() if (LAST_LOADED_NAME != settings->appIcon) { LAST_LOADED_NAME = settings->appIcon; - if (settings->appIcon == AyuSettings::DEFAULT_ICON) - { - LAST_LOADED = logo(); - LAST_LOADED_NO_MARGIN = logoNoMargin(); - } - else if (settings->appIcon == AyuSettings::ALT_ICON) - { - LAST_LOADED = logoAlt(); - LAST_LOADED_NO_MARGIN = logoAltNoMargin(); - } - else if (settings->appIcon == AyuSettings::NOTHING_ICON) - { - LAST_LOADED = logoNothing(); - LAST_LOADED_NO_MARGIN = logoNothingNoMargin(); - } - else - { - LAST_LOADED = logo(); - LAST_LOADED_NO_MARGIN = logoNoMargin(); - } + + LAST_LOADED = QImage(qsl(":/gui/art/ayu/%1/logo256.png").arg(settings->appIcon)); + LAST_LOADED_NO_MARGIN = QImage(qsl(":/gui/art/ayu/%1/logo256_no_margin.png").arg(settings->appIcon)); } } -QImage logo() +QImage logoPreview() { - return QImage(qsl(":/gui/art/logo_256.png")); + return QImage(qsl(":/gui/art/ayu/default/logo256.png")); } -QImage logoNoMargin() -{ - return QImage(qsl(":/gui/art/logo_256_no_margin.png")); -} - -QImage logoAlt() +QImage logoAltPreview() { return QImage(qsl(":/gui/art/ayu/alt/logo256.png")); } -QImage logoAltNoMargin() -{ - return QImage(qsl(":/gui/art/ayu/alt/logo256_no_margin.png")); -} - -QImage logoNothing() +QImage logoNothingPreview() { return QImage(qsl(":/gui/art/ayu/nothing/logo256.png")); } -QImage logoNothingNoMargin() -{ - return QImage(qsl(":/gui/art/ayu/nothing/logo256_no_margin.png")); -} - QString currentAppLogoName() { return LAST_LOADED_NAME; diff --git a/Telegram/SourceFiles/ayu/ui/ayu_assets.h b/Telegram/SourceFiles/ayu/ui/ayu_assets.h index 9f9ea18c5..f4840a05b 100644 --- a/Telegram/SourceFiles/ayu/ui/ayu_assets.h +++ b/Telegram/SourceFiles/ayu/ui/ayu_assets.h @@ -7,14 +7,11 @@ #pragma once -QImage logo(); -QImage logoNoMargin(); +void loadAppIco(); -QImage logoAlt(); -QImage logoAltNoMargin(); - -QImage logoNothing(); -QImage logoNothingNoMargin(); +QImage logoPreview(); +QImage logoAltPreview(); +QImage logoNothingPreview(); QString currentAppLogoName(); QImage currentAppLogo(); diff --git a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp b/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp index 8a2d52b6f..9d51897cd 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp @@ -9,6 +9,7 @@ #include "ayu/ayu_settings.h" #include "core/application.h" #include "styles/style_layers.h" +#include "tray.h" #include "ayu/ui/ayu_assets.h" #include "main/main_domain.h" @@ -16,6 +17,10 @@ #include "ui/painter.h" #include "window/main_window.h" +#ifdef Q_OS_WIN +#include "ayu/utils/windows_utils.h" +#endif + void drawIcon(QPainter& p, const QImage& icon, int offset, bool selected) { if (selected) @@ -40,9 +45,9 @@ void IconPicker::paintEvent(QPaintEvent* e) Painter p(this); PainterHighQualityEnabler hq(p); - auto icon1 = logo().scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation); - auto icon2 = logoAlt().scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation); - auto icon3 = logoNothing().scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation); + auto icon1 = logoPreview().scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation); + auto icon2 = logoAltPreview().scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation); + auto icon3 = logoNothingPreview().scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation); // todo: center drawIcon(p, icon1, 0, currentAppLogoName() == AyuSettings::DEFAULT_ICON); @@ -76,8 +81,14 @@ void IconPicker::mousePressEvent(QMouseEvent* e) { AyuSettings::save(); +#ifdef Q_OS_WIN + loadAppIco(); + reloadAppIconFromTaskBar(); +#endif + Window::OverrideApplicationIcon(currentAppLogo()); Core::App().refreshApplicationIcon(); + Core::App().tray().updateIconCounters(); Core::App().domain().notifyUnreadBadgeChanged(); repaint(); diff --git a/Telegram/SourceFiles/ayu/utils/windows_utils.cpp b/Telegram/SourceFiles/ayu/utils/windows_utils.cpp new file mode 100644 index 000000000..f8e59ee53 --- /dev/null +++ b/Telegram/SourceFiles/ayu/utils/windows_utils.cpp @@ -0,0 +1,46 @@ +// This is the source code of AyuGram for Desktop. +// +// We do not and cannot prevent the use of our code, +// but be respectful and credit the original author. +// +// Copyright @Radolyn, 2023 +#include "windows_utils.h" + +#include + +void reloadAppIconFromTaskBar() { + QString appdata = QDir::fromNativeSeparators(qgetenv("APPDATA")); + QString ayugramIconPath = appdata + "/AyuGram.ico"; + + QString shortcut = appdata + "/Microsoft/Internet Explorer/Quick Launch/User Pinned/TaskBar/AyuGram Desktop.lnk"; + if (!QFile::exists(shortcut)) { + shortcut = appdata + "/Microsoft/Internet Explorer/Quick Launch/User Pinned/TaskBar/AyuGram.lnk"; + } + + if (QFile::exists(shortcut)) { + IShellLink *pShellLink = NULL; + IPersistFile *pPersistFile = NULL; + + HRESULT hr = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, + (void **) &pShellLink); + if (SUCCEEDED(hr)) { + hr = pShellLink->QueryInterface(IID_IPersistFile, (void **) &pPersistFile); + if (SUCCEEDED(hr)) { + WCHAR wszShortcutPath[MAX_PATH]; + shortcut.toWCharArray(wszShortcutPath); + wszShortcutPath[shortcut.length()] = '\0'; + + if (SUCCEEDED(pPersistFile->Load(wszShortcutPath, STGM_READWRITE))) { + pShellLink->SetIconLocation(ayugramIconPath.toStdWString().c_str(), 0); + pPersistFile->Save(wszShortcutPath, TRUE); + } + + pPersistFile->Release(); + } + + pShellLink->Release(); + } + + SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL); + } +} diff --git a/Telegram/SourceFiles/ayu/utils/windows_utils.h b/Telegram/SourceFiles/ayu/utils/windows_utils.h new file mode 100644 index 000000000..0d4a823c7 --- /dev/null +++ b/Telegram/SourceFiles/ayu/utils/windows_utils.h @@ -0,0 +1,9 @@ +// This is the source code of AyuGram for Desktop. +// +// We do not and cannot prevent the use of our code, +// but be respectful and credit the original author. +// +// Copyright @Radolyn, 2023 +#pragma once + +void reloadAppIconFromTaskBar(); diff --git a/Telegram/SourceFiles/intro/intro_start.cpp b/Telegram/SourceFiles/intro/intro_start.cpp index ae57d655a..a3184d85f 100644 --- a/Telegram/SourceFiles/intro/intro_start.cpp +++ b/Telegram/SourceFiles/intro/intro_start.cpp @@ -25,7 +25,7 @@ StartWidget::StartWidget( : Step(parent, account, data, true) { setMouseTracking(true); setTitleText(rpl::single(u"AyuGram Desktop"_q)); - setDescriptionText(tr::lng_intro_about()); + setDescriptionText(tr::ayu_IntroAbout()); show(); } diff --git a/Telegram/SourceFiles/intro/intro_step.cpp b/Telegram/SourceFiles/intro/intro_step.cpp index 4d7361a88..f827d8a80 100644 --- a/Telegram/SourceFiles/intro/intro_step.cpp +++ b/Telegram/SourceFiles/intro/intro_step.cpp @@ -38,6 +38,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_intro.h" #include "styles/style_window.h" +// AyuGram includes +#include "ayu/ui/ayu_assets.h" + + namespace Intro { namespace details { namespace { @@ -445,7 +449,8 @@ void Step::paintCover(QPainter &p, int top) { planeLeft += deltaLeft; // planeTop += top; } - st::introCoverIcon.paint(p, planeLeft, planeTop, width()); + const auto ayuGramIcon = Ui::PixmapFromImage(currentAppLogo()); + QIcon(ayuGramIcon).paint(&p, QRect(width() / 2 - ayuGramIcon.width() / 2, planeTop - 16, ayuGramIcon.width(), st::introCoverIcon.height())); } int Step::contentLeft() const { diff --git a/Telegram/SourceFiles/platform/win/tray_win.cpp b/Telegram/SourceFiles/platform/win/tray_win.cpp index 4586dd300..8ad464f18 100644 --- a/Telegram/SourceFiles/platform/win/tray_win.cpp +++ b/Telegram/SourceFiles/platform/win/tray_win.cpp @@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // AyuGram includes #include "ayu/ui/ayu_assets.h" +#include "ui/painter.h" namespace Platform { @@ -94,6 +95,7 @@ constexpr auto kTooltipDelay = crl::time(10000); return Window::WithSmallCounter(std::move(result), std::move(args)); } QPainter p(&result); + PainterHighQualityEnabler hq(p); // AyuGram: fix for lq icons const auto half = d.size / 2; args.size = half; p.drawPixmap( diff --git a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp index 8cfc5cd3f..2e749d4e1 100644 --- a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp +++ b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp @@ -20,9 +20,9 @@ namespace Platform { namespace AppUserModelId { namespace { -const PROPERTYKEY pkey_AppUserModel_ID = { { 0x9F4C2855, 0x9F79, 0x4B39, { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3 } }, 5 }; -const PROPERTYKEY pkey_AppUserModel_StartPinOption = { { 0x9F4C2855, 0x9F79, 0x4B39, { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3 } }, 12 }; -const PROPERTYKEY pkey_AppUserModel_ToastActivator = { { 0x9F4C2855, 0x9F79, 0x4B39, { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3 } }, 26 }; +const PROPERTYKEY pkey_AppUserModel_ID = { { 0x9F4C2666, 0x9F79, 0x4B39, { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3 } }, 5 }; +const PROPERTYKEY pkey_AppUserModel_StartPinOption = { { 0x9F4C2666, 0x9F79, 0x4B39, { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3 } }, 12 }; +const PROPERTYKEY pkey_AppUserModel_ToastActivator = { { 0x9F4C2666, 0x9F79, 0x4B39, { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3 } }, 26 }; #ifdef OS_WIN_STORE const WCHAR AppUserModelIdRelease[] = L"Telegram.TelegramDesktop.Store"; diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 2b3e3fce9..b7077ae1c 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -473,8 +473,8 @@ MainMenu::MainMenu( parentResized(); _telegram->setMarkedText(Ui::Text::Link( - u"Telegram Desktop"_q, - u"https://desktop.telegram.org"_q)); + u"AyuGram Desktop"_q, + u"https://ayugram.one"_q)); _telegram->setLinksTrusted(); _version->setMarkedText( Ui::Text::Link(