Skip to content

Commit 41d371c

Browse files
authored
Merge pull request #3169 from ferdnyc/delay-app-import
launch.py: Fix command-line output
2 parents 1ec4d24 + f2bc30b commit 41d371c

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

src/launch.py

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
#!/usr/bin/env python3
22

3-
"""
3+
"""
44
@file
55
@brief This file is used to launch OpenShot
66
@author Jonathan Thomas <[email protected]>
77
@author Noah Figg <[email protected]>
8-
8+
99
@mainpage OpenShot Video Editor 2.0
10-
10+
1111
Welcome to the OpenShot Video Editor 2.0 PyQt5 documentation. OpenShot was developed to
1212
make high-quality video editing and animation solutions freely available to the world. With a focus
1313
on stability, performance, and ease-of-use, we believe OpenShot is the best cross-platform,
1414
open-source video editing application in the world!
15-
16-
This documentation is auto-generated by Doxygen, using the doxypy Python filter. If you are
17-
interested in how OpenShot Video Editor is designed, feel free to dive in, because this
15+
16+
This documentation is auto-generated by Doxygen, using the doxypy Python filter. If you are
17+
interested in how OpenShot Video Editor is designed, feel free to dive in, because this
1818
documentation was built just for you. If you are not a developer, please feel free to visit
19-
our main website (http://www.openshot.org/download/), and download a copy today for Linux, Mac, or Windows.
19+
our main website (http://www.openshot.org/download/), and download a copy today for Linux, Mac, or Windows.
2020
2121
@section LICENSE
22-
22+
2323
Copyright (c) 2008-2018 OpenShot Studios, LLC
2424
(http://www.openshotstudios.com). This file is part of
2525
OpenShot Video Editor (http://www.openshot.org), an open-source project
2626
dedicated to delivering high quality video editing and animation solutions
2727
to the world.
28-
28+
2929
OpenShot Video Editor is free software: you can redistribute it and/or modify
3030
it under the terms of the GNU General Public License as published by
3131
the Free Software Foundation, either version 3 of the License, or
3232
(at your option) any later version.
33-
33+
3434
OpenShot Video Editor is distributed in the hope that it will be useful,
3535
but WITHOUT ANY WARRANTY; without even the implied warranty of
3636
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3737
GNU General Public License for more details.
38-
38+
3939
You should have received a copy of the GNU General Public License
4040
along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
4141
"""
4242

4343
import sys
44-
from argparse import ArgumentParser, REMAINDER
44+
import argparse
4545

4646
try:
4747
from classes import info
@@ -52,21 +52,20 @@
5252
from classes import info
5353
print("Loaded modules from installed directory: %s" % info.PATH)
5454

55-
from classes.app import OpenShotApp
56-
5755

5856
def main():
5957
""""Initialize settings (not implemented) and create main window/application."""
6058

61-
parser = ArgumentParser(description = 'OpenShot version ' + info.SETUP['version'])
59+
parser = argparse.ArgumentParser(description = 'OpenShot version ' + info.SETUP['version'])
6260
parser.add_argument('-l', '--lang', action='store',
6361
help='language code for interface (overrides '
6462
'preferences and system environment)')
6563
parser.add_argument('--list-languages', dest='list_languages',
6664
action='store_true', help='List all language '
6765
'codes supported by OpenShot')
6866
parser.add_argument('-V', '--version', action='store_true')
69-
parser.add_argument('remain', nargs=REMAINDER)
67+
parser.add_argument('remain', nargs=argparse.REMAINDER,
68+
help=argparse.SUPPRESS)
7069

7170
args = parser.parse_args()
7271

@@ -90,6 +89,8 @@ def main():
9089
sys.exit(-1)
9190

9291
# Create Qt application, pass any unprocessed arguments
92+
from classes.app import OpenShotApp
93+
9394
argv = [sys.argv[0]]
9495
for arg in args.remain:
9596
argv.append(arg)

0 commit comments

Comments
 (0)