Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Tabs and Cleanup of Code

Browse source
This commit is contained in:
Cain Kilgore 2017-07-24 06:27:14 +01:00
parent 630922dd95
commit a4cf27402d
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
View file

@ -20,7 +20,7 @@ Preference {
height: control.height + hifi.dimensions.controlInterlineHeight height: control.height + hifi.dimensions.controlInterlineHeight
Component.onCompleted: { Component.onCompleted: {
if(preference.value) { if (preference.value) {
box1.checked = true; box1.checked = true;
} else { } else {
box2.checked = true; box2.checked = true;
@ -28,13 +28,13 @@ Preference {
} }
function save() { function save() {
// Box1 = True, Box2 = False (Right Hand for Default) // Box1 = True, Box2 = False (Right Hand for Default)
if(box1.checked && !box2.checked) { if (box1.checked && !box2.checked) {
preference.value = true; preference.value = true;
} }
if(!box1.checked && box2.checked) { if (!box1.checked && box2.checked) {
preference.value = false; preference.value = false;
} }
preference.save(); preference.save();
} }
@ -70,10 +70,10 @@ Preference {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
onClicked: { onClicked: {
if(box2.checked) { if (box2.checked) {
box2.checked = false; box2.checked = false;
} }
if(!box1.checked && !box2.checked) { if (!box1.checked && !box2.checked) {
box2.checked = true; box2.checked = true;
} }
} }

3
interface/resources/qml/dialogs/preferences/Section.qml
View file

@ -73,7 +73,7 @@ Preference {
property var buttonBuilder: Component { ButtonPreference { } } property var buttonBuilder: Component { ButtonPreference { } }
property var comboBoxBuilder: Component { ComboBoxPreference { } } property var comboBoxBuilder: Component { ComboBoxPreference { } }
property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } } property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
property var primaryHandBuilder: Component { PrimaryHandPreference { } } property var primaryHandBuilder: Component { PrimaryHandPreference { } }
property var preferences: [] property var preferences: []
property int checkBoxCount: 0 property int checkBoxCount: 0
@ -135,6 +135,7 @@ Preference {
checkBoxCount = 0; checkBoxCount = 0;
builder = spinnerSliderBuilder; builder = spinnerSliderBuilder;
break; break;
case Preference.PrimaryHand: case Preference.PrimaryHand:
checkBoxCount++; checkBoxCount++;
builder = primaryHandBuilder; builder = primaryHandBuilder;

1
interface/src/ui/PreferencesDialog.cpp
View file

@ -71,7 +71,6 @@ void setupPreferences() {
auto getter = [=]()->bool { return myAvatar->getUseAlternativeHand(); }; auto getter = [=]()->bool { return myAvatar->getUseAlternativeHand(); };
auto setter = [=](bool value) { myAvatar->setUseAlternativeHand(value); }; auto setter = [=](bool value) { myAvatar->setUseAlternativeHand(value); };
preferences->addPreference(new PrimaryHandPreference(AVATAR_BASICS, "Dominant Hand", getter, setter)); preferences->addPreference(new PrimaryHandPreference(AVATAR_BASICS, "Dominant Hand", getter, setter));
} }
// UI // UI