more tweaks to preferences UI

interface/src/avatar/MyAvatar.cpp

@@ -943,6 +943,29 @@ void MyAvatar::clearJointAnimationPriorities() {
     }
 }
 
+QString MyAvatar::getModelDescription() const {
+    QString result;
+    if (_useFullAvatar) {
+        if (!getFullAvartarModelName().isEmpty()) {
+            result = "Full Avatar \"" + getFullAvartarModelName() + "\"";
+        } else {
+            result = "Full Avatar \"" + _fullAvatarURLFromPreferences.fileName() + "\"";
+        }
+    } else {
+        if (!getHeadModelName().isEmpty()) {
+            result = "Head \"" + getHeadModelName() + "\"";
+        } else {
+            result = "Head \"" + _headURLFromPreferences.fileName() + "\"";
+        }
+        if (!getBodyModelName().isEmpty()) {
+            result += " and Body \"" + getBodyModelName() + "\"";
+        } else {
+            result += " and Body \"" + _skeletonURLFromPreferences.fileName() + "\"";
+        }
+    }
+    return result;
+}
+
 void MyAvatar::setFaceModelURL(const QUrl& faceModelURL) {
     Avatar::setFaceModelURL(faceModelURL);
     _billboardValid = false;

interface/src/avatar/MyAvatar.h

@@ -131,6 +131,8 @@ public:
     const QString& getBodyModelName() const { return _bodyModelName; }
     const QString& getFullAvartarModelName() const { return _fullAvatarModelName; }
 
+    QString getModelDescription() const;
+
     virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData);
 
     virtual glm::vec3 getSkeletonPosition() const;

interface/src/ui/AvatarAppearanceDialog.cpp

@@ -26,9 +26,8 @@
 #include "Snapshot.h"
 #include "UserActivityLogger.h"
 #include "UIUtil.h"
-
+#include "ui/DialogsManager.h"
-
+#include "ui/PreferencesDialog.h"
-const int PREFERENCES_HEIGHT_PADDING = 20;
 
 AvatarAppearanceDialog::AvatarAppearanceDialog(QWidget* parent) :
     QDialog(parent) {
@@ -52,10 +51,6 @@ AvatarAppearanceDialog::AvatarAppearanceDialog(QWidget* parent) :
     connect(Application::getInstance(), &Application::bodyURLChanged, this, &AvatarAppearanceDialog::bodyURLChanged);
     connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &AvatarAppearanceDialog::fullAvatarURLChanged);
 
-    // move dialog to left side
-    //move(parentWidget()->geometry().topLeft());
-    //setFixedHeight(parentWidget()->size().height() - PREFERENCES_HEIGHT_PADDING);
-
     auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
     
     ui.bodyNameLabel->setText("Body - " + myAvatar->getBodyModelName());
@@ -66,18 +61,16 @@ AvatarAppearanceDialog::AvatarAppearanceDialog(QWidget* parent) :
 }
 
 void AvatarAppearanceDialog::useSeparateBodyAndHead(bool checked) {
-    setUseFullAvatar(!checked);
-
     QUrl headURL(ui.faceURLEdit->text());
     QUrl bodyURL(ui.skeletonURLEdit->text());
-    
     DependencyManager::get<AvatarManager>()->getMyAvatar()->useHeadAndBodyURLs(headURL, bodyURL);
+    setUseFullAvatar(!checked);
 }
 
 void AvatarAppearanceDialog::useFullAvatar(bool checked) {
-    setUseFullAvatar(checked);
     QUrl fullAvatarURL(ui.fullAvatarURLEdit->text());
     DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(fullAvatarURL);
+    setUseFullAvatar(checked);
 }
 
 void AvatarAppearanceDialog::setUseFullAvatar(bool useFullAvatar) {
@@ -88,6 +81,8 @@ void AvatarAppearanceDialog::setUseFullAvatar(bool useFullAvatar) {
     
     ui.useFullAvatar->setChecked(_useFullAvatar);
     ui.useSeparateBodyAndHead->setChecked(!_useFullAvatar);
+
+    DependencyManager::get<DialogsManager>()->getPreferencesDialog()->avatarDescriptionChanged();
 }
 
 void AvatarAppearanceDialog::headURLChanged(const QString& newValue, const QString& modelName) {
@@ -110,6 +105,9 @@ void AvatarAppearanceDialog::fullAvatarURLChanged(const QString& newValue, const
 
 void AvatarAppearanceDialog::accept() {
     saveAvatarAppearance();
+
+    DependencyManager::get<DialogsManager>()->getPreferencesDialog()->avatarDescriptionChanged();
+
     close();
     delete _marketplaceWindow;
     _marketplaceWindow = NULL;

interface/src/ui/AvatarAppearanceDialog.h

@@ -58,6 +58,7 @@ private slots:
     void useSeparateBodyAndHead(bool checked);
     void useFullAvatar(bool checked);
     
+    
 };
 
 #endif // hifi_AvatarAppearanceDialog_h

interface/src/ui/DialogsManager.h

@@ -44,6 +44,7 @@ public:
     QPointer<HMDToolsDialog> getHMDToolsDialog() const { return _hmdToolsDialog; }
     QPointer<LodToolsDialog> getLodToolsDialog() const { return _lodToolsDialog; }
     QPointer<OctreeStatsDialog> getOctreeStatsDialog() const { return _octreeStatsDialog; }
+    QPointer<PreferencesDialog> getPreferencesDialog() const { return _preferencesDialog; }
     
 public slots:
     void toggleAddressBar();

interface/src/ui/PreferencesDialog.cpp

@@ -57,23 +57,25 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) :
     move(parentWidget()->geometry().topLeft());
     setFixedHeight(parentWidget()->size().height() - PREFERENCES_HEIGHT_PADDING);
 
-    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
-    
-    ui.apperanceDescription->setText("Body - " + myAvatar->getBodyModelName());
 
     UIUtil::scaleWidgetFontSizes(this);
 }
 
+void PreferencesDialog::avatarDescriptionChanged() {
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
+}
+
 void PreferencesDialog::headURLChanged(const QString& newValue, const QString& modelName) {
-    ui.apperanceDescription->setText("Head - " + modelName);
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
 }
 
 void PreferencesDialog::bodyURLChanged(const QString& newValue, const QString& modelName) {
-    ui.apperanceDescription->setText("Body - " + modelName);
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
 }
 
 void PreferencesDialog::fullAvatarURLChanged(const QString& newValue, const QString& modelName) {
-    ui.apperanceDescription->setText("Full Avatar - " + modelName);
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
 }
 
 void PreferencesDialog::accept() {

interface/src/ui/PreferencesDialog.h

@@ -25,6 +25,8 @@ class PreferencesDialog : public QDialog {
 public:
     PreferencesDialog(QWidget* parent = nullptr);
 
+    void avatarDescriptionChanged();
+
 protected:
     void resizeEvent(QResizeEvent* resizeEvent);