Raphael Collet (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-red-button into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-red-button/+merge/112544
Highlight the workflow and wizard buttons where it makes sense.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-red-button/+merge/112544
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-red-button.
=== modified file 'openerp/addons/base/ir/wizard/wizard_menu_view.xml'
--- openerp/addons/base/ir/wizard/wizard_menu_view.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/ir/wizard/wizard_menu_view.xml 2012-06-28 11:35:20 +0000
@@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Create Menu" version="7.0">
<header>
- <button name="menu_create" string="Create _Menu" type="object"/>
- <button special="cancel" string="_Cancel"/>
+ <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="name"/>
=== modified file 'openerp/addons/base/module/wizard/base_export_language_view.xml'
--- openerp/addons/base/module/wizard/base_export_language_view.xml 2012-01-16 14:01:58 +0000
+++ openerp/addons/base/module/wizard/base_export_language_view.xml 2012-06-28 11:35:20 +0000
@@ -7,7 +7,12 @@
<field name="model">base.language.export</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Export Translations">
+ <form string="Export Translations" version="7.0">
+ <header>
+ <button name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
+ </header>
<group col="8">
<group colspan="3">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -35,17 +40,6 @@
<field height="80" name="advice" nolabel="1" colspan="4"/>
</group>
</group>
- <group colspan="8" col="8" states="choose">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button icon="gtk-cancel" name="act_cancel" special="cancel" string="_Close" type="object"/>
- <button icon="gtk-ok" name="act_getfile" string="_Export" type="object"/>
- </group>
- <group colspan="8" col="8" states="get">
- <separator string="" colspan="8"/>
- <label colspan="7" width="220"/>
- <button icon="gtk-close" name="act_destroy" special="cancel" string="_Close" type="object"/>
- </group>
</group>
</form>
</field>
=== modified file 'openerp/addons/base/module/wizard/base_import_language_view.xml'
--- openerp/addons/base/module/wizard/base_import_language_view.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/module/wizard/base_import_language_view.xml 2012-06-28 11:35:20 +0000
@@ -9,16 +9,19 @@
<field name="arch" type="xml">
<form string="Import Translation" version="7.0">
<header>
- <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
- <button special="cancel" string="_Close" icon="gtk-cancel"/>
+ <button name="import_lang" string="_Import" type="object" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
</header>
- <separator string="Import Translation" colspan="2"/>
- <label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
- <group col="4">
- <field name="name"/>
- <field name="code"/>
- <field name="data"/>
- <field name="overwrite"/>
+ <group>
+ <separator string="Import Translation" colspan="2"/>
+ <label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
+ <group col="4">
+ <field name="name"/>
+ <field name="code"/>
+ <field name="data"/>
+ <field name="overwrite"/>
+ </group>
</group>
</form>
</field>
=== modified file 'openerp/addons/base/module/wizard/base_language_install_view.xml'
--- openerp/addons/base/module/wizard/base_language_install_view.xml 2012-06-19 08:10:05 +0000
+++ openerp/addons/base/module/wizard/base_language_install_view.xml 2012-06-28 11:35:20 +0000
@@ -7,7 +7,12 @@
<field name="model">base.language.install</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Load a Translation">
+ <form string="Load Official Translation" version="7.0">
+ <header>
+ <button name="lang_install" string="Load" type="object" states="init" class="oe_highlight_on_dirty" />
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
+ </header>
<group colspan="4" col="8">
<group colspan="1">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -30,17 +35,6 @@
</group>
</group>
</group>
- <group colspan="8" col="8" states="init">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
- <button name="lang_install" string="Load" type="object" icon="gtk-ok" colspan="1"/>
- </group>
- <group colspan="8" col="8" states="done">
- <separator string="" colspan="8"/>
- <label colspan="7" width="220"/>
- <button special="cancel" string="Close" icon="gtk-ok"/>
- </group>
</form>
</field>
</record>
=== modified file 'openerp/addons/base/module/wizard/base_module_configuration_view.xml'
--- openerp/addons/base/module/wizard/base_module_configuration_view.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/module/wizard/base_module_configuration_view.xml 2012-06-28 11:35:20 +0000
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<form string="System Configuration Done" version="7.0">
<header>
- <button special="cancel" string="_Ok"/>
+ <button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
</form>
=== modified file 'openerp/addons/base/module/wizard/base_module_import_view.xml'
--- openerp/addons/base/module/wizard/base_module_import_view.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/module/wizard/base_module_import_view.xml 2012-06-28 11:35:20 +0000
@@ -7,7 +7,14 @@
<field name="model">base.module.import</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Import module">
+ <form string="Import module" version="7.0">
+ <header>
+ <button name="importzip" string="Import module" type="object" states="init" class="oe_highlight_on_dirty"/>
+ or
+ <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel"/>
+ </header>
<group col="8">
<group colspan="3" col="1">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -29,18 +36,6 @@
<label string="Module file successfully imported!" colspan="4"/>
</group>
</group>
- <group colspan="8" col="8" states="init">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="importzip" string="Import module" type="object" icon="gtk-apply"/>
- </group>
- <group colspan="8" col="8" states="done">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button special="cancel" string="Close" icon="gtk-ok"/>
- <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
- </group>
</group>
</form>
</field>
=== modified file 'openerp/addons/base/module/wizard/base_module_scan_view.xml'
--- openerp/addons/base/module/wizard/base_module_scan_view.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/module/wizard/base_module_scan_view.xml 2012-06-28 11:35:20 +0000
@@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Scan for new modules" version="7.0">
<header>
- <button name="watch_dir" string="Check new modules" type="object" icon="gtk-ok"/>
- <button special="cancel" string="Close" icon="gtk-cancel"/>
+ <button name="watch_dir" string="Check new modules" type="object" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
</form>
=== modified file 'openerp/addons/base/module/wizard/base_module_update_view.xml'
--- openerp/addons/base/module/wizard/base_module_update_view.xml 2012-04-30 06:04:34 +0000
+++ openerp/addons/base/module/wizard/base_module_update_view.xml 2012-06-28 11:35:20 +0000
@@ -7,7 +7,14 @@
<field name="model">base.module.update</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Update Module List">
+ <form string="Update Module List" version="7.0">
+ <header>
+ <button name="update_module" string="Update" type="object" states="init" class="oe_highlight_on_dirty"/>
+ or
+ <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
+ </header>
<group col="8">
<group colspan="3">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -28,18 +35,6 @@
<field name="add" colspan="4"/>
</group>
</group>
- <group colspan="8" col="8" states="init">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="update_module" string="Update" type="object" icon="gtk-ok"/>
- </group>
- <group colspan="8" col="8" states="done">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button special="cancel" string="Close" icon="gtk-ok"/>
- <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
- </group>
</group>
</form>
</field>
=== modified file 'openerp/addons/base/module/wizard/base_module_upgrade.py'
--- openerp/addons/base/module/wizard/base_module_upgrade.py 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/module/wizard/base_module_upgrade.py 2012-06-28 11:35:20 +0000
@@ -48,12 +48,15 @@
if not ids:
res['arch'] = '''<form string="Apply Scheduled Upgrades" version="7.0">
<header>
- <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
- <button special="cancel" string="Close" icon="gtk-cancel"/>
+ <button name="config" string="Start configuration" type="object" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel"/>
</header>
- <separator string="System update completed" colspan="4"/>
- <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
- <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
+ <group>
+ <separator string="System update completed" colspan="4"/>
+ <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
+ <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
+ </group>
</form>'''
return res
@@ -80,14 +83,14 @@
JOIN ir_module_module_dependency d ON (m.id = d.module_id)
LEFT JOIN ir_module_module m2 ON (d.name = m2.name)
WHERE m.id in %s and (m2.state IS NULL or m2.state IN %s)""",
- (tuple(ids), ('uninstalled',)))
+ (tuple(ids), ('uninstalled',)))
unmet_packages = [x[0] for x in cr.fetchall()]
if unmet_packages:
raise osv.except_osv(_('Unmet dependency !'),
_('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
ir_module.download(cr, uid, ids, context=context)
- cr.commit() # save before re-creating cursor below
+ cr.commit() # save before re-creating cursor below
pooler.restart_pool(cr.dbname, update_module=True)
=== modified file 'openerp/addons/base/module/wizard/base_module_upgrade_view.xml'
--- openerp/addons/base/module/wizard/base_module_upgrade_view.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/module/wizard/base_module_upgrade_view.xml 2012-06-28 11:35:20 +0000
@@ -9,13 +9,16 @@
<field name="arch" type="xml">
<form string="System Update" version="7.0">
<header>
- <button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="upgrade_module" string="Update" type="object" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel"/>
</header>
- <label string="Your system will be updated."/>
- <label string="Note that this operation might take a few minutes."/>
- <separator string="Modules to Update"/>
- <field name="module_info"/>
+ <group>
+ <label string="Your system will be updated."/>
+ <label string="Note that this operation might take a few minutes."/>
+ <separator string="Modules to Update"/>
+ <field name="module_info"/>
+ </group>
</form>
</field>
</record>
@@ -45,11 +48,14 @@
<field name="arch" type="xml">
<form string="Apply Scheduled Upgrades" version="7.0">
<header>
- <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="config" string="Start configuration" type="object" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel"/>
</header>
- <label string="The selected modules have been updated / installed !"/>
- <label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/>
+ <group>
+ <label string="The selected modules have been updated / installed !"/>
+ <label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/>
+ </group>
</form>
</field>
</record>
=== modified file 'openerp/addons/base/module/wizard/base_update_translations_view.xml'
--- openerp/addons/base/module/wizard/base_update_translations_view.xml 2011-07-26 12:37:14 +0000
+++ openerp/addons/base/module/wizard/base_update_translations_view.xml 2012-06-28 11:35:20 +0000
@@ -6,7 +6,12 @@
<field name="model">base.update.translations</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Synchronize Terms">
+ <form string="Synchronize Terms" version="7.0">
+ <header>
+ <button name="act_update" string="Update" type="object" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel"/>
+ </header>
<group col="8">
<group colspan="3">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -18,12 +23,6 @@
<separator string="Synchronize Translation" colspan="4"/>
<field name="lang" colspan="4"/>
</group>
- <group colspan="8" col="8">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
- <button icon="gtk-ok" name="act_update" string="Update" type="object"/>
- </group>
</group>
</form>
</field>
=== modified file 'openerp/addons/base/publisher_warranty/publisher_warranty_view.xml'
--- openerp/addons/base/publisher_warranty/publisher_warranty_view.xml 2012-06-22 10:11:46 +0000
+++ openerp/addons/base/publisher_warranty/publisher_warranty_view.xml 2012-06-28 11:35:20 +0000
@@ -40,14 +40,15 @@
<field name="check_opw"/>
</group>
<group col="2" colspan="3">
- <button name="check_validity" icon="camera_test.png
-" string="Validate" type="object"
+ <button name="check_validity" string="Validate" type="object"
attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
- <button name="check_validity" icon="camera_test.png" string="Refresh Validation Dates" type="object"
+ <button name="check_validity" string="Refresh Validation Dates" type="object"
attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
</group>
</group>
- </sheet>
+ </sheet>
</form>
</field>
</record>
@@ -93,7 +94,12 @@
<field name="model">publisher_warranty.contract.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Register a Contract">
+ <form string="Register a Contract" version="7.0">
+ <header>
+ <button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight_on_dirty" />
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
+ </header>
<group colspan="4" col="8">
<group colspan="1">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -115,17 +121,6 @@
</group>
</group>
</group>
- <group colspan="8" col="8" states="draft">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
- <button name="action_validate" string="Register" type="object" icon="gtk-apply" colspan="1"/>
- </group>
- <group colspan="8" col="8" states="finished">
- <separator string="" colspan="8"/>
- <label colspan="7" width="220"/>
- <button special="cancel" string="Close" icon="gtk-ok"/>
- </group>
</form>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_config.xml'
--- openerp/addons/base/res/res_config.xml 2012-06-20 08:08:14 +0000
+++ openerp/addons/base/res/res_config.xml 2012-06-28 11:35:20 +0000
@@ -8,9 +8,10 @@
<form version="7.0">
<header>
<button name="action_next" type="object"
- string="Apply" icon="gtk-go-forward" class="oe_highlight"/>
+ string="Apply" class="oe_highlight_on_dirty" />
+ or
<button name="action_skip" type="object" special="cancel"
- string="Cancel" icon="gtk-jump-to"/>
+ string="Cancel" class="oe_link"/>
</header>
<group string="res_config_contents"/>
</form>
@@ -25,9 +26,13 @@
<form string="Next Configuration Step" version="7.0">
<header>
<button name="action_next" type="object"
- string="Continue" icon="gtk-go-forward" class="oe_highlight"/>
+ string="Continue" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
</header>
- <field name="note"/>
+ <group>
+ <field name="note"/>
+ </group>
</form>
</field>
</record>
@@ -39,12 +44,13 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
- <button name="action_next" type="object"
- string="Install Modules" icon="gtk-go-forward" class="oe_highlight"/>
- <button name="action_skip" type="object" special="cancel"
- string="Cancel" icon="gtk-jump-to"/>
+ <button name="action_next" type="object" string="Install Modules" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
</header>
- <separator string="title" colspan="4"/>
+ <group>
+ <separator string="title" colspan="4"/>
+ </group>
</form>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_widget_view.xml'
--- openerp/addons/base/res/res_widget_view.xml 2012-06-22 10:11:46 +0000
+++ openerp/addons/base/res/res_widget_view.xml 2012-06-28 11:35:20 +0000
@@ -45,7 +45,7 @@
<field name="search_view_id" ref="view_res_widget_search"/>
</record>
<menuitem action="res_widget_act_window" id="menu_res_widget_act_window" parent="base.next_id_2" />
-
+
<record id="res_widget_user_tree" model="ir.ui.view">
<field name="name">res.widget.user.tree</field>
<field name="model">res.widget.user</field>
@@ -70,7 +70,7 @@
<field name="user_id"/>
<field name="sequence"/>
</group>
- </sheet>
+ </sheet>
</form>
</field>
</record>
@@ -89,10 +89,13 @@
<field name="arch" type="xml">
<form string="Widget Wizard" col="4" version="7.0">
<header>
- <button name="res_widget_add" string="Add" type="object"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel" />
+ <button name="res_widget_add" string="Add" type="object" class="oe_highlight_on_dirty"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
</header>
- <field name="widgets_list"/>
+ <group>
+ <field name="widgets_list"/>
+ </group>
</form>
</field>
</record>
=== modified file 'openerp/addons/base/rng/view.rng'
--- openerp/addons/base/rng/view.rng 2012-06-14 14:46:33 +0000
+++ openerp/addons/base/rng/view.rng 2012-06-28 11:35:20 +0000
@@ -677,6 +677,7 @@
<rng:optional><rng:attribute name="context"/></rng:optional>
<rng:optional><rng:attribute name="confirm"/></rng:optional>
<rng:optional><rng:attribute name="help"/></rng:optional>
+ <rng:optional><rng:attribute name="class"/></rng:optional>
<rng:optional><rng:attribute name="default_focus"/></rng:optional>
<rng:zeroOrMore>
<rng:choice>
=== modified file 'openerp/tests/addons/test_exceptions/view.xml'
--- openerp/tests/addons/test_exceptions/view.xml 2011-09-30 09:37:55 +0000
+++ openerp/tests/addons/test_exceptions/view.xml 2012-06-28 11:35:20 +0000
@@ -38,11 +38,6 @@
<button name="generate_undefined" string="Undefined" type="object" icon="gtk-ok" colspan="1"/>
<label string="Server error-traceback"/>
</group>
- <group colspan="8" col="8">
- <separator string="" colspan="8"/>
- <label colspan="6" width="220"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
- </group>
</form>
</field>
</record>
_______________________________________________
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
