Moved some photo editor files to separate directories.

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

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 {
 

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"

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 {

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 <QGraphicsView>

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"

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 {
 

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"

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 <QGraphicsSceneMouseEvent>

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"

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 <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>

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 <QGraphicsScene>
 

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 {
 

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"

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;

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"