Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 9 files). Show all
Unified · Split
| @@ -47,15 +47,10 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) : · 46 unmodified lines | |||
| 47 | connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser); | 47 | connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser); |
| 48 | connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked, Application::getInstance(), &Application::loadDefaultScripts); | 48 | connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked, Application::getInstance(), &Application::loadDefaultScripts); |
| 49 | 49 | ||
| 50 | //FIXME remove DialogsManager* dialogsManager = DependencyManager::get<DialogsManager>().data(); | ||
| 51 | //FIXME remove connect(ui.buttonChangeApperance, &QPushButton::clicked, dialogsManager, &DialogsManager::changeAvatarAppearance); | ||
| 52 | connect(ui.buttonChangeApperance, &QPushButton::clicked, this, &PreferencesDialog::openFullAvatarModelBrowser); | 50 | connect(ui.buttonChangeApperance, &QPushButton::clicked, this, &PreferencesDialog::openFullAvatarModelBrowser); |
| 53 | connect(ui.apperanceDescription, &QLineEdit::textChanged, this, [this](const QString& url) { | 51 | connect(ui.apperanceDescription, &QLineEdit::textChanged, this, [this](const QString& url) { |
| 54 | this->fullAvatarURLChanged(url, ""); | 52 | this->fullAvatarURLChanged(url, ""); |
| 55 | }); | 53 | }); |
| 56 | |||
| 57 | //FIXME remove connect(Application::getInstance(), &Application::headURLChanged, this, &PreferencesDialog::headURLChanged); | ||
| 58 | //FIXME remove connect(Application::getInstance(), &Application::bodyURLChanged, this, &PreferencesDialog::bodyURLChanged); | ||
| 59 | connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged); | 54 | connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged); |
| 60 | 55 | ||
| 61 | // move dialog to left side | 56 | // move dialog to left side |
| @@ -65,20 +60,7 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) : · 3 unmodified lines | |||
| 65 | UIUtil::scaleWidgetFontSizes(this); | 60 | UIUtil::scaleWidgetFontSizes(this); |
| 66 | } | 61 | } |
| 67 | 62 | ||
| 68 | /*FIXME remove void PreferencesDialog::avatarDescriptionChanged() { | ||
| 69 | ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription()); | ||
| 70 | } | ||
| 71 | |||
| 72 | void PreferencesDialog::headURLChanged(const QString& newValue, const QString& modelName) { | ||
| 73 | ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription()); | ||
| 74 | } | ||
| 75 | |||
| 76 | void PreferencesDialog::bodyURLChanged(const QString& newValue, const QString& modelName) { | ||
| 77 | ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription()); | ||
| 78 | } | ||
| 79 | */ | ||
| 80 | void PreferencesDialog::fullAvatarURLChanged(const QString& newValue, const QString& modelName) { | 63 | void PreferencesDialog::fullAvatarURLChanged(const QString& newValue, const QString& modelName) { |
| 81 | //FIXME remove ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription()); | ||
| 82 | ui.apperanceDescription->setText(newValue); | 64 | ui.apperanceDescription->setText(newValue); |
| 83 | const QString APPEARANCE_LABEL_TEXT("Appearance: "); | 65 | const QString APPEARANCE_LABEL_TEXT("Appearance: "); |
| 84 | ui.appearanceLabel->setText(APPEARANCE_LABEL_TEXT + modelName); | 66 | ui.appearanceLabel->setText(APPEARANCE_LABEL_TEXT + modelName); |