Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix askToSetAvatarUrl dialogs to use new style.

Browse source
This commit is contained in:
howard-stearns 2016-01-25 14:04:06 -08:00
parent 5171ec93a9
commit eb19f293c4
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
interface/src/Application.cpp
View file

@ -4253,12 +4253,7 @@ bool Application::askToSetAvatarUrl(const QString& url) {
QUrl realUrl(url);
if (realUrl.isLocalFile()) {
QString message = "You can not use local files for avatar components.";
QMessageBox msgBox;
msgBox.setText(message);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Warning);
msgBox.exec();
OffscreenUi::warning("", message);
return false;
}
@ -4267,32 +4262,22 @@ bool Application::askToSetAvatarUrl(const QString& url) {
FSTReader::ModelType modelType = FSTReader::predictModelType(fstMapping);
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Question);
msgBox.setWindowTitle("Set Avatar");
QPushButton* bodyAndHeadButton = NULL;
QString modelName = fstMapping["name"].toString();
QString message;
QString typeInfo;
bool ok = false;
switch (modelType) {
case FSTReader::HEAD_AND_BODY_MODEL:
message = QString("Would you like to use '") + modelName + QString("' for your avatar?");
bodyAndHeadButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
ok = QMessageBox::Ok == OffscreenUi::question("Set Avatar",
QString("Would you like to use '") + modelName + "' for your avatar?",
QMessageBox::Ok | QMessageBox::Cancel);
break;
default:
message = QString(modelName + QString("Does not support a head and body as required."));
OffscreenUi::warning("", modelName + "Does not support a head and body as required.");
break;
}
msgBox.setText(message);
msgBox.addButton(QMessageBox::Cancel);
msgBox.exec();
if (msgBox.clickedButton() == bodyAndHeadButton) {
if (ok) {
getMyAvatar()->useFullAvatarURL(url, modelName);
emit fullAvatarURLChanged(url, modelName);
} else {