Showing the changes to interface/src/Menu.cpp (1 of 24 files). Show all
Unified · Split
| @@ -436,12 +436,12 @@ Menu::Menu() : · 435 unmodified lines | |||
| 436 | MenuOption::Faceshift, | 436 | MenuOption::Faceshift, |
| 437 | 0, | 437 | 0, |
| 438 | true, | 438 | true, |
| 439 | DependencyManager::get<Faceshift>(), | 439 | DependencyManager::get<Faceshift>().data(), |
| 440 | SLOT(setTCPEnabled(bool))); | 440 | SLOT(setTCPEnabled(bool))); |
| 441 | #endif | 441 | #endif |
| 442 | #ifdef HAVE_VISAGE | 442 | #ifdef HAVE_VISAGE |
| 443 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::Visage, 0, false, | 443 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::Visage, 0, false, |
| 444 | DependencyManager::get<Visage>(), SLOT(updateEnabled())); | 444 | DependencyManager::get<Visage>().data(), SLOT(updateEnabled())); |
| 445 | #endif | 445 | #endif |
| 446 | 446 | ||
| 447 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSkeletonCollisionShapes); | 447 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSkeletonCollisionShapes); |
| @@ -1050,11 +1050,11 @@ void Menu::bumpSettings() { · 602 unmodified lines | |||
| 1050 | 1050 | ||
| 1051 | void sendFakeEnterEvent() { | 1051 | void sendFakeEnterEvent() { |
| 1052 | QPoint lastCursorPosition = QCursor::pos(); | 1052 | QPoint lastCursorPosition = QCursor::pos(); |
| 1053 | QGLWidget* glWidget = Application::getInstance()->getGLWidget(); | 1053 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); |
| 1054 | 1054 | ||
| 1055 | QPoint windowPosition = glWidget->mapFromGlobal(lastCursorPosition); | 1055 | QPoint windowPosition = glCanvas->mapFromGlobal(lastCursorPosition); |
| 1056 | QEnterEvent enterEvent = QEnterEvent(windowPosition, windowPosition, lastCursorPosition); | 1056 | QEnterEvent enterEvent = QEnterEvent(windowPosition, windowPosition, lastCursorPosition); |
| 1057 | QCoreApplication::sendEvent(glWidget, &enterEvent); | 1057 | QCoreApplication::sendEvent(glCanvas.data(), &enterEvent); |
| 1058 | } | 1058 | } |
| 1059 | 1059 | ||
| 1060 | const float DIALOG_RATIO_OF_WINDOW = 0.30f; | 1060 | const float DIALOG_RATIO_OF_WINDOW = 0.30f; |
| @@ -1302,7 +1302,7 @@ void Menu::toggleLoginMenuItem() { · 241 unmodified lines | |||
| 1302 | 1302 | ||
| 1303 | void Menu::bandwidthDetails() { | 1303 | void Menu::bandwidthDetails() { |
| 1304 | if (! _bandwidthDialog) { | 1304 | if (! _bandwidthDialog) { |
| 1305 | _bandwidthDialog = new BandwidthDialog(Application::getInstance()->getGLWidget(), | 1305 | _bandwidthDialog = new BandwidthDialog(DependencyManager::get<GLCanvas>().data(), |
| 1306 | Application::getInstance()->getBandwidthMeter()); | 1306 | Application::getInstance()->getBandwidthMeter()); |
| 1307 | connect(_bandwidthDialog, SIGNAL(closed()), SLOT(bandwidthDetailsClosed())); | 1307 | connect(_bandwidthDialog, SIGNAL(closed()), SLOT(bandwidthDetailsClosed())); |
| 1308 | 1308 | ||
| @@ -1413,7 +1413,7 @@ void Menu::bandwidthDetailsClosed() { · 104 unmodified lines | |||
| 1413 | 1413 | ||
| 1414 | void Menu::octreeStatsDetails() { | 1414 | void Menu::octreeStatsDetails() { |
| 1415 | if (!_octreeStatsDialog) { | 1415 | if (!_octreeStatsDialog) { |
| 1416 | _octreeStatsDialog = new OctreeStatsDialog(Application::getInstance()->getGLWidget(), | 1416 | _octreeStatsDialog = new OctreeStatsDialog(DependencyManager::get<GLCanvas>().data(), |
| 1417 | Application::getInstance()->getOcteeSceneStats()); | 1417 | Application::getInstance()->getOcteeSceneStats()); |
| 1418 | connect(_octreeStatsDialog, SIGNAL(closed()), SLOT(octreeStatsDetailsClosed())); | 1418 | connect(_octreeStatsDialog, SIGNAL(closed()), SLOT(octreeStatsDetailsClosed())); |
| 1419 | _octreeStatsDialog->show(); | 1419 | _octreeStatsDialog->show(); |
| @@ -1597,7 +1597,7 @@ bool Menu::shouldRenderMesh(float largestDimension, float distanceToCamera) { · 177 unmodified lines | |||
| 1597 | 1597 | ||
| 1598 | void Menu::lodTools() { | 1598 | void Menu::lodTools() { |
| 1599 | if (!_lodToolsDialog) { | 1599 | if (!_lodToolsDialog) { |
| 1600 | _lodToolsDialog = new LodToolsDialog(Application::getInstance()->getGLWidget()); | 1600 | _lodToolsDialog = new LodToolsDialog(DependencyManager::get<GLCanvas>().data()); |
| 1601 | connect(_lodToolsDialog, SIGNAL(closed()), SLOT(lodToolsClosed())); | 1601 | connect(_lodToolsDialog, SIGNAL(closed()), SLOT(lodToolsClosed())); |
| 1602 | _lodToolsDialog->show(); | 1602 | _lodToolsDialog->show(); |
| 1603 | if (_hmdToolsDialog) { | 1603 | if (_hmdToolsDialog) { |
| @@ -1617,7 +1617,7 @@ void Menu::lodToolsClosed() { · 13 unmodified lines | |||
| 1617 | void Menu::hmdTools(bool showTools) { | 1617 | void Menu::hmdTools(bool showTools) { |
| 1618 | if (showTools) { | 1618 | if (showTools) { |
| 1619 | if (!_hmdToolsDialog) { | 1619 | if (!_hmdToolsDialog) { |
| 1620 | _hmdToolsDialog = new HMDToolsDialog(Application::getInstance()->getGLWidget()); | 1620 | _hmdToolsDialog = new HMDToolsDialog(DependencyManager::get<GLCanvas>().data()); |
| 1621 | connect(_hmdToolsDialog, SIGNAL(closed()), SLOT(hmdToolsClosed())); | 1621 | connect(_hmdToolsDialog, SIGNAL(closed()), SLOT(hmdToolsClosed())); |
| 1622 | } | 1622 | } |
| 1623 | _hmdToolsDialog->show(); | 1623 | _hmdToolsDialog->show(); |