Mercurial Repositories > eric / file comparison
comparison: eric6_diff.py
eric6_diff.py
- changeset 4343
- afe0da217745
- parent 4289
- 6c1ab651c9ce
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4341:1ff0929aab09 | 4343:afe0da217745 |
|---|---|
| 15 from __future__ import unicode_literals | 15 from __future__ import unicode_literals |
| 16 | 16 |
| 17 import Toolbox.PyQt4ImportHook # __IGNORE_WARNING__ | 17 import Toolbox.PyQt4ImportHook # __IGNORE_WARNING__ |
| 18 | 18 |
| 19 try: # Only for Py2 | 19 try: # Only for Py2 |
| 20 import Utilities.compatibility_fixes # __IGNORE_WARNING__ | 20 import Globals.compatibility_fixes # __IGNORE_WARNING__ |
| 21 except (ImportError): | 21 except (ImportError): |
| 22 pass | 22 pass |
| 23 | 23 |
| 24 import sys | 24 import sys |
| 25 import os | |
| 25 | 26 |
| 26 for arg in sys.argv: | 27 for arg in sys.argv[:]: |
| 27 if arg.startswith("--config="): | 28 if arg.startswith("--config="): |
| 28 import Globals | 29 import Globals |
| 29 configDir = arg.replace("--config=", "") | 30 configDir = arg.replace("--config=", "") |
| 30 Globals.setConfigDir(configDir) | 31 Globals.setConfigDir(configDir) |
| 31 sys.argv.remove(arg) | 32 sys.argv.remove(arg) |
| 32 break | 33 elif arg.startswith("--settings="): |
| 34 from PyQt5.QtCore import QSettings | |
| 35 settingsDir = os.path.expanduser(arg.replace("--settings=", "")) | |
| 36 if not os.path.isdir(settingsDir): | |
| 37 os.makedirs(settingsDir) | |
| 38 QSettings.setPath(QSettings.IniFormat, QSettings.UserScope, | |
| 39 settingsDir) | |
| 40 sys.argv.remove(arg) | |
| 33 | 41 |
| 34 from Globals import AppInfo | 42 from Globals import AppInfo |
| 35 | 43 |
| 36 from Toolbox import Startup | 44 from Toolbox import Startup |
| 37 | 45 |
| 52 Main entry point into the application. | 60 Main entry point into the application. |
| 53 """ | 61 """ |
| 54 options = [ | 62 options = [ |
| 55 ("--config=configDir", | 63 ("--config=configDir", |
| 56 "use the given directory as the one containing the config files"), | 64 "use the given directory as the one containing the config files"), |
| 65 ("--settings=settingsDir", | |
| 66 "use the given directory to store the settings files"), | |
| 57 ] | 67 ] |
| 58 appinfo = AppInfo.makeAppInfo(sys.argv, | 68 appinfo = AppInfo.makeAppInfo(sys.argv, |
| 59 "Eric6 Diff", | 69 "Eric6 Diff", |
| 60 "", | 70 "", |
| 61 "Simple graphical diff tool", | 71 "Simple graphical diff tool", |
