From bd891d6bdac803f11cdc2582aa8b210e7aeccf3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
Date: Mon, 17 Jun 2024 13:16:34 +0200
Subject: [PATCH] Switch keyboard shortcut for "Save All" to "Save As" (#3965)

Leaving "Save All" with no default shortcut.

Closes #3933
---
 NEWS.md                            | 1 +
 docs/manual/keyboard-shortcuts.rst | 3 +--
 src/tiled/mainwindow.ui            | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 9b5f37c94c..1d97ac7b03 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,7 @@
 * Added lock icon to open tabs for which the file is read-only
 * Added Shift modifier to cut when capturing a tile stamp (by kdx2a, #3961)
 * Made adding "Copy" when duplicating optional and disabled by default (#3917)
+* Changed default shortcut for "Save As" to Ctrl+Shift+S and removed shortcut from "Save All" (#3933)
 * Layer names are now trimmed when edited in the UI, to avoid accidental whitespace
 * Scripting: Added API for working with worlds (#3539)
 * Scripting: Added Tile.image for accessing a tile's image data
diff --git a/docs/manual/keyboard-shortcuts.rst b/docs/manual/keyboard-shortcuts.rst
index 5ed39fbcc6..6dc2d19a89 100644
--- a/docs/manual/keyboard-shortcuts.rst
+++ b/docs/manual/keyboard-shortcuts.rst
@@ -17,8 +17,7 @@ General
 -  ``Ctrl + Shift + P`` - Search for available actions
 -  ``Ctrl + Shift + T`` - Reopen a recently closed file
 -  ``Ctrl + S`` - Save current document
--  ``Ctrl + Alt + S`` - Save current document to another file
--  ``Ctrl + Shift + S`` - Save all documents
+-  ``Ctrl + Shift + S`` - Save current document to another file
 -  ``Ctrl + E`` - Export current document
 -  ``Ctrl + Shift + E`` - Export current document to another file
 -  ``Ctrl + R`` - Reload current document
diff --git a/src/tiled/mainwindow.ui b/src/tiled/mainwindow.ui
index 2dee2ccbcc..a6b2fa137d 100644
--- a/src/tiled/mainwindow.ui
+++ b/src/tiled/mainwindow.ui
@@ -344,7 +344,7 @@
     <string>Save &amp;As...</string>
    </property>
    <property name="shortcut">
-    <string notr="true">Ctrl+Alt+S</string>
+    <string notr="true">Ctrl+Shift+S</string>
    </property>
   </action>
   <action name="actionNewTileset">
@@ -537,9 +537,6 @@
    <property name="text">
     <string>Save All</string>
    </property>
-   <property name="shortcut">
-    <string notr="true">Ctrl+Shift+S</string>
-   </property>
   </action>
   <action name="actionDocumentation">
    <property name="text">