From eaee0ab233709c18324dbb25f38b59c95c447e3c Mon Sep 17 00:00:00 2001 From: DH4 Date: Fri, 26 May 2017 23:06:47 -0500 Subject: Removed hardcoded parameters. Defaults loaded at runtime. --- main.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'main.py') diff --git a/main.py b/main.py index 9f608d8..3915c71 100644 --- a/main.py +++ b/main.py @@ -36,6 +36,7 @@ class Command(QtCore.QObject): self.args = self.parser.parse_args() self.settings = QSettings('settings.ini', QSettings.IniFormat) + LoadDefaultSettings(self) # load colours as tuples from comma-separated strings self.textColor = core.Core.RGBFromString(self.settings.value("textColor", '255, 255, 255')) @@ -106,6 +107,8 @@ class Command(QtCore.QObject): self.settings.setValue("textColor", '%s,%s,%s' % self.textColor) sys.exit(0) + + class Main(QtCore.QObject): newTask = QtCore.pyqtSignal(str, str, QFont, int, int, int, int, tuple, tuple) @@ -119,6 +122,8 @@ class Main(QtCore.QObject): self.window = window self.core = core.Core() self.settings = QSettings('settings.ini', QSettings.IniFormat) + + LoadDefaultSettings(self) # load colors as tuples from a comma-separated string self.textColor = core.Core.RGBFromString(self.settings.value("textColor", '255, 255, 255')) @@ -314,6 +319,23 @@ class Main(QtCore.QObject): self.window.lineEdit_visColor.setText(RGBstring) window.pushButton_visColor.setStyleSheet(btnStyle) +def LoadDefaultSettings(self): + default = { + "outputWidth": 1280, + "outputHeight": 720, + "outputFrameRate": 30, + "outputAudioCodec": "aac", + "outputAudioBitrate": "192k", + "outputVideoCodec": "libx264", + "outputVideoFormat": "yuv420p", + "outputPreset": "medium", + "outputFormat": "mp4" + } + + for parm, value in default.items(): + if self.settings.value(parm) == None: + self.settings.setValue(parm,value) + if len(sys.argv) > 1: # command line mode app = QtGui.QApplication(sys.argv, False) -- cgit v1.2.3