History

CR feedback

ZappoMan committed 11 years ago

Commit da9a8e81 parent 827e37b1 file · +13 −6Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 1 file). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+13−6
@@ -16,6 +16,7 @@ · 15 unmodified lines
1616 #include <avatar/AvatarManager.h>
1717 #include <devices/Faceshift.h>
1818 #include <devices/SixenseManager.h>
19+#include <NetworkingConstants.h>
1920
2021 #include "Application.h"
2122 #include "MainWindow.h"
@@ -82,17 +83,21 @@ void PreferencesDialog::setSkeletonUrl(QString modelUrl) { · 60 unmodified lines
8283 }
8384
8485 void PreferencesDialog::openHeadModelBrowser() {
85− auto MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace?category=avatars";
86+ auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
87+ auto WIDTH = 900;
88+ auto HEIGHT = 700;
8689 if (!_marketplaceWindow) {
87− _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, 900, 700, false);
90+ _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
8891 }
8992 _marketplaceWindow->setVisible(true);
9093 }
9194
9295 void PreferencesDialog::openBodyModelBrowser() {
93− auto MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace?category=avatars";
96+ auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
97+ auto WIDTH = 900;
98+ auto HEIGHT = 700;
9499 if (!_marketplaceWindow) {
95− _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, 900, 700, false);
100+ _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
96101 }
97102 _marketplaceWindow->setVisible(true);
98103 }
@@ -211,11 +216,13 @@ void PreferencesDialog::savePreferences() { · 112 unmodified lines
211216 UserActivityLogger::getInstance().changedDisplayName(displayNameStr);
212217 shouldDispatchIdentityPacket = true;
213218 }
219+
220+ auto AVATAR_FILE_EXTENSION = ".fst";
214221
215222 QUrl faceModelURL(ui.faceURLEdit->text());
216223 QString faceModelURLString = faceModelURL.toString();
217224 if (faceModelURLString != _faceURLString) {
218− if (faceModelURLString.isEmpty() || faceModelURLString.toLower().contains(".fst")) {
225+ if (faceModelURLString.isEmpty() || faceModelURLString.toLower().contains(AVATAR_FILE_EXTENSION)) {
219226 // change the faceModelURL in the profile, it will also update this user's BlendFace
220227 myAvatar->setFaceModelURL(faceModelURL);
221228 UserActivityLogger::getInstance().changedModel("head", faceModelURLString);
@@ -228,7 +235,7 @@ void PreferencesDialog::savePreferences() { · 6 unmodified lines
228235 QUrl skeletonModelURL(ui.skeletonURLEdit->text());
229236 QString skeletonModelURLString = skeletonModelURL.toString();
230237 if (skeletonModelURLString != _skeletonURLString) {
231− if (skeletonModelURLString.isEmpty() || skeletonModelURLString.toLower().contains(".fst")) {
238+ if (skeletonModelURLString.isEmpty() || skeletonModelURLString.toLower().contains(AVATAR_FILE_EXTENSION)) {
232239 // change the skeletonModelURL in the profile, it will also update this user's Body
233240 myAvatar->setSkeletonModelURL(skeletonModelURL);
234241 UserActivityLogger::getInstance().changedModel("skeleton", skeletonModelURLString);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t