Separate context menu items related to linked diagrams from others with separators

CCBUG:53369
CCBUG:413579

umbrello/menus/umlscenepopupmenu.cpp

@@ -38,10 +38,13 @@ UMLScenePopupMenu::UMLScenePopupMenu(QWidget *parent, UMLScene *scene)
         case Uml::DiagramType::Sequence:
         case Uml::DiagramType::Collaboration:
             if (type == Uml::DiagramType::State && scene->widgetLink()) {
-                if (scene->widgetLink()->isStateWidget())
+                if (scene->widgetLink()->isStateWidget()) {
                     insert(mt_ReturnToCombinedState);
-                else if (scene->widgetLink()->isClassWidget())
+                    addSeparator();
+                } else if (scene->widgetLink()->isClassWidget()) {
                     insert(mt_ReturnToClass);
+                    addSeparator();
+                }
             }
             insertSubMenuNew(type);
             addSeparator();

umbrello/menus/widgetbasepopupmenu.cpp

@@ -349,6 +349,7 @@ void WidgetBasePopupMenu::insertSingleSelectionMenu(WidgetBase* widget)
             switch (pState->stateType()) {
             case StateWidget::Combined:
                 insert(mt_EditCombinedState);
+                addSeparator();
                 break;
             default:
                 break;
@@ -356,7 +357,7 @@ void WidgetBasePopupMenu::insertSingleSelectionMenu(WidgetBase* widget)
 
             insertSubMenuNew(type);
             insertSubMenuColor(widget->useFillColor());
-            insertStdItems(false, type);
+            insertStdItems(true, type);
             switch (pState->stateType()) {
             case StateWidget::Combined:
                 insert(mt_Change_Font);