From 7797774b72287c9e17f3420a68b683839ac09e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 23 Dec 2018 05:02:07 +0100 Subject: Drop Qt4 / KDE4 parts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- DesktopEffects/DesktopEffectsKDE4.py | 146 -------------- DesktopEffects/DesktopEffectsQt4Dialog.py | 225 --------------------- data/DesktopEffectsQt4Dialog.ui | 320 ------------------------------ desktop-effects-tde | 6 +- desktop-effects-tde.desktop | 2 +- desktop-effects-tde4 | 32 --- 6 files changed, 3 insertions(+), 728 deletions(-) delete mode 100755 DesktopEffects/DesktopEffectsKDE4.py delete mode 100644 DesktopEffects/DesktopEffectsQt4Dialog.py delete mode 100644 data/DesktopEffectsQt4Dialog.ui delete mode 100755 desktop-effects-tde4 diff --git a/DesktopEffects/DesktopEffectsKDE4.py b/DesktopEffects/DesktopEffectsKDE4.py deleted file mode 100755 index 28648b0..0000000 --- a/DesktopEffects/DesktopEffectsKDE4.py +++ /dev/null @@ -1,146 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright 2007-2008 Martin Böhm -# Copyright 2007-2008 Michael Anderson - -import sys -import os -from optparse import OptionParser -from PyQt4.QtGui import * -from PyQt4.QtCore import * -from PyQt4.QtSvg import * - -from DesktopEffectsQt4Dialog import Ui_Dialog -from DesktopEffectsCommon import DesktopEffectsCommon -import gettext - -def _(str): - ''' the traditional gettext function ''' - return unicode(gettext.gettext(str), 'UTF-8') - -def __(catalog,str): - ''' selects a different catalog for the str translation; - useful when you want to use the standard KDE labels. ''' - return unicode(gettext.dgettext(catalog, str), 'UTF-8') - -def utf8(str): - if isinstance(str, unicode): - return str - return unicode(str, 'UTF-8') - -class DesktopEffectsKDE4(DesktopEffectsCommon): - def __init__(self): - '''launches the app, draws the window ''' - # needed for all Qt actions - app = QApplication (sys.argv) - - # Qt4 explanations: - # self.qd is the link to the main QDialog (what you can see) - # self.ui is its UI (the UI defined in Qt-Designer - self.qd = QDialog() - self.ui = Ui_Dialog() - self.ui.setupUi(self.qd) - - localesApp="desktop-effects-tde" - localesDir="/opt/trinity/share/locale" - gettext.bindtextdomain(localesApp, localesDir) - gettext.textdomain(localesApp) - - # the Common class triggers some UI text settings, so we need to - # init the UI first - DesktopEffectsCommon.__init__(self) - - self.radioGroup = QButtonGroup(self.qd) - self.radioGroup.setExclusive(True) - self.radioGroup.addButton(self.ui.noEffectsButton) - self.radioGroup.addButton(self.ui.stdEffectsButton) - self.radioGroup.addButton(self.ui.extraEffectsButton) - self.radioGroup.addButton(self.ui.customEffectsButton) - - # connect signals and slots -- we have to do it ourselves in Qt4 - QObject.connect(self.ui.installButton, SIGNAL("clicked()"), self.btnInstallClicked) - QObject.connect(self.ui.done, SIGNAL("clicked()"), self.done) - QObject.connect(self.ui.apply, SIGNAL("clicked()"), self.apply) - # connect radio buttons - methods provided by the Common class - QObject.connect(self.ui.noEffectsButton, SIGNAL("clicked()"), self.noEffects) - QObject.connect(self.ui.stdEffectsButton, SIGNAL("clicked()"), self.standardEffects) - QObject.connect(self.ui.extraEffectsButton, SIGNAL("clicked()"), self.extraEffects) - QObject.connect(self.ui.customEffectsButton, SIGNAL("clicked()"), self.customEffects) - - self.ui.installButton.setText(_("Install")) - self.ui.warningText.setText(_("Desktop Effects are a great way to enjoy a modern desktop experience without transitioning to KDE4")) - self.ui.groupBox.setTitle(_("Effects Level")) - self.ui.noEffectsButton.setText(_("No Effects")) - self.ui.label_6.setText(_("All effects are disabled and KDE Window manager is used. This is the default behaviour.")) - self.ui.stdEffectsButton.setText(_("Standard Effects")) - self.ui.label_12.setText(_("Some simple effects.")) - self.ui.extraEffectsButton.setText(_("Extra Effects")) - self.ui.label_14.setText(_("You\'ll need sunglasses")) - self.ui.customEffectsButton.setText(_("Custom Effects")) - self.ui.label_16.setText(_("Use custom settings from another settings manager. Switching from this option to another will back up any custom settings")) - self.ui.apply.setText(_("Apply")) - self.ui.done.setText(_("Done")) - self.qd.show() - sys.exit(self.qd.exec_()) - - def check(self): - ''' overrides the DesktopEffectsCommon.check() method, does some painting ''' - DesktopEffectsCommon.check(self) - self.ui.packageText.setText(self.pText) - self.ui.installButton.setText(self.ibText) - 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 - self.ui.stdEffectsButton.toggle() - elif state == "extraeffects": - self.action = 3 - self.ui.extraEffectsButton.toggle() - elif state == "custom": - self.action = 4 - self.ui.customEffectsButton.toggle() - else: - self.action = 1 - self.ui.noEffectsButton.toggle() - def apply(self): - DesktopEffectsCommon.apply(self) - if self.action == 1: - print "hi" - os.popen("twin --replace &") - - def showWarning(self): - ''' shows the warning box if the package is installed ''' - self.ui.warningText.show() - self.ui.warningIcon.show() - - def hideWarning(self): - ''' hides the warning because the package is not yet there ''' - self.ui.warningText.hide() - self.ui.warningIcon.hide() - - def enable(self): - ''' enables the radio boxes, compiz is installed ''' - self.ui.groupBox.setDisabled(False) - - def disable(self): - ''' disables the group box, you have to install compiz first ''' - self.ui.groupBox.setDisabled(True) - - def close(self): - ''' triggers the QDialog to close ''' - self.qd.close() diff --git a/DesktopEffects/DesktopEffectsQt4Dialog.py b/DesktopEffects/DesktopEffectsQt4Dialog.py deleted file mode 100644 index b7cbd3a..0000000 --- a/DesktopEffects/DesktopEffectsQt4Dialog.py +++ /dev/null @@ -1,225 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'data/DesktopEffectsQt4Dialog.ui' -# -# Created: Wed Mar 12 21:46:04 2008 -# by: PyQt4 UI code generator 4.3.3 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -class Ui_Dialog(object): - def setupUi(self, Dialog): - Dialog.setObjectName("Dialog") - Dialog.resize(QtCore.QSize(QtCore.QRect(0,0,744,512).size()).expandedTo(Dialog.minimumSizeHint())) - - self.vboxlayout = QtGui.QVBoxLayout(Dialog) - self.vboxlayout.setObjectName("vboxlayout") - - self.hboxlayout = QtGui.QHBoxLayout() - self.hboxlayout.setObjectName("hboxlayout") - - spacerItem = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Minimum) - self.hboxlayout.addItem(spacerItem) - - self.label_2 = QtGui.QLabel(Dialog) - self.label_2.setObjectName("label_2") - self.hboxlayout.addWidget(self.label_2) - - self.packageText = QtGui.QLabel(Dialog) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.packageText.sizePolicy().hasHeightForWidth()) - self.packageText.setSizePolicy(sizePolicy) - self.packageText.setWordWrap(True) - self.packageText.setObjectName("packageText") - self.hboxlayout.addWidget(self.packageText) - - self.installButton = QtGui.QPushButton(Dialog) - self.installButton.setObjectName("installButton") - self.hboxlayout.addWidget(self.installButton) - self.vboxlayout.addLayout(self.hboxlayout) - - self.hboxlayout1 = QtGui.QHBoxLayout() - self.hboxlayout1.setObjectName("hboxlayout1") - - self.warningIcon = QtGui.QLabel(Dialog) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.warningIcon.sizePolicy().hasHeightForWidth()) - self.warningIcon.setSizePolicy(sizePolicy) - self.warningIcon.setObjectName("warningIcon") - self.hboxlayout1.addWidget(self.warningIcon) - - self.warningText = QtGui.QLabel(Dialog) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred,QtGui.QSizePolicy.Maximum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.warningText.sizePolicy().hasHeightForWidth()) - self.warningText.setSizePolicy(sizePolicy) - self.warningText.setWordWrap(True) - self.warningText.setObjectName("warningText") - self.hboxlayout1.addWidget(self.warningText) - self.vboxlayout.addLayout(self.hboxlayout1) - - self.groupBox = QtGui.QGroupBox(Dialog) - self.groupBox.setObjectName("groupBox") - - self.gridlayout = QtGui.QGridLayout(self.groupBox) - self.gridlayout.setObjectName("gridlayout") - - self.hboxlayout2 = QtGui.QHBoxLayout() - self.hboxlayout2.setObjectName("hboxlayout2") - - self.vboxlayout1 = QtGui.QVBoxLayout() - self.vboxlayout1.setObjectName("vboxlayout1") - - self.noEffectsButton = QtGui.QRadioButton(self.groupBox) - self.noEffectsButton.setObjectName("noEffectsButton") - self.vboxlayout1.addWidget(self.noEffectsButton) - - self.label_6 = QtGui.QLabel(self.groupBox) - self.label_6.setWordWrap(True) - self.label_6.setObjectName("label_6") - self.vboxlayout1.addWidget(self.label_6) - self.hboxlayout2.addLayout(self.vboxlayout1) - - self.label_5 = QtGui.QLabel(self.groupBox) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth()) - self.label_5.setSizePolicy(sizePolicy) - self.label_5.setPixmap(QtGui.QPixmap("/usr/share/apps/desktop-effects-tde/noeffects.png")) - self.label_5.setObjectName("label_5") - self.hboxlayout2.addWidget(self.label_5) - self.gridlayout.addLayout(self.hboxlayout2,0,0,1,1) - - self.hboxlayout3 = QtGui.QHBoxLayout() - self.hboxlayout3.setObjectName("hboxlayout3") - - self.vboxlayout2 = QtGui.QVBoxLayout() - self.vboxlayout2.setObjectName("vboxlayout2") - - self.stdEffectsButton = QtGui.QRadioButton(self.groupBox) - self.stdEffectsButton.setObjectName("stdEffectsButton") - self.vboxlayout2.addWidget(self.stdEffectsButton) - - self.label_12 = QtGui.QLabel(self.groupBox) - self.label_12.setObjectName("label_12") - self.vboxlayout2.addWidget(self.label_12) - self.hboxlayout3.addLayout(self.vboxlayout2) - - self.label_13 = QtGui.QLabel(self.groupBox) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_13.sizePolicy().hasHeightForWidth()) - self.label_13.setSizePolicy(sizePolicy) - self.label_13.setPixmap(QtGui.QPixmap("/usr/share/apps/desktop-effects-tde/standardeffects.png")) - self.label_13.setObjectName("label_13") - self.hboxlayout3.addWidget(self.label_13) - self.gridlayout.addLayout(self.hboxlayout3,1,0,1,1) - - self.hboxlayout4 = QtGui.QHBoxLayout() - self.hboxlayout4.setObjectName("hboxlayout4") - - self.vboxlayout3 = QtGui.QVBoxLayout() - self.vboxlayout3.setObjectName("vboxlayout3") - - self.extraEffectsButton = QtGui.QRadioButton(self.groupBox) - self.extraEffectsButton.setObjectName("extraEffectsButton") - self.vboxlayout3.addWidget(self.extraEffectsButton) - - self.label_14 = QtGui.QLabel(self.groupBox) - self.label_14.setObjectName("label_14") - self.vboxlayout3.addWidget(self.label_14) - self.hboxlayout4.addLayout(self.vboxlayout3) - - self.label_15 = QtGui.QLabel(self.groupBox) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_15.sizePolicy().hasHeightForWidth()) - self.label_15.setSizePolicy(sizePolicy) - self.label_15.setPixmap(QtGui.QPixmap("/usr/share/apps/desktop-effects-tde/extraeffects.png")) - self.label_15.setObjectName("label_15") - self.hboxlayout4.addWidget(self.label_15) - self.gridlayout.addLayout(self.hboxlayout4,2,0,1,1) - - self.hboxlayout5 = QtGui.QHBoxLayout() - self.hboxlayout5.setObjectName("hboxlayout5") - - self.vboxlayout4 = QtGui.QVBoxLayout() - self.vboxlayout4.setObjectName("vboxlayout4") - - self.customEffectsButton = QtGui.QRadioButton(self.groupBox) - self.customEffectsButton.setObjectName("customEffectsButton") - self.vboxlayout4.addWidget(self.customEffectsButton) - - self.label_16 = QtGui.QLabel(self.groupBox) - self.label_16.setWordWrap(True) - self.label_16.setObjectName("label_16") - self.vboxlayout4.addWidget(self.label_16) - self.hboxlayout5.addLayout(self.vboxlayout4) - - self.label_17 = QtGui.QLabel(self.groupBox) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_17.sizePolicy().hasHeightForWidth()) - self.label_17.setSizePolicy(sizePolicy) - self.label_17.setPixmap(QtGui.QPixmap("/usr/share/apps/desktop-effects-tde/extraeffects.png")) - self.label_17.setObjectName("label_17") - self.hboxlayout5.addWidget(self.label_17) - self.gridlayout.addLayout(self.hboxlayout5,3,0,1,1) - - spacerItem1 = QtGui.QSpacerItem(20,40,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding) - self.gridlayout.addItem(spacerItem1,4,0,1,1) - self.vboxlayout.addWidget(self.groupBox) - - self.hboxlayout6 = QtGui.QHBoxLayout() - self.hboxlayout6.setObjectName("hboxlayout6") - - spacerItem2 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum) - self.hboxlayout6.addItem(spacerItem2) - - self.apply = QtGui.QPushButton(Dialog) - self.apply.setObjectName("apply") - self.hboxlayout6.addWidget(self.apply) - - self.done = QtGui.QPushButton(Dialog) - self.done.setObjectName("done") - self.hboxlayout6.addWidget(self.done) - self.vboxlayout.addLayout(self.hboxlayout6) - - self.retranslateUi(Dialog) - QtCore.QMetaObject.connectSlotsByName(Dialog) - - def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "Compiz Desktop Effects", None, QtGui.QApplication.UnicodeUTF8)) - self.packageText.setText(QtGui.QApplication.translate("Dialog", "In order for Compiz Desktop Effects to work, the Compiz engine must be installed on your system.", None, QtGui.QApplication.UnicodeUTF8)) - self.installButton.setText(QtGui.QApplication.translate("Dialog", "Install", None, QtGui.QApplication.UnicodeUTF8)) - self.warningText.setText(QtGui.QApplication.translate("Dialog", "Desktop Effects are a great way to enjoy a modern desktop experience without transitioning to KDE4", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setTitle(QtGui.QApplication.translate("Dialog", "Effects Level", None, QtGui.QApplication.UnicodeUTF8)) - self.noEffectsButton.setText(QtGui.QApplication.translate("Dialog", "No Effects", None, QtGui.QApplication.UnicodeUTF8)) - self.label_6.setText(QtGui.QApplication.translate("Dialog", "All effects are disabled and KDE Window manager is used. This is the default behaviour.", None, QtGui.QApplication.UnicodeUTF8)) - self.stdEffectsButton.setText(QtGui.QApplication.translate("Dialog", "Standard Effects", None, QtGui.QApplication.UnicodeUTF8)) - self.label_12.setText(QtGui.QApplication.translate("Dialog", "Some simple effects.", None, QtGui.QApplication.UnicodeUTF8)) - self.extraEffectsButton.setText(QtGui.QApplication.translate("Dialog", "Extra Effects", None, QtGui.QApplication.UnicodeUTF8)) - self.label_14.setText(QtGui.QApplication.translate("Dialog", "You\'ll need sunglasses", None, QtGui.QApplication.UnicodeUTF8)) - self.customEffectsButton.setText(QtGui.QApplication.translate("Dialog", "Custom Effects", None, QtGui.QApplication.UnicodeUTF8)) - self.label_16.setText(QtGui.QApplication.translate("Dialog", "Use custom settings from another settings manager. Switching from this option to another will back up any custom settings", None, QtGui.QApplication.UnicodeUTF8)) - self.apply.setText(QtGui.QApplication.translate("Dialog", "Apply", None, QtGui.QApplication.UnicodeUTF8)) - self.done.setText(QtGui.QApplication.translate("Dialog", "Done", None, QtGui.QApplication.UnicodeUTF8)) - diff --git a/data/DesktopEffectsQt4Dialog.ui b/data/DesktopEffectsQt4Dialog.ui deleted file mode 100644 index 9058686..0000000 --- a/data/DesktopEffectsQt4Dialog.ui +++ /dev/null @@ -1,320 +0,0 @@ - - Dialog - - - - 0 - 0 - 744 - 512 - - - - Compiz Desktop Effects - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - In order for Compiz Desktop Effects to work, the Compiz engine must be installed on your system. - - - true - - - - - - - Install - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - Desktop Effects are a great way to enjoy a modern desktop experience without transitioning to KDE4 - - - true - - - - - - - - - Effects Level - - - - - - - - - - No Effects - - - - - - - All effects are disabled and TDE Window manager is used. This is the default behaviour. - - - true - - - - - - - - - - 0 - 0 - - - - - - - /usr/share/apps/desktop-effects-tde/noeffects.png - - - - - - - - - - - - - Standard Effects - - - - - - - Some simple effects. - - - - - - - - - - 0 - 0 - - - - - - - /usr/share/apps/desktop-effects-tde/standardeffects.png - - - - - - - - - - - - - Extra Effects - - - - - - - Over-the-top effects. - - - - - - - - - - 0 - 0 - - - - - - - /usr/share/apps/desktop-effects-tde/extraeffects.png - - - - - - - - - - - - - Custom Effects - - - - - - - Use custom settings from another settings manager. Switching from this option to another will back up any custom settings - - - true - - - - - - - - - - 0 - 0 - - - - - - - /usr/share/apps/desktop-effects-tde/extraeffects.png - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Apply - - - - - - - Done - - - - - - - - - - diff --git a/desktop-effects-tde b/desktop-effects-tde index 431c180..e675cf6 100755 --- a/desktop-effects-tde +++ b/desktop-effects-tde @@ -26,8 +26,6 @@ __author__ = "Kubuntu Team " import sys sys.path.append("/opt/trinity/share/pyshared") -if sys.argv[0].endswith("trinity"): +if sys.argv[0].endswith("tde"): from DesktopEffects.DesktopEffectsKDE import DesktopEffectsKDE as DesktopEffects -else: - from DesktopEffects.DesktopEffectsKDE4 import DesktopEffectsKDE4 as DesktopEffects -de = DesktopEffects() + de = DesktopEffects() diff --git a/desktop-effects-tde.desktop b/desktop-effects-tde.desktop index 889c520..fa50270 100644 --- a/desktop-effects-tde.desktop +++ b/desktop-effects-tde.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=Desktop Effects Comment=Compiz Setup Icon=kcmkwm -Exec=desktop-effects-tde4 +Exec=desktop-effects-tde Terminal=false Type=Application OnlyShowIn=TDE; diff --git a/desktop-effects-tde4 b/desktop-effects-tde4 deleted file mode 100755 index b876a79..0000000 --- a/desktop-effects-tde4 +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/python -# -*- coding: UTF-8 -*- - -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright 2007-2008 Martin Böhm -# Copyright 2007-2008 Michael Anderson - -"""Desktop Effects for KDE - -Without arguments, immediately loads the Desktop Effects Configuration -window. -""" - -__copyright__ = "Copyright © 2007 Martin Böhm and the Kubuntu Team" -__author__ = "Kubuntu Team " -import sys -sys.path.append("/opt/trinity/share/pyshared") - -from DesktopEffects.DesktopEffectsKDE4 import DesktopEffectsKDE4 as DesktopEffects -de = DesktopEffects() -- cgit v1.2.3