Naresh(OpenERP) has proposed merging
lp:~openerp-dev/openobject-client/trunk-bug-798643-nch into
lp:openobject-client.
Requested reviews:
OpenERP sa GTK client R&D (openerp-dev-gtk)
Related bugs:
Bug #798643 in OpenERP Server: "[PS] Shortcuts are not translated even if
current language is FR"
https://bugs.launchpad.net/openobject-server/+bug/798643
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-798643-nch/+merge/65765
Hello,
Shortcuts are no more editable now.
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-798643-nch/+merge/65765
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-client/trunk-bug-798643-nch.
=== modified file 'bin/modules/gui/main.py'
--- bin/modules/gui/main.py 2011-05-10 11:40:45 +0000
+++ bin/modules/gui/main.py 2011-06-24 05:50:56 +0000
@@ -856,12 +856,6 @@
# Adding a timer the check to requests
gobject.timeout_add(15 * 60 * 1000, self.request_set)
-
- def shortcut_edit(self, widget, model='ir.ui.menu'):
- obj = service.LocalService('gui.window')
- domain = [('user_id', '=', rpc.session.uid), ('resource', '=', model)]
- obj.create(False, 'ir.ui.view_sc', res_id=None, domain=domain, view_type='form', mode='tree,form')
-
def shortcut_set(self, sc=None):
def _action_shortcut(widget, action):
if action:
@@ -881,12 +875,6 @@
menuitem = gtk.MenuItem(s['name'])
menuitem.connect('activate', _action_shortcut, s['res_id'])
menu.add(menuitem)
-
- menu.add(gtk.SeparatorMenuItem())
- menuitem = gtk.MenuItem(_('Edit'))
- menuitem.connect('activate', self.shortcut_edit)
- menu.add(menuitem)
-
menu.show_all()
self.shortcut_menu.set_submenu(menu)
self.shortcut_menu.set_sensitive(True)
=== modified file 'bin/modules/gui/window/view_tree/view_tree_sc.py'
--- bin/modules/gui/window/view_tree/view_tree_sc.py 2011-03-20 11:26:23 +0000
+++ bin/modules/gui/window/view_tree/view_tree_sc.py 2011-06-24 05:50:56 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -32,7 +32,6 @@
self.last_iter = None
self.model = model
self.tree = tree
- self.tree.connect( 'key-press-event', self.on_key_press_event )
self.tree.get_selection().set_mode('single')
self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, [("shortcuts", 0, 0)], gtk.gdk.ACTION_COPY)
@@ -43,8 +42,6 @@
self.tree.append_column(column)
column.set_visible(False)
cell = gtk.CellRendererText()
- cell.connect( 'edited', self.on_cell_edited )
-
column = gtk.TreeViewColumn (_('Description'), cell, text=1)
self.tree.append_column(column)
# self.update()
@@ -92,29 +89,6 @@
if (action==2):
self.update()
- def on_cell_edited(self, cell, path_string, new_text):
- model = self.tree.get_model()
- iter = model.get_iter_from_string(path_string)
- old_text = model.get_value( iter, self.COLUMN_NAME )
- if old_text <> new_text:
- res_id = int( model.get_value( iter, self.COLUMN_ID ) )
- rpc.session.rpc_exec_auth('/object', 'execute', 'ir.ui.view_sc', 'write', res_id, { 'name' : new_text }, rpc.session.context )
- model.set(iter, self.COLUMN_NAME, new_text)
-
- cell.set_property( 'editable', False )
-
- def on_key_press_event( self, widget, event ):
- if event.keyval == gtk.keysyms.F2:
- column = self.tree.get_column( self.COLUMN_NAME )
- cell = column.get_cell_renderers()[0]
- cell.set_property( 'editable', True )
-
- selected_row = widget.get_selection().get_selected()
- if selected_row and selected_row[1]:
- (model, iter) = selected_row
- path = model.get_path( iter )
- self.tree.set_cursor_on_cell( path, column, cell, True )
-
def check_sanity(self, model, iter_to_copy, target_iter):
path_of_iter_to_copy = model.get_path(iter_to_copy)
path_of_target_iter = model.get_path(target_iter)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
