diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 9f0a2493b9..b968e4cabd 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -861,14 +861,14 @@ PRIVATE history/history_view_highlight_manager.h history/history_widget.cpp history/history_widget.h - info/boosts/giveaway/giveaway_list_controllers.cpp - info/boosts/giveaway/giveaway_list_controllers.h - info/boosts/create_giveaway_box.cpp - info/boosts/create_giveaway_box.h - info/boosts/info_boosts_inner_widget.cpp - info/boosts/info_boosts_inner_widget.h - info/boosts/info_boosts_widget.cpp - info/boosts/info_boosts_widget.h + info/channel_statistics/boosts/create_giveaway_box.cpp + info/channel_statistics/boosts/create_giveaway_box.h + info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp + info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h + info/channel_statistics/boosts/info_boosts_inner_widget.cpp + info/channel_statistics/boosts/info_boosts_inner_widget.h + info/channel_statistics/boosts/info_boosts_widget.cpp + info/channel_statistics/boosts/info_boosts_widget.h info/common_groups/info_common_groups_inner_widget.cpp info/common_groups/info_common_groups_inner_widget.h info/common_groups/info_common_groups_widget.cpp diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp index 19907b0803..1cac5db25c 100644 --- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp +++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp @@ -26,7 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_subscription_option.h" #include "data/data_user.h" #include "data/stickers/data_custom_emoji.h" -#include "info/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget. +#include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget. #include "lang/lang_keys.h" #include "main/main_session.h" #include "mainwidget.h" diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp index c0d26766a6..50470657ae 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp @@ -30,7 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/view/history_view_element.h" #include "history/history.h" #include "history/history_item.h" -#include "info/boosts/info_boosts_widget.h" +#include "info/channel_statistics/boosts/info_boosts_widget.h" #include "info/profile/info_profile_emoji_status_panel.h" #include "info/info_memento.h" #include "iv/iv_data.h" diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index 674d5b0745..d6b982c45a 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -39,7 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_premium_limits.h" #include "data/data_user.h" #include "history/admin_log/history_admin_log_section.h" -#include "info/boosts/info_boosts_widget.h" +#include "info/channel_statistics/boosts/info_boosts_widget.h" #include "info/profile/info_profile_values.h" #include "info/info_memento.h" #include "lang/lang_keys.h" diff --git a/Telegram/SourceFiles/info/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp similarity index 98% rename from Telegram/SourceFiles/info/boosts/create_giveaway_box.cpp rename to Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp index 01462aa3ba..4734718b96 100644 --- a/Telegram/SourceFiles/info/boosts/create_giveaway_box.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp @@ -5,18 +5,18 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "info/boosts/create_giveaway_box.h" +#include "info/channel_statistics/boosts/create_giveaway_box.h" #include "api/api_premium.h" #include "base/call_delayed.h" #include "base/unixtime.h" #include "countries/countries_instance.h" #include "data/data_peer.h" -#include "info/boosts/giveaway/boost_badge.h" -#include "info/boosts/giveaway/giveaway_list_controllers.h" -#include "info/boosts/giveaway/giveaway_type_row.h" -#include "info/boosts/giveaway/select_countries_box.h" -#include "info/boosts/info_boosts_widget.h" +#include "info/channel_statistics/boosts/giveaway/boost_badge.h" +#include "info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h" +#include "info/channel_statistics/boosts/giveaway/giveaway_type_row.h" +#include "info/channel_statistics/boosts/giveaway/select_countries_box.h" +#include "info/channel_statistics/boosts/info_boosts_widget.h" #include "info/info_controller.h" #include "info/info_memento.h" #include "lang/lang_keys.h" diff --git a/Telegram/SourceFiles/info/boosts/create_giveaway_box.h b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.h similarity index 100% rename from Telegram/SourceFiles/info/boosts/create_giveaway_box.h rename to Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.h diff --git a/Telegram/SourceFiles/info/boosts/giveaway/boost_badge.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp similarity index 98% rename from Telegram/SourceFiles/info/boosts/giveaway/boost_badge.cpp rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp index f6cc1f548f..feb6d395ed 100644 --- a/Telegram/SourceFiles/info/boosts/giveaway/boost_badge.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "info/boosts/giveaway/boost_badge.h" +#include "info/channel_statistics/boosts/giveaway/boost_badge.h" #include "ui/effects/radial_animation.h" #include "ui/painter.h" diff --git a/Telegram/SourceFiles/info/boosts/giveaway/boost_badge.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.h similarity index 100% rename from Telegram/SourceFiles/info/boosts/giveaway/boost_badge.h rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.h diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style similarity index 100% rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway.style rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp similarity index 99% rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.cpp rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp index 4b5c7ac605..22c3680bd5 100644 --- a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "info/boosts/giveaway/giveaway_list_controllers.h" +#include "info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h" #include "apiwrap.h" #include "data/data_channel.h" diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h similarity index 100% rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.h rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp similarity index 98% rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.cpp rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp index c66a636ab1..2cfed79a6d 100644 --- a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "info/boosts/giveaway/giveaway_type_row.h" +#include "info/channel_statistics/boosts/giveaway/giveaway_type_row.h" #include "lang/lang_keys.h" #include "ui/painter.h" diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.h similarity index 100% rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.h rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.h diff --git a/Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp similarity index 98% rename from Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.cpp rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp index 2a296930ab..1faa9289d7 100644 --- a/Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "info/boosts/giveaway/select_countries_box.h" +#include "info/channel_statistics/boosts/giveaway/select_countries_box.h" #include "countries/countries_instance.h" #include "lang/lang_keys.h" diff --git a/Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.h similarity index 100% rename from Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.h rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.h diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp similarity index 97% rename from Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp rename to Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp index eb0805c497..15c72c5f22 100644 --- a/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "info/boosts/info_boosts_inner_widget.h" +#include "info/channel_statistics/boosts/info_boosts_inner_widget.h" #include "api/api_premium.h" #include "api/api_statistics.h" @@ -14,10 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_peer.h" #include "data/data_session.h" #include "data/data_user.h" -#include "info/boosts/create_giveaway_box.h" -#include "info/boosts/giveaway/boost_badge.h" -#include "info/boosts/giveaway/giveaway_type_row.h" -#include "info/boosts/info_boosts_widget.h" +#include "info/channel_statistics/boosts/create_giveaway_box.h" +#include "info/channel_statistics/boosts/giveaway/boost_badge.h" +#include "info/channel_statistics/boosts/giveaway/giveaway_type_row.h" +#include "info/channel_statistics/boosts/info_boosts_widget.h" #include "info/info_controller.h" #include "info/profile/info_profile_icon.h" #include "info/statistics/info_statistics_inner_widget.h" // FillLoading. diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.h b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.h similarity index 100% rename from Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.h rename to Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.h diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp similarity index 95% rename from Telegram/SourceFiles/info/boosts/info_boosts_widget.cpp rename to Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp index b1db67544e..e8a94e1a92 100644 --- a/Telegram/SourceFiles/info/boosts/info_boosts_widget.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp @@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "info/boosts/info_boosts_widget.h" +#include "info/channel_statistics/boosts/info_boosts_widget.h" -#include "info/boosts/info_boosts_inner_widget.h" +#include "info/channel_statistics/boosts/info_boosts_inner_widget.h" #include "info/info_controller.h" #include "info/info_memento.h" #include "lang/lang_keys.h" diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_widget.h b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.h similarity index 97% rename from Telegram/SourceFiles/info/boosts/info_boosts_widget.h rename to Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.h index d676482670..6da483431a 100644 --- a/Telegram/SourceFiles/info/boosts/info_boosts_widget.h +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.h @@ -47,7 +47,6 @@ public: void showFinished() override; [[nodiscard]] not_null peer() const; - [[nodiscard]] FullMsgId contextId() const; void setInternalState( const QRect &geometry, diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp index 1a975b7881..1ed6d78840 100644 --- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp +++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp @@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_stories.h" #include "data/data_user.h" #include "history/history_item.h" -#include "info/boosts/giveaway/boost_badge.h" +#include "info/channel_statistics/boosts/giveaway/boost_badge.h" #include "lang/lang_keys.h" #include "main/main_session.h" #include "ui/effects/outline_segments.h" // Ui::UnreadStoryOutlineGradient. diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index bd32747ce4..d3920c5a5f 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -63,7 +63,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "support/support_helper.h" #include "info/info_controller.h" #include "info/info_memento.h" -#include "info/boosts/info_boosts_widget.h" +#include "info/channel_statistics/boosts/info_boosts_widget.h" #include "info/profile/info_profile_values.h" #include "info/statistics/info_statistics_widget.h" #include "info/stories/info_stories_widget.h" diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake index c2bb319bff..b77a7f1b75 100644 --- a/Telegram/cmake/td_ui.cmake +++ b/Telegram/cmake/td_ui.cmake @@ -23,7 +23,7 @@ set(style_files calls/calls.style export/view/export.style info/info.style - info/boosts/giveaway/giveaway.style + info/channel_statistics/boosts/giveaway/giveaway.style info/userpic/info_userpic_builder.style intro/intro.style iv/iv.style @@ -122,12 +122,12 @@ PRIVATE info/userpic/info_userpic_emoji_builder_layer.cpp info/userpic/info_userpic_emoji_builder_layer.h - info/boosts/giveaway/boost_badge.cpp - info/boosts/giveaway/boost_badge.h - info/boosts/giveaway/giveaway_type_row.cpp - info/boosts/giveaway/giveaway_type_row.h - info/boosts/giveaway/select_countries_box.cpp - info/boosts/giveaway/select_countries_box.h + info/channel_statistics/boosts/giveaway/boost_badge.cpp + info/channel_statistics/boosts/giveaway/boost_badge.h + info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp + info/channel_statistics/boosts/giveaway/giveaway_type_row.h + info/channel_statistics/boosts/giveaway/select_countries_box.cpp + info/channel_statistics/boosts/giveaway/select_countries_box.h intro/intro_code_input.cpp intro/intro_code_input.h