From b82126672c191998dfd6fa2cdb422e93b09aa4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 1 Jul 2026 18:28:10 +0200 Subject: [PATCH 1/3] Sphinx: Tiny up .gitignore and remove stale sphinx.pot (#4560) Split the combined "Doxygen and Sphinx" section and note that the html/ rule is for Doxygen's output. Only the .pot files under docs/_build/gettext are meant to be tracked, but the gettext builder writes other output (static asset dirs) alongside them. Ignore everything under docs/_build/gettext except the .pot sources. Remove orphaned sphinx.pot and its translations, stale since f21a6b97f ("docs: Use the sphinx-docsearch extension"). --- .gitignore | 13 ++++--- docs/_build/gettext/sphinx.pot | 37 -------------------- docs/locale/de/LC_MESSAGES/sphinx.po | 38 -------------------- docs/locale/fi/LC_MESSAGES/sphinx.po | 42 ----------------------- docs/locale/fr/LC_MESSAGES/sphinx.po | 38 -------------------- docs/locale/nb_NO/LC_MESSAGES/sphinx.po | 42 ----------------------- docs/locale/zh_Hans/LC_MESSAGES/sphinx.po | 42 ----------------------- 7 files changed, 9 insertions(+), 243 deletions(-) delete mode 100644 docs/_build/gettext/sphinx.pot delete mode 100644 docs/locale/de/LC_MESSAGES/sphinx.po delete mode 100644 docs/locale/fi/LC_MESSAGES/sphinx.po delete mode 100644 docs/locale/fr/LC_MESSAGES/sphinx.po delete mode 100644 docs/locale/nb_NO/LC_MESSAGES/sphinx.po delete mode 100644 docs/locale/zh_Hans/LC_MESSAGES/sphinx.po diff --git a/.gitignore b/.gitignore index db9c8184cb..45a841e04e 100644 --- a/.gitignore +++ b/.gitignore @@ -33,13 +33,18 @@ build/ # Ronn html outputs man/*.1.html -# Doxygen and Sphinx +# Doxygen (writes its HTML output to ./html, see Doxyfile: HTML_OUTPUT) html/ -docs/_build/html/ -docs/_build/gettext/.doctrees -docs/_build/doctrees/ + +# Sphinx docs/.venv/ *.mo +docs/_build/html/ +docs/_build/doctrees/ +# Only the .pot files here are source; ignore the other output the gettext +# builder writes alongside them (static asset dirs, etc.). +docs/_build/gettext/* +!docs/_build/gettext/*.pot # tsdoc generation results docs/scripting-doc/out/ diff --git a/docs/_build/gettext/sphinx.pot b/docs/_build/gettext/sphinx.pot deleted file mode 100644 index e07b8f11b0..0000000000 --- a/docs/_build/gettext/sphinx.pot +++ /dev/null @@ -1,37 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2023, Tiled Documentation Writers -# This file is distributed under the same license as the Tiled package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Tiled 1.10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-10 11:19+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../../_templates/layout.html:61 -msgid "Search within %(docstitle)s" -msgstr "" - -#: ../../_templates/layout.html:83 -msgid "About these documents" -msgstr "" - -#: ../../_templates/layout.html:86 -msgid "Index" -msgstr "" - -#: ../../_templates/layout.html:89 -msgid "Search" -msgstr "" - -#: ../../_templates/layout.html:92 -msgid "Copyright" -msgstr "" diff --git a/docs/locale/de/LC_MESSAGES/sphinx.po b/docs/locale/de/LC_MESSAGES/sphinx.po deleted file mode 100644 index ca3d835652..0000000000 --- a/docs/locale/de/LC_MESSAGES/sphinx.po +++ /dev/null @@ -1,38 +0,0 @@ -# German translations for Tiled package. -# Copyright (C) 2021, Tiled Documentation Writers -# This file is distributed under the same license as the Tiled package. -# Automatically generated, 2021. -# -msgid "" -msgstr "" -"Project-Id-Version: Tiled 1.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-04 15:28+0200\n" -"PO-Revision-Date: 2021-08-04 15:28+0200\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../../_templates/layout.html:61 -msgid "Search within %(docstitle)s" -msgstr "" - -#: ../../_templates/layout.html:83 -msgid "About these documents" -msgstr "" - -#: ../../_templates/layout.html:86 -msgid "Index" -msgstr "" - -#: ../../_templates/layout.html:89 -msgid "Search" -msgstr "" - -#: ../../_templates/layout.html:92 -msgid "Copyright" -msgstr "" diff --git a/docs/locale/fi/LC_MESSAGES/sphinx.po b/docs/locale/fi/LC_MESSAGES/sphinx.po deleted file mode 100644 index bdfc81de39..0000000000 --- a/docs/locale/fi/LC_MESSAGES/sphinx.po +++ /dev/null @@ -1,42 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2023, Tiled Documentation Writers -# This file is distributed under the same license as the Tiled package. -# FIRST AUTHOR , 2023. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Tiled 1.10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-10 11:19+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language: fi\n" -"Language-Team: fi \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" - -#: ../../_templates/layout.html:61 -#, python-format -msgid "Search within %(docstitle)s" -msgstr "" - -#: ../../_templates/layout.html:83 -msgid "About these documents" -msgstr "" - -#: ../../_templates/layout.html:86 -msgid "Index" -msgstr "" - -#: ../../_templates/layout.html:89 -msgid "Search" -msgstr "" - -#: ../../_templates/layout.html:92 -msgid "Copyright" -msgstr "" - diff --git a/docs/locale/fr/LC_MESSAGES/sphinx.po b/docs/locale/fr/LC_MESSAGES/sphinx.po deleted file mode 100644 index cc07297605..0000000000 --- a/docs/locale/fr/LC_MESSAGES/sphinx.po +++ /dev/null @@ -1,38 +0,0 @@ -# French translations for Tiled package. -# Copyright (C) 2021, Tiled Documentation Writers -# This file is distributed under the same license as the Tiled package. -# Automatically generated, 2021. -# -msgid "" -msgstr "" -"Project-Id-Version: Tiled 1.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-04 15:28+0200\n" -"PO-Revision-Date: 2021-08-04 15:28+0200\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../../_templates/layout.html:61 -msgid "Search within %(docstitle)s" -msgstr "" - -#: ../../_templates/layout.html:83 -msgid "About these documents" -msgstr "" - -#: ../../_templates/layout.html:86 -msgid "Index" -msgstr "" - -#: ../../_templates/layout.html:89 -msgid "Search" -msgstr "" - -#: ../../_templates/layout.html:92 -msgid "Copyright" -msgstr "" diff --git a/docs/locale/nb_NO/LC_MESSAGES/sphinx.po b/docs/locale/nb_NO/LC_MESSAGES/sphinx.po deleted file mode 100644 index 0c0872c178..0000000000 --- a/docs/locale/nb_NO/LC_MESSAGES/sphinx.po +++ /dev/null @@ -1,42 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2023, Tiled Documentation Writers -# This file is distributed under the same license as the Tiled package. -# FIRST AUTHOR , 2023. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Tiled 1.10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-10 11:19+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language: nb_NO\n" -"Language-Team: nb_NO \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" - -#: ../../_templates/layout.html:61 -#, python-format -msgid "Search within %(docstitle)s" -msgstr "" - -#: ../../_templates/layout.html:83 -msgid "About these documents" -msgstr "" - -#: ../../_templates/layout.html:86 -msgid "Index" -msgstr "" - -#: ../../_templates/layout.html:89 -msgid "Search" -msgstr "" - -#: ../../_templates/layout.html:92 -msgid "Copyright" -msgstr "" - diff --git a/docs/locale/zh_Hans/LC_MESSAGES/sphinx.po b/docs/locale/zh_Hans/LC_MESSAGES/sphinx.po deleted file mode 100644 index 060e23bafd..0000000000 --- a/docs/locale/zh_Hans/LC_MESSAGES/sphinx.po +++ /dev/null @@ -1,42 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2023, Tiled Documentation Writers -# This file is distributed under the same license as the Tiled package. -# FIRST AUTHOR , 2023. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Tiled 1.10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-10 11:19+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language: zh_Hans\n" -"Language-Team: zh_Hans \n" -"Plural-Forms: nplurals=1; plural=0;\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" - -#: ../../_templates/layout.html:61 -#, python-format -msgid "Search within %(docstitle)s" -msgstr "" - -#: ../../_templates/layout.html:83 -msgid "About these documents" -msgstr "" - -#: ../../_templates/layout.html:86 -msgid "Index" -msgstr "" - -#: ../../_templates/layout.html:89 -msgid "Search" -msgstr "" - -#: ../../_templates/layout.html:92 -msgid "Copyright" -msgstr "" - From 3d83f6b34ce016c02d07cc2c6fe53453069d4a99 Mon Sep 17 00:00:00 2001 From: "Kanishka.." <143314565+kanishka0411@users.noreply.github.com> Date: Wed, 1 Jul 2026 22:10:36 +0530 Subject: [PATCH 2/3] docs: Added section for resizing maps and the world grid (#4552) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add manual section for resizing maps and the world grid * Give the world grid its own section and update the resize section * Annotate new 1.13 world features in the manual * Exclude .venv from Sphinx source scanning Co-authored-by: Thorbjørn Lindeijer --- docs/conf.py | 1 + docs/manual/worlds.rst | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index aa6ccd0b57..dd88a588e5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -87,6 +87,7 @@ # This patterns also effect to html_static_path and html_extra_path exclude_patterns = [ '.DS_Store', + '.venv', 'README.md', 'Thumbs.db', '_build', diff --git a/docs/manual/worlds.rst b/docs/manual/worlds.rst index c3e1929241..a425fb065f 100644 --- a/docs/manual/worlds.rst +++ b/docs/manual/worlds.rst @@ -81,7 +81,7 @@ Adding Maps can be accessed by right-clicking in the map editor. Removing Maps - Hit the 'Remove the current map from the current world' button on the + Hit the 'Remove the current map from the current world' button on the toolbar. Alternatively, right-click a map in the map editor and select the 'Remove ... from World ...' action from the context menu. @@ -92,11 +92,37 @@ Moving Maps Alternatively you can use the arrow keys to move the current selected map - holding Shift will perform bigger steps. +.. raw:: html + +
New in Tiled 1.13
+ +Resizing Maps + Hover over a map with the World Tool to show resize handles on its corners + and edges, then drag a handle to resize the map within the world. The map's + existing content keeps its position within the world, with the map's world + position adjusted when necessary to achieve this. You can abort a resize + by hitting 'Escape' or by right-clicking. + Saving World files You can save manipulated world files by using the *World > Save World* menu. Worlds will also automatically be saved if you launch any external tool that has the 'Save Map Before Executing' option enabled. +.. raw:: html + +
New in Tiled 1.13
+ +The World Grid +-------------- + +A grid can be shown across the world to help align maps. Toggle it with +*View > Show World Grid*, and toggle snapping with *View > Snapping > Snap Maps +to World Grid*. While snapping is enabled, maps snap to the grid as they are +moved or resized. Hold 'Ctrl' during the drag to temporarily turn off snapping, +letting you position the map freely. + +The grid size is set per world in the *World > World Properties* dialog. + Using Pattern Matching ---------------------- From 2049d986a929595610ef586de67b9c1764ac3d7b Mon Sep 17 00:00:00 2001 From: miffe Date: Wed, 1 Jul 2026 09:54:47 -0700 Subject: [PATCH 3/3] Update the mime types to support more of the Tiled extensions (#4550) This updates the mime database and the desktop file to add suport for: - .tmj: Tiled map json files - .tsj: Tiled tileset json files - .tiled-project: Tiled project files - .world: Tiled world files Closes #4523 --- NEWS.md | 1 + mime/org.mapeditor.Tiled.xml | 24 ++++++++++++++++++++++++ org.mapeditor.Tiled.desktop | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 784197ec61..61191352f2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,6 +8,7 @@ * Scripting: Added 'tiled.cell' function, 'cell.flags' property and 'TileLayerEdit.setCell' function (#4538) * Scripting: Added MapObject.resolvedClassName() (by MatusGuy, #4529) * Fixed crash when the selection becomes empty while starting a move (#4536) +* Linux: Added file associations for .tmj, .tsj, .tiled-project and .world files (by miffe, #4550) * snap: Updated to Qt 6 * Raised the minimum Qt version to 6.2 (drops Qt 5 support) diff --git a/mime/org.mapeditor.Tiled.xml b/mime/org.mapeditor.Tiled.xml index 845539ccf0..d3d04ba5fb 100644 --- a/mime/org.mapeditor.Tiled.xml +++ b/mime/org.mapeditor.Tiled.xml @@ -12,4 +12,28 @@ + + Tiled map + + + + + + Tiled tileset + + + + + + Tiled project + + + + + + Tiled world + + + + diff --git a/org.mapeditor.Tiled.desktop b/org.mapeditor.Tiled.desktop index 1c95c633fd..06024424eb 100644 --- a/org.mapeditor.Tiled.desktop +++ b/org.mapeditor.Tiled.desktop @@ -10,4 +10,4 @@ Icon=tiled Categories=Graphics;2DGraphics; StartupNotify=true X-Desktop-File-Install-Version=0.1 -MimeType=application/x-tiled-tmx;application/x-tiled-tsx; +MimeType=application/x-tiled-tmx;application/x-tiled-tsx;application/x-tiled-tmj;application/x-tiled-tsj;application/x-tiled-project;application/x-tiled-world;