Showing the changes to interface/src/Menu.cpp (1 of 2 files). Show all
Unified · Split
| @@ -76,7 +76,7 @@ Menu::Menu() : · 75 unmodified lines | |||
| 76 | _lastAdjust(usecTimestampNow()), | 76 | _lastAdjust(usecTimestampNow()), |
| 77 | _fpsAverage(FIVE_SECONDS_OF_FRAMES), | 77 | _fpsAverage(FIVE_SECONDS_OF_FRAMES), |
| 78 | _loginAction(NULL), | 78 | _loginAction(NULL), |
| 79 | _preferencesDialog() | 79 | _preferencesDialog(NULL) |
| 80 | 80 | ||
| 81 | { | 81 | { |
| 82 | Application *appInstance = Application::getInstance(); | 82 | Application *appInstance = Application::getInstance(); |
| @@ -678,6 +678,14 @@ void Menu::loginForCurrentDomain() { · 595 unmodified lines | |||
| 678 | } | 678 | } |
| 679 | 679 | ||
| 680 | void Menu::editPreferences() { | 680 | void Menu::editPreferences() { |
| 681 | if (! _preferencesDialog) { | ||
| 682 | _preferencesDialog = new PreferencesDialog(Application::getInstance()->getGLWidget()); | ||
| 683 | _preferencesDialog->show(); | ||
| 684 | } | ||
| 685 | _preferencesDialog->raise(); | ||
| 686 | |||
| 687 | /* | ||
| 688 | |||
| 681 | Application* applicationInstance = Application::getInstance(); | 689 | Application* applicationInstance = Application::getInstance(); |
| 682 | 690 | ||
| 683 | QDialog dialog(applicationInstance->getWindow()); | 691 | QDialog dialog(applicationInstance->getWindow()); |
| @@ -812,7 +820,7 @@ void Menu::editPreferences() { · 128 unmodified lines | |||
| 812 | _faceshiftEyeDeflection = faceshiftEyeDeflection->value() / (float)faceshiftEyeDeflection->maximum(); | 820 | _faceshiftEyeDeflection = faceshiftEyeDeflection->value() / (float)faceshiftEyeDeflection->maximum(); |
| 813 | } | 821 | } |
| 814 | QMetaObject::invokeMethod(applicationInstance->getAudio(), "reset", Qt::QueuedConnection); | 822 | QMetaObject::invokeMethod(applicationInstance->getAudio(), "reset", Qt::QueuedConnection); |
| 815 | 823 | */ | |
| 816 | sendFakeEnterEvent(); | 824 | sendFakeEnterEvent(); |
| 817 | } | 825 | } |
| 818 | 826 | ||