Fix order and translation of Ok/cancel button in survey import dialog…

… window
piMoll · May 1, 2022 · bc9fa60 · bc9fa60
1 parent 6bd3f50
commit bc9fa60
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 4 deletions.
diff --git a/gui/saveDialog.py b/gui/saveDialog.py
@@ -54,8 +54,8 @@ def __init__(self, parent):
 
         # Create Ok/Cancel Button and connect signal
         buttonBox = QDialogButtonBox(main_widget)
-        buttonBox.setStandardButtons(QDialogButtonBox.Ok |
-                                     QDialogButtonBox.Cancel)
+        buttonBox.setStandardButtons(QDialogButtonBox.Cancel |
+                                     QDialogButtonBox.Ok)
         buttonBox.button(QDialogButtonBox.Ok).setText(self.tr("OK"))
         buttonBox.button(QDialogButtonBox.Cancel).setText(self.tr("Abbrechen"))
         buttonBox.accepted.connect(self.apply)

diff --git a/gui/surveyImportDialog.py b/gui/surveyImportDialog.py
@@ -60,8 +60,10 @@ def connectGuiElements(self):
         self.buttonTemplateExcelProtocol.clicked.connect(
             lambda: self.onDownloadTemplate('excelProtocol'))
 
-        self.buttonBox.accepted.connect(self.onOk)
+        self.buttonBox.accepted.connect(self.onImport)
         self.buttonBox.rejected.connect(self.onCancel)
+        self.buttonBox.button(QDialogButtonBox.Ok).setText(self.tr('Import'))
+        self.buttonBox.button(QDialogButtonBox.Cancel).setText(self.tr('Abbrechen'))
 
     def onSelectSurveyType(self):
         newSurveyType = None
@@ -131,7 +133,7 @@ def onDownloadTemplate(self, templateName):
             QMessageBox.information(self, self.tr('Download Vorlage'),
                                     msg, QMessageBox.Ok)
 
-    def onOk(self):
+    def onImport(self):
         if self.surveyType and self.filePath:
             self.doImport = True
 

diff --git a/i18n/SeilaplanPlugin_de.qm b/i18n/SeilaplanPlugin_de.qm
diff --git a/i18n/SeilaplanPlugin_de.ts b/i18n/SeilaplanPlugin_de.ts
@@ -2405,6 +2405,16 @@ Pfad zu Dokumentation:
         <source>Download Vorlage</source>
         <translation>Download Vorlage</translation>
     </message>
+    <message>
+        <location filename="../gui/surveyImportDialog.py" line="65"/>
+        <source>Import</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <location filename="../gui/surveyImportDialog.py" line="66"/>
+        <source>Abbrechen</source>
+        <translation>Abbrechen</translation>
+    </message>
 </context>
 <context>
     <name>SurveyImportDialogUI</name>

diff --git a/i18n/SeilaplanPlugin_en.qm b/i18n/SeilaplanPlugin_en.qm
diff --git a/i18n/SeilaplanPlugin_en.ts b/i18n/SeilaplanPlugin_en.ts
@@ -2426,6 +2426,16 @@ The algorithm calculates a solution, which in first priority is minimizing the n
         <source>Download Vorlage</source>
         <translation>Download template</translation>
     </message>
+    <message>
+        <location filename="../gui/surveyImportDialog.py" line="65"/>
+        <source>Import</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <location filename="../gui/surveyImportDialog.py" line="66"/>
+        <source>Abbrechen</source>
+        <translation>Cancel</translation>
+    </message>
 </context>
 <context>
     <name>SurveyImportDialogUI</name>

diff --git a/i18n/SeilaplanPlugin_fr.qm b/i18n/SeilaplanPlugin_fr.qm
diff --git a/i18n/SeilaplanPlugin_fr.ts b/i18n/SeilaplanPlugin_fr.ts
@@ -2426,6 +2426,16 @@ Il est recherché la solution qui, en première priorité, minimalise le nombre
         <source>Download Vorlage</source>
         <translation>Télécharger le modèle</translation>
     </message>
+    <message>
+        <location filename="../gui/surveyImportDialog.py" line="65"/>
+        <source>Import</source>
+        <translation>Importer</translation>
+    </message>
+    <message>
+        <location filename="../gui/surveyImportDialog.py" line="66"/>
+        <source>Abbrechen</source>
+        <translation>Annuler</translation>
+    </message>
 </context>
 <context>
     <name>SurveyImportDialogUI</name>

diff --git a/i18n/SeilaplanPlugin_it.qm b/i18n/SeilaplanPlugin_it.qm
diff --git a/i18n/SeilaplanPlugin_it.ts b/i18n/SeilaplanPlugin_it.ts
@@ -2423,6 +2423,16 @@ C&apos;è cercato la soluzione che, in prima priorità, minimizza il numero dei
         <source>Download Vorlage</source>
         <translation>Scaricare il template</translation>
     </message>
+    <message>
+        <location filename="../gui/surveyImportDialog.py" line="65"/>
+        <source>Import</source>
+        <translation>Importare</translation>
+    </message>
+    <message>
+        <location filename="../gui/surveyImportDialog.py" line="66"/>
+        <source>Abbrechen</source>
+        <translation></translation>
+    </message>
 </context>
 <context>
     <name>SurveyImportDialogUI</name>

diff --git a/scripts/cheatsheet.sh b/scripts/cheatsheet.sh
@@ -6,6 +6,7 @@ pyrcc5 -o resources/resources.py resources/resources.qrc
 # Compile gui
 pyuic5 gui/seilaplanDialog.ui -o gui/ui_seilaplanDialog.py
 pyuic5 gui/adjustmentDialog.ui -o gui/ui_adjustmentDialog.py
+pyuic5 gui/surveyImportDialog.ui -o gui/ui_surveyImportDialog.py
 
 # get new translation texts
 bash scripts/update-strings.sh SeilaplanPlugin_de SeilaplanPlugin_en SeilaplanPlugin_fr SeilaplanPlugin_it