Compare commits

...

18 Commits

Author SHA1 Message Date
Laurent Trinques e053acb065 Add binary pt_BR translation 2025-01-03 06:50:24 +01:00
Laurent Trinques b5d57086bc Merge pull request #322 from gleissonjoaquim3/master
PT-BR language update
2025-01-03 06:05:12 +01:00
gleissonjoaquim3 b456bedaa3 lang/qet_pt_BR.ts
PT-BR language update
2025-01-03 01:33:13 -03:00
Laurent Trinques db18095cfb Merge pull request #319 from ChuckNr11/master
Change Sorting of ElementInfo ComboBox
2025-01-01 09:01:48 +01:00
Achim 3438ba9ab3 composite text of report element corrected
In the ElementEditor, incorrect variables were displayed for
CompositeText in ReportElements.  This is corrected here
2024-12-31 21:58:42 +01:00
Laurent Trinques 1078496bb1 Merge pull request #320 from plc-user/master
Fix: Only scroll diagram-view, when moved text leaves visible area
2024-12-31 16:04:26 +01:00
plc-user 711353bb58 Fix whitespace 2024-12-31 16:01:47 +01:00
plc-user dd7955e50e Fix: Only scroll diagram-view, when moved text leaves visible area 2024-12-31 15:52:17 +01:00
Achim 7a617e72bd a few small corrections 2024-12-31 08:40:56 +01:00
Achim e73aa3b84d ComboBox change sorting
alphabetical sorting in the ComboBox changed according to the order in
the elementInfoKeys list
2024-12-31 08:40:03 +01:00
Achim 8e0c3f4252 german language file adapted 2024-12-31 08:32:41 +01:00
Laurent Trinques 27474b0822 Refresh translation binary 2024-12-27 15:00:44 +01:00
Laurent Trinques d6dcc85157 Update qet_be.ts 2024-12-27 14:59:06 +01:00
Laurent Trinques b2dc6ba738 Add be-nl translation, thanks Ronny 2024-12-27 14:16:31 +01:00
Laurent Trinques 31ed09f185 Revert "Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/"
This reverts commit 3992c60c45.
2024-12-22 16:17:32 +01:00
Laurent Trinques 3992c60c45 Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/
pull/314
2024-12-22 14:25:30 +01:00
Laurent Trinques fef351df8b Typo 2024-12-22 08:44:19 +01:00
Laurent Trinques fa322af060 Merge pull request #317 from qelectrotech/revert-314-master
Revert "ElementEditor elmt_info_cb sorting changed"
2024-12-21 13:22:10 +01:00
14 changed files with 626 additions and 580 deletions
BIN
View File
Binary file not shown.
+403 -375
View File
File diff suppressed because it is too large Load Diff
+35 -35
View File
@@ -9056,47 +9056,47 @@ Möchten Sie sie ersetzen?</translation>
<message>
<location filename="../sources/qetinformation.cpp" line="272"/>
<source>Bloc auxiliaire 1</source>
<translation>Zusatzinfo 1</translation>
<translation>Zusatzinfo Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="273"/>
<source>Description textuelle auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Artikelbeschreibung Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="274"/>
<source>Numéro d&apos;article auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Artikelnummer Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="275"/>
<source>Fabricant auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Hersteller Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="276"/>
<source>Numéro de commande auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Bestellnummer Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="277"/>
<source>Numéro interne auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Interne Nummer Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="278"/>
<source>Fournisseur auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Lieferant Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="279"/>
<source>Quantité auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Menge Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="280"/>
<source>Unité auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Einheit Zusatzartikel 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="281"/>
@@ -9106,132 +9106,132 @@ Möchten Sie sie ersetzen?</translation>
<message>
<location filename="../sources/qetinformation.cpp" line="282"/>
<source>Description textuelle auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Artikelbeschreibung Zusatzartikel 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="283"/>
<source>Numéro d&apos;article auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Artikelnummer Zusatzartikel 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="284"/>
<source>Fabricant auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Hersteller Zusatzartikel 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="285"/>
<source>Numéro de commande auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Bestellnummer Zusatzartikel 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="286"/>
<source>Numéro interne auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Interne Nummer Zusatzartikel 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="287"/>
<source>Fournisseur auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Lieferant Zusatzartikel 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="288"/>
<source>Quantité auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Menge Zusatzartikel 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="289"/>
<source>Unité auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Einheit Zusatzartikel 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="290"/>
<source>Bloc auxiliaire 3</source>
<translation type="unfinished">Zusatzinfo 3</translation>
<translation type="unfinished">Zusatzinfo Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="291"/>
<source>Description textuelle auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Artikelbeschreibung Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="292"/>
<source>Numéro d&apos;article auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Artikelnummer Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="293"/>
<source>Fabricant auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Hersteller Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="294"/>
<source>Numéro de commande auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Bestellnummer Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="295"/>
<source>Numéro interne auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Interne Nummer Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="296"/>
<source>Fournisseur auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Lieferant Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="297"/>
<source>Quantité auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Menge Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="298"/>
<source>Unité auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Einheit Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="299"/>
<source>Bloc auxiliaire 4</source>
<translation type="unfinished">Zusatzinfo 4</translation>
<translation type="unfinished">Zusatzinfo Zusatzartikel 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="300"/>
<source>Description textuelle auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Artikelbeschreibung Zusatzartikel 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="301"/>
<source>Numéro d&apos;article auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Artikelnummer Zusatzartikel 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="302"/>
<source>Fabricant auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Hersteller Zusatzartikel 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="303"/>
<source>Numéro de commande auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Bestellnummer Zusatzartikel 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="304"/>
<source>Numéro interne auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Interne Nummer Zusatzartikel 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="305"/>
<source>Fournisseur auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Lieferant Zusatzartikel 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="306"/>
<source>Quantité auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Menge Zusatzartikel 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="307"/>
<source>Unité auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Einheit Zusatzartikel 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="257"/>
BIN
View File
Binary file not shown.
+127 -106
View File
@@ -1056,7 +1056,7 @@ Nota: Estas opções NÃO permitem ou bloqueiam a autonumeração, apenas a sua
<message>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="496"/>
<source>Couleur secondaire :</source>
<translation>Cor secundária: </translation>
<translation>Cor secundária :</translation>
</message>
<message>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="518"/>
@@ -2568,17 +2568,17 @@ Todos os elementos e as sub pastas contidas nesta pasta serão excluídos.</tran
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="600"/>
<source>Le dossier</source>
<translation type="unfinished"></translation>
<translation>O arquivo</translation>
</message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="601"/>
<source>contient</source>
<translation type="unfinished"></translation>
<translation>contém</translation>
</message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="602"/>
<source>éléments</source>
<translation type="unfinished"></translation>
<translation>elementos</translation>
</message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="605"/>
@@ -2658,13 +2658,13 @@ Todos os elementos e as sub pastas contidas nesta pasta serão excluídos.</tran
<location filename="../sources/elementspanel.cpp" line="239"/>
<source>Double-cliquez pour réduire ou développer la collection company de cartouches</source>
<comment>Status tip</comment>
<translation type="unfinished"></translation>
<translation>Clique em ambos os lados para recolher ou expandir a coleção de blocos da empresa</translation>
</message>
<message>
<location filename="../sources/elementspanel.cpp" line="240"/>
<source>Ceci est la collection company de cartouches -- utilisez-la pour créer, stocker et éditer vos propres cartouches.</source>
<comment>&quot;What&apos;s this&quot; tip</comment>
<translation type="unfinished"></translation>
<translation>Esta é a coleção de blocos da empresa use para criar, armazenar e editar seus próprios blocos.</translation>
</message>
<message>
<location filename="../sources/elementspanel.cpp" line="247"/>
@@ -3383,17 +3383,17 @@ que você cria. Entradas de texto e números
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="227"/>
<source>Répertoire de la collection commune</source>
<translation>Pasta de coleção padrão</translation>
<translation>Local da coleção padrão</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="290"/>
<source>Répertoire de la collection utilisateur</source>
<translation>Pasta de coleção do usuário</translation>
<translation>Local da coleção do usuário</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="311"/>
<source>Répertoire des cartouches utilisateur</source>
<translation>Pasta de armazenamento do usuário</translation>
<translation>Local do armazenamento do usuário</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="342"/>
@@ -3460,17 +3460,17 @@ Aqui você pode especificar o valor padrão deste campo para os elementos que vo
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="248"/>
<source>Répertoire de la collection company</source>
<translation type="unfinished"></translation>
<translation>Local da coleção da empresa</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="269"/>
<source>Répertoire des cartouches company</source>
<translation type="unfinished"></translation>
<translation>Local dos blocos da empresa</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="386"/>
<source>Langues</source>
<translation>Línguas</translation>
<translation>Idioma</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="429"/>
@@ -3554,12 +3554,12 @@ Aqui você pode especificar o valor padrão deste campo para os elementos que vo
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="888"/>
<source>Editor</source>
<translation type="unfinished"></translation>
<translation>Editor</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="896"/>
<source>Max. parts in Element Editor List</source>
<translation type="unfinished"></translation>
<translation>Máx. de peças na lista do editor de elementos</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="45"/>
@@ -3725,17 +3725,17 @@ Aqui você pode especificar o valor padrão deste campo para os elementos que vo
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="376"/>
<source>Chinois</source>
<translation type="unfinished"></translation>
<translation>Chinês</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="453"/>
<source>Chemin de la collection company</source>
<translation type="unfinished"></translation>
<translation>Caminho da coleção da empresa</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="481"/>
<source>Chemin des cartouches company</source>
<translation type="unfinished"></translation>
<translation>Caminho dos blocos da empresa</translation>
</message>
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="495"/>
@@ -3745,7 +3745,7 @@ Aqui você pode especificar o valor padrão deste campo para os elementos que vo
<message>
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="524"/>
<source>To high values might lead to crashes of the application.</source>
<translation type="unfinished"></translation>
<translation>Valores altos podem causar travamentos do aplicativo.</translation>
</message>
</context>
<context>
@@ -5644,13 +5644,13 @@ Você deseja salvar as alterações?</translation>
<location filename="../sources/qetapp.cpp" line="457"/>
<source>Cartouches company</source>
<comment>title of the company&apos;s title block templates collection</comment>
<translation type="unfinished"></translation>
<translation>Blocos de elementos da empresa</translation>
</message>
<message>
<location filename="../sources/qetapp.cpp" line="477"/>
<source>Cartouches utilisateur</source>
<comment>title of the user&apos;s title block templates collection</comment>
<translation>Blocos de legenda do usuário</translation>
<translation>Blocos de elementos do usuário</translation>
</message>
<message>
<location filename="../sources/qetapp.cpp" line="1351"/>
@@ -5818,7 +5818,7 @@ Você deseja salvar as alterações?</translation>
<message>
<location filename="../sources/qetapp.cpp" line="2428"/>
<source>Usage : </source>
<translation>Utilização:</translation>
<translation>Utilização : </translation>
</message>
<message>
<location filename="../sources/qetapp.cpp" line="2430"/>
@@ -6176,7 +6176,7 @@ Opções disponíveis:
<message>
<location filename="../sources/qetdiagrameditor.cpp" line="551"/>
<source>Ctrl+Shift+S</source>
<translation type="unfinished">Ctrl+Shift+S</translation>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
<location filename="../sources/qetdiagrameditor.cpp" line="553"/>
@@ -6895,12 +6895,12 @@ Opções disponíveis:
<message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="277"/>
<source>&amp;Fermer cet éditeur</source>
<translation type="unfinished"></translation>
<translation>&amp;Fechar este editor</translation>
</message>
<message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="280"/>
<source>Fermer cet éditeur</source>
<translation type="unfinished"></translation>
<translation>Fechar este editor</translation>
</message>
<message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="289"/>
@@ -7005,7 +7005,7 @@ Opções disponíveis:
<message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="514"/>
<source>importer un élément à redimensionner</source>
<translation type="unfinished"></translation>
<translation>Importar um elemento para redimensionar</translation>
</message>
<message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="352"/>
@@ -7358,7 +7358,7 @@ Opções disponíveis:
<message>
<location filename="../sources/editor/ui/qetelementeditor.cpp" line="983"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
<translation>Ctrl+W</translation>
</message>
<message>
<location filename="../sources/editor/ui/qetelementeditor.cpp" line="1033"/>
@@ -7385,12 +7385,12 @@ aguarde enquanto importa...</translation>
<message>
<location filename="../sources/editor/ui/qetelementeditor.cpp" line="1500"/>
<source>Importer un élément à redimensionner</source>
<translation type="unfinished"></translation>
<translation>Importar um elemento para redimensionar</translation>
</message>
<message>
<location filename="../sources/editor/ui/qetelementeditor.cpp" line="1502"/>
<source>Éléments QElectroTech (*.elmt)</source>
<translation type="unfinished">Elementos QElectroTech (*.elmt)</translation>
<translation>Elementos QElectroTech (*.elmt)</translation>
</message>
<message numerus="yes">
<location filename="../sources/editor/ui/qetelementeditor.cpp" line="786"/>
@@ -8514,8 +8514,8 @@ O que você deseja fazer?</translation>
<source>%n plan de bornes</source>
<comment>part of a sentence listing the content of a diagram</comment>
<translation>
<numerusform>%n plano de terminais</numerusform>
<numerusform></numerusform>
<numerusform>%n Planejador de terminais</numerusform>
<numerusform>%n Planejador de terminais</numerusform>
</translation>
</message>
<message>
@@ -8788,7 +8788,7 @@ O que você deseja fazer?</translation>
<message>
<location filename="../sources/ElementsCollection/fileelementcollectionitem.cpp" line="126"/>
<source>Collection Company</source>
<translation type="unfinished"></translation>
<translation>Coleção da empresa</translation>
</message>
<message>
<location filename="../sources/ElementsCollection/fileelementcollectionitem.cpp" line="128"/>
@@ -9065,42 +9065,42 @@ Deseja substituí-lo?</translation>
<message>
<location filename="../sources/qetinformation.cpp" line="273"/>
<source>Description textuelle auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Descrição do texto auxiliar 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="274"/>
<source>Numéro d&apos;article auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Item auxiliar número 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="275"/>
<source>Fabricant auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Fabricante auxiliar 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="276"/>
<source>Numéro de commande auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Comando auxiliar número 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="277"/>
<source>Numéro interne auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Código interno auxiliar 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="278"/>
<source>Fournisseur auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Fornecedor Auxiliar 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="279"/>
<source>Quantité auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Quantidade auxiliar 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="280"/>
<source>Unité auxiliaire 1</source>
<translation type="unfinished"></translation>
<translation>Unidade auxiliar 1</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="281"/>
@@ -9110,132 +9110,132 @@ Deseja substituí-lo?</translation>
<message>
<location filename="../sources/qetinformation.cpp" line="282"/>
<source>Description textuelle auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation>Descrição do texto auxiliar 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="283"/>
<source>Numéro d&apos;article auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation>Item auxiliar número 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="284"/>
<source>Fabricant auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation>Fabricante auxiliar 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="285"/>
<source>Numéro de commande auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation>Comando auxiliar número 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="286"/>
<source>Numéro interne auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation>Código interno auxiliar 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="287"/>
<source>Fournisseur auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation>Fornecedor Auxiliar 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="288"/>
<source>Quantité auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation>Quantidade auxiliar 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="289"/>
<source>Unité auxiliaire 2</source>
<translation type="unfinished"></translation>
<translation>Unidade auxiliar 2</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="290"/>
<source>Bloc auxiliaire 3</source>
<translation type="unfinished">Bloco auxiliar 3</translation>
<translation>Bloco auxiliar 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="291"/>
<source>Description textuelle auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation>Descrição do texto auxiliar 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="292"/>
<source>Numéro d&apos;article auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation>Item auxiliar número 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="293"/>
<source>Fabricant auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation>Fabricante auxiliar 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="294"/>
<source>Numéro de commande auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation>Comando auxiliar número 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="295"/>
<source>Numéro interne auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation>Número interno auxiliar 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="296"/>
<source>Fournisseur auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation>Fornecedor Auxiliar 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="297"/>
<source>Quantité auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation>Quantidade auxiliar 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="298"/>
<source>Unité auxiliaire 3</source>
<translation type="unfinished"></translation>
<translation>Unidade auxiliar 3</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="299"/>
<source>Bloc auxiliaire 4</source>
<translation type="unfinished">Bloco auxiliar 4</translation>
<translation>Bloco auxiliar 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="300"/>
<source>Description textuelle auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation>Descrição do texto auxiliar 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="301"/>
<source>Numéro d&apos;article auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation>Item auxiliar número 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="302"/>
<source>Fabricant auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation>Fabricante auxiliar 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="303"/>
<source>Numéro de commande auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation>Comando auxiliar número 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="304"/>
<source>Numéro interne auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation>Número interno auxiliar 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="305"/>
<source>Fournisseur auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation>Fornecedor Auxiliar 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="306"/>
<source>Quantité auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation>Quantidade auxiliar 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="307"/>
<source>Unité auxiliaire 4</source>
<translation type="unfinished"></translation>
<translation>Unidade auxiliar 4</translation>
</message>
<message>
<location filename="../sources/qetinformation.cpp" line="257"/>
@@ -9330,7 +9330,7 @@ Deseja substituí-lo?</translation>
<message>
<location filename="../sources/qetdiagrameditor.cpp" line="2424"/>
<source>To install the plugin qet_tb_generator&lt;br&gt;Visit :&lt;br&gt;&lt;a href=&apos;https://pypi.python.org/pypi/qet-tb-generator&apos;&gt;qet-tb-generator&lt;/a&gt;&lt;br&gt;&lt;B&gt;&lt;U&gt; First install on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;1. Install, if required, python 3.11 bundle only, &lt;a href=&apos;https://www.python.org/ftp/python/3.11.2/python-3.11.2-macos11.pkg&apos;&gt;python-3.11.2-macos11.pkg&lt;/a&gt;&lt;br&gt;2 Run Profile.command script&lt;br&gt;because program use hardcoded PATH for localise qet-tb-generator plugin &lt;br&gt; Visit :&lt;br&gt;&lt;a href=&apos;https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674&apos;&gt;howto&lt;/a&gt;&lt;br&gt;2. pip3 install qet_tb_generator&lt;br&gt;&lt;B&gt;&lt;U&gt; Update on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt; pip3 install --upgrade qet_tb_generator&lt;br&gt;</source>
<translation type="unfinished"></translation>
<translation>Para instalar o plug-in qet_tb_generator&lt;br&gt;Acesse :&lt;br&gt;&lt;a href=&apos;https://pypi.python.org/pypi/qet-tb-generator&apos;&gt;qet-tb-generator&lt;/a&gt;&lt;br&gt;&lt;B&gt;&lt;U&gt; Primeira instalação no macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;1. Instale, se necessário, apenas o pacote python 3.11, &lt;a href=&apos;https://www.python.org/ftp/python/3.11.2/python-3.11.2-macos11.pkg&apos;&gt;python-3.11.2- macos11.pkg&lt;/a&gt;&lt;br&gt;2 Execute o script Profile.command&lt;br&gt;porque o programa usa PATH codificado para localização Plug-in qet-tb-generator &lt;br&gt; Visite:&lt;br&gt;&lt;a href=&apos;https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674&apos;&gt;como fazer&lt;/a&gt;&lt;br&gt;2. pip3 install qet_tb_generator&lt;br&gt;&lt;B&gt;&lt;U&gt; Atualização no macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt; pip3 install --upgrade qet_tb_generator&lt;br&gt;</translation>
</message>
<message>
<location filename="../sources/qetdiagrameditor.cpp" line="2443"/>
@@ -9573,83 +9573,87 @@ Deseja substituí-lo?</translation>
<message>
<location filename="../sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutshandler.cpp" line="26"/>
<source>Disposition par défaut</source>
<translation type="unfinished"></translation>
<translation>Layout padrão</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="43"/>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="52"/>
<source>Entrer le facteur d&apos;échelle</source>
<translation type="unfinished"></translation>
<translation>Insira o fator da escala</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="44"/>
<source>Facteur X:</source>
<translation type="unfinished"></translation>
<translation>Fator X:</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="53"/>
<source>Facteur Y:</source>
<translation type="unfinished"></translation>
<translation>Fator Y:</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="61"/>
<source>sans</source>
<translation type="unfinished"></translation>
<translation>nenhum</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="62"/>
<source>horizontal</source>
<translation type="unfinished"></translation>
<translation>horizontal</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="63"/>
<source>vertical</source>
<translation type="unfinished"></translation>
<translation>vertical</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="64"/>
<source>horizontal + vertical</source>
<translation type="unfinished"></translation>
<translation>horizontal e vertical</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="66"/>
<source>Retourner l&apos;élément :</source>
<translation type="unfinished"></translation>
<translation>Rotacionar elemento :</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="67"/>
<source>direction</source>
<translation type="unfinished"></translation>
<translation>direção</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="100"/>
<source>QET_ElementScaler:
additional information about %1 import / scaling</source>
<translation type="unfinished"></translation>
<translation>QET_ElementScaler:
informações adicionais sobre %1 importação/dimensionamento</translation>
</message>
<message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="155"/>
<source>Le logiciel QET_ElementScaler est nécessaire pour mettre les éléments à l&apos;échelle.
Veuillez télécharger celui-ci en suivant le lien ci dessous et le dézipper dans le dossier d&apos;installation</source>
<translation type="unfinished"></translation>
<translation>O software QET_ElementScaler é necessário para dimensionar os elementos.
Faça o download seguindo o link abaixo e descompacte-o na pasta de instalação</translation>
</message>
<message>
<location filename="../sources/dxf/dxftoelmt.cpp" line="58"/>
<source>Dxf2elmt:
Error: Make sure the file %1 is a valid .dxf file</source>
<translation type="unfinished"></translation>
<translation>Dxf2elmt:
Erro: Certifique-se de que o arquivo %1 é um arquivo .dxf válido</translation>
</message>
<message>
<location filename="../sources/dxf/dxftoelmt.cpp" line="59"/>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="101"/>
<source>See details here:</source>
<translation type="unfinished"></translation>
<translation>Veja maiores detalhes aqui:</translation>
</message>
<message>
<location filename="../sources/dxf/dxftoelmt.cpp" line="112"/>
<source>L&apos;import dxf nécessite le logiciel dxf2elmt.
Veuillez télécharger celui-ci en suivant le lien ci dessous et le dézipper dans le dossier d&apos;installation</source>
<translation type="unfinished"></translation>
<translation>A importação de arquivos DXF requer o software dxf2elmt.
Faça o download seguindo o link abaixo e descompacte-o na pasta de instalação</translation>
</message>
</context>
<context>
@@ -10621,7 +10625,7 @@ Os outros campos não são utilizados.</translation>
<location filename="../sources/autoNum/ui/selectautonumw.cpp" line="259"/>
<source>Element Autonumérotation</source>
<comment>title window</comment>
<translation type="unfinished"></translation>
<translation>Autonumeração de elementos</translation>
</message>
<message>
<location filename="../sources/autoNum/ui/selectautonumw.cpp" line="261"/>
@@ -10643,7 +10647,24 @@ Les autres champs ne sont pas utilisés.
-Le type &quot;Folio&quot; représente le nom du folio en cours.
Les autres champs ne sont pas utilisés.</source>
<comment>help dialog about the element autonumerotation</comment>
<translation type="unfinished"></translation>
<translatorcomment>Dialogo de ajuda sobre autonumeração</translatorcomment>
<translation>É aqui que você pode definir como os novos elementos serão numerados.
-Uma numeração é composta por uma variável mínima.
-Você pode adicionar ou remover uma variável de numeração usando os botões - e +.
-Uma variável de numeração inclui: um tipo, um valor e um incremento.
-os tipos Dígito 1, Dígito 01 e Dígito 001, representam um tipo numérico definido no campo Valor, que incrementa a cada novo condutor o valor do campo Incremento.
-Dígito 01 e Dígito 001, são representados respectivamente no diagrama por no mínimo dois e três dígitos.
Se o número definido no campo Valor tiver menos dígitos que o tipo escolhido, será precedido de um ou dois 0 para respeitar o seu tipo.
-O tipo Texto representa um texto fixo.
O campo &quot;Incremento&quot; não é utilizado.
-O tipo Número da página representa o número da página atual.
Os outros campos não são usados.
-O tipo Página representa o nome da Página atual.
Os outros campos não são usados.</translation>
</message>
<message>
<location filename="../sources/autoNum/ui/selectautonumw.cpp" line="233"/>
@@ -13195,117 +13216,117 @@ Les autres champs ne sont pas utilisés.</source>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="14"/>
<source>Form</source>
<translation type="unfinished">Formulário</translation>
<translation>Formulário</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="23"/>
<source>Borne niveau 0 :</source>
<translation type="unfinished"></translation>
<translation>Novo Terminal 0 :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="30"/>
<source>En tête :</source>
<translation type="unfinished"></translation>
<translation>No topo :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="47"/>
<source>Point de pont</source>
<translation type="unfinished"></translation>
<translation>Ponto de ponte</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="75"/>
<source>Décalage vertical</source>
<translation type="unfinished"></translation>
<translation>Deslocamento vertical</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="82"/>
<source>Afficher l&apos;aide</source>
<translation type="unfinished"></translation>
<translation>Mostrar ajuda</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="110"/>
<source>Largeur</source>
<translation type="unfinished">Largura</translation>
<translation>Largura</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="131"/>
<source>Hauteur</source>
<translation type="unfinished"></translation>
<translation>Altura</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="138"/>
<source>Prévisualisation :</source>
<translation type="unfinished"></translation>
<translation>Visualização :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="196"/>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="215"/>
<source>Gauche</source>
<translation type="unfinished">Esquerda</translation>
<translation>Esquerda</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="201"/>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="220"/>
<source>Centre</source>
<translation type="unfinished">Centro</translation>
<translation>Centro</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="206"/>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="225"/>
<source>Droite</source>
<translation type="unfinished">Direita</translation>
<translation>Direita</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="233"/>
<source>Alignement du texte d&apos;en tête :</source>
<translation type="unfinished"></translation>
<translation>Alinhamento do texto do cabeçalho :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="240"/>
<source>Alignement du texte de borne :</source>
<translation type="unfinished"></translation>
<translation>Alinhamento de texto do terminal :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="248"/>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="262"/>
<source>Horizontal</source>
<translation type="unfinished">Horizontal</translation>
<translation>Horizontal</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="253"/>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="267"/>
<source>Vertical</source>
<translation type="unfinished">Vertical</translation>
<translation>Vertical</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="275"/>
<source>Orientation du texte de borne :</source>
<translation type="unfinished"></translation>
<translation>Orientação do texto do terminal :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="282"/>
<source>Orientation du texte d&apos;en tête :</source>
<translation type="unfinished"></translation>
<translation>Orientação do texto do cabeçalho :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="299"/>
<source>Borne niveau 2 :</source>
<translation type="unfinished"></translation>
<translation>Novo Terminal 2 :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="313"/>
<source>Espace :</source>
<translation type="unfinished"></translation>
<translation>Espaço :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="369"/>
<source>Borne niveau 3 :</source>
<translation type="unfinished"></translation>
<translation>Novo Terminal 3 :</translation>
</message>
<message>
<location filename="../sources/TerminalStrip/ui/terminalstriplayouteditor.ui" line="383"/>
<source>Borne niveau 1 :</source>
<translation type="unfinished"></translation>
<translation>Novo Terminal 1 :</translation>
</message>
</context>
<context>
@@ -13366,7 +13387,7 @@ Les autres champs ne sont pas utilisés.</source>
<message>
<location filename="../sources/TerminalStrip/ui/ConfigPage/terminalstripprojectconfigpage.cpp" line="33"/>
<source>Plan de bornes</source>
<translation type="unfinished"></translation>
<translation>Planejador de Terminais</translation>
</message>
</context>
<context>
+2 -2
View File
@@ -62,7 +62,7 @@
* supplier_auxiliary2
* quantity_auxiliary2
* unity_auxiliary2
* auxiliary3 -> auxiliary 1 of element
* auxiliary3 -> auxiliary 3 of element
* description_auxiliary3
* designation_auxiliary3
* manufacturer_auxiliary3
@@ -71,7 +71,7 @@
* supplier_auxiliary3
* quantity_auxiliary3
* unity_auxiliary3
* auxiliary4 -> auxiliary 1 of element
* auxiliary4 -> auxiliary 4 of element
* description_auxiliary4
* designation_auxiliary4
* manufacturer_auxiliary4
+14 -8
View File
@@ -821,19 +821,25 @@ void DiagramView::scrollOnMovement(QKeyEvent *e)
{
if (qgraphicsitem_cast<Conductor *>(qgi))
continue;
if(qgi->parentItem() && qgi->parentItem()->isSelected())
if (qgi->parentItem() && qgi->parentItem()->isSelected())
continue;
qreal x = qgi->pos().x();
qreal y = qgi->pos().y();
qreal bottom = viewed_scene.bottom();
qreal top = viewed_scene.top();
qreal left = viewed_scene.left();
qreal right = viewed_scene.right();
qreal elmt_top = y + qgi->boundingRect().top();
qreal top = viewed_scene.top();
qreal left = viewed_scene.left();
qreal right = viewed_scene.right();
qreal elmt_top = y + qgi->boundingRect().top();
qreal elmt_bottom = y + qgi->boundingRect().bottom();
qreal elmt_right = x + qgi->boundingRect().right();
qreal elmt_left = x + qgi->boundingRect().left();
qreal elmt_right = x + qgi->boundingRect().right();
qreal elmt_left = x + qgi->boundingRect().left();
if (qgi->parentItem()) {
elmt_top += qgi->parentItem()->y();
elmt_bottom += qgi->parentItem()->y();
elmt_right += qgi->parentItem()->x();
elmt_left += qgi->parentItem()->x();
}
bool elmt_right_of_left_margin = elmt_left>=left;
bool elmt_left_of_right_margin = elmt_right<=right;
@@ -841,7 +847,7 @@ void DiagramView::scrollOnMovement(QKeyEvent *e)
bool elmt_above_bottom_margin = elmt_bottom<=bottom;
if (!(elmt_right_of_left_margin && elmt_left_of_right_margin) ||
!(elmt_below_top_margin && elmt_above_bottom_margin ) )
!(elmt_below_top_margin && elmt_above_bottom_margin ) )
{
QScrollBar *h = horizontalScrollBar();
QScrollBar *v = verticalScrollBar();
+9 -9
View File
@@ -226,15 +226,10 @@ void DynamicTextFieldEditor::fillInfoComboBox()
else {
strl = QETInformation::elementInfoKeys();
}
//We use a QMap because the keys of the map are sorted, then no matter the current local,
//the value of the combo box are always alphabetically sorted
QMap <QString, QString> info_map;
for(const QString& str : strl)
info_map.insert(QETInformation::translatedInfoKey(str), str);
for (const QString& key : info_map.keys())
ui -> m_elmt_info_cb -> addItem(key, info_map.value(key));
for (int i=0; i<strl.size();++i) {
ui -> m_elmt_info_cb -> addItem(QETInformation::translatedInfoKey(strl[i]), strl[i]);
}
}
void DynamicTextFieldEditor::on_m_x_sb_editingFinished()
@@ -369,7 +364,12 @@ void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index) {
void DynamicTextFieldEditor::on_m_composite_text_pb_clicked()
{
CompositeTextEditDialog ctd(m_text_field.data() -> compositeText(), this);
bool isReport = false;
if (elementEditor()->elementScene()->elementData().m_type & ElementData::AllReport) {
isReport = true;
}
CompositeTextEditDialog ctd(m_text_field.data() -> compositeText(), isReport, this);
if(ctd.exec()) {
QString ct = ctd.plainText();
for (int i = 0; i < m_parts.length(); i++) {
@@ -205,6 +205,8 @@ void ElementPropertiesEditorWidget::populateTree()
QETInformation::translatedInfoKey(key));
qtwi->setData(0, Qt::UserRole, key);
qtwi->setText(1, m_data.m_informations.value(key).toString());
// Adjust column width
ui->m_tree->resizeColumnToContents(0);
}
}
+1 -2
View File
@@ -312,6 +312,7 @@ QStringList QETInformation::elementEditorElementInfoKeys()
{
QStringList list = { ELMT_LABEL,
ELMT_PLANT,
ELMT_LOCATION,
ELMT_COMMENT,
ELMT_FUNCTION,
ELMT_DESCRIPTION,
@@ -322,8 +323,6 @@ QStringList QETInformation::elementEditorElementInfoKeys()
ELMT_SUPPLIER,
ELMT_QUANTITY,
ELMT_UNITY,
ELMT_LOCATION,
ELMT_PLANT,
ELMT_AUX1,
ELMT_DESCRIPTION_AUX1,
ELMT_DESIGNATION_AUX1,
+15 -15
View File
@@ -49,39 +49,39 @@ namespace QETInformation
static QString ELMT_LOCATION = "location";
static QString ELMT_AUX1 = "auxiliary1";
static QString ELMT_DESCRIPTION_AUX1 = "description_auxiliary1";
static QString ELMT_DESIGNATION_AUX1 = "designation_auxiliary1 ";
static QString ELMT_DESIGNATION_AUX1 = "designation_auxiliary1";
static QString ELMT_MANUFACTURER_AUX1 = "manufacturer_auxiliary1";
static QString ELMT_MANUFACTURER_REF_AUX1 = "manufacturer_reference_auxiliary1";
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1 = "machine_manufacturer_reference_auxiliary1 ";
static QString ELMT_SUPPLIER_AUX1 = "supplier_auxiliary1 ";
static QString ELMT_QUANTITY_AUX1 = "quantity_auxiliary1 ";
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1 = "machine_manufacturer_reference_auxiliary1";
static QString ELMT_SUPPLIER_AUX1 = "supplier_auxiliary1";
static QString ELMT_QUANTITY_AUX1 = "quantity_auxiliary1";
static QString ELMT_UNITY_AUX1 = "unity_auxiliary1";
static QString ELMT_AUX2 = "auxiliary2";
static QString ELMT_DESCRIPTION_AUX2 = "description_auxiliary2";
static QString ELMT_DESIGNATION_AUX2 = "designation_auxiliary2 ";
static QString ELMT_DESIGNATION_AUX2 = "designation_auxiliary2";
static QString ELMT_MANUFACTURER_AUX2 = "manufacturer_auxiliary2";
static QString ELMT_MANUFACTURER_REF_AUX2 = "manufacturer_reference_auxiliary2";
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX2 = "machine_manufacturer_reference_auxiliary2";
static QString ELMT_SUPPLIER_AUX2 = "supplier_auxiliary2 ";
static QString ELMT_QUANTITY_AUX2 = "quantity_auxiliary2 ";
static QString ELMT_SUPPLIER_AUX2 = "supplier_auxiliary2";
static QString ELMT_QUANTITY_AUX2 = "quantity_auxiliary2";
static QString ELMT_UNITY_AUX2 = "unity_auxiliary2";
static QString ELMT_AUX3 = "auxiliary3";
static QString ELMT_DESCRIPTION_AUX3 = "description_auxiliary3";
static QString ELMT_DESIGNATION_AUX3 = "designation_auxiliary3 ";
static QString ELMT_DESIGNATION_AUX3 = "designation_auxiliary3";
static QString ELMT_MANUFACTURER_AUX3 = "manufacturer_auxiliary3";
static QString ELMT_MANUFACTURER_REF_AUX3 = "manufacturer_reference_auxiliary3";
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3 = "machine_manufacturer_reference_auxiliary3 ";
static QString ELMT_SUPPLIER_AUX3 = "supplier_auxiliary3 ";
static QString ELMT_QUANTITY_AUX3 = "quantity_auxiliary3 ";
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3 = "machine_manufacturer_reference_auxiliary3";
static QString ELMT_SUPPLIER_AUX3 = "supplier_auxiliary3";
static QString ELMT_QUANTITY_AUX3 = "quantity_auxiliary3";
static QString ELMT_UNITY_AUX3 = "unity_auxiliary3";
static QString ELMT_AUX4 = "auxiliary4";
static QString ELMT_DESCRIPTION_AUX4 = "description_auxiliary4";
static QString ELMT_DESIGNATION_AUX4 = "designation_auxiliary4 ";
static QString ELMT_DESIGNATION_AUX4 = "designation_auxiliary4";
static QString ELMT_MANUFACTURER_AUX4 = "manufacturer_auxiliary4";
static QString ELMT_MANUFACTURER_REF_AUX4 = "manufacturer_reference_auxiliary4";
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4 = "machine_manufacturer_reference_auxiliary4 ";
static QString ELMT_SUPPLIER_AUX4 = "supplier_auxiliary4 ";
static QString ELMT_QUANTITY_AUX4 = "quantity_auxiliary4 ";
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4 = "machine_manufacturer_reference_auxiliary4";
static QString ELMT_SUPPLIER_AUX4 = "supplier_auxiliary4";
static QString ELMT_QUANTITY_AUX4 = "quantity_auxiliary4";
static QString ELMT_UNITY_AUX4 = "unity_auxiliary4";
+12 -17
View File
@@ -18,10 +18,15 @@ CompositeTextEditDialog::CompositeTextEditDialog(DynamicElementTextItem *text, Q
m_default_text = m_text->compositeText();
ui->m_plain_text_edit->setPlainText(m_default_text);
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
setUpComboBox();
bool report = false;
if ((m_text) &&(m_text->parentElement()->linkType()) & (Element::AllReport))
{
report = true;
}
setUpComboBox(report);
}
CompositeTextEditDialog::CompositeTextEditDialog(QString text, QWidget *parent) :
CompositeTextEditDialog::CompositeTextEditDialog(QString text, bool report, QWidget *parent) :
QDialog(parent),
ui(new Ui::CompositeTextEditDialog)
{
@@ -29,7 +34,7 @@ CompositeTextEditDialog::CompositeTextEditDialog(QString text, QWidget *parent)
m_default_text = std::move(text);
ui->m_plain_text_edit->setPlainText(m_default_text);
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
setUpComboBox();
setUpComboBox(report);
}
CompositeTextEditDialog::~CompositeTextEditDialog()
@@ -50,13 +55,9 @@ QString CompositeTextEditDialog::plainText() const
@brief CompositeTextEditDialog::setUpComboBox
Add the available element information in the combo box
*/
void CompositeTextEditDialog::setUpComboBox()
void CompositeTextEditDialog::setUpComboBox(bool is_report)
{
QStringList qstrl;
bool is_report = false;
if (m_text && m_text->parentElement()->linkType() & Element::AllReport) {
is_report = true;
}
if(is_report) //Special treatment for text owned by a folio report
{
@@ -68,15 +69,9 @@ void CompositeTextEditDialog::setUpComboBox()
qstrl.removeAll("formula");
}
//We use a QMap because the keys of the map are sorted, then no matter the current local,
//the value of the combo box are always alphabetically sorted
QMap <QString, QString> info_map;
for(const QString& str : qstrl) {
info_map.insert(QETInformation::translatedInfoKey(str),
is_report ? QETInformation::folioReportInfoToVar(str) : QETInformation::elementInfoToVar(str));
}
for(const QString& key : info_map.keys()) {
ui->m_info_cb->addItem(key, info_map.value(key));
for (int i=0; i<qstrl.size();++i) {
ui -> m_info_cb -> addItem(QETInformation::translatedInfoKey(qstrl[i]),
is_report ? QETInformation::folioReportInfoToVar(qstrl[i]) : QETInformation::elementInfoToVar(qstrl[i]));
}
}
+2 -2
View File
@@ -22,7 +22,7 @@ class CompositeTextEditDialog : public QDialog
public:
explicit CompositeTextEditDialog(DynamicElementTextItem *text, QWidget *parent = nullptr);
explicit CompositeTextEditDialog(QString text, QWidget *parent = nullptr);
explicit CompositeTextEditDialog(QString text, bool report, QWidget *parent = nullptr);
~CompositeTextEditDialog() override;
QString plainText() const;
@@ -34,7 +34,7 @@ class CompositeTextEditDialog : public QDialog
void focusInEvent(QFocusEvent *event) override;
private :
void setUpComboBox();
void setUpComboBox(bool is_report);
QString infoToVar(const QString& info) const;
private:
+4 -9
View File
@@ -1623,17 +1623,12 @@ QWidget *DynamicTextItemDelegate::createEditor(
if(!deti)
break;
//We use a QMap because the keys of the map are sorted, then no matter the current local,
//the value of the combo box are always alphabetically sorted
QMap <QString, QString> info_map;
for(const QString& str : availableInfo(deti)) {
info_map.insert(QETInformation::translatedInfoKey(str), str);
}
QComboBox *qcb = new QComboBox(parent);
qcb->setObjectName("info_text");
for (const QString& key : info_map.keys()) {
qcb->addItem(key, info_map.value(key));
QStringList strl = availableInfo(deti);
for (int i=0; i<strl.size();++i) {
qcb -> addItem(QETInformation::translatedInfoKey(strl[i]), strl[i]);
}
return qcb;
}