History

Merge branch 'master' of git://github.com/highfidelity/hifi into 19644

Ryan Huffman committed 12 years ago

Commit cfb1e5a2 parents a1d5d44 e3373a498 files · +3361 −973Browse files

Showing the changes to interface/src/ui/RunningScriptsWidget.cpp (1 of 98 files). Show all

Unified · Split

interface/src/ui/RunningScriptsWidget.cpp+4−5
@@ -187,6 +187,10 @@ void RunningScriptsWidget::paintEvent(QPaintEvent* event) { · 186 unmodified lines
187 painter.end();187 painter.end();
188}188}
189 189
190void RunningScriptsWidget::scriptStopped(const QString& scriptName) {
191 _recentlyLoadedScripts.prepend(scriptName);
192}
193
190void RunningScriptsWidget::stopScript(int row, int column) {194void RunningScriptsWidget::stopScript(int row, int column) {
191 if (column == 1) { // make sure the user has clicked on the close icon195 if (column == 1) { // make sure the user has clicked on the close icon
192 _lastStoppedScript = _runningScriptsTable->item(row, 0)->toolTip();196 _lastStoppedScript = _runningScriptsTable->item(row, 0)->toolTip();
@@ -199,11 +203,6 @@ void RunningScriptsWidget::loadScript(int row, int column) { · 6 unmodified lines
199}203}
200 204
201void RunningScriptsWidget::allScriptsStopped() {205void RunningScriptsWidget::allScriptsStopped() {
202 QStringList list = Application::getInstance()->getRunningScripts();
203 for (int i = 0; i < list.size(); ++i) {
204 _recentlyLoadedScripts.prepend(list.at(i));
205 }
206
207 Application::getInstance()->stopAllScripts();206 Application::getInstance()->stopAllScripts();
208}207}
209 208

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t