procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove Info::Profile::ToUpperValue.

This commit is contained in:
John Preston 2019-06-17 18:59:43 +02:00
parent 87cb0ada98
commit faa42110ac
11 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
View File

@ -12,9 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_chat.h" #include "data/data_chat.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/wrap/vertical_layout.h" #include "ui/wrap/vertical_layout.h"
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "info/profile/info_profile_button.h" #include "info/profile/info_profile_button.h"
#include "info/profile/info_profile_values.h"
#include "boxes/peer_list_box.h" #include "boxes/peer_list_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/add_contact_box.h" #include "boxes/add_contact_box.h"
@ -228,9 +227,8 @@ object_ptr<Ui::RpWidget> SetupCreateGroup(
auto result = object_ptr<Info::Profile::Button>( auto result = object_ptr<Info::Profile::Button>(
parent, parent,
Lang::Viewer( tr::lng_manage_discussion_group_create(
lng_manage_discussion_group_create ) | Ui::Text::ToUpper(),
) | Info::Profile::ToUpperValue(),
st::infoCreateLinkedChatButton); st::infoCreateLinkedChatButton);
result->addClickHandler([=] { result->addClickHandler([=] {
const auto guarded = crl::guard(parent, callback); const auto guarded = crl::guard(parent, callback);
@ -253,7 +251,7 @@ object_ptr<Ui::RpWidget> SetupUnlink(
Lang::Viewer(channel->isBroadcast() Lang::Viewer(channel->isBroadcast()
? lng_manage_discussion_group_unlink ? lng_manage_discussion_group_unlink
: lng_manage_linked_channel_unlink : lng_manage_linked_channel_unlink
) | Info::Profile::ToUpperValue(), ) | Ui::Text::ToUpper(),
st::infoUnlinkChatButton); st::infoUnlinkChatButton);
result->addClickHandler([=] { result->addClickHandler([=] {
callback(nullptr); callback(nullptr);

6
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -21,8 +21,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/widgets/shadow.h" #include "ui/widgets/shadow.h"
#include "ui/effects/ripple_animation.h" #include "ui/effects/ripple_animation.h"
#include "ui/special_buttons.h" #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "ui/image/image.h" #include "ui/image/image.h"
#include "ui/special_buttons.h"
#include "inline_bots/inline_bot_result.h" #include "inline_bots/inline_bot_result.h"
#include "data/data_drafts.h" #include "data/data_drafts.h"
#include "data/data_session.h" #include "data/data_session.h"
@ -45,7 +46,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/view/history_view_element.h" #include "history/view/history_view_element.h"
#include "profile/profile_block_group_members.h" #include "profile/profile_block_group_members.h"
#include "info/info_memento.h" #include "info/info_memento.h"
#include "info/profile/info_profile_values.h" // Info::Profile::ToUpperValue
#include "core/click_handler_types.h" #include "core/click_handler_types.h"
#include "chat_helpers/tabbed_panel.h" #include "chat_helpers/tabbed_panel.h"
#include "chat_helpers/tabbed_selector.h" #include "chat_helpers/tabbed_selector.h"
@ -156,7 +156,7 @@ object_ptr<Ui::FlatButton> SetupDiscussButton(
const auto button = result.data(); const auto button = result.data();
auto text = Lang::Viewer( auto text = Lang::Viewer(
lng_channel_discuss lng_channel_discuss
) | Info::Profile::ToUpperValue(); ) | Ui::Text::ToUpper();
const auto label = Ui::CreateChild<Ui::FlatLabel>( const auto label = Ui::CreateChild<Ui::FlatLabel>(
button, button,
rpl::duplicate(text), rpl::duplicate(text),

3
Telegram/SourceFiles/info/profile/info_profile_actions.cpp
View File

@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/shadow.h" #include "ui/widgets/shadow.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/toast/toast.h" #include "ui/toast/toast.h"
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "boxes/abstract_box.h" #include "boxes/abstract_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/peer_list_box.h" #include "boxes/peer_list_box.h"
@ -96,7 +97,7 @@ auto AddMainButton(
Ui::MultiSlideTracker &tracker) { Ui::MultiSlideTracker &tracker) {
tracker.track(AddActionButton( tracker.track(AddActionButton(
parent, parent,
std::move(text) | ToUpperValue(), std::move(text) | Ui::Text::ToUpper(),
std::move(toggleOn), std::move(toggleOn),
std::move(callback), std::move(callback),
st::infoMainButton)); st::infoMainButton));

3
Telegram/SourceFiles/info/profile/info_profile_cover.cpp
View File

@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_info.h" #include "styles/style_info.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/effects/ripple_animation.h" #include "ui/effects/ripple_animation.h"
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "ui/special_buttons.h" #include "ui/special_buttons.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "observer_peer.h" #include "observer_peer.h"
@ -446,7 +447,7 @@ void SharedMediaCover::createLabel() {
using namespace rpl::mappers; using namespace rpl::mappers;
auto label = object_ptr<Ui::FlatLabel>( auto label = object_ptr<Ui::FlatLabel>(
this, this,
Lang::Viewer(lng_profile_shared_media) | ToUpperValue(), Lang::Viewer(lng_profile_shared_media) | Ui::Text::ToUpper(),
st::infoBlockHeaderLabel); st::infoBlockHeaderLabel);
label->setAttribute(Qt::WA_TransparentForMouseEvents); label->setAttribute(Qt::WA_TransparentForMouseEvents);

3
Telegram/SourceFiles/info/profile/info_profile_members.cpp
View File

@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"
#include "ui/widgets/scroll_area.h" #include "ui/widgets/scroll_area.h"
#include "ui/wrap/padding_wrap.h" #include "ui/wrap/padding_wrap.h"
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "ui/search_field_controller.h" #include "ui/search_field_controller.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
@ -167,7 +168,7 @@ object_ptr<Ui::FlatLabel> Members::setupTitle() {
_peer _peer
) | rpl::map([](int count) { ) | rpl::map([](int count) {
return lng_chat_status_members(lt_count_decimal, count); return lng_chat_status_members(lt_count_decimal, count);
}) | ToUpperValue(), }) | Ui::Text::ToUpper(),
st::infoBlockHeaderLabel); st::infoBlockHeaderLabel);
result->setAttribute(Qt::WA_TransparentForMouseEvents); result->setAttribute(Qt::WA_TransparentForMouseEvents);
return result; return result;

6
Telegram/SourceFiles/info/profile/info_profile_values.h
View File

@ -36,12 +36,6 @@ inline auto WithEmptyEntities() {
}); });
} }
inline auto ToUpperValue() {
return rpl::map([](QString &&text) {
return std::move(text).toUpper();
});
}
rpl::producer<TextWithEntities> NameValue(not_null<PeerData*> peer); rpl::producer<TextWithEntities> NameValue(not_null<PeerData*> peer);
rpl::producer<TextWithEntities> PhoneValue(not_null<UserData*> user); rpl::producer<TextWithEntities> PhoneValue(not_null<UserData*> user);
rpl::producer<TextWithEntities> BioValue(not_null<UserData*> user); rpl::producer<TextWithEntities> BioValue(not_null<UserData*> user);

4
Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp
View File

@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "passport/passport_panel_controller.h" #include "passport/passport_panel_controller.h"
#include "passport/passport_panel_details_row.h" #include "passport/passport_panel_details_row.h"
#include "info/profile/info_profile_button.h" #include "info/profile/info_profile_button.h"
#include "info/profile/info_profile_values.h"
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
@ -18,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#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/fade_wrap.h" #include "ui/wrap/fade_wrap.h"
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "boxes/abstract_box.h" #include "boxes/abstract_box.h"
#include "boxes/confirm_phone_box.h" #include "boxes/confirm_phone_box.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
@ -322,7 +322,7 @@ void PanelEditContact::setupControls(
_content->add( _content->add(
object_ptr<Info::Profile::Button>( object_ptr<Info::Profile::Button>(
_content, _content,
std::move(*text) | Info::Profile::ToUpperValue(), std::move(*text) | Ui::Text::ToUpper(),
st::passportDeleteButton), st::passportDeleteButton),
st::passportUploadButtonPadding st::passportUploadButtonPadding
)->addClickHandler([=] { )->addClickHandler([=] {

4
Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
View File

@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "passport/passport_panel_details_row.h" #include "passport/passport_panel_details_row.h"
#include "passport/passport_panel_edit_scans.h" #include "passport/passport_panel_edit_scans.h"
#include "info/profile/info_profile_button.h" #include "info/profile/info_profile_button.h"
#include "info/profile/info_profile_values.h"
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"
#include "ui/widgets/scroll_area.h" #include "ui/widgets/scroll_area.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
@ -21,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/wrap/vertical_layout.h" #include "ui/wrap/vertical_layout.h"
#include "ui/wrap/fade_wrap.h" #include "ui/wrap/fade_wrap.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "boxes/abstract_box.h" #include "boxes/abstract_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
@ -486,7 +486,7 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
inner->add( inner->add(
object_ptr<Info::Profile::Button>( object_ptr<Info::Profile::Button>(
inner, inner,
std::move(*text) | Info::Profile::ToUpperValue(), std::move(*text) | Ui::Text::ToUpper(),
st::passportDeleteButton), st::passportDeleteButton),
st::passportUploadButtonPadding st::passportUploadButtonPadding
)->addClickHandler([=] { )->addClickHandler([=] {

6
Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
View File

@ -10,12 +10,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "passport/passport_panel_controller.h" #include "passport/passport_panel_controller.h"
#include "passport/passport_panel_details_row.h" #include "passport/passport_panel_details_row.h"
#include "info/profile/info_profile_button.h" #include "info/profile/info_profile_button.h"
#include "info/profile/info_profile_values.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/wrap/fade_wrap.h" #include "ui/wrap/fade_wrap.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "ui/wrap/vertical_layout.h" #include "ui/wrap/vertical_layout.h"
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "ui/text_options.h" #include "ui/text_options.h"
#include "core/file_utilities.h" #include "core/file_utilities.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
@ -212,7 +212,7 @@ Ui::SlideWrap<ScanButton> *EditScans::List::nonDeletedErrorRow() const {
rpl::producer<QString> EditScans::List::uploadButtonText() const { rpl::producer<QString> EditScans::List::uploadButtonText() const {
return Lang::Viewer(files.empty() return Lang::Viewer(files.empty()
? lng_passport_upload_scans ? lng_passport_upload_scans
: lng_passport_upload_more) | Info::Profile::ToUpperValue(); : lng_passport_upload_more) | Ui::Text::ToUpper();
} }
void EditScans::List::hideError() { void EditScans::List::hideError() {
@ -686,7 +686,7 @@ void EditScans::setupSpecialScans(
) | rpl::map([=, type = type](bool created) { ) | rpl::map([=, type = type](bool created) {
return Lang::Viewer(uploadKey(type, created)); return Lang::Viewer(uploadKey(type, created));
}) | rpl::flatten_latest( }) | rpl::flatten_latest(
) | Info::Profile::ToUpperValue(); ) | Ui::Text::ToUpper();
scan.upload = inner->add( scan.upload = inner->add(
object_ptr<Info::Profile::Button>( object_ptr<Info::Profile::Button>(
inner, inner,

4
Telegram/SourceFiles/settings/settings_advanced.cpp
View File

@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "boxes/connection_box.h" #include "boxes/connection_box.h"
#include "boxes/about_box.h" #include "boxes/about_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "info/profile/info_profile_button.h" #include "info/profile/info_profile_button.h"
#include "info/profile/info_profile_values.h"
#include "platform/platform_specific.h" #include "platform/platform_specific.h"
#include "platform/platform_info.h" #include "platform/platform_info.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
@ -111,7 +111,7 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
st::settingsButton); st::settingsButton);
const auto update = Ui::CreateChild<Button>( const auto update = Ui::CreateChild<Button>(
check.get(), check.get(),
Lang::Viewer(lng_update_telegram) | Info::Profile::ToUpperValue(), Lang::Viewer(lng_update_telegram) | Ui::Text::ToUpper(),
st::settingsUpdate); st::settingsUpdate);
update->hide(); update->hide();
check->widthValue() | rpl::start_with_next([=](int width) { check->widthValue() | rpl::start_with_next([=](int width) {

4
Telegram/SourceFiles/window/window_outdated_bar.cpp
View File

@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/labels.h" // Ui::FlatLabel #include "ui/widgets/labels.h" // Ui::FlatLabel
#include "ui/widgets/buttons.h" // Ui::IconButton #include "ui/widgets/buttons.h" // Ui::IconButton
#include "ui/wrap/slide_wrap.h" // Ui::SlideWrap #include "ui/wrap/slide_wrap.h" // Ui::SlideWrap
#include "info/profile/info_profile_values.h" // Info::Profile::ToUpperValue #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
#include "platform/platform_info.h" #include "platform/platform_info.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "styles/style_window.h" #include "styles/style_window.h"
@ -46,7 +46,7 @@ Bar::Bar(not_null<QWidget*> parent, QDate date)
: _date(date) : _date(date)
, _title( , _title(
this, this,
Lang::Viewer(lng_outdated_title) | Info::Profile::ToUpperValue(), Lang::Viewer(lng_outdated_title) | Ui::Text::ToUpper(),
st::windowOutdatedTitle) st::windowOutdatedTitle)
, _details(this, , _details(this,
QString(), QString(),