History

Added hot keys enumeration for display menu

vladest committed 8 years ago

Commit 3d8d0bf1 parent ba4ef741 file · +6 −7Browse files

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

Unified · Split

interface/src/Application.cpp+6−7
@@ -7457,7 +7457,7 @@ DisplayPluginPointer Application::getActiveDisplayPlugin() const { · 7456 unmodified lines
7457 7457
7458static const char* EXCLUSION_GROUP_KEY = "exclusionGroup";7458static const char* EXCLUSION_GROUP_KEY = "exclusionGroup";
7459 7459
7460static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) {7460static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, int index) {
7461 auto menu = Menu::getInstance();7461 auto menu = Menu::getInstance();
7462 QString name = displayPlugin->getName();7462 QString name = displayPlugin->getName();
7463 auto grouping = displayPlugin->getGrouping();7463 auto grouping = displayPlugin->getGrouping();
@@ -7484,12 +7484,12 @@ static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool acti · 20 unmodified lines
7484 }7484 }
7485 auto parent = menu->getMenu(MenuOption::OutputMenu);7485 auto parent = menu->getMenu(MenuOption::OutputMenu);
7486 auto action = menu->addActionToQMenuAndActionHash(parent,7486 auto action = menu->addActionToQMenuAndActionHash(parent,
7487 name, 0, qApp,7487 name, QKeySequence(Qt::CTRL + (Qt::Key_0 + index)), qApp,
7488 SLOT(updateDisplayMode()),7488 SLOT(updateDisplayMode()),
7489 QAction::NoRole, Menu::UNSPECIFIED_POSITION, groupingMenu);7489 QAction::NoRole, Menu::UNSPECIFIED_POSITION, groupingMenu);
7490 7490
7491 action->setCheckable(true);7491 action->setCheckable(true);
7492 action->setChecked(active);7492 action->setChecked(index == 1);
7493 displayPluginGroup->addAction(action);7493 displayPluginGroup->addAction(action);
7494 7494
7495 action->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(displayPluginGroup));7495 action->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(displayPluginGroup));
@@ -7507,8 +7507,6 @@ void Application::updateDisplayMode() { · 11 unmodified lines
7507 7507
7508 static std::once_flag once;7508 static std::once_flag once;
7509 std::call_once(once, [&] {7509 std::call_once(once, [&] {
7510 bool first = true;
7511
7512 // first sort the plugins into groupings: standard, advanced, developer7510 // first sort the plugins into groupings: standard, advanced, developer
7513 DisplayPluginList standard;7511 DisplayPluginList standard;
7514 DisplayPluginList advanced;7512 DisplayPluginList advanced;
@@ -7533,14 +7531,15 @@ void Application::updateDisplayMode() { · 18 unmodified lines
7533 standard.insert(std::end(standard), std::begin(advanced), std::end(advanced));7531 standard.insert(std::end(standard), std::begin(advanced), std::end(advanced));
7534 standard.insert(std::end(standard), std::begin(developer), std::end(developer));7532 standard.insert(std::end(standard), std::begin(developer), std::end(developer));
7535 7533
7534 int dpIndex = 1;
7536 foreach(auto displayPlugin, standard) {7535 foreach(auto displayPlugin, standard) {
7537 addDisplayPluginToMenu(displayPlugin, first);7536 addDisplayPluginToMenu(displayPlugin, dpIndex);
7538 auto displayPluginName = displayPlugin->getName();7537 auto displayPluginName = displayPlugin->getName();
7539 QObject::connect(displayPlugin.get(), &DisplayPlugin::recommendedFramebufferSizeChanged, [this](const QSize & size) {7538 QObject::connect(displayPlugin.get(), &DisplayPlugin::recommendedFramebufferSizeChanged, [this](const QSize & size) {
7540 resizeGL();7539 resizeGL();
7541 });7540 });
7542 QObject::connect(displayPlugin.get(), &DisplayPlugin::resetSensorsRequested, this, &Application::requestReset);7541 QObject::connect(displayPlugin.get(), &DisplayPlugin::resetSensorsRequested, this, &Application::requestReset);
7543 first = false;7542 dpIndex++;
7544 }7543 }
7545 7544
7546 // after all plugins have been added to the menu, add a separator to the menu7545 // after all plugins have been added to the menu, add a separator to the menu