From 95a92fc5ebfaa3d5ee9b525d459c3a568cfed08c Mon Sep 17 00:00:00 2001 From: Faye Li Date: Tue, 24 Jan 2017 14:42:28 -0800 Subject: [PATCH 1/3] added tablet button --- scripts/system/users.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/system/users.js b/scripts/system/users.js index 8c52240aa9..372bbb781d 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -13,6 +13,18 @@ (function() { // BEGIN LOCAL_SCOPE +// create tablet button +var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); +var button = tablet.addButton({ + icon: "icons/tablet-icons/people-i.svg", + text: "Users" +}); +function onClicked() { + // hide/show users overlays + +} +button.clicked.connect(onClicked); + // resolve these paths immediately var MIN_MAX_BUTTON_SVG = Script.resolvePath("assets/images/tools/min-max-toggle.svg"); var BASE_URL = Script.resolvePath("assets/images/tools/"); @@ -1234,4 +1246,11 @@ var usersWindow = (function () { Script.scriptEnding.connect(tearDown); }()); +function cleanup () { + //remove tablet button + button.clicked.disconnect(onClicked); + tablet.removeButton(button); +} +Script.scriptEnding.connect(cleanup); + }()); // END LOCAL_SCOPE From 5bed68ac4c75db32689a09b56918c13d4a1fcc4d Mon Sep 17 00:00:00 2001 From: Faye Li Date: Tue, 24 Jan 2017 14:56:58 -0800 Subject: [PATCH 2/3] button toggle --- scripts/system/users.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/system/users.js b/scripts/system/users.js index 372bbb781d..83eefd9aba 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -19,9 +19,16 @@ var button = tablet.addButton({ icon: "icons/tablet-icons/people-i.svg", text: "Users" }); +var showUsersOverlays = false; function onClicked() { + print(showUsersOverlays); // hide/show users overlays - + if (showUsersOverlays) { + showUsersOverlays = false; + } else { + showUsersOverlays = true; + } + button.editProperties({isActive: showUsersOverlays}); } button.clicked.connect(onClicked); From 71b60966445319d2754942212bf3ad98715dd016 Mon Sep 17 00:00:00 2001 From: Faye Li Date: Tue, 24 Jan 2017 15:12:46 -0800 Subject: [PATCH 3/3] toggle menu item --- scripts/system/users.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/scripts/system/users.js b/scripts/system/users.js index 83eefd9aba..4c9663e203 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -12,23 +12,17 @@ // (function() { // BEGIN LOCAL_SCOPE - +var MENU_ITEM = "Users Online"; // create tablet button var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var button = tablet.addButton({ icon: "icons/tablet-icons/people-i.svg", - text: "Users" + text: "Users", + isActive: Menu.isOptionChecked(MENU_ITEM) }); -var showUsersOverlays = false; function onClicked() { - print(showUsersOverlays); - // hide/show users overlays - if (showUsersOverlays) { - showUsersOverlays = false; - } else { - showUsersOverlays = true; - } - button.editProperties({isActive: showUsersOverlays}); + Menu.setIsOptionChecked(MENU_ITEM, !Menu.isOptionChecked(MENU_ITEM)); + button.editProperties({isActive: Menu.isOptionChecked(MENU_ITEM)}); } button.clicked.connect(onClicked);