From b1ce4f622742555af4597e46fbb61acf2b21d5cc Mon Sep 17 00:00:00 2001
From: Treeway <56928485+Treeway7@users.noreply.github.com>
Date: Wed, 13 Sep 2023 17:30:44 -0500
Subject: [PATCH] Reorganized Edit menu and toolbar (#86)

* Reorganized menu icons

* Added new copy icon
---
 coinkiller_data/icons/copy.png    | Bin 754 -> 492 bytes
 leveleditor/leveleditorwindow.cpp |  16 +++++++++-------
 leveleditor/leveleditorwindow.ui  |   5 ++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/coinkiller_data/icons/copy.png b/coinkiller_data/icons/copy.png
index fba16a7bb1e3130464c64c851e884474b222e369..f78592c7db944a0b7213babe7fe9896a6d876c73 100644
GIT binary patch
delta 466
zcmV;@0WJRW1?&TmB!3BTNLh0L01FcU01FcV0GgZ_0004=Nkl<Zc%1E)O-jTt7>0{@
z1igix!A$~QV8mu8sa`=`b?rjiUO>^-h0e6Ikim@`H!>Z;pRI01VFp(U&LC3xVq4nK
zYMR!f(ia}+m*z{}r1`0${55Sk-FegYEXKY&S9|A%<Gq@;dw*p(-Zgu!(}Zbz7IduZ
z`V?T;-i_h7W~H4hwpL~_p&g`ZFPLb7>3At%)Vi)u1BUI6`S*|mxk#n$1$AwvumMbH
z2O5dsI{>zAcMN2`OXgyt9Thf!!jV4?M*+w>=w_P80_uVw_tOA<mY4yJB}Y2#UkaIk
zI#4%K)J|ywvVUp};D7fCZlB&$@a23QZ)1PbN+NB*986O1<$N3);POfv=-s_BBIU)2
z8E7-AG9bGKN*m~LBQ0zooC#?Izh)Pdn1O0`fvB1_fSWZyB+mh)(g#R9JU$7|`WG>K
z{*aL@%L8(m0hQiMoC9=&`>&G*5pDh34zq-owI!s|T}$|>j9A@t&Vgjv7wlj{Q+r<c
z9LSUKH~gV|CB9O*k%-3C85pD+5{=6n@WXqZTg{@e@GhuZ9|9S?>l;K@Q2+n{07*qo
IM6N<$f>z|#e*gdg

delta 730
zcmV<00ww+I1M&rsB!32COGiWi{{a60|De66lK=n$r%6OXR9Fe^RXc1GK@gq2yV$bN
zAMht3abh8%*ik5mBM=rs0TCn$B%lBqdMcV!(5Fv@DCj7lNCkB)#7Cf@R1_eDgoGRt
zL98U$#I|gQTXt>T&(6;I?4T52?d<OCo0)yLJ39vW*MFq_0Dmq#F4Oiku})uU1M1}$
zH_49J21g_u7Ne7K8IB&3XQW2u<)y`9L~My8Jrhtp0Qb&%Asv&Z8x18l`=}Jfx7r)+
znE(&xRRHF)O%fSU<lOlur5Im#BYhFz8|frcF=<Ky_as~;VLBo~)Yozec?pb$O#T{6
z-F#7lT@BX5UVrkD61q(l&+WMk`N@fjq!rDAVz1!junZ%C4i}5JIgP0V3T66!fO=-{
zoF<zlVxO6xU|;WBJCjskNR>|Pl6vm`J1R_2lt8t#1I5CYA&pwSYhp5soK4Cws7h0e
z#L~iBy6016X5yHI)gO@m@Wqe{BP6!&L@XpSl2TuK@PC>fZnt6&seQ@RlgE!Sg$o;4
z3$x<G23Jidv7CqL4X8b3&gYmI4JA-m{SMVq*)X0|M*sprL&qj>zW%ns4N93#W>{xy
zC;^+LOJ$?1b>)E)h>sny1@VVuo4y|kN`NOIe+BwR;}=t`4zym>r*FUD+48y$3CHwk
z5Uyp})qe>rPy+F>AqWqeiR%vqj4+9)53VACb;F<^-2!k_kJ7_9!M?m3H<SRc1J*03
z45t91-e%mj%_@2Y6W7yCJEsmMfYky1h23s~kw6Jxj%!<0Soyq-nKUt;E2qZIJZdgl
zI<yp9?Ec!c=MzXoe2~cc`X<&v;Q1}~M=l6^WmBcL2o!E`*r^WO-H#;X8;OM9Z8vp5
z<gc%HoPZ8EjX|FR{3STqIpGJMga=N*)fH$2<_XY;PRIHmcXI-N0B`21ZvSRi`Tzg`
M07*qoM6N<$f{)!zc>n+a

diff --git a/leveleditor/leveleditorwindow.cpp b/leveleditor/leveleditorwindow.cpp
index 6588675a..29e77e77 100644
--- a/leveleditor/leveleditorwindow.cpp
+++ b/leveleditor/leveleditorwindow.cpp
@@ -133,13 +133,15 @@ LevelEditorWindow::LevelEditorWindow(LevelManager* lvlMgr, int initialArea) :
     actionRedo->setIcon(QIcon(basePath + "redo.png"));
     actionRedo->setShortcuts(QKeySequence::Redo);
 
-    // Add actions to ui
-    ui->toolBar->addAction(actionUndo);
-    ui->toolBar->addAction(actionRedo);
-
-    // Add actions to ui
-    ui->menuEdit->addAction(actionUndo);
-    ui->menuEdit->addAction(actionRedo);
+    // Add actions to toolbar
+    ui->toolBar->insertAction(ui->actionCut, actionUndo);
+    ui->toolBar->insertAction(ui->actionCut, actionRedo);
+    ui->toolBar->insertSeparator(ui->actionCut);
+
+    // Add actions to edit menu
+    ui->menuEdit->insertAction(ui->actionCut, actionUndo);
+    ui->menuEdit->insertAction(ui->actionCut, actionRedo);
+    ui->menuEdit->insertSeparator(ui->actionCut);
 
     // Create undo view
     undoView = new QUndoView(undoStack);
diff --git a/leveleditor/leveleditorwindow.ui b/leveleditor/leveleditorwindow.ui
index df020024..5728d5f4 100644
--- a/leveleditor/leveleditorwindow.ui
+++ b/leveleditor/leveleditorwindow.ui
@@ -101,9 +101,9 @@
     <property name="title">
      <string>Edit</string>
     </property>
-    <addaction name="actionPaste"/>
     <addaction name="actionCut"/>
     <addaction name="actionCopy"/>
+    <addaction name="actionPaste"/>
     <addaction name="actionDelete"/>
     <addaction name="actionSelectAll"/>
     <addaction name="actionDeselect"/>
@@ -143,9 +143,9 @@
    </attribute>
    <addaction name="actionSave"/>
    <addaction name="separator"/>
-   <addaction name="actionPaste"/>
    <addaction name="actionCut"/>
    <addaction name="actionCopy"/>
+   <addaction name="actionPaste"/>
    <addaction name="actionDelete"/>
    <addaction name="separator"/>
    <addaction name="actionRaise"/>
@@ -172,7 +172,6 @@
    <addaction name="separator"/>
    <addaction name="actionAddArea"/>
    <addaction name="actionDeleteCurrentArea"/>
-   <addaction name="separator"/>
   </widget>
   <action name="actionToggleLayer1">
    <property name="checkable">