History

add an ATPAssetMigrator for bulk ATP migration

Stephen Birarda committed 11 years ago

Commit cf74cfb1 parent 60f5a0610 files · +382 −93Browse files

Showing the changes to interface/src/Menu.cpp (1 of 10 files). Show all

Unified · Split

interface/src/Menu.cpp+9−1
@@ -24,6 +24,7 @@ · 23 unmodified lines
24 24
25#include "Application.h"25#include "Application.h"
26#include "AccountManager.h"26#include "AccountManager.h"
27#include "assets/ATPAssetMigrator.h"
27#include "audio/AudioScope.h"28#include "audio/AudioScope.h"
28#include "avatar/AvatarManager.h"29#include "avatar/AvatarManager.h"
29#include "devices/DdeFaceTracker.h"30#include "devices/DdeFaceTracker.h"
@@ -354,7 +355,7 @@ Menu::Menu() { · 324 unmodified lines
354 MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets");355 MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets");
355 356
356 auto& assetDialogFactory = AssetUploadDialogFactory::getInstance();357 auto& assetDialogFactory = AssetUploadDialogFactory::getInstance();
357 assetDialogFactory.setParent(this);358 assetDialogFactory.setDialogParent(this);
358 359
359 QAction* assetUpload = addActionToQMenuAndActionHash(assetDeveloperMenu,360 QAction* assetUpload = addActionToQMenuAndActionHash(assetDeveloperMenu,
360 MenuOption::UploadAsset,361 MenuOption::UploadAsset,
@@ -365,6 +366,13 @@ Menu::Menu() { · 4 unmodified lines
365 // disable the asset upload action by default - it gets enabled only if asset server becomes present366 // disable the asset upload action by default - it gets enabled only if asset server becomes present
366 assetUpload->setEnabled(false);367 assetUpload->setEnabled(false);
367 368
369 auto& atpMigrator = ATPAssetMigrator::getInstance();
370 atpMigrator.setDialogParent(this);
371
372 QAction* assetMigration = addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration,
373 0, &atpMigrator,
374 SLOT(loadEntityServerFile()));
375
368 MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar");376 MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar");
369 377
370 MenuWrapper* faceTrackingMenu = avatarDebugMenu->addMenu("Face Tracking");378 MenuWrapper* faceTrackingMenu = avatarDebugMenu->addMenu("Face Tracking");