Kill the AvatarAppearanceDialog and rewire necessary parts of PreferencesDialog.

interface/src/ui/AvatarAppearanceDialog.cpp

@@ -1,215 +0,0 @@
-//
-//  AvatarAppearanceDialog.cpp
-//  interface/src/ui
-//
-//  Created by Stojce Slavkovski on 2/20/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <QFileDialog>
-#include <QFont>
-
-#include <AudioClient.h>
-#include <avatar/AvatarManager.h>
-#include <devices/Faceshift.h>
-#include <NetworkingConstants.h>
-
-#include "Application.h"
-#include "MainWindow.h"
-#include "LODManager.h"
-#include "Menu.h"
-#include "AvatarAppearanceDialog.h"
-#include "Snapshot.h"
-#include "UserActivityLogger.h"
-#include "UIUtil.h"
-#include "ui/DialogsManager.h"
-#include "ui/PreferencesDialog.h"
-
-AvatarAppearanceDialog::AvatarAppearanceDialog(QWidget* parent) :
-    QDialog(parent) {
-        
-    setAttribute(Qt::WA_DeleteOnClose);
-
-    ui.setupUi(this);
-
-    loadAvatarAppearance();
-
-    connect(ui.defaultButton, &QPushButton::clicked, this, &AvatarAppearanceDialog::accept);
-
-    connect(ui.buttonBrowseHead, &QPushButton::clicked, this, &AvatarAppearanceDialog::openHeadModelBrowser);
-    connect(ui.buttonBrowseBody, &QPushButton::clicked, this, &AvatarAppearanceDialog::openBodyModelBrowser);
-    connect(ui.buttonBrowseFullAvatar, &QPushButton::clicked, this, &AvatarAppearanceDialog::openFullAvatarModelBrowser);
-
-    connect(ui.useSeparateBodyAndHead, &QRadioButton::clicked, this, &AvatarAppearanceDialog::useSeparateBodyAndHead);
-    connect(ui.useFullAvatar, &QRadioButton::clicked, this, &AvatarAppearanceDialog::useFullAvatar);
-    
-    connect(Application::getInstance(), &Application::headURLChanged, this, &AvatarAppearanceDialog::headURLChanged);
-    connect(Application::getInstance(), &Application::bodyURLChanged, this, &AvatarAppearanceDialog::bodyURLChanged);
-    connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &AvatarAppearanceDialog::fullAvatarURLChanged);
-
-    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-    
-    ui.bodyNameLabel->setText("Body - " + myAvatar->getBodyModelName());
-    ui.headNameLabel->setText("Head - " + myAvatar->getHeadModelName());
-    ui.fullAvatarNameLabel->setText("Full Avatar - " + myAvatar->getFullAvartarModelName());
-
-    UIUtil::scaleWidgetFontSizes(this);
-}
-
-void AvatarAppearanceDialog::useSeparateBodyAndHead(bool 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) {
-    QUrl fullAvatarURL(ui.fullAvatarURLEdit->text());
-    DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(fullAvatarURL);
-    setUseFullAvatar(checked);
-}
-
-void AvatarAppearanceDialog::setUseFullAvatar(bool useFullAvatar) {
-    _useFullAvatar = useFullAvatar;
-    ui.faceURLEdit->setEnabled(!_useFullAvatar);
-    ui.skeletonURLEdit->setEnabled(!_useFullAvatar);
-    ui.fullAvatarURLEdit->setEnabled(_useFullAvatar);
-    
-    ui.useFullAvatar->setChecked(_useFullAvatar);
-    ui.useSeparateBodyAndHead->setChecked(!_useFullAvatar);
-
-    QPointer<PreferencesDialog> prefs = DependencyManager::get<DialogsManager>()->getPreferencesDialog();
-    if (prefs) {  // Preferences dialog may have been closed
-        prefs->avatarDescriptionChanged();
-    }
-}
-
-void AvatarAppearanceDialog::headURLChanged(const QString& newValue, const QString& modelName) {
-    ui.faceURLEdit->setText(newValue);
-    setUseFullAvatar(false);
-    ui.headNameLabel->setText("Head - " + modelName);
-}
-
-void AvatarAppearanceDialog::bodyURLChanged(const QString& newValue, const QString& modelName) {
-    ui.skeletonURLEdit->setText(newValue);
-    setUseFullAvatar(false);
-    ui.bodyNameLabel->setText("Body - " + modelName);
-}
-
-void AvatarAppearanceDialog::fullAvatarURLChanged(const QString& newValue, const QString& modelName) {
-    ui.fullAvatarURLEdit->setText(newValue);
-    setUseFullAvatar(true);
-    ui.fullAvatarNameLabel->setText("Full Avatar - " + modelName);
-}
-
-void AvatarAppearanceDialog::accept() {
-    saveAvatarAppearance();
-
-    QPointer<PreferencesDialog> prefs = DependencyManager::get<DialogsManager>()->getPreferencesDialog();
-    if (prefs) {  // Preferences dialog may have been closed
-        prefs->avatarDescriptionChanged();
-    }
-
-    close();
-    delete _marketplaceWindow;
-    _marketplaceWindow = NULL;
-}
-
-void AvatarAppearanceDialog::setHeadUrl(QString modelUrl) {
-    ui.faceURLEdit->setText(modelUrl);
-}
-
-void AvatarAppearanceDialog::setSkeletonUrl(QString modelUrl) {
-    ui.skeletonURLEdit->setText(modelUrl);
-}
-
-void AvatarAppearanceDialog::openFullAvatarModelBrowser() {
-    auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
-    auto WIDTH = 900;
-    auto HEIGHT = 700;
-    if (!_marketplaceWindow) {
-        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
-    }
-    _marketplaceWindow->setVisible(true);
-}
-
-void AvatarAppearanceDialog::openHeadModelBrowser() {
-    auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
-    auto WIDTH = 900;
-    auto HEIGHT = 700;
-    if (!_marketplaceWindow) {
-        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
-    }
-    _marketplaceWindow->setVisible(true);
-}
-
-void AvatarAppearanceDialog::openBodyModelBrowser() {
-    auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
-    auto WIDTH = 900;
-    auto HEIGHT = 700;
-    if (!_marketplaceWindow) {
-        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
-    }
-    _marketplaceWindow->setVisible(true);
-}
-
-void AvatarAppearanceDialog::resizeEvent(QResizeEvent *resizeEvent) {
-    
-    // keep buttons panel at the bottom
-    ui.buttonsPanel->setGeometry(0,
-                                 size().height() - ui.buttonsPanel->height(),
-                                 size().width(),
-                                 ui.buttonsPanel->height());
-    
-    // set width and height of srcollarea to match bottom panel and width
-    ui.scrollArea->setGeometry(ui.scrollArea->geometry().x(), ui.scrollArea->geometry().y(),
-                               size().width(),
-                               size().height() - ui.buttonsPanel->height() - ui.scrollArea->geometry().y());
-    
-}
-
-void AvatarAppearanceDialog::loadAvatarAppearance() {
-    
-    MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-
-    _useFullAvatar = myAvatar->getUseFullAvatar();
-    _fullAvatarURLString = myAvatar->getFullAvatarURLFromPreferences().toString();
-    _headURLString = myAvatar->getHeadURLFromPreferences().toString();
-    _bodyURLString = myAvatar->getBodyURLFromPreferences().toString();
-
-    ui.fullAvatarURLEdit->setText(_fullAvatarURLString);
-    ui.faceURLEdit->setText(_headURLString);
-    ui.skeletonURLEdit->setText(_bodyURLString);
-    setUseFullAvatar(_useFullAvatar);
-}
-
-void AvatarAppearanceDialog::saveAvatarAppearance() {
-    
-    MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-
-    QUrl headURL(ui.faceURLEdit->text());
-    QString headURLString = headURL.toString();
-
-    QUrl bodyURL(ui.skeletonURLEdit->text());
-    QString bodyURLString = bodyURL.toString();
-
-    QUrl fullAvatarURL(ui.fullAvatarURLEdit->text());
-    QString fullAvatarURLString = fullAvatarURL.toString();
-
-    bool somethingChanged = 
-        _useFullAvatar != myAvatar->getUseFullAvatar() ||
-        fullAvatarURLString != myAvatar->getFullAvatarURLFromPreferences().toString() ||
-        headURLString != myAvatar->getHeadURLFromPreferences().toString() ||
-        bodyURLString != myAvatar->getBodyURLFromPreferences().toString();
-        
-    if (somethingChanged) {
-        if (_useFullAvatar) {
-            myAvatar->useFullAvatarURL(fullAvatarURL);
-        } else {
-            myAvatar->useHeadAndBodyURLs(headURL, bodyURL);
-        }
-    }
-}

interface/src/ui/AvatarAppearanceDialog.h

@@ -1,64 +0,0 @@
-//
-//  AvatarAppearanceDialog.h
-//  interface/src/ui
-//
-//  Created by Stojce Slavkovski on 2/20/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_AvatarAppearanceDialog_h
-#define hifi_AvatarAppearanceDialog_h
-
-#include "ui_avatarAppearance.h"
-
-#include <QDialog>
-#include <QString>
-
-#include "scripting/WebWindowClass.h"
-
-class AvatarAppearanceDialog : public QDialog {
-    Q_OBJECT
-    
-public:
-    AvatarAppearanceDialog(QWidget* parent = nullptr);
-
-protected:
-    void resizeEvent(QResizeEvent* resizeEvent);
-
-private:
-    void loadAvatarAppearance();
-    void saveAvatarAppearance();
-    void openHeadModelBrowser();
-    void openBodyModelBrowser();
-    void openFullAvatarModelBrowser();
-    void setUseFullAvatar(bool useFullAvatar);
-
-    Ui_AvatarAppearanceDialog ui;
-
-    bool _useFullAvatar;
-    QString _headURLString;
-    QString _bodyURLString;
-    QString _fullAvatarURLString;
-    
-    
-    QString _displayNameString;
-    
-    WebWindowClass* _marketplaceWindow = NULL;
-
-private slots:
-    void accept();
-    void setHeadUrl(QString modelUrl);
-    void setSkeletonUrl(QString modelUrl);
-    void headURLChanged(const QString& newValue, const QString& modelName);
-    void bodyURLChanged(const QString& newValue, const QString& modelName);
-    void fullAvatarURLChanged(const QString& newValue, const QString& modelName);
-    void useSeparateBodyAndHead(bool checked);
-    void useFullAvatar(bool checked);
-    
-    
-};
-
-#endif // hifi_AvatarAppearanceDialog_h

interface/src/ui/DialogsManager.cpp

@@ -20,7 +20,6 @@
 #include "AddressBarDialog.h"
 #include "AnimationsDialog.h"
 #include "AttachmentsDialog.h"
-#include "AvatarAppearanceDialog.h"
 #include "BandwidthDialog.h"
 #include "CachesSizeDialog.h"
 #include "DiskCacheEditor.h"
@@ -88,15 +87,6 @@ void DialogsManager::editPreferences() {
     }
 }
 
-void DialogsManager::changeAvatarAppearance() {
-    if (!_avatarAppearanceDialog) {
-        maybeCreateDialog(_avatarAppearanceDialog);
-        _avatarAppearanceDialog->show();
-    } else {
-        _avatarAppearanceDialog->close();
-    }
-}
-
 void DialogsManager::editAttachments() {
     if (!_attachmentsDialog) {
         maybeCreateDialog(_attachmentsDialog);

interface/src/ui/DialogsManager.h

@@ -34,7 +34,6 @@ class OctreeStatsDialog;
 class PreferencesDialog;
 class ScriptEditorWindow;
 class QMessageBox;
-class AvatarAppearanceDialog;
 class DomainConnectionDialog;
 class UpdateDialog;
 
@@ -66,7 +65,6 @@ public slots:
     void hmdTools(bool showTools);
     void showScriptEditor();
     void showIRCLink();
-    void changeAvatarAppearance();
     void showDomainConnectionDialog();
     
     // Application Update
@@ -110,7 +108,6 @@ private:
     QPointer<OctreeStatsDialog> _octreeStatsDialog;
     QPointer<PreferencesDialog> _preferencesDialog;
     QPointer<ScriptEditorWindow> _scriptEditor;
-    QPointer<AvatarAppearanceDialog> _avatarAppearanceDialog;
     QPointer<DomainConnectionDialog> _domainConnectionDialog;
     QPointer<UpdateDialog> _updateDialog;
 };

interface/src/ui/PreferencesDialog.cpp

@@ -47,23 +47,25 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) :
     connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser);
     connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked, Application::getInstance(), &Application::loadDefaultScripts);
 
-    DialogsManager* dialogsManager = DependencyManager::get<DialogsManager>().data();
-    connect(ui.buttonChangeApperance, &QPushButton::clicked, dialogsManager, &DialogsManager::changeAvatarAppearance);
+    //FIXME remove DialogsManager* dialogsManager = DependencyManager::get<DialogsManager>().data();
+    //FIXME remove connect(ui.buttonChangeApperance, &QPushButton::clicked, dialogsManager, &DialogsManager::changeAvatarAppearance);
+    connect(ui.buttonChangeApperance, &QPushButton::clicked, this, &PreferencesDialog::openFullAvatarModelBrowser);
+        connect(ui.apperanceDescription, &QLineEdit::textChanged, this, [this](const QString& url) {
+            this->fullAvatarURLChanged(url, "");
+        });
 
-    connect(Application::getInstance(), &Application::headURLChanged, this, &PreferencesDialog::headURLChanged);
-    connect(Application::getInstance(), &Application::bodyURLChanged, this, &PreferencesDialog::bodyURLChanged);
+    //FIXME remove connect(Application::getInstance(), &Application::headURLChanged, this, &PreferencesDialog::headURLChanged);
+    //FIXME remove connect(Application::getInstance(), &Application::bodyURLChanged, this, &PreferencesDialog::bodyURLChanged);
     connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged);
 
     // move dialog to left side
     move(parentWidget()->geometry().topLeft());
     setFixedHeight(parentWidget()->size().height() - PREFERENCES_HEIGHT_PADDING);
 
-    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
-
     UIUtil::scaleWidgetFontSizes(this);
 }
 
-void PreferencesDialog::avatarDescriptionChanged() {
+/*FIXME remove void PreferencesDialog::avatarDescriptionChanged() {
     ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
 }
 
@@ -74,9 +76,13 @@ void PreferencesDialog::headURLChanged(const QString& newValue, const QString& m
 void PreferencesDialog::bodyURLChanged(const QString& newValue, const QString& modelName) {
     ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
 }
-
+*/
 void PreferencesDialog::fullAvatarURLChanged(const QString& newValue, const QString& modelName) {
-    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
+    //FIXME remove ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
+    ui.apperanceDescription->setText(newValue);
+    const QString APPEARANCE_LABEL_TEXT("Appearance: ");
+    ui.appearanceLabel->setText(APPEARANCE_LABEL_TEXT + modelName);
+    DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(newValue, modelName);
 }
 
 void PreferencesDialog::accept() {
@@ -103,6 +109,16 @@ void PreferencesDialog::openScriptsLocationBrowser() {
         ui.scriptsLocationEdit->setText(dir);
     }
 }
+void PreferencesDialog::openFullAvatarModelBrowser() {
+    const auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
+    const auto WIDTH = 900;
+    const auto HEIGHT = 700;
+    if (!_marketplaceWindow) {
+        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
+    }
+    _marketplaceWindow->setVisible(true);
+
+}
 
 void PreferencesDialog::resizeEvent(QResizeEvent *resizeEvent) {
     
@@ -129,6 +145,9 @@ void PreferencesDialog::loadPreferences() {
 
     ui.collisionSoundURLEdit->setText(myAvatar->getCollisionSoundURL());
 
+    fullAvatarURLChanged(myAvatar->getFullAvatarURLFromPreferences().toString(),
+                         myAvatar->getFullAvartarModelName());
+
     ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger));
 
     ui.snapshotLocationEdit->setText(Snapshot::snapshotsLocation.get());
@@ -210,6 +229,7 @@ void PreferencesDialog::savePreferences() {
     }
     
     myAvatar->setCollisionSoundURL(ui.collisionSoundURLEdit->text());
+    // avatar model url is already persisted by fullAvatarURLChanged()
 
     if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger)
         != ui.sendDataCheckBox->isChecked()) {

interface/src/ui/PreferencesDialog.h

@@ -42,10 +42,11 @@ private:
 
 private slots:
     void accept();
+    void openFullAvatarModelBrowser();
     void openSnapshotLocationBrowser();
     void openScriptsLocationBrowser();
-    void headURLChanged(const QString& newValue, const QString& modelName);
-    void bodyURLChanged(const QString& newValue, const QString& modelName);
+    /* FIXME remove void headURLChanged(const QString& newValue, const QString& modelName);
+    void bodyURLChanged(const QString& newValue, const QString& modelName);*/
     void fullAvatarURLChanged(const QString& newValue, const QString& modelName);
 };
 

interface/ui/avatarAppearance.ui

@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AvatarAppearanceDialog</class>
- <widget class="QDialog" name="AvatarAppearanceDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>500</width>
-    <height>350</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>500</width>
-    <height>350</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>500</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="font">
-   <font>
-    <pointsize>13</pointsize>
-   </font>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>-107</y>
-        <width>485</width>
-        <height>1550</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>30</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>30</number>
-       </property>
-       <property name="bottomMargin">
-        <number>10</number>
-       </property>
-
-       
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_4">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>7</number>
-         </property>
-         <property name="bottomMargin">
-          <number>7</number>
-         </property>
-         
-         
-         
-       <item>
-        <widget class="QRadioButton" name="useFullAvatar">
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="text">
-          <string>Use single avatar with Body and Head</string>
-         </property>
-        </widget>
-       </item>
-
-
-
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_fullAvatar">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>10</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         
-         
-         <item>
-          <widget class="QLabel" name="fullAvatarNameLabel">
-           <property name="font">
-            <font>
-             <family>Arial</family>
-            </font>
-           </property>
-           <property name="text">
-            <string>Full Avatar</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-           </property>
-           <property name="buddy">
-            <cstring>fullAvatarURLEdit</cstring>
-           </property>
-          </widget>
-         </item>
-
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_fullAvatar">
-
-           <item>
-            <widget class="QLineEdit" name="fullAvatarURLEdit">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-
-           <item>
-            <spacer name="horizontalSpacer_fullAvatar">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>5</width>
-               <height>0</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-
-           <item>
-            <widget class="QPushButton" name="buttonBrowseFullAvatar">
-             <property name="font">
-              <font>
-               <family>Arial</family>
-              </font>
-             </property>
-             <property name="text">
-              <string>Browse</string>
-             </property>
-             <property name="iconSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           
-           
-           
-          </layout>
-         </item>
-         
-         
-         
-        </layout>
-        
-        
-        
-        
-       </item>
-
-       <item>
-        <widget class="QRadioButton" name="useSeparateBodyAndHead">
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="text">
-          <string>Use separate Body and Head avatar files</string>
-         </property>
-        </widget>
-       </item>
-
-
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_separateParts_head">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>10</number>
-         </property>
-         <property name="topMargin">
-          <number>7</number>
-         </property>
-         <property name="bottomMargin">
-          <number>7</number>
-         </property>
-
-
-
-         <item>
-          <widget class="QLabel" name="headNameLabel">
-           <property name="font">
-            <font>
-             <family>Arial</family>
-            </font>
-           </property>
-           <property name="text">
-            <string>Head</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-           </property>
-          </widget>
-
-         </item>
-         
-         
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLineEdit" name="faceURLEdit"/>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>5</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="buttonBrowseHead">
-             <property name="font">
-              <font>
-               <family>Arial</family>
-              </font>
-             </property>
-             <property name="text">
-              <string>Browse</string>
-             </property>
-             <property name="iconSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         
-         
-        </layout>
-       </item>
-
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_separateParts_body">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>10</number>
-         </property>
-         <property name="topMargin">
-          <number>7</number>
-         </property>
-         <property name="bottomMargin">
-          <number>7</number>
-         </property>
-         
-         <item>
-          <widget class="QLabel" name="bodyNameLabel">
-           <property name="font">
-            <font>
-             <family>Arial</family>
-            </font>
-           </property>
-           <property name="text">
-            <string>Body</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-           </property>
-           <property name="buddy">
-            <cstring>skeletonURLEdit</cstring>
-           </property>
-          </widget>
-
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_skeletonURL">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLineEdit" name="skeletonURLEdit">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_10">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>5</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="buttonBrowseBody">
-             <property name="font">
-              <font>
-               <family>Arial</family>
-              </font>
-             </property>
-             <property name="text">
-              <string>Browse</string>
-             </property>
-             <property name="iconSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-
-
-
-
-        </layout>
-       </item>
-
-
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="buttonsPanel">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_12">
-      <item>
-       <layout class="QHBoxLayout" name="buttonsHBox_2">
-        <item>
-         <spacer name="horizontalSpacer_14">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="defaultButton">
-          <property name="font">
-           <font>
-            <family>Arial</family>
-           </font>
-          </property>
-          <property name="text">
-           <string>Close</string>
-          </property>
-          <property name="default">
-           <bool>true</bool>
-          </property>
-          <property name="flat">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
-</ui>

interface/ui/preferencesDialog.ui

@@ -294,11 +294,6 @@
                <family>Arial</family>
               </font>
              </property>
-
-             <property name="enabled">
-               <bool>false</bool>
-             </property>
-             
             </widget>
            </item>
            <item>