Replace old drag&drop with new UI
Showing the changes to interface/src/Menu.cpp (1 of 6 files). Show all
Unified · Split
| @@ -35,7 +35,6 @@ · 34 unmodified lines | |||
| 35 | #include "MainWindow.h" | 35 | #include "MainWindow.h" |
| 36 | #include "render/DrawStatus.h" | 36 | #include "render/DrawStatus.h" |
| 37 | #include "scripting/MenuScriptingInterface.h" | 37 | #include "scripting/MenuScriptingInterface.h" |
| 38 | #include "ui/AssetUploadDialogFactory.h" | ||
| 39 | #include "ui/DialogsManager.h" | 38 | #include "ui/DialogsManager.h" |
| 40 | #include "ui/StandAloneJSConsole.h" | 39 | #include "ui/StandAloneJSConsole.h" |
| 41 | #include "InterfaceLogging.h" | 40 | #include "InterfaceLogging.h" |
| @@ -365,17 +364,6 @@ Menu::Menu() { · 323 unmodified lines | |||
| 365 | 364 | ||
| 366 | // Developer > Assets >>> | 365 | // Developer > Assets >>> |
| 367 | MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets"); | 366 | 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 | |||
| 379 | auto& atpMigrator = ATPAssetMigrator::getInstance(); | 367 | auto& atpMigrator = ATPAssetMigrator::getInstance(); |
| 380 | atpMigrator.setDialogParent(this); | 368 | atpMigrator.setDialogParent(this); |
| 381 | 369 | ||