From d2ef174d13e1103c651dd5cec469cfdd9cb9409d Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Wed, 25 Aug 2021 01:09:37 +0300 Subject: [PATCH] Reorganize custom boxes --- Telegram/CMakeLists.txt | 16 ++++++++-------- Telegram/SourceFiles/api/api_bot.cpp | 2 +- .../SourceFiles/core/click_handler_types.cpp | 2 +- Telegram/SourceFiles/history/history_widget.cpp | 2 +- .../history/view/media/history_view_poll.cpp | 2 +- .../kotato_confirm_box.cpp} | 2 +- .../confirm_box.h => boxes/kotato_confirm_box.h} | 0 .../fonts_box.cpp => boxes/kotato_fonts_box.cpp} | 2 +- .../fonts_box.h => boxes/kotato_fonts_box.h} | 0 .../radio_box.cpp => boxes/kotato_radio_box.cpp} | 2 +- .../radio_box.h => boxes/kotato_radio_box.h} | 0 .../unpin_box.cpp => boxes/kotato_unpin_box.cpp} | 2 +- .../unpin_box.h => boxes/kotato_unpin_box.h} | 0 Telegram/SourceFiles/kotato/settings_menu.cpp | 4 ++-- Telegram/SourceFiles/window/window_peer_menu.cpp | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) rename Telegram/SourceFiles/kotato/{customboxes/confirm_box.cpp => boxes/kotato_confirm_box.cpp} (98%) rename Telegram/SourceFiles/kotato/{customboxes/confirm_box.h => boxes/kotato_confirm_box.h} (100%) rename Telegram/SourceFiles/kotato/{customboxes/fonts_box.cpp => boxes/kotato_fonts_box.cpp} (99%) rename Telegram/SourceFiles/kotato/{customboxes/fonts_box.h => boxes/kotato_fonts_box.h} (100%) rename Telegram/SourceFiles/kotato/{customboxes/radio_box.cpp => boxes/kotato_radio_box.cpp} (98%) rename Telegram/SourceFiles/kotato/{customboxes/radio_box.h => boxes/kotato_radio_box.h} (100%) rename Telegram/SourceFiles/kotato/{customboxes/unpin_box.cpp => boxes/kotato_unpin_box.cpp} (98%) rename Telegram/SourceFiles/kotato/{customboxes/unpin_box.h => boxes/kotato_unpin_box.h} (100%) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index c701638d1..d8a19a8f2 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -736,14 +736,14 @@ PRIVATE intro/intro_step.h intro/intro_widget.cpp intro/intro_widget.h - kotato/customboxes/confirm_box.cpp - kotato/customboxes/confirm_box.h - kotato/customboxes/fonts_box.cpp - kotato/customboxes/fonts_box.h - kotato/customboxes/radio_box.cpp - kotato/customboxes/radio_box.h - kotato/customboxes/unpin_box.cpp - kotato/customboxes/unpin_box.h + kotato/boxes/kotato_confirm_box.cpp + kotato/boxes/kotato_confirm_box.h + kotato/boxes/kotato_fonts_box.cpp + kotato/boxes/kotato_fonts_box.h + kotato/boxes/kotato_radio_box.cpp + kotato/boxes/kotato_radio_box.h + kotato/boxes/kotato_unpin_box.cpp + kotato/boxes/kotato_unpin_box.h kotato/json_settings.cpp kotato/json_settings.h kotato/settings_menu.cpp diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp index 677d2dd4e..74704f27e 100644 --- a/Telegram/SourceFiles/api/api_bot.cpp +++ b/Telegram/SourceFiles/api/api_bot.cpp @@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/share_box.h" #include "boxes/passcode_box.h" #include "lang/lang_keys.h" -#include "kotato/customboxes/confirm_box.h" +#include "kotato/boxes/kotato_confirm_box.h" #include "core/click_handler_types.h" #include "data/data_changes.h" #include "data/data_peer.h" diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index 265869a4a..a02326148 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwidget.h" #include "main/main_session.h" #include "boxes/confirm_box.h" -#include "kotato/customboxes/confirm_box.h" +#include "kotato/boxes/kotato_confirm_box.h" #include "base/qthelp_regex.h" #include "storage/storage_account.h" #include "history/view/history_view_element.h" diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 7576f45b7..2b3fbc8e4 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/share_box.h" #include "boxes/edit_caption_box.h" #include "boxes/peers/edit_peer_permissions_box.h" // ShowAboutGigagroup. -#include "kotato/customboxes/confirm_box.h" +#include "kotato/boxes/kotato_confirm_box.h" #include "core/file_utilities.h" #include "ui/toast/toast.h" #include "ui/toasts/common_toasts.h" diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp index 899fc8d18..5673955af 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp @@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/effects/ripple_animation.h" #include "ui/effects/fireworks_animation.h" #include "ui/toast/toast.h" -#include "kotato/customboxes/confirm_box.h" +#include "kotato/boxes/kotato_confirm_box.h" #include "data/data_media_types.h" #include "data/data_poll.h" #include "data/data_user.h" diff --git a/Telegram/SourceFiles/kotato/customboxes/confirm_box.cpp b/Telegram/SourceFiles/kotato/boxes/kotato_confirm_box.cpp similarity index 98% rename from Telegram/SourceFiles/kotato/customboxes/confirm_box.cpp rename to Telegram/SourceFiles/kotato/boxes/kotato_confirm_box.cpp index 803ece751..7b8d73d58 100644 --- a/Telegram/SourceFiles/kotato/customboxes/confirm_box.cpp +++ b/Telegram/SourceFiles/kotato/boxes/kotato_confirm_box.cpp @@ -5,7 +5,7 @@ the unofficial app based on Telegram Desktop. For license and copyright information please follow this link: https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL */ -#include "kotato/customboxes/confirm_box.h" +#include "kotato/boxes/kotato_confirm_box.h" #include "lang/lang_keys.h" #include "ui/widgets/labels.h" diff --git a/Telegram/SourceFiles/kotato/customboxes/confirm_box.h b/Telegram/SourceFiles/kotato/boxes/kotato_confirm_box.h similarity index 100% rename from Telegram/SourceFiles/kotato/customboxes/confirm_box.h rename to Telegram/SourceFiles/kotato/boxes/kotato_confirm_box.h diff --git a/Telegram/SourceFiles/kotato/customboxes/fonts_box.cpp b/Telegram/SourceFiles/kotato/boxes/kotato_fonts_box.cpp similarity index 99% rename from Telegram/SourceFiles/kotato/customboxes/fonts_box.cpp rename to Telegram/SourceFiles/kotato/boxes/kotato_fonts_box.cpp index 42e46fb5c..cef24b1bd 100644 --- a/Telegram/SourceFiles/kotato/customboxes/fonts_box.cpp +++ b/Telegram/SourceFiles/kotato/boxes/kotato_fonts_box.cpp @@ -5,7 +5,7 @@ the unofficial app based on Telegram Desktop. For license and copyright information please follow this link: https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL */ -#include "kotato/customboxes/fonts_box.h" +#include "kotato/boxes/kotato_fonts_box.h" #include "kotato/kotato_lang.h" #include "base/platform/base_platform_info.h" diff --git a/Telegram/SourceFiles/kotato/customboxes/fonts_box.h b/Telegram/SourceFiles/kotato/boxes/kotato_fonts_box.h similarity index 100% rename from Telegram/SourceFiles/kotato/customboxes/fonts_box.h rename to Telegram/SourceFiles/kotato/boxes/kotato_fonts_box.h diff --git a/Telegram/SourceFiles/kotato/customboxes/radio_box.cpp b/Telegram/SourceFiles/kotato/boxes/kotato_radio_box.cpp similarity index 98% rename from Telegram/SourceFiles/kotato/customboxes/radio_box.cpp rename to Telegram/SourceFiles/kotato/boxes/kotato_radio_box.cpp index 8a6a54044..ada3862bb 100644 --- a/Telegram/SourceFiles/kotato/customboxes/radio_box.cpp +++ b/Telegram/SourceFiles/kotato/boxes/kotato_radio_box.cpp @@ -5,7 +5,7 @@ the unofficial app based on Telegram Desktop. For license and copyright information please follow this link: https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL */ -#include "kotato/customboxes/radio_box.h" +#include "kotato/boxes/kotato_radio_box.h" #include "lang/lang_keys.h" #include "ui/wrap/vertical_layout.h" diff --git a/Telegram/SourceFiles/kotato/customboxes/radio_box.h b/Telegram/SourceFiles/kotato/boxes/kotato_radio_box.h similarity index 100% rename from Telegram/SourceFiles/kotato/customboxes/radio_box.h rename to Telegram/SourceFiles/kotato/boxes/kotato_radio_box.h diff --git a/Telegram/SourceFiles/kotato/customboxes/unpin_box.cpp b/Telegram/SourceFiles/kotato/boxes/kotato_unpin_box.cpp similarity index 98% rename from Telegram/SourceFiles/kotato/customboxes/unpin_box.cpp rename to Telegram/SourceFiles/kotato/boxes/kotato_unpin_box.cpp index 63ad9bba1..286897a48 100644 --- a/Telegram/SourceFiles/kotato/customboxes/unpin_box.cpp +++ b/Telegram/SourceFiles/kotato/boxes/kotato_unpin_box.cpp @@ -5,7 +5,7 @@ the unofficial app based on Telegram Desktop. For license and copyright information please follow this link: https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL */ -#include "kotato/customboxes/unpin_box.h" +#include "kotato/boxes/kotato_unpin_box.h" #include "kotato/kotato_lang.h" #include "lang/lang_keys.h" diff --git a/Telegram/SourceFiles/kotato/customboxes/unpin_box.h b/Telegram/SourceFiles/kotato/boxes/kotato_unpin_box.h similarity index 100% rename from Telegram/SourceFiles/kotato/customboxes/unpin_box.h rename to Telegram/SourceFiles/kotato/boxes/kotato_unpin_box.h diff --git a/Telegram/SourceFiles/kotato/settings_menu.cpp b/Telegram/SourceFiles/kotato/settings_menu.cpp index 836e595c1..8645cd3f9 100644 --- a/Telegram/SourceFiles/kotato/settings_menu.cpp +++ b/Telegram/SourceFiles/kotato/settings_menu.cpp @@ -19,8 +19,8 @@ https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL #include "ui/widgets/continuous_sliders.h" #include "ui/text/text_utilities.h" // Ui::Text::ToUpper #include "boxes/connection_box.h" -#include "kotato/customboxes/fonts_box.h" -#include "kotato/customboxes/radio_box.h" +#include "kotato/boxes/kotato_fonts_box.h" +#include "kotato/boxes/kotato_radio_box.h" #include "boxes/about_box.h" #include "boxes/confirm_box.h" #include "platform/platform_specific.h" diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 2703c0a3a..057391467 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/peers/add_participants_box.h" #include "boxes/peers/edit_contact_box.h" #include "boxes/share_box.h" -#include "kotato/customboxes/unpin_box.h" +#include "kotato/boxes/kotato_unpin_box.h" #include "ui/boxes/report_box.h" #include "ui/toast/toast.h" #include "ui/text/text_utilities.h"