Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SDK
Umbrello
Commits
1e4efa2c
Commit
1e4efa2c
authored
Nov 26, 2019
by
Ralf Habacker
Browse files
Separate context menu items related to linked diagrams from others with separators
CCBUG:53369
CCBUG:413579
parent
5bb6510e
Changes
2
Hide whitespace changes
Inline
Side-by-side
umbrello/menus/umlscenepopupmenu.cpp
View file @
1e4efa2c
...
...
@@ -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
View file @
1e4efa2c
...
...
@@ -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
(
fals
e
,
type
);
insertStdItems
(
tru
e
,
type
);
switch
(
pState
->
stateType
())
{
case
StateWidget
::
Combined
:
insert
(
mt_Change_Font
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment