Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 02:55:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11830 from ElderOrb/FB8244

Browse source 
8244 Rename captionColorOverride to captionColor
This commit is contained in:
Brad Hefta-Gaub 2017-11-18 14:28:32 -08:00 committed by GitHub
commit 1de6ecec30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/qml/hifi/tablet/TabletButton.qml
View file

@ -5,7 +5,9 @@ import TabletScriptingInterface 1.0
Item { Item {
id: tabletButton id: tabletButton
property string captionColorOverride: "" property color defaultCaptionColor: "#ffffff"
property color captionColor: defaultCaptionColor
property var uuid; property var uuid;
property string icon: "icons/tablet-icons/edit-i.svg" property string icon: "icons/tablet-icons/edit-i.svg"
property string hoverIcon: tabletButton.icon property string hoverIcon: tabletButton.icon
@ -105,7 +107,7 @@ Item {
Text { Text {
id: text id: text
color: captionColorOverride !== "" ? captionColorOverride: "#ffffff" color: captionColor
text: tabletButton.text text: tabletButton.text
font.bold: true font.bold: true
font.pixelSize: 18 font.pixelSize: 18
@ -171,7 +173,7 @@ Item {
PropertyChanges { PropertyChanges {
target: text target: text
color: captionColorOverride !== "" ? captionColorOverride: "#ffffff" color: captionColor
text: tabletButton.hoverText text: tabletButton.hoverText
} }
@ -197,7 +199,7 @@ Item {
PropertyChanges { PropertyChanges {
target: text target: text
color: captionColorOverride !== "" ? captionColorOverride: "#333333" color: captionColor !== defaultCaptionColor ? captionColor : "#333333"
text: tabletButton.activeText text: tabletButton.activeText
} }
@ -228,7 +230,7 @@ Item {
PropertyChanges { PropertyChanges {
target: text target: text
color: captionColorOverride !== "" ? captionColorOverride: "#333333" color: captionColor !== defaultCaptionColor ? captionColor : "#333333"
text: tabletButton.activeHoverText text: tabletButton.activeHoverText
} }

6
interface/resources/qml/hifi/toolbars/ToolbarButton.qml
View file

@ -4,7 +4,9 @@ import QtQuick.Controls 1.4
StateImage { StateImage {
id: button id: button
property string captionColorOverride: "" property color defaultCaptionColor: "#ffffff"
property color captionColor: defaultCaptionColor
property bool buttonEnabled: true property bool buttonEnabled: true
property bool isActive: false property bool isActive: false
property bool isEntered: false property bool isEntered: false
@ -98,7 +100,7 @@ StateImage {
Text { Text {
id: caption 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) text: button.isActive ? (button.isEntered ? button.activeHoverText : button.activeText) : (button.isEntered ? button.hoverText : button.text)
font.bold: false font.bold: false
font.pixelSize: 9 font.pixelSize: 9

4
scripts/system/edit.js
View file

@ -419,7 +419,7 @@ var toolBar = (function () {
var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON); var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON);
tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
activeButton = tablet.addButton({ activeButton = tablet.addButton({
captionColorOverride: hasRezPermissions ? "" : "#888888", captionColor: hasRezPermissions ? "#ffffff" : "#888888",
icon: createButtonIconRsrc, icon: createButtonIconRsrc,
activeIcon: "icons/tablet-icons/edit-a.svg", activeIcon: "icons/tablet-icons/edit-a.svg",
text: "CREATE", text: "CREATE",
@ -792,7 +792,7 @@ function handleDomainChange() {
var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified()); var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
createButton.editProperties({ createButton.editProperties({
icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON), icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON),
captionColorOverride: (hasRezPermissions ? "" : "#888888"), captionColor: (hasRezPermissions ? "#ffffff" : "#888888"),
}); });
} }

8
unpublishedScripts/marketplace/shapes/shapes.js
View file

@ -18,7 +18,7 @@
APP_ICON_INACTIVE = Script.resolvePath("./assets/shapes-i.svg"), APP_ICON_INACTIVE = Script.resolvePath("./assets/shapes-i.svg"),
APP_ICON_ACTIVE = Script.resolvePath("./assets/shapes-a.svg"), APP_ICON_ACTIVE = Script.resolvePath("./assets/shapes-a.svg"),
APP_ICON_DISABLED = Script.resolvePath("./assets/shapes-d.svg"), APP_ICON_DISABLED = Script.resolvePath("./assets/shapes-d.svg"),
ENABLED_CAPTION_COLOR_OVERRIDE = "", ENABLED_CAPTION_COLOR_OVERRIDE = "#ffffff",
DISABLED_CAPTION_COLOR_OVERRIDE = "#888888", DISABLED_CAPTION_COLOR_OVERRIDE = "#888888",
START_DELAY = 2000, // ms START_DELAY = 2000, // ms
@ -1865,7 +1865,7 @@
} }
button.editProperties({ button.editProperties({
icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED, 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 isActive: isAppActive
}); });
} }
@ -1880,7 +1880,7 @@
} }
button.editProperties({ button.editProperties({
icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED, 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 isActive: isAppActive
}); });
} }
@ -1945,7 +1945,7 @@
hasRezPermissions = Entities.canRez() || Entities.canRezTmp(); hasRezPermissions = Entities.canRez() || Entities.canRezTmp();
button = tablet.addButton({ button = tablet.addButton({
icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED, 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, activeIcon: APP_ICON_ACTIVE,
text: APP_NAME, text: APP_NAME,
isActive: isAppActive isActive: isAppActive