jyapayne/Electrify
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fixed a bug where index.html was copied into the main folder and errored out trying to load resources.

Browse source
This commit is contained in:
Joey Payne 2014-11-18 11:50:35 +13:00
commit 44dd95ce7b
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
files/nw-versions.txt
View file

@ -1,4 +1,5 @@
0.11.0-rc1 0.11.0-rc1
0.11.0
0.10.5 0.10.5
0.10.4 0.10.4
0.10.3 0.10.3

BIN
icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 36 KiB

16
main.py
View file

@ -354,6 +354,7 @@ class MainWindow(QtGui.QWidget):
def __init__(self, width, height, parent=None): def __init__(self, width, height, parent=None):
super(MainWindow, self).__init__(parent) super(MainWindow, self).__init__(parent)
self.setWindowIcon(QtGui.QIcon('icon.png'))
self.update_json = False self.update_json = False
self.setup_nw_versions() self.setup_nw_versions()
@ -631,7 +632,6 @@ class MainWindow(QtGui.QWidget):
self.progress_label.setText(str(value)) self.progress_label.setText(str(value))
def runInBackground(self, method_name, callback): def runInBackground(self, method_name, callback):
self.thread = BackgroundThread(self, method_name) self.thread = BackgroundThread(self, method_name)
self.thread.finished.connect(callback) self.thread.finished.connect(callback)
self.thread.start() self.thread.start()
@ -668,12 +668,10 @@ class MainWindow(QtGui.QWidget):
if f: if f:
f.close() f.close()
def doneGettingVersions(self): def doneGettingVersions(self):
self.ex_button.setEnabled(self.requiredSettingsFilled()) self.ex_button.setEnabled(self.requiredSettingsFilled())
self.progress_text = 'Done retrieving versions.' self.progress_text = 'Done retrieving versions.'
def makeOutputFilesInBackground(self): def makeOutputFilesInBackground(self):
self.ex_button.setEnabled(False) self.ex_button.setEnabled(False)
self.runInBackground('makeOutputDirs', self.doneMakingFiles) self.runInBackground('makeOutputDirs', self.doneMakingFiles)
@ -1225,11 +1223,13 @@ class MainWindow(QtGui.QWidget):
for sgroup in self._setting_groups: for sgroup in self._setting_groups:
for setting in sgroup.values(): for setting in sgroup.values():
if setting.type == 'file' and setting.value: if setting.type == 'file' and setting.value:
try: f_path = setting.value.replace(self.projectDir(),'')
shutil.copy(setting.value, self.projectDir()) if not os.path.exists(f_path):
setting.value = os.path.basename(setting.value) try:
except shutil.Error as e:#same file warning shutil.copy(setting.value, self.projectDir())
log( 'Warning: {}'.format(e)) setting.value = os.path.basename(setting.value)
except shutil.Error as e:#same file warning
log( 'Warning: {}'.format(e))
os.chdir(old_dir) os.chdir(old_dir)