summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2018-09-20 22:23:39 +0200
committerAleks Kissinger <aleks0@gmail.com>2018-09-20 22:23:39 +0200
commitafcf3dba0753d71b801fb035277b2ec857f19de9 (patch)
treeda1870be45697eb044be20b5322ff54a7a8af581 /src
parent5708cb51035cfd40692afd308fb2bf326528b885 (diff)
restructured menu
Diffstat (limited to 'src')
-rw-r--r--src/gui/mainmenu.ui38
-rw-r--r--src/gui/toolpalette.cpp2
-rw-r--r--src/main.cpp1
3 files changed, 35 insertions, 6 deletions
diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui
index 80a7c81..1517fb1 100644
--- a/src/gui/mainmenu.ui
+++ b/src/gui/mainmenu.ui
@@ -36,6 +36,22 @@
<addaction name="actionExtendAbove"/>
<addaction name="actionExtendBelow"/>
</widget>
+ <widget class="QMenu" name="menuReorder">
+ <property name="title">
+ <string>Reorder</string>
+ </property>
+ <addaction name="actionBring_to_Front"/>
+ <addaction name="actionSend_to_Back"/>
+ </widget>
+ <widget class="QMenu" name="menuTransform">
+ <property name="title">
+ <string>Transform</string>
+ </property>
+ <addaction name="actionReflectHorizontal"/>
+ <addaction name="actionReflectVertical"/>
+ <addaction name="actionRotateCW"/>
+ <addaction name="actionRotateCCW"/>
+ </widget>
<addaction name="actionUndo"/>
<addaction name="actionRedo"/>
<addaction name="separator"/>
@@ -48,10 +64,8 @@
<addaction name="actionDeselect_All"/>
<addaction name="menuSelect"/>
<addaction name="separator"/>
- <addaction name="actionReflectHorizontal"/>
- <addaction name="actionReflectVertical"/>
- <addaction name="actionRotateCW"/>
- <addaction name="actionRotateCCW"/>
+ <addaction name="menuReorder"/>
+ <addaction name="menuTransform"/>
</widget>
<widget class="QMenu" name="menuTikz">
<property name="title">
@@ -278,6 +292,22 @@
<string>Shift+Down</string>
</property>
</action>
+ <action name="actionBring_to_Front">
+ <property name="text">
+ <string>Bring to Front</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+]</string>
+ </property>
+ </action>
+ <action name="actionSend_to_Back">
+ <property name="text">
+ <string>Send to Back</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+[</string>
+ </property>
+ </action>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
<addaction name="menuView"/>
diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp
index 044e8d0..c0e2a22 100644
--- a/src/gui/toolpalette.cpp
+++ b/src/gui/toolpalette.cpp
@@ -43,7 +43,7 @@ ToolPalette::ToolPalette(QWidget *parent) :
select = new QAction(QIcon(":/images/select-ak.svg"), "Select");
vertex = new QAction(QIcon(":/images/node-ak.svg"), "Add Vertex");
edge = new QAction(QIcon(":/images/edge-ak.svg"), "Add Edge");
- crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box");
+ //crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box");
tools->addAction(select);
diff --git a/src/main.cpp b/src/main.cpp
index 1fcefc0..97dbe4d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,7 +32,6 @@
// #include <Windows.h>
// #endif
-
int main(int argc, char *argv[])
{
// #ifdef Q_OS_WIN