=== modified file 'src/gui/HelpDialog.cpp' --- old/src/gui/HelpDialog.cpp 2012-03-20 11:20:28 +0000 +++ new/src/gui/HelpDialog.cpp 2012-05-21 16:20:11 +0000 @@ -69,6 +69,10 @@ #endif group = N_("When a Script is Running"); + + setKey(group, "", "4", N_("Stop currently running script")); + setKey(group, "", "5", N_("Pause script execution")); + setKey(group, "", "6", N_("Resume script execution")); setKey(group, "", "J", N_("Slow down the script execution rate")); setKey(group, "", "L", N_("Speed up the script execution rate")); setKey(group, "", "K", N_("Set the normal script execution rate")); === modified file 'src/gui/StelGui.cpp' --- old/src/gui/StelGui.cpp 2012-04-30 11:21:48 +0000 +++ new/src/gui/StelGui.cpp 2012-05-21 16:30:51 +0000 @@ -148,6 +148,9 @@ addGuiActions("actionDecrease_Script_Speed", N_("Slow down the script execution rate"), "", group, false, false); addGuiActions("actionIncrease_Script_Speed", N_("Speed up the script execution rate"), "", group, false, false); addGuiActions("actionSet_Real_Script_Speed", N_("Set the normal script execution rate"), "", group, false, false); + addGuiActions("actionStop_Script", N_("Pause script execution"), "", group, false, false); + addGuiActions("actionPause_Script", N_("Pause script execution"), "", group, false, false); + addGuiActions("actionResume_Script", N_("Resume script execution"), "", group, false, false); addGuiActions("actionDecrease_Time_Speed", N_("Decrease time speed"), "J", group, false, false); addGuiActions("actionIncrease_Time_Speed", N_("Increase time speed"), "L", group, false, false); addGuiActions("actionSet_Real_Time_Speed", N_("Set normal time rate"), "K", group, false, false); @@ -210,6 +213,9 @@ connect(getGuiActions("actionIncrease_Script_Speed"), SIGNAL(triggered()), this, SLOT(increaseScriptSpeed())); connect(getGuiActions("actionDecrease_Script_Speed"), SIGNAL(triggered()), this, SLOT(decreaseScriptSpeed())); connect(getGuiActions("actionSet_Real_Script_Speed"), SIGNAL(triggered()), this, SLOT(setRealScriptSpeed())); + connect(getGuiActions("actionStop_Script"), SIGNAL(triggered()), this, SLOT(stopScript())); + connect(getGuiActions("actionPause_Script"), SIGNAL(triggered()), this, SLOT(pauseScript())); + connect(getGuiActions("actionResume_Script"), SIGNAL(triggered()), this, SLOT(resumeScript())); connect(getGuiActions("actionIncrease_Time_Speed"), SIGNAL(triggered()), core, SLOT(increaseTimeSpeed())); connect(getGuiActions("actionDecrease_Time_Speed"), SIGNAL(triggered()), core, SLOT(decreaseTimeSpeed())); connect(getGuiActions("actionIncrease_Time_Speed_Less"), SIGNAL(triggered()), core, SLOT(increaseTimeSpeedLess())); @@ -829,6 +835,10 @@ getGuiActions("actionDecrease_Script_Speed")->setShortcut(QKeySequence("J")); getGuiActions("actionIncrease_Script_Speed")->setShortcut(QKeySequence("L")); getGuiActions("actionSet_Real_Script_Speed")->setShortcut(QKeySequence("K")); + + getGuiActions("actionStop_Script")->setShortcut(QKeySequence("4")); + getGuiActions("actionPause_Script")->setShortcut(QKeySequence("5")); + getGuiActions("actionResume_Script")->setShortcut(QKeySequence("6")); } else { @@ -855,6 +865,21 @@ { StelMainGraphicsView::getInstance().getScriptMgr().setScriptRate(1); } + +void StelGui::stopScript() +{ + StelMainGraphicsView::getInstance().getScriptMgr().stopScript(); +} + +void StelGui::pauseScript() +{ + StelMainGraphicsView::getInstance().getScriptMgr().pauseScript(); +} + +void StelGui::resumeScript() +{ + StelMainGraphicsView::getInstance().getScriptMgr().resumeScript(); +} #endif void StelGui::setFlagShowFlipButtons(bool b) === modified file 'src/gui/StelGui.hpp' --- old/src/gui/StelGui.hpp 2012-04-30 06:24:58 +0000 +++ new/src/gui/StelGui.hpp 2012-05-21 16:31:27 +0000 @@ -147,6 +147,9 @@ void increaseScriptSpeed(); void decreaseScriptSpeed(); void setRealScriptSpeed(); + void stopScript(); + void pauseScript(); + void resumeScript(); #endif //! Hide or show the GUI. Public so it can be called from scripts.