mirror of
https://github.com/overte-org/overte.git
synced 2025-04-08 01:12:48 +02:00
style updates
This commit is contained in:
David Kelly
parent
2f1b6be24d
commit
4629accc9c
3 changed files with 27 additions and 45 deletions
|
|
@ -19,12 +19,11 @@ Original.CheckBox {
|
|||
|
||||
property int colorScheme: hifi.colorSchemes.light
|
||||
readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
|
||||
|
||||
property bool isRedCheck: false
|
||||
property int boxSize: 14
|
||||
readonly property int boxRadius: 3
|
||||
readonly property int checkSize: Math.max(boxSize - 8, 10)
|
||||
readonly property int checkRadius: 2
|
||||
|
||||
activeFocusOnPress: true
|
||||
|
||||
style: CheckBoxStyle {
|
||||
|
|
@ -37,6 +36,7 @@ Original.CheckBox {
|
|||
border.color: pressed || hovered
|
||||
? hifi.colors.checkboxCheckedBorder
|
||||
: (checkBox.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
|
||||
|
||||
gradient: Gradient {
|
||||
GradientStop {
|
||||
position: 0.2
|
||||
|
|
@ -68,9 +68,9 @@ Original.CheckBox {
|
|||
height: checkSize
|
||||
radius: checkRadius
|
||||
anchors.centerIn: parent
|
||||
color: hifi.colors.checkboxChecked
|
||||
color: isRedCheck ? "#FF0000" : hifi.colors.checkboxChecked
|
||||
border.width: 2
|
||||
border.color: hifi.colors.checkboxCheckedBorder
|
||||
border.color: isRedCheck? "#D00000" : hifi.colors.checkboxCheckedBorder
|
||||
visible: checked && !pressed || !checked && pressed
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ import QtQuick.Controls 1.4
|
|||
import "../styles-uit"
|
||||
|
||||
Item {
|
||||
property var dialogTitleText;
|
||||
property var optionTitleText;
|
||||
property var optionBodyText;
|
||||
property var optionValues;
|
||||
property var selectedOptionIndex;
|
||||
property var dialogTitleText : "";
|
||||
property var optionTitleText: "";
|
||||
property var optionBodyText: "";
|
||||
property var optionValues: [];
|
||||
property var selectedOptionIndex: 0;
|
||||
property var callbackFunction;
|
||||
property int dialogWidth;
|
||||
property int dialogHeight;
|
||||
|
|
@ -51,12 +51,12 @@ Item {
|
|||
id: dialogContainer;
|
||||
color: "white";
|
||||
anchors.centerIn: dialogBackground;
|
||||
width: dialogWidth;
|
||||
height: dialogHeight;
|
||||
width: combo.dialogWidth;
|
||||
height: combo.dialogHeight;
|
||||
|
||||
RalewayRegular {
|
||||
id: dialogTitle;
|
||||
text: dialogTitleText;
|
||||
text: combo.dialogTitleText;
|
||||
anchors.top: parent.top;
|
||||
anchors.topMargin: 20;
|
||||
anchors.left: parent.left;
|
||||
|
|
@ -154,4 +154,4 @@ Item {
|
|||
comboListViewModel.insert(index, {"titleText": titleText, "bodyText": optionBodyText[index], "optionValue": optionValues[index]});
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -512,6 +512,7 @@ Rectangle {
|
|||
// If this is an "Ignore" checkbox, disable the checkbox if user isn't present.
|
||||
enabled: styleData.role === "ignore" ? (model ? model["isPresent"] : true) : true;
|
||||
boxSize: 24;
|
||||
isRedCheck: true
|
||||
onClicked: {
|
||||
var newValue = !model[styleData.role];
|
||||
nearbyUserModel.setProperty(model.userIndex, styleData.role, newValue);
|
||||
|
|
@ -611,7 +612,7 @@ Rectangle {
|
|||
"Bold names in the list are <b>avatar display names</b>.<br>" +
|
||||
"<font color='purple'>Purple borders around profile pictures are <b>connections</b></font>.<br>" +
|
||||
"<font color='green'>Green borders around profile pictures are <b>friends</b>.</font><br>" +
|
||||
"(TEMPORARY LANGUAGE) In some situations, you can also see others' usernames.<br>" +
|
||||
"In some situations, you can also see others' usernames.<br>" +
|
||||
"If you can see someone's username, you can GoTo them by selecting them in the PAL, then clicking their name.<br>" +
|
||||
"<br>If someone's display name isn't set, a unique <b>session display name</b> is assigned to them.<br>" +
|
||||
"<br>Administrators of this domain can also see the <b>username</b> or <b>machine ID</b> associated with each avatar present.");
|
||||
|
|
@ -948,7 +949,7 @@ Rectangle {
|
|||
}
|
||||
Item {
|
||||
id: upperRightInfoContainer;
|
||||
width: 160;
|
||||
width: 200;
|
||||
height: parent.height;
|
||||
anchors.top: parent.top;
|
||||
anchors.right: parent.right;
|
||||
|
|
@ -959,7 +960,7 @@ Rectangle {
|
|||
// Text size
|
||||
size: hifi.fontSizes.tabularData;
|
||||
// Anchors
|
||||
anchors.top: availabilityComboBox.bottom;
|
||||
anchors.top: myCard.top;
|
||||
anchors.horizontalCenter: parent.horizontalCenter;
|
||||
// Style
|
||||
color: hifi.colors.baseGrayHighlight;
|
||||
|
|
@ -972,13 +973,20 @@ Rectangle {
|
|||
id: availabilityComboBox;
|
||||
color: hifi.colors.textFieldLightBackground
|
||||
// Anchors
|
||||
anchors.top: parent.top;
|
||||
anchors.top: availabilityText.bottom;
|
||||
anchors.horizontalCenter: parent.horizontalCenter;
|
||||
// Size
|
||||
width: parent.width;
|
||||
height: 40;
|
||||
function determineAvailabilityIndex() {
|
||||
return ['all', 'connections', 'friends', 'none'].indexOf(GlobalServices.findableBy);
|
||||
}
|
||||
|
||||
function determineAvailabilityString() {
|
||||
return availabilityStrings[determineAvailabilityIndex()];
|
||||
}
|
||||
RalewayRegular {
|
||||
text: myData.userName === "Unknown user" ? "Login to Set" : availabilityStrings[GlobalServices.findableBy];
|
||||
text: myData.userName === "Unknown user" ? "Login to Set" : availabilityComboBox.determineAvailabilityString();
|
||||
anchors.fill: parent;
|
||||
anchors.leftMargin: 10;
|
||||
horizontalAlignment: Text.AlignLeft;
|
||||
|
|
@ -986,7 +994,7 @@ Rectangle {
|
|||
}
|
||||
MouseArea {
|
||||
anchors.fill: parent;
|
||||
enabled: myData.userName ==! "Unknown user";
|
||||
enabled: myData.userName !== "Unknown user";
|
||||
hoverEnabled: true;
|
||||
onClicked: {
|
||||
popupComboDialog("Set your availability:",
|
||||
|
|
@ -1001,32 +1009,6 @@ Rectangle {
|
|||
onExited: availabilityComboBox.color = hifi.colors.textFieldLightBackground;
|
||||
}
|
||||
}
|
||||
|
||||
/*HifiControlsUit.ComboBox {
|
||||
function determineAvailabilityIndex() {
|
||||
return ['all', 'connections', 'friends', 'none'].indexOf(GlobalServices.findableBy)
|
||||
}
|
||||
id: availabilityComboBox;
|
||||
// Anchors
|
||||
anchors.top: parent.top;
|
||||
anchors.horizontalCenter: parent.horizontalCenter;
|
||||
// Size
|
||||
width: parent.width;
|
||||
height: 40;
|
||||
currentIndex: determineAvailabilityIndex();
|
||||
model: ListModel {
|
||||
id: availabilityComboBoxListItems
|
||||
ListElement { text: "Everyone"; value: "all"; }
|
||||
ListElement { text: "All Connections"; value: "connections"; }
|
||||
ListElement { text: "Friends Only"; value: "friends"; }
|
||||
ListElement { text: "Appear Offline"; value: "none" }
|
||||
}
|
||||
onCurrentIndexChanged: {
|
||||
GlobalServices.findableBy = availabilityComboBoxListItems.get(currentIndex).value;
|
||||
UserActivityLogger.palAction("set_availability", availabilityComboBoxListItems.get(currentIndex).value);
|
||||
print('Setting availability:', JSON.stringify(GlobalServices.findableBy));
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue