diff --git a/picard/tagger.py b/picard/tagger.py
index 40096b364..babcb0be3 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -662,12 +662,16 @@ Options:
-d, --debug enable debug-level logging
-h, --help display this help and exit
-v, --version display version information and exit
+ -V, --long-version display long version information and exit
""" % (sys.argv[0],)
def version():
print "%s %s %s" % (PICARD_ORG_NAME, PICARD_APP_NAME, PICARD_FANCY_VERSION_STR)
+def longversion():
+ print versions.as_string()
+
def main(localedir=None, autoupdate=True):
# Some libs (ie. Phonon) require those to be set
@@ -675,13 +679,16 @@ def main(localedir=None, autoupdate=True):
QtGui.QApplication.setOrganizationName(PICARD_ORG_NAME)
signal.signal(signal.SIGINT, signal.SIG_DFL)
- opts, args = getopt.gnu_getopt(sys.argv[1:], "hvd", ["help", "version", "debug"])
+ opts, args = getopt.gnu_getopt(sys.argv[1:], "hvdV", ["help", "version",
+ "debug", "long-version"])
kwargs = {}
for opt, arg in opts:
if opt in ("-h", "--help"):
return help()
elif opt in ("-v", "--version"):
return version()
+ elif opt in ("-V", "--long-version"):
+ return longversion()
elif opt in ("-d", "--debug"):
kwargs["debug"] = True
tagger = Tagger(args, localedir, autoupdate, **kwargs)
diff --git a/picard/ui/options/about.py b/picard/ui/options/about.py
index fb7abd6a4..83d17cdd5 100644
--- a/picard/ui/options/about.py
+++ b/picard/ui/options/about.py
@@ -57,20 +57,22 @@ class AboutOptionsPage(OptionsPage):
else:
args["translator-credits"] = ""
+ args['third_parties_versions'] = '
'.join([u"%s %s" %
+ (versions.version_name(name), value) for name, value
+ in versions.as_dict(i18n=True).items()
+ if name != 'version'])
text = _(u"""
MusicBrainz Picard
Version %(version)s
-PyQt %(pyqt-version)s
-Mutagen %(mutagen-version)s
-Discid %(discid-version)s
+%(third_parties_versions)s
Supported formats
%(formats)s
Please donate
Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.
Credits
-Copyright © 2004-2014 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s
Official website
%(picard-doc-url)s