[REF] web(_*): views: view_switcher icon

Add a key icon in the view's prototype corresponding to the font-awesome icon
to display in the view switcher.

15 files changed, 15 insertions, 45 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 49f87a4dbd0..a9d05b17bb2 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1040,30 +1040,6 @@
 .openerp .oe-control-panel .oe-cp-switch-buttons button {
   width: 34px;
 }
-.openerp .oe-control-panel .oe-cp-switch-buttons .oe-cp-switch-kanban:before {
-  content: "";
-}
-.openerp .oe-control-panel .oe-cp-switch-buttons .oe-cp-switch-list:before {
-  content: "";
-}
-.openerp .oe-control-panel .oe-cp-switch-buttons .oe-cp-switch-form:before {
-  content: "";
-}
-.openerp .oe-control-panel .oe-cp-switch-buttons .oe-cp-switch-graph:before {
-  content: "";
-}
-.openerp .oe-control-panel .oe-cp-switch-buttons .oe-cp-switch-calendar:before {
-  content: "";
-}
-.openerp .oe-control-panel .oe-cp-switch-buttons .oe-cp-switch-gantt:before {
-  content: "";
-}
-.openerp .oe-control-panel .oe-cp-switch-buttons .oe-cp-switch-pivot:before {
-  content: "";
-}
-.openerp .oe-control-panel .oe-cp-switch-buttons .oe-cp-switch-tree:before {
-  content: "";
-}
 .openerp .oe-control-panel .oe-cp-buttons {
   display: inline-block;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index a83d7d5a020..c665269bcfe 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -905,22 +905,6 @@ $sheet-padding: 16px
         .oe-cp-switch-buttons
             button
                 width: 34px
-            .oe-cp-switch-kanban:before
-                content: "\f009"
-            .oe-cp-switch-list:before
-                content: ""
-            .oe-cp-switch-form:before
-                content: "\f044"
-            .oe-cp-switch-graph:before
-                content: "\f080"
-            .oe-cp-switch-calendar:before
-                content: "\f073"
-            .oe-cp-switch-gantt:before
-                content: "\f0ae"
-            .oe-cp-switch-pivot:before
-                content: "\f0ce"
-            .oe-cp-switch-tree:before
-                content: "\f036"
         .oe-cp-buttons
             display: inline-block
         .oe-cp-sidebar
diff --git a/addons/web/static/src/js/framework/view.js b/addons/web/static/src/js/framework/view.js
index d803b7487df..e34a8f486ec 100644
--- a/addons/web/static/src/js/framework/view.js
+++ b/addons/web/static/src/js/framework/view.js
@@ -23,6 +23,8 @@ var View = Widget.extend({
     // multi_record is used to distinguish views displaying a single record
     // (e.g. FormView) from those that display several records (e.g. ListView)
     multi_record: true,
+    // icon is the font-awesome icon to display in the view switcher
+    icon: 'fa-question',
     init: function(parent, dataset, view_id, options) {
         this._super(parent);
         this.ViewManager = parent;
diff --git a/addons/web/static/src/js/view_manager.js b/addons/web/static/src/js/view_manager.js
index 621fd663313..bf2e5beb185 100644
--- a/addons/web/static/src/js/view_manager.js
+++ b/addons/web/static/src/js/view_manager.js
@@ -62,6 +62,7 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
                     button_label: View ? _.str.sprintf(_t('%(view_type)s view'), {'view_type': (view_label || view_type)}) : (void 'nope'),
                     multi_record: View ? View.prototype.multi_record : undefined,
                     accesskey: View ? View.prototype.accesskey : undefined,
+                    icon: View ? View.prototype.icon : undefined,
                 };
             self.view_order.push(view_descr);
             self.views[view_type] = view_descr;
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index 304232d0bc4..c386e6fc993 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -35,6 +35,7 @@ var FormView = View.extend(common.FieldManagerMixin, {
     view_type: "form",
     multi_record: false,
     accesskey: "F",
+    icon: 'fa-edit',
     /**
      * @constructs instance.web.FormView
      * @extends instance.web.View
diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js
index 0bf222079fb..030a7dcc62e 100644
--- a/addons/web/static/src/js/views/graph_view.js
+++ b/addons/web/static/src/js/views/graph_view.js
@@ -16,6 +16,7 @@ var QWeb = core.qweb;
 var GraphView = View.extend({
     className: 'oe_graph',
     display_name: _lt('Graph'),
+    icon: 'fa-bar-chart',
     view_type: 'graph',
 
     init: function(parent, dataset, view_id, options) {
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index 4503321953a..cd33d2d6966 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -35,6 +35,7 @@ var row_decoration = [
 var ListView = View.extend( /** @lends instance.web.ListView# */ {
     _template: 'ListView',
     accesskey: 'L',
+    icon: 'fa-list-ul',
     display_name: _lt('List'),
     defaults: {
         // records can be selected one by one
diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js
index b35a9a68927..c916749c0d5 100644
--- a/addons/web/static/src/js/views/pivot_view.js
+++ b/addons/web/static/src/js/views/pivot_view.js
@@ -21,6 +21,7 @@ var total = _t("Total");
 
 var PivotView = View.extend({
     template: 'PivotView',
+    icon: 'fa-table',
     display_name: _lt('Pivot'),
     view_type: 'pivot',
     events: {
diff --git a/addons/web/static/src/js/views/tree_view.js b/addons/web/static/src/js/views/tree_view.js
index 2372f029b98..ab9193095ea 100644
--- a/addons/web/static/src/js/views/tree_view.js
+++ b/addons/web/static/src/js/views/tree_view.js
@@ -16,6 +16,7 @@ var QWeb = core.qweb;
 
 var TreeView = View.extend(/** @lends instance.web.TreeView# */{
     display_name: _lt('Tree'),
+    icon: 'fa-align-left',
     view_type: 'tree',
     /**
      * Indicates that this view is not searchable, and thus that no search
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3ba802f6ad3..aba01929158 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -171,7 +171,9 @@
 </div>
 <t t-name="ViewManager.switch-buttons">
     <t t-foreach="views" t-as="view">
-        <button type="button" t-attf-class="btn btn-default fa oe-cp-switch-#{view.type}" t-att-data-view-type="view.type" t-att-title="view.label" t-att-accesskey="view.accesskey"/>
+        <button type="button" t-att-accesskey="view.accesskey"
+            t-attf-class="btn btn-default fa #{view.icon} oe-cp-switch-#{view.type}" 
+            t-att-data-view-type="view.type" t-att-title="view.label"/>
     </t>
 </t>
 
diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index d5e28979d2d..f002111fa09 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -63,6 +63,7 @@ function isNullOrUndef(value) {
 var CalendarView = View.extend({
     template: "CalendarView",
     display_name: _lt('Calendar'),
+    icon: 'fa-calendar',
     quick_create_instance: widgets.QuickCreate,
 
     init: function (parent, dataset, view_id, options) {
diff --git a/addons/web_diagram/static/src/css/base_diagram.css b/addons/web_diagram/static/src/css/base_diagram.css
index d5d59c2056b..f9bf32ca201 100644
--- a/addons/web_diagram/static/src/css/base_diagram.css
+++ b/addons/web_diagram/static/src/css/base_diagram.css
@@ -44,7 +44,3 @@
     -o-user-select: none;
     user-select: none;
 }
-
-.oe-cp-switch-buttons .oe-cp-switch-diagram:before {
-  content: "";
-}
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 8fdcf077b38..f28926ddb8e 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -15,6 +15,7 @@ var QWeb = core.qweb;
 
 var DiagramView = View.extend({
     display_name: _lt('Diagram'),
+    icon: 'fa-code-fork',
     view_type: 'diagram',
     searchable: false,
     multi_record: false,
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index b9d5a0d7f2c..09ab70d659a 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -17,6 +17,7 @@ var QWeb = core.qweb;
 
 var GanttView = View.extend({
     display_name: _lt('Gantt'),
+    icon: 'fa-tasks',
     view_type: "gantt",
     init: function() {
         this._super.apply(this, arguments);
diff --git a/addons/web_kanban/static/src/js/kanban_view.js b/addons/web_kanban/static/src/js/kanban_view.js
index b7a3b8b703a..fe97b1c6814 100644
--- a/addons/web_kanban/static/src/js/kanban_view.js
+++ b/addons/web_kanban/static/src/js/kanban_view.js
@@ -27,6 +27,7 @@ var KanbanView = View.extend({
     accesskey: "K",
     className: "o_kanban_view",
     display_name: _lt("Kanban"),
+    icon: 'fa-th-large',
     mobile_friendly: true,
     view_type: "kanban",