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

Fixed more issues with directory parsing.

Browse source
This commit is contained in:
Joey Payne 2014-12-20 15:03:47 +13:00
commit 27ef3ba5a5
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main.py
View file

@ -468,6 +468,7 @@ class MainWindow(QtGui.QWidget, CommandBase):
directory = QtGui.QFileDialog.getExistingDirectory(self, "Find Project Directory", directory = QtGui.QFileDialog.getExistingDirectory(self, "Find Project Directory",
self.project_dir() or QtCore.QDir.currentPath()) self.project_dir() or QtCore.QDir.currentPath())
if directory: if directory:
directory = directory.replace('\\', '\\\\')
self.reset_settings() self.reset_settings()
self.input_line.setText(directory) self.input_line.setText(directory)
self.output_line.setText(os.path.join(directory, 'output')) self.output_line.setText(os.path.join(directory, 'output'))
@ -500,6 +501,7 @@ class MainWindow(QtGui.QWidget, CommandBase):
self.project_dir() or self.project_dir() or
QtCore.QDir.currentPath())) QtCore.QDir.currentPath()))
if directory: if directory:
directory = directory.replace('\\', '\\\\')
self.output_line.setText(directory) self.output_line.setText(directory)
self.update_json = True self.update_json = True
@ -511,6 +513,7 @@ class MainWindow(QtGui.QWidget, CommandBase):
setting.file_types) setting.file_types)
if file_path: if file_path:
file_path = file_path.replace(self.project_dir()+os.path.sep, '') file_path = file_path.replace(self.project_dir()+os.path.sep, '')
file_path = file_path.replace('\\', '\\\\')
text_obj.setText(file_path) text_obj.setText(file_path)
setting.last_value = file_path setting.last_value = file_path
@ -520,6 +523,7 @@ class MainWindow(QtGui.QWidget, CommandBase):
QtCore.QDir.currentPath())) QtCore.QDir.currentPath()))
if folder: if folder:
folder = folder.replace(self.project_dir()+os.path.sep, '') folder = folder.replace(self.project_dir()+os.path.sep, '')
folder = folder.replace('\\', '\\\\')
text_obj.setText(folder) text_obj.setText(folder)
setting.last_value = folder setting.last_value = folder
@ -763,7 +767,9 @@ class MainWindow(QtGui.QWidget, CommandBase):
for setting in setting_list: for setting in setting_list:
setting_field = self.find_child_by_name(setting.name) setting_field = self.find_child_by_name(setting.name)
if setting_field: if setting_field:
if setting.type == 'file' or setting.type == 'string' or setting.type == 'folder': if (setting.type == 'file' or
setting.type == 'string' or
setting.type == 'folder'):
val_str = self.convert_val_to_str(setting.value) val_str = self.convert_val_to_str(setting.value)
setting_field.setText(val_str) setting_field.setText(val_str)
if setting.type == 'check': if setting.type == 'check':