Merge lp:~jtatum/mago/gcalctool-lucid into lp:~mago-contributors/mago/mago-1.0

[James Tatum]

[James Tatum (jtatum)]

Updating gcalctool tests for Lucid. The gconf key changed as did a majority of the button identifiers.

Resubmitting merge proposal - I had to redo my branch thanks to some operational differences in bzr 2. This should not be merged until Karmic is branched in Mago since these changes will definitely break the tests in Karmic.

[Ara Pulido (ara)]

Thanks for your changes, James.

They look OK and they work successfully in Lucid. Accepted.
(I have already branched Karmic tests)

review: Approve

=== modified file 'gcalctool/README'
--- gcalctool/README	2009-09-11 02:51:23 +0000
+++ gcalctool/README	2010-01-06 19:11:14 +0000
@@ -13,7 +13,7 @@
 
 Version
 -------
-Tests were updated for Ubuntu Karmic
+Tests were updated for Ubuntu Lucid
 
 Available Testsuites
 --------------------

=== modified file 'gcalctool/gcalctool_views.xml'
--- gcalctool/gcalctool_views.xml	2009-09-19 03:28:17 +0000
+++ gcalctool/gcalctool_views.xml	2010-01-06 19:11:14 +0000
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <suite name="gcalctool views">
   <class>gcalctool_views.GCalctoolViews</class>
   <description>
@@ -6,12 +7,12 @@
   </description>
   <case name="Advanced">
     <method>changeViews</method>
-    <description>Change to the 'advanced' view and verify the square button
+    <description>Change to the 'advanced' view and verify the mod button
     is showing</description>
     <args>
       <view>ADVANCED</view>
       <state>showing</state>
-      <button>Square</button>
+      <button>mod</button>
     </args>
   </case>
   <case name="Financial">
@@ -21,7 +22,7 @@
     <args>
       <view>FINANCIAL</view>
       <state>showing</state>
-      <button>Future value</button>
+      <button>Fv</button>
     </args>
   </case>
   <case name="Scientific">
@@ -36,22 +37,22 @@
   </case>
   <case name="Programming">
     <method>changeViews</method>
-    <description>Change to the 'programming' view and verify the 1's button
+    <description>Change to the 'programming' view and verify the ones button
     is showing</description>
     <args>
       <view>PROGRAMMING</view>
       <state>showing</state>
-      <button>1's</button>
+      <button>ones</button>
     </args>
   </case>
   <case name="Basic">
     <method>changeViews</method>
-    <description>Change to the 'basic' view and verify the reciprocal button
+    <description>Change to the 'basic' view and verify the pi button
     is hidden</description>
     <args>
       <view>BASIC</view>
       <state>hidden</state>
-      <button>Reciprocal</button>
+      <button>π</button>
     </args>
   </case>
 </suite>

=== modified file 'mago/application/gnome.py'
--- mago/application/gnome.py	2009-09-11 04:58:37 +0000
+++ mago/application/gnome.py	2010-01-06 19:11:14 +0000
@@ -1,3 +1,4 @@
+#-*- coding:utf-8 -*-
 """
 This is the "gnome" module.
 
@@ -34,30 +35,28 @@
                                 "MENU" : MNU_SCIENTIFIC},
              "PROGRAMMING"   : {"WINDOW" : WINDOW_PROGRAMMING,
                                 "MENU" : MNU_PROGRAMMING}}
-    BUTTONS = {"0" : "Numeric 0",
-               "1" : "Numeric 1",
-               "2" : "Numeric 2",
-               "3" : "Numeric 3",
-               "4" : "Numeric 4",
-               "5" : "Numeric 5",
-               "6" : "Numeric 6",
-               "7" : "Numeric 7",
-               "8" : "Numeric 8",
-               "9" : "Numeric 9",
-               "=" : "Calculate result",
-               "+" : "Add",
-               "-" : "Subtract",
-               "*" : "Multiply",
-               "/" : "Divide",
-               "c" : "Clear entry",
-               "C" : "Clear",
-               "." : "Numeric point",
-               "@" : "Square",
-               "s" : "Square root"}
+    BUTTONS = {"0" : "0",
+               "1" : "1",
+               "2" : "2",
+               "3" : "3",
+               "4" : "4",
+               "5" : "5",
+               "6" : "6",
+               "7" : "7",
+               "8" : "8",
+               "9" : "9",
+               "=" : "=",
+               "+" : "+",
+               "-" : "−",
+               "*" : "×",
+               "/" : "÷",
+               "C" : "Clr",
+               "." : ".",
+               "s" : "√"}
     EDITBAR_ROLE        = "edit bar"
     EDITBAR_INDEX       = 0
     SLEEP_DELAY         = 2
-    GCONF_MODE_KEY      = "/apps/gcalctool/mode"
+    GCONF_MODE_KEY      = "/apps/gcalctool/button_layout"
     GCONF_MODE_VAL      = "BASIC"
     
     def __init__(self):