From 47a9f63d66c00f6cdca6785d2224ffcc565f0efe Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Thu, 20 Oct 2022 01:35:14 +0200 Subject: [PATCH] Adding new category for object properties unpopulated Adding new translations --- LogarithmPlotter/i18n/lp_de.ts | 117 +++++++++++------- LogarithmPlotter/i18n/lp_en.ts | 117 +++++++++++------- LogarithmPlotter/i18n/lp_es.ts | 117 +++++++++++------- LogarithmPlotter/i18n/lp_fr.ts | 117 +++++++++++------- LogarithmPlotter/i18n/lp_hu.ts | 117 +++++++++++------- LogarithmPlotter/i18n/lp_nb_NO.ts | 117 +++++++++++------- LogarithmPlotter/i18n/lp_template.ts | 117 +++++++++++------- .../Setting/ExpressionEditor.qml | 29 +++-- 8 files changed, 547 insertions(+), 301 deletions(-) diff --git a/LogarithmPlotter/i18n/lp_de.ts b/LogarithmPlotter/i18n/lp_de.ts index 6883254..0beb08c 100644 --- a/LogarithmPlotter/i18n/lp_de.ts +++ b/LogarithmPlotter/i18n/lp_de.ts @@ -169,8 +169,8 @@ CustomPropertyList - - + + + Create new %1 + Neues %1objekt erstellen @@ -178,42 +178,42 @@ Dialog - + Edit properties of %1 %2 Eigenschaften von %1 %2 bearbeiten - + LogarithmPlotter - Invalid object name LogarithmPlotter - Ungültiger Objektname - + An object with the name '%1' already exists. Ein Objekt mit dem Namen '%1' existiert bereits. - + Name Name - + Label content Etikett - + null leer - + name Name - + name + value Name + Wert @@ -249,6 +249,39 @@ + Neues %1objekt erstellen + + ExpressionEditor + + + Object Properties + + + + + Variables + + + + + Constants + + + + + Functions + Funktionen + + + + Executable Objects + + + + + Objects + Objekte + + FileDialog @@ -734,7 +767,7 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" - + %1: @@ -762,12 +795,12 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" editproperty - + %1 of %2 %3 changed from "%4" to "%5". %1 von %2 %3 wurde von "%4" auf "%5" geändert. - + %1 of %2 changed from %3 to %4. %1 von %2 wurde von %3 auf %4 geändert. @@ -900,17 +933,17 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" Ende des Ausdrucks - + No object found with names %1. Kein Objekt mit Namen %1 gefunden. - + No object found with name %1. Kein Objekt mit dem Namen %1 gefunden. - + Object cannot be dependent on itself. Ein Objekt kann nicht von sich selbst abhängen. @@ -918,12 +951,12 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" expression - + LogarithmPlotter - Parsing error LogarithmPlotter - Analysefehler - + Error while parsing expression for property %1: %2 @@ -1052,114 +1085,114 @@ Bitte vergewissern Sie sich, dass Ihre LaTeX-Installation korrekt ist, und melde parameters - + above ↑ Über - + below ↓ Unter - - + + left ← Links - - + + right → Rechts - + above-left ↖ Oben links - + above-right ↗ Oben rechts - + below-left ↙ Unten links - + below-right ↘ Unten rechts - + center >|< Zentrum - + top ↑ Über - + bottom ↓ Unter - + top-left ↖ Oben links - + top-right ↗ Oben rechts - + bottom-left ↙ Unten links - + bottom-right ↘ Unten rechts - + application Anwendung - + function Funktion - + high Hoch - + low Tief - + Next to target Neben dem Ziel - + With label Mit Etikett - + Hidden Versteckt diff --git a/LogarithmPlotter/i18n/lp_en.ts b/LogarithmPlotter/i18n/lp_en.ts index e78a4a5..16cb0e7 100644 --- a/LogarithmPlotter/i18n/lp_en.ts +++ b/LogarithmPlotter/i18n/lp_en.ts @@ -169,8 +169,8 @@ CustomPropertyList - - + + + Create new %1 + Create new %1 @@ -178,42 +178,42 @@ Dialog - + Edit properties of %1 %2 Edit properties of %1 %2 - + LogarithmPlotter - Invalid object name LogarithmPlotter - Invalid object name - + An object with the name '%1' already exists. An object with the name '%1' already exists. - + Name Name - + Label content Label content - + null null - + name name - + name + value name + value @@ -249,6 +249,39 @@ + Create new %1 + + ExpressionEditor + + + Object Properties + + + + + Variables + + + + + Constants + + + + + Functions + Functions + + + + Executable Objects + + + + + Objects + Objects + + FileDialog @@ -734,7 +767,7 @@ These settings can be changed at any time from the "Settings" menu. - + %1: @@ -762,12 +795,12 @@ These settings can be changed at any time from the "Settings" menu. editproperty - + %1 of %2 %3 changed from "%4" to "%5". %1 of %2 %3 changed from "%4" to "%5". - + %1 of %2 changed from %3 to %4. %1 of %2 changed from %3 to %4. @@ -900,17 +933,17 @@ These settings can be changed at any time from the "Settings" menu.End of expression - + No object found with names %1. No object found with names %1. - + No object found with name %1. No object found with name %1. - + Object cannot be dependent on itself. Object cannot be dependent on itself. @@ -918,12 +951,12 @@ These settings can be changed at any time from the "Settings" menu. expression - + LogarithmPlotter - Parsing error LogarithmPlotter - Parsing error - + Error while parsing expression for property %1: %2 @@ -1052,114 +1085,114 @@ Please make sure your LaTeX installation is correct and report a bug if so. parameters - + above ↑ Above - + below ↓ Below - - + + left ← Left - - + + right → Right - + above-left ↖ Above left - + above-right ↗ Above right - + below-left ↙ Below left - + below-right ↘ Below right - + center >|< Center - + top ↑ Top - + bottom ↓ Bottom - + top-left ↖ Top left - + top-right ↗ Top right - + bottom-left ↙ Bottom left - + bottom-right ↘ Bottom right - + application Application - + function Function - + high High - + low Low - + Next to target Next to target - + With label With label - + Hidden Hidden diff --git a/LogarithmPlotter/i18n/lp_es.ts b/LogarithmPlotter/i18n/lp_es.ts index dfaf15b..992dd8c 100644 --- a/LogarithmPlotter/i18n/lp_es.ts +++ b/LogarithmPlotter/i18n/lp_es.ts @@ -169,8 +169,8 @@ CustomPropertyList - - + + + Create new %1 @@ -178,46 +178,79 @@ Dialog - + Edit properties of %1 %2 - + LogarithmPlotter - Invalid object name - + An object with the name '%1' already exists. - + Name - + Label content - + null - + name - + name + value + + ExpressionEditor + + + Object Properties + + + + + Variables + + + + + Constants + + + + + Functions + + + + + Executable Objects + + + + + Objects + + + FileDialog @@ -682,7 +715,7 @@ These settings can be changed at any time from the "Settings" menu. - + %1: @@ -710,12 +743,12 @@ These settings can be changed at any time from the "Settings" menu. editproperty - + %1 of %2 %3 changed from "%4" to "%5". - + %1 of %2 changed from %3 to %4. @@ -848,17 +881,17 @@ These settings can be changed at any time from the "Settings" menu. - + No object found with names %1. - + No object found with name %1. - + Object cannot be dependent on itself. @@ -866,12 +899,12 @@ These settings can be changed at any time from the "Settings" menu. expression - + LogarithmPlotter - Parsing error - + Error while parsing expression for property %1: %2 @@ -961,114 +994,114 @@ Please make sure your latex installation is correct and report a bug if so. parameters - + above - + below - - + + left - - + + right - + above-left - + above-right - + below-left - + below-right - + center - + top - + bottom - + top-left - + top-right - + bottom-left - + bottom-right - + application - + function - + high - + low - + Next to target - + With label - + Hidden diff --git a/LogarithmPlotter/i18n/lp_fr.ts b/LogarithmPlotter/i18n/lp_fr.ts index c6dbf1f..6e84cc6 100644 --- a/LogarithmPlotter/i18n/lp_fr.ts +++ b/LogarithmPlotter/i18n/lp_fr.ts @@ -170,8 +170,8 @@ CustomPropertyList - - + + + Create new %1 + Créer un nouvel objet %1 @@ -179,42 +179,42 @@ Dialog - + Edit properties of %1 %2 Changer les propriétés de %1 %2 - + LogarithmPlotter - Invalid object name LogarithmPlotter - Nom d'objet invalide - + An object with the name '%1' already exists. Un objet portant le nom '%1' existe déjà. - + Name Nom - + Label content Étiquette - + null vide - + name nom - + name + value nom + valeur @@ -251,6 +251,39 @@ + Créer un nouvel objet %1 + + ExpressionEditor + + + Object Properties + + + + + Variables + + + + + Constants + + + + + Functions + Fonctions + + + + Executable Objects + + + + + Objects + Objets + + FileDialog @@ -743,7 +776,7 @@ These settings can always be changed at any time from the "Settings" m - + %1: @@ -771,12 +804,12 @@ These settings can always be changed at any time from the "Settings" m editproperty - + %1 of %2 %3 changed from "%4" to "%5". %1 de %2 %3 modifiée de "%4" à "%5". - + %1 of %2 changed from %3 to %4. %1 de %2 modifiée de %3 à %4. @@ -909,17 +942,17 @@ These settings can always be changed at any time from the "Settings" m Fin de la formule - + No object found with names %1. Aucun objet trouvé ayant pour noms %1. - + No object found with name %1. Aucun objet avec le nom %1 n'a été trouvé. - + Object cannot be dependent on itself. Un objet ne peut pas dépendre de lui-même. @@ -927,12 +960,12 @@ These settings can always be changed at any time from the "Settings" m expression - + LogarithmPlotter - Parsing error LogarithmPlotter - Erreur de syntaxe - + Error while parsing expression for property %1: %2 @@ -1061,114 +1094,114 @@ Vérifiez que votre installation de LaTeX est correcte et signalez un bogue si c parameters - + above ↑ Au dessus - + below ↓ En dessous - - + + left ← À gauche - - + + right → À droite - + above-left ↖ Au dessus à gauche - + above-right ↗ Au dessus à droite - + below-left ↙ En dessous à gauche - + below-right ↘ En dessous à droite - + center >|< Centré - + top ↑ Au dessus - + bottom ↓ En dessous - + top-left ↖ Au dessus à gauche - + top-right ↗ Au dessus à droite - + bottom-left ↙ En dessous à gauche - + bottom-right ↘ En dessous à droite - + application Application - + function Fonction - + high Haut - + low Bas - + Next to target A côté de la cible - + With label Avec l'étiquette - + Hidden Caché diff --git a/LogarithmPlotter/i18n/lp_hu.ts b/LogarithmPlotter/i18n/lp_hu.ts index a2c2163..45bcef3 100644 --- a/LogarithmPlotter/i18n/lp_hu.ts +++ b/LogarithmPlotter/i18n/lp_hu.ts @@ -169,8 +169,8 @@ CustomPropertyList - - + + + Create new %1 + Új %1 létrehozása @@ -178,42 +178,42 @@ Dialog - + Edit properties of %1 %2 %1 %2 tulajdonságainak szerkesztése - + LogarithmPlotter - Invalid object name - + An object with the name '%1' already exists. - + Name Név - + Label content Címke tartalom - + null üres - + name név - + name + value név + érték @@ -249,6 +249,39 @@ + Új %1 létrehozása + + ExpressionEditor + + + Object Properties + + + + + Variables + + + + + Constants + + + + + Functions + Függvények + + + + Executable Objects + + + + + Objects + Tárgyak + + FileDialog @@ -734,7 +767,7 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. - + %1: @@ -762,12 +795,12 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. editproperty - + %1 of %2 %3 changed from "%4" to "%5". %1/%2 %3 megváltozott. Régi érték: %4, új érték: %5. - + %1 of %2 changed from %3 to %4. %1/%2 megváltozott. Régi érték: %3, új érték: %4. @@ -900,17 +933,17 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. - + No object found with names %1. - + No object found with name %1. - + Object cannot be dependent on itself. @@ -918,12 +951,12 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. expression - + LogarithmPlotter - Parsing error - + Error while parsing expression for property %1: %2 @@ -1045,114 +1078,114 @@ Kérjük, ellenőrizze, hogy a LaTeX telepítése helyes-e, és ha igen, jelents parameters - + above ↑ Felett - + below ↓ Alatt - - + + left ← Balra - - + + right → Jobbra - + above-left ↖ Felett, balra - + above-right ↗ Felett, jobbra - + below-left ↙ Alatt, balra - + below-right ↘ Alatt, jobbra - + center >|< Középre - + top ↑ Felső - + bottom ↓ Alsó - + top-left ↖ Bal felső - + top-right ↗ Jobb felső - + bottom-left ↙ Bal alsó - + bottom-right ↘ Jobb alsó - + application Alkalmazás - + function Függvény - + high Magas - + low Alul - + Next to target Cél mellé - + With label Címkével - + Hidden Rejtett diff --git a/LogarithmPlotter/i18n/lp_nb_NO.ts b/LogarithmPlotter/i18n/lp_nb_NO.ts index dfdfd34..d1becca 100644 --- a/LogarithmPlotter/i18n/lp_nb_NO.ts +++ b/LogarithmPlotter/i18n/lp_nb_NO.ts @@ -169,8 +169,8 @@ CustomPropertyList - - + + + Create new %1 + Opprett nytt %1 @@ -178,42 +178,42 @@ Dialog - + Edit properties of %1 %2 Rediger egenskaper for %1 %2 - + LogarithmPlotter - Invalid object name - + An object with the name '%1' already exists. - + Name Navn - + Label content Etikett-innhold - + null NULL - + name navn - + name + value navn + veri @@ -249,6 +249,39 @@ + Opprett nytt %1 + + ExpressionEditor + + + Object Properties + + + + + Variables + + + + + Constants + + + + + Functions + Funksjoner + + + + Executable Objects + + + + + Objects + Objekter + + FileDialog @@ -734,7 +767,7 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. - + %1: @@ -762,12 +795,12 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. editproperty - + %1 of %2 %3 changed from "%4" to "%5". %1 av %2 %3 endret fra «%4» til «%5». - + %1 of %2 changed from %3 to %4. @@ -900,17 +933,17 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. - + No object found with names %1. - + No object found with name %1. - + Object cannot be dependent on itself. @@ -918,12 +951,12 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. expression - + LogarithmPlotter - Parsing error - + Error while parsing expression for property %1: %2 @@ -1036,114 +1069,114 @@ Please make sure your latex installation is correct and report a bug if so. parameters - + above - + below - - + + left - - + + right - + above-left - + above-right - + below-left - + below-right - + center - + top - + bottom - + top-left - + top-right - + bottom-left - + bottom-right - + application - + function - + high - + low - + Next to target - + With label - + Hidden diff --git a/LogarithmPlotter/i18n/lp_template.ts b/LogarithmPlotter/i18n/lp_template.ts index f525586..377be41 100644 --- a/LogarithmPlotter/i18n/lp_template.ts +++ b/LogarithmPlotter/i18n/lp_template.ts @@ -169,8 +169,8 @@ CustomPropertyList - - + + + Create new %1 @@ -178,46 +178,79 @@ Dialog - + Edit properties of %1 %2 - + LogarithmPlotter - Invalid object name - + An object with the name '%1' already exists. - + Name - + Label content - + null - + name - + name + value + + ExpressionEditor + + + Object Properties + + + + + Variables + + + + + Constants + + + + + Functions + + + + + Executable Objects + + + + + Objects + + + FileDialog @@ -682,7 +715,7 @@ These settings can be changed at any time from the "Settings" menu. - + %1: @@ -710,12 +743,12 @@ These settings can be changed at any time from the "Settings" menu. editproperty - + %1 of %2 %3 changed from "%4" to "%5". - + %1 of %2 changed from %3 to %4. @@ -848,17 +881,17 @@ These settings can be changed at any time from the "Settings" menu. - + No object found with names %1. - + No object found with name %1. - + Object cannot be dependent on itself. @@ -866,12 +899,12 @@ These settings can be changed at any time from the "Settings" menu. expression - + LogarithmPlotter - Parsing error - + Error while parsing expression for property %1: %2 @@ -961,114 +994,114 @@ Please make sure your latex installation is correct and report a bug if so. parameters - + above - + below - - + + left - - + + right - + above-left - + above-right - + below-left - + below-right - + center - + top - + bottom - + top-left - + top-right - + bottom-left - + bottom-right - + application - + function - + high - + low - + Next to target - + With label - + Hidden diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml index c7b86c1..578ac20 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml @@ -255,8 +255,8 @@ Item { visible: currentToken != null && identifierTokenTypes.includes(currentToken.type) // Focus handling. - readonly property var lists: [variablesList, constantsList, functionsList, executableObjectsList, objectsList] - readonly property int itemCount: variablesList.model.length, constantsList.model.length + functionsList.model.length + executableObjectsList.model.length + objectsList.model.length + readonly property var lists: [objectPropertiesList, variablesList, constantsList, functionsList, executableObjectsList, objectsList] + readonly property int itemCount: objectPropertiesList.model.length + variablesList.model.length, constantsList.model.length + functionsList.model.length + executableObjectsList.model.length + objectsList.model.length property int itemSelected: 0 /*! @@ -286,11 +286,26 @@ Item { editor.cursorPosition = startPos+autotext.autocomplete.length+autotext.cursorFinalOffset } + AutocompletionCategory { + id: objectPropertiesList + + category: qsTr("Object Properties") + itemStartIndex: 0 + itemSelected: parent.itemSelected + categoryItems: [] + property var objectName: null + autocompleteGenerator: (item) => {return { + 'text': item, 'annotation': Objects.currentObjectsByName[objectName].constructor.properties()[item], + 'autocomplete': item + " ", 'cursorFinalOffset': 0 + }} + baseText: parent.visible ? parent.currentToken.value : "" + } + AutocompletionCategory { id: variablesList category: qsTr("Variables") - itemStartIndex: 0 + itemStartIndex: objectPropertiesList.model.length itemSelected: parent.itemSelected categoryItems: control.variables autocompleteGenerator: (item) => {return { @@ -304,7 +319,7 @@ Item { id: constantsList category: qsTr("Constants") - itemStartIndex: variablesList.model.length + itemStartIndex: variablesList.itemStartIndex + variablesList.model.length itemSelected: parent.itemSelected categoryItems: Parsing.CONSTANTS_LIST autocompleteGenerator: (item) => {return { @@ -318,7 +333,7 @@ Item { id: functionsList category: qsTr("Functions") - itemStartIndex: variablesList.model.length + constantsList.model.length + itemStartIndex: constantsList.itemStartIndex + constantsList.model.length itemSelected: parent.itemSelected categoryItems: Parsing.FUNCTIONS_LIST autocompleteGenerator: (item) => {return { @@ -332,7 +347,7 @@ Item { id: executableObjectsList category: qsTr("Executable Objects") - itemStartIndex: variablesList.model.length + constantsList.model.length + functionsList.model.length + itemStartIndex: functionsList.itemStartIndex + functionsList.model.length itemSelected: parent.itemSelected categoryItems: Objects.getObjectsName("ExecutableObject").filter(obj => obj != self) autocompleteGenerator: (item) => {return { @@ -346,7 +361,7 @@ Item { id: objectsList category: qsTr("Objects") - itemStartIndex: executableObjectsList.model.length + variablesList.model.length + constantsList.model.length + functionsList.model.length + itemStartIndex: executableObjectsList.itemStartIndex + executableObjectsList.model.length itemSelected: parent.itemSelected categoryItems: Object.keys(Objects.currentObjectsByName).filter(obj => obj != self) autocompleteGenerator: (item) => {return {