assorted fixes for qt6

3ll3d00d · Sep 14, 2024 · 47340ff · 47340ff
1 parent d72cd40
commit 47340ff
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -49,6 +49,12 @@ jobs:
         run: poetry install --no-interaction
       - name: Install project
         run: poetry install --no-interaction
+      - name: Install test dependencies
+        run: |
+          if [[ "$RUNNER_OS" == "Linux" ]]
+          then
+            sudo apt install -y libegl1
+          fi
       - name: pytest
         run: |
           PYTHONPATH=./src/main/python poetry run pytest --cov=./src/main/python

diff --git a/src/main/python/model/extract.py b/src/main/python/model/extract.py
@@ -615,7 +615,7 @@ def setTargetDirectory(self):
         Sets the target directory based on the user selection.
         '''
         dialog = QFileDialog(parent=self)
-        dialog.setFileMode(QFileDialog.FileMode.DirectoryOnly)
+        dialog.setFileMode(QFileDialog.FileMode.Directory)
         dialog.setWindowTitle(f"Select Output Directory")
         if dialog.exec():
             selected = dialog.selectedFiles()

diff --git a/src/main/python/model/iir.py b/src/main/python/model/iir.py
@@ -188,7 +188,7 @@ def float_to_str(f, to_hex=False, minidsp_style=False, fixed_point=False):
     if to_hex is True:
         return float_to_hex(f, minidsp_style, fixed_point)
     else:
-        d1 = ctx.create_decimal(repr(f))
+        d1 = ctx.create_decimal(str(f))
         return format(d1, 'f')
 
 

diff --git a/src/main/python/model/merge.py b/src/main/python/model/merge.py
@@ -267,7 +267,7 @@ def pick_output_dir(self):
         Sets the output directory.
         '''
         dialog = QFileDialog(parent=self)
-        dialog.setFileMode(QFileDialog.FileMode.DirectoryOnly)
+        dialog.setFileMode(QFileDialog.FileMode.Directory)
         dialog.setOption(QFileDialog.Option.ShowDirsOnly)
         dialog.setWindowTitle('Select a location to store the generated dsp config files')
         if dialog.exec():
@@ -297,7 +297,7 @@ def pick_user_source_dir(self):
         Sets the user source directory.
         '''
         dialog = QFileDialog(parent=self)
-        dialog.setFileMode(QFileDialog.FileMode.DirectoryOnly)
+        dialog.setFileMode(QFileDialog.FileMode.Directory)
         dialog.setOption(QFileDialog.Option.ShowDirsOnly)
         dialog.setWindowTitle('Choose a directory which holds your own BEQ files')
         if dialog.exec():

diff --git a/src/main/python/model/postbuilder.py b/src/main/python/model/postbuilder.py
@@ -352,7 +352,7 @@ def __validate_metadata(self, metadata):
 class UrlValidator(QRegularExpressionValidator):
     def __init__(self, parent, button):
         regex = QRegularExpression(''.join(URL_REGEX_FRAGMENTS))
-        regex.setPatternOptions(QRegularExpression.PatternOption.CaseInsensitive)
+        regex.setPatternOptions(QRegularExpression.PatternOption.CaseInsensitiveOption)
         self.__button = button
         super().__init__(regex, parent)
 

diff --git a/src/main/python/model/preferences.py b/src/main/python/model/preferences.py
@@ -709,7 +709,7 @@ def __show_and_set_picker(self, name: str, widget: QLineEdit) -> Optional[str]:
 
     def showDefaultOutputDirectoryPicker(self):
         dialog = QFileDialog(parent=self)
-        dialog.setFileMode(QFileDialog.FileMode.DirectoryOnly)
+        dialog.setFileMode(QFileDialog.FileMode.Directory)
         dialog.setWindowTitle(f"Select Extract Audio Output Directory")
         if dialog.exec():
             selected = dialog.selectedFiles()
@@ -733,7 +733,7 @@ def showExtractCompleteSoundPicker(self):
     def showBeqDirectoryPicker(self):
         ''' selects an output directory for the beq files '''
         dialog = QFileDialog(parent=self)
-        dialog.setFileMode(QFileDialog.FileMode.DirectoryOnly)
+        dialog.setFileMode(QFileDialog.FileMode.Directory)
         dialog.setWindowTitle(f"Select BEQ Files Download Directory")
         if dialog.exec():
             selected = dialog.selectedFiles()