update to using tabler icons

oetiker · Jun 21, 2022 · e71cbf7 · e71cbf7
1 parent 92adc95
commit e71cbf7
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 47 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.9.3 2022-06-21 09:37:07 +0200 Tobias Oetiker <tobi@oetiker.ch>
+
+ - switch to tabler icon-theme
+
 0.9.2 2022-06-10 15:45:32 +0200 Tobias Oetiker <tobi@oetiker.ch>
 
  - fix missing icons

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.2
+0.9.3
diff --git a/frontend/Manifest.json b/frontend/Manifest.json
@@ -24,6 +24,7 @@
   "requires": {
     "@qooxdoo/framework": "^7.1.0",
     "oetiker/CanvasCell": "^1.0.4",
-    "oetiker/QxD3": "^0.4.1"
+    "oetiker/QxD3": "^0.4.1",
+    "oposs/qx-iconfont-tabler": "^0.1.0"
   }
 }
diff --git a/frontend/qx-lock.json b/frontend/qx-lock.json
@@ -2,19 +2,19 @@
   "libraries": [
     {
       "library_name": "CanvasCell",
-      "library_version": "1.0.4",
-      "path": "qx_packages/oetiker_CanvasCell_v1_0_4",
+      "library_version": "1.0.5",
+      "path": "qx_packages/oetiker_CanvasCell_v1_0_5",
       "uri": "oetiker/CanvasCell",
       "repo_name": "oetiker/CanvasCell",
-      "repo_tag": "v1.0.4"
+      "repo_tag": "v1.0.5"
     },
     {
       "library_name": "QxD3",
-      "library_version": "0.4.1",
-      "path": "qx_packages/oetiker_QxD3_v0_4_1",
+      "library_version": "0.4.2",
+      "path": "qx_packages/oetiker_QxD3_v0_4_2",
       "uri": "oetiker/QxD3",
       "repo_name": "oetiker/QxD3",
-      "repo_tag": "v0.4.1"
+      "repo_tag": "v0.4.2"
     },
     {
       "library_name": "deprecated.qx.io.remote",
@@ -23,6 +23,14 @@
       "uri": "qooxdoo/deprecated.qx.io.remote",
       "repo_name": "qooxdoo/deprecated.qx.io.remote",
       "repo_tag": "v1.0.2"
+    },
+    {
+      "library_name": "qx-iconfont-tabler",
+      "library_version": "0.1.0",
+      "path": "qx_packages/oposs_qx-iconfont-tabler_0_1_0",
+      "uri": "oposs/qx-iconfont-tabler",
+      "repo_name": "oposs/qx-iconfont-tabler",
+      "repo_tag": "0.1.0"
     }
   ],
   "version": "2.1.0"

diff --git a/frontend/source/class/ep/Application.js b/frontend/source/class/ep/Application.js
@@ -26,7 +26,7 @@ qx.Class.define("ep.Application", {
             this.base(arguments);
             qx.Class.include(qx.ui.treevirtual.TreeVirtual, qx.ui.treevirtual.MNode);
             qx.Class.include(qx.ui.table.Table, qx.ui.table.MTableContextMenu);
-
+            iconfont.tabler.Load;
             // Enable logging in debug variant
             if (qx.core.Environment.get("qx.debug")) {
                 // support native logging capabilities, e.g. Firebug for Firefox

diff --git a/frontend/source/class/ep/theme/Appearance.js b/frontend/source/class/ep/theme/Appearance.js
@@ -16,8 +16,8 @@ qx.Theme.define("ep.theme.Appearance", {
                 return {
                     padding: [0, 8, 2, 10],
                     icon: states.opened
-                        ? "@MaterialIconsSharp/folder_open/22"
-                        : "@MaterialIconsSharp/folder/22",
+                        ? "@TablerIcons/folder/22"
+                        : "@TablerIcons/folder/22",
                     backgroundColor: states.selected
                         ? states.disables
                             ? "primary-disabled"
@@ -26,7 +26,7 @@ qx.Theme.define("ep.theme.Appearance", {
                     textColor: states.selected
                         ? "text-on-primary"
                         : "text-disabled-on-primary",
-                    iconOpened: "@MaterialIconsSharp/folder_open/22",
+                    iconOpened: "@TablerIcons/folder/22",
                     opacity: states.drag ? 0.5 : undefined
                 };
             }
@@ -59,7 +59,7 @@ qx.Theme.define("ep.theme.Appearance", {
                 textColor: "text-primary-on-surface",
                 backgroundColor: "surface",
                 padding: 3,
-                icon: "@MaterialIcons/menu/16"
+                icon: "@TablerIcons/dots-vertical/16"
               };
             }
           },
@@ -68,7 +68,7 @@ qx.Theme.define("ep.theme.Appearance", {
             alias: "menu-button",
             style() {
               return {
-                icon: "@MaterialIcons/sync/16"
+                icon: "@TablerIcons/refresh/16"
               };
             }
           },

diff --git a/frontend/source/class/ep/ui/DashBoard.js b/frontend/source/class/ep/ui/DashBoard.js
@@ -250,7 +250,7 @@ qx.Class.define("ep.ui.DashBoard", {
             var button = this.getChildControl('button');
 
             var menuButton = this._menuButton = new qx.ui.basic.Atom().set({
-                icon   : '@MaterialIcons/menu/16',
+                icon   : '@TablerIcons/dots-vertical/16',
                 show   : 'icon',
                 cursor : 'pointer',
                 visibility: 'excluded'
@@ -285,10 +285,10 @@ qx.Class.define("ep.ui.DashBoard", {
                 backgroundColor: 'rgba(0,0,0,0.4)',
                 visibility: 'excluded'
             });
-            var moveBtn = new qx.ui.basic.Atom(null,"@MaterialIcons/settings/48").set({
+            var moveBtn = new qx.ui.basic.Atom(null,"@TablerIcons/adjustments/48").set({
                 allowGrowY: false
             });
-            var removeBtn = new qx.ui.basic.Atom(null,"@MaterialIcons/delete/48").set({
+            var removeBtn = new qx.ui.basic.Atom(null,"@TablerIcons/trash/48").set({
                 allowGrowY: false
             });
             editBox.add(moveBtn);

diff --git a/frontend/source/class/ep/ui/DashConfig.js b/frontend/source/class/ep/ui/DashConfig.js
@@ -275,8 +275,8 @@ qx.Class.define("ep.ui.DashConfig", {
         },
 
         _addGrowHandles: function(){
-            var right = this._ghRight = this._makeGrowHandle("@MaterialIcons/note_add/32");
-            var bottom = this._ghBottom = this._makeGrowHandle("@MaterialIcons/note_add/32");
+            var right = this._ghRight = this._makeGrowHandle("@TablerIcons/column-insert-right/32");
+            var bottom = this._ghBottom = this._makeGrowHandle("@TablerIcons/row-insert-bottom/32");
             var that = this;
             right.addListener('tap',function(e){
                 that.setMaxX(that.getMaxX()+1);

diff --git a/frontend/source/class/ep/ui/DashServerMenu.js b/frontend/source/class/ep/ui/DashServerMenu.js
@@ -17,17 +17,17 @@ qx.Class.define("ep.ui.DashServerMenu", {
 
     construct : function() {
         this.base(arguments);
-        var plus = new qx.ui.form.MenuButton(null,"@MaterialIcons/add/22",this).set({
+        var plus = new qx.ui.form.MenuButton(null,"@TablerIcons/plus/22",this).set({
             //margin: [4,4,4,4],
             appearance: "menubar-button",
             center: true,
             show: 'icon' 
         });
         this._menuCache = {};
-        this._menuBusy = new qx.ui.menu.Button("Updating Dashlist","@MaterialIcons/sync/16").set({
+        this._menuBusy = new qx.ui.menu.Button("Updating Dashlist","@TablerIcons/refresh/16").set({
             enabled: false
         });
-        this._noDashboards = new qx.ui.menu.Button("No Dashboards found").set({
+        this._noDashboards = new qx.ui.menu.Button("No Dashboards found","@TablerIcons/ban/22").set({
             enabled: false
         });
         this.addListener('changeVisibility',function(e){
@@ -102,13 +102,13 @@ qx.Class.define("ep.ui.DashServerMenu", {
                     }
                     if (!libMenu ){
                         libMenu = new qx.ui.menu.Menu;
-                        libMenuButton = new qx.ui.menu.Button(menu.tr("Library"),null,null,libMenu);
+                        libMenuButton = new qx.ui.menu.Button(menu.tr("Library"),"@TablerIcons/users/22",null,libMenu);
                     }
                     if (!loginMenus[item.login]){
                         loginMenus[item.login] = new qx.ui.menu.Menu;
                         libMenu.add(
                             new qx.ui.menu.Button(
-                                item.login,null, null,loginMenus[item.login]
+                                item.login,"@TablerIcons/user/22", null,loginMenus[item.login]
                             )
                         );
                     }
@@ -137,7 +137,7 @@ qx.Class.define("ep.ui.DashServerMenu", {
         },
         _makeButton: function(menu,item){
             var dashMgr = ep.ui.DashManager.getInstance();
-            var button = new qx.ui.menu.Button(item.lb).set({
+            var button = new qx.ui.menu.Button(item.lb,"@TablerIcons/layout-dashboard/22").set({
                 label: item.lb,
                 enabled: !dashMgr.isBoardOpen(item.id) 
             });

diff --git a/frontend/source/class/ep/ui/LoadingBox.js b/frontend/source/class/ep/ui/LoadingBox.js
@@ -36,7 +36,7 @@ qx.Class.define("ep.ui.LoadingBox", {
 
 
 
-        var loader = this.__loader = new qx.ui.basic.Atom(null, "@MaterialIcons/sync/16").set({
+        var loader = this.__loader = new qx.ui.basic.Atom(null, "@TablerIcons/refresh/16").set({
             visibility      : 'hidden',
             show            : 'icon',
             backgroundColor : '#ffffff',
@@ -53,7 +53,7 @@ qx.Class.define("ep.ui.LoadingBox", {
 
         this._add(loader);
 
-        var noData = this.__noData = new qx.ui.basic.Atom(this.tr("no data available"), "@MaterialIcons/info/64").set({
+        var noData = this.__noData = new qx.ui.basic.Atom(this.tr("no data available"), "@TablerIcons/database-off/64").set({
             visibility      : 'hidden',
             gap             : 20,
             backgroundColor : '#ffffff',

diff --git a/frontend/source/class/ep/ui/MsgBox.js b/frontend/source/class/ep/ui/MsgBox.js
@@ -52,7 +52,7 @@ qx.Class.define("ep.ui.MsgBox", {
 
         var that = this;
 
-        var btn_cnl = this.__mk_btn(this.tr("Cancel"), "@MaterialIcons/cancel/16");
+        var btn_cnl = this.__mk_btn(this.tr("Cancel"), "@TablerIcons/x/16");
         this.__btn_cnl = btn_cnl;
 
         btn_cnl.addListener("execute", function(e) {
@@ -65,7 +65,7 @@ qx.Class.define("ep.ui.MsgBox", {
             btn_cnl.focus();
         }, this);
 
-        var btn_app = this.__mk_btn(this.tr("Apply"), "@MaterialIcons/done/16");
+        var btn_app = this.__mk_btn(this.tr("Apply"), "@TablerIcons/check/16");
         this.__btn_app = btn_app;
 
         btn_app.addListener("execute", function(e) {
@@ -74,7 +74,7 @@ qx.Class.define("ep.ui.MsgBox", {
 
         box.add(btn_app);
 
-        var btn_ok = this.__mk_btn(this.tr("OK"), "@MaterialIcons/done/16");
+        var btn_ok = this.__mk_btn(this.tr("OK"), "@TablerIcons/check/16");
         this.__btn_ok = btn_ok;
 
         btn_ok.addListener("execute", function(e) {
@@ -139,8 +139,8 @@ qx.Class.define("ep.ui.MsgBox", {
          * @return {void} 
          */
         error : function(titel, text) {
-            this.__body.setIcon("@MaterialIcons/error_outline/32");
-            this.setIcon("@MaterialIcons/error_outline/16");
+            this.__body.setIcon("@TablerIcons/alert-triangle/32");
+            this.setIcon("@TablerIcons/alert-triangle/16");
             this.__btn_ok.setVisibility('visible');
             this.__btn_app.setVisibility('excluded');
             this.__btn_cnl.setVisibility('excluded');
@@ -156,8 +156,8 @@ qx.Class.define("ep.ui.MsgBox", {
          * @return {void} 
          */
         exc : function(exc) {
-            this.__body.setIcon("@MaterialIcons/error_outline/32");
-            this.setIcon("@MaterialIcons/error_outline/16");
+            this.__body.setIcon("@TablerIcons/alert-triangle/32");
+            this.setIcon("@TablerIcons/alert-triangle/16");
             this.__btn_ok.setVisibility('visible');
             this.__btn_app.setVisibility('excluded');
             this.__btn_cnl.setVisibility('excluded');
@@ -179,8 +179,8 @@ qx.Class.define("ep.ui.MsgBox", {
          * @return {void} 
          */
         info : function(titel, text) {
-            this.__body.setIcon("@MaterialIcons/info/32");
-            this.setIcon("@MaterialIcons/info/16");
+            this.__body.setIcon("@TablerIcons/info-circle/32");
+            this.setIcon("@TablerIcons/info-circle/16");
             this.__btn_ok.setVisibility('visible');
             this.__btn_app.setVisibility('excluded');
             this.__btn_cnl.setVisibility('excluded');
@@ -198,8 +198,8 @@ qx.Class.define("ep.ui.MsgBox", {
          * @return {void} 
          */
         warn : function(titel, text, exec_action) {
-            this.__body.setIcon("@MaterialIcons/warning_amber/32");
-            this.setIcon("@MaterialIcons/warning_amber/16");
+            this.__body.setIcon("@TablerIcons/traffic-cone/32");
+            this.setIcon("@TablerIcons/traffic-cone/16");
             if (exec_action){
                 this.__btn_ok.setVisibility('excluded');
                 this.__btn_cnl.setVisibility('visible');

diff --git a/frontend/source/class/ep/ui/ShortNote.js b/frontend/source/class/ep/ui/ShortNote.js
@@ -25,7 +25,7 @@ qx.Class.define("ep.ui.ShortNote", {
         this.set({
             zIndex: -10
         });
-        var note = this.__note = new qx.ui.basic.Atom('',"@MaterialIcons/info/16");
+        var note = this.__note = new qx.ui.basic.Atom('',"@TablerIcons/bulb/16");
         note.set({
             textColor : "text-on-secondary",
             backgroundColor : "secondary",

diff --git a/frontend/source/class/ep/ui/TreeView.js b/frontend/source/class/ep/ui/TreeView.js
@@ -125,11 +125,11 @@ qx.Class.define("ep.ui.TreeView", {
                     converter : function(value, model) {
                         if (value == "default") {
                             if (! model.getKids) {
-                                return "@MaterialIconsOutlined/inventory_2/22";
+                                return "@TablerIcons/package/22";
                             }
                         }
                         else {
-                            return "@MaterialIcons/sync/22";
+                            return "@TablerIcons/refresh/22";
                         }
                     }
                 },

diff --git a/frontend/source/class/ep/ui/ViewPage.js b/frontend/source/class/ep/ui/ViewPage.js
@@ -29,7 +29,7 @@ qx.Class.define("ep.ui.ViewPage", {
         var button = this.getChildControl('button');
 
         var menuButton = this._menuButton = new qx.ui.basic.Atom().set({
-            icon   : '@MaterialIcons/menu/16',
+            icon   : '@TablerIcons/dots-vertical/16',
             show   : 'icon',
             cursor : 'pointer',
             visibility: 'excluded'

diff --git a/frontend/source/class/ep/visualizer/AbstractData.js b/frontend/source/class/ep/visualizer/AbstractData.js
@@ -46,9 +46,9 @@ qx.Class.define("ep.visualizer.AbstractData", {
         // create main menu and buttons
         var menu = new qx.ui.menu.Menu();
 
-        var csvButton = new qx.ui.menu.Button(this.tr('Save CSV'), "@MaterialIcons/description/16");
-        var xlsButton = new qx.ui.menu.Button(this.tr('Save Excel 2003 XLS'), "@MaterialIcons/description/16");
-        var xlsxButton = new qx.ui.menu.Button(this.tr('Save Excel 2010 XLSX'), "@MaterialIcons/description/16");
+        var csvButton = new qx.ui.menu.Button(this.tr('Save CSV'), "@TablerIcons/download/16");
+        var xlsButton = new qx.ui.menu.Button(this.tr('Save Excel 2003 XLS'), "@TablerIcons/download/16");
+        var xlsxButton = new qx.ui.menu.Button(this.tr('Save Excel 2010 XLSX'), "@TablerIcons/download/16");
 
         // add execute listeners
         csvButton.addListener("execute", function() {

diff --git a/frontend/source/class/ep/visualizer/Chart.js b/frontend/source/class/ep/visualizer/Chart.js
@@ -104,8 +104,8 @@ qx.Class.define("ep.visualizer.Chart", {
 
         var menu = new qx.ui.menu.Menu();
 
-        var pdfButton = new qx.ui.menu.Button(this.tr('Save PDF'), "@MaterialIcons/save/16");
-        var printButton = this.__printBtn = new qx.ui.menu.Button(this.tr('Print'), "@MaterialIcons/print/16");
+        var pdfButton = new qx.ui.menu.Button(this.tr('Save PDF'), "@TablerIcons/download/16");
+        var printButton = this.__printBtn = new qx.ui.menu.Button(this.tr('Print'), "@TablerIcons/printer/16");
 
         // add execute listeners
         pdfButton.addListener("execute", this._downloadPdf, this);