From 49c229897f53a874b59ac63a997623c7190920e8 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 23 Feb 2016 17:55:36 +1300 Subject: [PATCH] Give the "change avatar?" confirmation dialog a default action --- interface/src/Application.cpp | 2 +- tests/ui/qml/main.qml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 7c1fd9279b..0268bc52a4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4315,7 +4315,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { case FSTReader::HEAD_AND_BODY_MODEL: ok = QMessageBox::Ok == OffscreenUi::question("Set Avatar", "Would you like to use '" + modelName + "' for your avatar?", - QMessageBox::Ok | QMessageBox::Cancel); + QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); break; default: diff --git a/tests/ui/qml/main.qml b/tests/ui/qml/main.qml index d5ef2584f5..0bdfdb64b9 100644 --- a/tests/ui/qml/main.qml +++ b/tests/ui/qml/main.qml @@ -87,11 +87,13 @@ ApplicationWindow { var messageBox = desktop.messageBox({ title: "Set Avatar", text: "Would you like to use 'Albert' for your avatar?", - icon: OriginalDialogs.StandardIcon.Question, + icon: OriginalDialogs.StandardIcon.Question, // Test question icon //icon: OriginalDialogs.StandardIcon.Information, // Test informaton icon //icon: OriginalDialogs.StandardIcon.Warning, // Test warning icon //icon: OriginalDialogs.StandardIcon.Critical, // Test critical icon - buttons: OriginalDialogs.StandardButton.Ok + OriginalDialogs.StandardButton.Cancel + //icon: OriginalDialogs.StandardIcon.NoIcon, // Test no icon + buttons: OriginalDialogs.StandardButton.Ok + OriginalDialogs.StandardButton.Cancel, + defaultButton: OriginalDialogs.StandardButton.Ok }); messageBox.selected.connect(function(button) { console.log("You clicked " + button)