From c2ea0e0970cc33cebeb487b9d144abb7d39067cc Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/desktop-effects-kde@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- 25enable-compiz | 4 ++-- DesktopEffects/DesktopEffectsCommon.py | 26 +++++++++++++------------- DesktopEffects/DesktopEffectsKDE.py | 4 ++-- DesktopEffects/DesktopEffectsKDE4.py | 6 +++--- desktop-effects-kde | 4 ++-- desktop-effects-kde4 | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25enable-compiz b/25enable-compiz index 69ca556..323c584 100644 --- a/25enable-compiz +++ b/25enable-compiz @@ -1,3 +1,3 @@ -if [ -e $HOME/.kde3/share/config/compizasWM ] ; then - export KDEWM="/opt/kde3/bin/compiz" +if [ -e $HOME/.trinity/share/config/compizasWM ] ; then + export KDEWM="/opt/trinity/bin/compiz" fi 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 diff --git a/desktop-effects-kde b/desktop-effects-kde index 145cca7..431c180 100755 --- a/desktop-effects-kde +++ b/desktop-effects-kde @@ -24,9 +24,9 @@ window. __copyright__ = "Copyright © 2007 Martin Böhm and the Kubuntu Team" __author__ = "Kubuntu Team " import sys -sys.path.append("/opt/kde3/share/pyshared") +sys.path.append("/opt/trinity/share/pyshared") -if sys.argv[0].endswith("kde3"): +if sys.argv[0].endswith("trinity"): from DesktopEffects.DesktopEffectsKDE import DesktopEffectsKDE as DesktopEffects else: from DesktopEffects.DesktopEffectsKDE4 import DesktopEffectsKDE4 as DesktopEffects diff --git a/desktop-effects-kde4 b/desktop-effects-kde4 index 0c8f3ae..b876a79 100755 --- a/desktop-effects-kde4 +++ b/desktop-effects-kde4 @@ -26,7 +26,7 @@ window. __copyright__ = "Copyright © 2007 Martin Böhm and the Kubuntu Team" __author__ = "Kubuntu Team " import sys -sys.path.append("/opt/kde3/share/pyshared") +sys.path.append("/opt/trinity/share/pyshared") from DesktopEffects.DesktopEffectsKDE4 import DesktopEffectsKDE4 as DesktopEffects de = DesktopEffects() -- cgit v1.2.3