Commit 9736c7b4 authored by Oliver Bock's avatar Oliver Bock
Browse files

Make sure control button states change coherently (action vs. button)

parent c6b63ecd
...@@ -54,15 +54,33 @@ PulsatingScience::PulsatingScience(QWidget *parent) : QMainWindow(parent) ...@@ -54,15 +54,33 @@ PulsatingScience::PulsatingScience(QWidget *parent) : QMainWindow(parent)
m_fullscreenShortcut->setEnabled(false); m_fullscreenShortcut->setEnabled(false);
// establish object communications // establish object communications
connect(ui.pushRun, SIGNAL(clicked()),
ui.pulsarGlWidget, SLOT(runAnimation()));
connect(ui.actionRun, SIGNAL(activated()), connect(ui.actionRun, SIGNAL(activated()),
ui.pulsarGlWidget, SLOT(runAnimation())); ui.pulsarGlWidget, SLOT(runAnimation()));
connect(ui.actionRun, SIGNAL(activated()),
this, SLOT(on_pushRun_clicked()));
connect(ui.pushPause, SIGNAL(clicked()),
ui.pulsarGlWidget, SLOT(pauseAnimation()));
connect(ui.actionPause, SIGNAL(activated()), connect(ui.actionPause, SIGNAL(activated()),
ui.pulsarGlWidget, SLOT(pauseAnimation())); ui.pulsarGlWidget, SLOT(pauseAnimation()));
connect(ui.actionPause, SIGNAL(activated()),
this, SLOT(on_pushPause_clicked()));
connect(ui.pushStop, SIGNAL(clicked()),
ui.pulsarGlWidget, SLOT(stopAnimation()));
connect(ui.actionStop, SIGNAL(activated()), connect(ui.actionStop, SIGNAL(activated()),
ui.pulsarGlWidget, SLOT(stopAnimation())); ui.pulsarGlWidget, SLOT(stopAnimation()));
connect(ui.actionStop, SIGNAL(activated()),
this, SLOT(on_pushStop_clicked()));
connect(ui.actionPermanent_orbits, SIGNAL(toggled(bool)), connect(ui.actionPermanent_orbits, SIGNAL(toggled(bool)),
ui.pulsarGlWidget, SLOT(showOrbits(bool))); ui.pulsarGlWidget, SLOT(showOrbits(bool)));
......
...@@ -748,54 +748,6 @@ ...@@ -748,54 +748,6 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>pushRun</sender>
<signal>clicked()</signal>
<receiver>actionRun</receiver>
<slot>trigger()</slot>
<hints>
<hint type="sourcelabel" >
<x>47</x>
<y>491</y>
</hint>
<hint type="destinationlabel" >
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>pushPause</sender>
<signal>clicked()</signal>
<receiver>actionPause</receiver>
<slot>trigger()</slot>
<hints>
<hint type="sourcelabel" >
<x>47</x>
<y>523</y>
</hint>
<hint type="destinationlabel" >
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>pushStop</sender>
<signal>clicked()</signal>
<receiver>actionStop</receiver>
<slot>trigger()</slot>
<hints>
<hint type="sourcelabel" >
<x>47</x>
<y>555</y>
</hint>
<hint type="destinationlabel" >
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection> <connection>
<sender>pushAbout</sender> <sender>pushAbout</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment