Mago

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

  1. gcalctool-lucid
  2. Merge into mago-1.0
Proposed by James Tatum
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jtatum/mago/gcalctool-lucid
Merge into: lp:~mago-contributors/mago/mago-1.0
Diff against target: 133 lines (+30/-30)
3 files modified
gcalctool/README (+1/-1)
gcalctool/gcalctool_views.xml (+9/-8)
mago/application/gnome.py (+20/-21)
To merge this branch: bzr merge lp:~jtatum/mago/gcalctool-lucid
Reviewer Review Type Date Requested Status
Ara Pulido Approve
Review via email: mp+16925@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Tatum (jtatum) wrote :

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.

Revision history for this message
Ara Pulido (ara) wrote :

Thanks for your changes, James.

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1313
14Version14Version
15-------15-------
16Tests were updated for Ubuntu Karmic16Tests were updated for Ubuntu Lucid
1717
18Available Testsuites18Available Testsuites
19--------------------19--------------------
2020
=== 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 @@
1<?xml version="1.0"?>1<?xml version="1.0" encoding="UTF-8"?>
2
2<suite name="gcalctool views">3<suite name="gcalctool views">
3 <class>gcalctool_views.GCalctoolViews</class>4 <class>gcalctool_views.GCalctoolViews</class>
4 <description>5 <description>
@@ -6,12 +7,12 @@
6 </description>7 </description>
7 <case name="Advanced">8 <case name="Advanced">
8 <method>changeViews</method>9 <method>changeViews</method>
9 <description>Change to the 'advanced' view and verify the square button10 <description>Change to the 'advanced' view and verify the mod button
10 is showing</description>11 is showing</description>
11 <args>12 <args>
12 <view>ADVANCED</view>13 <view>ADVANCED</view>
13 <state>showing</state>14 <state>showing</state>
14 <button>Square</button>15 <button>mod</button>
15 </args>16 </args>
16 </case>17 </case>
17 <case name="Financial">18 <case name="Financial">
@@ -21,7 +22,7 @@
21 <args>22 <args>
22 <view>FINANCIAL</view>23 <view>FINANCIAL</view>
23 <state>showing</state>24 <state>showing</state>
24 <button>Future value</button>25 <button>Fv</button>
25 </args>26 </args>
26 </case>27 </case>
27 <case name="Scientific">28 <case name="Scientific">
@@ -36,22 +37,22 @@
36 </case>37 </case>
37 <case name="Programming">38 <case name="Programming">
38 <method>changeViews</method>39 <method>changeViews</method>
39 <description>Change to the 'programming' view and verify the 1's button40 <description>Change to the 'programming' view and verify the ones button
40 is showing</description>41 is showing</description>
41 <args>42 <args>
42 <view>PROGRAMMING</view>43 <view>PROGRAMMING</view>
43 <state>showing</state>44 <state>showing</state>
44 <button>1's</button>45 <button>ones</button>
45 </args>46 </args>
46 </case>47 </case>
47 <case name="Basic">48 <case name="Basic">
48 <method>changeViews</method>49 <method>changeViews</method>
49 <description>Change to the 'basic' view and verify the reciprocal button50 <description>Change to the 'basic' view and verify the pi button
50 is hidden</description>51 is hidden</description>
51 <args>52 <args>
52 <view>BASIC</view>53 <view>BASIC</view>
53 <state>hidden</state>54 <state>hidden</state>
54 <button>Reciprocal</button>55 <button>π</button>
55 </args>56 </args>
56 </case>57 </case>
57</suite>58</suite>
5859
=== 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 @@
1#-*- coding:utf-8 -*-
1"""2"""
2This is the "gnome" module.3This is the "gnome" module.
34
@@ -34,30 +35,28 @@
34 "MENU" : MNU_SCIENTIFIC},35 "MENU" : MNU_SCIENTIFIC},
35 "PROGRAMMING" : {"WINDOW" : WINDOW_PROGRAMMING,36 "PROGRAMMING" : {"WINDOW" : WINDOW_PROGRAMMING,
36 "MENU" : MNU_PROGRAMMING}}37 "MENU" : MNU_PROGRAMMING}}
37 BUTTONS = {"0" : "Numeric 0",38 BUTTONS = {"0" : "0",
38 "1" : "Numeric 1",39 "1" : "1",
39 "2" : "Numeric 2",40 "2" : "2",
40 "3" : "Numeric 3",41 "3" : "3",
41 "4" : "Numeric 4",42 "4" : "4",
42 "5" : "Numeric 5",43 "5" : "5",
43 "6" : "Numeric 6",44 "6" : "6",
44 "7" : "Numeric 7",45 "7" : "7",
45 "8" : "Numeric 8",46 "8" : "8",
46 "9" : "Numeric 9",47 "9" : "9",
47 "=" : "Calculate result",48 "=" : "=",
48 "+" : "Add",49 "+" : "+",
49 "-" : "Subtract",50 "-" : "−",
50 "*" : "Multiply",51 "*" : "×",
51 "/" : "Divide",52 "/" : "÷",
52 "c" : "Clear entry",53 "C" : "Clr",
53 "C" : "Clear",54 "." : ".",
54 "." : "Numeric point",55 "s" : "√"}
55 "@" : "Square",
56 "s" : "Square root"}
57 EDITBAR_ROLE = "edit bar"56 EDITBAR_ROLE = "edit bar"
58 EDITBAR_INDEX = 057 EDITBAR_INDEX = 0
59 SLEEP_DELAY = 258 SLEEP_DELAY = 2
60 GCONF_MODE_KEY = "/apps/gcalctool/mode"59 GCONF_MODE_KEY = "/apps/gcalctool/button_layout"
61 GCONF_MODE_VAL = "BASIC"60 GCONF_MODE_VAL = "BASIC"
62 61
63 def __init__(self):62 def __init__(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: