quarantines: use a check mark for the dark mode filter

...instead of a toggle button. also adjusts the wording and adds a
separator.

Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>

diff --git a/js/AttachmentQuarantine.js b/js/AttachmentQuarantine.js
index 6e9e5463a5cbbf895346655ae58ed34f27e03f1a..52bda4c6668e3da0df93be59e8a2aa4d47bb52c7 100644 (file)
--- a/js/AttachmentQuarantine.js
+++ b/js/AttachmentQuarantine.js
@@ -108,10 +108,14 @@ Ext.define('PMG.AttachmentQuarantine', {
                            iconCls: 'fa fa-file-code-o',
                        },
                        {
-                           xtype: 'button',
-                           reference: 'themeToggle',
-                           text: gettext('Toggle Theme'),
-                           enableToggle: true,
+                           xtype: 'tbseparator',
+                           reference: 'themeCheckSep',
+                       },
+                       {
+                           xtype: 'proxmoxcheckbox',
+                           reference: 'themeCheck',
+                           checked: true,
+                           boxLabel: gettext('Dark-mode filter'),
                            iconCls: 'fa fa-paint-brush',
                        },
                        '->',

diff --git a/js/SpamQuarantine.js b/js/SpamQuarantine.js
index 093413dc0dc332d71a53d7e5df83badec7f0262b..a390dcf7d13fbf67ae106fe1901bab52cc312084 100644 (file)
--- a/js/SpamQuarantine.js
+++ b/js/SpamQuarantine.js
@@ -225,10 +225,14 @@ Ext.define('PMG.SpamQuarantine', {
                            iconCls: 'fa fa-bullhorn',
                        },
                        {
-                           xtype: 'button',
-                           reference: 'themeToggle',
-                           text: gettext('Toggle Theme'),
-                           enableToggle: true,
+                           xtype: 'tbseparator',
+                           reference: 'themeCheckSep',
+                       },
+                       {
+                           xtype: 'proxmoxcheckbox',
+                           reference: 'themeCheck',
+                           checked: true,
+                           boxLabel: gettext('Dark-mode filter'),
                            iconCls: 'fa fa-paint-brush',
                        },
                        '->',

diff --git a/js/VirusQuarantine.js b/js/VirusQuarantine.js
index 08bd7d9edc9138483a8ee6528f9ef03896ae3984..9e5a4fb74c72839616ec4c3e6fd882c328ade007 100644 (file)
--- a/js/VirusQuarantine.js
+++ b/js/VirusQuarantine.js
@@ -121,10 +121,14 @@ Ext.define('PMG.VirusQuarantine', {
                            iconCls: 'fa fa-file-code-o',
                        },
                        {
-                           xtype: 'button',
-                           reference: 'themeToggle',
-                           text: gettext('Toggle Theme'),
-                           enableToggle: true,
+                           xtype: 'tbseparator',
+                           reference: 'themeCheckSep',
+                       },
+                       {
+                           xtype: 'proxmoxcheckbox',
+                           reference: 'themeCheck',
+                           checked: true,
+                           boxLabel: gettext('Dark-mode filter'),
                            iconCls: 'fa fa-paint-brush',
                        },
                        '->',

diff --git a/js/controller/QuarantineController.js b/js/controller/QuarantineController.js
index 3135e2b9d3437736193685952c1d2028f622e4b4..2a24389283811f02a299afa5f7ac1587ab339e4c 100644 (file)
--- a/js/controller/QuarantineController.js
+++ b/js/controller/QuarantineController.js
@@ -46,21 +46,23 @@ Ext.define('PMG.controller.QuarantineController', {
 
     hideThemeToggle: function(argument) {
        let me = this;
-       let themeButton = me.lookup("themeToggle");
+       let themeButton = me.lookup('themeCheck');
        themeButton.disable();
        themeButton.hide();
+       me.lookup('themeCheckSep').hide();
        me.themed = true;
        me.toggleTheme();
     },
 
     showThemeToggle: function(argument) {
        let me = this;
-       let themeButton = me.lookup("themeToggle");
+       let themeButton = me.lookup('themeCheck');
        me.themed = false;
        me.toggleTheme();
-       themeButton.setPressed(true);
+       themeButton.setValue(true);
        themeButton.enable();
        themeButton.show();
+       me.lookup('themeCheckSep').show();
     },
 
     toggleRaw: function(button) {
@@ -226,8 +228,8 @@ Ext.define('PMG.controller.QuarantineController', {
        'button[reference=raw]': {
            click: 'toggleRaw',
        },
-       'button[reference=themeToggle]': {
-           click: 'toggleTheme',
+       'proxmoxcheckbox[reference=themeCheck]': {
+           change: 'toggleTheme',
        },
        'pmgQuarantineList': {
            selectionChange: 'onSelectMail',