History

cleanup DSC api, add scripting interface

Stephen Birarda committed 12 years ago

Commit 36137731 parent 340ae8e7 files · +122 −78Browse files

Showing the changes to interface/src/Menu.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Menu.cpp+7−5
@@ -830,8 +830,9 @@ void Menu::editPreferences() { · 829 unmodified lines
830 applicationInstance->getProfile()->setFaceModelURL(faceModelURL);830 applicationInstance->getProfile()->setFaceModelURL(faceModelURL);
831 831
832 // send the new face mesh URL to the data-server (if we have a client UUID)832 // send the new face mesh URL to the data-server (if we have a client UUID)
833 DataServerClient::putValueForKey(DataServerKey::FaceMeshURL,833 DataServerClient::putValueForKeyAndUsername(DataServerKey::FaceMeshURL,
834 faceModelURL.toString().toLocal8Bit().constData());834 faceModelURL.toString().toLocal8Bit().constData(),
835 applicationInstance->getProfile()->getUsername());
835 }836 }
836 837
837 QUrl skeletonModelURL(skeletonURLEdit->text());838 QUrl skeletonModelURL(skeletonURLEdit->text());
@@ -841,8 +842,9 @@ void Menu::editPreferences() { · 3 unmodified lines
841 applicationInstance->getProfile()->setSkeletonModelURL(skeletonModelURL);842 applicationInstance->getProfile()->setSkeletonModelURL(skeletonModelURL);
842 843
843 // send the new skeleton model URL to the data-server (if we have a client UUID)844 // send the new skeleton model URL to the data-server (if we have a client UUID)
844 DataServerClient::putValueForKey(DataServerKey::SkeletonURL,845 DataServerClient::putValueForKeyAndUsername(DataServerKey::SkeletonURL,
845 skeletonModelURL.toString().toLocal8Bit().constData());846 skeletonModelURL.toString().toLocal8Bit().constData(),
847 applicationInstance->getProfile()->getUsername());
846 }848 }
847 849
848 applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());850 applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());
@@ -961,7 +963,7 @@ void Menu::goToUser() { · 112 unmodified lines
961 int dialogReturn = userDialog.exec();963 int dialogReturn = userDialog.exec();
962 if (dialogReturn == QDialog::Accepted && !userDialog.textValue().isEmpty()) {964 if (dialogReturn == QDialog::Accepted && !userDialog.textValue().isEmpty()) {
963 // there's a username entered by the user, make a request to the data-server965 // there's a username entered by the user, make a request to the data-server
964 DataServerClient::getValuesForKeysAndUserString(966 DataServerClient::getValuesForKeysAndUsername(
965 QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation,967 QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation,
966 userDialog.textValue(), Application::getInstance()->getProfile());968 userDialog.textValue(), Application::getInstance()->getProfile());
967 }969 }