From c5d2f598d75728ad3e80acfa14672f3a28a8ea50 Mon Sep 17 00:00:00 2001 From: Alexander Ivash Date: Thu, 16 Nov 2017 15:46:49 +0300 Subject: [PATCH] 8244 Rename captionColorOverride to captionColor --- interface/resources/qml/hifi/tablet/TabletButton.qml | 12 +++++++----- .../resources/qml/hifi/toolbars/ToolbarButton.qml | 6 ++++-- scripts/system/edit.js | 4 ++-- unpublishedScripts/marketplace/shapes/shapes.js | 8 ++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/TabletButton.qml b/interface/resources/qml/hifi/tablet/TabletButton.qml index 169c7acec1..8fc31d1cd6 100644 --- a/interface/resources/qml/hifi/tablet/TabletButton.qml +++ b/interface/resources/qml/hifi/tablet/TabletButton.qml @@ -5,7 +5,9 @@ import TabletScriptingInterface 1.0 Item { id: tabletButton - property string captionColorOverride: "" + property color defaultCaptionColor: "#ffffff" + property color captionColor: defaultCaptionColor + property var uuid; property string icon: "icons/tablet-icons/edit-i.svg" property string hoverIcon: tabletButton.icon @@ -105,7 +107,7 @@ Item { Text { id: text - color: captionColorOverride !== "" ? captionColorOverride: "#ffffff" + color: captionColor text: tabletButton.text font.bold: true font.pixelSize: 18 @@ -171,7 +173,7 @@ Item { PropertyChanges { target: text - color: captionColorOverride !== "" ? captionColorOverride: "#ffffff" + color: captionColor text: tabletButton.hoverText } @@ -197,7 +199,7 @@ Item { PropertyChanges { target: text - color: captionColorOverride !== "" ? captionColorOverride: "#333333" + color: captionColor !== defaultCaptionColor ? captionColor : "#333333" text: tabletButton.activeText } @@ -228,7 +230,7 @@ Item { PropertyChanges { target: text - color: captionColorOverride !== "" ? captionColorOverride: "#333333" + color: captionColor !== defaultCaptionColor ? captionColor : "#333333" text: tabletButton.activeHoverText } diff --git a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml index 63149ad23b..f27ba6bb24 100644 --- a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml +++ b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml @@ -4,7 +4,9 @@ import QtQuick.Controls 1.4 StateImage { id: button - property string captionColorOverride: "" + property color defaultCaptionColor: "#ffffff" + property color captionColor: defaultCaptionColor + property bool buttonEnabled: true property bool isActive: false property bool isEntered: false @@ -98,7 +100,7 @@ StateImage { Text { id: caption - color: captionColorOverride !== "" ? captionColorOverride: (button.isActive ? "#000000" : "#ffffff") + color: button.isActive ? "#000000" : captionColor text: button.isActive ? (button.isEntered ? button.activeHoverText : button.activeText) : (button.isEntered ? button.hoverText : button.text) font.bold: false font.pixelSize: 9 diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 15f1c2f6c1..b313079aac 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -419,7 +419,7 @@ var toolBar = (function () { var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON); tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); activeButton = tablet.addButton({ - captionColorOverride: hasRezPermissions ? "" : "#888888", + captionColor: hasRezPermissions ? "#ffffff" : "#888888", icon: createButtonIconRsrc, activeIcon: "icons/tablet-icons/edit-a.svg", text: "CREATE", @@ -792,7 +792,7 @@ function handleDomainChange() { var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified()); createButton.editProperties({ icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON), - captionColorOverride: (hasRezPermissions ? "" : "#888888"), + captionColor: (hasRezPermissions ? "#ffffff" : "#888888"), }); } diff --git a/unpublishedScripts/marketplace/shapes/shapes.js b/unpublishedScripts/marketplace/shapes/shapes.js index cd5f119588..bb35d9089e 100644 --- a/unpublishedScripts/marketplace/shapes/shapes.js +++ b/unpublishedScripts/marketplace/shapes/shapes.js @@ -18,7 +18,7 @@ APP_ICON_INACTIVE = Script.resolvePath("./assets/shapes-i.svg"), APP_ICON_ACTIVE = Script.resolvePath("./assets/shapes-a.svg"), APP_ICON_DISABLED = Script.resolvePath("./assets/shapes-d.svg"), - ENABLED_CAPTION_COLOR_OVERRIDE = "", + ENABLED_CAPTION_COLOR_OVERRIDE = "#ffffff", DISABLED_CAPTION_COLOR_OVERRIDE = "#888888", START_DELAY = 2000, // ms @@ -1865,7 +1865,7 @@ } button.editProperties({ icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED, - captionColorOverride: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE, + captionColor: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE, isActive: isAppActive }); } @@ -1880,7 +1880,7 @@ } button.editProperties({ icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED, - captionColorOverride: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE, + captionColor: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE, isActive: isAppActive }); } @@ -1945,7 +1945,7 @@ hasRezPermissions = Entities.canRez() || Entities.canRezTmp(); button = tablet.addButton({ icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED, - captionColorOverride: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE, + captionColor: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE, activeIcon: APP_ICON_ACTIVE, text: APP_NAME, isActive: isAppActive