From 832dd8d50c3a875eb7da9a7401013d654a5faa5a Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sun, 21 Mar 2021 15:38:33 +0300 Subject: [PATCH] Moved some photo editor files to separate directories. --- Telegram/CMakeLists.txt | 30 +++++++++---------- .../editor/{ => controllers}/controllers.h | 4 +-- .../stickers_panel_controller.cpp | 2 +- .../stickers_panel_controller.h | 0 .../{ => controllers}/undo_controller.cpp | 2 +- .../{ => controllers}/undo_controller.h | 0 Telegram/SourceFiles/editor/editor_paint.cpp | 10 +++---- Telegram/SourceFiles/editor/photo_editor.cpp | 2 +- .../editor/photo_editor_common.cpp | 2 +- .../editor/photo_editor_controls.cpp | 2 +- .../SourceFiles/editor/{ => scene}/scene.cpp | 8 ++--- .../SourceFiles/editor/{ => scene}/scene.h | 0 .../editor/{ => scene}/scene_item_base.cpp | 4 +-- .../editor/{ => scene}/scene_item_base.h | 0 .../editor/{ => scene}/scene_item_canvas.cpp | 2 +- .../editor/{ => scene}/scene_item_canvas.h | 0 .../editor/{ => scene}/scene_item_line.cpp | 2 +- .../editor/{ => scene}/scene_item_line.h | 2 +- .../editor/{ => scene}/scene_item_sticker.cpp | 2 +- .../editor/{ => scene}/scene_item_sticker.h | 2 +- .../SourceFiles/storage/localimageloader.cpp | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) rename Telegram/SourceFiles/editor/{ => controllers}/controllers.h (87%) rename Telegram/SourceFiles/editor/{ => controllers}/stickers_panel_controller.cpp (97%) rename Telegram/SourceFiles/editor/{ => controllers}/stickers_panel_controller.h (100%) rename Telegram/SourceFiles/editor/{ => controllers}/undo_controller.cpp (95%) rename Telegram/SourceFiles/editor/{ => controllers}/undo_controller.h (100%) rename Telegram/SourceFiles/editor/{ => scene}/scene.cpp (95%) rename Telegram/SourceFiles/editor/{ => scene}/scene.h (100%) rename Telegram/SourceFiles/editor/{ => scene}/scene_item_base.cpp (98%) rename Telegram/SourceFiles/editor/{ => scene}/scene_item_base.h (100%) rename Telegram/SourceFiles/editor/{ => scene}/scene_item_canvas.cpp (99%) rename Telegram/SourceFiles/editor/{ => scene}/scene_item_canvas.h (100%) rename Telegram/SourceFiles/editor/{ => scene}/scene_item_line.cpp (95%) rename Telegram/SourceFiles/editor/{ => scene}/scene_item_line.h (95%) rename Telegram/SourceFiles/editor/{ => scene}/scene_item_sticker.cpp (98%) rename Telegram/SourceFiles/editor/{ => scene}/scene_item_sticker.h (96%) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 899d58684..9e897bc5b 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -508,7 +508,11 @@ PRIVATE dialogs/dialogs_widget.h editor/color_picker.cpp editor/color_picker.h - editor/controllers.h + editor/controllers/controllers.h + editor/controllers/stickers_panel_controller.cpp + editor/controllers/stickers_panel_controller.h + editor/controllers/undo_controller.cpp + editor/controllers/undo_controller.h editor/editor_crop.cpp editor/editor_crop.h editor/editor_paint.cpp @@ -523,20 +527,16 @@ PRIVATE editor/photo_editor_controls.h editor/photo_editor_layer_widget.cpp editor/photo_editor_layer_widget.h - editor/scene.cpp - editor/scene.h - editor/scene_item_base.cpp - editor/scene_item_base.h - editor/scene_item_canvas.cpp - editor/scene_item_canvas.h - editor/scene_item_line.cpp - editor/scene_item_line.h - editor/scene_item_sticker.cpp - editor/scene_item_sticker.h - editor/stickers_panel_controller.cpp - editor/stickers_panel_controller.h - editor/undo_controller.cpp - editor/undo_controller.h + editor/scene/scene.cpp + editor/scene/scene.h + editor/scene/scene_item_base.cpp + editor/scene/scene_item_base.h + editor/scene/scene_item_canvas.cpp + editor/scene/scene_item_canvas.h + editor/scene/scene_item_line.cpp + editor/scene/scene_item_line.h + editor/scene/scene_item_sticker.cpp + editor/scene/scene_item_sticker.h export/export_manager.cpp export/export_manager.h export/view/export_view_content.cpp diff --git a/Telegram/SourceFiles/editor/controllers.h b/Telegram/SourceFiles/editor/controllers/controllers.h similarity index 87% rename from Telegram/SourceFiles/editor/controllers.h rename to Telegram/SourceFiles/editor/controllers/controllers.h index 53445cb7f..9bd40ef17 100644 --- a/Telegram/SourceFiles/editor/controllers.h +++ b/Telegram/SourceFiles/editor/controllers/controllers.h @@ -7,8 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "editor/stickers_panel_controller.h" -#include "editor/undo_controller.h" +#include "editor/controllers/stickers_panel_controller.h" +#include "editor/controllers/undo_controller.h" namespace Editor { diff --git a/Telegram/SourceFiles/editor/stickers_panel_controller.cpp b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp similarity index 97% rename from Telegram/SourceFiles/editor/stickers_panel_controller.cpp rename to Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp index 863ec837f..2c3577edd 100644 --- a/Telegram/SourceFiles/editor/stickers_panel_controller.cpp +++ b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.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 "editor/stickers_panel_controller.h" +#include "editor/controllers/stickers_panel_controller.h" #include "chat_helpers/tabbed_panel.h" #include "chat_helpers/tabbed_selector.h" diff --git a/Telegram/SourceFiles/editor/stickers_panel_controller.h b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.h similarity index 100% rename from Telegram/SourceFiles/editor/stickers_panel_controller.h rename to Telegram/SourceFiles/editor/controllers/stickers_panel_controller.h diff --git a/Telegram/SourceFiles/editor/undo_controller.cpp b/Telegram/SourceFiles/editor/controllers/undo_controller.cpp similarity index 95% rename from Telegram/SourceFiles/editor/undo_controller.cpp rename to Telegram/SourceFiles/editor/controllers/undo_controller.cpp index f9ca2b7f7..0d6579425 100644 --- a/Telegram/SourceFiles/editor/undo_controller.cpp +++ b/Telegram/SourceFiles/editor/controllers/undo_controller.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 "editor/undo_controller.h" +#include "editor/controllers/undo_controller.h" namespace Editor { namespace { diff --git a/Telegram/SourceFiles/editor/undo_controller.h b/Telegram/SourceFiles/editor/controllers/undo_controller.h similarity index 100% rename from Telegram/SourceFiles/editor/undo_controller.h rename to Telegram/SourceFiles/editor/controllers/undo_controller.h diff --git a/Telegram/SourceFiles/editor/editor_paint.cpp b/Telegram/SourceFiles/editor/editor_paint.cpp index a06f97388..a83f19100 100644 --- a/Telegram/SourceFiles/editor/editor_paint.cpp +++ b/Telegram/SourceFiles/editor/editor_paint.cpp @@ -7,11 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "editor/editor_paint.h" -#include "editor/scene.h" -#include "editor/scene_item_base.h" -#include "editor/scene_item_canvas.h" -#include "editor/scene_item_sticker.h" -#include "editor/controllers.h" +#include "editor/controllers/controllers.h" +#include "editor/scene/scene.h" +#include "editor/scene/scene_item_base.h" +#include "editor/scene/scene_item_canvas.h" +#include "editor/scene/scene_item_sticker.h" #include "lottie/lottie_single_player.h" #include diff --git a/Telegram/SourceFiles/editor/photo_editor.cpp b/Telegram/SourceFiles/editor/photo_editor.cpp index b2d1ed3d5..dfa8303a3 100644 --- a/Telegram/SourceFiles/editor/photo_editor.cpp +++ b/Telegram/SourceFiles/editor/photo_editor.cpp @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "core/core_settings.h" #include "editor/color_picker.h" -#include "editor/controllers.h" +#include "editor/controllers/controllers.h" #include "editor/photo_editor_content.h" #include "editor/photo_editor_controls.h" #include "window/window_controller.h" diff --git a/Telegram/SourceFiles/editor/photo_editor_common.cpp b/Telegram/SourceFiles/editor/photo_editor_common.cpp index 33530cd68..3d9b94427 100644 --- a/Telegram/SourceFiles/editor/photo_editor_common.cpp +++ b/Telegram/SourceFiles/editor/photo_editor_common.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "editor/photo_editor_common.h" -#include "editor/scene.h" +#include "editor/scene/scene.h" namespace Editor { diff --git a/Telegram/SourceFiles/editor/photo_editor_controls.cpp b/Telegram/SourceFiles/editor/photo_editor_controls.cpp index 6d43fb144..4aca10010 100644 --- a/Telegram/SourceFiles/editor/photo_editor_controls.cpp +++ b/Telegram/SourceFiles/editor/photo_editor_controls.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "editor/photo_editor_controls.h" -#include "editor/controllers.h" +#include "editor/controllers/controllers.h" #include "lang/lang_keys.h" #include "ui/image/image_prepare.h" #include "ui/widgets/buttons.h" diff --git a/Telegram/SourceFiles/editor/scene.cpp b/Telegram/SourceFiles/editor/scene/scene.cpp similarity index 95% rename from Telegram/SourceFiles/editor/scene.cpp rename to Telegram/SourceFiles/editor/scene/scene.cpp index 1a3d49ff8..b9f6019cd 100644 --- a/Telegram/SourceFiles/editor/scene.cpp +++ b/Telegram/SourceFiles/editor/scene/scene.cpp @@ -5,11 +5,11 @@ 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 "editor/scene.h" +#include "editor/scene/scene.h" -#include "editor/scene_item_canvas.h" -#include "editor/scene_item_line.h" -#include "editor/scene_item_sticker.h" +#include "editor/scene/scene_item_canvas.h" +#include "editor/scene/scene_item_line.h" +#include "editor/scene/scene_item_sticker.h" #include "ui/rp_widget.h" #include diff --git a/Telegram/SourceFiles/editor/scene.h b/Telegram/SourceFiles/editor/scene/scene.h similarity index 100% rename from Telegram/SourceFiles/editor/scene.h rename to Telegram/SourceFiles/editor/scene/scene.h diff --git a/Telegram/SourceFiles/editor/scene_item_base.cpp b/Telegram/SourceFiles/editor/scene/scene_item_base.cpp similarity index 98% rename from Telegram/SourceFiles/editor/scene_item_base.cpp rename to Telegram/SourceFiles/editor/scene/scene_item_base.cpp index cb076d7c0..da7d7ed49 100644 --- a/Telegram/SourceFiles/editor/scene_item_base.cpp +++ b/Telegram/SourceFiles/editor/scene/scene_item_base.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 "editor/scene_item_base.h" +#include "editor/scene/scene_item_base.h" -#include "editor/scene.h" +#include "editor/scene/scene.h" #include "lang/lang_keys.h" #include "ui/widgets/popup_menu.h" #include "styles/style_editor.h" diff --git a/Telegram/SourceFiles/editor/scene_item_base.h b/Telegram/SourceFiles/editor/scene/scene_item_base.h similarity index 100% rename from Telegram/SourceFiles/editor/scene_item_base.h rename to Telegram/SourceFiles/editor/scene/scene_item_base.h diff --git a/Telegram/SourceFiles/editor/scene_item_canvas.cpp b/Telegram/SourceFiles/editor/scene/scene_item_canvas.cpp similarity index 99% rename from Telegram/SourceFiles/editor/scene_item_canvas.cpp rename to Telegram/SourceFiles/editor/scene/scene_item_canvas.cpp index 5b85357cf..b6cecc646 100644 --- a/Telegram/SourceFiles/editor/scene_item_canvas.cpp +++ b/Telegram/SourceFiles/editor/scene/scene_item_canvas.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 "editor/scene_item_canvas.h" +#include "editor/scene/scene_item_canvas.h" #include #include diff --git a/Telegram/SourceFiles/editor/scene_item_canvas.h b/Telegram/SourceFiles/editor/scene/scene_item_canvas.h similarity index 100% rename from Telegram/SourceFiles/editor/scene_item_canvas.h rename to Telegram/SourceFiles/editor/scene/scene_item_canvas.h diff --git a/Telegram/SourceFiles/editor/scene_item_line.cpp b/Telegram/SourceFiles/editor/scene/scene_item_line.cpp similarity index 95% rename from Telegram/SourceFiles/editor/scene_item_line.cpp rename to Telegram/SourceFiles/editor/scene/scene_item_line.cpp index 9a4c6349b..f193cd3fc 100644 --- a/Telegram/SourceFiles/editor/scene_item_line.cpp +++ b/Telegram/SourceFiles/editor/scene/scene_item_line.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 "editor/scene_item_line.h" +#include "editor/scene/scene_item_line.h" #include diff --git a/Telegram/SourceFiles/editor/scene_item_line.h b/Telegram/SourceFiles/editor/scene/scene_item_line.h similarity index 95% rename from Telegram/SourceFiles/editor/scene_item_line.h rename to Telegram/SourceFiles/editor/scene/scene_item_line.h index 154b95f82..e016338d5 100644 --- a/Telegram/SourceFiles/editor/scene_item_line.h +++ b/Telegram/SourceFiles/editor/scene/scene_item_line.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "editor/scene_item_base.h" +#include "editor/scene/scene_item_base.h" namespace Editor { diff --git a/Telegram/SourceFiles/editor/scene_item_sticker.cpp b/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp similarity index 98% rename from Telegram/SourceFiles/editor/scene_item_sticker.cpp rename to Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp index 9c29f7cd2..0345c0d1a 100644 --- a/Telegram/SourceFiles/editor/scene_item_sticker.cpp +++ b/Telegram/SourceFiles/editor/scene/scene_item_sticker.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 "editor/scene_item_sticker.h" +#include "editor/scene/scene_item_sticker.h" #include "app.h" #include "chat_helpers/stickers_lottie.h" diff --git a/Telegram/SourceFiles/editor/scene_item_sticker.h b/Telegram/SourceFiles/editor/scene/scene_item_sticker.h similarity index 96% rename from Telegram/SourceFiles/editor/scene_item_sticker.h rename to Telegram/SourceFiles/editor/scene/scene_item_sticker.h index f78186974..6254f30cf 100644 --- a/Telegram/SourceFiles/editor/scene_item_sticker.h +++ b/Telegram/SourceFiles/editor/scene/scene_item_sticker.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "editor/scene_item_base.h" +#include "editor/scene/scene_item_base.h" namespace Data { class DocumentMedia; diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp index acabea47b..bec5601e5 100644 --- a/Telegram/SourceFiles/storage/localimageloader.cpp +++ b/Telegram/SourceFiles/storage/localimageloader.cpp @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/mime_type.h" #include "base/unixtime.h" #include "base/qt_adapters.h" -#include "editor/scene.h" // Editor::Scene::attachedStickers +#include "editor/scene/scene.h" // Editor::Scene::attachedStickers #include "media/audio/media_audio.h" #include "media/clip/media_clip_reader.h" #include "mtproto/facade.h"