diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index f781ee8a9f..a4ef9cc022 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -158,7 +158,8 @@ Menu::Menu() : addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScriptURL, Qt::CTRL | Qt::SHIFT | Qt::Key_O, appInstance, SLOT(loadScriptURLDialog())); addActionToQMenuAndActionHash(fileMenu, MenuOption::StopAllScripts, 0, appInstance, SLOT(stopAllScripts())); - addActionToQMenuAndActionHash(fileMenu, MenuOption::ReloadAllScripts, 0, appInstance, SLOT(reloadAllScripts())); + addActionToQMenuAndActionHash(fileMenu, MenuOption::ReloadAllScripts, Qt::CTRL | Qt::SHIFT | Qt::Key_R, + appInstance, SLOT(reloadAllScripts())); addActionToQMenuAndActionHash(fileMenu, MenuOption::RunningScripts, Qt::CTRL | Qt::Key_J, appInstance, SLOT(toggleRunningScriptsWidget())); diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp index 6efa2f8fe6..baf3995d0e 100644 --- a/interface/src/ui/RunningScriptsWidget.cpp +++ b/interface/src/ui/RunningScriptsWidget.cpp @@ -136,6 +136,7 @@ void RunningScriptsWidget::setRunningScripts(const QStringList& list) { ui->noRunningScriptsLabel->setVisible(list.isEmpty()); + ui->runningScriptsList->setVisible(!list.isEmpty()); ui->reloadAllButton->setVisible(!list.isEmpty()); ui->stopAllButton->setVisible(!list.isEmpty()); diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui index ddc6ad6c27..a55e949d7a 100644 --- a/interface/ui/runningScriptsWidget.ui +++ b/interface/ui/runningScriptsWidget.ui @@ -6,8 +6,8 @@ 0 0 - 324 - 643 + 319 + 481 @@ -29,57 +29,12 @@ 20 - - - - - 6 - - - 0 - - - 6 - - - - - color: #0e7077; -font-size: 20px; - - - Running Scripts - - - 0 - - - -1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - + 0 - 1 + 0 @@ -157,7 +112,7 @@ font: bold 16px; 0 - 8 + 4 @@ -218,6 +173,12 @@ font: bold 16px; + + + 0 + 0 + + 0 @@ -236,6 +197,12 @@ font: bold 16px; + + + 0 + 0 + + Helvetica,Arial,sans-serif @@ -252,10 +219,13 @@ font: bold 16px; 0 - Qt::ScrollBarAsNeeded + Qt::ScrollBarAlwaysOn - Qt::ScrollBarAlwaysOff + Qt::ScrollBarAsNeeded + + + QAbstractScrollArea::AdjustToContents true @@ -268,7 +238,7 @@ font: bold 16px; 0 0 - 284 + 264 16 @@ -278,6 +248,9 @@ font: bold 16px; 0 + + Qt::LeftToRight + font-size: 14px; @@ -303,14 +276,20 @@ font: bold 16px; + + + 0 + 0 + + - font: 14px; + font: 14px; color: #5f5f5f; - There are no scripts currently running. + There are no scripts running. - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -325,15 +304,9 @@ font: bold 16px; 0 - 2 + 0 - - - 0 - 300 - - 0 @@ -352,6 +325,12 @@ font: bold 16px; + + + 0 + 0 + + 0 @@ -432,6 +411,12 @@ font: bold 16px; + + + 0 + 0 + + Qt::ScrollBarAlwaysOn