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

Fixed some issues with mac export.

Browse source
This commit is contained in:
Joey Payne 2014-09-29 09:06:53 +13:00
commit 9d49f8069b
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main.py
View file

@ -88,7 +88,7 @@ class Setting(object):
if location: if location:
self.save_path = location self.save_path = location
else: else:
self.save_path = DEFAULT_DOWNLOAD_PATH self.save_path = self.save_path or DEFAULT_DOWNLOAD_PATH
self.get_file_information_from_url() self.get_file_information_from_url()
if self.full_file_path: if self.full_file_path:
@ -165,11 +165,11 @@ class MainWindow(QtGui.QWidget):
} }
win_32_dir_prefix = 'node-webkit-v{}-win-ia32' win_32_dir_prefix = 'node-webkit-v{}-win-ia32'
mac_32_dir_prefix = 'node-webkit-v{}-mac-ia32' mac_32_dir_prefix = 'node-webkit-v{}-osx-ia32'
linux_32_dir_prefix = 'node-webkit-v{}-linux-ia32' linux_32_dir_prefix = 'node-webkit-v{}-linux-ia32'
win_64_dir_prefix = 'node-webkit-v{}-win-x64' win_64_dir_prefix = 'node-webkit-v{}-win-x64'
mac_64_dir_prefix = 'node-webkit-v{}-mac-x64' mac_64_dir_prefix = 'node-webkit-v{}-osx-x64'
linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' linux_64_dir_prefix = 'node-webkit-v{}-linux-x64'
@ -1048,6 +1048,9 @@ class MainWindow(QtGui.QWidget):
log( 'Warning: Json file invalid.') log( 'Warning: Json file invalid.')
self.ex_button.setEnabled(self.requiredSettingsFilled())
def load_from_json(self, json_str): def load_from_json(self, json_str):
dic = json.loads(json_str) dic = json.loads(json_str)
self.original_packagejson = dic self.original_packagejson = dic