Mercurial Repositories > eric / file comparison
comparison: eric7/eric7_diff.py
eric7/eric7_diff.py
- branch
- eric7
- changeset 8318
- 962bce857696
- parent 8314
- e3642a6a1e71
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8316:0c7a44af84bc | 8318:962bce857696 |
|---|---|
| 22 import Globals | 22 import Globals |
| 23 configDir = arg.replace("--config=", "") | 23 configDir = arg.replace("--config=", "") |
| 24 Globals.setConfigDir(configDir) | 24 Globals.setConfigDir(configDir) |
| 25 sys.argv.remove(arg) | 25 sys.argv.remove(arg) |
| 26 elif arg.startswith("--settings="): | 26 elif arg.startswith("--settings="): |
| 27 from PyQt5.QtCore import QSettings | 27 from PyQt6.QtCore import QSettings |
| 28 settingsDir = os.path.expanduser(arg.replace("--settings=", "")) | 28 settingsDir = os.path.expanduser(arg.replace("--settings=", "")) |
| 29 if not os.path.isdir(settingsDir): | 29 if not os.path.isdir(settingsDir): |
| 30 os.makedirs(settingsDir) | 30 os.makedirs(settingsDir) |
| 31 QSettings.setPath( | 31 QSettings.setPath( |
| 32 QSettings.Format.IniFormat, QSettings.Scope.UserScope, settingsDir) | 32 QSettings.Format.IniFormat, QSettings.Scope.UserScope, settingsDir) |
| 50 | 50 |
| 51 def main(): | 51 def main(): |
| 52 """ | 52 """ |
| 53 Main entry point into the application. | 53 Main entry point into the application. |
| 54 """ | 54 """ |
| 55 from PyQt5.QtGui import QGuiApplication | 55 from PyQt6.QtGui import QGuiApplication |
| 56 QGuiApplication.setDesktopFileName("eric7_diff.desktop") | 56 QGuiApplication.setDesktopFileName("eric7_diff.desktop") |
| 57 | 57 |
| 58 options = [ | 58 options = [ |
| 59 ("--config=configDir", | 59 ("--config=configDir", |
| 60 "use the given directory as the one containing the config files"), | 60 "use the given directory as the one containing the config files"), |
