From b41fb952ae18156045b3bee3c992509175d6a442 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 5 May 2017 10:29:46 -0700 Subject: [PATCH 1/3] UI changes - Thanks Alan! --- interface/resources/qml/hifi/ComboDialog.qml | 11 +++++++---- interface/resources/qml/hifi/Pal.qml | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/interface/resources/qml/hifi/ComboDialog.qml b/interface/resources/qml/hifi/ComboDialog.qml index e328805d74..83fcad18c7 100644 --- a/interface/resources/qml/hifi/ComboDialog.qml +++ b/interface/resources/qml/hifi/ComboDialog.qml @@ -23,7 +23,8 @@ Item { property var callbackFunction; property int dialogWidth; property int dialogHeight; - property int comboOptionTextSize: 18; + property int comboOptionTextSize: 16; + property int comboBodyTextSize: 16; FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; } FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; } visible: false; @@ -63,7 +64,7 @@ Item { anchors.left: parent.left; anchors.leftMargin: 20; size: 24; - color: 'black'; + color: hifi.colors.darkGray; horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignTop; } @@ -141,6 +142,7 @@ Item { height: 30; size: comboOptionTextSize; wrapMode: Text.WordWrap; + color: hifi.colors.darkGray; } RalewayRegular { @@ -148,11 +150,12 @@ Item { text: bodyText; anchors.top: optionTitle.bottom; anchors.left: comboOptionSelected.right; - anchors.leftMargin: 25; + anchors.leftMargin: 10; anchors.right: parent.right; anchors.rightMargin: 10; - size: comboOptionTextSize; + size: comboBodyTextSize; wrapMode: Text.WordWrap; + color: hifi.colors.darkGray; } MouseArea { diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 60439cf63f..152e2f70a2 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -1013,10 +1013,10 @@ Rectangle { onClicked: { popupComboDialog("Set your availability:", availabilityComboBox.availabilityStrings, - ["Your username will be visible in everyone's 'Nearby' list.\nAnyone 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.\nThey will 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.\nThey will be able to jump to your location if the domain allows.", - "Your location will not be visible in the 'Connections' list of any other users. Only domain admins will be able to see your username in the 'Nearby' list."], + ["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.", + "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 not receive 'Go To' notifications from Connections.", + "You will appear offline in the 'Connections' list, and you will not receive 'Go To' notifications from Connections."], ["all", "connections", "friends", "none"]); } onEntered: availabilityComboBox.color = hifi.colors.lightGrayText; From 905f36976ff85cdffb5a1eb61c2cd2e992d9fc92 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 5 May 2017 11:28:49 -0700 Subject: [PATCH 2/3] New language --- 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 152e2f70a2..1f8cdfc81b 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -1015,8 +1015,8 @@ Rectangle { 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.", - "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 not receive 'Go To' notifications from Connections.", - "You will appear offline in the 'Connections' list, and you will not receive 'Go To' notifications from Connections."], + "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 not receive 'Happening Now' notifications in 'Go To'.", + "You will appear offline in the 'Connections' list, and you will not receive 'Happening Now' notifications in 'Go To'."], ["all", "connections", "friends", "none"]); } onEntered: availabilityComboBox.color = hifi.colors.lightGrayText; From a10606b9949f12d13fc7dc7052d0594471d4e819 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 5 May 2017 11:44:59 -0700 Subject: [PATCH 3/3] OMG language changed again --- interface/resources/qml/hifi/Pal.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 1f8cdfc81b..1755d2fbec 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -1015,7 +1015,7 @@ Rectangle { 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.", - "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 not receive 'Happening Now' notifications 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. You will only receive 'Happening Now' notifications in 'Go To' from friends.", "You will appear offline in the 'Connections' list, and you will not receive 'Happening Now' notifications in 'Go To'."], ["all", "connections", "friends", "none"]); }