Merge pull request #2652 from AndrewMeadows/inertia

save settings whenever menu items are changed

interface/src/Application.cpp

@@ -251,6 +251,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
     QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection);
 
     _settings = new QSettings(this);
+    _numChangedSettings = 0;
 
     // Check to see if the user passed in a command line option for loading a local
     // Voxel File.
@@ -407,6 +408,7 @@ void Application::saveSettings() {
         _voxelImporter->saveSettings(_settings);
     }
     _settings->sync();
+    _numChangedSettings = 0;
 }
 
 
@@ -1322,6 +1324,9 @@ void Application::idle() {
             // After finishing all of the above work, restart the idle timer, allowing 2ms to process events.
             idleTimer->start(2);
         }
+        if (_numChangedSettings > 0) {
+            saveSettings();
+        }
     }
 }
 
@@ -1668,6 +1673,7 @@ void Application::init() {
     connect(_rearMirrorTools, SIGNAL(restoreView()), SLOT(restoreMirrorView()));
     connect(_rearMirrorTools, SIGNAL(shrinkView()), SLOT(shrinkMirrorView()));
     connect(_rearMirrorTools, SIGNAL(resetView()), SLOT(resetSensors()));
+    connect(_myAvatar, SIGNAL(transformChanged()), this, SLOT(bumpSettings()));
 }
 
 void Application::closeMirrorView() {

interface/src/Application.h

@@ -286,6 +286,8 @@ public slots:
     void uploadHead();
     void uploadSkeleton();
 
+    void bumpSettings() { ++_numChangedSettings; }
+
 private slots:
     void timer();
     void idle();
@@ -376,6 +378,7 @@ private:
     QNetworkAccessManager* _networkAccessManager;
     QMutex _settingsMutex;
     QSettings* _settings;
+    int _numChangedSettings;
 
     QUndoStack _undoStack;
     

interface/src/Menu.cpp

@@ -684,6 +684,7 @@ QAction* Menu::addCheckableActionToQMenuAndActionHash(QMenu* destinationMenu,
                                                         QAction::NoRole, menuItemLocation);
     action->setCheckable(true);
     action->setChecked(checked);
+    connect(action, SIGNAL(changed()), Application::getInstance(), SLOT(bumpSettings()));
 
     return action;
 }
@@ -917,7 +918,6 @@ void Menu::goToLocation() {
     QString currentLocation = QString("%1, %2, %3").arg(QString::number(avatarPos.x),
                                                         QString::number(avatarPos.y), QString::number(avatarPos.z));
 
-
     QInputDialog coordinateDialog(Application::getInstance()->getWindow());
     coordinateDialog.setWindowTitle("Go to Location");
     coordinateDialog.setLabelText("Coordinate as x,y,z:");

interface/src/avatar/MyAvatar.cpp

@@ -1167,6 +1167,7 @@ void MyAvatar::goToLocationFromResponse(const QJsonObject& jsonObject) {
         glm::vec3 newPosition = glm::vec3(coordinateItems[0].toFloat(), coordinateItems[1].toFloat(),
                                           coordinateItems[2].toFloat()) - newOrientation * IDENTITY_FRONT * DISTANCE_TO_USER;
         setPosition(newPosition);
+        emit transformChanged();
     }
     
 }

interface/src/avatar/MyAvatar.h

@@ -106,6 +106,9 @@ public slots:
     glm::vec3 getThrust() { return _thrust; };
     void setThrust(glm::vec3 newThrust) { _thrust = newThrust; }
 
+signals:
+    void transformChanged();
+
 private:
     bool _mousePressed;
     float _bodyPitchDelta;  // degrees

interface/src/location/LocationManager.cpp

@@ -118,8 +118,6 @@ void LocationManager::checkForMultipleDestinations() {
             Application::getInstance()->getAvatar()->goToLocationFromResponse(_placeData);
             return;
         }
-
-        emit locationChanged();
     }
 }
 
@@ -178,6 +176,7 @@ void LocationManager::goToOrientation(QString orientation) {
         glm::quat avatarOrientation = myAvatar->getOrientation();
         if (newAvatarOrientation != avatarOrientation) {
             myAvatar->setOrientation(newAvatarOrientation);
+            emit myAvatar->transformChanged();
         }
     }
 }
@@ -211,6 +210,7 @@ bool LocationManager::goToDestination(QString destination) {
 
             qDebug("Going To Location: %f, %f, %f...", x, y, z);
             myAvatar->setPosition(newAvatarPos);
+            emit myAvatar->transformChanged();
         }
 
         return true;

interface/src/location/LocationManager.h

@@ -48,7 +48,6 @@ private:
 signals:
     void creationCompleted(LocationManager::NamedLocationCreateResponse response);
     void multipleDestinationsFound(const QJsonObject& userData, const QJsonObject& placeData);
-    void locationChanged();
     
 private slots:
     void namedLocationDataReceived(const QJsonObject& data);

interface/src/ui/PreferencesDialog.cpp

@@ -140,6 +140,7 @@ void PreferencesDialog::savePreferences() {
     
     if (shouldDispatchIdentityPacket) {
         myAvatar->sendIdentityPacket();
+        Application::getInstance()->bumpSettings();
     }
 
     myAvatar->getHead()->setPupilDilation(ui.pupilDilationSlider->value() / (float)ui.pupilDilationSlider->maximum());