Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 02:16:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed Menu::bumpSettings()

Browse source
This commit is contained in:
Atlante45 2015-01-18 06:57:59 -08:00
parent 0e40a61eaa
commit e7a2b0296b
4 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -723,6 +723,10 @@ void Application::paintGL() {
_frameCount++; _frameCount++;
} }
void Application::runTests() {
runTimingTests();
}
void Application::resetCamerasOnResizeGL(Camera& camera, int width, int height) { void Application::resetCamerasOnResizeGL(Camera& camera, int width, int height) {
if (OculusManager::isConnected()) { if (OculusManager::isConnected()) {
OculusManager::configureCamera(camera, width, height); OculusManager::configureCamera(camera, width, height);

2
interface/src/Application.h
View file

@ -398,6 +398,8 @@ private slots:
void parseVersionXml(); void parseVersionXml();
void manageRunningScriptsWidgetVisibility(bool shown); void manageRunningScriptsWidgetVisibility(bool shown);
void runTests();
private: private:
void resetCamerasOnResizeGL(Camera& camera, int width, int height); void resetCamerasOnResizeGL(Camera& camera, int width, int height);

14
interface/src/Menu.cpp
View file

@ -470,7 +470,7 @@ Menu::Menu() {
addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::TestPing, 0, true); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::TestPing, 0, true);
addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::FrameTimer); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::FrameTimer);
addActionToQMenuAndActionHash(timingMenu, MenuOption::RunTimingTests, 0, this, SLOT(runTests())); addActionToQMenuAndActionHash(timingMenu, MenuOption::RunTimingTests, 0, qApp, SLOT(runTests()));
addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings);
addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings);
@ -599,9 +599,6 @@ void Menu::loadSettings(QSettings* settings) {
Application::getInstance()->getAvatar()->loadData(settings); Application::getInstance()->getAvatar()->loadData(settings);
Application::getInstance()->updateWindowTitle(); Application::getInstance()->updateWindowTitle();
// notify that a settings has changed
connect(&DependencyManager::get<NodeList>()->getDomainHandler(), &DomainHandler::hostnameChanged, this, &Menu::bumpSettings);
// MyAvatar caches some menu options, so we have to update them whenever we load settings. // MyAvatar caches some menu options, so we have to update them whenever we load settings.
// TODO: cache more settings in MyAvatar that are checked with very high frequency. // TODO: cache more settings in MyAvatar that are checked with very high frequency.
setIsOptionChecked(MenuOption::KeyboardMotorControl , true); setIsOptionChecked(MenuOption::KeyboardMotorControl , true);
@ -800,7 +797,6 @@ QAction* Menu::addCheckableActionToQMenuAndActionHash(QMenu* destinationMenu,
QAction::NoRole, menuItemLocation); QAction::NoRole, menuItemLocation);
action->setCheckable(true); action->setCheckable(true);
action->setChecked(checked); action->setChecked(checked);
connect(action, SIGNAL(changed()), this, SLOT(bumpSettings()));
return action; return action;
} }
@ -1076,11 +1072,3 @@ void Menu::showEditEntitiesHelp() {
InfoView::forcedShow(INFO_EDIT_ENTITIES_PATH); InfoView::forcedShow(INFO_EDIT_ENTITIES_PATH);
} }
void Menu::bumpSettings() {
Application::getInstance()->bumpSettings();
}
void Menu::runTests() {
runTimingTests();
}

2
interface/src/Menu.h
View file

@ -132,8 +132,6 @@ private:
private slots: private slots:
void aboutApp(); void aboutApp();
void showEditEntitiesHelp(); void showEditEntitiesHelp();
void bumpSettings();
void runTests();
}; };
namespace MenuOption { namespace MenuOption {