diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | client/config/Makefile.in | 2 | ||||
| -rw-r--r-- | client/config/configdialog.ui | 262 | ||||
| -rw-r--r-- | client/config/deKoratorconfig.cc | 94 | ||||
| -rw-r--r-- | client/config/deKoratorconfig.h | 8 | ||||
| -rw-r--r-- | client/config/themes.cpp | 132 | ||||
| -rw-r--r-- | client/config/themes.h | 28 | ||||
| -rw-r--r-- | client/config/themes.moc.cc | 72 | ||||
| -rw-r--r-- | client/deKoratorclient.cc | 458 | ||||
| -rw-r--r-- | client/deKoratorclient.h | 100 | ||||
| -rw-r--r-- | client/shadow.cpp | 14 | ||||
| -rw-r--r-- | client/shadow.h | 10 | ||||
| -rw-r--r-- | client/themes.moc.cc | 72 |
13 files changed, 627 insertions, 627 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 01b338b..e1b857c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ include( ConfigureChecks.cmake ) add_definitions( -DHAVE_CONFIG_H ) -set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/client/config/Makefile.in b/client/config/Makefile.in index db931cb..ab4cbac 100644 --- a/client/config/Makefile.in +++ b/client/config/Makefile.in @@ -819,6 +819,6 @@ configdialog.cc: $(srcdir)/configdialog.ui configdialog.h configdialog.moc configdialog.h: $(srcdir)/configdialog.ui rm -rf configdialog.h; - $(UIC) $(srcdir)/configdialog.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> configdialog.h ; + $(UIC) $(srcdir)/configdialog.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <tqwizard.h>,#include <kwizard.h>,g" >> configdialog.h ; configdialog.moc: configdialog.h $(MOC) configdialog.h -o configdialog.moc diff --git a/client/config/configdialog.ui b/client/config/configdialog.ui index 0fd4ee1..bce071a 100644 --- a/client/config/configdialog.ui +++ b/client/config/configdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigDialog</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>generalbox</cstring> </property> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>titlealign</cstring> </property> @@ -65,7 +65,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignLeft</cstring> </property> @@ -79,7 +79,7 @@ <string></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignHCenter</cstring> </property> @@ -96,7 +96,7 @@ <string></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignRight</cstring> </property> @@ -112,7 +112,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup6</cstring> </property> @@ -123,7 +123,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useShdtextChkBox</cstring> </property> @@ -134,7 +134,7 @@ <string>Alt+U</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout15</cstring> </property> @@ -142,7 +142,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup7</cstring> </property> @@ -156,7 +156,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout11</cstring> </property> @@ -164,7 +164,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -175,7 +175,7 @@ <string>X :</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>activeShdtextXSpinBox</cstring> </property> @@ -189,7 +189,7 @@ <number>-3</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_2</cstring> </property> @@ -200,7 +200,7 @@ <string>Y :</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>activeShdtextYSpinBox</cstring> </property> @@ -216,7 +216,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout10</cstring> </property> @@ -224,7 +224,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_6</cstring> </property> @@ -250,7 +250,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup7_2</cstring> </property> @@ -264,7 +264,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout11_2</cstring> </property> @@ -272,7 +272,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_4</cstring> </property> @@ -283,7 +283,7 @@ <string>X :</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>inActiveShdtextXSpinBox</cstring> </property> @@ -297,7 +297,7 @@ <number>-3</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_2_3</cstring> </property> @@ -308,7 +308,7 @@ <string>Y :</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>inActiveShdtextYSpinBox</cstring> </property> @@ -324,7 +324,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout14</cstring> </property> @@ -332,7 +332,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_6_3</cstring> </property> @@ -362,7 +362,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup9</cstring> </property> @@ -373,7 +373,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout17</cstring> </property> @@ -381,7 +381,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout16</cstring> </property> @@ -389,7 +389,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_3</cstring> </property> @@ -397,7 +397,7 @@ <string>X :</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>btnShiftXSpinBox</cstring> </property> @@ -408,7 +408,7 @@ <number>-3</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_2_2</cstring> </property> @@ -416,7 +416,7 @@ <string>Y :</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>btnShiftYSpinBox</cstring> </property> @@ -450,7 +450,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useMenuImageChkBox</cstring> </property> @@ -461,7 +461,7 @@ <string>Alt+F</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ignoreAppIcnCol</cstring> </property> @@ -469,7 +469,7 @@ <string>Ignore app icon colorizing</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>dblClkCloseChkBox</cstring> </property> @@ -480,7 +480,7 @@ <string>Alt+W</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showBtmBorderChkBox</cstring> </property> @@ -512,7 +512,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -523,7 +523,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -534,7 +534,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout19</cstring> </property> @@ -542,7 +542,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup14</cstring> </property> @@ -553,7 +553,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>colorizeActFramesChkBox</cstring> </property> @@ -564,7 +564,7 @@ <string>Alt+F</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>colorizeActButtonsChkBox</cstring> </property> @@ -577,7 +577,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup14_2</cstring> </property> @@ -588,7 +588,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>colorizeInActFramesChkBox</cstring> </property> @@ -599,7 +599,7 @@ <string>Alt+F</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>colorizeInActButtonsChkBox</cstring> </property> @@ -616,7 +616,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup5</cstring> </property> @@ -627,7 +627,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useAnimChkBox</cstring> </property> @@ -638,7 +638,7 @@ <string>Alt+U</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout18</cstring> </property> @@ -646,7 +646,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup12</cstring> </property> @@ -657,7 +657,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Intensity</string> @@ -695,7 +695,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout37</cstring> </property> @@ -703,7 +703,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_8</cstring> </property> @@ -714,7 +714,7 @@ <string>Steps :</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>stepsSpinBox</cstring> </property> @@ -728,7 +728,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_5</cstring> </property> @@ -739,7 +739,7 @@ <string>Interval</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>intervalSpinBox</cstring> </property> @@ -755,7 +755,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>KeepAnimateChkBox</cstring> </property> @@ -765,7 +765,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup11</cstring> </property> @@ -776,7 +776,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>To Gray</string> @@ -806,7 +806,7 @@ <cstring>hoverTypeCombo</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout14</cstring> </property> @@ -814,7 +814,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -822,7 +822,7 @@ <string>Amount :</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>effectsAmount_SpinBox</cstring> </property> @@ -839,7 +839,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup13</cstring> </property> @@ -850,7 +850,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout19</cstring> </property> @@ -858,7 +858,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout17</cstring> </property> @@ -866,7 +866,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -884,7 +884,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout18</cstring> </property> @@ -892,7 +892,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -916,7 +916,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup5_2</cstring> </property> @@ -927,7 +927,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout38</cstring> </property> @@ -935,7 +935,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_4</cstring> </property> @@ -943,7 +943,7 @@ <string>Deco's</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Liquid Method</string> @@ -965,7 +965,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout39</cstring> </property> @@ -973,7 +973,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -981,7 +981,7 @@ <string>Buttons</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Liquid Method</string> @@ -1024,7 +1024,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1035,7 +1035,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useCusBtnClrChkBox</cstring> </property> @@ -1043,7 +1043,7 @@ <string>Use custom buttons colors</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup16</cstring> </property> @@ -1057,7 +1057,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_7</cstring> </property> @@ -1065,7 +1065,7 @@ <string>Apply custom colors to:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout37</cstring> </property> @@ -1073,7 +1073,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cusColActBtnChkBox</cstring> </property> @@ -1081,7 +1081,7 @@ <string>Active buttons</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cusColInActBtnChkBox</cstring> </property> @@ -1108,7 +1108,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout42</cstring> </property> @@ -1116,7 +1116,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout41</cstring> </property> @@ -1124,7 +1124,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout38</cstring> </property> @@ -1132,7 +1132,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -1150,7 +1150,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout25</cstring> </property> @@ -1158,7 +1158,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -1176,7 +1176,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout28</cstring> </property> @@ -1184,7 +1184,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -1202,7 +1202,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout29</cstring> </property> @@ -1210,7 +1210,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -1228,7 +1228,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout32</cstring> </property> @@ -1236,7 +1236,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -1254,7 +1254,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout28_2</cstring> </property> @@ -1262,7 +1262,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4_2_2</cstring> </property> @@ -1280,7 +1280,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout31_2</cstring> </property> @@ -1288,7 +1288,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6_2</cstring> </property> @@ -1308,7 +1308,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout36</cstring> </property> @@ -1316,7 +1316,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout27</cstring> </property> @@ -1324,7 +1324,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -1342,7 +1342,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout26</cstring> </property> @@ -1350,7 +1350,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -1368,7 +1368,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout33_2</cstring> </property> @@ -1376,7 +1376,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel8_2</cstring> </property> @@ -1394,7 +1394,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout31</cstring> </property> @@ -1402,7 +1402,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -1420,7 +1420,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout33</cstring> </property> @@ -1428,7 +1428,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -1446,7 +1446,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout29_2</cstring> </property> @@ -1454,7 +1454,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5_2</cstring> </property> @@ -1472,7 +1472,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout32_2</cstring> </property> @@ -1480,7 +1480,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7_2</cstring> </property> @@ -1523,7 +1523,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1534,7 +1534,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -1545,7 +1545,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -1558,7 +1558,7 @@ <cstring>framesPathKurl</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -1571,7 +1571,7 @@ <cstring>buttonsPathKurl</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useMasks_Chkbox</cstring> </property> @@ -1582,7 +1582,7 @@ <string>Alt+U</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -1622,7 +1622,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1633,7 +1633,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup10</cstring> </property> @@ -1644,7 +1644,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout12</cstring> </property> @@ -1669,7 +1669,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>previewLabael</cstring> </property> @@ -1728,7 +1728,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout13</cstring> </property> @@ -1736,7 +1736,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>installthemeBtn</cstring> </property> @@ -1744,7 +1744,7 @@ <string>Install Ne&w Theme</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeThemBtn</cstring> </property> @@ -1755,7 +1755,7 @@ <string>Alt+E</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>applyThemeBtn</cstring> </property> @@ -1770,7 +1770,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1781,7 +1781,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>textEdit1</cstring> </property> @@ -1887,7 +1887,7 @@ Allways start up building your theme from the template-theme. </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> diff --git a/client/config/deKoratorconfig.cc b/client/config/deKoratorconfig.cc index b3b686f..cae4fa9 100644 --- a/client/config/deKoratorconfig.cc +++ b/client/config/deKoratorconfig.cc @@ -34,14 +34,14 @@ #include <kconfig.h> #include <klocale.h> #include <kglobal.h> -#include <qbuttongroup.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qcheckbox.h> +#include <tqbuttongroup.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> #include <kcolorbutton.h> #include <klistview.h> @@ -56,8 +56,8 @@ // ------------- // Constructor -DeKoratorConfig::DeKoratorConfig( KConfig* config, QWidget* parent ) - : QObject( parent ), config_( 0 ), dialog_( 0 ) +DeKoratorConfig::DeKoratorConfig( KConfig* config, TQWidget* parent ) + : TQObject( parent ), config_( 0 ), dialog_( 0 ) { // create the configuration object config_ = new KConfig( "kwindeKoratorrc" ); @@ -102,19 +102,19 @@ DeKoratorConfig::DeKoratorConfig( KConfig* config, QWidget* parent ) connect( dialog_->colorizeInActFramesChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); connect( dialog_->colorizeInActButtonsChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); connect( dialog_->useAnimChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->animateEfeectsCombo, SIGNAL( activated( const QString& ) ), SIGNAL( changed() ) ); + connect( dialog_->animateEfeectsCombo, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); connect( dialog_->stepsSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); connect( dialog_->intervalSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); connect( dialog_->KeepAnimateChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->hoverTypeCombo, SIGNAL( activated( const QString& ) ), SIGNAL( changed() ) ); + connect( dialog_->hoverTypeCombo, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); connect( dialog_->effectsAmount_SpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); connect( dialog_->activeHighlightClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); connect( dialog_->inActiveHighlightClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->decoColorizeComboBox, SIGNAL( activated( const QString& ) ), SIGNAL( changed() ) ); - connect( dialog_->buttonsColorizeComboBox, SIGNAL( activated( const QString& ) ), SIGNAL( changed() ) ); - // connect( dialog_->buttonsHoverColorizeComboBox, SIGNAL( activated( const QString& ) ), SIGNAL( changed() ) ); + connect( dialog_->decoColorizeComboBox, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); + connect( dialog_->buttonsColorizeComboBox, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); + // connect( dialog_->buttonsHoverColorizeComboBox, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); // buttons connect( dialog_->useCusBtnClrChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); @@ -137,17 +137,17 @@ DeKoratorConfig::DeKoratorConfig( KConfig* config, QWidget* parent ) connect( dialog_->shadeDownClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); // path's - connect( dialog_->framesPathKurl, SIGNAL( textChanged( const QString& ) ), SIGNAL( changed() ) ); + connect( dialog_->framesPathKurl, SIGNAL( textChanged( const TQString& ) ), SIGNAL( changed() ) ); dialog_->framesPathKurl->setMode( 2 ); - connect( dialog_->buttonsPathKurl, SIGNAL( textChanged( const QString& ) ), SIGNAL( changed() ) ); + connect( dialog_->buttonsPathKurl, SIGNAL( textChanged( const TQString& ) ), SIGNAL( changed() ) ); dialog_->buttonsPathKurl->setMode( 2 ); connect( dialog_->useMasks_Chkbox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->masksPathKurl, SIGNAL( textChanged( const QString& ) ), SIGNAL( changed() ) ); + connect( dialog_->masksPathKurl, SIGNAL( textChanged( const TQString& ) ), SIGNAL( changed() ) ); dialog_->masksPathKurl->setMode( 2 ); // themes - connect( dialog_->themesKlstView, SIGNAL( selectionChanged( QListViewItem * ) ), - SLOT( themeSelected( QListViewItem * ) ) ); + connect( dialog_->themesKlstView, SIGNAL( selectionChanged( TQListViewItem * ) ), + SLOT( themeSelected( TQListViewItem * ) ) ); connect( dialog_->installthemeBtn, SIGNAL( clicked( ) ), SLOT( installNewTheme() ) ); connect( dialog_->removeThemBtn, SIGNAL( clicked( ) ), SLOT( removeSelectedTheme() ) ); connect( dialog_->applyThemeBtn, SIGNAL( clicked( ) ), SLOT( setTheme() ) ); @@ -186,14 +186,14 @@ void DeKoratorConfig::load( KConfig* ) // misc config_->setGroup( "MISC" ); - QString value = config_->readEntry( "TitleAlignment", "AlignHCenter" ); - QRadioButton *button = ( QRadioButton* ) dialog_->titlealign->child( value ); + TQString value = config_->readEntry( "TitleAlignment", "AlignHCenter" ); + TQRadioButton *button = ( TQRadioButton* ) dialog_->titlealign->child( value ); if ( button ) button->setChecked( TRUE ); dialog_->useMenuImageChkBox->setChecked( config_->readBoolEntry( "UseMenuImage", FALSE ) ); dialog_->ignoreAppIcnCol->setChecked( config_->readBoolEntry( "IgnoreAppIconCol", FALSE ) ); dialog_->dblClkCloseChkBox->setChecked( config_->readBoolEntry( "DblClkClose", FALSE ) ); dialog_->showBtmBorderChkBox->setChecked( config_->readBoolEntry( "ShowBtmBorder", FALSE ) ); - QColor color = QColor( 150, 150, 150 ); + TQColor color = TQColor( 150, 150, 150 ); dialog_->useShdtextChkBox->setChecked( config_->readBoolEntry( "UseShdtext", FALSE ) ); dialog_->activeShdtextXSpinBox->setValue( config_->readNumEntry( "ActiveShdtextX", 0 ) ); dialog_->activeShdtextYSpinBox->setValue( config_->readNumEntry( "ActiveShdtextY", 0 ) ); @@ -267,8 +267,8 @@ void DeKoratorConfig::save( KConfig* ) // misc config_->setGroup( "MISC" ); - QRadioButton *button = ( QRadioButton* ) dialog_->titlealign->selected(); - if ( button ) config_->writeEntry( "TitleAlignment", QString( button->name() ) ); + TQRadioButton *button = ( TQRadioButton* ) dialog_->titlealign->selected(); + if ( button ) config_->writeEntry( "TitleAlignment", TQString( button->name() ) ); config_->writeEntry( "UseMenuImage", dialog_->useMenuImageChkBox->isChecked() ); config_->writeEntry( "IgnoreAppIconCol", dialog_->ignoreAppIcnCol->isChecked() ); config_->writeEntry( "DblClkClose", dialog_->dblClkCloseChkBox->isChecked() ); @@ -346,8 +346,8 @@ void DeKoratorConfig::defaults() { // misc - QRadioButton * button = - ( QRadioButton* ) dialog_->titlealign->child( "AlignHCenter" ); + TQRadioButton * button = + ( TQRadioButton* ) dialog_->titlealign->child( "AlignHCenter" ); if ( button ) button->setChecked( TRUE ); dialog_->useMenuImageChkBox->setChecked( FALSE ); dialog_->ignoreAppIcnCol->setChecked( FALSE ); @@ -356,10 +356,10 @@ void DeKoratorConfig::defaults() dialog_->useShdtextChkBox->setChecked( FALSE ); dialog_->activeShdtextXSpinBox->setValue( 0 ); dialog_->activeShdtextYSpinBox->setValue( 0 ); - dialog_->activeShdColBtn->setColor( QColor( 150, 150, 150 ) ); + dialog_->activeShdColBtn->setColor( TQColor( 150, 150, 150 ) ); dialog_->inActiveShdtextXSpinBox->setValue( 0 ); dialog_->inActiveShdtextYSpinBox->setValue( 0 ); - dialog_->inActiveShdColBtn->setColor( QColor( 150, 150, 150 ) ); + dialog_->inActiveShdColBtn->setColor( TQColor( 150, 150, 150 ) ); dialog_->btnShiftXSpinBox->setValue( 0 ); dialog_->btnShiftYSpinBox->setValue( 0 ); @@ -377,8 +377,8 @@ void DeKoratorConfig::defaults() dialog_->hoverTypeCombo->setCurrentText( "To Gray" ); dialog_->effectsAmount_SpinBox->setValue( 5 ); - dialog_->activeHighlightClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->inActiveHighlightClrBtn->setColor( QColor( 150, 150, 150 ) ); + dialog_->activeHighlightClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->inActiveHighlightClrBtn->setColor( TQColor( 150, 150, 150 ) ); dialog_->decoColorizeComboBox->setCurrentText( "Liquid Method" ); dialog_->buttonsColorizeComboBox->setCurrentText( "Liquid Method" ); // dialog_->buttonsHoverColorizeComboBox->setCurrentText( "Liquid Method" ); @@ -387,20 +387,20 @@ void DeKoratorConfig::defaults() dialog_->useCusBtnClrChkBox->setChecked( FALSE ); dialog_->cusColActBtnChkBox->setChecked( FALSE ); dialog_->cusColInActBtnChkBox->setChecked( FALSE ); - dialog_->closeClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->minClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->maxClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->restoreClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->helpClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->menuClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->stickyClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->stickyDownClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->aboveClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->aboveDownClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->belowClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->belowDownClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->shadeClrBtn->setColor( QColor( 150, 150, 150 ) ); - dialog_->shadeDownClrBtn->setColor( QColor( 150, 150, 150 ) ); + dialog_->closeClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->minClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->maxClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->restoreClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->helpClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->menuClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->stickyClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->stickyDownClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->aboveClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->aboveDownClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->belowClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->belowDownClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->shadeClrBtn->setColor( TQColor( 150, 150, 150 ) ); + dialog_->shadeDownClrBtn->setColor( TQColor( 150, 150, 150 ) ); // path's dialog_->framesPathKurl->setURL( "" ); @@ -414,7 +414,7 @@ void DeKoratorConfig::defaults() // ---------- // -void DeKoratorConfig::themeSelected( QListViewItem *item ) +void DeKoratorConfig::themeSelected( TQListViewItem *item ) { themes_->themeSelected( item, dialog_->previewLabael, dialog_->removeThemBtn ); } @@ -455,7 +455,7 @@ void DeKoratorConfig::setTheme() extern "C" { - QObject * allocate_config( KConfig * config, QWidget * parent ) + TQObject * allocate_config( KConfig * config, TQWidget * parent ) { return ( new DeKoratorConfig( config, parent ) ); } diff --git a/client/config/deKoratorconfig.h b/client/config/deKoratorconfig.h index 0505c98..399002f 100644 --- a/client/config/deKoratorconfig.h +++ b/client/config/deKoratorconfig.h @@ -34,18 +34,18 @@ #ifndef EXAMPLECONFIG_H #define EXAMPLECONFIG_H -#include <qobject.h> +#include <tqobject.h> class KConfig; class ConfigDialog; class IconThemesConfig; -class DeKoratorConfig : public QObject +class DeKoratorConfig : public TQObject { Q_OBJECT public: - DeKoratorConfig( KConfig* config, QWidget* parent ); + DeKoratorConfig( KConfig* config, TQWidget* parent ); ~DeKoratorConfig(); signals: @@ -58,7 +58,7 @@ public slots: protected slots: - void themeSelected( QListViewItem *item ); + void themeSelected( TQListViewItem *item ); void selectionChanged( int ); void installNewTheme(); void removeSelectedTheme(); diff --git a/client/config/themes.cpp b/client/config/themes.cpp index f612ad6..4820954 100644 --- a/client/config/themes.cpp +++ b/client/config/themes.cpp @@ -36,10 +36,10 @@ #include <stdlib.h> #include <unistd.h> -#include <qfileinfo.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqfileinfo.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <kdebug.h> #include <kapplication.h> @@ -64,9 +64,9 @@ #include <ksvgiconengine.h> #endif -#include <qdir.h> -#include <qpainter.h> -#include <qregexp.h> +#include <tqdir.h> +#include <tqpainter.h> +#include <tqregexp.h> #include "themes.h" #include <kurlrequester.h> @@ -77,7 +77,7 @@ // ---------- // -IconThemesConfig::IconThemesConfig( QWidget *parent, KListView *themesView /*, QPushButton *removethemeBtn*/ ) +IconThemesConfig::IconThemesConfig( TQWidget *parent, KListView *themesView /*, TQPushButton *removethemeBtn*/ ) { parent_ = parent; themesView_ = themesView; @@ -99,9 +99,9 @@ IconThemesConfig::~IconThemesConfig() // ---------- // -QListViewItem *IconThemesConfig::iconThemeItem( const QString &name ) +TQListViewItem *IconThemesConfig::iconThemeItem( const TQString &name ) { - QListViewItem * item; + TQListViewItem * item; for ( item = themesView_->firstChild(); item ; item = item->nextSibling() ) if ( item->text( 0 ) == name ) return item; @@ -118,38 +118,38 @@ void IconThemesConfig::loadThemes() { themesView_->clear(); m_themeNames.clear(); - QStringList themelist; - QString name; - QString place; - QStringList::Iterator it, itj; - QStringList themesDirs; + TQStringList themelist; + TQString name; + TQString place; + TQStringList::Iterator it, itj; + TQStringList themesDirs; // if no local deKorator folders - if ( ! QDir( QDir::homeDirPath() + "/.kde/share/apps/" ).exists( "deKorator" ) ) + if ( ! TQDir( TQDir::homeDirPath() + "/.kde/share/apps/" ).exists( "deKorator" ) ) { - qWarning( "no dirs, will make them..." ); - KIO::mkdir( QDir::homeDirPath() + "/.kde/share/apps/deKorator/" ); - KIO::mkdir( QDir::homeDirPath() + "/.kde/share/apps/deKorator/themes/" ); + tqWarning( "no dirs, will make them..." ); + KIO::mkdir( TQDir::homeDirPath() + "/.kde/share/apps/deKorator/" ); + KIO::mkdir( TQDir::homeDirPath() + "/.kde/share/apps/deKorator/themes/" ); } else { - qWarning( "exist" ); + tqWarning( "exist" ); } themesDirs = KGlobal::dirs() ->findDirs( "data", "deKorator/themes" ) ; for ( it = themesDirs.begin(); it != themesDirs.end(); ++it ) { - QDir dir = QDir( *it ); + TQDir dir = TQDir( *it ); themelist = dir.entryList( "*-theme" ); for ( itj = themelist.begin(); itj != themelist.end(); ++itj ) { place = *it; - name = ( QString ) * itj; + name = ( TQString ) * itj; - themesView_->insertItem( new QListViewItem( themesView_, name ) ); + themesView_->insertItem( new TQListViewItem( themesView_, name ) ); m_themeNames.insert( name, place ); } @@ -164,7 +164,7 @@ void IconThemesConfig::loadThemes() void IconThemesConfig::installNewTheme() { - KURL themeURL = KURLRequesterDlg::getURL( QString::null, parent_, + KURL themeURL = KURLRequesterDlg::getURL( TQString::null, parent_, i18n( "Drag or Type Theme URL" ) ); kdDebug() << themeURL.prettyURL() << endl; @@ -172,11 +172,11 @@ void IconThemesConfig::installNewTheme() return ; // themeTmpFile contains the name of the downloaded file - QString themeTmpFile; + TQString themeTmpFile; if ( !KIO::NetAccess::download( themeURL, themeTmpFile, parent_ ) ) { - QString sorryText; + TQString sorryText; if ( themeURL.isLocalFile() ) sorryText = i18n( "Unable to find the deKorator theme archive %1." ); else @@ -187,10 +187,10 @@ void IconThemesConfig::installNewTheme() } // - QStringList themesNames = findThemeDirs( themeTmpFile ); + TQStringList themesNames = findThemeDirs( themeTmpFile ); if ( themesNames.isEmpty() ) { - QString invalidArch( i18n( "The file is not a valid deKorator theme archive." ) ); + TQString invalidArch( i18n( "The file is not a valid deKorator theme archive." ) ); KMessageBox::error( parent_, invalidArch ); KIO::NetAccess::removeTempFile( themeTmpFile ); @@ -200,8 +200,8 @@ void IconThemesConfig::installNewTheme() if ( !installThemes( themesNames, themeTmpFile ) ) { //FIXME: make me able to know what is wrong.... - // QStringList instead of bool? - QString somethingWrong = + // TQStringList instead of bool? + TQString somethingWrong = i18n( "A problem occurred during the installation process; " "however, most of the themes in the archive have been installed" ); KMessageBox::error( parent_, somethingWrong ); @@ -211,9 +211,9 @@ void IconThemesConfig::installNewTheme() loadThemes(); - QStringList::Iterator cur = themesNames.at( 0 ); + TQStringList::Iterator cur = themesNames.at( 0 ); - QListViewItem *item = iconThemeItem( *cur ); + TQListViewItem *item = iconThemeItem( *cur ); themesView_->setSelected( item, true ); } @@ -222,14 +222,14 @@ void IconThemesConfig::installNewTheme() // ---------- // -bool IconThemesConfig::installThemes( const QStringList &themes, const QString &archiveName ) +bool IconThemesConfig::installThemes( const TQStringList &themes, const TQString &archiveName ) { bool everythingOk = true; - QString localThemesDir = QDir::homeDirPath() + "/.kde/share/apps/deKorator/themes/"; + TQString localThemesDir = TQDir::homeDirPath() + "/.kde/share/apps/deKorator/themes/"; // KProgressDialog progressDiag( parent_, "themeinstallprogress", i18n( "Installing icon themes" ), - QString::null, + TQString::null, true ); progressDiag.setAutoClose( true ); progressDiag.progressBar() ->setTotalSteps( themes.count() ); @@ -242,7 +242,7 @@ bool IconThemesConfig::installThemes( const QStringList &themes, const QString & const KArchiveDirectory* rootDir = archive.directory(); KArchiveDirectory* currentTheme; - for ( QStringList::ConstIterator it = themes.begin(); it != themes.end(); ++it ) + for ( TQStringList::ConstIterator it = themes.begin(); it != themes.end(); ++it ) { progressDiag.setLabel( i18n( "<qt>Installing <strong>%1</strong> theme</qt>" ) @@ -276,9 +276,9 @@ bool IconThemesConfig::installThemes( const QStringList &themes, const QString & // ---------- // -QStringList IconThemesConfig::findThemeDirs( const QString &archiveName ) +TQStringList IconThemesConfig::findThemeDirs( const TQString &archiveName ) { - QStringList foundThemes; + TQStringList foundThemes; KTar archive( archiveName ); archive.open( IO_ReadOnly ); @@ -288,11 +288,11 @@ QStringList IconThemesConfig::findThemeDirs( const QString &archiveName ) KArchiveDirectory* subDir = 0L; // iterate all the dirs looking for an index.theme or index.desktop file - QStringList entries = themeDir->entries(); - for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) + TQStringList entries = themeDir->entries(); + for ( TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) { - QString name = ( QString ) * it; - QRegExp rxp = QRegExp( "*-theme", TRUE, TRUE ); + TQString name = ( TQString ) * it; + TQRegExp rxp = TQRegExp( "*-theme", TRUE, TRUE ); int i = name.contains( rxp ); if ( !i ) { @@ -306,7 +306,7 @@ QStringList IconThemesConfig::findThemeDirs( const QString &archiveName ) if ( subDir && ( subDir->entry( "deco" ) != NULL && subDir->entry( "buttons" ) != NULL && subDir->entry( "masks" ) != NULL ) ) { foundThemes.append( subDir->name() ); - //qWarning( "found" ); + //tqWarning( "found" ); } } } @@ -323,11 +323,11 @@ QStringList IconThemesConfig::findThemeDirs( const QString &archiveName ) void IconThemesConfig::removeSelectedTheme() { - QListViewItem * selected = themesView_->selectedItem(); + TQListViewItem * selected = themesView_->selectedItem(); if ( !selected ) return ; - QString question = i18n( "<qt>Are you sure you want to remove the " + TQString question = i18n( "<qt>Are you sure you want to remove the " "<strong>%1</strong> theme?<br>" "<br>" "This will delete the files installed by this theme.</qt>" ). @@ -336,9 +336,9 @@ void IconThemesConfig::removeSelectedTheme() int r = KMessageBox::warningContinueCancel( parent_, question, i18n( "Confirmation" ), KStdGuiItem::del() ); if ( r != KMessageBox::Continue ) return ; - QString delTheme = selected->text( 0 ); - QString deldirStr = QDir::homeDirPath() + "/.kde/share/apps/deKorator/themes/" + delTheme; - QDir dir = QDir( deldirStr ); + TQString delTheme = selected->text( 0 ); + TQString deldirStr = TQDir::homeDirPath() + "/.kde/share/apps/deKorator/themes/" + delTheme; + TQDir dir = TQDir( deldirStr ); dir.rename( deldirStr, deldirStr + "del" ); KIO::del( KURL( deldirStr + "del" ) ); @@ -351,25 +351,25 @@ void IconThemesConfig::removeSelectedTheme() // ---------- // -void IconThemesConfig::themeSelected( QListViewItem *item, QLabel *previewLabel, QPushButton *btn ) +void IconThemesConfig::themeSelected( TQListViewItem *item, TQLabel *previewLabel, TQPushButton *btn ) { - QPixmap previewPix, topLeftCornerBg, leftButtonsBg, leftTitleBg, midTitleBg, rightTitleBg, rightButtonsBg, topRightCornerBg; - QPainter painter; + TQPixmap previewPix, topLeftCornerBg, leftButtonsBg, leftTitleBg, midTitleBg, rightTitleBg, rightButtonsBg, topRightCornerBg; + TQPainter painter; int w, h, x; - QString dirName( m_themeNames[ item->text( 0 ) ] ); + TQString dirName( m_themeNames[ item->text( 0 ) ] ); if ( dirName.contains( "home" ) ) { - //qWarning("true"); + //tqWarning("true"); btn->setEnabled( true ); } else { btn->setEnabled( false ); - //qWarning("false"); + //tqWarning("false"); } - QString dirNameStr = dirName + item->text( 0 ) + "/deco/" ; + TQString dirNameStr = dirName + item->text( 0 ) + "/deco/" ; topLeftCornerBg.load( dirNameStr + "topLeftCornerBg.png" ); leftButtonsBg.load( dirNameStr + "leftButtonsBg" ); leftTitleBg.load( dirNameStr + "leftTitleBg.png" ); @@ -381,23 +381,23 @@ void IconThemesConfig::themeSelected( QListViewItem *item, QLabel *previewLabel, w = topLeftCornerBg.width() + leftButtonsBg.width() + leftTitleBg.width() + midTitleBg.width() + rightTitleBg.width() + rightButtonsBg.width() + topRightCornerBg.width() + 8; h = midTitleBg.height() + 8; previewPix.resize( w, h ); - //qWarning("%d",w); + //tqWarning("%d",w); painter.begin( &previewPix ); // paint outer rect - painter.fillRect( 0, 0, w, h, QColor( 20, 20, 20 ) ); + painter.fillRect( 0, 0, w, h, TQColor( 20, 20, 20 ) ); - painter.setPen( QColor( 60, 60, 60 ) ); + painter.setPen( TQColor( 60, 60, 60 ) ); painter.drawRect( 0, 0, w , h ); - painter.setPen( QColor( 80, 80, 80 ) ); + painter.setPen( TQColor( 80, 80, 80 ) ); painter.drawRect( 1, 1, w - 2 , h - 2 ); - painter.setPen( QColor( 180, 180, 180 ) ); + painter.setPen( TQColor( 180, 180, 180 ) ); painter.drawLine( w - 1, 1, w - 1, h - 1 ); painter.drawLine( 1, h - 1, w - 2, h - 1 ); - painter.setPen( QColor( 150, 150, 150 ) ); + painter.setPen( TQColor( 150, 150, 150 ) ); painter.drawLine( w - 2, 2, w - 2, h - 2 ); painter.drawLine( 2, h - 2, w - 3, h - 2 ); @@ -424,7 +424,7 @@ void IconThemesConfig::themeSelected( QListViewItem *item, QLabel *previewLabel, x += rightButtonsBg.width(); painter.drawPixmap( x, 4, topRightCornerBg ); - painter.setPen( QColor( 0, 0, 0 ) ); + painter.setPen( TQColor( 0, 0, 0 ) ); painter.drawLine( 4, h - 5, w - 4 , h - 5 ); painter.end(); @@ -440,14 +440,14 @@ void IconThemesConfig::themeSelected( QListViewItem *item, QLabel *previewLabel, void IconThemesConfig::setTheme( KURLRequester *framesPath, KURLRequester *buttonsPath, KURLRequester *masksPath ) { - QListViewItem * selected = themesView_->selectedItem(); + TQListViewItem * selected = themesView_->selectedItem(); if ( !selected ) return ; - QString dirName( m_themeNames[ selected->text( 0 ) ] ); + TQString dirName( m_themeNames[ selected->text( 0 ) ] ); - QString setTheme = selected->text( 0 ); - QString setThemeStr = dirName + setTheme; + TQString setTheme = selected->text( 0 ); + TQString setThemeStr = dirName + setTheme; framesPath->setURL( setThemeStr + "/deco" ); buttonsPath->setURL( setThemeStr + "/buttons" ); diff --git a/client/config/themes.h b/client/config/themes.h index feb2cf5..238bbe1 100644 --- a/client/config/themes.h +++ b/client/config/themes.h @@ -35,39 +35,39 @@ #define ICONTHEMES_H #include <kcmodule.h> -#include <qmap.h> +#include <tqmap.h> #include <klistview.h> -class QPushButton; +class TQPushButton; class DeviceManager; -class QCheckBox; -class QStringList; +class TQCheckBox; +class TQStringList; -class IconThemesConfig : public QObject +class IconThemesConfig : public TQObject { Q_OBJECT public: - IconThemesConfig( QWidget *parent, KListView *themesView/*, QPushButton *removethemeBtn*/ ); + IconThemesConfig( TQWidget *parent, KListView *themesView/*, TQPushButton *removethemeBtn*/ ); virtual ~IconThemesConfig(); void loadThemes(); - bool installThemes( const QStringList &themes, const QString &archiveName ); - QStringList findThemeDirs( const QString &archiveName ); - void themeSelected( QListViewItem *item, QLabel *preview, QPushButton *btn ); + bool installThemes( const TQStringList &themes, const TQString &archiveName ); + TQStringList findThemeDirs( const TQString &archiveName ); + void themeSelected( TQListViewItem *item, TQLabel *preview, TQPushButton *btn ); void installNewTheme(); void removeSelectedTheme(); void setTheme( KURLRequester *framesPath, KURLRequester *buttonsPath, KURLRequester *masksPath ); private: - QListViewItem *iconThemeItem( const QString &name ); + TQListViewItem *iconThemeItem( const TQString &name ); KListView *themesView_; - QWidget *parent_; - //QPushButton *removeThemeBtn_; - QListViewItem *m_defaultTheme; - QMap <QString, QString>m_themeNames; + TQWidget *parent_; + //TQPushButton *removeThemeBtn_; + TQListViewItem *m_defaultTheme; + TQMap <TQString, TQString>m_themeNames; }; #endif // ICONTHEMES_H diff --git a/client/config/themes.moc.cc b/client/config/themes.moc.cc index 111855b..d64c1a9 100644 --- a/client/config/themes.moc.cc +++ b/client/config/themes.moc.cc @@ -2,20 +2,20 @@ ** IconThemesConfig meta object code from reading C++ file 'themes.h' ** ** Created: Wed Dec 7 20:20:14 2005 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $) +** by: The TQt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #undef QT_NO_COMPAT #include "themes.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> #include <private/qucomextra_p.h> #if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) #error "This file was generated using the moc from 3.3.5. It" -#error "cannot be used with the include files from this version of Qt." +#error "cannot be used with the include files from this version of TQt." #error "(The moc has changed too much.)" #endif @@ -24,46 +24,46 @@ const char *IconThemesConfig::className() const return "IconThemesConfig"; } -QMetaObject *IconThemesConfig::metaObj = 0; -static QMetaObjectCleanUp cleanUp_IconThemesConfig( "IconThemesConfig", &IconThemesConfig::staticMetaObject ); +TQMetaObject *IconThemesConfig::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_IconThemesConfig( "IconThemesConfig", &IconThemesConfig::staticMetaObject ); #ifndef QT_NO_TRANSLATION -QString IconThemesConfig::tr( const char *s, const char *c ) +TQString IconThemesConfig::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "IconThemesConfig", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "IconThemesConfig", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::fromLatin1( s ); } #ifndef QT_NO_TRANSLATION_UTF8 -QString IconThemesConfig::trUtf8( const char *s, const char *c ) +TQString IconThemesConfig::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "IconThemesConfig", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "IconThemesConfig", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } #endif // QT_NO_TRANSLATION_UTF8 #endif // QT_NO_TRANSLATION -QMetaObject* IconThemesConfig::staticMetaObject() +TQMetaObject* IconThemesConfig::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KCModule::staticMetaObject(); - static const QUParameter param_slot_0[] = { - { "item", &static_QUType_ptr, "QListViewItem", QUParameter::In } + TQMetaObject* parentObject = KCModule::staticMetaObject(); + static const TQUParameter param_slot_0[] = { + { "item", &static_QUType_ptr, "TQListViewItem", TQUParameter::In } }; - static const QUMethod slot_0 = {"themeSelected", 1, param_slot_0 }; - static const QUMethod slot_1 = {"installNewTheme", 0, 0 }; - static const QUMethod slot_2 = {"removeSelectedTheme", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "themeSelected(QListViewItem*)", &slot_0, QMetaData::Protected }, - { "installNewTheme()", &slot_1, QMetaData::Protected }, - { "removeSelectedTheme()", &slot_2, QMetaData::Protected } + static const TQUMethod slot_0 = {"themeSelected", 1, param_slot_0 }; + static const TQUMethod slot_1 = {"installNewTheme", 0, 0 }; + static const TQUMethod slot_2 = {"removeSelectedTheme", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "themeSelected(TQListViewItem*)", &slot_0, TQMetaData::Protected }, + { "installNewTheme()", &slot_1, TQMetaData::Protected }, + { "removeSelectedTheme()", &slot_2, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( + metaObj = TQMetaObject::new_metaobject( "IconThemesConfig", parentObject, slot_tbl, 3, 0, 0, @@ -76,35 +76,35 @@ QMetaObject* IconThemesConfig::staticMetaObject() return metaObj; } -void* IconThemesConfig::qt_cast( const char* clname ) +void* IconThemesConfig::tqt_cast( const char* clname ) { if ( !qstrcmp( clname, "IconThemesConfig" ) ) return this; - return KCModule::qt_cast( clname ); + return KCModule::tqt_cast( clname ); } -bool IconThemesConfig::qt_invoke( int _id, QUObject* _o ) +bool IconThemesConfig::tqt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: themeSelected((QListViewItem*)static_QUType_ptr.get(_o+1)); break; + case 0: themeSelected((TQListViewItem*)static_QUType_ptr.get(_o+1)); break; case 1: installNewTheme(); break; case 2: removeSelectedTheme(); break; default: - return KCModule::qt_invoke( _id, _o ); + return KCModule::tqt_invoke( _id, _o ); } return TRUE; } -bool IconThemesConfig::qt_emit( int _id, QUObject* _o ) +bool IconThemesConfig::tqt_emit( int _id, TQUObject* _o ) { - return KCModule::qt_emit(_id,_o); + return KCModule::tqt_emit(_id,_o); } #ifndef QT_NO_PROPERTIES -bool IconThemesConfig::qt_property( int id, int f, QVariant* v) +bool IconThemesConfig::tqt_property( int id, int f, TQVariant* v) { - return KCModule::qt_property( id, f, v); + return KCModule::tqt_property( id, f, v); } -bool IconThemesConfig::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } +bool IconThemesConfig::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } #endif // QT_NO_PROPERTIES diff --git a/client/deKoratorclient.cc b/client/deKoratorclient.cc index 4374b71..8f6d87c 100644 --- a/client/deKoratorclient.cc +++ b/client/deKoratorclient.cc @@ -37,7 +37,7 @@ #include "deKoratorclient.h" -#include <qsettings.h> +#include <tqsettings.h> using namespace DeKorator; @@ -46,7 +46,7 @@ using namespace DeKorator; static int MARGIN = 4; //static int GRUBMARGIN = 5; -static QColor STYLEBGCOL; +static TQColor STYLEBGCOL; // frames static int TITLESIZE = 0; @@ -105,7 +105,7 @@ static int BOTTOMRIGHTMASKHEIGHT = 0; // config // misc -static Qt::AlignmentFlags TITLEALIGN = Qt::AlignHCenter; +static TQt::AlignmentFlags TITLEALIGN = TQt::AlignHCenter; static bool USEMENUEIMAGE = FALSE; static bool IGNOREAPPICNCOL = FALSE; static bool DBLCLKCLOSE = FALSE; @@ -113,10 +113,10 @@ static bool SHOWBTMBORDER = FALSE; static bool USESHDTEXT = FALSE; static int ACTIVESHDTEXTX = FALSE; static int ACTIVESHDTEXTY = FALSE; -static QColor ACTIVESHADECOLOR = QColor( 150, 150, 150 ); +static TQColor ACTIVESHADECOLOR = TQColor( 150, 150, 150 ); static int INACTIVESHDTEXTX = FALSE; static int INACTIVESHDTEXTY = FALSE; -static QColor INACTIVESHADECOLOR = QColor( 150, 150, 150 ); +static TQColor INACTIVESHADECOLOR = TQColor( 150, 150, 150 ); static int BTNSHIFTX = 0; static int BTNSHIFTY = 0; @@ -124,19 +124,19 @@ static int BTNSHIFTY = 0; // colors static bool USEANIMATION = TRUE; -static QString ANIMATIONTYPE = "Intensity"; +static TQString ANIMATIONTYPE = "Intensity"; static int STEPS = 5; static int INTERVAL = 5; static int KEEPANIMATING = FALSE; -static QString BUTTONHOVERTYPE = "To Gray"; +static TQString BUTTONHOVERTYPE = "To Gray"; static float EFFECTAMOUNT = 5; -static QColor ACTIVEHIGHLIGHTCOLOR = QColor( 150, 150, 150 ); -static QColor INACTIVEHIGHLIGHTCOLOR = QColor( 150, 150, 150 ); -static QString DECOCOLORIZE = "Liquid Method"; -static QString BUTTONSCOLORIZE = "Liquid Method"; -//static QString BUTTONSHOVERCOLORIZE = "Liquid Method"; +static TQColor ACTIVEHIGHLIGHTCOLOR = TQColor( 150, 150, 150 ); +static TQColor INACTIVEHIGHLIGHTCOLOR = TQColor( 150, 150, 150 ); +static TQString DECOCOLORIZE = "Liquid Method"; +static TQString BUTTONSCOLORIZE = "Liquid Method"; +//static TQString BUTTONSHOVERCOLORIZE = "Liquid Method"; static const uint TIMERINTERVAL = 30; // msec static const uint ANIMATIONSTEPS = 100; @@ -146,13 +146,13 @@ static const uint ANIMATIONSTEPS = 100; static bool USEMASKS = FALSE; // pix arrays -static QPixmap *DECOARR[ decoCount ][ pixTypeCount ]; -static QPixmap *DECOPIXACTARR[ decoCount ]; -static QPixmap *DECOPIXINACTARR[ decoCount ]; +static TQPixmap *DECOARR[ decoCount ][ pixTypeCount ]; +static TQPixmap *DECOPIXACTARR[ decoCount ]; +static TQPixmap *DECOPIXINACTARR[ decoCount ]; -static QPixmap *BUTTONSARR[ buttonTypeAllCount ][ buttonStateCount ][ pixTypeCount ]; -static QPixmap *BUTTONPIXACTARR[ buttonTypeAllCount ][ buttonStateCount ]; -static QPixmap *BUTTONPIXINACTARR[ buttonTypeAllCount ][ buttonStateCount ]; +static TQPixmap *BUTTONSARR[ buttonTypeAllCount ][ buttonStateCount ][ pixTypeCount ]; +static TQPixmap *BUTTONPIXACTARR[ buttonTypeAllCount ][ buttonStateCount ]; +static TQPixmap *BUTTONPIXINACTARR[ buttonTypeAllCount ][ buttonStateCount ]; ////////////////////////////////////////////////////////////////////////////// // DeKoratorFactory Class // @@ -167,13 +167,13 @@ bool DeKoratorFactory::colorizeInActButtons_ = FALSE; bool DeKoratorFactory::useCustomButtonsColors_ = FALSE; bool DeKoratorFactory::customColorsActiveButtons_ = FALSE; bool DeKoratorFactory::customColorsInActiveButtons_ = FALSE; -QColor DeKoratorFactory::cusBtnCol_[ buttonTypeAllCount ]; +TQColor DeKoratorFactory::cusBtnCol_[ buttonTypeAllCount ]; bool DeKoratorFactory::needInit_ = FALSE; bool DeKoratorFactory::needReload_ = FALSE; -QString DeKoratorFactory::framesPath_ = ""; -QString DeKoratorFactory::buttonsPath_ = ""; -QString DeKoratorFactory::masksPath_ = ""; +TQString DeKoratorFactory::framesPath_ = ""; +TQString DeKoratorFactory::buttonsPath_ = ""; +TQString DeKoratorFactory::masksPath_ = ""; extern "C" KDecorationFactory* create_factory() @@ -267,7 +267,7 @@ bool DeKoratorFactory::reset( unsigned long changed ) if ( confchange || ( changed & ( SettingDecoration | SettingButtons | SettingBorder | SettingColors ) ) ) { - //qWarning( "aaaaaaaaaaaaa" ); + //tqWarning( "aaaaaaaaaaaaa" ); if ( DeKoratorFactory::needReload_ ) { loadPixmaps(); @@ -328,21 +328,21 @@ bool DeKoratorFactory::readConfig() { // create a config object KConfig config( "kwindeKoratorrc" ); - QColor col = QColor( 150, 150, 150 ); + TQColor col = TQColor( 150, 150, 150 ); // grab settings // misc settings config.setGroup( "MISC" ); - Qt::AlignmentFlags oldalign = TITLEALIGN; - QString value = config.readEntry( "TitleAlignment", "AlignHCenter" ); + TQt::AlignmentFlags oldalign = TITLEALIGN; + TQString value = config.readEntry( "TitleAlignment", "AlignHCenter" ); if ( value == "AlignLeft" ) - TITLEALIGN = Qt::AlignLeft; + TITLEALIGN = TQt::AlignLeft; else if ( value == "AlignHCenter" ) - TITLEALIGN = Qt::AlignHCenter; + TITLEALIGN = TQt::AlignHCenter; else if ( value == "AlignRight" ) - TITLEALIGN = Qt::AlignRight; + TITLEALIGN = TQt::AlignRight; bool oldUseMenuImage = USEMENUEIMAGE; USEMENUEIMAGE = config.readBoolEntry( "UseMenuImage", "false" ); @@ -365,7 +365,7 @@ bool DeKoratorFactory::readConfig() int oldActiveShdtextY = ACTIVESHDTEXTY; ACTIVESHDTEXTY = config.readNumEntry( "ActiveShdtextY", 0 ); - QColor oldActiveShadeColor = ACTIVESHADECOLOR; + TQColor oldActiveShadeColor = ACTIVESHADECOLOR; ACTIVESHADECOLOR = config.readColorEntry( "ActiveShadowColor", &col ); int oldInActiveShdtextX = INACTIVESHDTEXTX; @@ -374,7 +374,7 @@ bool DeKoratorFactory::readConfig() int oldInActiveShdtextY = INACTIVESHDTEXTY; INACTIVESHDTEXTY = config.readNumEntry( "InActiveShdtextY", 0 ); - QColor oldInActiveShadeColor = INACTIVESHADECOLOR; + TQColor oldInActiveShadeColor = INACTIVESHADECOLOR; INACTIVESHADECOLOR = config.readColorEntry( "InActiveShadowColor", &col ); @@ -416,13 +416,13 @@ bool DeKoratorFactory::readConfig() INACTIVEHIGHLIGHTCOLOR = config.readColorEntry( "InActiveHighlightColor", &col ); - QString oldDecoColorize = DECOCOLORIZE; + TQString oldDecoColorize = DECOCOLORIZE; DECOCOLORIZE = config.readEntry( "DecoColorize", "Liquid Method" ); - QString oldButtonsColorize = BUTTONSCOLORIZE; + TQString oldButtonsColorize = BUTTONSCOLORIZE; BUTTONSCOLORIZE = config.readEntry( "ButtonsColorize", "Liquid Method" ); /* - QString oldButtonsHoverColorize = BUTTONSHOVERCOLORIZE; + TQString oldButtonsHoverColorize = BUTTONSHOVERCOLORIZE; BUTTONSHOVERCOLORIZE = config.readEntry( "ButtonsHoverColorize", "Liquid Method" );*/ // buttons settings @@ -438,7 +438,7 @@ bool DeKoratorFactory::readConfig() DeKoratorFactory::customColorsInActiveButtons_ = config.readBoolEntry( "customColorsInActiveButtons", "false" ); // load buttons colors - QColor colArr[ buttonTypeAllCount ]; + TQColor colArr[ buttonTypeAllCount ]; for ( int i = 0 ; i < buttonTypeAllCount ; i++ ) { colArr[ i ] = DeKoratorFactory::cusBtnCol_[ i ]; @@ -465,7 +465,7 @@ bool DeKoratorFactory::readConfig() { cusColChanged = true; i = buttonTypeAllCount; - qWarning( "true" ); + tqWarning( "true" ); } } @@ -473,28 +473,28 @@ bool DeKoratorFactory::readConfig() // path's settings config.setGroup( "PATHS" ); - QString oldFramesPath = DeKoratorFactory::framesPath_; + TQString oldFramesPath = DeKoratorFactory::framesPath_; DeKoratorFactory::framesPath_ = config.readEntry( "FramesPath", "" ); - QString oldButtonsPath = DeKoratorFactory::buttonsPath_; + TQString oldButtonsPath = DeKoratorFactory::buttonsPath_; DeKoratorFactory::buttonsPath_ = config.readEntry( "ButtonsPath", "" ); bool oldUseMasks = USEMASKS; USEMASKS = config.readBoolEntry( "UseMasks", "false" ); - QString oldMasksPath = DeKoratorFactory::masksPath_; + TQString oldMasksPath = DeKoratorFactory::masksPath_; DeKoratorFactory::masksPath_ = config.readEntry( "MasksPath", "" ); //style backgrond - QColor oldStyleBgCol = STYLEBGCOL; + TQColor oldStyleBgCol = STYLEBGCOL; - QString colStr = QSettings().readEntry( "/Qt/Palette/active", "aaaa" ); + TQString colStr = TQSettings().readEntry( "/TQt/Palette/active", "aaaa" ); colStr = colStr.section( "#", 3, 3 ) ; colStr.insert( 0, '#' ); colStr.truncate( 7 ); - QColor c; + TQColor c; c.setNamedColor( colStr ); STYLEBGCOL = c; @@ -561,9 +561,9 @@ bool DeKoratorFactory::readConfig() // Read in the configuration file void DeKoratorFactory::loadPixmaps() { - QString decoPixDir = DeKoratorFactory::framesPath_; - QString btnPixDir = DeKoratorFactory::buttonsPath_; - QString masksPixDir = DeKoratorFactory::masksPath_; + TQString decoPixDir = DeKoratorFactory::framesPath_; + TQString btnPixDir = DeKoratorFactory::buttonsPath_; + TQString masksPixDir = DeKoratorFactory::masksPath_; // deco @@ -648,12 +648,12 @@ void DeKoratorFactory::loadPixmaps() //masks - topLeftCornerBitmap_ = QBitmap( masksPixDir + "/topLeftCornerBitmap.png" ); - topMidBitmap_ = QBitmap( masksPixDir + "/topMidBitmap.png" ); - topRightCornerBitmap_ = QBitmap( masksPixDir + "/topRightCornerBitmap.png" ); - buttomLeftCornerBitmap_ = QBitmap( masksPixDir + "/buttomLeftCornerBitmap.png" ); - buttomMidBitmap_ = QBitmap( masksPixDir + "/buttomMidBitmap.png" ); - buttomRightCornerBitmap_ = QBitmap( masksPixDir + "/buttomRightCornerBitmap.png" ); + topLeftCornerBitmap_ = TQBitmap( masksPixDir + "/topLeftCornerBitmap.png" ); + topMidBitmap_ = TQBitmap( masksPixDir + "/topMidBitmap.png" ); + topRightCornerBitmap_ = TQBitmap( masksPixDir + "/topRightCornerBitmap.png" ); + buttomLeftCornerBitmap_ = TQBitmap( masksPixDir + "/buttomLeftCornerBitmap.png" ); + buttomMidBitmap_ = TQBitmap( masksPixDir + "/buttomMidBitmap.png" ); + buttomRightCornerBitmap_ = TQBitmap( masksPixDir + "/buttomRightCornerBitmap.png" ); determineSizes(); @@ -732,7 +732,7 @@ void DeKoratorFactory::determineSizes() void DeKoratorFactory::colorizeDecoPixmaps( bool isActive ) { int i; - QColor col = options() ->colorGroup( KDecoration::ColorTitleBar, isActive ).background(); + TQColor col = options() ->colorGroup( KDecoration::ColorTitleBar, isActive ).background(); if ( isActive ) { @@ -762,7 +762,7 @@ void DeKoratorFactory::colorizeDecoPixmaps( bool isActive ) void DeKoratorFactory::colorizeButtonsPixmaps( bool isActive ) { int i, j; - QColor col = options() ->colorGroup( KDecoration::ColorButtonBg, isActive ).background(); + TQColor col = options() ->colorGroup( KDecoration::ColorButtonBg, isActive ).background(); if ( isActive ) { @@ -821,9 +821,9 @@ void DeKoratorFactory::colorizeButtonsPixmaps( bool isActive ) // colorizePixmap() // ------------ // -void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeMethod ) +void DeKoratorFactory::colorizePixmap( TQPixmap *pix, TQColor c, TQString colorizeMethod ) { - QImage img; + TQImage img; if ( colorizeMethod == "Liquid Method" ) { img = pix->convertToImage(); @@ -831,7 +831,7 @@ void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeM if ( img.depth() != 32 ) img = img.convertDepth( 32 ); - QImage *dest = new QImage( img.width(), img.height(), 32 ); + TQImage *dest = new TQImage( img.width(), img.height(), 32 ); dest->setAlphaBuffer( TRUE ); unsigned int *data = ( unsigned int * ) img.bits(); unsigned int *destData = ( unsigned int* ) dest->bits(); @@ -845,14 +845,14 @@ void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeM for ( current = 0; current < total; ++current ) { - alpha = qAlpha( data[ current ] ); + alpha = tqAlpha( data[ current ] ); - // qWarning( "--------------------------" ); - // qWarning( "red - %d", qRed( data[ current ] ) ); - // qWarning( "green - %d", qRed( data[ current ] ) ); - // qWarning( "blue - %d", qRed( data[ current ] ) ); + // tqWarning( "--------------------------" ); + // tqWarning( "red - %d", tqRed( data[ current ] ) ); + // tqWarning( "green - %d", tqRed( data[ current ] ) ); + // tqWarning( "blue - %d", tqRed( data[ current ] ) ); - delta = 255 - qGray( data[ current ] ); + delta = 255 - tqGray( data[ current ] ); destR = srcR - delta; destG = srcG - delta; @@ -870,7 +870,7 @@ void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeM destG = 255; if ( destB > 255 ) destB = 255; - destData[ current ] = qRgba( destR, destG, destB, alpha ); + destData[ current ] = tqRgba( destR, destG, destB, alpha ); } pix->convertFromImage( *dest ); } @@ -888,9 +888,9 @@ void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeM if ( img.depth() != 32 ) img = img.convertDepth( 32 ); - // QImage *dest; + // TQImage *dest; // *dest = img; - QImage *dest = new QImage( img.width(), img.height(), 32 ); + TQImage *dest = new TQImage( img.width(), img.height(), 32 ); dest->setAlphaBuffer( TRUE ); unsigned int *data = ( unsigned int * ) img.bits(); unsigned int *destData = ( unsigned int* ) dest->bits(); @@ -903,19 +903,19 @@ void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeM // int srcB = c.blue(); int h, s, v, ch; // int *r, *g, *b, *a; - QColor col ; + TQColor col ; // float srcPercent, destPercent; for ( current = 0; current < total; ++current ) { - // int qRed ( data[ current ] ); - // int qGreen ( data[ current ] ); - // int qBlue ( data[ current ] ); - // alpha = qAlpha( destData[ current ] ); + // int tqRed ( data[ current ] ); + // int tqGreen ( data[ current ] ); + // int tqBlue ( data[ current ] ); + // alpha = tqAlpha( destData[ current ] ); // // //destData[ current ] = data[ current ]; // - // QColor col = destData[ current ]; + // TQColor col = destData[ current ]; // col.getHsv( h, s, v ); // //*h += 50; // @@ -924,7 +924,7 @@ void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeM // col.getRgb( r, g, b ); col.setRgb( data[ current ] ); - //col = Qt::red; + //col = TQt::red; c.hsv( &h, &s, &v ); ch = h; col.hsv( &h, &s, &v ); @@ -934,7 +934,7 @@ void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeM destR = col.red(); destG = col.green(); destB = col.blue(); - alpha = qAlpha( data[ current ] ); + alpha = tqAlpha( data[ current ] ); // if ( destR < 0 ) @@ -950,10 +950,10 @@ void DeKoratorFactory::colorizePixmap( QPixmap *pix, QColor c, QString colorizeM // if ( destB > 255 ) // destB = 255; - destData[ current ] = qRgba( destR, destG, destB, alpha ); + destData[ current ] = tqRgba( destR, destG, destB, alpha ); //destData[ current ] = data[ current ]; } - pix->convertFromImage( *dest, /*Qt::ColorOnly | Qt::DiffuseDither | Qt::DiffuseAlphaDither |*/ Qt::AvoidDither ); + pix->convertFromImage( *dest, /*TQt::ColorOnly | TQt::DiffuseDither | TQt::DiffuseAlphaDither |*/ TQt::AvoidDither ); } } @@ -969,7 +969,7 @@ void DeKoratorFactory::initPixmaps() { for ( j = 0; j < pixTypeCount; j++ ) { - DECOARR[ i ][ j ] = new QPixmap(); + DECOARR[ i ][ j ] = new TQPixmap(); } } @@ -979,7 +979,7 @@ void DeKoratorFactory::initPixmaps() { for ( k = 0; k < pixTypeCount; k++ ) { - BUTTONSARR[ i ][ j ][ k ] = new QPixmap(); + BUTTONSARR[ i ][ j ][ k ] = new TQPixmap(); } } } @@ -1076,10 +1076,10 @@ void DeKoratorFactory::chooseRightPixmaps() void DeKoratorFactory::prepareDecoWithBgCol() { int i; - QPainter painter; - QPixmap tempPix; - QWidget widget; - QColor col = widget.colorGroup().background(); + TQPainter painter; + TQPixmap tempPix; + TQWidget widget; + TQColor col = widget.colorGroup().background(); if ( DeKoratorFactory::colorizeActFrames_ ) @@ -1186,8 +1186,8 @@ void DeKoratorFactory::prepareDecoWithBgCol() // --------------- // Constructor DeKoratorButton::DeKoratorButton( bool isLeft, int buttonWidth, int buttonHeight, DeKoratorClient * parent, const char * name, - const QString & tip, ButtonType type, buttonTypeAll btnType ) - : QButton( parent->widget(), name ), isLeft_( isLeft ), buttonWidth_( buttonWidth ), client_( parent ), type_( type ), lastmouse_( NoButton ), decoPixHeight_( buttonHeight ) + const TQString & tip, ButtonType type, buttonTypeAll btnType ) + : TQButton( parent->widget(), name ), isLeft_( isLeft ), buttonWidth_( buttonWidth ), client_( parent ), type_( type ), lastmouse_( NoButton ), decoPixHeight_( buttonHeight ) { //decoPixInAct_ = buttonPixInAct; animProgress = 0; @@ -1200,9 +1200,9 @@ DeKoratorButton::DeKoratorButton( bool isLeft, int buttonWidth, int buttonHeight //if ( buttonPix ) setPixmap( btnType ); - QToolTip::add + TQToolTip::add ( this, tip ); - animTmr = new QTimer( this ); + animTmr = new TQTimer( this ); connect( animTmr, SIGNAL( timeout() ), this, SLOT( animate() ) ); } @@ -1239,7 +1239,7 @@ void DeKoratorButton::setPixmap( buttonTypeAll btnType ) // } // else // { - // deco_ = new QBitmap(DECOSIZE, DECOSIZE, bitmap, TRUE); + // deco_ = new TQBitmap(DECOSIZE, DECOSIZE, bitmap, TRUE); // deco_->setMask(*deco_); // } repaint( FALSE ); @@ -1249,22 +1249,22 @@ void DeKoratorButton::setPixmap( buttonTypeAll btnType ) // sizeHint() // ---------- // Return size hint -QSize DeKoratorButton::sizeHint() const +TQSize DeKoratorButton::sizeHint() const { - return QSize( buttonWidth_, BUTTONSHEIGHT ); + return TQSize( buttonWidth_, BUTTONSHEIGHT ); } ////////////////////////////////////////////////////////////////////////////// // enterEvent() // ------------ // Mouse has entered the button -void DeKoratorButton::enterEvent( QEvent * e ) +void DeKoratorButton::enterEvent( TQEvent * e ) { // if we wanted to do mouseovers, we would keep track of it here - QButton::enterEvent( e ); + TQButton::enterEvent( e ); s = STEPS; hover_ = TRUE; - setCursor( Qt::PointingHandCursor ); + setCursor( TQt::PointingHandCursor ); if ( USEANIMATION ) animate(); @@ -1276,11 +1276,11 @@ void DeKoratorButton::enterEvent( QEvent * e ) // leaveEvent() // ------------ // Mouse has left the button -void DeKoratorButton::leaveEvent( QEvent * e ) +void DeKoratorButton::leaveEvent( TQEvent * e ) { // if we wanted to do mouseovers, we would keep track of it here - QButton::leaveEvent( e ); + TQButton::leaveEvent( e ); //STEPS = s; hover_ = FALSE; unsetCursor (); @@ -1295,7 +1295,7 @@ void DeKoratorButton::leaveEvent( QEvent * e ) // mousePressEvent() // ----------------- // Button has been pressed -void DeKoratorButton::mousePressEvent( QMouseEvent * e ) +void DeKoratorButton::mousePressEvent( TQMouseEvent * e ) { lastmouse_ = e->button(); @@ -1305,16 +1305,16 @@ void DeKoratorButton::mousePressEvent( QMouseEvent * e ) { button = NoButton; // middle & right buttons inappropriate } - QMouseEvent me( e->type(), e->pos(), e->globalPos(), + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), button, e->state() ); - QButton::mousePressEvent( &me ); + TQButton::mousePressEvent( &me ); } ////////////////////////////////////////////////////////////////////////////// // mouseReleaseEvent() // ----------------- // Button has been released -void DeKoratorButton::mouseReleaseEvent( QMouseEvent * e ) +void DeKoratorButton::mouseReleaseEvent( TQMouseEvent * e ) { lastmouse_ = e->button(); @@ -1324,23 +1324,23 @@ void DeKoratorButton::mouseReleaseEvent( QMouseEvent * e ) { button = NoButton; // middle & right buttons inappropriate } - QMouseEvent me( e->type(), e->pos(), e->globalPos(), button, e->state() ); - QButton::mouseReleaseEvent( &me ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), button, e->state() ); + TQButton::mouseReleaseEvent( &me ); } ////////////////////////////////////////////////////////////////////////////// // drawButton() // ------------ // Draw the button -void DeKoratorButton::drawButton( QPainter * painter ) +void DeKoratorButton::drawButton( TQPainter * painter ) { if ( !DeKoratorFactory::initialized() ) return ; - QColorGroup group; + TQColorGroup group; int dx = 0, dy = 0; bool act = client_->isActive(); - QImage buttonImgBak; + TQImage buttonImgBak; // fill background if ( isLeft_ ) @@ -1353,7 +1353,7 @@ void DeKoratorButton::drawButton( QPainter * painter ) { dy = ( height() - 16 ) / 2; - QPixmap appIconPix = client_->icon().pixmap( QIconSet::Small, QIconSet::Normal ); + TQPixmap appIconPix = client_->icon().pixmap( TQIconSet::Small, TQIconSet::Normal ); if ( !IGNOREAPPICNCOL ) { @@ -1365,7 +1365,7 @@ void DeKoratorButton::drawButton( QPainter * painter ) } else if ( client_->decoFactory_->colorizeActButtons_ ) { - QColor col = client_->decoFactory_->options() ->colorGroup( KDecoration::ColorButtonBg, act ).background(); + TQColor col = client_->decoFactory_->options() ->colorGroup( KDecoration::ColorButtonBg, act ).background(); DeKoratorFactory::colorizePixmap( &appIconPix, col, BUTTONSCOLORIZE ); } @@ -1378,7 +1378,7 @@ void DeKoratorButton::drawButton( QPainter * painter ) } else if ( client_->decoFactory_->colorizeInActButtons_ ) { - QColor col = client_->decoFactory_->options() ->colorGroup( KDecoration::ColorButtonBg, act ).background(); + TQColor col = client_->decoFactory_->options() ->colorGroup( KDecoration::ColorButtonBg, act ).background(); DeKoratorFactory::colorizePixmap( &appIconPix, col, BUTTONSCOLORIZE ); } @@ -1431,7 +1431,7 @@ void DeKoratorButton::drawButton( QPainter * painter ) if ( client_->isShade() && !SHOWBTMBORDER ) { - painter->setPen( QColor( 70, 70, 70 ) ); + painter->setPen( TQColor( 70, 70, 70 ) ); painter->drawLine( 0, BUTTONSHEIGHT - 1, buttonWidth_ - 1, BUTTONSHEIGHT - 1 ); } } @@ -1440,7 +1440,7 @@ void DeKoratorButton::drawButton( QPainter * painter ) // chooseRightHoverEffect() // ------------ // -QImage* DeKoratorButton::chooseRightHoverEffect( QImage * img, QString res ) +TQImage* DeKoratorButton::chooseRightHoverEffect( TQImage * img, TQString res ) { if ( USEANIMATION && !isDown() ) @@ -1456,7 +1456,7 @@ QImage* DeKoratorButton::chooseRightHoverEffect( QImage * img, QString res ) else if ( res == "Blend" ) { f /= 1.7; - QColor col = client_->isActive() ? ACTIVEHIGHLIGHTCOLOR : INACTIVEHIGHLIGHTCOLOR; + TQColor col = client_->isActive() ? ACTIVEHIGHLIGHTCOLOR : INACTIVEHIGHLIGHTCOLOR; * img = KImageEffect::blend ( col, *img, f ); } @@ -1467,25 +1467,25 @@ QImage* DeKoratorButton::chooseRightHoverEffect( QImage * img, QString res ) else if ( res == "Fade" ) { f /= 3; - QColor col = client_->isActive() ? ACTIVEHIGHLIGHTCOLOR : INACTIVEHIGHLIGHTCOLOR; + TQColor col = client_->isActive() ? ACTIVEHIGHLIGHTCOLOR : INACTIVEHIGHLIGHTCOLOR; * img = KImageEffect::fade ( *img, f, col ); } else if ( res == "Trashed" ) { - * img = KImageEffect::fade ( *img, animProgress, Qt::black ); + * img = KImageEffect::fade ( *img, animProgress, TQt::black ); } else if ( res == "Hue Shift" ) { int h, s, v; - QColor col ; + TQColor col ; int shift = ( int ) ( animProgress * 3.5 ); col.setRgb( 255, 0, 0 ); col.hsv( &h, &s, &v ); col.setHsv( shift, s, v ); - QPixmap pix; - pix.convertFromImage( *img, Qt::AvoidDither ); + TQPixmap pix; + pix.convertFromImage( *img, TQt::AvoidDither ); DeKoratorFactory::colorizePixmap( &pix, col, "Hue Adgustment" ); *img = pix.convertToImage(); } @@ -1496,10 +1496,10 @@ QImage* DeKoratorButton::chooseRightHoverEffect( QImage * img, QString res ) KIconEffect::toGray( *img, EFFECTAMOUNT ); else if ( BUTTONHOVERTYPE == "Colorize" ) { - QColor col = client_->isActive() ? ACTIVEHIGHLIGHTCOLOR : INACTIVEHIGHLIGHTCOLOR; + TQColor col = client_->isActive() ? ACTIVEHIGHLIGHTCOLOR : INACTIVEHIGHLIGHTCOLOR; - QPixmap pix; - pix.convertFromImage( *img, Qt::AvoidDither ); + TQPixmap pix; + pix.convertFromImage( *img, TQt::AvoidDither ); DeKoratorFactory::colorizePixmap( &pix, col, BUTTONSCOLORIZE ); *img = pix.convertToImage(); } @@ -1558,9 +1558,9 @@ void DeKoratorButton::animate() if ( animProgress > 0 ) animTmr->start( INTERVAL, true ); // single-shot } - //qWarning( "STEPS: %d", STEPS ); - //qWarning( "animProgress: %d", animProgress ); - //qWarning( "INTERVAL: %d", INTERVAL ); + //tqWarning( "STEPS: %d", STEPS ); + //tqWarning( "animProgress: %d", animProgress ); + //tqWarning( "INTERVAL: %d", INTERVAL ); repaint( false ); } @@ -1658,23 +1658,23 @@ void DeKoratorClient::init() buttomRightFrameBg[ normal ] ->load( decoPixDir + "/bottomRightFrameBg.png" );*/ // layouts - mainLayout_ = new QVBoxLayout( widget(), 0, 0 ); - titleLayout_ = new QHBoxLayout( mainLayout_, 0, 0 ); - midLayout_ = new QHBoxLayout( mainLayout_, 0, 0 ); + mainLayout_ = new TQVBoxLayout( widget(), 0, 0 ); + titleLayout_ = new TQHBoxLayout( mainLayout_, 0, 0 ); + midLayout_ = new TQHBoxLayout( mainLayout_, 0, 0 ); // spacers - leftTitleBarSpacer_ = new QSpacerItem( TOPLEFTCORNERWIDTH, TITLESIZE, - QSizePolicy::Fixed, QSizePolicy::Fixed ); - titleBarSpacer_ = new QSpacerItem( 1, TITLESIZE, QSizePolicy::Expanding, - QSizePolicy::Fixed ); - rightTitleBarSpacer_ = new QSpacerItem( TOPRIGHTCORNERWIDTH, TITLESIZE, - QSizePolicy::Fixed, QSizePolicy::Fixed ); - leftSpacer_ = new QSpacerItem( LEFTFRAMESIZE, 1, - QSizePolicy::Fixed, QSizePolicy::Expanding ); - rightSpacer_ = new QSpacerItem( RIGHTFRAMESIZE, 1, - QSizePolicy::Fixed, QSizePolicy::Expanding ); - bottomSpacer_ = new QSpacerItem( 1, ( !isSetShade() || SHOWBTMBORDER ) ? BUTTOMFRAMESIZE : 0, - QSizePolicy::Expanding, QSizePolicy::Fixed ); + leftTitleBarSpacer_ = new TQSpacerItem( TOPLEFTCORNERWIDTH, TITLESIZE, + TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + titleBarSpacer_ = new TQSpacerItem( 1, TITLESIZE, TQSizePolicy::Expanding, + TQSizePolicy::Fixed ); + rightTitleBarSpacer_ = new TQSpacerItem( TOPRIGHTCORNERWIDTH, TITLESIZE, + TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + leftSpacer_ = new TQSpacerItem( LEFTFRAMESIZE, 1, + TQSizePolicy::Fixed, TQSizePolicy::Expanding ); + rightSpacer_ = new TQSpacerItem( RIGHTFRAMESIZE, 1, + TQSizePolicy::Fixed, TQSizePolicy::Expanding ); + bottomSpacer_ = new TQSpacerItem( 1, ( !isSetShade() || SHOWBTMBORDER ) ? BUTTOMFRAMESIZE : 0, + TQSizePolicy::Expanding, TQSizePolicy::Fixed ); // setup layout @@ -1694,11 +1694,11 @@ void DeKoratorClient::init() midLayout_->addItem( leftSpacer_ ); if ( isPreview() ) { - midLayout_->addWidget( new QLabel( "<center><b>" + i18n( "Dekorator preview (Version 0.3)" ) + "</b></center>", widget() ) ); + midLayout_->addWidget( new TQLabel( "<center><b>" + i18n( "Dekorator preview (Version 0.3)" ) + "</b></center>", widget() ) ); } else { - midLayout_->addItem( new QSpacerItem( 0, 0 ) ); + midLayout_->addItem( new TQSpacerItem( 0, 0 ) ); } midLayout_->addItem( rightSpacer_ ); @@ -1720,11 +1720,11 @@ void DeKoratorClient::init() // addButtons() // ------------ // Add buttons to title layout -void DeKoratorClient::addButtons( QBoxLayout * layout, const QString & s, bool isLeft ) +void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool isLeft ) { //const unsigned char * bitmap; -// QPixmap * pix1, *pix2, *pix3, *pix4; - QString tip; +// TQPixmap * pix1, *pix2, *pix3, *pix4; + TQString tip; buttonTypeAll btnType; if ( s.length() > 0 ) @@ -1964,9 +1964,9 @@ void DeKoratorClient::desktopChange() if ( button[ ButtonSticky ] ) { button[ ButtonSticky ] ->setPixmap( btnType ); - QToolTip::remove + TQToolTip::remove ( button[ ButtonSticky ] ); - QToolTip::add + TQToolTip::add ( button[ ButtonSticky ], d ? i18n( "Sticky" ) : i18n( "Un-Sticky" ) ); } } @@ -2004,9 +2004,9 @@ void DeKoratorClient::maximizeChange() if ( button[ ButtonMax ] ) { button[ ButtonMax ] ->setPixmap( btnType ); - QToolTip::remove + TQToolTip::remove ( button[ ButtonMax ] ); - QToolTip::add + TQToolTip::add ( button[ ButtonMax ], m ? i18n( "Restore" ) : i18n( "Maximize" ) ); } } @@ -2031,9 +2031,9 @@ void DeKoratorClient::shadeChange() if ( button[ ButtonShade ] ) { button[ ButtonShade ] ->setPixmap( btnType ); - QToolTip::remove + TQToolTip::remove ( button[ ButtonShade ] ); - QToolTip::add + TQToolTip::add ( button[ ButtonShade ], s ? i18n( "Unshade" ) : i18n( "Shade" ) ); } @@ -2109,12 +2109,12 @@ void DeKoratorClient::borders( int & l, int & r, int & t, int & b ) const if ( !isShade() || SHOWBTMBORDER ) { b = BUTTOMFRAMESIZE; - bottomSpacer_->changeSize( 1, BUTTOMFRAMESIZE, QSizePolicy::Expanding, QSizePolicy::Fixed ); + bottomSpacer_->changeSize( 1, BUTTOMFRAMESIZE, TQSizePolicy::Expanding, TQSizePolicy::Fixed ); } else { b = 0; - bottomSpacer_->changeSize( 1, b, QSizePolicy::Expanding, QSizePolicy::Fixed ); + bottomSpacer_->changeSize( 1, b, TQSizePolicy::Expanding, TQSizePolicy::Fixed ); } widget() ->layout() ->activate(); } @@ -2123,7 +2123,7 @@ void DeKoratorClient::borders( int & l, int & r, int & t, int & b ) const // resize() // -------- // Called to resize the window -void DeKoratorClient::resize( const QSize & size ) +void DeKoratorClient::resize( const TQSize & size ) { widget() ->resize( size ); } @@ -2132,9 +2132,9 @@ void DeKoratorClient::resize( const QSize & size ) // minimumSize() // ------------- // Return the minimum allowable size for this window -QSize DeKoratorClient::minimumSize() const +TQSize DeKoratorClient::minimumSize() const { - QSize size = widget() ->minimumSize(); + TQSize size = widget() ->minimumSize(); size.setWidth( size.width() + TOPLEFTCORNERWIDTH + TOPRIGHTCORNERWIDTH ); return size; @@ -2145,7 +2145,7 @@ QSize DeKoratorClient::minimumSize() const // mousePosition() // --------------- // Return logical mouse position -KDecoration::Position DeKoratorClient::mousePosition( const QPoint & point ) const +KDecoration::Position DeKoratorClient::mousePosition( const TQPoint & point ) const { // bool res = TRUE; Position pos; @@ -2237,7 +2237,7 @@ KDecoration::Position DeKoratorClient::mousePosition( const QPoint & point ) con // eventFilter() // ------------- // Event filter -bool DeKoratorClient::eventFilter( QObject * obj, QEvent * e ) +bool DeKoratorClient::eventFilter( TQObject * obj, TQEvent * e ) { if ( obj != widget() ) return FALSE; @@ -2245,36 +2245,36 @@ bool DeKoratorClient::eventFilter( QObject * obj, QEvent * e ) switch ( e->type() ) { - case QEvent::MouseButtonDblClick: + case TQEvent::MouseButtonDblClick: { - mouseDoubleClickEvent( static_cast<QMouseEvent *>( e ) ); + mouseDoubleClickEvent( static_cast<TQMouseEvent *>( e ) ); return TRUE; } - case QEvent::Wheel: + case TQEvent::Wheel: { - wheelEvent( static_cast<QWheelEvent *>( e ) ); + wheelEvent( static_cast<TQWheelEvent *>( e ) ); return TRUE; } - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonPress: { - processMousePressEvent( static_cast<QMouseEvent *>( e ) ); + processMousePressEvent( static_cast<TQMouseEvent *>( e ) ); if ( USEMASKS ) doShape(); return TRUE; } - case QEvent::Paint: + case TQEvent::Paint: { - paintEvent( static_cast<QPaintEvent *>( e ) ); + paintEvent( static_cast<TQPaintEvent *>( e ) ); return TRUE; } - case QEvent::Resize: + case TQEvent::Resize: { - resizeEvent( static_cast<QResizeEvent *>( e ) ); + resizeEvent( static_cast<TQResizeEvent *>( e ) ); return TRUE; } - case QEvent::Show: + case TQEvent::Show: { - showEvent( static_cast<QShowEvent *>( e ) ); + showEvent( static_cast<TQShowEvent *>( e ) ); return TRUE; } default: @@ -2290,7 +2290,7 @@ bool DeKoratorClient::eventFilter( QObject * obj, QEvent * e ) // mouseDoubleClickEvent() // ----------------------- // Doubleclick on title -void DeKoratorClient::mouseDoubleClickEvent( QMouseEvent * e ) +void DeKoratorClient::mouseDoubleClickEvent( TQMouseEvent * e ) { if ( titleBarSpacer_->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); @@ -2300,7 +2300,7 @@ void DeKoratorClient::mouseDoubleClickEvent( QMouseEvent * e ) // wheelEvent() // ----------------------- // -void DeKoratorClient::wheelEvent( QWheelEvent *e ) +void DeKoratorClient::wheelEvent( TQWheelEvent *e ) { if ( titleLayout_->geometry().contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta() ); @@ -2311,7 +2311,7 @@ void DeKoratorClient::wheelEvent( QWheelEvent *e ) // paintEvent() // ------------ // Repaint the window -void DeKoratorClient::paintEvent( QPaintEvent* ) +void DeKoratorClient::paintEvent( TQPaintEvent* ) { if ( !DeKoratorFactory::initialized() ) return ; @@ -2320,17 +2320,17 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) if ( captionBufferDirty_ && USESHDTEXT ) updateCaptionBuffer(); - QPainter painter( widget() ); + TQPainter painter( widget() ); int tx, ty, tw, th; int w = width() , h = height(); - QRect titleR( titleBarSpacer_->geometry() ); - QRect leftTitleR( leftTitleBarSpacer_->geometry() ); - QRect rightTitleR( rightTitleBarSpacer_->geometry() ); + TQRect titleR( titleBarSpacer_->geometry() ); + TQRect leftTitleR( leftTitleBarSpacer_->geometry() ); + TQRect rightTitleR( rightTitleBarSpacer_->geometry() ); titleR.rect( &tx, &ty, &tw, &th ); - QRect rect; + TQRect rect; - QPainter painter2; - QPixmap pix( w, TITLESIZE ); + TQPainter painter2; + TQPixmap pix( w, TITLESIZE ); painter2.begin( &pix ); { // topLeftCorner @@ -2347,14 +2347,14 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) if ( tw > 0 ) { - //qWarning("%d",titleR.width()); + //tqWarning("%d",titleR.width()); //leftTitleR - rect.setRect( tx, 0, QMIN( LEFTTITLEWIDTH, tw ), TITLESIZE ); + rect.setRect( tx, 0, TQMIN( LEFTTITLEWIDTH, tw ), TITLESIZE ); painter2.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ leftTitle ] ) : *( DECOPIXINACTARR[ leftTitle ] ) ); - // rect.setRect( tx, 0, QMIN( LEFTTITLEWIDTH, tw ), TITLESIZE ); + // rect.setRect( tx, 0, TQMIN( LEFTTITLEWIDTH, tw ), TITLESIZE ); // painter2.drawTiledPixmap( rect, isActive() ? decoFactory_->leftTitleBg_ : decoFactory_->leftTitleBgInAct_ ); //midTitle @@ -2370,7 +2370,7 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) //rightTitleR if ( tw > LEFTTITLEWIDTH ) { - rect.setRect( QMAX( tx + tw - RIGHTTITLEWIDTH, tx + LEFTTITLEWIDTH ), 0, QMIN( RIGHTTITLEWIDTH, tw - LEFTTITLEWIDTH ), th ); + rect.setRect( TQMAX( tx + tw - RIGHTTITLEWIDTH, tx + LEFTTITLEWIDTH ), 0, TQMIN( RIGHTTITLEWIDTH, tw - LEFTTITLEWIDTH ), th ); painter2.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? *( DECOPIXACTARR[ rightTitle ] ) : *( DECOPIXINACTARR[ rightTitle ] ), ( tw > LEFTTITLEWIDTH + RIGHTTITLEWIDTH ) ? 0 : LEFTTITLEWIDTH - ( tw - RIGHTTITLEWIDTH ), 0 ); @@ -2391,8 +2391,8 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) // painter2.drawTiledPixmap( rect, isActive() ? decoFactory_->topRightCornerBg_ : decoFactory_->topRightCornerBgInAct_ ); - QString c( caption() ); - QFontMetrics fm( options() ->font( isActive() ) ); + TQString c( caption() ); + TQFontMetrics fm( options() ->font( isActive() ) ); int captionWidth = fm.width( c ); // shadow text effect if ( USESHDTEXT ) @@ -2401,23 +2401,23 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) int captionHeight = fm.height( ); int dx = 0, dy = 0; - if ( TITLEALIGN == Qt::AlignLeft || captionWidth > titleR.width() ) + if ( TITLEALIGN == TQt::AlignLeft || captionWidth > titleR.width() ) { dx = tx + 1 + ( isActive() ? ACTIVESHDTEXTX : INACTIVESHDTEXTX ) ; dy = ( TITLESIZE / 2 ) - ( captionHeight / 2 ) + ( isActive() ? ACTIVESHDTEXTY : INACTIVESHDTEXTY ) ; } - else if ( TITLEALIGN == Qt::AlignHCenter ) + else if ( TITLEALIGN == TQt::AlignHCenter ) { dx = tx + ( tw / 2 ) - ( ( captionWidth + ( MARGIN * 2 ) ) / 2 ) + ( isActive() ? ACTIVESHDTEXTX : INACTIVESHDTEXTX ) ; dy = ( TITLESIZE / 2 ) - ( captionHeight / 2 ) + ( isActive() ? ACTIVESHDTEXTY : INACTIVESHDTEXTY ) ; } - else if ( TITLEALIGN == Qt::AlignRight ) + else if ( TITLEALIGN == TQt::AlignRight ) { dx = tx + tw - ( captionWidth + ( MARGIN * 2 ) ) - 1 + ( isActive() ? ACTIVESHDTEXTX : INACTIVESHDTEXTX ) ; dy = ( TITLESIZE / 2 ) - ( captionHeight / 2 ) + ( isActive() ? ACTIVESHDTEXTY : INACTIVESHDTEXTY ) ; } - painter2.drawImage( dx, dy, isActive() ? activeShadowImg_ : inActiveShadowImg_, 0, 0, isActive() ? QMIN( activeShadowImg_.width(), titleR.width() ) : QMIN( inActiveShadowImg_.width(), titleR.width() ), isActive() ? activeShadowImg_.height() : inActiveShadowImg_.height() ); + painter2.drawImage( dx, dy, isActive() ? activeShadowImg_ : inActiveShadowImg_, 0, 0, isActive() ? TQMIN( activeShadowImg_.width(), titleR.width() ) : TQMIN( inActiveShadowImg_.width(), titleR.width() ), isActive() ? activeShadowImg_.height() : inActiveShadowImg_.height() ); } @@ -2425,9 +2425,9 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) painter2.setFont( options() ->font( isActive(), FALSE ) ); painter2.setPen( options() ->color( KDecoration::ColorFont, isActive() ) ); - Qt::AlignmentFlags titleAlignBak = TITLEALIGN; + TQt::AlignmentFlags titleAlignBak = TITLEALIGN; if ( captionWidth > titleR.width() ) - titleAlignBak = Qt::AlignLeft; + titleAlignBak = TQt::AlignLeft; painter2.drawText( tx + MARGIN, ty, tw - ( MARGIN * 2 ), th, titleAlignBak | AlignVCenter, caption() ); } @@ -2445,7 +2445,7 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) //left frame //top - rect.setRect( 0, TITLESIZE , LEFTFRAMESIZE, QMIN( TOPLEFTFRAMEHEIGHT, leftRightFramesHeight ) ); + rect.setRect( 0, TITLESIZE , LEFTFRAMESIZE, TQMIN( TOPLEFTFRAMEHEIGHT, leftRightFramesHeight ) ); painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ topLeftFrame ] ) : *( DECOPIXINACTARR[ topLeftFrame ] ) ); @@ -2462,7 +2462,7 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) // buttom if ( leftRightFramesHeight > TOPLEFTFRAMEHEIGHT ) { - rect.setRect( 0, QMAX( h - BUTTOMFRAMESIZE - BOTTOMLEFTFRAMEHEIGHT, TITLESIZE + TOPLEFTFRAMEHEIGHT ) , LEFTFRAMESIZE, QMIN( BOTTOMLEFTFRAMEHEIGHT, leftRightFramesHeight - TOPLEFTFRAMEHEIGHT ) ); + rect.setRect( 0, TQMAX( h - BUTTOMFRAMESIZE - BOTTOMLEFTFRAMEHEIGHT, TITLESIZE + TOPLEFTFRAMEHEIGHT ) , LEFTFRAMESIZE, TQMIN( BOTTOMLEFTFRAMEHEIGHT, leftRightFramesHeight - TOPLEFTFRAMEHEIGHT ) ); painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? *( DECOPIXACTARR[ buttomLeftFrame ] ) : *( DECOPIXINACTARR[ buttomLeftFrame ] ), 0, ( leftRightFramesHeight > TOPLEFTFRAMEHEIGHT + BOTTOMLEFTFRAMEHEIGHT ) ? 0 : TITLESIZE + TOPLEFTFRAMEHEIGHT - ( h - BUTTOMFRAMESIZE - BOTTOMLEFTFRAMEHEIGHT ) ); @@ -2472,7 +2472,7 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) //rightFrame // top - rect.setRect( w - RIGHTFRAMESIZE, TITLESIZE , RIGHTFRAMESIZE, QMIN( TOPRIGHTFRAMEHEIGHT, leftRightFramesHeight ) ); + rect.setRect( w - RIGHTFRAMESIZE, TITLESIZE , RIGHTFRAMESIZE, TQMIN( TOPRIGHTFRAMEHEIGHT, leftRightFramesHeight ) ); painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ topRightFrame ] ) : *( DECOPIXINACTARR[ topRightFrame ] ) ); @@ -2491,7 +2491,7 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) // bottom if ( leftRightFramesHeight > TOPRIGHTFRAMEHEIGHT ) { - rect.setRect( w - RIGHTFRAMESIZE, QMAX( h - BUTTOMFRAMESIZE - BOTTOMRIGHTFRAMEHEIGHT, TITLESIZE + TOPRIGHTFRAMEHEIGHT ) , RIGHTFRAMESIZE, QMIN( BOTTOMRIGHTFRAMEHEIGHT, leftRightFramesHeight - TOPRIGHTFRAMEHEIGHT ) ); + rect.setRect( w - RIGHTFRAMESIZE, TQMAX( h - BUTTOMFRAMESIZE - BOTTOMRIGHTFRAMEHEIGHT, TITLESIZE + TOPRIGHTFRAMEHEIGHT ) , RIGHTFRAMESIZE, TQMIN( BOTTOMRIGHTFRAMEHEIGHT, leftRightFramesHeight - TOPRIGHTFRAMEHEIGHT ) ); painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? *( DECOPIXACTARR[ buttomRightFrame ] ) : *( DECOPIXINACTARR[ buttomRightFrame ] ), 0, ( leftRightFramesHeight > TOPRIGHTFRAMEHEIGHT + BOTTOMRIGHTFRAMEHEIGHT ) ? 0 : TITLESIZE + TOPRIGHTFRAMEHEIGHT - ( h - BUTTOMFRAMESIZE - BOTTOMRIGHTFRAMEHEIGHT ) ); @@ -2503,7 +2503,7 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) // buttom frame if ( w > 0 ) { // left - rect.setRect( 0 , h - BUTTOMFRAMESIZE, QMIN( LEFTBOTTOMFRAMEWIDTH, w ) , BUTTOMFRAMESIZE ); + rect.setRect( 0 , h - BUTTOMFRAMESIZE, TQMIN( LEFTBOTTOMFRAMEWIDTH, w ) , BUTTOMFRAMESIZE ); painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ leftButtomFrame ] ) : *( DECOPIXINACTARR[ leftButtomFrame ] ) ); @@ -2520,7 +2520,7 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) // right if ( w > LEFTBOTTOMFRAMEWIDTH ) { - rect.setRect( QMAX( w - RIGHTBOTTOMFRAMEWIDTH, LEFTBOTTOMFRAMEWIDTH ) , h - BUTTOMFRAMESIZE, QMIN( RIGHTBOTTOMFRAMEWIDTH, w - LEFTBOTTOMFRAMEWIDTH ) , BUTTOMFRAMESIZE ); + rect.setRect( TQMAX( w - RIGHTBOTTOMFRAMEWIDTH, LEFTBOTTOMFRAMEWIDTH ) , h - BUTTOMFRAMESIZE, TQMIN( RIGHTBOTTOMFRAMEWIDTH, w - LEFTBOTTOMFRAMEWIDTH ) , BUTTOMFRAMESIZE ); painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? *( DECOPIXACTARR[ rightButtomFrame ] ) : *( DECOPIXINACTARR[ rightButtomFrame ] ), ( w > LEFTBOTTOMFRAMEWIDTH + RIGHTBOTTOMFRAMEWIDTH ) ? 0 : LEFTBOTTOMFRAMEWIDTH - ( w - RIGHTBOTTOMFRAMEWIDTH ), 0 ); @@ -2530,7 +2530,7 @@ void DeKoratorClient::paintEvent( QPaintEvent* ) } else { - painter.setPen( QColor( 70, 70, 70 ) ); + painter.setPen( TQColor( 70, 70, 70 ) ); painter.drawLine( 0 , h - 1, w, h - 1 ); } } @@ -2545,16 +2545,16 @@ void DeKoratorClient::updateCaptionBuffer() if ( !DeKoratorFactory::initialized() ) return ; - QPainter painter; - QString c( caption() ); - QFontMetrics fm( options() ->font( isActive() ) ); + TQPainter painter; + TQString c( caption() ); + TQFontMetrics fm( options() ->font( isActive() ) ); int captionWidth = fm.width( c ); int captionHeight = fm.height( ); - QPixmap textPixmap; + TQPixmap textPixmap; // prepare the shadow - textPixmap = QPixmap( captionWidth + ( MARGIN * 2 ) , captionHeight ); // 2*2 px shadow space - textPixmap.fill( QColor( 0, 0, 0 ) ); + textPixmap = TQPixmap( captionWidth + ( MARGIN * 2 ) , captionHeight ); // 2*2 px shadow space + textPixmap.fill( TQColor( 0, 0, 0 ) ); textPixmap.setMask( textPixmap.createHeuristicMask( TRUE ) ); painter.begin( &textPixmap ); painter.setFont( options() ->font( isActive(), FALSE ) ); @@ -2576,11 +2576,11 @@ void DeKoratorClient::updateCaptionBuffer() // resizeEvent() // ------------- // Window is being resized -void DeKoratorClient::resizeEvent( QResizeEvent *e ) +void DeKoratorClient::resizeEvent( TQResizeEvent *e ) { if ( widget() ->isShown() ) { - QRegion region = widget() ->rect(); + TQRegion region = widget() ->rect(); region = region.subtract( titleBarSpacer_->geometry() ); widget() ->erase( region ); } @@ -2589,7 +2589,7 @@ void DeKoratorClient::resizeEvent( QResizeEvent *e ) if ( oldSize_ != e->size() ) { - //qWarning("QResizeEvent"); + //tqWarning("TQResizeEvent"); sizeChanged = true; } else @@ -2597,11 +2597,11 @@ void DeKoratorClient::resizeEvent( QResizeEvent *e ) oldSize_ = e->size(); - // if(e->type() == QEvent::Resize) + // if(e->type() == TQEvent::Resize) // { // - // //oldSize((QResizeEvent*)e)->size()); - // qWarning( "resizeEvent" ); + // //oldSize((TQResizeEvent*)e)->size()); + // tqWarning( "resizeEvent" ); // } // maskDirty_ = true; @@ -2613,7 +2613,7 @@ void DeKoratorClient::resizeEvent( QResizeEvent *e ) // showEvent() // ----------- // Window is being shown -void DeKoratorClient::showEvent( QShowEvent * ) +void DeKoratorClient::showEvent( TQShowEvent * ) { widget() ->repaint(); if ( USEMASKS ) @@ -2676,7 +2676,7 @@ void DeKoratorClient::aboveButtonPressed() ////////////////////////////////////////////////////////////////////////////// // belowButtonPressed() // ----------------- -// Below buttQt::green; //on was pressed +// Below buttTQt::green; //on was pressed void DeKoratorClient::belowButtonPressed() { if ( button[ ButtonBelow ] ) @@ -2693,7 +2693,7 @@ void DeKoratorClient::menuButtonPressed() { // if ( button[ ButtonMenu ] ) // { - // QPoint p( button[ ButtonMenu ] ->rect().bottomLeft().x(), + // TQPoint p( button[ ButtonMenu ] ->rect().bottomLeft().x(), // button[ ButtonMenu ] ->rect().bottomLeft().y() ); // KDecorationFactory* f = factory(); // showWindowMenu( button[ ButtonMenu ] ->mapToGlobal( p ) ); @@ -2701,16 +2701,16 @@ void DeKoratorClient::menuButtonPressed() // button[ ButtonMenu ] ->setDown( FALSE ); // } - static QTime * t = NULL; + static TQTime * t = NULL; static DeKoratorClient* lastClient = NULL; if ( t == NULL ) - t = new QTime; - bool dbl = ( lastClient == this && t->elapsed() <= QApplication::doubleClickInterval() ); + t = new TQTime; + bool dbl = ( lastClient == this && t->elapsed() <= TQApplication::doubleClickInterval() ); lastClient = this; t->start(); if ( !dbl || !DBLCLKCLOSE ) { - QPoint p( button[ ButtonMenu ] ->rect().bottomLeft().x(), + TQPoint p( button[ ButtonMenu ] ->rect().bottomLeft().x(), button[ ButtonMenu ] ->rect().bottomLeft().y() ); KDecorationFactory* f = factory(); showWindowMenu( button[ ButtonMenu ] ->mapToGlobal( p ) ); @@ -2740,16 +2740,16 @@ void DeKoratorClient::doShape() { int w = width(); int h = height(); - QRegion mask( 0, 0, w, h ); + TQRegion mask( 0, 0, w, h ); if ( sizeChanged ) { - //qWarning("doShape"); + //tqWarning("doShape"); // top left - QRegion mtr; - QRegion m = QRegion( decoFactory_->topLeftCornerBitmap_ ); - mask -= QRegion( m ); + TQRegion mtr; + TQRegion m = TQRegion( decoFactory_->topLeftCornerBitmap_ ); + mask -= TQRegion( m ); // top mid @@ -2757,14 +2757,14 @@ void DeKoratorClient::doShape() { int pos = TOPLEFTMASKWIDTH; int rep = ( w - TOPLEFTMASKWIDTH - TOPRIGHTMASKWIDTH ) / TOPMIDMASKWIDTH; - m = QRegion( decoFactory_->topMidBitmap_ ); - QRegion mBak = m; + m = TQRegion( decoFactory_->topMidBitmap_ ); + TQRegion mBak = m; for ( int i = 0 ; i < rep ; i++ ) { m = mBak; m.translate( TOPLEFTMASKWIDTH + ( i * TOPMIDMASKWIDTH ), 0 ); - mask -= QRegion( m ); + mask -= TQRegion( m ); pos += TOPMIDMASKWIDTH; } @@ -2778,18 +2778,18 @@ void DeKoratorClient::doShape() { //top right - m = QRegion( decoFactory_->topRightCornerBitmap_ ); + m = TQRegion( decoFactory_->topRightCornerBitmap_ ); m.translate( width() - TOPRIGHTMASKWIDTH, 0 ); - mask -= QRegion( m ); + mask -= TQRegion( m ); } if ( !isShade() || SHOWBTMBORDER ) { //buttom left - m = QRegion( decoFactory_->buttomLeftCornerBitmap_ ); + m = TQRegion( decoFactory_->buttomLeftCornerBitmap_ ); m.translate( 0, h - BOTTOMLEFTMASKHEIGHT ); - mask -= QRegion( m ); + mask -= TQRegion( m ); // bottom mid if ( BOTTOMMIDMASKWIDTH >= 1 ) @@ -2797,14 +2797,14 @@ void DeKoratorClient::doShape() int pos = BOTTOMLEFTMASKWIDTH; int rep = ( w - BOTTOMLEFTMASKWIDTH - BOTTOMRIGHTMASKWIDTH ) / BOTTOMMIDMASKWIDTH; int hm = h - BOTTOMMIDMASKHEIGHT; - m = QRegion( decoFactory_->buttomMidBitmap_ ); - QRegion mBak = m; + m = TQRegion( decoFactory_->buttomMidBitmap_ ); + TQRegion mBak = m; for ( int i = 0 ; i < rep ; i++ ) { m = mBak; m.translate( BOTTOMLEFTMASKWIDTH + ( i * BOTTOMMIDMASKWIDTH ), hm ); - mask -= QRegion( m ); + mask -= TQRegion( m ); pos += BOTTOMMIDMASKWIDTH; } @@ -2817,9 +2817,9 @@ void DeKoratorClient::doShape() } //buttom right - m = QRegion( decoFactory_->buttomRightCornerBitmap_ ); + m = TQRegion( decoFactory_->buttomRightCornerBitmap_ ); m.translate( width() - BOTTOMRIGHTMASKWIDTH, h - BOTTOMRIGHTMASKHEIGHT ); - mask -= QRegion( m ); + mask -= TQRegion( m ); } mask_ = mask; } diff --git a/client/deKoratorclient.h b/client/deKoratorclient.h index b8c7c28..d1bbede 100644 --- a/client/deKoratorclient.h +++ b/client/deKoratorclient.h @@ -35,16 +35,16 @@ #ifndef DEKORATORCLIENT_H #define DEKORATORCLIENT_H -#include <qbutton.h> -#include <qbitmap.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qtooltip.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <qtimer.h> -#include <qcursor.h> +#include <tqbutton.h> +#include <tqbitmap.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqtooltip.h> +#include <tqpixmap.h> +#include <tqapplication.h> +#include <tqtimer.h> +#include <tqcursor.h> #include <kdecoration.h> #include <kdecorationfactory.h> @@ -58,8 +58,8 @@ #include "shadow.h" -class QSpacerItem; -class QPoint; +class TQSpacerItem; +class TQPoint; namespace DeKorator { @@ -141,9 +141,9 @@ public: virtual ~DeKoratorFactory(); virtual KDecoration *createDecoration( KDecorationBridge *b ); virtual bool reset( unsigned long changed ); - static void colorizePixmap( QPixmap *pix, QColor col, QString colorizeMethod ); + static void colorizePixmap( TQPixmap *pix, TQColor col, TQString colorizeMethod ); static bool initialized(); - QBitmap topLeftCornerBitmap_, topMidBitmap_, topRightCornerBitmap_, buttomLeftCornerBitmap_, buttomMidBitmap_, buttomRightCornerBitmap_; + TQBitmap topLeftCornerBitmap_, topMidBitmap_, topRightCornerBitmap_, buttomLeftCornerBitmap_, buttomMidBitmap_, buttomRightCornerBitmap_; private: bool readConfig(); @@ -161,9 +161,9 @@ private: static bool colorizeInActFrames_; static bool needInit_; static bool needReload_; - static QString framesPath_; - static QString buttonsPath_; - static QString masksPath_; + static TQString framesPath_; + static TQString buttonsPath_; + static TQString masksPath_; public: static bool initialized_; static bool useCustomButtonsColors_; @@ -171,7 +171,7 @@ public: static bool customColorsInActiveButtons_; static bool colorizeActButtons_; static bool colorizeInActButtons_; - static QColor cusBtnCol_[ buttonTypeAllCount ]; + static TQColor cusBtnCol_[ buttonTypeAllCount ]; }; inline bool DeKoratorFactory::initialized() @@ -192,16 +192,16 @@ inline bool DeKoratorFactory::initialized() // DeKoratorButton ////////////////////////////////////////////////////////////// -class DeKoratorButton : public QButton +class DeKoratorButton : public TQButton { Q_OBJECT public: DeKoratorButton( bool isLeft, int buttonWidth, int buttonHeight, DeKoratorClient *parent = 0, const char *name = 0, - const QString &tip = NULL, ButtonType type = ButtonHelp, buttonTypeAll btnType = restore ); + const TQString &tip = NULL, ButtonType type = ButtonHelp, buttonTypeAll btnType = restore ); ~DeKoratorButton(); void setPixmap( buttonTypeAll btnType ); - QSize sizeHint() const; + TQSize sizeHint() const; ButtonState lastMousePress() const; void reset(); @@ -209,30 +209,30 @@ protected slots: void animate(); private: - void enterEvent( QEvent *e ); - void leaveEvent( QEvent *e ); - void mousePressEvent( QMouseEvent *e ); - void mouseReleaseEvent( QMouseEvent *e ); - void drawButton( QPainter *painter ); - QImage* chooseRightHoverEffect( QImage *img, QString res ); + void enterEvent( TQEvent *e ); + void leaveEvent( TQEvent *e ); + void mousePressEvent( TQMouseEvent *e ); + void mouseReleaseEvent( TQMouseEvent *e ); + void drawButton( TQPainter *painter ); + TQImage* chooseRightHoverEffect( TQImage *img, TQString res ); private: bool isLeft_; int buttonWidth_; DeKoratorClient *client_; ButtonType type_; - //QPixmap *decoPix_, *decoPixPress_, *decoPixHover_, *decoPixInAct_; + //TQPixmap *decoPix_, *decoPixPress_, *decoPixHover_, *decoPixInAct_; ButtonState lastmouse_; int decoPixHeight_; bool hover_; - QTimer *animTmr; + TQTimer *animTmr; uint animProgress; - QPixmap *btnPixAct_, *btnPixInAct_; + TQPixmap *btnPixAct_, *btnPixInAct_; buttonTypeAll btnType_; int s; }; -inline Qt::ButtonState DeKoratorButton::lastMousePress() const +inline TQt::ButtonState DeKoratorButton::lastMousePress() const { return lastmouse_; } @@ -272,19 +272,19 @@ public: virtual void shadeChange(); virtual void borders( int &l, int &r, int &t, int &b ) const; - virtual void resize( const QSize &size ); - virtual QSize minimumSize() const; - virtual Position mousePosition( const QPoint &point ) const; + virtual void resize( const TQSize &size ); + virtual TQSize minimumSize() const; + virtual Position mousePosition( const TQPoint &point ) const; private: - void addButtons( QBoxLayout* layout, const QString& buttons, bool isLeft ); - - bool eventFilter( QObject *obj, QEvent *e ); - void mouseDoubleClickEvent( QMouseEvent *e ); - void wheelEvent( QWheelEvent *e ); - void paintEvent( QPaintEvent *e ); - void resizeEvent( QResizeEvent * ); - void showEvent( QShowEvent * ); + void addButtons( TQBoxLayout* layout, const TQString& buttons, bool isLeft ); + + bool eventFilter( TQObject *obj, TQEvent *e ); + void mouseDoubleClickEvent( TQMouseEvent *e ); + void wheelEvent( TQWheelEvent *e ); + void paintEvent( TQPaintEvent *e ); + void resizeEvent( TQResizeEvent * ); + void showEvent( TQShowEvent * ); void doShape(); void updateCaptionBuffer(); @@ -301,17 +301,17 @@ private slots: private: DeKoratorButton *button[ ButtonTypeCount ]; - QVBoxLayout *mainLayout_; - QHBoxLayout *titleLayout_ ; - QHBoxLayout *midLayout_; - QSpacerItem *leftTitleBarSpacer_, *titleBarSpacer_, *rightTitleBarSpacer_, *leftSpacer_, *rightSpacer_, *bottomSpacer_; + TQVBoxLayout *mainLayout_; + TQHBoxLayout *titleLayout_ ; + TQHBoxLayout *midLayout_; + TQSpacerItem *leftTitleBarSpacer_, *titleBarSpacer_, *rightTitleBarSpacer_, *leftSpacer_, *rightSpacer_, *bottomSpacer_; bool closing_; - QPixmap *captionBufferPix_; + TQPixmap *captionBufferPix_; bool captionBufferDirty_; - QImage activeShadowImg_, inActiveShadowImg_; - QRegion mask_; + TQImage activeShadowImg_, inActiveShadowImg_; + TQRegion mask_; bool sizeChanged; - QSize oldSize_; + TQSize oldSize_; public: DeKoratorFactory *decoFactory_; }; diff --git a/client/shadow.cpp b/client/shadow.cpp index d17c936..09b813a 100644 --- a/client/shadow.cpp +++ b/client/shadow.cpp @@ -32,7 +32,7 @@ /////////////////////////////////////////////////////////////////////// #include "shadow.h" -#include <qcolor.h> +#include <tqcolor.h> ShadowEngine::ShadowEngine() { @@ -44,9 +44,9 @@ ShadowEngine::~ShadowEngine() { } -QImage ShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColor) +TQImage ShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor) { - QImage result; + TQImage result; // create a new image for for the shaddow int w = textPixmap.width(); @@ -62,7 +62,7 @@ QImage ShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColor /* * This is the source pixmap */ - QImage img = textPixmap.convertToImage().convertDepth(32); + TQImage img = textPixmap.convertToImage().convertDepth(32); /* * Resize the image if necessary @@ -82,13 +82,13 @@ QImage ShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColor alphaShadow = decay(img, i, j); alphaShadow = (alphaShadow > 180.0) ? 180.0 : alphaShadow; // update the shadow's i,j pixel. - result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); + result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); } } return result; } -double ShadowEngine::decay(QImage& source, int i, int j) +double ShadowEngine::decay(TQImage& source, int i, int j) { // create a new image for the shadow int w = source.width(); @@ -120,7 +120,7 @@ double ShadowEngine::decay(QImage& source, int i, int j) else sy = j + m; - opacity += qGray(source.pixel(sx, sy)); + opacity += tqGray(source.pixel(sx, sy)); } } alphaShadow += opacity / multiplicationFactor_; diff --git a/client/shadow.h b/client/shadow.h index 75d76f4..2ddfcca 100644 --- a/client/shadow.h +++ b/client/shadow.h @@ -34,9 +34,9 @@ #ifndef __FX_SHADOW #define __FX_SHADOW -#include <qpixmap.h> -#include <qimage.h> -#include <qcolor.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqcolor.h> class ShadowEngine { @@ -45,9 +45,9 @@ class ShadowEngine ~ShadowEngine(); void setThickness(int thickness) { thickness_ = thickness; } void setMultiplicationFactor(double factor) { multiplicationFactor_ = factor; } - QImage makeShadow(const QPixmap& textPixmap, const QColor &bgColor); + TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor); private: - double decay(QImage& source, int x, int y); + double decay(TQImage& source, int x, int y); int thickness_; double multiplicationFactor_; diff --git a/client/themes.moc.cc b/client/themes.moc.cc index 8ba243f..6d8ec8a 100644 --- a/client/themes.moc.cc +++ b/client/themes.moc.cc @@ -2,20 +2,20 @@ ** IconThemesConfig meta object code from reading C++ file 'themes.h' ** ** Created: Wed Dec 7 21:43:34 2005 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $) +** by: The TQt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #undef QT_NO_COMPAT #include "themes.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> #include <private/qucomextra_p.h> #if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) #error "This file was generated using the moc from 3.3.5. It" -#error "cannot be used with the include files from this version of Qt." +#error "cannot be used with the include files from this version of TQt." #error "(The moc has changed too much.)" #endif @@ -24,46 +24,46 @@ const char *IconThemesConfig::className() const return "IconThemesConfig"; } -QMetaObject *IconThemesConfig::metaObj = 0; -static QMetaObjectCleanUp cleanUp_IconThemesConfig( "IconThemesConfig", &IconThemesConfig::staticMetaObject ); +TQMetaObject *IconThemesConfig::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_IconThemesConfig( "IconThemesConfig", &IconThemesConfig::staticMetaObject ); #ifndef QT_NO_TRANSLATION -QString IconThemesConfig::tr( const char *s, const char *c ) +TQString IconThemesConfig::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "IconThemesConfig", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "IconThemesConfig", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::fromLatin1( s ); } #ifndef QT_NO_TRANSLATION_UTF8 -QString IconThemesConfig::trUtf8( const char *s, const char *c ) +TQString IconThemesConfig::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "IconThemesConfig", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "IconThemesConfig", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } #endif // QT_NO_TRANSLATION_UTF8 #endif // QT_NO_TRANSLATION -QMetaObject* IconThemesConfig::staticMetaObject() +TQMetaObject* IconThemesConfig::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KCModule::staticMetaObject(); - static const QUParameter param_slot_0[] = { - { "item", &static_QUType_ptr, "QListViewItem", QUParameter::In } + TQMetaObject* parentObject = KCModule::staticMetaObject(); + static const TQUParameter param_slot_0[] = { + { "item", &static_QUType_ptr, "TQListViewItem", TQUParameter::In } }; - static const QUMethod slot_0 = {"themeSelected", 1, param_slot_0 }; - static const QUMethod slot_1 = {"installNewTheme", 0, 0 }; - static const QUMethod slot_2 = {"removeSelectedTheme", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "themeSelected(QListViewItem*)", &slot_0, QMetaData::Protected }, - { "installNewTheme()", &slot_1, QMetaData::Protected }, - { "removeSelectedTheme()", &slot_2, QMetaData::Protected } + static const TQUMethod slot_0 = {"themeSelected", 1, param_slot_0 }; + static const TQUMethod slot_1 = {"installNewTheme", 0, 0 }; + static const TQUMethod slot_2 = {"removeSelectedTheme", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "themeSelected(TQListViewItem*)", &slot_0, TQMetaData::Protected }, + { "installNewTheme()", &slot_1, TQMetaData::Protected }, + { "removeSelectedTheme()", &slot_2, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( + metaObj = TQMetaObject::new_metaobject( "IconThemesConfig", parentObject, slot_tbl, 3, 0, 0, @@ -76,35 +76,35 @@ QMetaObject* IconThemesConfig::staticMetaObject() return metaObj; } -void* IconThemesConfig::qt_cast( const char* clname ) +void* IconThemesConfig::tqt_cast( const char* clname ) { if ( !qstrcmp( clname, "IconThemesConfig" ) ) return this; - return KCModule::qt_cast( clname ); + return KCModule::tqt_cast( clname ); } -bool IconThemesConfig::qt_invoke( int _id, QUObject* _o ) +bool IconThemesConfig::tqt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: themeSelected((QListViewItem*)static_QUType_ptr.get(_o+1)); break; + case 0: themeSelected((TQListViewItem*)static_QUType_ptr.get(_o+1)); break; case 1: installNewTheme(); break; case 2: removeSelectedTheme(); break; default: - return KCModule::qt_invoke( _id, _o ); + return KCModule::tqt_invoke( _id, _o ); } return TRUE; } -bool IconThemesConfig::qt_emit( int _id, QUObject* _o ) +bool IconThemesConfig::tqt_emit( int _id, TQUObject* _o ) { - return KCModule::qt_emit(_id,_o); + return KCModule::tqt_emit(_id,_o); } #ifndef QT_NO_PROPERTIES -bool IconThemesConfig::qt_property( int id, int f, QVariant* v) +bool IconThemesConfig::tqt_property( int id, int f, TQVariant* v) { - return KCModule::qt_property( id, f, v); + return KCModule::tqt_property( id, f, v); } -bool IconThemesConfig::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } +bool IconThemesConfig::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } #endif // QT_NO_PROPERTIES |