Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 10:29:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refreshing with master

Browse source
This commit is contained in:
Dante Ruiz 2017-02-17 15:50:08 +00:00
parent 628b97bfc6
commit 3189b44612
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/tablet/TabletMenu.qml
View file

@ -20,13 +20,10 @@ FocusScope {
property var rootMenu: Menu { objectName:"rootMenu" } property var rootMenu: Menu { objectName:"rootMenu" }
property var point: Qt.point(50, 50); property var point: Qt.point(50, 50);
property var eventBridge;
signal sendToScript(var message);
TabletMenuStack { id: menuPopperUpper } TabletMenuStack { id: menuPopperUpper }
property string subMenu: "" property string subMenu: ""
property var eventBridge; property var eventBridge;
signal sendToScript(var message); signal sendToScript(var message);
TabletMenuStack { id: menuPopperUpper }
Rectangle { Rectangle {
id: bgNavBar id: bgNavBar

2
interface/src/Application.cpp
View file

@ -5744,7 +5744,9 @@ bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name)
} }
void Application::toggleRunningScriptsWidget() const { void Application::toggleRunningScriptsWidget() const {
static const QUrl url("hifi/dialogs/RunningScripts.qml");
DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts"); DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");
//if (_runningScriptsWidget->isVisible()) { //if (_runningScriptsWidget->isVisible()) {
// if (_runningScriptsWidget->hasFocus()) { // if (_runningScriptsWidget->hasFocus()) {
// _runningScriptsWidget->hide(); // _runningScriptsWidget->hide();