raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Modify loading file from the command line to only load files ending with osz, oszl, or otz.

Browse Source
This commit is contained in:
Jonathan Springer 2014-04-01 14:58:22 -04:00
parent 6ca37531a0
commit d26b34aee0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/core/ui/mainwindow.py
View File

@ -597,10 +597,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
args = [] args = []
for a in self.arguments: for a in self.arguments:
args.extend([a]) args.extend([a])
filename = args[0] for arg in args:
if not isinstance(filename, str): filename = arg
filename = str(filename, sys.getfilesystemencoding()) if not isinstance(filename, str):
self.service_manager_contents.load_file(filename) filename = str(filename, sys.getfilesystemencoding())
if filename.endswith(('.osz', '.oszl', '.otz')):
self.service_manager_contents.load_file(filename)
elif Settings().value(self.general_settings_section + '/auto open'): elif Settings().value(self.general_settings_section + '/auto open'):
self.service_manager_contents.load_Last_file() self.service_manager_contents.load_Last_file()
self.timer_version_id = self.startTimer(1000) self.timer_version_id = self.startTimer(1000)