diff --git a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp index 3f5815771f..908579b221 100644 --- a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp @@ -352,7 +352,7 @@ void ChoosePeerBoxController::prepareRestrictions() { tr::lng_request_peer_requirements(), { 0, st::membersMarginTop, 0, 0 }); const auto skip = st::defaultSubsectionTitlePadding.left(); - auto separator = QString::fromUtf8("\n\xE2\x80\xA2 "); + auto separator = '\n' + Ui::kQBullet + ' '; raw->add( object_ptr( raw, diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp index cf6303ea70..eacaa448ca 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp @@ -173,7 +173,7 @@ private: link.usageLimit) : tr::lng_group_invite_no_joined(tr::now); const auto add = [&](const QString &text) { - result += QString::fromUtf8(" \xE2\x80\xA2 ") + text; + result += ' ' + Ui::kQBullet + ' ' + text; }; if (revoked) { return result; diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp index 7a20770d2f..88eb87ecd9 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp @@ -1310,7 +1310,7 @@ Fn AboutGigagroupCallback( box->setTitle(tr::lng_gigagroup_convert_title()); const auto addFeature = [&](rpl::producer text) { using namespace rpl::mappers; - const auto prefix = QString::fromUtf8("\xE2\x80\xA2 "); + const auto prefix = Ui::kQBullet + ' '; box->addRow( object_ptr( box, diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp index 3f809df881..02329beaeb 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp @@ -2740,7 +2740,7 @@ void Panel::refreshTitle() { if (_call->rtmp()) { _titleSeparator.create( widget(), - rpl::single(QString::fromUtf8("\xE2\x80\xA2")), + rpl::single(Ui::kQBullet), st::groupCallTitleLabel); _titleSeparator->show(); _titleSeparator->setAttribute(Qt::WA_TransparentForMouseEvents); diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index b0a9a66eb2..9b1f21fb3b 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -135,7 +135,7 @@ void Changelogs::addBetaLog(int changeVersion, const char *changes) { } const auto text = [&] { static const auto simple = u"\n- "_q; - static const auto separator = QString::fromUtf8("\n\xE2\x80\xA2 "); + static const auto separator = '\n' + Ui::kQBullet + ' '; auto result = QString::fromUtf8(changes).trimmed(); if (result.startsWith(base::StringViewMid(simple, 1))) { result = separator.mid(1) + result.mid(simple.size() - 1); diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index f55eda96b0..a83831a4b9 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -1802,12 +1802,14 @@ object_ptr DetailsFiller::setupPersonalChannel( ) | rpl::map([](TextWithEntities &&text, ChannelData *channel) { const auto count = channel ? channel->membersCount() : 0; if (count > 1) { - text.append( - QString::fromUtf8(" \xE2\x80\xA2 ") - ).append(tr::lng_chat_status_subscribers( - tr::now, - lt_count_decimal, - count)); + text.append(' ') + .append(Ui::kQBullet) + .append(' ') + .append( + tr::lng_chat_status_subscribers( + tr::now, + lt_count_decimal, + count)); } return text; }); diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp index 17a1d55eff..f1113de0eb 100644 --- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp +++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp @@ -249,19 +249,23 @@ struct MadePrivacyBadge { const auto index = data.fullIndex + 1; const auto count = data.fullCount; return count - ? QString::fromUtf8(" \xE2\x80\xA2 %1/%2").arg(index).arg(count) + ? QString::fromUtf8(" %3 %1/%2") + .arg(index) + .arg(count) + .arg(Ui::kQBullet) : QString(); } [[nodiscard]] Timestamp ComposeDetails(HeaderData data, TimeId now) { auto result = ComposeTimestamp(data.date, now); if (data.edited) { - result.text.append( - QString::fromUtf8(" \xE2\x80\xA2 ") + tr::lng_edited(tr::now)); + result.text.append(' ' + + Ui::kQBullet + + ' ' + + tr::lng_edited(tr::now)); } if (data.fromPeer || !data.repostFrom.isEmpty()) { - result.text = QString::fromUtf8("\xE2\x80\xA2 ") - + result.text; + result.text = Ui::kQBullet + ' ' + result.text; } return result; } diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp index c40e80be6e..ac07131c63 100644 --- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp +++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp @@ -129,9 +129,9 @@ constexpr auto kLoadViewsPages = 2; const QString &date, not_null repost) { return date + (repost->repostModified() - ? (QString::fromUtf8(" \xE2\x80\xA2 ") + tr::lng_edited(tr::now)) + ? (' ' + Ui::kQBullet + ' ' + tr::lng_edited(tr::now)) : !repost->caption().empty() - ? (QString::fromUtf8(" \xE2\x80\xA2 ") + tr::lng_commented(tr::now)) + ? (' ' + Ui::kQBullet + ' ' + tr::lng_commented(tr::now)) : QString()); } diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index bbc870bbb4..f9eb0ac99d 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -1497,8 +1497,7 @@ void OverlayWidget::updateControls() { height() - st::mediaviewTextTop, qMin(_fromNameLabel.maxWidth(), width() / 3), st::mediaviewFont->height); - const auto separatorText = QString::fromUtf8("\xE2\x80\xA2"); - const auto separatorWidth = st::mediaviewFont->width(separatorText); + const auto separatorWidth = st::mediaviewFont->width(Ui::kQBullet); _separatorNav = QRect( st::mediaviewTextLeft + _nameNav.width() @@ -5636,7 +5635,7 @@ void OverlayWidget::paintFooterContent( p.drawText( separator.left(), separator.top() + st::mediaviewFont->ascent, - QString::fromUtf8("\xE2\x80\xA2")); + Ui::kQBullet); } } diff --git a/Telegram/SourceFiles/settings/settings_active_sessions.cpp b/Telegram/SourceFiles/settings/settings_active_sessions.cpp index 9d078a21cc..ceb16ee804 100644 --- a/Telegram/SourceFiles/settings/settings_active_sessions.cpp +++ b/Telegram/SourceFiles/settings/settings_active_sessions.cpp @@ -153,7 +153,7 @@ void RenameBox(not_null box) { [[nodiscard]] QString LocationAndDate(const EntryData &entry) { return (entry.location.isEmpty() ? entry.ip : entry.location) + (entry.hash - ? (QString::fromUtf8(" \xE2\x80\xA2 ") + entry.active) + ? (' ' + Ui::kQBullet + ' ' + entry.active) : QString()); } diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp index 5bd22679fd..b453f9cd6b 100644 --- a/Telegram/SourceFiles/settings/settings_folders.cpp +++ b/Telegram/SourceFiles/settings/settings_folders.cpp @@ -162,7 +162,7 @@ struct FilterRow { : tr::lng_filters_no_chats(tr::now); return filter.chatlist() ? (result - + QString::fromUtf8(" \xE2\x80\xA2 ") + + (' ' + Ui::kQBullet + ' ') + tr::lng_filters_shareable_status(tr::now)) : result; } diff --git a/Telegram/SourceFiles/settings/settings_websites.cpp b/Telegram/SourceFiles/settings/settings_websites.cpp index 5fd6e078c3..56d8ae50d3 100644 --- a/Telegram/SourceFiles/settings/settings_websites.cpp +++ b/Telegram/SourceFiles/settings/settings_websites.cpp @@ -96,7 +96,7 @@ private: [[nodiscard]] QString LocationAndDate(const EntryData &entry) { return (entry.location.isEmpty() ? entry.ip : entry.location) + (entry.hash - ? (QString::fromUtf8(" \xE2\x80\xA2 ") + entry.active) + ? ((' ' + Ui::kQBullet + ' ') + entry.active) : QString()); } diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 50490486d1..d9516e9f26 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 50490486d12b486fb27a09e844ba3adbaca66a3e +Subproject commit d9516e9f26ecbe267d24b4bbb5fa6fb15939e628