Mercurial Repositories > eric / file comparison
comparison: eric5_diff.py
eric5_diff.py
- changeset 2087
- 795992a5c561
- parent 1509
- c0b5e693b0eb
- child 2302
- f29e9405c851
equal
deleted
inserted
replaced
| 2085:b4c1f0b6dac2 | 2087:795992a5c561 |
|---|---|
| 14 | 14 |
| 15 import sys | 15 import sys |
| 16 | 16 |
| 17 for arg in sys.argv: | 17 for arg in sys.argv: |
| 18 if arg.startswith("--config="): | 18 if arg.startswith("--config="): |
| 19 import Utilities | 19 import Globals |
| 20 configDir = arg.replace("--config=", "") | 20 configDir = arg.replace("--config=", "") |
| 21 Utilities.setConfigDir(configDir) | 21 Globals.setConfigDir(configDir) |
| 22 sys.argv.remove(arg) | 22 sys.argv.remove(arg) |
| 23 break | 23 break |
| 24 | 24 |
| 25 from Utilities import Startup | 25 from Globals import AppInfo |
| 26 | |
| 27 from Toolbox import Startup | |
| 26 | 28 |
| 27 | 29 |
| 28 def createMainWidget(argv): | 30 def createMainWidget(argv): |
| 29 """ | 31 """ |
| 30 Function to create the main widget. | 32 Function to create the main widget. |
| 42 """ | 44 """ |
| 43 options = [\ | 45 options = [\ |
| 44 ("--config=configDir", | 46 ("--config=configDir", |
| 45 "use the given directory as the one containing the config files"), | 47 "use the given directory as the one containing the config files"), |
| 46 ] | 48 ] |
| 47 appinfo = Startup.makeAppInfo(sys.argv, | 49 appinfo = AppInfo.makeAppInfo(sys.argv, |
| 48 "Eric5 Diff", | 50 "Eric5 Diff", |
| 49 "", | 51 "", |
| 50 "Simple graphical diff tool", | 52 "Simple graphical diff tool", |
| 51 options) | 53 options) |
| 52 res = Startup.simpleAppStartup(sys.argv, | 54 res = Startup.simpleAppStartup(sys.argv, |
