Odoo GTK Client (MOVED TO GITHUB)

Merge lp:~ovnicraft/openobject-client/openerp-client-wo-mx into lp:openobject-client

  1. openerp-client-wo-mx
  2. Merge into trunk
Proposed by Cristian Salamea
Status: Rejected
Rejected by: tfr (Openerp)
Proposed branch: lp:~ovnicraft/openobject-client/openerp-client-wo-mx
Merge into: lp:openobject-client
Diff against target: 285 lines (+67/-39)
11 files modified
bin/tools/datetime_util.py (+20/-25)
bin/widget/screen/screen.py (+5/-0)
bin/widget/view/calendar_gtk/parser.py (+22/-5)
bin/widget/view/form_gtk/date_widget.py (+1/-1)
bin/widget/view/form_gtk/float_time.py (+2/-1)
bin/widget/view/form_gtk/textbox.py (+2/-1)
bin/widget/view/tree_gtk/date_renderer.py (+4/-2)
bin/widget/view/tree_gtk/parser.py (+7/-0)
bin/widget_search/calendar.py (+1/-1)
bin/widget_search/date_widget.py (+1/-1)
setup.py (+2/-2)
To merge this branch: bzr merge lp:~ovnicraft/openobject-client/openerp-client-wo-mx
Reviewer Review Type Date Requested Status
tfr (Openerp) Disapprove
Review via email: mp+17959@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cristian Salamea (ovnicraft) wrote :

Left mx.DateTime as dependence, the mx code are commented.

Revision history for this message
tfr (Openerp) (tfr) wrote :

Old merge proposal, there is no more mx.datetime in the client

review: Disapprove

Unmerged revisions

1040. By Cristian Salamea

[IMP] strptime set available without define a function to call it

1039. By Cristian Salamea

[FIX] removed comments

1038. By Cristian Salamea

[FIX] error in lib name

1037. By Cristian Salamea

[MERGE] from official

1036. By Cristian Salamea

[FIX] redefined method without mx

1035. By Cristian Salamea

[FIX] import removed

1034. By Cristian Salamea

[FIX] removed as dep

1033. By Cristian Salamea

[FIX] import removed

1032. By Cristian Salamea

[FIX] import removed, not used

1031. By Cristian Salamea

[FIX] mktime replace with datetime

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/modules/gui/main.py'
2=== modified file 'bin/tools/datetime_util.py'
3--- bin/tools/datetime_util.py 2010-01-12 09:24:17 +0000
4+++ bin/tools/datetime_util.py 2010-01-24 00:44:15 +0000
5@@ -24,34 +24,29 @@
6 import locale
7 import rpc
8
9-from mx.DateTime import RelativeDateTime
10-from mx.DateTime import now
11+from datetime import datetime
12+from dateutil.relativedelta import relativedelta
13
14-try:
15- from mx.DateTime import strptime
16-except ImportError:
17- # strptime does not exist on windows. we emulate it
18- from mx.DateTime import mktime
19- def strptime(s, f):
20- return mktime(time.strptime(s, f))
21+# needed to set available strptime
22+strptime = datetime.strptime
23
24 date_operation = {
25- '^=w(\d+)$': lambda dt,r: dt+RelativeDateTime(day=0, month=0, weeks = int(r.group(1))),
26- '^=d(\d+)$': lambda dt,r: dt+RelativeDateTime(day=int(r.group(1))),
27- '^=m(\d+)$': lambda dt,r: dt+RelativeDateTime(month = int(r.group(1))),
28- '^=y(2\d\d\d)$': lambda dt,r: dt+RelativeDateTime(year = int(r.group(1))),
29- '^=h(\d+)$': lambda dt,r: dt+RelativeDateTime(hour = int(r.group(1))),
30- '^=(\d+)w$': lambda dt,r: dt+RelativeDateTime(day=0, month=0, weeks = int(r.group(1))),
31- '^=(\d+)d$': lambda dt,r: dt+RelativeDateTime(day=int(r.group(1))),
32- '^=(\d+)m$': lambda dt,r: dt+RelativeDateTime(month = int(r.group(1))),
33- '^=(2\d\d\d)y$': lambda dt,r: dt+RelativeDateTime(year = int(r.group(1))),
34- '^=(\d+)h$': lambda dt,r: dt+RelativeDateTime(hour = int(r.group(1))),
35- '^([\\+-]\d+)h$': lambda dt,r: dt+RelativeDateTime(hours = int(r.group(1))),
36- '^([\\+-]\d+)w$': lambda dt,r: dt+RelativeDateTime(days = 7*int(r.group(1))),
37- '^([\\+-]\d+)d$': lambda dt,r: dt+RelativeDateTime(days = int(r.group(1))),
38- '^([\\+-]\d+)m$': lambda dt,r: dt+RelativeDateTime(months = int(r.group(1))),
39- '^([\\+-]\d+)y$': lambda dt,r: dt+RelativeDateTime(years = int(r.group(1))),
40- '^=$': lambda dt,r: now(),
41+ '^=w(\d+)$': lambda dt,r: dt+relativedelta(day=0, month=0, weeks = int(r.group(1))),
42+ '^=d(\d+)$': lambda dt,r: dt+relativedelta(day=int(r.group(1))),
43+ '^=m(\d+)$': lambda dt,r: dt+relativedelta(month = int(r.group(1))),
44+ '^=y(2\d\d\d)$': lambda dt,r: dt+relativedelta(year = int(r.group(1))),
45+ '^=h(\d+)$': lambda dt,r: dt+relativedelta(hour = int(r.group(1))),
46+ '^=(\d+)w$': lambda dt,r: dt+relativedelta(day=0, month=0, weeks = int(r.group(1))),
47+ '^=(\d+)d$': lambda dt,r: dt+relativedelta(day=int(r.group(1))),
48+ '^=(\d+)m$': lambda dt,r: dt+relativedelta(month = int(r.group(1))),
49+ '^=(2\d\d\d)y$': lambda dt,r: dt+relativedelta(year = int(r.group(1))),
50+ '^=(\d+)h$': lambda dt,r: dt+relativedelta(hour = int(r.group(1))),
51+ '^([\\+-]\d+)h$': lambda dt,r: dt+relativedelta(hours = int(r.group(1))),
52+ '^([\\+-]\d+)w$': lambda dt,r: dt+relativedelta(days = 7*int(r.group(1))),
53+ '^([\\+-]\d+)d$': lambda dt,r: dt+relativedelta(days = int(r.group(1))),
54+ '^([\\+-]\d+)m$': lambda dt,r: dt+relativedelta(months = int(r.group(1))),
55+ '^([\\+-]\d+)y$': lambda dt,r: dt+relativedelta(years = int(r.group(1))),
56+ '^=$': lambda dt,r: datetime.now(),
57 '^-$': lambda dt,r: False
58 }
59
60
61=== modified file 'bin/widget/screen/screen.py'
62--- bin/widget/screen/screen.py 2010-01-23 18:46:11 +0000
63+++ bin/widget/screen/screen.py 2010-01-24 00:44:15 +0000
64@@ -760,11 +760,16 @@
65 return id
66
67 def load(self, ids):
68+<<<<<<< TREE
69 limit = self.screen_container.get_limit()
70 if len(ids) >= limit:
71 tot_rec = rpc.session.rpc_exec_auth_try('/object', 'execute', self.name, 'search_count', [], self.context)
72 #if limit < tot_rec:
73 # self.screen_container.fill_limit_combo(tot_rec)
74+=======
75+ if not isinstance(ids,list):
76+ ids = [ids]
77+>>>>>>> MERGE-SOURCE
78 self.models.load(ids, display=False)
79 self.current_view.reset()
80 if ids:
81
82=== modified file 'bin/widget/view/calendar_gtk/parser.py'
83--- bin/widget/view/calendar_gtk/parser.py 2010-01-12 09:24:17 +0000
84+++ bin/widget/view/calendar_gtk/parser.py 2010-01-24 00:44:15 +0000
85@@ -28,7 +28,9 @@
86 from datetime import datetime, date
87
88 from SpiffGtkWidgets import Calendar
89-from mx import DateTime
90+#from mx import DateTime
91+from datetime import datetime
92+from dateutil.relativedelta import relativedelta
93 import time
94 import math
95
96@@ -114,8 +116,13 @@
97 self.glade.signal_connect('on_button_day_clicked', self._change_view, 'day')
98 self.glade.signal_connect('on_button_week_clicked', self._change_view, 'week')
99 self.glade.signal_connect('on_button_month_clicked', self._change_view, 'month')
100+<<<<<<< TREE
101
102 self.date = DateTime.today()
103+=======
104+
105+ self.date = datetime.today()
106+>>>>>>> MERGE-SOURCE
107
108 self.string = attrs.get('string', '')
109 self.date_start = attrs.get('date_start')
110@@ -165,24 +172,28 @@
111 t[1] += 1
112 else:
113 t = list(args[0].timetuple()[:3])
114- self.date = DateTime.DateTime(*t)
115+ self.date = datetime(*t[0:6])#DateTime.DateTime(*t)
116 self.display(None)
117 self.screen.context.update({'default_' +self.date_start:self.date.strftime('%Y-%m-%d %H:%M:%S')})
118 self.screen.switch_view(mode='form')
119 self.screen.new()
120
121 def _today(self, widget, *args, **argv):
122- self.date = DateTime.today()
123+ self.date = datetime.today()
124 self.display(None)
125
126 def _back_forward(self, widget, type, *args, **argv):
127 if self.mode=='day':
128- self.date = self.date + DateTime.RelativeDateTime(days=type)
129+ self.date = self.date + relativedelta(days=type)
130 if self.mode=='week':
131- self.date = self.date + DateTime.RelativeDateTime(weeks=type)
132+ self.date = self.date + relativedelta(weeks=type)
133 if self.mode=='month':
134+<<<<<<< TREE
135 self.date = self.date + DateTime.RelativeDateTime(months=type)
136 self.screen.search_filter()
137+=======
138+ self.date = self.date + relativedelta(months=type)
139+>>>>>>> MERGE-SOURCE
140 self.display(None)
141
142 def _change_view(self, widget, type, *args, **argv):
143@@ -343,8 +354,14 @@
144 if not h:
145 n = n - 1
146 span = n + 1
147+<<<<<<< TREE
148
149 t=DateTime.mktime(starts)
150+=======
151+
152+# t=DateTime.mktime(starts) Can be replaced with time.mktime
153+ t = datetime(*starts[0:6])
154+>>>>>>> MERGE-SOURCE
155 ends = time.localtime(t.ticks() + (h * 60 * 60) + (n * 24 * 60 * 60))
156
157
158
159=== modified file 'bin/widget/view/form_gtk/date_widget.py'
160--- bin/widget/view/form_gtk/date_widget.py 2010-01-12 09:24:17 +0000
161+++ bin/widget/view/form_gtk/date_widget.py 2010-01-24 00:44:15 +0000
162@@ -28,7 +28,7 @@
163 import tools
164 import tools.datetime_util
165 import time
166-from mx.DateTime import DateTime
167+#from mx.DateTime import DateTime
168
169
170 class DateEntry(gtk.Entry):
171
172=== modified file 'bin/widget/view/form_gtk/float_time.py'
173--- bin/widget/view/form_gtk/float_time.py 2010-01-12 09:24:17 +0000
174+++ bin/widget/view/form_gtk/float_time.py 2010-01-24 00:44:15 +0000
175@@ -28,7 +28,8 @@
176
177 import common
178 import interface
179-from mx.DateTime import DateTimeDelta
180+#from mx.DateTime import DateTimeDelta
181+
182
183 class float_time(interface.widget_interface):
184 def __init__(self, window, parent, model, attrs={}):
185
186=== modified file 'bin/widget/view/form_gtk/textbox.py'
187--- bin/widget/view/form_gtk/textbox.py 2010-01-12 09:24:17 +0000
188+++ bin/widget/view/form_gtk/textbox.py 2010-01-24 00:44:15 +0000
189@@ -50,7 +50,8 @@
190 def _readonly_set(self, value):
191 interface.widget_interface._readonly_set(self, value)
192 self.tv.set_editable(not value)
193- self.tv.set_sensitive(not value)
194+ #Commenting following line in order to make text field lines selectable
195+# self.tv.set_sensitive(not value)
196
197 def _color_widget(self):
198 return self.tv
199
200=== modified file 'bin/widget/view/tree_gtk/date_renderer.py'
201--- bin/widget/view/tree_gtk/date_renderer.py 2010-01-23 15:06:53 +0000
202+++ bin/widget/view/tree_gtk/date_renderer.py 2010-01-24 00:44:15 +0000
203@@ -29,7 +29,7 @@
204 import tools
205 import tools.datetime_util
206 import time
207-from mx.DateTime import DateTime
208+#from mx.DateTime import DateTime
209
210
211 class DecoratorRenderer(gtk.GenericCellRenderer):
212@@ -64,7 +64,9 @@
213 return self.renderer1.get_size(widget, cell_area)
214
215 def on_render(self, window, widget, background_area, cell_area, expose_area, flags):
216- return self.renderer1.render(window, widget, background_area, cell_area, expose_area, flags)
217+ if isinstance(window,gtk.gdk.Window):
218+ return self.renderer1.render(window, widget, background_area, cell_area, expose_area, flags)
219+ return None
220
221 def on_activate(self, event, widget, path, background_area, cell_area, flags):
222 return self.renderer1.activate(event, widget, path, background_area, cell_area, flags)
223
224=== modified file 'bin/widget/view/tree_gtk/parser.py'
225--- bin/widget/view/tree_gtk/parser.py 2010-01-23 15:06:53 +0000
226+++ bin/widget/view/tree_gtk/parser.py 2010-01-24 00:44:15 +0000
227@@ -114,10 +114,17 @@
228 treeview.sequence = True
229 for boolean_fields in ('readonly', 'required'):
230 if boolean_fields in node_attrs:
231+<<<<<<< TREE
232 node_attrs[boolean_fields] = bool(int(node_attrs[boolean_fields]))
233 if fields[fname]['type'] == 'selection':
234 if fields[fname].get('selection',[]):
235 node_attrs['selection'] = fields[fname]['selection']
236+=======
237+ if node_attrs[boolean_fields] in ('True', 'False'):
238+ node_attrs[boolean_fields] = eval(node_attrs[boolean_fields])
239+ else:
240+ node_attrs[boolean_fields] = bool(int(node_attrs[boolean_fields]))
241+>>>>>>> MERGE-SOURCE
242 fields[fname].update(node_attrs)
243 node_attrs.update(fields[fname])
244 node_attrs['editable'] = editable
245
246=== modified file 'bin/widget_search/calendar.py'
247--- bin/widget_search/calendar.py 2010-01-23 15:00:18 +0000
248+++ bin/widget_search/calendar.py 2010-01-24 00:44:15 +0000
249@@ -26,7 +26,7 @@
250 import locale
251
252 import mx.DateTime
253-from mx.DateTime import *
254+#from mx.DateTime import *
255
256 import tools
257 import tools.datetime_util
258
259=== modified file 'bin/widget_search/date_widget.py'
260--- bin/widget_search/date_widget.py 2010-01-12 09:24:17 +0000
261+++ bin/widget_search/date_widget.py 2010-01-24 00:44:15 +0000
262@@ -27,7 +27,7 @@
263 import tools
264 import tools.datetime_util
265 import time
266-from mx.DateTime import DateTime
267+#from mx.DateTime import DateTime
268
269
270 class DateEntry(gtk.Entry):
271
272=== modified file 'setup.py'
273--- setup.py 2010-01-21 10:58:10 +0000
274+++ setup.py 2010-01-24 00:44:14 +0000
275@@ -62,8 +62,8 @@
276 py_short_version = '%s.%s' % sys.version_info[:2]
277
278 required_modules = [('gtk', 'gtk python bindings'),
279- ('gtk.glade', 'glade python bindings'),
280- ('mx.DateTime', 'date and time handling routines for Python')]
281+ ('gtk.glade', 'glade python bindings'),]
282+# ('mx.DateTime', 'date and time handling routines for Python')]
283
284 def check_modules():
285 ok = True