From facee33400656d29197fd830a07f0fe6a936846d Mon Sep 17 00:00:00 2001 From: Kalila <69767640+digisomni@users.noreply.github.com> Date: Mon, 26 Jul 2021 01:23:09 +0200 Subject: [PATCH 1/3] Remove snaps in goto & nearby teleport references --- interface/resources/qml/hifi/Pal.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 15fa8df93d2..52b7cbe55a2 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -1109,10 +1109,10 @@ Rectangle { // TODO: Change language from "Happening Now" to something else (or remove entirely) popupComboDialog("Set your availability:", availabilityComboBox.availabilityStrings, - ["Your username will be visible in everyone's 'Nearby' list. Anyone will be able to jump to your location from within the 'Nearby' list.", - "Your location will be visible in the 'Connections' list only for those with whom you are connected or friends. They'll be able to jump to your location if the domain allows, and you will see 'Snaps' Blasts from them in 'Go To'.", - "Your location will be visible in the 'Connections' list only for those with whom you are friends. They'll be able to jump to your location if the domain allows, and you will see 'Snaps' Blasts from them in 'Go To'", - "You will appear offline in the 'Connections' list, and you will not receive Snaps Blasts from connections or friends in 'Go To'."], + ["Your username will be visible in everyone's 'Nearby' list.", + "Your location will be visible in the 'Connections' list only for those with whom you are connected or friends. They'll be able to jump to your location if the domain allows,", + "Your location will be visible in the 'Connections' list only for those with whom you are friends. They'll be able to jump to your location if the domain allows,", + "You will appear offline in the 'Connections' list,"], ["all", "connections", "friends", "none"]); } onEntered: availabilityComboBox.color = hifi.colors.lightGrayText; From 3f1c7fae1d71d6c3a698b20e7c718311cfc83f90 Mon Sep 17 00:00:00 2001 From: Kalila <69767640+digisomni@users.noreply.github.com> Date: Sat, 7 Aug 2021 14:20:07 -0400 Subject: [PATCH 2/3] Update interface/resources/qml/hifi/Pal.qml Co-authored-by: David Rowe --- interface/resources/qml/hifi/Pal.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 52b7cbe55a2..abfa47fd96b 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -1110,9 +1110,9 @@ Rectangle { popupComboDialog("Set your availability:", availabilityComboBox.availabilityStrings, ["Your username will be visible in everyone's 'Nearby' list.", - "Your location will be visible in the 'Connections' list only for those with whom you are connected or friends. They'll be able to jump to your location if the domain allows,", - "Your location will be visible in the 'Connections' list only for those with whom you are friends. They'll be able to jump to your location if the domain allows,", - "You will appear offline in the 'Connections' list,"], + "Your location will be visible in the 'Connections' list only for those with whom you are connected or friends. They'll be able to jump to your location if the domain allows.", + "Your location will be visible in the 'Connections' list only for those with whom you are friends. They'll be able to jump to your location if the domain allows.", + "You will appear offline in the 'Connections' list."], ["all", "connections", "friends", "none"]); } onEntered: availabilityComboBox.color = hifi.colors.lightGrayText; From f9eb292ee464a7e7e7ea47c1825137463283a1aa Mon Sep 17 00:00:00 2001 From: namark Date: Sat, 12 Feb 2022 00:09:01 +0400 Subject: [PATCH 3/3] Decreased the height of the availability combo dialog. --- interface/resources/qml/hifi/Pal.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index abfa47fd96b..656e610728f 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -94,7 +94,7 @@ Rectangle { id: comboDialog; z: 998; // Force the ComboDialog on top of everything else dialogWidth: parent.width - 50; - dialogHeight: parent.height - 100; + dialogHeight: parent.height - 200; } function letterbox(headerGlyph, headerText, message) { letterboxMessage.headerGlyph = headerGlyph; @@ -632,7 +632,7 @@ Rectangle { : hifi.buttons.disabledTextColor[actionButton.colorScheme]; } } - + HifiControlsUit.Button { id: hardBanButton; color: 2; // Red