remove unneeded files
This commit is contained in:
@@ -1,41 +0,0 @@
|
||||
--- pds/environments.py.orig 2011-07-04 16:43:22.000000000 +0300
|
||||
+++ pds/environments.py 2014-01-13 23:48:50.387199790 +0200
|
||||
@@ -64,7 +64,7 @@
|
||||
ConfigPath = '$HOME/.config/xfce4/'
|
||||
ConfigFile = 'xfconf/xfce-perchannel-xml/xsettings.xml'
|
||||
ConfigType = 'xml'
|
||||
- DefaultIconTheme = 'hicolor'
|
||||
+ DefaultIconTheme = 'Faenza'
|
||||
DefaultConfigPath = '/etc/xdg/xfce4/%s' % ConfigFile
|
||||
IconKey = 'IconThemeName'
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
ConfigPath = '$HOME/.e/e/'
|
||||
ConfigFile = 'config/standard/e.cfg'
|
||||
ConfigType = 'env'
|
||||
- DefaultIconTheme = 'hicolor'
|
||||
+ DefaultIconTheme = 'Faenza'
|
||||
IconKey = 'E_ICON_THEME'
|
||||
|
||||
class LXDE(DefaultDe):
|
||||
@@ -83,9 +83,9 @@
|
||||
ConfigPath = '$HOME/.config'
|
||||
ConfigFile = ''
|
||||
ConfigType = None
|
||||
- DefaultIconTheme = 'oxygen'
|
||||
+ DefaultIconTheme = 'Faenza'
|
||||
IconKey = 'theme/name'
|
||||
- DefaultIconFile = '/usr/share/icons/lxde_pardus2011_menu.png'
|
||||
+ DefaultIconFile = '/usr/share/lxde/images/pisilinuxLogo.png'
|
||||
|
||||
class Fluxbox(DefaultDe):
|
||||
Name = 'fluxbox'
|
||||
@@ -93,7 +93,7 @@
|
||||
ConfigPath = '$HOME/.config'
|
||||
ConfigFile = ''
|
||||
ConfigType = None
|
||||
- DefaultIconTheme = 'oxygen'
|
||||
+ DefaultIconTheme = 'Faenza'
|
||||
|
||||
class Gnome(DefaultDe):
|
||||
Name = 'gnome'
|
||||
@@ -1,59 +0,0 @@
|
||||
diff -aur pds~/environments.py pds/environments.py
|
||||
--- pds~/environments.py 2014-01-13 22:59:36.000000000 +0100
|
||||
+++ pds/environments.py 2014-01-28 19:56:31.163320368 +0100
|
||||
@@ -113,3 +113,10 @@
|
||||
ConfigType = None
|
||||
DefaultIconTheme = 'oxygen'
|
||||
|
||||
+class Mate(DefaultDe):
|
||||
+ Name = 'mate'
|
||||
+ Version = '1.61'
|
||||
+ ConfigPath = '$HOME/.config/mate'
|
||||
+ ConfigFile = ''
|
||||
+ ConfigType = None
|
||||
+ DefaultIconTheme = 'matefaenza'
|
||||
diff -aur pds~/__init__.py pds/__init__.py
|
||||
--- pds~/__init__.py 2011-07-04 12:19:46.000000000 +0200
|
||||
+++ pds/__init__.py 2014-01-28 22:22:56.729985428 +0100
|
||||
@@ -14,8 +14,9 @@
|
||||
|
||||
# Pardus Desktop Services
|
||||
from os import path
|
||||
-from os import getenv
|
||||
from os import popen
|
||||
+from os import getenv
|
||||
+from os import environ
|
||||
|
||||
import piksemel
|
||||
import gettext
|
||||
@@ -32,7 +33,7 @@
|
||||
class Pds:
|
||||
|
||||
SupportedDesktops = (DefaultDe, Kde4, Kde3, Xfce, Enlightenment, LXDE,
|
||||
- Fluxbox, Gnome, Gnome3)
|
||||
+ Fluxbox, Gnome, Gnome3, Mate)
|
||||
|
||||
def __init__(self, catalogName='', debug=False):
|
||||
self._session = None
|
||||
@@ -148,12 +149,19 @@
|
||||
def session(self):
|
||||
if not self._session:
|
||||
env = getenv('DESKTOP_SESSION')
|
||||
- if env == 'default' or not env or env == 'gnome':
|
||||
+ if not env:
|
||||
+ for var in list(environ.keys()):
|
||||
+ v = var.split('_')
|
||||
+ if len(v) < 2: continue
|
||||
+ elif v[1] == 'DESKTOP':
|
||||
+ env = v[0].lower()
|
||||
+ break
|
||||
+ elif env == 'default' or env == 'gnome':
|
||||
session = readfile('/etc/default/desktop', DefaultDe.Name)
|
||||
env = session.split('=')[1].strip()
|
||||
for de in Pds.SupportedDesktops:
|
||||
if env:
|
||||
- if env in de.SessionTypes or env == de.Name:
|
||||
+ if env in de.SessionTypes or env.lower() == de.Name.lower():
|
||||
self._session = de
|
||||
else:
|
||||
if de.VersionKey:
|
||||
@@ -12,7 +12,6 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Pisi Linux Desktop Services</Summary>
|
||||
<Description>pisilinux-desktop-services is a wrapper python module for integrating various desktop environments using PyQt.</Description>
|
||||
<!--<Archive sha1sum="2cdaa83b77295e7a1a38164b8ee295c5ad13af9a" type="targz">http://source.pisilinux.org/1.0/pds-1.2.6.tar.gz</Archive>-->
|
||||
<Archive sha1sum="2351a0e61002047309742e3df0c792e7060afbec" type="targz">https://github.com/PisiLinuxNew/pds/archive/2.0.0.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>python-qt5-devel</Dependency>
|
||||
|
||||
Reference in New Issue
Block a user