summaryrefslogtreecommitdiffstats
path: root/DesktopEffects
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
commitc2ea0e0970cc33cebeb487b9d144abb7d39067cc (patch)
tree36a7c8d4f5a3cd5b88f1f7fe291440af04655f5e /DesktopEffects
parent7e131609b72da5327ec3d0d1cbfd8508b3ca257d (diff)
downloaddesktop-effects-tde-c2ea0e0970cc33cebeb487b9d144abb7d39067cc.zip
desktop-effects-tde-c2ea0e0970cc33cebeb487b9d144abb7d39067cc.tar.gz
Convert remaining references to kde3 (e.g. in paths) to trinityv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/desktop-effects-kde@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'DesktopEffects')
-rw-r--r--DesktopEffects/DesktopEffectsCommon.py26
-rwxr-xr-xDesktopEffects/DesktopEffectsKDE.py4
-rwxr-xr-xDesktopEffects/DesktopEffectsKDE4.py6
3 files changed, 18 insertions, 18 deletions
diff --git a/DesktopEffects/DesktopEffectsCommon.py b/DesktopEffects/DesktopEffectsCommon.py
index 2212b02..9206afb 100644
--- a/DesktopEffects/DesktopEffectsCommon.py
+++ b/DesktopEffects/DesktopEffectsCommon.py
@@ -44,13 +44,13 @@ class DesktopEffectsCommon(object):
self.action = 0
self.ibText = ""
self.check()
- self.DATADIR = "/opt/kde3/share/apps/desktop-effects-kde/"
+ self.DATADIR = "/opt/trinity/share/apps/desktop-effects-kde/"
def checkInstalled(self):
progress = OpProgress()
cache = apt_pkg.GetCache(progress)
for pkg in cache.Packages:
- if pkg.Name == "compiz-kde-kde3":
+ if pkg.Name == "compiz-kde-trinity":
if pkg.CurrentVer is not None:
return True
# otherwise
@@ -58,8 +58,8 @@ class DesktopEffectsCommon(object):
def checkEnabled(self):
'''checks if the compizasWM file is present, and if so, reads what mode we are in'''
- if os.path.exists(os.path.expanduser("~/.kde3/share/config/compizasWM")):
- compizasWM = open(os.path.expanduser("~/.kde3/share/config/compizasWM"))
+ if os.path.exists(os.path.expanduser("~/.trinity/share/config/compizasWM")):
+ compizasWM = open(os.path.expanduser("~/.trinity/share/config/compizasWM"))
state = compizasWM.readline()
return state
else:
@@ -121,7 +121,7 @@ class DesktopEffectsCommon(object):
elif self.action == 4:
self.enableCustomEffects()
if not self.enabled and not self.action == 1:
- os.spawnl(os.P_NOWAIT, "/opt/kde3/bin/compiz", "--replace")
+ os.spawnl(os.P_NOWAIT, "/opt/trinity/bin/compiz", "--replace")
self.enabled = True
def btnInstallClicked(self):
@@ -130,7 +130,7 @@ class DesktopEffectsCommon(object):
return
try:
''' Installs the Compiz package. Not very nice as it is distribution dependent. '''
- subprocess.call(['kdesudo', '-c' '/opt/kde3/bin/adept_batch install compiz-kde-kde3 compiz-fusion-plugins-main-kde3 compiz-fusion-plugins-extra-kde3'])
+ subprocess.call(['kdesudo', '-c' '/opt/trinity/bin/adept_batch install compiz-kde-trinity compiz-fusion-plugins-main-trinity compiz-fusion-plugins-extra-trinity'])
except:
subprocess.call(['kdialog', '--sorry', 'Adept Batch is not installed on this system'])
self.check()
@@ -158,14 +158,14 @@ class DesktopEffectsCommon(object):
if removeAnswer == 0:
try:
''' Remove the Compiz package. Not very nice as it is distribution dependent. '''
- subprocess.call(['kdesudo', '-c' '/opt/kde3/bin/adept_batch remove compiz-kde-kde3 compiz-fusion-plugins-main-kde3 compiz-fusion-plugins-extra-kde3'])
+ subprocess.call(['kdesudo', '-c' '/opt/trinity/bin/adept_batch remove compiz-kde-trinity compiz-fusion-plugins-main-trinity compiz-fusion-plugins-extra-trinity'])
except:
subprocess.call(['kdialog', '--sorry', 'Adept Batch is not installed on this system'])
def disableEffects(self):
'''remove compiz as the default WM'''
- os.remove(os.path.expanduser("~/.kde3/share/config/compizasWM"))
+ os.remove(os.path.expanduser("~/.trinity/share/config/compizasWM"))
self.enabled = False
@@ -173,7 +173,7 @@ class DesktopEffectsCommon(object):
'''copy the .ini to Default.ini and enable compiz as default WM'''
code = os.system('mkdir -p ~/.config/compiz/compizconfig')
try:
- enable = open(os.path.expanduser("~/.kde3/share/config/compizasWM"),"w")
+ enable = open(os.path.expanduser("~/.trinity/share/config/compizasWM"),"w")
if enable.readline() == "custom":
customeffects = open(os.path.expanduser("~/.config/compiz/compizconfig/Default.ini"),"r")
backupfile = open(os.path.expanduser("~/.config/compiz/compizconfig/Custom.ini"),"w")
@@ -194,8 +194,8 @@ class DesktopEffectsCommon(object):
def enableExtraEffects(self):
''' copy the extraeffects.ini to Default.ini and enable compiz as defaultWM'''
code = os.system('mkdir -p ~/.config/compiz/compizconfig')
- if os.path.exists(os.path.expanduser("~/.kde3/share/config/compizasWM")):
- enable = open(os.path.expanduser("~/.kde3/share/config/compizasWM"),"r")
+ if os.path.exists(os.path.expanduser("~/.trinity/share/config/compizasWM")):
+ enable = open(os.path.expanduser("~/.trinity/share/config/compizasWM"),"r")
if enable.readline() == "custom":
customeffects = open(os.path.expanduser("~/.config/compiz/compizconfig/Default.ini"),"r")
backupfile = open(os.path.expanduser("~/.config/compiz/compizconfig/Custom.ini"),"w")
@@ -204,7 +204,7 @@ class DesktopEffectsCommon(object):
customeffects.close()
enable.close()
- enable = open(os.path.expanduser("~/.kde3/share/config/compizasWM"),"w")
+ enable = open(os.path.expanduser("~/.trinity/share/config/compizasWM"),"w")
enable.write("extraeffects")
enable.close()
config = open(os.path.join(self.DATADIR,"HighEffects.ini"),"r")
@@ -221,7 +221,7 @@ class DesktopEffectsCommon(object):
except:
print "no custom effects file, creating blank .ini" #DEBUG
config = open(os.path.join(self.DATADIR,"BlankEffects.ini"),"r")
- enable = open(os.path.expanduser("~/.kde3/share/config/compizasWM"),"w")
+ enable = open(os.path.expanduser("~/.trinity/share/config/compizasWM"),"w")
enable.write("custom")
enable.close()
dest = open(os.path.expanduser("~/.config/compiz/compizconfig/Default.ini"),"w")
diff --git a/DesktopEffects/DesktopEffectsKDE.py b/DesktopEffects/DesktopEffectsKDE.py
index 4888d2b..e9f427b 100755
--- a/DesktopEffects/DesktopEffectsKDE.py
+++ b/DesktopEffects/DesktopEffectsKDE.py
@@ -51,7 +51,7 @@ class DesktopEffectsKDE(DesktopEffectsDialog, DesktopEffectsCommon):
DesktopEffectsDialog.__init__(self)
# bind the locale
localesApp="desktop-effects"
- localesDir="/opt/kde3/share/locale"
+ localesDir="/opt/trinity/share/locale"
gettext.bindtextdomain(localesApp, localesDir)
gettext.textdomain(localesApp)
# initialize variables
@@ -116,7 +116,7 @@ class DesktopEffectsKDE(DesktopEffectsDialog, DesktopEffectsCommon):
progress = OpProgress()
cache = apt_pkg.GetCache(progress)
for pkg in cache.Packages:
- if pkg.Name == "compiz-kde-kde3":
+ if pkg.Name == "compiz-kde-trinity":
if pkg.CurrentVer is not None:
return True
# otherwise
diff --git a/DesktopEffects/DesktopEffectsKDE4.py b/DesktopEffects/DesktopEffectsKDE4.py
index ca32dac..b1d8ce9 100755
--- a/DesktopEffects/DesktopEffectsKDE4.py
+++ b/DesktopEffects/DesktopEffectsKDE4.py
@@ -56,7 +56,7 @@ class DesktopEffectsKDE4(DesktopEffectsCommon):
self.ui.setupUi(self.qd)
localesApp="desktop-effects-kde"
- localesDir="/opt/kde3/share/locale"
+ localesDir="/opt/trinity/share/locale"
gettext.bindtextdomain(localesApp, localesDir)
gettext.textdomain(localesApp)
@@ -102,8 +102,8 @@ class DesktopEffectsKDE4(DesktopEffectsCommon):
DesktopEffectsCommon.check(self)
self.ui.packageText.setText(self.pText)
self.ui.installButton.setText(self.ibText)
- if os.path.exists(os.path.expanduser("~/.kde3/share/config/compizasWM")):
- compizasWM = open(os.path.expanduser("~/.kde3/share/config/compizasWM"))
+ if os.path.exists(os.path.expanduser("~/.trinity/share/config/compizasWM")):
+ compizasWM = open(os.path.expanduser("~/.trinity/share/config/compizasWM"))
state = compizasWM.readline()
if state == "standardeffects":
self.action = 2