diff --git a/interface/resources/icons/tablet-icons/bubble-i.svg b/interface/resources/icons/tablet-icons/bubble-i.svg
new file mode 100644
index 0000000000..d7c8948e01
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/bubble-i.svg
@@ -0,0 +1,46 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/edit-i.svg b/interface/resources/icons/tablet-icons/edit-i.svg
new file mode 100644
index 0000000000..e430333597
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/edit-i.svg
@@ -0,0 +1,25 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/goto-i.svg b/interface/resources/icons/tablet-icons/goto-i.svg
new file mode 100644
index 0000000000..911e346866
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/goto-i.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/help-i.svg b/interface/resources/icons/tablet-icons/help-i.svg
new file mode 100644
index 0000000000..8d53e04d64
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/help-i.svg
@@ -0,0 +1,27 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/market-i.svg b/interface/resources/icons/tablet-icons/market-i.svg
new file mode 100644
index 0000000000..bf9aa9335f
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/market-i.svg
@@ -0,0 +1,23 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/menu-i.svg b/interface/resources/icons/tablet-icons/menu-i.svg
new file mode 100644
index 0000000000..a7a7400ffd
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/menu-i.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/mic-a.svg b/interface/resources/icons/tablet-icons/mic-a.svg
new file mode 100644
index 0000000000..69feec7c17
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/mic-a.svg
@@ -0,0 +1,21 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/mic-i.svg b/interface/resources/icons/tablet-icons/mic-i.svg
new file mode 100644
index 0000000000..c4eda55cbc
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/mic-i.svg
@@ -0,0 +1,22 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/people-i.svg b/interface/resources/icons/tablet-icons/people-i.svg
new file mode 100644
index 0000000000..8665dfc6f7
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/people-i.svg
@@ -0,0 +1,22 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/scripts-i.svg b/interface/resources/icons/tablet-icons/scripts-i.svg
new file mode 100644
index 0000000000..647cf805ce
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/scripts-i.svg
@@ -0,0 +1,21 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/snap-i.svg b/interface/resources/icons/tablet-icons/snap-i.svg
new file mode 100644
index 0000000000..abafa1c3cf
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/snap-i.svg
@@ -0,0 +1,18 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/switch-a.svg b/interface/resources/icons/tablet-icons/switch-a.svg
new file mode 100644
index 0000000000..2e26d09e62
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/switch-a.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/interface/resources/icons/tablet-icons/switch-i.svg b/interface/resources/icons/tablet-icons/switch-i.svg
new file mode 100644
index 0000000000..a6460f9c27
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/switch-i.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/scripts/system/bubble.js b/scripts/system/bubble.js
index 7880faa934..35fc7db59b 100644
--- a/scripts/system/bubble.js
+++ b/scripts/system/bubble.js
@@ -166,6 +166,7 @@
// Setup the bubble button and add it to the toolbar
var button = tablet.addButton({
+ icon: "icons/tablet-icons/bubble-i.svg",
text: "BUBBLE"
});
onBubbleToggled();
@@ -176,7 +177,7 @@
// Cleanup the toolbar button and overlays when script is stopped
Script.scriptEnding.connect(function () {
- tablet.removeButton('bubble');
+ tablet.removeButton(button);
button.clicked.disconnect(Users.toggleIgnoreRadius);
Users.ignoreRadiusEnabledChanged.disconnect(onBubbleToggled);
Users.enteredIgnoreRadius.disconnect(enteredIgnoreRadius);
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 63e64ba982..083d587480 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -196,7 +196,6 @@ var toolBar = (function () {
function cleanup() {
that.setActive(false);
- systemToolbar.removeButton(EDIT_TOGGLE_BUTTON);
}
function addButton(name, image, handler) {
@@ -233,6 +232,7 @@ var toolBar = (function () {
tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
activeButton = tablet.addButton({
+ icon: "icons/tablet-icons/edit-i.svg",
text: "EDIT"
});
diff --git a/scripts/system/goto.js b/scripts/system/goto.js
index 62b9dce35b..b058f9695b 100644
--- a/scripts/system/goto.js
+++ b/scripts/system/goto.js
@@ -16,6 +16,7 @@
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
var isActive = false
var button = tablet.addButton({
+ icon: "icons/tablet-icons/goto-i.svg",
text:"GOTO"
});
@@ -35,7 +36,7 @@ button.clicked.connect(onClicked);
DialogsManager.addressBarShown.connect(onAddressBarShown);
Script.scriptEnding.connect(function () {
- toolBar.removeButton("goto");
+ tablet.removeButton(button);
button.clicked.disconnect(onClicked);
DialogsManager.addressBarShown.disconnect(onAddressBarShown);
});
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index d79a6e46cb..a89203235c 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -11,18 +11,13 @@
(function() { // BEGIN LOCAL_SCOPE
var SNAPSHOT_DELAY = 500; // 500ms
-var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system");
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
var resetOverlays;
var reticleVisible;
var clearOverlayWhenMoving;
-var button = toolBar.addButton({
- objectName: "snapshot",
- imageURL: Script.resolvePath("assets/images/tools/snap.svg"),
- visible: true,
- buttonState: 1,
- defaultState: 1,
- hoverState: 2,
- alpha: 0.9,
+var button = tablet.addButton({
+ icon: "icons/tablet-icons/snap-i.svg",
+ text: "SNAP"
});
function shouldOpenFeedAfterShare() {
@@ -117,17 +112,14 @@ function onClicked() {
Reticle.visible = false;
Window.snapshotTaken.connect(resetButtons);
- button.writeProperty("buttonState", 0);
- button.writeProperty("defaultState", 0);
- button.writeProperty("hoverState", 2);
+ //button.writeProperty("buttonState", 0);
+ //button.writeProperty("defaultState", 0);
+ //button.writeProperty("hoverState", 2);
// hide overlays if they are on
if (resetOverlays) {
Menu.setIsOptionChecked("Overlays", false);
}
-
- // hide hud
- toolBar.writeProperty("visible", false);
// take snapshot (with no notification)
Script.setTimeout(function () {
@@ -160,7 +152,7 @@ function resetButtons(pathStillSnapshot, pathAnimatedSnapshot, notify) {
// If we ARE taking an animated snapshot, we've already re-enabled the HUD by this point.
if (pathAnimatedSnapshot === "") {
// show hud
- toolBar.writeProperty("visible", true);
+ //toolBar.writeProperty("visible", true);
Reticle.visible = reticleVisible;
// show overlays if they were on
if (resetOverlays) {
@@ -171,9 +163,9 @@ function resetButtons(pathStillSnapshot, pathAnimatedSnapshot, notify) {
button.clicked.connect(onClicked);
}
// update button states
- button.writeProperty("buttonState", 1);
- button.writeProperty("defaultState", 1);
- button.writeProperty("hoverState", 3);
+ //button.writeProperty("buttonState", 1);
+ //button.writeProperty("defaultState", 1);
+ //button.writeProperty("hoverState", 3);
Window.snapshotTaken.disconnect(resetButtons);
// A Snapshot Review dialog might be left open indefinitely after taking the picture,
@@ -197,13 +189,12 @@ function resetButtons(pathStillSnapshot, pathAnimatedSnapshot, notify) {
function processingGif() {
// show hud
- toolBar.writeProperty("visible", true);
Reticle.visible = reticleVisible;
// update button states
- button.writeProperty("buttonState", 0);
- button.writeProperty("defaultState", 0);
- button.writeProperty("hoverState", 2);
+ //button.writeProperty("buttonState", 0);
+ //button.writeProperty("defaultState", 0);
+ //button.writeProperty("hoverState", 2);
// Don't allow the user to click the snapshot button yet
button.clicked.disconnect(onClicked);
// show overlays if they were on
@@ -217,7 +208,7 @@ Window.snapshotShared.connect(snapshotShared);
Window.processingGif.connect(processingGif);
Script.scriptEnding.connect(function () {
- toolBar.removeButton("snapshot");
+ tablet.removeButton(button);
button.clicked.disconnect(onClicked);
Window.snapshotShared.disconnect(snapshotShared);
Window.processingGif.disconnect(processingGif);