Changeset 0445c6b2dd1d…
Parent 6e72e090ea24…
by
Changes to one file · Browse files at 0445c6b2dd1d Showing diff from parent 6e72e090ea24 Diff from another changeset...
@@ -40,7 +40,6 @@ nonrepo_commands = '''userconfig shellconfig clone debugcomplete init
about help version thgstatus serve'''
-mainapp = None
def dispatch(args):
"""run the command specified in args"""
try:
@@ -239,7 +238,6 @@ raise error.RepoError(_("There is no Mercurial repository here"
" (.hg not found)"))
- cmdoptions['mainapp'] = True
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
return _runcommand(lui, options, cmd, d)
@@ -297,13 +295,17 @@def qtrun(dlgfunc, ui, *args, **opts):
portable_fork(ui, opts)
- global mainapp
- if mainapp:
+ if QtGui.QApplication.instance():
dlg = dlgfunc(ui, *args, **opts)
dlg.show()
return
mainapp = QtGui.QApplication(sys.argv)
+ # default org is used by QSettings
+ mainapp.setApplicationName('TortoiseHg')
+ mainapp.setOrganizationName('TortoiseHg')
+ mainapp.setOrganizationDomain('tortoisehg.org')
+ mainapp.setApplicationVersion(thgversion.version())
try:
dlg = dlgfunc(ui, *args, **opts)
dlg.show()
|
Loading...