fix xml, add icons etc

diff --git a/debian/changelog b/debian/changelog
index 5b78285..4adeb3a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cell-modem-ui (0.2-1) unstable; urgency=low
+
+  * Revised priorities in XML
+  * Added icons for buttons
+  * Rewrote button texts
+  * Added disclaimer to control about requiring a reboot
+
+ -- Tuomo Tanskanen <tumi@tumi.fi>  Mon, 21 Dec 2009 01:12:48 +0200
+
 cell-modem-ui (0.1-1) unstable; urgency=low
 
   * Initial version

diff --git a/debian/control b/debian/control
index 2404e68..6c5eb6b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,4 +13,5 @@ Description: Add Activate/Deactivate phone buttons to powerkey menu
  Enables switching cellular modem on or off individually, without
  going to full Offline mode. Handy for having WLAN enabled, but
  phone off (e.g. flights, hospitals).
+ Requires reboot (or "killall systemui") to activate.
 XB-Maemo-Display-Name: Cellular Modem Activation/Deactivation UI

diff --git a/etc/systemui/cell-modem-ui.xml b/etc/systemui/cell-modem-ui.xml
index 4f2afb9..b561933 100644 (file)
--- a/etc/systemui/cell-modem-ui.xml
+++ b/etc/systemui/cell-modem-ui.xml
@@ -1,73 +1,79 @@
 <powerkeymenu path="/">
- <menuitem priority="200" name="Turn on cellular" visible="tablet_state">
+ <menuitem priority="425" name="Enable phone" visible="tablet_state">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
-           path="/com/nokia/phone/SSC"
-           interface="com.nokia.phone.SSC" 
-            method="launch_pin_query"
-           bus="system" 
-            autostart="true">
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="launch_pin_query"
+       bus="system" 
+       autostart="true">
     <argument type="boolean">true</argument>
   </callback>
+  <icon>general_application_call</icon>
  </menuitem>
 
- <menuitem priority="200" name="Turn on cellular" visible="inactive">
+ <menuitem priority="425" name="Enable phone" visible="inactive">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
-           path="/com/nokia/phone/SSC"
-           interface="com.nokia.phone.SSC" 
-            method="set_radio"
-           bus="system" 
-            autostart="true">
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
     <argument type="boolean">true</argument>
   </callback>
+  <icon>general_application_call</icon>
  </menuitem>
 
- <menuitem priority="200" name="Turn off cellular" visible="online">
+ <menuitem priority="425" name="Disable phone" visible="online">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
-           path="/com/nokia/phone/SSC"
-           interface="com.nokia.phone.SSC" 
-            method="set_radio"
-           bus="system" 
-            autostart="true">
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
     <argument type="boolean">false</argument>
   </callback>
+  <icon>red_end_call</icon>
  </menuitem>
 
- <menuitem priority="200" name="Turn off cellular" visible="activation_pending">
+ <menuitem priority="425" name="Disable phone" visible="activation_pending">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
-           path="/com/nokia/phone/SSC"
-           interface="com.nokia.phone.SSC" 
-            method="set_radio"
-           bus="system" 
-            autostart="true">
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
     <argument type="boolean">false</argument>
   </callback>
+  <icon>red_end_call</icon>
  </menuitem>
 
- <menuitem priority="200" name="Turn off cellular" visible="activation_failed">
+ <menuitem priority="425" name="Disable phone" visible="activation_failed">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
-           path="/com/nokia/phone/SSC"
-           interface="com.nokia.phone.SSC" 
-            method="set_radio"
-           bus="system" 
-            autostart="true">
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
     <argument type="boolean">false</argument>
   </callback>
+  <icon>red_end_call</icon>
  </menuitem>
 
- <menuitem priority="200" name="Turn off cellular" visible="selection_failed">
+ <menuitem priority="425" name="Disable phone" visible="selection_failed">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
-           path="/com/nokia/phone/SSC"
-           interface="com.nokia.phone.SSC" 
-            method="set_radio"
-           bus="system" 
-            autostart="true">
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
     <argument type="boolean">false</argument>
   </callback>
+  <icon>red_end_call</icon>
  </menuitem>
 </powerkeymenu>