Merge branch 'master' into wip-translator

Wohlstand · Wohlstand · commit 60c7b00f5b01 · 2025-04-10T05:08:06.000+03:00
diff --git a/Editor/editing/_scenes/level/items/item_bgo.h b/Editor/editing/_scenes/level/items/item_bgo.h
@@ -27,8 +27,13 @@
 
 class ItemBGO : public LvlBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemBGO", sourceText, disambiguation, n);
+    }
+
 public:
     ItemBGO(QGraphicsItem *parent = nullptr);
     ItemBGO(LvlScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/level/items/item_block.h b/Editor/editing/_scenes/level/items/item_block.h
@@ -27,8 +27,13 @@
 
 class ItemBlock : public LvlBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemBlock", sourceText, disambiguation, n);
+    }
+
 public:
     ItemBlock(LvlScene *parentScene, QGraphicsItem *parent = nullptr);
     ItemBlock(QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/level/items/item_door.h b/Editor/editing/_scenes/level/items/item_door.h
@@ -27,8 +27,13 @@
 
 class ItemDoor : public LvlBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemDoor", sourceText, disambiguation, n);
+    }
+
 public:
     ItemDoor(QGraphicsItem *parent = nullptr);
     ItemDoor(LvlScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/level/items/item_npc.h b/Editor/editing/_scenes/level/items/item_npc.h
@@ -27,8 +27,13 @@
 
 class ItemNPC : public LvlBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemNPC", sourceText, disambiguation, n);
+    }
+
 public:
     ItemNPC(LvlScene *parentScene, QGraphicsItem *parent = nullptr);
     ItemNPC(bool noScene = false, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/level/items/item_playerpoint.h b/Editor/editing/_scenes/level/items/item_playerpoint.h
@@ -27,8 +27,13 @@
 
 class ItemPlayerPoint : public LvlBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemPlayerPoint", sourceText, disambiguation, n);
+    }
+
 public:
     explicit ItemPlayerPoint(QGraphicsItem *parent = nullptr);
     explicit ItemPlayerPoint(LvlScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/level/items/item_water.h b/Editor/editing/_scenes/level/items/item_water.h
@@ -27,8 +27,13 @@
 
 class ItemPhysEnv : public LvlBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemPhysEnv", sourceText, disambiguation, n);
+    }
+
 public:
     ItemPhysEnv(QGraphicsItem *parent = nullptr);
     ItemPhysEnv(LvlScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/level/items/lvl_base_item.h b/Editor/editing/_scenes/level/items/lvl_base_item.h
@@ -30,11 +30,8 @@
 
 class LvlScene;
 
-class LvlBaseItem:
-    public QObject,
-    public QGraphicsItem
+class LvlBaseItem : public QGraphicsItem
 {
-    Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
 
 private:
diff --git a/Editor/editing/_scenes/world/items/item_level.h b/Editor/editing/_scenes/world/items/item_level.h
@@ -27,8 +27,13 @@
 
 class ItemLevel : public WldBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemLevel", sourceText, disambiguation, n);
+    }
+
 public:
     ItemLevel(QGraphicsItem *parent = nullptr);
     ItemLevel(WldScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/world/items/item_music.h b/Editor/editing/_scenes/world/items/item_music.h
@@ -27,8 +27,13 @@
 
 class ItemMusic : public WldBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemMusic", sourceText, disambiguation, n);
+    }
+
 public:
     ItemMusic(QGraphicsItem *parent = nullptr);
     ItemMusic(WldScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/world/items/item_path.h b/Editor/editing/_scenes/world/items/item_path.h
@@ -27,8 +27,13 @@
 
 class ItemPath : public WldBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemPath", sourceText, disambiguation, n);
+    }
+
 public:
     ItemPath(QGraphicsItem *parent = nullptr);
     ItemPath(WldScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/world/items/item_point.cpp b/Editor/editing/_scenes/world/items/item_point.cpp
@@ -30,8 +30,8 @@ void ItemPoint::construct()
     m_imageSize.setHeight(32);
 }
 
-ItemPoint::ItemPoint(QGraphicsItem *parent)
-    : WldBaseItem(parent)
+ItemPoint::ItemPoint(QGraphicsItem *parent, QObject *q_parent)
+    : QObject(q_parent), WldBaseItem(parent)
 {
     construct();
 }
diff --git a/Editor/editing/_scenes/world/items/item_point.h b/Editor/editing/_scenes/world/items/item_point.h
@@ -25,11 +25,13 @@
 #include "../wld_scene.h"
 #include "wld_base_item.h"
 
-class ItemPoint : public WldBaseItem
+class ItemPoint : public QObject, public WldBaseItem
 {
+    Q_OBJECT
     void construct();
+
 public:
-    ItemPoint(QGraphicsItem *parent = nullptr);
+    ItemPoint(QGraphicsItem *parent = nullptr, QObject *q_parent = nullptr);
     ItemPoint(WldScene *scenePoint, QGraphicsItem *parent = nullptr);
     virtual ~ItemPoint();
 
diff --git a/Editor/editing/_scenes/world/items/item_scene.h b/Editor/editing/_scenes/world/items/item_scene.h
@@ -27,8 +27,13 @@
 
 class ItemScene : public WldBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemScene", sourceText, disambiguation, n);
+    }
+
 public:
     ItemScene(QGraphicsItem *parent = nullptr);
     ItemScene(WldScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/world/items/item_tile.h b/Editor/editing/_scenes/world/items/item_tile.h
@@ -27,8 +27,13 @@
 
 class ItemTile : public WldBaseItem
 {
-    Q_OBJECT
     void construct();
+
+    static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1)
+    {
+        return QCoreApplication::translate("ItemTile", sourceText, disambiguation, n);
+    }
+
 public:
     ItemTile(QGraphicsItem *parent = nullptr);
     ItemTile(WldScene *parentScene, QGraphicsItem *parent = nullptr);
diff --git a/Editor/editing/_scenes/world/items/wld_base_item.cpp b/Editor/editing/_scenes/world/items/wld_base_item.cpp
@@ -40,7 +40,7 @@ void WldBaseItem::construct()
 }
 
 WldBaseItem::WldBaseItem(QGraphicsItem *parent) :
-    QGraphicsItem(parent), m_scene(nullptr)
+    QGraphicsItem(parent)
 {
     construct();
 }
diff --git a/Editor/editing/_scenes/world/items/wld_base_item.h b/Editor/editing/_scenes/world/items/wld_base_item.h
@@ -28,10 +28,8 @@
 #include <math.h>
 
 class WldScene;
-class WldBaseItem: public QObject,
-    public QGraphicsItem
+class WldBaseItem : public QGraphicsItem
 {
-    Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
 
     /*!
diff --git a/Editor/editing/_scenes/world/wld_point_selector.h b/Editor/editing/_scenes/world/wld_point_selector.h
@@ -34,6 +34,7 @@ class WldPointSelector : public QObject
     QGraphicsItem *m_pointItem;
     //! Sprite of the point indicator
     QPixmap         m_pointImg;
+
 public:
     explicit WldPointSelector(WldScene *scene, QObject *parent = nullptr);
     virtual ~WldPointSelector();
diff --git a/Editor/main_window/dock/lvl_events_box.cpp b/Editor/main_window/dock/lvl_events_box.cpp
@@ -2433,8 +2433,6 @@ void LvlEventsBox::sctBackgroundImageChanged(int index)
 
 void LvlEventsBox::on_LVLEvent_Cmn_Msg_clicked()
 {
-    if(m_currentEventArrayID < 0) return;
-
     int WinType = mw()->activeChildWindow();
 
     if(WinType == MainWindow::WND_Level)
diff --git a/Editor/main_window/dock/lvl_events_box.h b/Editor/main_window/dock/lvl_events_box.h
@@ -166,7 +166,7 @@ private slots:
 
     Ui::LvlEventsBox *ui;
 
-    long m_currentEventArrayID = 0;
+    uint32_t m_currentEventArrayID = 0;
     bool m_internalLock = false;
 
     bool m_lockEventSectionDataList = false;
diff --git a/Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java b/Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java
@@ -60,8 +60,8 @@
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
-    private static final int SDL_MINOR_VERSION = 30;
-    private static final int SDL_MICRO_VERSION = 10;
+    private static final int SDL_MINOR_VERSION = 32;
+    private static final int SDL_MICRO_VERSION = 4;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -790,6 +790,9 @@ public void handleMessage(Message msg) {
                                 window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
                                 SDLActivity.mFullscreenModeActive = false;
                             }
+                            if (Build.VERSION.SDK_INT >= 28 /* Android 9 (Pie) */) {
+                                window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+                            }
                         }
                     } else {
                         Log.e(TAG, "error handling message, getContext() returned no Activity");
diff --git a/_Libs/AudioCodecs b/_Libs/AudioCodecs
@@ -1 +1 @@
-Subproject commit 4fc55189fc351f88e57992acc491d940372e1a38
+Subproject commit fe3bd5d37a9e37f3b4bbab1568fe1b8834c4beff
diff --git a/_Libs/SDL_Mixer_X b/_Libs/SDL_Mixer_X
@@ -1 +1 @@
-Subproject commit 472da67d1b0387408ba37c32eb870e89f16f0a93
+Subproject commit 12241e7500111f833942a3368c551ceebc60db43
