[graphics/krita] krita: GUI: Restored undo/redo mainToolBar actions.

Git commit cb34bd4f66151a5ddafde548d282f444755965e9 by Emmet O'Neill.
Committed on 24/10/2024 at 03:46.
Pushed by emmetoneill into branch 'master'.

GUI: Restored undo/redo mainToolBar actions.

It looks like these actions were unsucessfully moved
from "mainToolBar" to "editToolBar" at some point.
This was causing the undo/redo buttons to not appear
on the main toolbar anymore.

This took a bit longer to debug than I'd have hoped
due to the difficulty with bisecting and unfamiliarity
with some of the xmlgui stuff.

BUG:488452

M  +5    -2    krita/krita5.xmlgui

https://invent.kde.org/graphics/krita/-/commit/cb34bd4f66151a5ddafde548d282f444755965e9

diff --git a/krita/krita5.xmlgui b/krita/krita5.xmlgui
index 2d4679f8dc3..19a58e168b4 100644
--- a/krita/krita5.xmlgui
+++ b/krita/krita5.xmlgui
@@ -424,12 +424,15 @@ xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0  http://www.kde.org
     <Action name="file_new"/>
     <Action name="file_open"/>
     <Action name="file_save"/>
+    <Separator/>
+    <Action name="edit_undo"/>
+    <Action name="edit_redo"/>
   </ToolBar>
-  <ToolBar name="editToolBar" fullWidth="false" noMerge="1">
+  <!--<ToolBar name="editToolBar" fullWidth="false" noMerge="1">
     <Text>Edit</Text>
     <Action name="edit_undo"/>
     <Action name="edit_redo"/>
-  </ToolBar>
+  </ToolBar>-->
   <ToolBar name="BrushesAndStuff" position="top">
     <Text>Brushes and Stuff</Text>
     <Action name="gradients"/>