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

Fixed an issue with Web2Exe overwriting an already formed package.json.

Browse source
This commit is contained in:
Joey Payne 2014-04-04 08:32:49 -06:00
commit 684bb7f43e
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
main.py
View file

@ -149,6 +149,7 @@ class MainWindow(QtGui.QWidget):
self.httpGetId = 0 self.httpGetId = 0
self.httpRequestAborted = False self.httpRequestAborted = False
self.thread = None self.thread = None
self.original_packagejson = {}
self.resize(width,height) self.resize(width,height)
@ -719,8 +720,12 @@ class MainWindow(QtGui.QWidget):
return hlayout return hlayout
def generate_json(self): def generate_json(self):
dic = {'webkit':{}, if 'webkit' not in self.original_packagejson:
'window':{}} self.original_packagejson['webkit'] = {}
if 'window' not in self.original_packagejson:
self.original_packagejson['window'] = {}
dic = self.original_packagejson
for setting_name, setting in self.app_settings.items(): for setting_name, setting in self.app_settings.items():
if setting.value is not None: if setting.value is not None:
@ -761,9 +766,10 @@ class MainWindow(QtGui.QWidget):
def load_from_json(self, json_str): def load_from_json(self, json_str):
dic = json.loads(json_str) dic = json.loads(json_str)
stack = [dic] self.original_packagejson = dic
stack = [('root',dic)]
while stack: while stack:
new_dic = stack.pop() parent, new_dic = stack.pop()
for item in new_dic: for item in new_dic:
setting_field = self.findChildByName(item) setting_field = self.findChildByName(item)
setting = self.getSetting(item) setting = self.getSetting(item)
@ -776,7 +782,7 @@ class MainWindow(QtGui.QWidget):
setting_field.setChecked(new_dic[item]) setting_field.setChecked(new_dic[item])
setting.value = new_dic[item] setting.value = new_dic[item]
if isinstance(new_dic[item], dict): if isinstance(new_dic[item], dict):
stack.append(new_dic[item]) stack.append((item,new_dic[item]))
def convert_val_to_str(self, val): def convert_val_to_str(self, val):
if isinstance(val, (list,tuple)): if isinstance(val, (list,tuple)):