History

Merge pull request #84 from Atlante45/feat/atp

Replace old drag&drop with new UI

Stephen Birarda committed 10 years ago

Commit 57ea51d2 parents 2e9ee4f 6bd7afc6 files · +76 −118Browse files

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

Unified · Split

interface/src/Menu.cpp+0−12
@@ -35,7 +35,6 @@ · 34 unmodified lines
3535 #include "MainWindow.h"
3636 #include "render/DrawStatus.h"
3737 #include "scripting/MenuScriptingInterface.h"
38−#include "ui/AssetUploadDialogFactory.h"
3938 #include "ui/DialogsManager.h"
4039 #include "ui/StandAloneJSConsole.h"
4140 #include "InterfaceLogging.h"
@@ -365,17 +364,6 @@ Menu::Menu() { · 323 unmodified lines
365364
366365 // Developer > Assets >>>
367366 MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets");
368− auto& assetDialogFactory = AssetUploadDialogFactory::getInstance();
369− assetDialogFactory.setDialogParent(this);
370− QAction* assetUpload = addActionToQMenuAndActionHash(assetDeveloperMenu,
371− MenuOption::UploadAsset,
372− 0,
373− &assetDialogFactory,
374− SLOT(showDialog()));
375−
376− // disable the asset upload action by default - it gets enabled only if asset server becomes present
377− assetUpload->setEnabled(false);
378−
379367 auto& atpMigrator = ATPAssetMigrator::getInstance();
380368 atpMigrator.setDialogParent(this);
381369