[systemsettings] Allow vibration to be turned always off

sailfishos · Sep 24, 2013 · d309fa0 · d309fa0
1 parent c65c8a9
commit d309fa0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/profilecontrol.cpp b/src/profilecontrol.cpp
@@ -151,7 +151,11 @@ int ProfileControl::vibraMode() const
             result = VibraNormal;
         }
     } else {
-        result = VibraSilent;
+        if (m_vibraInSilent) {
+            result = VibraSilent;
+        } else {
+            result = VibraNever;
+        }
     }
 
     return result;
@@ -173,6 +177,8 @@ void ProfileControl::setVibraMode(int mode)
     case VibraNormal:
         generalValue = true;
         break;
+    case VibraNever:
+        break;
     }
 
     bool changed = false;

diff --git a/src/profilecontrol.h b/src/profilecontrol.h
@@ -67,7 +67,8 @@ class ProfileControl: public QObject
     enum VibraMode {
         VibraAlways,
         VibraSilent,
-        VibraNormal
+        VibraNormal,
+        VibraNever
     };
 
     /*!