Merge pull request #3593 from huffman/20024

CR for Job #20024 - UI edits to Running Scripts dialog

AndrewMeadows committed 12 years ago

Commit 2a35c4a2 parents 240280b 5813e303 files · +67 −46Browse files

Showing the changes to interface/src/Menu.cpp (1 of 3 files). Show all

Unified · Split

@@ -158,7 +158,7 @@ Menu::Menu() : · 157 unmodified lines
158	addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScriptURL,	158	addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScriptURL,
159	Qt::CTRL \| Qt::SHIFT \| Qt::Key_O, appInstance, SLOT(loadScriptURLDialog()));	159	Qt::CTRL \| Qt::SHIFT \| Qt::Key_O, appInstance, SLOT(loadScriptURLDialog()));
160	addActionToQMenuAndActionHash(fileMenu, MenuOption::StopAllScripts, 0, appInstance, SLOT(stopAllScripts()));	160	addActionToQMenuAndActionHash(fileMenu, MenuOption::StopAllScripts, 0, appInstance, SLOT(stopAllScripts()));
161	addActionToQMenuAndActionHash(fileMenu, MenuOption::ReloadAllScripts, Qt::CTRL \| Qt::SHIFT \| Qt::Key_R,	161	addActionToQMenuAndActionHash(fileMenu, MenuOption::ReloadAllScripts, Qt::CTRL \| Qt::Key_R,
162	appInstance, SLOT(reloadAllScripts()));	162	appInstance, SLOT(reloadAllScripts()));
163	addActionToQMenuAndActionHash(fileMenu, MenuOption::RunningScripts, Qt::CTRL \| Qt::Key_J,	163	addActionToQMenuAndActionHash(fileMenu, MenuOption::RunningScripts, Qt::CTRL \| Qt::Key_J,
164	appInstance, SLOT(toggleRunningScriptsWidget()));	164	appInstance, SLOT(toggleRunningScriptsWidget()));

Keyboard shortcuts