some improvement

PisiLinuxNew · Jun 2, 2022 · 6d3166a · 6d3166a
1 parent 12fb563
commit 6d3166a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/pds/__init__.py b/pds/__init__.py
@@ -32,7 +32,7 @@
 
 class Pds:
 
-    SupportedDesktops = (DefaultDe, Kde5, Kde4, Kde3, Xfce, Enlightenment, LXDE,
+    SupportedDesktops = (DefaultDe, Kde5, Xfce, Enlightenment, LXDE, LxQt, Lumina, Cinnamon, 
                         Fluxbox, Gnome, Gnome3, Mate)
 
     def __init__(self, catalogName='', debug=False):

diff --git a/pds/environments.py b/pds/environments.py
@@ -111,3 +111,19 @@ class Mate(DefaultDe):
     ConfigFile           = ''
     ConfigType           = None
     DefaultIconTheme     = 'mate'
+
+class Lumina(DefaultDe):
+    Name                 = 'lumina'
+    Version              = '1.6'
+    ConfigPath           = '$HOME/.config/lumina'
+    ConfigFile           = ''
+    ConfigType           = None
+    DefaultIconTheme     = 'adwaita'
+
+class Cinnamon(DefaultDe):
+    Name                 = 'cinnamon'
+    Version              = '5.2'
+    ConfigPath           = '$HOME/.config/cinnamon'
+    ConfigFile           = ''
+    ConfigType           = None
+    DefaultIconTheme     = 'adwaita'
diff --git a/pds/qiconloader.py b/pds/qiconloader.py
@@ -81,6 +81,7 @@ def __init__(self, pds = None, debug = False, forceCache = False):
 
         logging.debug('Icon Dirs : %s' % ','.join(self.iconDirs))
         self.themeIndex = self.readThemeIndex(self.themeName)
+        #self.extraIcons = ['/usr/share/pixmaps/icons']
         self.extraIcons = ['/usr/share/pixmaps', '/usr/share/pixmaps/icons']
         self.updateAvailableIcons()
 
@@ -143,6 +144,7 @@ def __get_icons(self, themeName = ''):
         for iconDir in self.extraIcons:
             if path.exists(iconDir):
                 icons.extend(glob(path.join(iconDir, '*.png')))
+            	icons.extend(glob(path.join(iconDir, '*.svg')))
 
         _icons = map(lambda a: a.split('/')[-1][:-4], icons)
 
@@ -177,10 +179,12 @@ def findIconHelper(self, size = int, themeName = str, iconName = str):
                         pixmap.load(fileName)
                         logging.debug('Icon: %s found in theme %s' % \
                                 (iconName, themeName))
+                        #print "pixmap ->{}".format(fileName)
                         return pixmap
                     elif path.exists(fileName_svg):
                         pixmap.load(fileName_svg)
                         logging.debug('Icon: %s found in %s' % (iconName, iconDir))
+                        #print "pixmap ->{}".format(fileName_svg)
                         return pixmap
 
         for iconDir in self.extraIcons:
@@ -193,11 +197,11 @@ def findIconHelper(self, size = int, themeName = str, iconName = str):
                 return pixmap
             elif path.exists(fileName_svg):
                     image=QImage(size, size, QImage.Format_RGB32)
-                    reader=QImageReader(fileName)
+                    reader=QImageReader(fileName_svg)
                     reader.read(image)
                     pixmap.convertFromImage(image)
                     logging.debug('Icon: %s found in %s' % (iconName, iconDir))
-                    #print "pixmap ->{}".format(fileName)
+                    #print "pixmap ->{}".format(fileName_svg)
                     return pixmap
 
         if len(self._themes) > 0:
@@ -267,7 +271,7 @@ def load(self, name, size = 128, forceCache = False):
             return icon.pixmap(QSize(size, size))
         return pix
 
-    def loadOverlayed(self, name, overlay = None, size = 128, overlay_size = 16, position = 2):
+    def loadOverlayed(self, name, overlay = None, size = 128, overlay_size = 16, position = 0):
 
         if not overlay:
             return self.load(name, size)