Bug fixing

* fix bug with invalid applet and configuration load with newest qt * fix bug with invalid DP configuration * fix bug with invalid HTML tags operations
2025-07-13 13:55:50 +00:00 · 2017-06-02 17:33:02 +03:00
parent 934e30819c
commit 737759d03f
13 changed files with 34 additions and 26 deletions
--- a/sources/qml/General.qml
+++ b/sources/qml/General.qml
@ -0,0 +1,158 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+pragma Singleton
+import QtQuick 2.0
+
+
+QtObject {
+    property variant fontWeight: {
+        "light": Font.Light,
+        "normal": Font.Normal,
+        "demibold": Font.DemiBold,
+        "bold": Font.Bold,
+        "black": Font.Black
+    }
+    property variant align: {
+        "left": Text.AlignLeft,
+        "center": Text.AlignHCenter,
+        "right": Text.AlignRight,
+        "justify": Text.AlignJustify
+    }
+    property variant textStyle: {
+        "normal": Text.Normal,
+        "outline": Text.Outline,
+        "raised": Text.Raised,
+        "sunken": Text.Sunken
+    }
+
+    // models
+    property variant awTagRegexp: [
+        {
+            "label": i18n("AC"),
+            "regexp": "^(ac|bat).*"
+        },
+        {
+            "label": i18n("Bars"),
+            "regexp": "^bar.*"
+        },
+        {
+            "label": i18n("CPU"),
+            "regexp": "^(cpu|gpu|la|ps|temp(?!erature)).*"
+        },
+        {
+            "label": i18n("Desktops"),
+            "regexp": "^(n|t)?desktop(s)?"
+        },
+        {
+            "label": i18n("HDD"),
+            "regexp": "^hdd.*"
+        },
+        {
+            "label": i18n("Memory"),
+            "regexp": "^(mem|swap).*"
+        },
+        {
+            "label": i18n("Network"),
+            "regexp": "^(netdev|(down|up(?!time)).*)"
+        },
+        {
+            "label": i18n("Music player"),
+            "regexp": "(^|d|s)(album|artist|duration|progress|title)"
+        },
+        {
+            "label": i18n("Scripts"),
+            "regexp": "^custom.*"
+        },
+        {
+            "label": i18n("Time"),
+            "regexp": ".*time$"
+        },
+        {
+            "label": i18n("Quotes"),
+            "regexp": "^(perc)?(ask|bid|price)(chg)?.*"
+        },
+        {
+            "label": i18n("Upgrades"),
+            "regexp": "^pkgcount.*"
+        },
+        {
+            "label": i18n("Weathers"),
+            "regexp": "^(weather(Id)?|humidity|pressure|temperature|timestamp)"
+        },
+        {
+            "label": i18n("Functions"),
+            "regexp": "functions"
+        }
+    ]
+    property variant dpTagRegexp: [
+        {
+            "label": i18n("All"),
+            "regexp": ".*"
+        }
+    ]
+    property variant fontStyleModel: [
+        {
+            "label": i18n("normal"),
+            "name": "normal"
+        },
+        {
+            "label": i18n("italic"),
+            "name": "italic"
+        }
+    ]
+    property variant fontWeightModel: [
+        {
+            "label": i18n("light"),
+            "name": "light"
+        },
+        {
+            "label": i18n("normal"),
+            "name": "normal"
+        },
+        {
+            "label": i18n("demi bold"),
+            "name": "demibold"
+        },
+        {
+            "label": i18n("bold"),
+            "name": "bold"
+        },
+        {
+            "label": i18n("black"),
+            "name": "black"
+        }
+    ]
+    property variant textStyleModel: [
+        {
+            "label": i18n("normal"),
+            "name": "normal"
+        },
+        {
+            "label": i18n("outline"),
+            "name": "outline"
+        },
+        {
+            "label": i18n("raised"),
+            "name": "raised"
+        },
+        {
+            "label": i18n("sunken"),
+            "name": "sunken"
+        }
+    ]
+}