Reorganized Edit menu and toolbar (#86)

* Reorganized menu icons * Added new copy icon
ExplosBlue · Sep 13, 2023 · b1ce4f6 · b1ce4f6
1 parent e332a33
commit b1ce4f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/coinkiller_data/icons/copy.png b/coinkiller_data/icons/copy.png
diff --git 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
@@ -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">