Mercurial Repositories > eric / changeset

--- a/eric6.e4p	Sun Oct 11 17:58:00 2020 +0200
+++ b/eric6.e4p	Mon Oct 12 17:23:15 2020 +0200
@@ -1572,8 +1572,6 @@
     <Source>eric6/eric6_pluginuninstall.py</Source>
     <Source>eric6/eric6_pluginuninstall.pyw</Source>
     <Source>eric6/eric6_post_install.py</Source>
-    <Source>eric6/eric6_qregexp.py</Source>
-    <Source>eric6/eric6_qregexp.pyw</Source>
     <Source>eric6/eric6_qregularexpression.py</Source>
     <Source>eric6/eric6_qregularexpression.pyw</Source>
     <Source>eric6/eric6_re.py</Source>

--- a/eric6/eric6_qregexp.py	Sun Oct 11 17:58:00 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2004 - 2020 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Eric6 QRegExp.
-
-This is the main Python script that performs the necessary initialization
-of the QRegExp wizard module and starts the Qt event loop. This is a standalone
-version of the integrated QRegExp wizard.
-"""
-
-# TODO: delete deprecated QRegExp wizard or move to external plug-in
-import sys
-import os
-
-sys.path.insert(1, os.path.dirname(__file__))
-
-for arg in sys.argv[:]:
-    if arg.startswith("--config="):
-        import Globals
-        configDir = arg.replace("--config=", "")
-        Globals.setConfigDir(configDir)
-        sys.argv.remove(arg)
-    elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
-        settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
-        if not os.path.isdir(settingsDir):
-            os.makedirs(settingsDir)
-        QSettings.setPath(QSettings.IniFormat, QSettings.UserScope,
-                          settingsDir)
-        sys.argv.remove(arg)
-
-from Globals import AppInfo
-
-from Toolbox import Startup
-
-
-def createMainWidget(argv):
-    """
-    Function to create the main widget.
-    
-    @param argv list of commandline parameters (list of strings)
-    @return reference to the main widget (QWidget)
-    """
-    from Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog import (
-        QRegExpWizardWindow
-    )
-    return QRegExpWizardWindow()
-
-
-def main():
-    """
-    Main entry point into the application.
-    """
-    from PyQt5.QtGui import QGuiApplication
-    QGuiApplication.setDesktopFileName("eric6_qregexp.desktop")
-    
-    options = [
-        ("--config=configDir",
-         "use the given directory as the one containing the config files"),
-        ("--settings=settingsDir",
-         "use the given directory to store the settings files"),
-    ]
-    appinfo = AppInfo.makeAppInfo(sys.argv,
-                                  "Eric6 QRegExp",
-                                  "",
-                                  "Regexp editor for Qt's QRegExp class",
-                                  options)
-    res = Startup.simpleAppStartup(sys.argv,
-                                   appinfo,
-                                   createMainWidget)
-    sys.exit(res)
-
-if __name__ == '__main__':
-    main()

--- a/eric6/eric6_qregexp.pyw	Sun Oct 11 17:58:00 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2011 - 2020 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Module implementing the Windows entry point.
-"""
-
-
-from eric6_qregexp import main
-
-main()