Partly closes iss #7. Color of feedback lights and font properties ar…

…e now user configurable. Need to add mixed feedback options (e.g. light and text)
sam81 · Nov 6, 2015 · 987ad04 · 987ad04
1 parent 6a75d6b
commit 987ad04
Show file tree

Hide file tree

Showing 13 changed files with 452 additions and 335 deletions.
diff --git a/prep-release/pysoundanalyser_de.ts b/prep-release/pysoundanalyser_de.ts
@@ -668,12 +668,12 @@ Bits: {3}</source>
 <context>
     <name>applyChanges</name>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="303"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="302"/>
         <source>There are unsaved changes. Apply Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="312"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="311"/>
         <source>Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1720,22 +1720,22 @@ Bits: {3}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="203"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="202"/>
         <source>dpi value not valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>dpi value too small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="266"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="265"/>
         <source>custom</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/prep-release/pysoundanalyser_el.ts b/prep-release/pysoundanalyser_el.ts
@@ -668,12 +668,12 @@ Bits: {3}</source>
 <context>
     <name>applyChanges</name>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="303"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="302"/>
         <source>There are unsaved changes. Apply Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="312"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="311"/>
         <source>Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1720,22 +1720,22 @@ Bits: {3}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="203"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="202"/>
         <source>dpi value not valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>dpi value too small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="266"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="265"/>
         <source>custom</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/prep-release/pysoundanalyser_en_GB.ts b/prep-release/pysoundanalyser_en_GB.ts
@@ -668,12 +668,12 @@ Bits: {3}</source>
 <context>
     <name>applyChanges</name>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="303"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="302"/>
         <source>There are unsaved changes. Apply Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="312"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="311"/>
         <source>Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1720,22 +1720,22 @@ Bits: {3}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="203"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="202"/>
         <source>dpi value not valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>dpi value too small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="266"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="265"/>
         <source>custom</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/prep-release/pysoundanalyser_es.ts b/prep-release/pysoundanalyser_es.ts
@@ -668,12 +668,12 @@ Bits: {3}</source>
 <context>
     <name>applyChanges</name>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="303"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="302"/>
         <source>There are unsaved changes. Apply Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="312"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="311"/>
         <source>Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1720,22 +1720,22 @@ Bits: {3}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="203"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="202"/>
         <source>dpi value not valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>dpi value too small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="266"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="265"/>
         <source>custom</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/prep-release/pysoundanalyser_fr.ts b/prep-release/pysoundanalyser_fr.ts
@@ -678,12 +678,12 @@ Bits: {3}</source>
 <context>
     <name>applyChanges</name>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="303"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="302"/>
         <source>There are unsaved changes. Apply Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="312"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="311"/>
         <source>Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1750,22 +1750,22 @@ Bits: {3}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="203"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="202"/>
         <source>dpi value not valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>dpi value too small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="266"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="265"/>
         <source>custom</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/prep-release/pysoundanalyser_it.ts b/prep-release/pysoundanalyser_it.ts
@@ -777,12 +777,12 @@ Bits: {3}</source>
 <context>
     <name>applyChanges</name>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="303"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="302"/>
         <source>There are unsaved changes. Apply Changes?</source>
         <translation>Ci sono modifiche non salvate. Applicare le modifiche?</translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="312"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="311"/>
         <source>Apply Changes</source>
         <translation>Applica le modifiche</translation>
     </message>
@@ -1894,22 +1894,22 @@ Bits: {3}</source>
         <translation>Comando:</translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="203"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="202"/>
         <source>dpi value not valid</source>
         <translation>valore dpi non valido</translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>dpi value too small</source>
         <translation>valore dpi troppo piccolo</translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="266"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="265"/>
         <source>custom</source>
         <translation>personalizzato</translation>
     </message>

diff --git a/prep-release/pysoundanalyser_ru.ts b/prep-release/pysoundanalyser_ru.ts
@@ -668,12 +668,12 @@ Bits: {3}</source>
 <context>
     <name>applyChanges</name>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="303"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="302"/>
         <source>There are unsaved changes. Apply Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="312"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="311"/>
         <source>Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1720,22 +1720,22 @@ Bits: {3}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="203"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="202"/>
         <source>dpi value not valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="208"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="207"/>
         <source>dpi value too small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="266"/>
+        <location filename="../pysoundanalyser/dialog_edit_preferences.py" line="265"/>
         <source>custom</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/pysoundanalyser/dialog_edit_preferences.py b/pysoundanalyser/dialog_edit_preferences.py
@@ -20,16 +20,16 @@
 if pyqtversion == 4:
     from PyQt4 import QtGui, QtCore
     from PyQt4.QtCore import QLocale
-    from PyQt4.QtGui import QCheckBox, QComboBox, QDialog, QDialogButtonBox, QDoubleValidator, QGridLayout, QIntValidator, QLabel, QLineEdit, QPushButton, QTabWidget, QVBoxLayout, QWidget
+    from PyQt4.QtGui import QCheckBox, QColorDialog, QComboBox, QDialog, QDialogButtonBox, QDoubleValidator, QGridLayout, QIntValidator, QLabel, QLineEdit, QPushButton, QTabWidget, QVBoxLayout, QWidget
 elif pyqtversion == -4:
     from PySide import QtGui, QtCore
     from PySide.QtCore import QLocale
-    from PySide.QtGui import QCheckBox, QComboBox, QDialog, QDialogButtonBox, QDoubleValidator, QGridLayout, QIntValidator, QLabel, QLineEdit, QPushButton, QTabWidget, QVBoxLayout, QWidget
+    from PySide.QtGui import QCheckBox, QColorDialog, QComboBox, QDialog, QDialogButtonBox, QDoubleValidator, QGridLayout, QIntValidator, QLabel, QLineEdit, QPushButton, QTabWidget, QVBoxLayout, QWidget
 elif pyqtversion == 5:
     from PyQt5 import QtGui, QtCore
     from PyQt5.QtCore import QLocale
     from PyQt5.QtGui import QDoubleValidator, QIntValidator
-    from PyQt5.QtWidgets import QCheckBox, QComboBox, QDialog, QDialogButtonBox, QGridLayout, QLabel, QLineEdit, QPushButton, QTabWidget, QVBoxLayout, QWidget
+    from PyQt5.QtWidgets import QCheckBox, QColorDialog, QComboBox, QDialog, QDialogButtonBox, QGridLayout, QLabel, QLineEdit, QPushButton, QTabWidget, QVBoxLayout, QWidget
 
 import copy, pickle
 
@@ -193,8 +193,7 @@ def __init__(self, parent):
         layout.addWidget(self.tabWidget)
         layout.addWidget(buttonBox)
         self.setLayout(layout)
-        #grid = QGridLayout()
-        #n = 0
+
 
     def ondpiChange(self):
         try:

diff --git a/pysoundanalyser/global_parameters.py b/pysoundanalyser/global_parameters.py
@@ -82,6 +82,9 @@ def def_prefs(prm):
     if platform.system() == 'Windows':
         prm["pref"]["playCommand"] = 'winsound'
         prm["pref"]["playCommandType"] = 'winsound'
+    elif platform.system() == "Darwin":
+        prm["pref"]["playCommand"] = 'afplay'
+        prm["pref"]["playCommandType"] = QApplication.translate("Preferences Window","custom","")
     else:
         prm["pref"]["playCommand"] = 'aplay'
         prm["pref"]["playCommandType"] = 'aplay'