From f77567093835ca0515b780a29ba6a33423f5c0cf Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 11 Oct 2023 22:42:23 +0300 Subject: [PATCH] Moved out some classes for widgets in statistical info to directory. --- .../info/statistics/info_statistics_inner_widget.cpp | 4 ++-- Telegram/SourceFiles/statistics/chart_widget.cpp | 6 +++--- .../statistics/view/stack_linear_chart_view.cpp | 2 +- .../statistics/{ => widgets}/chart_header_widget.cpp | 2 +- .../statistics/{ => widgets}/chart_header_widget.h | 0 .../{ => widgets}/chart_lines_filter_widget.cpp | 2 +- .../{ => widgets}/chart_lines_filter_widget.h | 0 .../{ => widgets}/point_details_widget.cpp | 2 +- .../statistics/{ => widgets}/point_details_widget.h | 0 Telegram/cmake/td_ui.cmake | 12 ++++++------ 10 files changed, 15 insertions(+), 15 deletions(-) rename Telegram/SourceFiles/statistics/{ => widgets}/chart_header_widget.cpp (96%) rename Telegram/SourceFiles/statistics/{ => widgets}/chart_header_widget.h (100%) rename Telegram/SourceFiles/statistics/{ => widgets}/chart_lines_filter_widget.cpp (99%) rename Telegram/SourceFiles/statistics/{ => widgets}/chart_lines_filter_widget.h (100%) rename Telegram/SourceFiles/statistics/{ => widgets}/point_details_widget.cpp (99%) rename Telegram/SourceFiles/statistics/{ => widgets}/point_details_widget.h (100%) diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp index 2669f196c..778f49fe1 100644 --- a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp +++ b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp @@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "info/statistics/info_statistics_inner_widget.h" -#include "info/statistics/info_statistics_widget.h" #include "api/api_statistics.h" #include "apiwrap.h" #include "data/data_peer.h" @@ -17,13 +16,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/info_memento.h" #include "info/statistics/info_statistics_list_controllers.h" #include "info/statistics/info_statistics_recent_message.h" +#include "info/statistics/info_statistics_widget.h" #include "lang/lang_keys.h" #include "lottie/lottie_icon.h" #include "main/main_session.h" #include "settings/settings_common.h" -#include "statistics/chart_header_widget.h" #include "statistics/chart_widget.h" #include "statistics/statistics_common.h" +#include "statistics/widgets/chart_header_widget.h" #include "ui/layers/generic_box.h" #include "ui/rect.h" #include "ui/toast/toast.h" diff --git a/Telegram/SourceFiles/statistics/chart_widget.cpp b/Telegram/SourceFiles/statistics/chart_widget.cpp index 72f6e0cb1..4d96d8c1b 100644 --- a/Telegram/SourceFiles/statistics/chart_widget.cpp +++ b/Telegram/SourceFiles/statistics/chart_widget.cpp @@ -9,13 +9,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/qt/qt_key_modifiers.h" #include "lang/lang_keys.h" -#include "statistics/chart_header_widget.h" #include "statistics/chart_lines_filter_controller.h" -#include "statistics/chart_lines_filter_widget.h" -#include "statistics/point_details_widget.h" #include "statistics/view/abstract_chart_view.h" #include "statistics/view/chart_view_factory.h" #include "statistics/view/stack_chart_common.h" +#include "statistics/widgets/chart_header_widget.h" +#include "statistics/widgets/chart_lines_filter_widget.h" +#include "statistics/widgets/point_details_widget.h" #include "ui/abstract_button.h" #include "ui/effects/animation_value_f.h" #include "ui/effects/ripple_animation.h" diff --git a/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp b/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp index 18249e95e..6402b8eea 100644 --- a/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp +++ b/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp @@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_statistics_chart.h" #include "statistics/chart_lines_filter_controller.h" -#include "statistics/point_details_widget.h" #include "statistics/view/stack_chart_common.h" +#include "statistics/widgets/point_details_widget.h" #include "ui/effects/animation_value_f.h" #include "ui/painter.h" #include "ui/rect.h" diff --git a/Telegram/SourceFiles/statistics/chart_header_widget.cpp b/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp similarity index 96% rename from Telegram/SourceFiles/statistics/chart_header_widget.cpp rename to Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp index 35858c008..f22cffcee 100644 --- a/Telegram/SourceFiles/statistics/chart_header_widget.cpp +++ b/Telegram/SourceFiles/statistics/widgets/chart_header_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 "statistics/chart_header_widget.h" +#include "statistics/widgets/chart_header_widget.h" #include "ui/painter.h" #include "styles/style_statistics.h" diff --git a/Telegram/SourceFiles/statistics/chart_header_widget.h b/Telegram/SourceFiles/statistics/widgets/chart_header_widget.h similarity index 100% rename from Telegram/SourceFiles/statistics/chart_header_widget.h rename to Telegram/SourceFiles/statistics/widgets/chart_header_widget.h diff --git a/Telegram/SourceFiles/statistics/chart_lines_filter_widget.cpp b/Telegram/SourceFiles/statistics/widgets/chart_lines_filter_widget.cpp similarity index 99% rename from Telegram/SourceFiles/statistics/chart_lines_filter_widget.cpp rename to Telegram/SourceFiles/statistics/widgets/chart_lines_filter_widget.cpp index 582a97fe4..8098e24fc 100644 --- a/Telegram/SourceFiles/statistics/chart_lines_filter_widget.cpp +++ b/Telegram/SourceFiles/statistics/widgets/chart_lines_filter_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 "statistics/chart_lines_filter_widget.h" +#include "statistics/widgets/chart_lines_filter_widget.h" #include "ui/abstract_button.h" #include "ui/effects/animations.h" diff --git a/Telegram/SourceFiles/statistics/chart_lines_filter_widget.h b/Telegram/SourceFiles/statistics/widgets/chart_lines_filter_widget.h similarity index 100% rename from Telegram/SourceFiles/statistics/chart_lines_filter_widget.h rename to Telegram/SourceFiles/statistics/widgets/chart_lines_filter_widget.h diff --git a/Telegram/SourceFiles/statistics/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp similarity index 99% rename from Telegram/SourceFiles/statistics/point_details_widget.cpp rename to Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp index 21bb45576..5f09c1021 100644 --- a/Telegram/SourceFiles/statistics/point_details_widget.cpp +++ b/Telegram/SourceFiles/statistics/widgets/point_details_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 "statistics/point_details_widget.h" +#include "statistics/widgets/point_details_widget.h" #include "ui/cached_round_corners.h" #include "statistics/statistics_common.h" diff --git a/Telegram/SourceFiles/statistics/point_details_widget.h b/Telegram/SourceFiles/statistics/widgets/point_details_widget.h similarity index 100% rename from Telegram/SourceFiles/statistics/point_details_widget.h rename to Telegram/SourceFiles/statistics/widgets/point_details_widget.h diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake index 2d39aec0e..5887ac5a3 100644 --- a/Telegram/cmake/td_ui.cmake +++ b/Telegram/cmake/td_ui.cmake @@ -161,18 +161,12 @@ PRIVATE platform/mac/file_bookmark_mac.mm platform/platform_file_bookmark.h - statistics/chart_header_widget.cpp - statistics/chart_header_widget.h statistics/chart_lines_filter_controller.cpp statistics/chart_lines_filter_controller.h - statistics/chart_lines_filter_widget.cpp - statistics/chart_lines_filter_widget.h statistics/chart_rulers_data.cpp statistics/chart_rulers_data.h statistics/chart_widget.cpp statistics/chart_widget.h - statistics/point_details_widget.cpp - statistics/point_details_widget.h statistics/segment_tree.cpp statistics/segment_tree.h statistics/statistics_common.h @@ -193,6 +187,12 @@ PRIVATE statistics/view/stack_linear_chart_common.h statistics/view/stack_linear_chart_view.cpp statistics/view/stack_linear_chart_view.h + statistics/widgets/chart_header_widget.cpp + statistics/widgets/chart_header_widget.h + statistics/widgets/chart_lines_filter_widget.cpp + statistics/widgets/chart_lines_filter_widget.h + statistics/widgets/point_details_widget.cpp + statistics/widgets/point_details_widget.h ui/boxes/auto_delete_settings.cpp ui/boxes/auto_delete_settings.h