Refs #9. Updated translations for MainWindow

Closes #41. Added GPLv3 license
Refs #66. Added Import wizard from the start screen.

Author: SBriere

LICENSE.TXT

@@ -52,6 +52,7 @@ SET(uis
     resources/ui/StreamWindow.ui
     resources/ui/ImportMatchDialog.ui
     resources/ui/CrashDialog.ui
+    resources/ui/ImportDialogWizard.ui
 )
 
 SET(qrcs

python/CMakeLists.txt

@@ -0,0 +1,56 @@
+from resources.ui.python.ImportDialogWizard_ui import Ui_dlgImportWizard
+
+from PySide6.QtCore import Slot
+from PySide6.QtWidgets import QDialog, QFileDialog, QMessageBox
+
+
+class ImportDialogWizard(QDialog):
+    useExisting = False
+    databaseFilename: str = ''
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.UI = Ui_dlgImportWizard()
+        self.UI.setupUi(self)
+
+        self.UI.frameExisting.hide()
+        self.UI.radioNewDataset.setChecked(True)
+
+        # Connect signals
+        self.UI.radioExistingDataset.clicked.connect(self.radio_choice_changed)
+        self.UI.radioNewDataset.clicked.connect(self.radio_choice_changed)
+        self.UI.txtFilename.textChanged.connect(self.filename_changed)
+        self.UI.btnBrowse.clicked.connect(self.browse_clicked)
+        self.UI.btnNext.clicked.connect(self.next_clicked)
+        self.UI.btnCancel.clicked.connect(self.cancel_clicked)
+
+    @Slot()
+    def radio_choice_changed(self):
+        self.UI.frameExisting.setVisible(self.UI.radioExistingDataset.isChecked())
+        self.useExisting = self.UI.radioExistingDataset.isChecked()
+        if self.UI.radioExistingDataset.isChecked():
+            self.UI.btnNext.setEnabled(self.UI.txtFilename.text() != '')
+        else:
+            self.UI.btnNext.setEnabled(True)
+
+    @Slot()
+    def browse_clicked(self):
+        file_diag = QFileDialog.getOpenFileName(caption=self.tr('Dataset to import data into'), filter='*.oi')
+
+        if file_diag[0] != '':
+            self.UI.txtFilename.setText(file_diag[0])
+
+    @Slot()
+    def filename_changed(self):
+        self.UI.btnNext.setEnabled(self.UI.txtFilename.text() != '')
+
+    @Slot()
+    def next_clicked(self):
+        if self.useExisting:
+            self.databaseFilename = self.UI.txtFilename.text()
+
+        self.accept()
+
+    @Slot()
+    def cancel_clicked(self):
+        self.reject()

python/libopenimu/qt/ImportDialogWizard.py

@@ -21,20 +21,24 @@ class ImportWindow(QDialog):
 
     dataSet = None
 
-    def __init__(self, dataset=None, parent=None, filename=None, showImport=False):
+    def __init__(self, dataset=None, parent=None, filename=None, show_import=False):
         super().__init__(parent=parent)
         self.UI = Ui_ImportDialog()
         self.UI.setupUi(self)
 
         # Manage data if present
         self.dataSet = dataset
         self.fileName = filename
-        self.showImport = showImport
+        self.showImport = show_import
         self.update_data()
 
         # Signals / Slots connections
         self.UI.btnCancel.clicked.connect(self.cancel_clicked)
         self.UI.btnOK.clicked.connect(self.ok_clicked)
+        self.UI.txtAuthor.textChanged.connect(self.validate)
+        self.UI.txtName.textChanged.connect(self.validate)
+        self.UI.txtFileName.textChanged.connect(self.validate)
+        self.UI.dateData.dateChanged.connect(self.validate)
         # self.UI.btnAddFile.clicked.connect(self.addFile_clicked)
         # self.UI.btnDelFile.clicked.connect(self.removeFile_clicked)
         self.UI.btnBrowse.clicked.connect(self.browse_clicked)
@@ -43,14 +47,15 @@ def exec(self):
         # self.UI.frameImport.setVisible(not self.showImport)
         # self.UI.splitter.setVisible(not self.noImportUI)
         if self.showImport:
-            self.UI.btnOK.setText("Suivant")
+            self.UI.btnOK.setText(self.tr("Next"))
 
         self.UI.btnBrowse.setVisible(not self.infosOnly)
         self.UI.txtFileName.setVisible(not self.infosOnly)
         self.UI.lblFile.setVisible(not self.infosOnly)
 
         return QDialog.exec(self)
 
+    @Slot()
     def validate(self):
         rval = True
         if self.UI.txtFileName.text() == '' or self.UI.txtFileName.text()[-3:] != '.oi':
@@ -71,6 +76,7 @@ def validate(self):
         else:
             self.UI.txtAuthor.setStyleSheet('background-color: rgba(226, 226, 226, 90%);')
 
+        self.UI.btnOK.setEnabled(rval)
         return rval
 
     def update_data(self):
@@ -84,10 +90,11 @@ def update_data(self):
             import os
             self.UI.txtAuthor.setText(os.getlogin())
         self.UI.txtFileName.setText(self.fileName)
+        self.validate()  # Show mandatory fields in red
 
     @Slot()
     def browse_clicked(self):
-        file_diag = QFileDialog.getSaveFileName(caption="Nom du fichier à enregistrer", filter="*.oi")
+        file_diag = QFileDialog.getSaveFileName(caption=self.tr("Dataset filename"), filter="*.oi")
 
         if file_diag[0] != '':
             self.UI.txtFileName.setText(file_diag[0])
@@ -111,7 +118,7 @@ def ok_clicked(self):
                 self.dataSet.name = self.UI.txtName.text()
                 self.dataSet.description = self.UI.txtDesc.toPlainText()
                 self.dataSet.author = self.UI.txtAuthor.text()
-                self.dataSet.upload_date = self.UI.dateData.date().toPyDate()
+                self.dataSet.upload_date = self.UI.dateData.date().toPython()
 
                 db.set_dataset_infos(name=self.dataSet.name,
                                      desc=self.dataSet.description,
@@ -124,9 +131,8 @@ def ok_clicked(self):
                 self.accept()
 
             except (DBAPIError, DataError, DatabaseError):
-                print('Error!')
                 box = QMessageBox()
-                box.setText('Erreur de création de DB, s.v.p. choisir une répertoire valide')
+                box.setText(self.tr('Dataset file creation error - please choose a valid file and directory'))
                 box.exec()
 
     @Slot()

python/libopenimu/qt/ImportWindow.py

@@ -58,7 +58,7 @@ def __init__(self, filename: str, parent=None):
         self.UI.dockToolBar.setTitleBarWidget(QWidget())
         self.UI.dockLog.hide()
 
-        self.add_to_log(self.tr("OpenIMU - Prêt à travailler."), LogTypes.LOGTYPE_INFO)
+        self.add_to_log(self.tr("OpenIMU - Ready."), LogTypes.LOGTYPE_INFO)
 
         # Setup signals and slots
         self.setup_signals()
@@ -68,14 +68,14 @@ def __init__(self, filename: str, parent=None):
         self.dbMan = DBManager(self.currentFileName)
 
         # Load data
-        self.add_to_log(self.tr('Chargement des données...'), LogTypes.LOGTYPE_INFO)
+        self.add_to_log(self.tr('Loading data...'), LogTypes.LOGTYPE_INFO)
         self.currentDataSet = self.dbMan.get_dataset()
         self.load_data_from_dataset()
         self.UI.treeDataSet.setCurrentItem(None)
         self.UI.treeDataSet.owner = self
 
         # self.loadDemoData()
-        self.add_to_log(self.tr("Données chargées!"), LogTypes.LOGTYPE_DONE)
+        self.add_to_log(self.tr("Data loaded!"), LogTypes.LOGTYPE_DONE)
 
         # If we need to import data, show the import dialog
         # if start_window.importing:
@@ -257,7 +257,7 @@ def export_csv_requested(self):
         exporter = ExportWindow(self.dbMan, self)
         exporter.setStyleSheet(self.styleSheet())
         if exporter.exec() == QDialog.Accepted:
-            print("Accepted")
+            pass
 
     @Slot()
     def infos_requested(self):
@@ -286,14 +286,15 @@ def db_close_requested(self):
         msg.setIcon(QMessageBox.Question)
         msg.setStyleSheet("QPushButton{min-width: 100px; min-height: 40px;}")
 
-        msg.setText("Cet ensemble de données sera fermé. Désirez-vous poursuivre?")
-        msg.setWindowTitle("Fermeture?")
+        msg.setText(self.tr('This dataset will be closed. Do you want to continue?'))
+        msg.setWindowTitle(self.tr('Close?'))
         msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
 
         rval = msg.exec()
         if rval == QMessageBox.Yes:
             self.dbMan.close()
-            self.add_to_log("Fichier " + self.currentFileName + " fermé.", LogTypes.LOGTYPE_INFO)
+            self.add_to_log(self.tr('File') + ' ' + self.currentFileName + ' ' + self.tr('was closed.'),
+                            LogTypes.LOGTYPE_INFO)
             # self.hide()
 
             # self.show_start_window()
@@ -305,16 +306,16 @@ def db_compact_requested(self):
         msg.setIcon(QMessageBox.Question)
         msg.setStyleSheet("QPushButton{min-width: 100px; min-height: 40px;}")
 
-        msg.setText("Le fichier de données sera nettoyé. Ceci peut prendre un certain temps. \n"
-                    "Désirez-vous poursuivre?")
-        msg.setWindowTitle("Compactage des données")
+        msg.setText(self.tr('Database file will be cleaned up and optimized. This can take some time.') + '\n\r' +
+                    self.tr('Do you want to continue?'))
+        msg.setWindowTitle(self.tr('Database cleanup'))
         msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
 
         rval = msg.exec()
         if rval == QMessageBox.Yes:
-            task = SimpleTask("Compactage des données", self.dbMan.compact)
+            task = SimpleTask(self.tr('Database cleanup'), self.dbMan.compact)
             process = BackgroundProcess([task])
-            dialog = ProgressDialog(process, 'Nettoyage', self)
+            dialog = ProgressDialog(process, self.tr('Cleanup'), self)
             process.start()
             dialog.exec()
 
@@ -394,12 +395,12 @@ def data_was_saved(self):
         if item_type == "group":
             group = self.UI.frmMain.layout().itemAt(0).widget().group
             self.update_group(group)
-            self.add_to_log("Groupe " + group.name + " mis à jour.", LogTypes.LOGTYPE_DONE)
+            self.add_to_log(self.tr('Group') + ' ' + group.name + ' ' + self.tr('updated.'), LogTypes.LOGTYPE_DONE)
 
         if item_type == "participant":
             part = self.UI.frmMain.layout().itemAt(0).widget().participant
             self.update_participant(part)
-            self.add_to_log("Participant " + part.name + " mis à jour.", LogTypes.LOGTYPE_DONE)
+            self.add_to_log(self.tr('Participant') + ' ' + part.name + ' ' + self.tr('updated.'), LogTypes.LOGTYPE_DONE)
 
     @Slot()
     def data_was_cancelled(self):
@@ -425,9 +426,9 @@ def delete_requested(self):
         msg.setIcon(QMessageBox.Question)
         msg.setStyleSheet("QPushButton{min-width: 100px; min-height: 40px;}")
 
-        msg.setText("Désirez-vous vraiment supprimer \"" + self.UI.treeDataSet.currentItem().text(0) +
-                    "\" et tous les éléments associés?")
-        msg.setWindowTitle("Confirmation de suppression")
+        msg.setText(self.tr('Are you sure you want to delete') + '"' + self.UI.treeDataSet.currentItem().text(0) +
+                    '"' + self.tr('and all associated elements?'))
+        msg.setWindowTitle(self.tr('Confirm deletion'))
         msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
 
         rval = msg.exec()
@@ -438,13 +439,13 @@ def delete_requested(self):
             if item_type == "group":
                 group = self.UI.treeDataSet.groups[item_id]
                 self.UI.treeDataSet.remove_group(group)
-                task = SimpleTask("Suppression de '" + group.name + "'", self.dbMan.delete_group, group)
+                task = SimpleTask(self.tr('Deleting') + '"' + group.name + '"', self.dbMan.delete_group, group)
                 tasks.append(task)
 
             if item_type == "participant":
                 part = self.UI.treeDataSet.participants[item_id]
                 self.UI.treeDataSet.remove_participant(part)
-                task = SimpleTask("Suppression de '" + part.name + "'", self.dbMan.delete_participant, part)
+                task = SimpleTask(self.tr('Deleting') + '"' + part.name + '"', self.dbMan.delete_participant, part)
                 tasks.append(task)
 
             if item_type == "recordset":
@@ -454,21 +455,23 @@ def delete_requested(self):
                         for ref in result.processed_data_ref:
                             if ref.recordset.id_recordset == item_id:
                                 self.UI.treeDataSet.remove_result(result)
-                                task = SimpleTask("Suppression de '" + result.name + "'",
+                                task = SimpleTask(self.tr('Deleting') + '"' + result.name + '"',
                                                   self.dbMan.delete_processed_data, result)
                                 tasks.append(task)
                                 # self.dbMan.delete_processed_data(result)
                                 break
 
                 recordset = self.UI.treeDataSet.recordsets[item_id]
-                task = SimpleTask("Suppression de '" + recordset.name + "'", self.dbMan.delete_recordset, recordset)
+                task = SimpleTask(self.tr('Deleting') + '"' + recordset.name + '"', self.dbMan.delete_recordset,
+                                  recordset)
                 tasks.append(task)
                 # self.dbMan.delete_recordset(recordset)
                 self.UI.treeDataSet.remove_recordset(recordset)
 
             if item_type == "result":
                 result = self.UI.treeDataSet.results[item_id]
-                task = SimpleTask("Suppression de '" + result.name + "'", self.dbMan.delete_processed_data, result)
+                task = SimpleTask(self.tr('Deleting') + '"' + result.name + '"', self.dbMan.delete_processed_data,
+                                  result)
                 tasks.append(task)
                 self.UI.treeDataSet.remove_result(result)
                 # self.dbMan.delete_processed_data(result)
@@ -483,7 +486,7 @@ def delete_requested(self):
                 for recordset in recordsets:
                     if part_id is None:
                         part_id = recordset.id_participant
-                    task = SimpleTask("Suppression de '" + recordset.name + "'",
+                    task = SimpleTask(self.tr('Deleting') + '"' + recordset.name + '"',
                                       self.dbMan.delete_recordset, recordset)
                     tasks.append(task)
                     self.UI.treeDataSet.remove_recordset(recordset)
@@ -495,7 +498,7 @@ def delete_requested(self):
                                                                                                .currentItem().parent())]
                 recordsets = self.dbMan.get_all_recordsets(participant=participant)
                 for recordset in recordsets:
-                    task = SimpleTask("Suppression de '" + recordset.name + "'",
+                    task = SimpleTask(self.tr('Deleting') + '"' + recordset.name + '"',
                                       self.dbMan.delete_recordset, recordset)
                     tasks.append(task)
                     self.UI.treeDataSet.remove_recordset(recordset)
@@ -509,13 +512,13 @@ def delete_requested(self):
             if tasks:
                 process = BackgroundProcess(tasks)
                 # Create progress dialog
-                dialog = ProgressDialog(process, 'Suppression', self)
+                dialog = ProgressDialog(process, self.tr('Deleting'), self)
                 # Start tasks
                 process.start()
                 dialog.exec()
                 # self.dbMan.clean_db()
 
-            self.add_to_log(item_name + " a été supprimé.", LogTypes.LOGTYPE_DONE)
+            self.add_to_log(item_name + ' ' + self.tr('was deleted.'), LogTypes.LOGTYPE_DONE)
             self.clear_main_widgets()
 
     def closeEvent(self, event):

python/libopenimu/qt/MainWindow.py

@@ -1,6 +1,8 @@
 from resources.ui.python.StartDialog_ui import Ui_StartDialog
 
 from libopenimu.qt.ImportWindow import ImportWindow
+from libopenimu.qt.ImportDialogWizard import ImportDialogWizard
+from libopenimu.qt.ImportBrowser import ImportBrowser
 
 from PySide6.QtCore import Slot, Signal, QLocale
 from PySide6.QtWidgets import QDialog, QFileDialog, QApplication
@@ -41,11 +43,17 @@ def __init__(self, parent=None):
 
     @Slot()
     def import_clicked(self):
-        importdialog = ImportWindow(parent=self)
-        importdialog.showImport = True
+        importdialog = ImportDialogWizard(parent=self)  # ImportWindow(parent=self)
+        # importdialog.showImport = True
 
         if importdialog.exec() == QDialog.Accepted:
-            self.open_file(importdialog.fileName)
+            self.importing = True
+            if importdialog.useExisting:
+                self.open_file(importdialog.databaseFilename)
+            else:
+                importdialog = ImportWindow(parent=self)
+                if importdialog.exec() == QDialog.Accepted:
+                    self.open_file(importdialog.fileName)
 
     @Slot()
     def open_clicked(self):

python/libopenimu/qt/StartWindow.py

@@ -46,6 +46,14 @@
         <file>icons/bug.png</file>
         <file>icons/date.png</file>
         <file>LogoOpenIMU.png</file>
+        <file>icons/ok.png</file>
+        <file>icons/undo.png</file>
+        <file>icons/new.png</file>
+        <file>icons/next.png</file>
+        <file>icons/previous.png</file>
+        <file>icons/group_new.png</file>
+        <file>icons/participant_new.png</file>
+        <file>icons/database_new.png</file>
     </qresource>
     <qresource prefix="/">
         <file>stylesheet.qss</file>