diff options
| author | Brianna | 2017-06-25 10:40:48 -0400 |
|---|---|---|
| committer | GitHub | 2017-06-25 10:40:48 -0400 |
| commit | 55423ca4aa206ec9a082942ca89da7dcb4f452bc (patch) | |
| tree | c65d2d5c908f472389dee4d1e03f8fe88e88dacf /src/core.py | |
| parent | 1bb67d1513122ca7fb02e60a92339bd1a73dbee3 (diff) | |
| parent | a2838a0c3898f999e71f76e6e8d5691155438aea (diff) | |
Merge pull request #35 from djfun/newgui-bugfixes
Newgui bugfixes
Diffstat (limited to 'src/core.py')
| -rw-r--r-- | src/core.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/core.py b/src/core.py index c80d60e..fdba1c4 100644 --- a/src/core.py +++ b/src/core.py @@ -29,6 +29,7 @@ class Core(): else: # unfrozen self.wd = os.path.dirname(os.path.realpath(__file__)) + self.componentsPath = os.path.join(self.wd, 'components') self.loadEncoderOptions() self.videoFormats = Core.appendUppercase([ @@ -66,14 +67,12 @@ class Core(): def findComponents(self): def findComponents(): - srcPath = os.path.join(self.wd, 'components') - if os.path.exists(srcPath): - for f in sorted(os.listdir(srcPath)): - name, ext = os.path.splitext(f) - if name.startswith("__"): - continue - elif ext == '.py': - yield name + for f in sorted(os.listdir(self.componentsPath)): + name, ext = os.path.splitext(f) + if name.startswith("__"): + continue + elif ext == '.py': + yield name self.modules = [ import_module('components.%s' % name) for name in findComponents() @@ -93,10 +92,12 @@ class Core(): return None component = self.modules[moduleIndex].Component( - moduleIndex, compPos, self) + moduleIndex, compPos, self + ) self.selectedComponents.insert( compPos, - component) + component + ) self.componentListChanged() # init component's widget for loading/saving presets @@ -177,6 +178,7 @@ class Core(): for i, tup in enumerate(data['Components']): name, vers, preset = tup clearThis = False + modified = False # add loaded named presets to savedPresets dict if 'preset' in preset and preset['preset'] is not None: @@ -186,6 +188,7 @@ class Core(): origSaveValueStore = self.getPreset(filepath2) if origSaveValueStore: self.savedPresets[nam] = dict(origSaveValueStore) + modified = not origSaveValueStore == preset else: # saved preset was renamed or deleted clearThis = True @@ -217,7 +220,7 @@ class Core(): if clearThis: self.clearPreset(i) if hasattr(loader, 'updateComponentTitle'): - loader.updateComponentTitle(i) + loader.updateComponentTitle(i, modified) except: errcode = 1 data = sys.exc_info() |