Reverting tablet API rename, cleaning up duplicated code

2025-03-27 23:52:03 +01:00 · 2017-11-15 11:50:11 -08:00 · 2017-11-15 11:50:11 -08:00 · 1167be4102
commit 1167be4102
parent 64592d66d7
73 changed files with 100 additions and 105 deletions
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controls-uit/Button.qml
@ -29,12 +29,12 @@ Original.Button {

    onHoveredChanged: {
        if (hovered) {
-            Tablets.playSound(TabletEnums.ButtonHover);
+            Tablet.playSound(TabletEnums.ButtonHover);
        }
    }

    onClicked: {
-        Tablets.playSound(TabletEnums.ButtonClick);
+        Tablet.playSound(TabletEnums.ButtonClick);
    }

    style: ButtonStyle {
--- a/interface/resources/qml/controls-uit/CheckBox.qml
+++ b/interface/resources/qml/controls-uit/CheckBox.qml
@ -31,12 +31,12 @@ Original.CheckBox {
    activeFocusOnPress: true

    onClicked: {
-        Tablets.playSound(TabletEnums.ButtonClick);
+        Tablet.playSound(TabletEnums.ButtonClick);
    }

 // TODO: doesnt works for QQC1. check with QQC2
 //    onHovered: {
-//        Tablets.playSound(TabletEnums.ButtonHover);
+//        Tablet.playSound(TabletEnums.ButtonHover);
 //    }

    style: CheckBoxStyle {
--- a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
+++ b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
@ -36,12 +36,12 @@ CheckBox {
    hoverEnabled: true

    onClicked: {
-        Tablets.playSound(TabletEnums.ButtonClick);
+        Tablet.playSound(TabletEnums.ButtonClick);
    }

    onHoveredChanged: {
        if (hovered) {
-            Tablets.playSound(TabletEnums.ButtonHover);
+            Tablet.playSound(TabletEnums.ButtonHover);
        }
    }

--- a/interface/resources/qml/controls-uit/GlyphButton.qml
+++ b/interface/resources/qml/controls-uit/GlyphButton.qml
@ -27,12 +27,12 @@ Original.Button {

    onHoveredChanged: {
        if (hovered) {
-            Tablets.playSound(TabletEnums.ButtonHover);
+            Tablet.playSound(TabletEnums.ButtonHover);
        }
    }

    onClicked: {
-        Tablets.playSound(TabletEnums.ButtonClick);
+        Tablet.playSound(TabletEnums.ButtonClick);
    }

    style: ButtonStyle {
--- a/interface/resources/qml/controls-uit/Key.qml
+++ b/interface/resources/qml/controls-uit/Key.qml
@ -35,13 +35,13 @@ Item {

        onContainsMouseChanged: {
            if (containsMouse) {
-                Tablets.playSound(TabletEnums.ButtonHover);
+                Tablet.playSound(TabletEnums.ButtonHover);
            }
        }

        onClicked: {
            mouse.accepted = true;
-            Tablets.playSound(TabletEnums.ButtonClick);
+            Tablet.playSound(TabletEnums.ButtonClick);

            webEntity.synthesizeKeyPress(glyph);
            webEntity.synthesizeKeyPress(glyph, mirrorText);
--- a/interface/resources/qml/controls-uit/RadioButton.qml
+++ b/interface/resources/qml/controls-uit/RadioButton.qml
@ -30,12 +30,12 @@ Original.RadioButton {
    readonly property int checkRadius: 2

    onClicked: {
-        Tablets.playSound(TabletEnums.ButtonClick);
+        Tablet.playSound(TabletEnums.ButtonClick);
    }

 // TODO: doesnt works for QQC1. check with QQC2
 //    onHovered: {
-//        Tablets.playSound(TabletEnums.ButtonHover);
+//        Tablet.playSound(TabletEnums.ButtonHover);
 //    }

    style: RadioButtonStyle {
--- a/interface/resources/qml/dialogs/TabletConnectionFailureDialog.qml
+++ b/interface/resources/qml/dialogs/TabletConnectionFailureDialog.qml
@ -24,7 +24,7 @@ Item {
                                        });
        object.selected.connect(function(button) {
            if (button === OriginalDialogs.StandardButton.Ok) {
-                var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+                var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
                tablet.gotoHomeScreen()
            }
        });
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@ -89,10 +89,10 @@ TabletModalWindow {
            //bodyLoader.active = false
        }
        if (gotoPreviousApp) {
-            var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+            var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
            tablet.returnToPreviousApp();
        } else {
-            Tablets.getTablet("com.highfidelity.interface.tablet.system").gotoHomeScreen();
+            Tablet.getTablet("com.highfidelity.interface.tablet.system").gotoHomeScreen();
        }
    }

--- a/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
@ -25,13 +25,13 @@ Preference {
        id: button
        onHoveredChanged: {
            if (hovered) {
-                Tablets.playSound(TabletEnums.ButtonHover);
+                Tablet.playSound(TabletEnums.ButtonHover);
            }
        }

        onClicked: {
            preference.trigger();
-            Tablets.playSound(TabletEnums.ButtonClick);
+            Tablet.playSound(TabletEnums.ButtonClick);
        }
        width: 180
        anchors.bottom: parent.bottom
--- a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
@ -41,12 +41,12 @@ Preference {
        id: checkBox
        onHoveredChanged: {
            if (hovered) {
-                Tablets.playSound(TabletEnums.ButtonHover);
+                Tablet.playSound(TabletEnums.ButtonHover);
            }
        }

        onClicked: {
-            Tablets.playSound(TabletEnums.ButtonClick);
+            Tablet.playSound(TabletEnums.ButtonClick);
        }

        anchors {
--- a/interface/resources/qml/hifi/Card.qml
+++ b/interface/resources/qml/hifi/Card.qml
@ -246,12 +246,12 @@ Item {
        anchors.fill: parent;
        acceptedButtons: Qt.LeftButton;
        onClicked: {
-            Tablets.playSound(TabletEnums.ButtonClick);
+            Tablet.playSound(TabletEnums.ButtonClick);
            goFunction("hifi://" + hifiUrl);
        }
        hoverEnabled: true;
        onEntered:  {
-            Tablets.playSound(TabletEnums.ButtonHover);
+            Tablet.playSound(TabletEnums.ButtonHover);
            hoverThunk();
        }
        onExited: unhoverThunk();
@ -269,7 +269,7 @@ Item {
        }
    }
    function go() {
-        Tablets.playSound(TabletEnums.ButtonClick);
+        Tablet.playSound(TabletEnums.ButtonClick);
        goFunction(drillDownToPlace ? ("/places/" + placeName) : ("/user_stories/" + storyId));
    }
    MouseArea {
--- a/interface/resources/qml/hifi/Desktop.qml
+++ b/interface/resources/qml/hifi/Desktop.qml
@ -45,7 +45,7 @@ OriginalDesktop.Desktop {
    Toolbar {
        id: sysToolbar;
        objectName: "com.highfidelity.interface.toolbar.system";
-        property var tablet: Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        property var tablet: Tablet.getTablet("com.highfidelity.interface.tablet.system");
        anchors.horizontalCenter: settings.constrainToolbarToCenterX ? desktop.horizontalCenter : undefined;
        // Literal 50 is overwritten by settings from previous session, and sysToolbar.x comes from settings when not constrained.
        x: sysToolbar.x
--- a/interface/resources/qml/hifi/audio/MicBar.qml
+++ b/interface/resources/qml/hifi/audio/MicBar.qml
@ -61,12 +61,12 @@ Rectangle {
        scrollGestureEnabled: false;
        onClicked: {
            Audio.muted = !Audio.muted;
-            Tablets.playSound(TabletEnums.ButtonClick);
+            Tablet.playSound(TabletEnums.ButtonClick);
        }
        drag.target: dragTarget;
        onContainsMouseChanged: {
            if (containsMouse) {
-                Tablets.playSound(TabletEnums.ButtonHover);
+                Tablet.playSound(TabletEnums.ButtonHover);
            }
        }
    }
--- a/interface/resources/qml/hifi/tablet/NewEntityButton.qml
+++ b/interface/resources/qml/hifi/tablet/NewEntityButton.qml
@ -123,11 +123,11 @@ Item {
        hoverEnabled: true
        enabled: true
        onClicked: {
-            Tablets.playSound(TabletEnums.ButtonClick);
+            Tablet.playSound(TabletEnums.ButtonClick);
            newEntityButton.clicked();
        }
        onEntered: {
-            Tablets.playSound(TabletEnums.ButtonHover);
+            Tablet.playSound(TabletEnums.ButtonHover);
            newEntityButton.state = "hover state";
        }
        onExited: {
--- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
@ -72,7 +72,7 @@ StackView {
        addressLine.focus = !HMD.active;
        root.parentChanged.connect(center);
        center();
-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    }
    Component.onDestruction: {
        root.parentChanged.disconnect(center);
@ -149,7 +149,7 @@ StackView {
                onClicked: {
                    addressBarDialog.loadHome();
                    tabletRoot.shown = false;
-                    tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+                    tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
                    tablet.gotoHomeScreen();
                }
                anchors {
--- a/interface/resources/qml/hifi/tablet/TabletAttachmentsDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAttachmentsDialog.qml
@ -37,7 +37,7 @@ Item {
    }

    function closeDialog() {
-        Tablets.getTablet("com.highfidelity.interface.tablet.system").gotoHomeScreen();
+        Tablet.getTablet("com.highfidelity.interface.tablet.system").gotoHomeScreen();
    }

    anchors.topMargin: hifi.dimensions.tabletMenuHeader  // Space for header.
--- a/interface/resources/qml/hifi/tablet/TabletButton.qml
+++ b/interface/resources/qml/hifi/tablet/TabletButton.qml
@ -130,12 +130,12 @@ Item {
            }
            tabletButton.clicked();
            if (tabletRoot) {
-                Tablets.playSound(TabletEnums.ButtonClick);
+                Tablet.playSound(TabletEnums.ButtonClick);
            }
        }
        onEntered: {
            tabletButton.isEntered = true;
-            Tablets.playSound(TabletEnums.ButtonHover);
+            Tablet.playSound(TabletEnums.ButtonHover);

            if (tabletButton.isActive) {
                tabletButton.state = "hover active state";
--- a/interface/resources/qml/hifi/tablet/TabletHome.qml
+++ b/interface/resources/qml/hifi/tablet/TabletHome.qml
@ -9,7 +9,7 @@ import "../audio" as HifiAudio
 Item {
    id: tablet
    objectName: "tablet"
-    property var tabletProxy: Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    property var tabletProxy: Tablet.getTablet("com.highfidelity.interface.tablet.system");
    
    Rectangle {
        id: bgTopBar
--- a/interface/resources/qml/hifi/tablet/TabletMenuView.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
@ -77,12 +77,12 @@ FocusScope {
                anchors.fill: parent
                hoverEnabled: true
                onEntered: {
-                    Tablets.playSound(TabletEnums.ButtonHover);
+                    Tablet.playSound(TabletEnums.ButtonHover);
                    listView.currentIndex = index
                }

                onClicked: {
-                    Tablets.playSound(TabletEnums.ButtonClick);
+                    Tablet.playSound(TabletEnums.ButtonClick);
                    root.selected(item);
                }
            }
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
@ -56,7 +56,7 @@ Item {
    }

    function closeDialog() {
-        var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

        if (gotoPreviousApp) {
            tablet.returnToPreviousApp();
@ -206,7 +206,7 @@ Item {
    }

    Component.onCompleted: {
-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        keyboardEnabled = HMD.active;
    }

--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -5833,10 +5833,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
    qScriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>);
    qScriptRegisterMetaType(scriptEngine.data(),
                            wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>);
-    scriptEngine->registerGlobalObject("Tablets", DependencyManager::get<TabletScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
    // FIXME remove these deprecated names for the tablet scripting interface
    scriptEngine->registerGlobalObject("tabletInterface", DependencyManager::get<TabletScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());

    auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>().data();
    DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(toolbarScriptingInterface);
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@ -105,12 +105,6 @@ void OffscreenUi::create() {
    myContext->setContextProperty("OffscreenUi", this);
    myContext->setContextProperty("offscreenFlags", offscreenFlags = new OffscreenFlags());
    myContext->setContextProperty("fileDialogHelper", new FileDialogHelper());
-    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-    qRegisterMetaType<TabletProxy*>();
-    qRegisterMetaType<TabletButtonProxy*>();
-    myContext->setContextProperty("Tablets", tabletScriptingInterface.data());
-    TabletProxy* tablet = tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system");
-    myContext->engine()->setObjectOwnership(tablet, QQmlEngine::CppOwnership);
 }

 void OffscreenUi::show(const QUrl& url, const QString& name, std::function<void(QQmlContext*, QObject*)> f) {
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@ -391,8 +391,10 @@ void initializeQmlEngine(QQmlEngine* engine, QQuickWindow* window) {
        qRegisterMetaType<TabletProxy*>();
        qRegisterMetaType<TabletButtonProxy*>();
    });
-    rootContext->setContextProperty("Tablets", DependencyManager::get<TabletScriptingInterface>().data());
+    rootContext->setContextProperty("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
    rootContext->setContextProperty("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data());
+    TabletProxy* tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
+    myContext->engine()->setObjectOwnership(tablet, QQmlEngine::CppOwnership);
 }

 QQmlEngine* acquireEngine(QQuickWindow* window) {
--- a/scripts/developer/EZrecord.js
+++ b/scripts/developer/EZrecord.js
@ -227,7 +227,7 @@
    }

    function setUp() {
-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        if (!tablet) {
            return;
        }
--- a/scripts/developer/inputRecording.js
+++ b/scripts/developer/inputRecording.js
@ -10,7 +10,7 @@
    var recording = false;
    var onRecordingScreen = false;
    var passedSaveDirectory = false;
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        text: "IRecord"
    });
--- a/scripts/developer/tests/dynamics/dynamicsTests.js
+++ b/scripts/developer/tests/dynamics/dynamicsTests.js
@ -18,7 +18,7 @@
    var DYNAMICS_TESTS_URL = Script.resolvePath("dynamics-tests.html");
    var DEFAULT_LIFETIME = 120; // seconds

-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

    var button = tablet.addButton({
        icon: Script.resolvePath("dynamicsTests.svg"),
--- a/scripts/developer/tests/puck-attach.js
+++ b/scripts/developer/tests/puck-attach.js
@ -19,7 +19,7 @@ Script.include("/~/system/libraries/Xform.js");
 var TABLET_BUTTON_NAME = "PUCKTACH";
 var TABLET_APP_URL = "https://hifi-content.s3.amazonaws.com/seefo/production/puck-attach/puck-attach.html";

-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var tabletButton = tablet.addButton({
    text: TABLET_BUTTON_NAME,
    icon: "https://s3.amazonaws.com/hifi-public/tony/icons/puck-i.svg",
--- a/scripts/developer/tests/sliderTestMain.js
+++ b/scripts/developer/tests/sliderTestMain.js
@ -1,6 +1,6 @@
 (function () {
 	var HTML_URL = Script.resolvePath("sliderTest.html");
-	var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+	var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        text: "SLIDER"
    });
--- a/scripts/developer/tests/tabletEventBridgeTest.js
+++ b/scripts/developer/tests/tabletEventBridgeTest.js
@ -14,7 +14,7 @@
 /* globals Tablets */


-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var tabletButton = tablet.addButton({
    text: "SOUNDS",
    icon: "http://s3.amazonaws.com/hifi-public/tony/icons/trombone-i.png",
--- a/scripts/developer/tests/tabletTest.js
+++ b/scripts/developer/tests/tabletTest.js
@ -10,7 +10,7 @@

 // Adds a BAM! button to the tablet ui.

-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var button = tablet.addButton({
    text: "BAM!!!"
 });
--- a/scripts/developer/utilities/audio/stats.js
+++ b/scripts/developer/utilities/audio/stats.js
@ -10,7 +10,7 @@
 //

 if (HMD.active && !Settings.getValue("HUDUIEnabled")) {
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var qml = Script.resolvePath("TabletStats.qml");
    tablet.loadQMLSource(qml);
    Script.stop();
--- a/scripts/developer/utilities/render/luci.js
+++ b/scripts/developer/utilities/render/luci.js
@ -27,7 +27,7 @@
        }
    }

-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        text: TABLET_BUTTON_NAME,
        icon: ICON_URL,
--- a/scripts/developer/utilities/render/photobooth/photoboothApp.js
+++ b/scripts/developer/utilities/render/photobooth/photoboothApp.js
@ -16,7 +16,7 @@
    var MODEL_BOUNDING_BOX_DIMENSIONS = {x: 1.0174,y: 1.1925,z: 1.0165};
    var PhotoBooth = {};
    var photoboothCreated = false;
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        icon: "icons/tablet-icons/snap-i.svg",
        text: "PHOTOBOOTH"
--- a/scripts/system/audio.js
+++ b/scripts/system/audio.js
@ -54,7 +54,7 @@ function onScreenChanged(type, url) {
    button.editProperties({isActive: onAudioScreen});
 }

-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var button = tablet.addButton({
    icon: Audio.muted ? MUTE_ICONS.icon : UNMUTE_ICONS.icon,
    activeIcon: Audio.muted ? MUTE_ICONS.activeIcon : UNMUTE_ICONS.activeIcon,
--- a/scripts/system/audioScope.js
+++ b/scripts/system/audioScope.js
@ -17,7 +17,7 @@
    var scopePaused = AudioScope.getPause();
    var autoPause = false;

-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var showScopeButton = tablet.addButton({
        icon: "icons/tablet-icons/scope.svg",
        text: "Audio Scope",
--- a/scripts/system/bubble.js
+++ b/scripts/system/bubble.js
@ -183,7 +183,7 @@

    // Setup the bubble button
    var buttonName = "BUBBLE";
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    button = tablet.addButton({
        icon: "icons/tablet-icons/bubble-i.svg",
        activeIcon: "icons/tablet-icons/bubble-a.svg",
--- a/scripts/system/chat.js
+++ b/scripts/system/chat.js
@ -19,7 +19,7 @@
    var tabletButtonIcon = "icons/tablet-icons/menu-i.svg"; // Icon for chat button.
    var tabletButtonActiveIcon = "icons/tablet-icons/menu-a.svg"; // Active icon for chat button.
    var tabletButton = null; // The button we create in the tablet.
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system"); // The awesome tablet.
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); // The awesome tablet.
    var chatLog = []; // Array of chat messages in the form of [avatarID, displayName, message, data].
    var avatarIdentifiers = {}; // Map of avatar ids to dict of identifierParams.
    var speechBubbleShowing = false; // Is the speech bubble visible?
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@ -148,7 +148,7 @@
    var walletEnabled = Settings.getValue("commerce", false);
    function startup() {
        if (walletEnabled) {
-            tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+            tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
            button = tablet.addButton({
                text: buttonName,
                icon: "icons/tablet-icons/wallet-i.svg",
--- a/scripts/system/controllers/godView.js
+++ b/scripts/system/controllers/godView.js
@ -81,7 +81,7 @@ function endGodView() {
 }

 var button;
-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

 function onClicked() {
    if (godView) {
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@ -390,7 +390,7 @@ var toolBar = (function () {
    }

    function fromQml(message) { // messages are {method, params}, like json-rpc. See also sendToQml.
-        var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        tablet.popFromStack();
        switch (message.method) {
        case "newModelDialogAdd":
@ -417,7 +417,7 @@ var toolBar = (function () {

        var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
        var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON);
-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        activeButton = tablet.addButton({
            captionColorOverride: hasRezPermissions ? "" : "#888888",
            icon: createButtonIconRsrc,
@ -463,7 +463,7 @@ var toolBar = (function () {
            var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;

            // tablet version of new-model dialog
-            var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+            var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
            tablet.pushOntoStack("NewModelDialog.qml");
        });

@ -644,7 +644,7 @@ var toolBar = (function () {
        isActive = active;
        activeButton.editProperties({isActive: isActive});

-        var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

        if (!isActive) {
            entityListTool.setVisible(false);
@ -1850,7 +1850,7 @@ var PropertiesTool = function (opts) {
    var that = {};

    var webView = null;
-    webView = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    webView = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    webView.setVisible = function(value) {};

    var visible = false;
@ -2293,7 +2293,7 @@ function selectParticleEntity(entityID) {
    particleExplorerTool.webView.emitScriptEvent(JSON.stringify(particleData));

    // Switch to particle explorer
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    tablet.sendToQml({method: 'selectTab', params: {id: 'particle'}});
 }

--- a/scripts/system/fingerPaint.js
+++ b/scripts/system/fingerPaint.js
@ -414,7 +414,7 @@
    }

    function setUp() {
-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        if (!tablet) {
            return;
        }
--- a/scripts/system/generalSettings.js
+++ b/scripts/system/generalSettings.js
@ -34,7 +34,7 @@
            alpha: 0.9
        });
    } else {
-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        button = tablet.addButton({
            icon: "icons/tablet-icons/goto-i.svg",
            text: buttonName,
--- a/scripts/system/goto.js
+++ b/scripts/system/goto.js
@ -37,7 +37,7 @@ if (Settings.getValue("HUDUIEnabled")) {
        alpha: 0.9
    });
 } else {
-    tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    button = tablet.addButton({
        icon: "icons/tablet-icons/goto-i.svg",
        activeIcon: "icons/tablet-icons/goto-a.svg",
--- a/scripts/system/help.js
+++ b/scripts/system/help.js
@ -17,7 +17,7 @@
    var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
    var buttonName = "HELP";
    var onHelpScreen = false;
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        icon: "icons/tablet-icons/help-i.svg",
        activeIcon: "icons/tablet-icons/help-a.svg",
--- a/scripts/system/hmd.js
+++ b/scripts/system/hmd.js
@ -38,7 +38,7 @@ function updateControllerDisplay() {
 }

 var button;
-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

 // Independent and Entity mode make people sick; disable them in hmd.
 var desktopOnlyViews = ['Independent Mode', 'Entity Mode'];
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@ -168,7 +168,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {

    this.receive = function (channel, senderID, senderUUID, localOnly) {
        if (_this.homeButtonID == senderID) {
-            var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+            var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
            var onHomeScreen = tablet.onHomeScreen();
            var isMessageOpen;
            if (onHomeScreen) {
@ -513,7 +513,7 @@ WebTablet.prototype.mousePressEvent = function (event) {
                                         entityPickResults.overlayID === this.tabletEntityID)) {
        var overlayPickResults = Overlays.findRayIntersection(pickRay, true, [this.webOverlayID, this.homeButtonID], []);
        if (overlayPickResults.intersects && overlayPickResults.overlayID === this.homeButtonID) {
-            var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+            var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
            var onHomeScreen = tablet.onHomeScreen();
            var isMessageOpen = tablet.isMessageDialogOpen();
            if (onHomeScreen) {
--- a/scripts/system/libraries/entityList.js
+++ b/scripts/system/libraries/entityList.js
@ -15,7 +15,7 @@ EntityListTool = function(opts) {
    var that = {};

    var webView = null;
-    webView = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    webView = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    webView.setVisible = function(value) {};

    var filterInView = false;
--- a/scripts/system/libraries/gridTool.js
+++ b/scripts/system/libraries/gridTool.js
@ -237,7 +237,7 @@ GridTool = function(opts) {
    var listeners = [];

    var webView = null;
-    webView = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    webView = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    webView.setVisible = function(value) {};

    horizontalGrid.addListener(function(data) {
--- a/scripts/system/libraries/utils.js
+++ b/scripts/system/libraries/utils.js
@ -354,7 +354,7 @@ flatten = function(array) {

 getTabletWidthFromSettings = function () {
    var DEFAULT_TABLET_WIDTH = 0.4375;
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var toolbarMode = tablet.toolbarMode;
    var DEFAULT_TABLET_SCALE = 100;
    var tabletScalePercentage = DEFAULT_TABLET_SCALE;
--- a/scripts/system/marketplaces/marketplace.js
+++ b/scripts/system/marketplaces/marketplace.js
@ -82,7 +82,7 @@ function toggleMarketplace() {
    }
 }

-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

 var browseExamplesButton = tablet.addButton({
    icon: "icons/tablet-icons/market-i.svg",
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@ -81,7 +81,7 @@
        }
    }

-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var marketplaceButton = tablet.addButton({
        icon: "icons/tablet-icons/market-i.svg",
        activeIcon: "icons/tablet-icons/market-a.svg",
--- a/scripts/system/menu.js
+++ b/scripts/system/menu.js
@ -13,7 +13,7 @@ var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-
 // var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";

 (function() {
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        icon: "icons/tablet-icons/menu-i.svg",
        activeIcon: "icons/tablet-icons/menu-a.svg",
--- a/scripts/system/mod.js
+++ b/scripts/system/mod.js
@ -18,7 +18,7 @@
 Script.include("/~/system/libraries/controllers.js");

 // grab the toolbar
-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

 var ASSETS_PATH = Script.resolvePath("assets");
 var TOOLS_PATH = Script.resolvePath("assets/images/tools/");
--- a/scripts/system/notifications.js
+++ b/scripts/system/notifications.js
@ -696,7 +696,7 @@
    Window.announcement.connect(onNotify);
    Window.notifyEditError = onEditError;
    Window.notify = onNotify;
-    Tablets.tabletNotification.connect(tabletNotification);
+    Tablet.tabletNotification.connect(tabletNotification);
    Wallet.walletNotSetup.connect(walletNotSetup);

    Messages.subscribe(NOTIFICATIONS_MESSAGE_CHANNEL);
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@ -677,7 +677,7 @@ var buttonName = "PEOPLE";
 var tablet = null;

 function startup() {
-    tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    button = tablet.addButton({
        text: buttonName,
        icon: "icons/tablet-icons/people-i.svg",
--- a/scripts/system/particle_explorer/particleExplorerTool.js
+++ b/scripts/system/particle_explorer/particleExplorerTool.js
@ -17,7 +17,7 @@ var PARTICLE_EXPLORER_HTML_URL = Script.resolvePath('particleExplorer.html');
 ParticleExplorerTool = function() {
    var that = {};
    that.createWebView = function() {
-        that.webView = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        that.webView = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        that.webView.setVisible = function(value) {};
        that.webView.webEventReceived.connect(that.webEventReceived);
    }
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@ -22,7 +22,7 @@ var clearOverlayWhenMoving;
 var buttonName = "SNAP";
 var buttonConnected = false;

-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var button = tablet.addButton({
    icon: "icons/tablet-icons/snap-i.svg",
    activeIcon: "icons/tablet-icons/snap-a.svg",
--- a/scripts/system/tablet-goto.js
+++ b/scripts/system/tablet-goto.js
@ -30,7 +30,7 @@
    var shouldActivateButton = false;
    function ignore() { }

-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var NORMAL_ICON    = "icons/tablet-icons/goto-i.svg";
    var NORMAL_ACTIVE  = "icons/tablet-icons/goto-a.svg";
    var WAITING_ICON   = "icons/tablet-icons/goto-msg.svg";
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@ -33,7 +33,7 @@

    function checkTablet() {
        if (gTablet === null) {
-            gTablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+            gTablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        }
    }

@ -315,7 +315,7 @@
    Script.scriptEnding.connect(function () {

        // if we reload scripts in tablet mode make sure we close the currently open window, by calling gotoHomeScreen
-        var tabletProxy = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        var tabletProxy = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        if (tabletProxy && tabletProxy.toolbarMode) {
            tabletProxy.gotoHomeScreen();
        }
--- a/scripts/system/tablet-users.js
+++ b/scripts/system/tablet-users.js
@ -33,7 +33,7 @@
        GlobalServices.findableBy = myVisibility;
    }

-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        icon: "icons/tablet-icons/users-i.svg",
        activeIcon: "icons/tablet-icons/users-a.svg",
--- a/unpublishedScripts/marketplace/blocks/blocksApp.js
+++ b/unpublishedScripts/marketplace/blocks/blocksApp.js
@ -26,7 +26,7 @@
        APP_URL = APP_OUTDATED_URL;
    }

-	var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+	var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 	var button = tablet.addButton({
 	    icon: APP_ICON,
        activeIcon: APP_ICON_ACTIVE,
--- a/unpublishedScripts/marketplace/camera-move/app-camera-move.js
+++ b/unpublishedScripts/marketplace/camera-move/app-camera-move.js
@ -162,7 +162,7 @@ var globalState = {
 function main() {
    log('initializing...', VERSION);

-    var tablet = Tablets.getTablet('com.highfidelity.interface.tablet.system'),
+    var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
        button = tablet.addButton(BUTTON_CONFIG);

    Script.scriptEnding.connect(function() {
@ -601,7 +601,7 @@ function _patchCameraModeSetting() {
 }

 function getSystemMetadata() {
-    var tablet = Tablets.getTablet('com.highfidelity.interface.tablet.system');
+    var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system');
    return {
        mode: {
            hmd: HMD.active,
--- a/unpublishedScripts/marketplace/clap/clapApp.js
+++ b/unpublishedScripts/marketplace/clap/clapApp.js
@ -16,7 +16,7 @@
 // Load up engine
 var APP_NAME = "CLAP";
 var ClapEngine = Script.require(Script.resolvePath("scripts/ClapEngine.js?v9"));
-var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

 // Define Menu
 var blackIcon = Script.resolvePath("icons/tablet-icons/clap-a.svg?foxv2");
--- a/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js
@ -45,7 +45,7 @@ var buttonConfig = utils.assign({
    activeIcon: require('./doppleganger-a.svg.json'),
 });

-var tablet = Tablets.getTablet('com.highfidelity.interface.tablet.system'),
+var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
    button = tablet.addButton(buttonConfig);

 Script.scriptEnding.connect(function() {
--- a/unpublishedScripts/marketplace/doppleganger-attachments/dist/app-doppleganger-marketplace.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/dist/app-doppleganger-marketplace.js
@ -905,7 +905,7 @@ var buttonConfig = utils.assign({
    activeIcon: __webpack_require__(7),
 });

-var tablet = Tablets.getTablet('com.highfidelity.interface.tablet.system'),
+var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
    button = tablet.addButton(buttonConfig);

 Script.scriptEnding.connect(function() {
--- a/unpublishedScripts/marketplace/doppleganger-mirror/app-doppleganger.js
+++ b/unpublishedScripts/marketplace/doppleganger-mirror/app-doppleganger.js
@ -12,7 +12,7 @@

 var DopplegangerClass = Script.require('./doppleganger.js');

-var tablet = Tablets.getTablet('com.highfidelity.interface.tablet.system'),
+var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
    button = tablet.addButton({
        icon: Script.resolvePath('./doppleganger-i.svg'),
        activeIcon: Script.resolvePath('./doppleganger-a.svg'),
--- a/unpublishedScripts/marketplace/emoji-tablet/emojiTablet.js
+++ b/unpublishedScripts/marketplace/emoji-tablet/emojiTablet.js
@ -19,7 +19,7 @@ var lib = Script.require("https://hifi-content.s3.amazonaws.com/elisalj/emoji_sc
    var APP_NAME = "EMOJIS";
    var APP_URL = "https://hifi-content.s3.amazonaws.com/elisalj/emoji_scripts/emojiTabletUI.html?" + Date.now();
    var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/emoji_scripts/icons/emoji-i.svg";
-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

    var button = tablet.addButton({
        icon: APP_ICON,
--- a/unpublishedScripts/marketplace/laser/laserPointerApp.js
+++ b/unpublishedScripts/marketplace/laser/laserPointerApp.js
@ -17,7 +17,7 @@

    var TRIGGER_PRESSURE = 0.95;

-    var tablet = Tablets.getTablet('com.highfidelity.interface.tablet.system');
+    var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system');

    var button = tablet.addButton({
        icon: APP_ICON,
--- a/unpublishedScripts/marketplace/record/record.js
+++ b/unpublishedScripts/marketplace/record/record.js
@ -631,7 +631,7 @@
    }

    function setUp() {
-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        if (!tablet) {
            return;
        }
@ -694,7 +694,7 @@
    }

    // FIXME: If setUp() is run immediately at Interface start-up, Interface hangs and crashes because of the line of code:
-    //     tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    //     tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    //setUp();
    //Script.scriptEnding.connect(tearDown);
    Script.setTimeout(function () {
--- a/unpublishedScripts/marketplace/shapes/shapes.js
+++ b/unpublishedScripts/marketplace/shapes/shapes.js
@ -1930,7 +1930,7 @@
    function setUp() {
        var hasRezPermissions;

-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        if (!tablet) {
            App.log("ERROR: Tablet not found! App not started.");
            return;
--- a/unpublishedScripts/marketplace/skyboxChanger/skyboxchanger.js
+++ b/unpublishedScripts/marketplace/skyboxChanger/skyboxchanger.js
@ -28,7 +28,7 @@
        }
    }

-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        icon: ICONS.icon,
        activeIcon: ICONS.activeIcon,
--- a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
+++ b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
@ -188,7 +188,7 @@
    //   -tablet: The tablet instance to be modified.
    var tablet = null;
    function startup() {
-        tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
        addOrRemoveButton(false, HMD.active);
        tablet.screenChanged.connect(onTabletScreenChanged);
        Window.domainChanged.connect(onDomainChanged);
--- a/unpublishedScripts/marketplace/tablet-raiseHand/tablet-raiseHand.js
+++ b/unpublishedScripts/marketplace/tablet-raiseHand/tablet-raiseHand.js
@ -20,7 +20,7 @@
    var isRaiseHandButtonActive = false;
    var animHandlerId;

-    var tablet = Tablets.getTablet("com.highfidelity.interface.tablet.system");
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
    var button = tablet.addButton({
        text: BUTTON_NAME,
        icon: "icons/tablet-icons/raise-hand-i.svg",