use com.lomiri namespace for new setting

ubports · Aug 16, 2020 · 83ad23e · 83ad23e
1 parent 32dbcd5
commit 83ad23e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -22,6 +22,7 @@ install(FILES
 
 add_custom_target(pkgversion ALL COMMAND dpkg-parsechangelog -l${CMAKE_SOURCE_DIR}/debian/changelog --show-field version > ${CMAKE_CURRENT_BINARY_DIR}/version)
 
+install(FILES com.lomiri.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
 install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
 install(FILES com.canonical.Unity.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/unity8)
diff --git a/data/com.lomiri.gschema.xml b/data/com.lomiri.gschema.xml
@@ -0,0 +1,11 @@
+<schemalist>
+
+  <schema path="/com/lomiri/ledindication/" id="com.lomiri.LedIndication" gettext-domain="lomiri">
+    <key type="b" name="charging-state-visible">
+      <default>true</default>
+      <summary>Whether the battery charging state should be shown using the notification led</summary>
+      <description>Toggle the visibility of the battery charging state in the notification led patterns</description>
+    </key>
+  </schema>
+
+</schemalist>
diff --git a/qml/Panel/Indicators/IndicatorsLight.qml b/qml/Panel/Indicators/IndicatorsLight.qml
@@ -51,8 +51,8 @@ QtObject {
         updateLightState("onSupportsMultiColorLedChanged")
     }
 
-    property var _unity8Settings: GSettings {
-        schema.id: "com.canonical.Unity8.LedIndication"
+    property var _lomiriSettings: GSettings {
+        schema.id: "com.lomiri.LedIndication"
         onChanged: {
             root.updateLightState("onChanged (settings)")
         }
@@ -75,7 +75,7 @@ QtObject {
             + ", displayStatus: " + displayStatus
             + ", deviceState: " + deviceState
             + ", batteryLevel: " + batteryLevel
-            + ", chargingStateVisible: " + _unity8Settings.chargingStateVisible)
+            + ", chargingStateVisible: " + _lomiriSettings.chargingStateVisible)
 
         //
         // If charging state visibility is disabled then only show messages.
@@ -131,7 +131,7 @@ QtObject {
         }
 
         // if charging state is not to be shown set led off
-        if(!_unity8Settings.chargingStateVisible) {
+        if(!_lomiriSettings.chargingStateVisible) {
             indicatorState = "INDICATOR_OFF"
             return
         }

diff --git a/tests/mocks/GSettings.1.0/fake_gsettings.cpp b/tests/mocks/GSettings.1.0/fake_gsettings.cpp
@@ -415,7 +415,7 @@ void GSettingsQml::setEnableIndicatorMenu(const QVariant &enableIndicatorMenu)
 
 QVariant GSettingsQml::chargingStateVisible() const
 {
-    if (m_valid && m_schema->id() == "com.canonical.Unity8.LedIndication") {
+    if (m_valid && m_schema->id() == "com.lomiri.LedIndication") {
         return GSettingsControllerQml::instance()->chargingStateVisible();
     } else {
         return QVariant();
@@ -424,7 +424,7 @@ QVariant GSettingsQml::chargingStateVisible() const
 
 void GSettingsQml::setChargingStateVisible(const QVariant &chargingStateVisible)
 {
-    if (m_valid && m_schema->id() == "com.canonical.Unity8.LedIndication") {
+    if (m_valid && m_schema->id() == "com.lomiri.LedIndication") {
         GSettingsControllerQml::instance()->setChargingStateVisible(chargingStateVisible.toBool());
     }
 }
diff --git a/tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml b/tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml
@@ -63,8 +63,8 @@ Item {
     }
 
     GSettings {
-        id: unity8settings
-        schema.id: "com.canonical.Unity8.LedIndication"
+        id: lomiriSettings
+        schema.id: "com.lomiri.LedIndication"
     }
 
     RowLayout {
@@ -161,11 +161,8 @@ Item {
             ActionData.data = noNewMessage;
             loader.sourceComponent = undefined;
             loader.sourceComponent = light;
-<<<<<<< 13a676575372b8cbe881471311dbeb3e9d7c572c
-=======
             Powerd.setStatus(Powerd.On, Powerd.Unknown);
-            unity8settings.chargingStateVisible = true;
->>>>>>> added test cases for charge-state-visibility setting
+            lomiriSettings.chargingStateVisible = true;
         }
 
         function test_LightsStatus_data() {
@@ -265,7 +262,6 @@ Item {
                       powerd: Powerd.Off, actionData: batteryLevelDBusSignals["100"], wizardStatus: batteryIconNames.charging },
 
                 //
-<<<<<<< 13a676575372b8cbe881471311dbeb3e9d7c572c
                 // Support for Multicolor LED
                 //
                 { tag: "Powerd.Off with New Message & no support for multicolor led",
@@ -277,7 +273,7 @@ Item {
                 { tag: "Powerd.Off while charging & no support for multicolor led",
                   expectedLightsState: Lights.Off,
                       powerd: Powerd.Off, actionData: deviceStateDBusSignals.charging, supportsMultiColorLed: false },
-=======
+
                 // disabled charging state visible
                 //
                 { tag: "Powerd.Off with New Message & chargingStateVisible=false",
@@ -286,20 +282,17 @@ Item {
                 { tag: "Powerd.Off while charging & chargingStateVisible=false",
                   expectedLightsState: Lights.Off,
                       powerd: Powerd.Off, actionData: deviceStateDBusSignals.charging, chargingStateVisible: false },
->>>>>>> added test cases for charge-state-visibility setting
+
             ]
         }
 
         function test_LightsStatus(data) {
             console.log("----------------------------------------------------------------")
 
-<<<<<<< 13a676575372b8cbe881471311dbeb3e9d7c572c
             if (data.hasOwnProperty("supportsMultiColorLed"))
                 loader.item.supportsMultiColorLed = data.supportsMultiColorLed
-=======
             if (data.hasOwnProperty("chargingStateVisible"))
-                unity8settings.chargingStateVisible = data.chargingStateVisible
->>>>>>> added test cases for charge-state-visibility setting
+                lomiriSettings.chargingStateVisible = data.chargingStateVisible
             if (data.hasOwnProperty("powerd"))
                 Powerd.setStatus(data.powerd, Powerd.Unknown)
             if (data.hasOwnProperty("actionData"))