Skip to content

Commit 5a4b2f7

Browse files
committed
2 parents d1f0419 + c0db5ee commit 5a4b2f7

File tree

214 files changed

+8805
-1722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+8805
-1722
lines changed

.github/workflows/linux.yml

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
defines:
5151
- ""
5252
- "DESKTOP_APP_DISABLE_X11_INTEGRATION"
53-
- "DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION"
5453

5554
env:
5655
UPLOAD_ARTIFACT: "true"

.gitmodules

-9
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@
8282
[submodule "Telegram/ThirdParty/dispatch"]
8383
path = Telegram/ThirdParty/dispatch
8484
url = https://github.com/apple/swift-corelibs-libdispatch
85-
[submodule "Telegram/ThirdParty/plasma-wayland-protocols"]
86-
path = Telegram/ThirdParty/plasma-wayland-protocols
87-
url = https://github.com/KDE/plasma-wayland-protocols.git
88-
[submodule "Telegram/ThirdParty/wayland-protocols"]
89-
path = Telegram/ThirdParty/wayland-protocols
90-
url = https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git
9185
[submodule "Telegram/ThirdParty/kimageformats"]
9286
path = Telegram/ThirdParty/kimageformats
9387
url = https://github.com/KDE/kimageformats.git
@@ -97,9 +91,6 @@
9791
[submodule "Telegram/ThirdParty/cld3"]
9892
path = Telegram/ThirdParty/cld3
9993
url = https://github.com/google/cld3.git
100-
[submodule "Telegram/ThirdParty/wayland"]
101-
path = Telegram/ThirdParty/wayland
102-
url = https://github.com/gitlab-freedesktop-mirrors/wayland.git
10394
[submodule "Telegram/ThirdParty/libprisma"]
10495
path = Telegram/ThirdParty/libprisma
10596
url = https://github.com/desktop-app/libprisma.git

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
6262
if (WIN32)
6363
set(qt_version 5.15.13)
6464
elseif (APPLE)
65-
set(qt_version 6.2.7)
65+
set(qt_version 6.2.8)
6666
endif()
6767
endif()
6868
include(cmake/external/qt/package.cmake)

Telegram/CMakeLists.txt

+18-38
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ PRIVATE
273273
boxes/local_storage_box.h
274274
boxes/max_invite_box.cpp
275275
boxes/max_invite_box.h
276+
boxes/moderate_messages_box.cpp
277+
boxes/moderate_messages_box.h
276278
boxes/peer_list_box.cpp
277279
boxes/peer_list_box.h
278280
boxes/peer_list_controllers.cpp
@@ -460,10 +462,14 @@ PRIVATE
460462
data/business/data_business_info.h
461463
data/business/data_shortcut_messages.cpp
462464
data/business/data_shortcut_messages.h
465+
data/components/recent_peers.cpp
466+
data/components/recent_peers.h
463467
data/components/scheduled_messages.cpp
464468
data/components/scheduled_messages.h
465469
data/components/sponsored_messages.cpp
466470
data/components/sponsored_messages.h
471+
data/components/top_peers.cpp
472+
data/components/top_peers.h
467473
data/notify/data_notify_settings.cpp
468474
data/notify/data_notify_settings.h
469475
data/notify/data_peer_notify_settings.cpp
@@ -608,6 +614,18 @@ PRIVATE
608614
data/data_wall_paper.h
609615
data/data_web_page.cpp
610616
data/data_web_page.h
617+
dialogs/ui/dialogs_layout.cpp
618+
dialogs/ui/dialogs_layout.h
619+
dialogs/ui/dialogs_message_view.cpp
620+
dialogs/ui/dialogs_message_view.h
621+
dialogs/ui/dialogs_stories_content.cpp
622+
dialogs/ui/dialogs_stories_content.h
623+
dialogs/ui/dialogs_suggestions.cpp
624+
dialogs/ui/dialogs_suggestions.h
625+
dialogs/ui/dialogs_topics_view.cpp
626+
dialogs/ui/dialogs_topics_view.h
627+
dialogs/ui/dialogs_video_userpic.cpp
628+
dialogs/ui/dialogs_video_userpic.h
611629
dialogs/dialogs_entry.cpp
612630
dialogs/dialogs_entry.h
613631
dialogs/dialogs_indexed_list.cpp
@@ -630,16 +648,6 @@ PRIVATE
630648
dialogs/dialogs_search_tags.h
631649
dialogs/dialogs_widget.cpp
632650
dialogs/dialogs_widget.h
633-
dialogs/ui/dialogs_layout.cpp
634-
dialogs/ui/dialogs_layout.h
635-
dialogs/ui/dialogs_message_view.cpp
636-
dialogs/ui/dialogs_message_view.h
637-
dialogs/ui/dialogs_stories_content.cpp
638-
dialogs/ui/dialogs_stories_content.h
639-
dialogs/ui/dialogs_topics_view.cpp
640-
dialogs/ui/dialogs_topics_view.h
641-
dialogs/ui/dialogs_video_userpic.cpp
642-
dialogs/ui/dialogs_video_userpic.h
643651
editor/color_picker.cpp
644652
editor/color_picker.h
645653
editor/controllers/controllers.h
@@ -1199,11 +1207,6 @@ PRIVATE
11991207
payments/payments_checkout_process.h
12001208
payments/payments_form.cpp
12011209
payments/payments_form.h
1202-
platform/linux/linux_wayland_integration_dummy.cpp
1203-
platform/linux/linux_wayland_integration.cpp
1204-
platform/linux/linux_wayland_integration.h
1205-
platform/linux/linux_xdp_open_with_dialog.cpp
1206-
platform/linux/linux_xdp_open_with_dialog.h
12071210
platform/linux/file_utilities_linux.cpp
12081211
platform/linux/file_utilities_linux.h
12091212
platform/linux/launcher_linux.cpp
@@ -1569,16 +1572,6 @@ if (NOT build_winstore)
15691572
)
15701573
endif()
15711574

1572-
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
1573-
remove_target_sources(Telegram ${src_loc}
1574-
platform/linux/linux_wayland_integration.cpp
1575-
)
1576-
else()
1577-
remove_target_sources(Telegram ${src_loc}
1578-
platform/linux/linux_wayland_integration_dummy.cpp
1579-
)
1580-
endif()
1581-
15821575
if (DESKTOP_APP_USE_PACKAGED)
15831576
remove_target_sources(Telegram ${src_loc}
15841577
platform/mac/mac_iconv_helper.c
@@ -1718,19 +1711,6 @@ else()
17181711
desktop-app::external_xcb
17191712
)
17201713
endif()
1721-
1722-
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
1723-
qt_generate_wayland_protocol_client_sources(Telegram
1724-
FILES
1725-
${third_party_loc}/wayland/protocol/wayland.xml
1726-
${third_party_loc}/plasma-wayland-protocols/src/protocols/plasma-shell.xml
1727-
)
1728-
1729-
target_link_libraries(Telegram
1730-
PRIVATE
1731-
desktop-app::external_wayland_client
1732-
)
1733-
endif()
17341714
endif()
17351715

17361716
if (build_macstore)
8.39 KB
Binary file not shown.
13.2 KB
Binary file not shown.
Loading
Loading
Loading
563 Bytes
Loading
1.13 KB
Loading
1.53 KB
Loading

Telegram/Resources/iv_html/page.css

+30-1
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,32 @@ html.custom_scroll ::-webkit-scrollbar-thumb:hover {
134134
.page-slide {
135135
position: relative;
136136
width: 100%;
137+
min-height: 100%;
137138
margin-left: 0%;
138139
transition: margin 240ms ease-in-out;
139140
}
141+
.page-footer {
142+
height: 32px;
143+
margin-top: -32px;
144+
background: var(--td-window-bg-over);
145+
}
146+
.page-footer .content {
147+
padding: 3px 18px;
148+
font-size: 15px;
149+
color: var(--td-window-sub-text-fg);
150+
text-align: center;
151+
}
152+
.page-footer .wrong {
153+
position: relative;
154+
padding: 5px;
155+
margin: -5px;
156+
color: var(--td-window-sub-text-fg);
157+
text-decoration: none;
158+
cursor: pointer;
159+
}
160+
.page-footer .wrong:hover {
161+
text-decoration: underline;
162+
}
140163
.hidden-left,
141164
.hidden-right {
142165
pointer-events: none;
@@ -148,7 +171,7 @@ html.custom_scroll ::-webkit-scrollbar-thumb:hover {
148171
margin-left: 100%;
149172
}
150173
article {
151-
padding-bottom: 12px;
174+
padding-bottom: 40px;
152175
overflow-y: hidden;
153176
overflow-x: auto;
154177
white-space: pre-wrap;
@@ -893,6 +916,9 @@ section.related a.related-link:after {
893916
right: 0;
894917
bottom: 0;
895918
}
919+
section.related a.related-link:last-child:after {
920+
border-bottom: 0px;
921+
}
896922
section.related .related-link-url {
897923
display: block;
898924
font-size: 15px;
@@ -1027,6 +1053,9 @@ section.channel > a > h4 {
10271053
display: block;
10281054
margin: 0 auto;
10291055
}
1056+
.media-outer {
1057+
margin-bottom: 16px;
1058+
}
10301059
.photo-wrap,
10311060
.video-wrap {
10321061
width: 100%;

Telegram/Resources/iv_html/page.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var IV = {
2626
}
2727
target = target.parentNode;
2828
}
29-
if (!target || !target.hasAttribute('href')) {
29+
if (!target || (context === '' && !target.hasAttribute('href'))) {
3030
return;
3131
}
3232
var base = document.createElement('A');
@@ -413,9 +413,12 @@ var IV = {
413413
var article = function (el) {
414414
return el.getElementsByTagName('article')[0];
415415
};
416-
var from = article(IV.findPageScroll());
417-
var to = article(IV.makeScrolledContent(data.html));
418-
morphdom(from, to, {
416+
var footer = function (el) {
417+
return el.getElementsByClassName('page-footer')[0];
418+
};
419+
var from = IV.findPageScroll();
420+
var to = IV.makeScrolledContent(data.html);
421+
morphdom(article(from), article(to), {
419422
onBeforeElUpdated: function (fromEl, toEl) {
420423
if (fromEl.classList.contains('video')
421424
&& toEl.classList.contains('video')
@@ -439,6 +442,7 @@ var IV = {
439442
return !fromEl.isEqualNode(toEl);
440443
}
441444
});
445+
morphdom(footer(from), footer(to));
442446
IV.initMedia();
443447
eval(data.js);
444448
},
@@ -477,9 +481,7 @@ var IV = {
477481
var result = document.createElement('div');
478482
result.className = 'page-scroll';
479483
result.tabIndex = '-1';
480-
result.innerHTML = '<div class="page-slide"><article>'
481-
+ html
482-
+ '</article></div>';
484+
result.innerHTML = html.trim();
483485
result.onscroll = IV.frameScrolled;
484486
return result;
485487
},

Telegram/Resources/langs/lang.strings

+65
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,9 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
730730
"lng_settings_angle_backend_d3d11on12" = "D3D11on12";
731731
"lng_settings_angle_backend_opengl" = "OpenGL";
732732
"lng_settings_angle_backend_disabled" = "Disabled";
733+
"lng_settings_top_peers_title" = "Frequent contacts";
734+
"lng_settings_top_peers_suggest" = "Suggest frequent contacts";
735+
"lng_settings_top_peers_about" = "Display people you message frequently at the top of the search section for quick access.";
733736
"lng_settings_sensitive_title" = "Sensitive content";
734737
"lng_settings_sensitive_disable_filtering" = "Disable filtering";
735738
"lng_settings_sensitive_about" = "Display sensitive media in public channels on all your Telegram devices.";
@@ -840,6 +843,7 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
840843
"lng_settings_auto_night_mode_on" = "System";
841844
"lng_settings_auto_night_warning" = "You have enabled auto-night mode. If you want to change the dark mode settings, you'll need to disable it first.";
842845
"lng_settings_auto_night_disable" = "Disable";
846+
"lng_settings_font_family" = "Font family";
843847

844848
"lng_settings_color_title" = "Color preview";
845849
"lng_settings_color_reply" = "Reply to your message";
@@ -1492,6 +1496,7 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
14921496
"lng_manage_peer_reactions_none_about" = "Members of the group can't add any reactions to messages.";
14931497
"lng_manage_peer_reactions_some_title" = "Only allow these reactions";
14941498
"lng_manage_peer_reactions_available" = "Available reactions";
1499+
"lng_manage_peer_reactions_available_ph" = "Add reactions...";
14951500
"lng_manage_peer_reactions_own" = "You can also {link} emoji packs and use them as reactions.";
14961501
"lng_manage_peer_reactions_own_link" = "create your own";
14971502
"lng_manage_peer_reactions_level#one" = "Your channel needs to reach level **{count}** to use **{same_count}** custom reaction.";
@@ -1500,6 +1505,11 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
15001505
"lng_manage_peer_reactions_boost_link" = "here";
15011506
"lng_manage_peer_reactions_limit" = "Channels can't have more custom reactions.";
15021507

1508+
"lng_manage_peer_reactions_max_title" = "Maximum number of reactions";
1509+
"lng_manage_peer_reactions_max_slider#one" = "{count} reaction per post";
1510+
"lng_manage_peer_reactions_max_slider#other" = "{count} reactions per post";
1511+
"lng_manage_peer_reactions_max_about" = "Limit the number of different reactions that can be added to a post, including already published ones.";
1512+
15031513
"lng_manage_peer_antispam" = "Aggressive Anti-Spam";
15041514
"lng_manage_peer_antispam_about" = "Telegram will filter more spam but may occasionally affect ordinary messages. You can report False Positives in Recent Actions.";
15051515
"lng_manage_peer_antispam_not_enough#one" = "Aggressive filtering can be enabled only in groups with more than **{count} member**.";
@@ -2269,6 +2279,11 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
22692279
"lng_business_about_chat_intro" = "Customize the message people see before they start a chat with you.";
22702280
"lng_business_subtitle_chat_links" = "Links to Chat";
22712281
"lng_business_about_chat_links" = "Create links that start a chat with you, suggesting the first message.";
2282+
"lng_business_subtitle_sponsored" = "Ads in Channels";
2283+
"lng_business_button_sponsored" = "Do Not Hide Ads";
2284+
"lng_business_about_sponsored" = "As a Premium subscriber, you don’t see any ads on Telegram, but you can turn them on, for example, to view your own ads that you launched on the {link}";
2285+
"lng_business_about_sponsored_link" = "Telegram Ad Platform {emoji}";
2286+
"lng_business_about_sponsored_url" = "https://ads.telegram.org";
22722287

22732288
"lng_location_title" = "Location";
22742289
"lng_location_about" = "Display the location of your business on your account.";
@@ -2839,7 +2854,17 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
28392854
"lng_in_dlg_audio_count#other" = "{count} audio";
28402855

28412856
"lng_ban_user" = "Ban User";
2857+
"lng_ban_users" = "Ban users";
2858+
"lng_restrict_users" = "Restrict users";
28422859
"lng_delete_all_from_user" = "Delete all from {user}";
2860+
"lng_delete_all_from_users" = "Delete all from users";
2861+
"lng_restrict_user_part" = "Partially restrict this user {emoji}";
2862+
"lng_restrict_users_part" = "Partially restrict users {emoji}";
2863+
"lng_restrict_user_full" = "Fully ban this user {emoji}";
2864+
"lng_restrict_users_full" = "Fully ban users {emoji}";
2865+
"lng_restrict_users_part_single_header" = "What can this user do?";
2866+
"lng_restrict_users_part_header#one" = "What can {count} selected user do?";
2867+
"lng_restrict_users_part_header#other" = "What can {count} selected users do?";
28432868
"lng_report_spam" = "Report Spam";
28442869
"lng_report_spam_and_leave" = "Report spam and leave";
28452870
"lng_report_spam_done" = "Thank you for your report.";
@@ -3410,6 +3435,17 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
34103435
"lng_mediaview_forward" = "Forward";
34113436
"lng_mediaview_delete" = "Delete";
34123437
"lng_mediaview_save_to_profile" = "Save to Profile";
3438+
"lng_mediaview_pin_story_done" = "Story pinned";
3439+
"lng_mediaview_pin_story_about" = "Now it will be always shown on the top.";
3440+
"lng_mediaview_pin_stories_done#one" = "{count} story pinned";
3441+
"lng_mediaview_pin_stories_done#other" = "{count} stories pinned";
3442+
"lng_mediaview_pin_stories_about#one" = "Now it will be always shown on the top.";
3443+
"lng_mediaview_pin_stories_about#other" = "Now they will be always shown on the top.";
3444+
"lng_mediaview_unpin_story_done" = "Story unpinned.";
3445+
"lng_mediaview_unpin_stories_done#one" = "{count} story unpinned";
3446+
"lng_mediaview_unpin_stories_done#other" = "{count} stories unpinned";
3447+
"lng_mediaview_pin_limit#one" = "You can't pin more than {count} story.";
3448+
"lng_mediaview_pin_limit#other" = "You can't pin more than {count} stories.";
34133449
"lng_mediaview_archive_story" = "Archive Story";
34143450
"lng_mediaview_photos_all" = "View all photos";
34153451
"lng_mediaview_files_all" = "View all files";
@@ -4704,6 +4740,8 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
47044740
"lng_view_button_boost" = "Boost";
47054741
"lng_view_button_giftcode" = "Open";
47064742
"lng_view_button_iv" = "Instant View";
4743+
"lng_view_button_stickerset" = "View stickers";
4744+
"lng_view_button_emojipack" = "View emoji";
47074745

47084746
"lng_sponsored_hide_ads" = "Hide";
47094747
"lng_sponsored_title" = "What are sponsored messages?";
@@ -5073,6 +5111,7 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
50735111
"lng_iv_share" = "Share";
50745112
"lng_iv_join_channel" = "Join";
50755113
"lng_iv_window_title" = "Instant View";
5114+
"lng_iv_wrong_layout" = "Wrong layout?";
50765115

50775116
"lng_limit_download_title" = "Download speed limited";
50785117
"lng_limit_download_subscribe" = "Subscribe to {link} and increase download speed {increase}.";
@@ -5087,6 +5126,32 @@ https://github.com/rabbitgramdesktop/rabbitgramdesktop/blob/dev/LEGAL
50875126
"lng_limit_upload_increase_speed" = "by **{percent}**";
50885127
"lng_limit_upload_subscribe_link" = "Telegram Premium";
50895128

5129+
"lng_recent_frequent" = "Frequent contacts";
5130+
"lng_recent_frequent_all" = "Show all";
5131+
"lng_recent_frequent_collapse" = "Collapse";
5132+
"lng_recent_title" = "Recent";
5133+
"lng_recent_clear" = "Clear";
5134+
"lng_recent_clear_sure" = "Do you want to clear your search history?";
5135+
"lng_recent_remove" = "Remove from Recent";
5136+
"lng_recent_clear_all" = "Clear all";
5137+
"lng_recent_hide_top" = "Remove all & Disable";
5138+
"lng_recent_hide_sure" = "Are you sure you want to clear and disable frequent contacts list?\n\nYou can always turn this feature back on in Settings > Privacy > Suggest Frequent Contacts.";
5139+
"lng_recent_hide_button" = "Hide";
5140+
"lng_recent_none" = "Recent search results\nwill appear here.";
5141+
"lng_recent_chats" = "Chats";
5142+
"lng_recent_channels" = "Channels";
5143+
"lng_channels_none_title" = "No channels yet...";
5144+
"lng_channels_none_about" = "You are not currently subscribed to any channels.";
5145+
"lng_channels_your_title" = "Channels you joined";
5146+
"lng_channels_your_more" = "Show more";
5147+
"lng_channels_your_less" = "Show less";
5148+
"lng_channels_recommended" = "Recommended channels";
5149+
5150+
"lng_font_box_title" = "Choose font family";
5151+
"lng_font_default" = "Default";
5152+
"lng_font_system" = "System font";
5153+
"lng_font_not_found" = "Font not found.";
5154+
50905155
// Wnd specific
50915156

50925157
"lng_wnd_choose_program_menu" = "Choose Default Program...";

Telegram/Resources/qrc/telegram/animations.qrc

+2
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@
2424
<file alias="chat_link.tgs">../../animations/chat_link.tgs</file>
2525
<file alias="collectible_username.tgs">../../animations/collectible_username.tgs</file>
2626
<file alias="collectible_phone.tgs">../../animations/collectible_phone.tgs</file>
27+
<file alias="search.tgs">../../animations/search.tgs</file>
28+
<file alias="noresults.tgs">../../animations/noresults.tgs</file>
2729
</qresource>
2830
</RCC>

0 commit comments

Comments
 (0)