History

Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui

Seth Alves committed 9 years ago

Commit 424af222 parents f48557b ed27c5564 files · +2193 −630Browse files

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

Unified · Split

interface/src/Menu.cpp+6−4
@@ -422,6 +422,9 @@ Menu::Menu() { · 421 unmodified lines
422 }422 }
423 423
424 // Developer > Assets >>>424 // Developer > Assets >>>
425 // Menu item is not currently needed but code should be kept in case it proves useful again at some stage.
426//#define WANT_ASSET_MIGRATION
427#ifdef WANT_ASSET_MIGRATION
425 MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets");428 MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets");
426 auto& atpMigrator = ATPAssetMigrator::getInstance();429 auto& atpMigrator = ATPAssetMigrator::getInstance();
427 atpMigrator.setDialogParent(this);430 atpMigrator.setDialogParent(this);
@@ -429,6 +432,7 @@ Menu::Menu() { · 1 unmodified line
429 addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration,432 addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration,
430 0, &atpMigrator,433 0, &atpMigrator,
431 SLOT(loadEntityServerFile()));434 SLOT(loadEntityServerFile()));
435#endif
432 436
433 // Developer > Avatar >>>437 // Developer > Avatar >>>
434 MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar");438 MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar");
@@ -561,16 +565,14 @@ Menu::Menu() { · 126 unmodified lines
561 QString("../../hifi/tablet/TabletNetworkingPreferences.qml"), "NetworkingPreferencesDialog");565 QString("../../hifi/tablet/TabletNetworkingPreferences.qml"), "NetworkingPreferencesDialog");
562 });566 });
563 addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));567 addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
568 addActionToQMenuAndActionHash(networkMenu, MenuOption::ClearDiskCache, 0,
569 DependencyManager::get<AssetClient>().data(), SLOT(clearCache()));
564 addCheckableActionToQMenuAndActionHash(networkMenu,570 addCheckableActionToQMenuAndActionHash(networkMenu,
565 MenuOption::DisableActivityLogger,571 MenuOption::DisableActivityLogger,
566 0,572 0,
567 false,573 false,
568 &UserActivityLogger::getInstance(),574 &UserActivityLogger::getInstance(),
569 SLOT(disable(bool)));575 SLOT(disable(bool)));
570 addActionToQMenuAndActionHash(networkMenu, MenuOption::CachesSize, 0,
571 dialogsManager.data(), SLOT(cachesSizeDialog()));
572 addActionToQMenuAndActionHash(networkMenu, MenuOption::DiskCacheEditor, 0,
573 dialogsManager.data(), SLOT(toggleDiskCacheEditor()));
574 addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,576 addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,
575 qApp, SLOT(loadDomainConnectionDialog()));577 qApp, SLOT(loadDomainConnectionDialog()));
576 578

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