From 8647def43c4b205a43410c447ec160d730f9dea1 Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Wed, 23 Nov 2022 14:59:07 +0100 Subject: [PATCH 1/2] dicttoxml -> XMLSerializer --- easyApp/Gui/Components/PreferencesDialog.qml | 2 +- easyApp/Logic/Translate.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/easyApp/Gui/Components/PreferencesDialog.qml b/easyApp/Gui/Components/PreferencesDialog.qml index 34e86ef..7ba5182 100644 --- a/easyApp/Gui/Components/PreferencesDialog.qml +++ b/easyApp/Gui/Components/PreferencesDialog.qml @@ -255,7 +255,7 @@ EaElements.Dialog { id: languageSelector model: XmlListModel { xml: EaGlobals.Variables.translator.languagesAsXml() - query: "/root/item" + query: "/data/item" XmlRole { name: "name" query: "name/string()" diff --git a/easyApp/Logic/Translate.py b/easyApp/Logic/Translate.py index 762f92c..e70af97 100644 --- a/easyApp/Logic/Translate.py +++ b/easyApp/Logic/Translate.py @@ -2,12 +2,11 @@ __version__ = "0.0.1" import os -from dicttoxml import dicttoxml from PySide2.QtCore import QObject, QTranslator, QLocale, Slot from PySide2.QtWidgets import QApplication from PySide2.QtQml import QQmlApplicationEngine - +from easyCore.Utils.io.xml import XMLSerializer class Translator(QObject): def __init__(self, app, engine, translations_path, languages): @@ -56,8 +55,7 @@ def selectLanguage(self, index): @Slot(result=str) def languagesAsXml(self): - xml = dicttoxml(self._languages, attr_type=False) - xml = xml.decode() + xml = XMLSerializer().encode({"item": self._languages}) return xml @Slot(result=int) From 3363aebdcff79ad94e6cf171286969df73196a39 Mon Sep 17 00:00:00 2001 From: Andrew Sazonov Date: Wed, 17 Jul 2024 08:58:02 +0200 Subject: [PATCH 2/2] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1d3c858..da20d98 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ include = ["CHANGELOG.md"] packages = [ { include = "easyApp" } ] [tool.poetry.dependencies] -python = '^3.7.0, <3.10' +python = '^3.7.0, <3.12' dicttoxml = "^1.7.4" requests = "^2.25.1" PySide2 = '^5.15.2'