Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
einsteinathome
pulsatingscience
Commits
e3720bcc
Commit
e3720bcc
authored
Feb 13, 2009
by
Oliver Bock
Browse files
Update deprecated QAction signals for 4.5 compliance
parent
781bb041
Changes
3
Show whitespace changes
Inline
Side-by-side
src/pulsatingscience.cpp
View file @
e3720bcc
...
@@ -61,28 +61,28 @@ PulsatingScience::PulsatingScience(QWidget *parent) : QMainWindow(parent)
...
@@ -61,28 +61,28 @@ PulsatingScience::PulsatingScience(QWidget *parent) : QMainWindow(parent)
connect
(
ui
.
pushRun
,
SIGNAL
(
clicked
()),
connect
(
ui
.
pushRun
,
SIGNAL
(
clicked
()),
ui
.
pulsarGlWidget
,
SLOT
(
runAnimation
()));
ui
.
pulsarGlWidget
,
SLOT
(
runAnimation
()));
connect
(
ui
.
actionRun
,
SIGNAL
(
activat
ed
()),
connect
(
ui
.
actionRun
,
SIGNAL
(
trigger
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
runAnimation
()));
ui
.
pulsarGlWidget
,
SLOT
(
runAnimation
()));
connect
(
ui
.
actionRun
,
SIGNAL
(
activat
ed
()),
connect
(
ui
.
actionRun
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
on_pushRun_clicked
()));
this
,
SLOT
(
on_pushRun_clicked
()));
connect
(
ui
.
pushPause
,
SIGNAL
(
clicked
()),
connect
(
ui
.
pushPause
,
SIGNAL
(
clicked
()),
ui
.
pulsarGlWidget
,
SLOT
(
pauseAnimation
()));
ui
.
pulsarGlWidget
,
SLOT
(
pauseAnimation
()));
connect
(
ui
.
actionPause
,
SIGNAL
(
activat
ed
()),
connect
(
ui
.
actionPause
,
SIGNAL
(
trigger
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
pauseAnimation
()));
ui
.
pulsarGlWidget
,
SLOT
(
pauseAnimation
()));
connect
(
ui
.
actionPause
,
SIGNAL
(
activat
ed
()),
connect
(
ui
.
actionPause
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
on_pushPause_clicked
()));
this
,
SLOT
(
on_pushPause_clicked
()));
connect
(
ui
.
pushStop
,
SIGNAL
(
clicked
()),
connect
(
ui
.
pushStop
,
SIGNAL
(
clicked
()),
ui
.
pulsarGlWidget
,
SLOT
(
stopAnimation
()));
ui
.
pulsarGlWidget
,
SLOT
(
stopAnimation
()));
connect
(
ui
.
actionStop
,
SIGNAL
(
activat
ed
()),
connect
(
ui
.
actionStop
,
SIGNAL
(
trigger
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
stopAnimation
()));
ui
.
pulsarGlWidget
,
SLOT
(
stopAnimation
()));
connect
(
ui
.
actionStop
,
SIGNAL
(
activat
ed
()),
connect
(
ui
.
actionStop
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
on_pushStop_clicked
()));
this
,
SLOT
(
on_pushStop_clicked
()));
connect
(
ui
.
actionPermanent_orbits
,
SIGNAL
(
toggled
(
bool
)),
connect
(
ui
.
actionPermanent_orbits
,
SIGNAL
(
toggled
(
bool
)),
...
@@ -311,19 +311,19 @@ void PulsatingScience::on_actionMenu_bar_toggled(bool checked)
...
@@ -311,19 +311,19 @@ void PulsatingScience::on_actionMenu_bar_toggled(bool checked)
// activate alternate shortcuts
// activate alternate shortcuts
m_runShortcut
->
setEnabled
(
true
);
m_runShortcut
->
setEnabled
(
true
);
connect
(
m_runShortcut
,
SIGNAL
(
activat
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
runAnimation
()));
connect
(
m_runShortcut
,
SIGNAL
(
trigger
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
runAnimation
()));
m_pauseShortcut
->
setEnabled
(
true
);
m_pauseShortcut
->
setEnabled
(
true
);
connect
(
m_pauseShortcut
,
SIGNAL
(
activat
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
pauseAnimation
()));
connect
(
m_pauseShortcut
,
SIGNAL
(
trigger
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
pauseAnimation
()));
m_stopShortcut
->
setEnabled
(
true
);
m_stopShortcut
->
setEnabled
(
true
);
connect
(
m_stopShortcut
,
SIGNAL
(
activat
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
stopAnimation
()));
connect
(
m_stopShortcut
,
SIGNAL
(
trigger
ed
()),
ui
.
pulsarGlWidget
,
SLOT
(
stopAnimation
()));
m_permanentOrbitsShortcut
->
setEnabled
(
true
);
m_permanentOrbitsShortcut
->
setEnabled
(
true
);
connect
(
m_permanentOrbitsShortcut
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
permanentOrbitsToggled
()));
connect
(
m_permanentOrbitsShortcut
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
permanentOrbitsToggled
()));
m_rotationAxesShortcut
->
setEnabled
(
true
);
m_rotationAxesShortcut
->
setEnabled
(
true
);
connect
(
m_rotationAxesShortcut
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
rotationAxesToggled
()));
connect
(
m_rotationAxesShortcut
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
rotationAxesToggled
()));
m_fullscreenShortcut
->
setEnabled
(
true
);
m_fullscreenShortcut
->
setEnabled
(
true
);
connect
(
m_fullscreenShortcut
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
fullscreenToggled
()));
connect
(
m_fullscreenShortcut
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
fullscreenToggled
()));
m_menuBarShortcut
->
setEnabled
(
true
);
m_menuBarShortcut
->
setEnabled
(
true
);
connect
(
m_menuBarShortcut
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
menuBarToggled
()));
connect
(
m_menuBarShortcut
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
menuBarToggled
()));
}
}
}
}
...
@@ -388,18 +388,18 @@ void PulsatingScience::on_dockAnimControl_topLevelChanged(bool topLevel) {
...
@@ -388,18 +388,18 @@ void PulsatingScience::on_dockAnimControl_topLevelChanged(bool topLevel) {
m_animControlFloating
=
topLevel
;
m_animControlFloating
=
topLevel
;
}
}
void
PulsatingScience
::
on_actionHelp_
activat
ed
()
void
PulsatingScience
::
on_actionHelp_
trigger
ed
()
{
{
PulsatingScienceHelp
help
(
this
);
PulsatingScienceHelp
help
(
this
);
help
.
exec
();
help
.
exec
();
}
}
void
PulsatingScience
::
on_actionWebsite_
activat
ed
()
void
PulsatingScience
::
on_actionWebsite_
trigger
ed
()
{
{
QDesktopServices
::
openUrl
(
QUrl
(
"http://www.aei.mpg.de"
));
QDesktopServices
::
openUrl
(
QUrl
(
"http://www.aei.mpg.de"
));
}
}
void
PulsatingScience
::
on_actionAbout_
activat
ed
()
void
PulsatingScience
::
on_actionAbout_
trigger
ed
()
{
{
QString
content
=
"<b>%1</b><br>"
QString
content
=
"<b>%1</b><br>"
"%2<br><br>"
"%2<br><br>"
...
...
src/pulsatingscience.h
View file @
e3720bcc
...
@@ -68,9 +68,9 @@ public slots:
...
@@ -68,9 +68,9 @@ public slots:
void
on_dockAnimControl_visibilityChanged
(
bool
visible
);
void
on_dockAnimControl_visibilityChanged
(
bool
visible
);
void
on_dockAnimControl_topLevelChanged
(
bool
topLevel
);
void
on_dockAnimControl_topLevelChanged
(
bool
topLevel
);
void
on_actionHelp_
activat
ed
();
void
on_actionHelp_
trigger
ed
();
void
on_actionWebsite_
activat
ed
();
void
on_actionWebsite_
trigger
ed
();
void
on_actionAbout_
activat
ed
();
void
on_actionAbout_
trigger
ed
();
void
updatePulsarSemiMajorAxisValue
(
double
value
);
void
updatePulsarSemiMajorAxisValue
(
double
value
);
void
toggleHiddenDemoMode
();
void
toggleHiddenDemoMode
();
...
...
src/pulsatingscience.ui
View file @
e3720bcc
...
@@ -752,7 +752,7 @@
...
@@ -752,7 +752,7 @@
<connections>
<connections>
<connection>
<connection>
<sender>actionQuit</sender>
<sender>actionQuit</sender>
<signal>
activat
ed()</signal>
<signal>
trigger
ed()</signal>
<receiver>PulsatingScienceClass</receiver>
<receiver>PulsatingScienceClass</receiver>
<slot>close()</slot>
<slot>close()</slot>
<hints>
<hints>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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