Changeset 73faf4 for src/UIElements/Menu/MenuDescription.cpp

Timestamp:

May 8, 2017, 2:00:47 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

c8165c

Parents:

ce254c (diff), cb6357 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GeometryObjects' into Candidate_v1.6.1

File:

• src/UIElements/Menu/MenuDescription.cpp (modified) (3 diffs)

src/UIElements/Menu/MenuDescription.cpp

@@ -61 +61 @@
   // put each menu into its place, "" means top level
   MenuPositionMap->insert(std::make_pair("analysis",TopPosition("tools",1)));
-  MenuPositionMap->insert(std::make_pair("atom",TopPosition("edit",1)));
-  MenuPositionMap->insert(std::make_pair("bond",TopPosition("edit",2)));
+  MenuPositionMap->insert(std::make_pair("atom",TopPosition("edit",2)));
+  MenuPositionMap->insert(std::make_pair("bond",TopPosition("edit",3)));
   MenuPositionMap->insert(std::make_pair("command",TopPosition("",3)));
   MenuPositionMap->insert(std::make_pair("edit",TopPosition("",2)));
   MenuPositionMap->insert(std::make_pair("fill",TopPosition("tools",5)));
   MenuPositionMap->insert(std::make_pair("fragmentation",TopPosition("tools",3)));
+  MenuPositionMap->insert(std::make_pair("geometry",TopPosition("edit",5)));
   MenuPositionMap->insert(std::make_pair("graph",TopPosition("tools",4)));
-  MenuPositionMap->insert(std::make_pair("molecule",TopPosition("edit",3)));
+  MenuPositionMap->insert(std::make_pair("molecule",TopPosition("edit",4)));
   MenuPositionMap->insert(std::make_pair("potential",TopPosition("tools",7)));
-  MenuPositionMap->insert(std::make_pair("parser",TopPosition("edit",4)));
-  MenuPositionMap->insert(std::make_pair("selection",TopPosition("edit",5)));
+  MenuPositionMap->insert(std::make_pair("parser",TopPosition("edit",6)));
+  MenuPositionMap->insert(std::make_pair("selection",TopPosition("edit",1)));
   MenuPositionMap->insert(std::make_pair("tesselation",TopPosition("tools",2)));
   MenuPositionMap->insert(std::make_pair("shape",TopPosition("tools",6)));
@@ -85 +86 @@
   MenuDescriptionsMap->insert(std::make_pair("fill","Fill"));
   MenuDescriptionsMap->insert(std::make_pair("fragmentation","Fragmentation"));
+  MenuDescriptionsMap->insert(std::make_pair("geometry","Geometry"));
   MenuDescriptionsMap->insert(std::make_pair("graph","Graph"));
   MenuDescriptionsMap->insert(std::make_pair("molecule","Parse files into system"));
@@ -103 +105 @@
   MenuNameMap->insert(std::make_pair("fill","Fill"));
   MenuNameMap->insert(std::make_pair("fragmentation","Fragmentation"));
+  MenuNameMap->insert(std::make_pair("geometry","Geometry"));
   MenuNameMap->insert(std::make_pair("graph","Graph"));
   MenuNameMap->insert(std::make_pair("molecule","Molecules"));