move the testing settings to a DBus interface

2 files changed, 39 insertions, 24 deletions

diff --git a/data/com.canonical.indicator.power.Testing.xml b/data/com.canonical.indicator.power.Testing.xml
new file mode 100644
index 0000000..25cd059
--- /dev/null
+++ b/data/com.canonical.indicator.power.Testing.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <interface name="com.canonical.indicator.power.Testing">
+
+    <property name="MockBatteryEnabled" type="b" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Whether or not the mock battery is enabled. (Default: false)</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="MockBatteryLevel" type="u" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>The charge level of the mock battery (0-100%, Default: 50%)</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="MockBatteryState" type="s" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>The mock battery's state. Possible values: 'charging', 'discharging' (Defualt: 'discharging')</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="MockBatteryMinutesLeft" type="u" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Muntes left until the mock battery finishes charging/dischargin (Default: 30)</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+  </interface>
+</node>
diff --git a/data/com.canonical.indicator.power.gschema.xml.in b/data/com.canonical.indicator.power.gschema.xml.in
index e9bfcf5..4fd2620 100644
--- a/data/com.canonical.indicator.power.gschema.xml.in
+++ b/data/com.canonical.indicator.power.gschema.xml.in
@@ -20,29 +20,5 @@
       <_summary>When to show the battery status in the menu bar.</_summary>
       <_description>Options for when to show battery status. Valid options are "present", "charge", and "never".</_description>
     </key>
-
-    <key name="mock-battery-enabled" type="b">
-      <default>false</default>
-      <_summary>Whether to use a mock battery for testing.</_summary>
-      <_description>When enabled, a single mock battery will be used instead of monitoring upower.</_description>
-    </key>
-    <key name="mock-battery-level" type="i">
-      <range min="0" max="100"/>
-      <default>50</default>
-      <_summary>The charge level of the mock battery.</_summary>
-      <_description>The charge level of the mock battery.</_description>
-    </key>
-    <key name="mock-battery-charging" type="b">
-      <default>false</default>
-      <_summary>Charge state of the mock battery</_summary>
-      <_description>Whether the mock battery is charging or discharging</_description>
-    </key>
-    <key name="mock-battery-minutes-left" type="i">
-      <range min="0" max="420"/>
-      <default>30</default>
-      <_summary>Time remaining on the battery</_summary>
-      <_description>Minutes left until the battery finishes charging/discharging</_description>
-    </key>
-      
   </schema>
 </schemalist>