Mercurial Repositories > eric / file diff

--- a/scripts/install.py	Thu Dec 09 20:07:08 2021 +0100
+++ b/scripts/install.py	Sat Dec 11 16:04:36 2021 +0100
@@ -175,8 +175,8 @@
           " defining a")
     print("dictionary called 'cfg' with the keys 'ericDir', 'ericPixDir',"
           " 'ericIconDir',")
-    print("'ericDTDDir', 'ericCSSDir', 'ericStylesDir', 'ericDocDir',"
-          " 'ericExamplesDir',")
+    print("'ericDTDDir', 'ericCSSDir', 'ericStylesDir', 'ericThemesDir',")
+    print(" 'ericDocDir', ericExamplesDir',")
     print("'ericTranslationsDir', 'ericTemplatesDir', 'ericCodeTemplatesDir',")
     print("'ericOthersDir','bindir', 'mdir' and 'apidir.")
     print("These define the directories for the installation of the various"
@@ -537,7 +537,8 @@
         for name in ['ericExamplesDir', 'ericDocDir', 'ericDTDDir',
                      'ericCSSDir', 'ericIconDir', 'ericPixDir',
                      'ericTemplatesDir', 'ericCodeTemplatesDir',
-                     'ericOthersDir', 'ericStylesDir', 'ericDir']:
+                     'ericOthersDir', 'ericStylesDir', 'ericThemesDir',
+                     'ericDir']:
             if os.path.exists(getConfig(name)):
                 shutil.rmtree(getConfig(name), True)
         
@@ -758,6 +759,10 @@
             cfg['ericStylesDir'],
             ['*.qss', '*.ehj'])
         copyTree(
+            os.path.join(eric7SourceDir, "Themes"),
+            cfg['ericThemesDir'],
+            ['*.qss', '*.ethj'])
+        copyTree(
             os.path.join(eric7SourceDir, "i18n"),
             cfg['ericTranslationsDir'],
             ['*.qm'])
@@ -1215,6 +1220,7 @@
         'ericDTDDir': os.path.join(ericdir, "DTDs"),
         'ericCSSDir': os.path.join(ericdir, "CSSs"),
         'ericStylesDir': os.path.join(ericdir, "Styles"),
+        'ericThemesDir': os.path.join(ericdir, "Themes"),
         'ericDocDir': os.path.join(ericdir, "Documentation"),
         'ericExamplesDir': os.path.join(ericdir, "Examples"),
         'ericTranslationsDir': os.path.join(ericdir, "i18n"),
@@ -1231,7 +1237,7 @@
             cfg['apidir'] = os.path.join(ericdir, "api")
     else:
         cfg['apidir'] = ""
-configLength = 15
+configLength = 16
     
 
 def createConfig():
@@ -1281,17 +1287,18 @@
         """    'ericDTDDir': r'{3}',\n"""
         """    'ericCSSDir': r'{4}',\n"""
         """    'ericStylesDir': r'{5}',\n"""
-        """    'ericDocDir': r'{6}',\n"""
-        """    'ericExamplesDir': r'{7}',\n"""
-        """    'ericTranslationsDir': r'{8}',\n"""
-        """    'ericTemplatesDir': r'{9}',\n"""
-        """    'ericCodeTemplatesDir': r'{10}',\n"""
-        """    'ericOthersDir': r'{11}',\n"""
-        """    'bindir': r'{12}',\n"""
-        """    'mdir': r'{13}',\n"""
-        """    'apidir': r'{14}',\n"""
-        """    'apis': {15},\n"""
-        """{16}"""
+        """    'ericThemesDir': r'{6}',\n"""
+        """    'ericDocDir': r'{7}',\n"""
+        """    'ericExamplesDir': r'{8}',\n"""
+        """    'ericTranslationsDir': r'{9}',\n"""
+        """    'ericTemplatesDir': r'{10}',\n"""
+        """    'ericCodeTemplatesDir': r'{11}',\n"""
+        """    'ericOthersDir': r'{12}',\n"""
+        """    'bindir': r'{13}',\n"""
+        """    'mdir': r'{14}',\n"""
+        """    'apidir': r'{15}',\n"""
+        """    'apis': {16},\n"""
+        """{17}"""
         """}}\n"""
         """\n"""
         """def getConfig(name):\n"""
@@ -1314,7 +1321,7 @@
     ).format(
         cfg['ericDir'], cfg['ericPixDir'], cfg['ericIconDir'],
         cfg['ericDTDDir'], cfg['ericCSSDir'],
-        cfg['ericStylesDir'], cfg['ericDocDir'],
+        cfg['ericStylesDir'], cfg['ericThemesDir'], cfg['ericDocDir'],
         cfg['ericExamplesDir'], cfg['ericTranslationsDir'],
         cfg['ericTemplatesDir'],
         cfg['ericCodeTemplatesDir'], cfg['ericOthersDir'],