Mercurial Repositories > eric / changeset

changeset

Merged with default branch to get latest bug fixes. multi_processing

Sun, 02 Feb 2020 12:01:27 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 02 Feb 2020 12:01:27 +0100
branch
multi_processing
changeset 7386
3de001de249c
parent 7379
72a72fd56494 (current diff)
parent 7385
e8d48a7eb84b (diff)
child 7389
770ffcb88be5

Merged with default branch to get latest bug fixes.

eric6/QScintilla/Shell.py file | annotate | diff | comparison | revisions 
--- a/docs/changelog	Sat Feb 01 19:48:21 2020 +0100
+++ b/docs/changelog	Sun Feb 02 12:01:27 2020 +0100
@@ -1,6 +1,12 @@
 Change Log
 ----------
-Version 20.01:
+Version 20.3:
+- bug fixes
+
+Version 20.2:
+- bug fixes
+
+Version 20.1:
 - bug fixes
 - MicroPython
   -- added entries to the ESP menu to show the Chip ID, Flash ID and
--- a/eric6/WebBrowser/WebBrowserPage.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/WebBrowser/WebBrowserPage.py	Sun Feb 02 12:01:27 2020 +0100
@@ -18,7 +18,8 @@
 )
 try:
     from PyQt5.QtWebEngine import PYQT_WEBENGINE_VERSION
-except AttributeError:
+    # __IGNORE_EXCEPTION__
+except (AttributeError, ImportError):
     PYQT_WEBENGINE_VERSION = QT_VERSION
 from PyQt5.QtWebChannel import QWebChannel
 
--- a/eric6/eric6.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6.py	Sun Feb 02 12:01:27 2020 +0100
@@ -256,6 +256,9 @@
     
     sys.excepthook = excepthook
     
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_browser.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_browser.py	Sun Feb 02 12:01:27 2020 +0100
@@ -139,6 +139,9 @@
     """
     global app
     
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_browser.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_compare.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_compare.py	Sun Feb 02 12:01:27 2020 +0100
@@ -61,6 +61,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_compare.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_configure.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_configure.py	Sun Feb 02 12:01:27 2020 +0100
@@ -60,6 +60,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_configure.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_diff.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_diff.py	Sun Feb 02 12:01:27 2020 +0100
@@ -53,6 +53,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_diff.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_editor.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_editor.py	Sun Feb 02 12:01:27 2020 +0100
@@ -62,6 +62,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_editor.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_hexeditor.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_hexeditor.py	Sun Feb 02 12:01:27 2020 +0100
@@ -60,6 +60,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_hexeditor.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_iconeditor.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_iconeditor.py	Sun Feb 02 12:01:27 2020 +0100
@@ -60,6 +60,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_iconeditor.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_plugininstall.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_plugininstall.py	Sun Feb 02 12:01:27 2020 +0100
@@ -52,6 +52,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_plugininstall.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_pluginrepository.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_pluginrepository.py	Sun Feb 02 12:01:27 2020 +0100
@@ -52,6 +52,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_pluginrepository.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_pluginuninstall.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_pluginuninstall.py	Sun Feb 02 12:01:27 2020 +0100
@@ -52,6 +52,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_pluginuninstall.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_qregexp.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_qregexp.py	Sun Feb 02 12:01:27 2020 +0100
@@ -55,6 +55,9 @@
     """
     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"),
--- a/eric6/eric6_qregularexpression.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_qregularexpression.py	Sun Feb 02 12:01:27 2020 +0100
@@ -55,6 +55,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_qregularexpression.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_re.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_re.py	Sun Feb 02 12:01:27 2020 +0100
@@ -55,6 +55,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_re.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_shell.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_shell.py	Sun Feb 02 12:01:27 2020 +0100
@@ -55,6 +55,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_shell.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_snap.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_snap.py	Sun Feb 02 12:01:27 2020 +0100
@@ -52,6 +52,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_snap.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_sqlbrowser.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_sqlbrowser.py	Sun Feb 02 12:01:27 2020 +0100
@@ -59,6 +59,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_sqlbrowser.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_tray.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_tray.py	Sun Feb 02 12:01:27 2020 +0100
@@ -55,6 +55,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_tray.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_trpreviewer.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_trpreviewer.py	Sun Feb 02 12:01:27 2020 +0100
@@ -67,6 +67,9 @@
     """
     global app
     
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_trpreviewer.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_uipreviewer.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_uipreviewer.py	Sun Feb 02 12:01:27 2020 +0100
@@ -60,6 +60,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_uipreviewer.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6/eric6_unittest.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/eric6/eric6_unittest.py	Sun Feb 02 12:01:27 2020 +0100
@@ -61,6 +61,9 @@
     """
     Main entry point into the application.
     """
+    from PyQt5.QtGui import QGuiApplication
+    QGuiApplication.setDesktopFileName("eric6_unittest.desktop")
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/setup.py	Sat Feb 01 19:48:21 2020 +0100
+++ b/setup.py	Sun Feb 02 12:01:27 2020 +0100
@@ -65,6 +65,7 @@
     return filesList
 
 
+# TODO: add .desktop files for the eric6 tools
 def getDataFiles():
     """
     Function to return data_files in a platform dependent manner.

Mercurial Repository: eric

eric ide

mercurial