Skip to content

Commit

Permalink
[Tux] fix orbit style display
Browse files Browse the repository at this point in the history
- calling GetInt several times makes problems - on some PCs there is no orbit selected, on some always the same
- furthermore the action order matters
- also remove an unnecessary function call
  • Loading branch information
donovaly committed Dec 22, 2022
1 parent a01d336 commit 0ab2608
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/Mod/Tux/NavigationIndicatorGui.py
Expand Up @@ -333,7 +333,7 @@ def retranslateUi():
aCompact.setText(translate("NavigationIndicator", "Compact"))
aTooltip.setText(translate("NavigationIndicator", "Tooltip"))
aTurntable.setText(translate("NavigationIndicator", "Turntable"))
aFreeTurntable.setText(translate("NavigationIndicator", "FreeTurntable"))
aFreeTurntable.setText(translate("NavigationIndicator", "Free Turntable"))
aTrackball.setText(translate("NavigationIndicator", "Trackball"))
a0.setText(translate("NavigationIndicator", "Undefined"))

Expand Down Expand Up @@ -366,10 +366,9 @@ def retranslateUi():
aFreeTurntable.setObjectName("NavigationIndicator_FreeTurntable")
aFreeTurntable.setCheckable(True)

menuOrbit.addAction(aFreeTurntable)
menuOrbit.addAction(aTurntable)
menuOrbit.addAction(aTrackball)

menuOrbit.addAction(aFreeTurntable)

menuSettings.addMenu(menuOrbit)
menuSettings.addSeparator()
Expand Down Expand Up @@ -519,12 +518,13 @@ def onOrbit():
def onOrbitShow():
"""Set turntable or trackball orbit style."""

OrbitStyle = pView.GetInt("OrbitStyle", 0)
gOrbit.blockSignals(True)
if pView.GetInt("OrbitStyle", 0):
if OrbitStyle == 0:
aTurntable.setChecked(True)
elif pView.GetInt("OrbitStyle", 1):
elif OrbitStyle == 1:
aTrackball.setChecked(True)
elif pView.GetInt("OrbitStyle", 2):
elif OrbitStyle == 2:
aFreeTurntable.setChecked(True)
gOrbit.blockSignals(False)

Expand Down Expand Up @@ -578,7 +578,6 @@ def setCurrent():
retranslateUi()
onCompact()
onTooltip()
onOrbitShow()

label = statusBar.children()[2]
statusBar.removeWidget(label)
Expand Down

0 comments on commit 0ab2608

Please sign in to comment.