Merge lp:~juan-munoz-clearcorp/openerp-ccorp-addons/957105-winpdb-6.1 into lp:openerp-ccorp-addons/trunk

[Juan Felipe Muñoz Ramos]

winpdb_debugger fix, now it works in openerp 6.1

=== modified file 'winpdb_debugger/winpdb_debugger.py'
--- winpdb_debugger/winpdb_debugger.py	2011-11-29 04:07:45 +0000
+++ winpdb_debugger/winpdb_debugger.py	2012-03-16 20:44:17 +0000
@@ -20,12 +20,13 @@
 #
 ##############################################################################
 
-import wizard
-import osv
+from osv import osv,fields
+from tools.translate import _
 from tools import config
 
 import rpdb2
 
+"""
 ask_form ='''<?xml version="1.0"?>
 <form string="Winpdb debugger">
     <label string="Open Winpdb and set the password to the OpenERP server administrator password. Then clic 'Start Winpdb debugger'." colspan="4"/>
@@ -38,33 +39,30 @@
     <label string="Winpdb attached or timeout." colspan="4"/>
 </form>
 '''
+"""
+class winpdb_debugger_wizard(osv.osv_memory):
+    _name = 'winpdb.debugger.wizard'
 
-class winpdb_debugger_wizard(wizard.interface):
-    def start_debugger(self, cr, uid, data, context):
+    def action_start_debugger(self, cr, uid, data, context):
         rpdb2.start_embedded_debugger(config['admin_passwd'])
-        return {}
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': ask_form,
-                'fields': {},
-                'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('start', 'Start Winpdb debugger', 'gtk-ok', True)
-                ]
-            }
-        },
-        'start': {
-            'actions': [start_debugger],
-            'result': {
-                'type':'form',
-                'arch':finish_form,
-                'fields':{},
-                'state':[('end','Close')]
-            }
-        },
-    }
-winpdb_debugger_wizard('winpdb.debugger')
+        return{}
+
+
+
+
+winpdb_debugger_wizard()
+
+
+"""
+return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'winpdb.debugger.wizard',
+            'views': [('winpdb_debugger_close__wizard','form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context,
+        }
+
+
+"""

=== modified file 'winpdb_debugger/winpdb_debugger_wizard.xml'
--- winpdb_debugger/winpdb_debugger_wizard.xml	2010-08-16 20:39:31 +0000
+++ winpdb_debugger/winpdb_debugger_wizard.xml	2012-03-16 20:44:17 +0000
@@ -4,10 +4,73 @@
 		<!--
 		Winpdb debugger start wizard
 		-->
-		<record id="winpdb_debugger_wizard" model="ir.actions.wizard">
-			<field name="name">Start Winpdb debugger</field>
-			<field name="wiz_name">winpdb.debugger</field>
-		</record>
-		<menuitem action="winpdb_debugger_wizard" id="winpdb_debugger_menu" parent="base.menu_administration" sequence="100" type="wizard"/>
+
+		
+    <record model="ir.ui.view" id="winpdb_debugger_form_view2">
+		<field name="name">winpdb.debugger.wizard.form</field>
+		<field name="model">winpdb.debugger.wizard</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+            <form string="Winpdb debugger">
+                <label string="Winpdb attached or timeout." colspan="4"/>
+			</form>
+		</field>
+	</record>
+    
+    
+	
+	
+	<record model="ir.ui.view" id="winpdb_debugger_form_view">
+		<field name="name">winpdb.debugger.wizard.form</field>
+		<field name="model">winpdb.debugger.wizard</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+            <form string="Winpdb debugger">
+                <label string="Open Winpdb and set the password to the OpenERP server administrator password. Then clic 'Start Winpdb debugger'." colspan="4"/>
+                <label string="The system will wait for 5 minutes until you open a connection. If no connection is opened, the server will continue." colspan="4"/>
+				<button type="special" special="cancel"
+						string="Cancel" icon="gtk-cancel"/>
+				<button type="object" name="action_start_debugger"
+						string="start debugger" icon="gtk-ok"/>
+			</form>
+		</field>
+	</record>
+
+
+
+
+		<record model="ir.actions.act_window" id="winpdb_debugger_open_wizard">
+			<field name="name">winpdb_open_wizard</field>
+			<field name="res_model">winpdb.debugger.wizard</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+            <field name="view_id" ref="winpdb_debugger_form_view"/>
+			<field name="target">new</field>
+		</record>
+		
+		<menuitem  name= "Star Winpdb debugger" action="winpdb_debugger_open_wizard" id="winpdb_debugger_menu" parent="base.menu_administration" sequence="100" />
+	
+    
+    
+    
+
+    
+    
+    <record model="ir.actions.act_window" id="winpdb_debugger_close__wizard">
+			<field name="name">winpdb_close_wizard</field>
+			<field name="res_model">winpdb.debugger.wizard</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+            <field name="view_id" ref="winpdb_debugger_form_view2"/>
+			<field name="target">new</field>
+		</record>
+
+
+   
+
+
+	
+	
+	
 	</data>
 </openerp>