TDE
/
yakuake
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/yakuake
0
0
Fork 0
Code Issues Releases Wiki Activity

TQt4 port yakuake

Browse Source 
This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/yakuake@1239058 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 44cf1a2066
commit f9a9340723
32 changed files with 799 additions and 786 deletions
Show Stats Download Patch File Download Diff File

28
yakuake/src/dcop_interface.h
Unescape View File

@ -33,10 +33,10 @@ class DCOPInterface : virtual public DCOPObject
virtual void slotRemoveTerminal(int session_id) = 0; virtual void slotRemoveTerminal(int session_id) = 0;
virtual void slotRemoveTerminal(int session_id, int terminal_id) = 0; virtual void slotRemoveTerminal(int session_id, int terminal_id) = 0;
virtual void slotRenameSession(int session_id, const QString & name) = 0; virtual void slotRenameSession(int session_id, const TQString & name) = 0;
virtual const QString sessionIdList() = 0; virtual const TQString sessionIdList() = 0;
virtual const QString terminalIdList(int session_id) = 0; virtual const TQString terminalIdList(int session_id) = 0;
virtual int tabPositionForSessionId(int session_id) = 0; virtual int tabPositionForSessionId(int session_id) = 0;
virtual int sessionIdForTabPosition(int position) = 0; virtual int sessionIdForTabPosition(int position) = 0;
@ -47,16 +47,16 @@ class DCOPInterface : virtual public DCOPObject
virtual void slotSelectSession(int session_id) = 0; virtual void slotSelectSession(int session_id) = 0;
virtual void slotSelectTabPosition(int position) = 0; virtual void slotSelectTabPosition(int position) = 0;
virtual const QString slotSessionName() = 0; virtual const TQString slotSessionName() = 0;
virtual const QString slotSessionName(int session_id) = 0; virtual const TQString slotSessionName(int session_id) = 0;
virtual const QString slotSessionTitle() = 0; virtual const TQString slotSessionTitle() = 0;
virtual const QString slotSessionTitle(int session_id) = 0; virtual const TQString slotSessionTitle(int session_id) = 0;
virtual const QString slotSessionTitle(int session_id, int terminal_id) = 0; virtual const TQString slotSessionTitle(int session_id, int terminal_id) = 0;
virtual void slotSetSessionTitleText(const QString& title) = 0; virtual void slotSetSessionTitleText(const TQString& title) = 0;
virtual void slotSetSessionTitleText(int session_id, const QString& title) = 0; virtual void slotSetSessionTitleText(int session_id, const TQString& title) = 0;
virtual void slotSetSessionTitleText(int session_id, int terminal_id, const QString& title) = 0; virtual void slotSetSessionTitleText(int session_id, int terminal_id, const TQString& title) = 0;
virtual void slotPasteClipboard() = 0; virtual void slotPasteClipboard() = 0;
virtual void slotPasteClipboard(int session_id) = 0; virtual void slotPasteClipboard(int session_id) = 0;
@ -66,9 +66,9 @@ class DCOPInterface : virtual public DCOPObject
virtual void slotPasteSelection(int session_id) = 0; virtual void slotPasteSelection(int session_id) = 0;
virtual void slotPasteSelection(int session_id, int terminal_id) = 0; virtual void slotPasteSelection(int session_id, int terminal_id) = 0;
virtual void slotRunCommandInSession(const QString& command) = 0; virtual void slotRunCommandInSession(const TQString& command) = 0;
virtual void slotRunCommandInSession(int session_id, const QString& command) = 0; virtual void slotRunCommandInSession(int session_id, const TQString& command) = 0;
virtual void slotRunCommandInSession(int session_id, int terminal_id, const QString& command) = 0; virtual void slotRunCommandInSession(int session_id, int terminal_id, const TQString& command) = 0;
virtual void slotSplitHorizontally() = 0; virtual void slotSplitHorizontally() = 0;
virtual void slotSplitHorizontally(int session_id) = 0; virtual void slotSplitHorizontally(int session_id) = 0;

8
yakuake/src/first_run_dialog.cpp
Unescape View File

@ -18,11 +18,11 @@
#include <kkeydialog.h> #include <kkeydialog.h>
FirstRunDialog::FirstRunDialog(QWidget* parent, const char* name) FirstRunDialog::FirstRunDialog(TQWidget* tqparent, const char* name)
: FirstRunDialogUI(parent, name) : FirstRunDialogUI(tqparent, name)
{ {
connect(key_button, SIGNAL(capturedShortcut(const KShortcut&)), connect(key_button, TQT_SIGNAL(capturedShortcut(const KShortcut&)),
this, SLOT(validateShortcut(const KShortcut&))); this, TQT_SLOT(validateShortcut(const KShortcut&)));
} }
FirstRunDialog::~FirstRunDialog() FirstRunDialog::~FirstRunDialog()

3
yakuake/src/first_run_dialog.h
Unescape View File

@ -22,9 +22,10 @@ class KShortcut;
class FirstRunDialog : public FirstRunDialogUI class FirstRunDialog : public FirstRunDialogUI
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit FirstRunDialog(QWidget* parent, const char* name=NULL); explicit FirstRunDialog(TQWidget* tqparent, const char* name=NULL);
~FirstRunDialog(); ~FirstRunDialog();
KShortcut shortcut(); KShortcut shortcut();

26
yakuake/src/first_run_dialog_ui.ui
Unescape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>FirstRunDialogUI</class> <class>FirstRunDialogUI</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>FirstRunDialogUI</cstring> <cstring>FirstRunDialogUI</cstring>
</property> </property>
@ -27,7 +27,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>welcome_label</cstring> <cstring>welcome_label</cstring>
</property> </property>
@ -42,7 +42,7 @@
<property name="text"> <property name="text">
<string>&lt;b&gt;Welcome to Yakuake&lt;/b&gt;</string> <string>&lt;b&gt;Welcome to Yakuake&lt;/b&gt;</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -57,14 +57,14 @@
<enum>Plain</enum> <enum>Plain</enum>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="6" column="0" rowspan="1" colspan="3"> <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>outro_label</cstring> <cstring>outro_label</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>You can change the shortcut later at any time via the menu.</string> <string>You can change the shortcut later at any time via the menu.</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -78,7 +78,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>21</height> <height>21</height>
@ -103,21 +103,21 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>21</height> <height>21</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>intro_label</cstring> <cstring>intro_label</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Before using the application, you might want to change the keyboard shortcut used to open and close the Yakuake window:</string> <string>Before using the application, you might want to change the keyboard shortcut used to open and close the Yakuake window:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -131,7 +131,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>16</height> <height>16</height>
@ -148,7 +148,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -157,8 +157,8 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kseparator.h</includehint> <includehint>kseparator.h</includehint>
<includehint>kkeybutton.h</includehint> <includehint>kkeybutton.h</includehint>

34
yakuake/src/general_settings.cpp
Unescape View File

@ -13,43 +13,43 @@
#include "general_settings.h" #include "general_settings.h"
#include "general_settings.moc" #include "general_settings.moc"
#include <qapplication.h> #include <tqapplication.h>
#include <qslider.h> #include <tqslider.h>
#include <qspinbox.h> #include <tqspinbox.h>
#include <qcombobox.h> #include <tqcombobox.h>
#include <qlabel.h> #include <tqlabel.h>
#include <knuminput.h> #include <knuminput.h>
#include <klocale.h> #include <klocale.h>
GeneralSettings::GeneralSettings(QWidget* parent, const char* name) GeneralSettings::GeneralSettings(TQWidget* tqparent, const char* name)
: GeneralSettingsUI(parent, name) : GeneralSettingsUI(tqparent, name)
{ {
kcfg_width->setSuffix("%"); kcfg_width->setSuffix("%");
kcfg_height->setSuffix("%"); kcfg_height->setSuffix("%");
steps_spinbox->setPrefix("~"); steps_spinbox->setPrefix("~");
steps_spinbox->setSuffix("ms"); steps_spinbox->setSuffix("ms");
for (int i = 2; i <= QApplication::desktop()->numScreens(); i++) for (int i = 2; i <= TQApplication::desktop()->numScreens(); i++)
kcfg_screen->insertItem(i18n("Screen %1").arg(QString::number(i))); kcfg_screen->insertItem(i18n("Screen %1").tqarg(TQString::number(i)));
if (QApplication::desktop()->numScreens() > 1) if (TQApplication::desktop()->numScreens() > 1)
{ {
screen_label->setEnabled(true); screen_label->setEnabled(true);
kcfg_screen->setEnabled(true); kcfg_screen->setEnabled(true);
} }
connect(kcfg_width, SIGNAL(valueChanged(int)), this, SLOT(updateWidthSlider(int))); connect(kcfg_width, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateWidthSlider(int)));
connect(width_slider, SIGNAL(valueChanged(int)), this, SLOT(updateWidthSpinbox(int))); connect(width_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateWidthSpinbox(int)));
connect(kcfg_height, SIGNAL(valueChanged(int)), this, SLOT(updateHeightSlider(int))); connect(kcfg_height, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateHeightSlider(int)));
connect(height_slider, SIGNAL(valueChanged(int)), this, SLOT(updateHeightSpinbox(int))); connect(height_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateHeightSpinbox(int)));
connect(kcfg_steps, SIGNAL(valueChanged(int)), this, SLOT(updateStepsSpinbox(int))); connect(kcfg_steps, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateStepsSpinbox(int)));
connect(steps_spinbox, SIGNAL(valueChanged(int)), this, SLOT(updateStepsSlider(int))); connect(steps_spinbox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateStepsSlider(int)));
connect(kcfg_location, SIGNAL(valueChanged(int)), this, SLOT(updateLocation(int))); connect(kcfg_location, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateLocation(int)));
} }
GeneralSettings::~GeneralSettings() GeneralSettings::~GeneralSettings()

3
yakuake/src/general_settings.h
Unescape View File

@ -20,9 +20,10 @@
class GeneralSettings : public GeneralSettingsUI class GeneralSettings : public GeneralSettingsUI
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit GeneralSettings(QWidget* parent, const char* name=NULL); explicit GeneralSettings(TQWidget* tqparent, const char* name=NULL);
~GeneralSettings(); ~GeneralSettings();

64
yakuake/src/general_settings_ui.ui
Unescape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>GeneralSettingsUI</class> <class>GeneralSettingsUI</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>GeneralSettingsUI</cstring> <cstring>GeneralSettingsUI</cstring>
</property> </property>
@ -19,7 +19,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>behavior_box</cstring> <cstring>behavior_box</cstring>
</property> </property>
@ -38,7 +38,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>kcfg_popup</cstring> <cstring>kcfg_popup</cstring>
</property> </property>
@ -46,7 +46,7 @@
<string>Show notification popup at application startup</string> <string>Show notification popup at application startup</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>kcfg_confirmquit</cstring> <cstring>kcfg_confirmquit</cstring>
</property> </property>
@ -54,7 +54,7 @@
<string>Confirm quit when closing more than one session</string> <string>Confirm quit when closing more than one session</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>kcfg_tabs</cstring> <cstring>kcfg_tabs</cstring>
</property> </property>
@ -72,7 +72,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -89,14 +89,14 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2"> <widget class="TQCheckBox" row="5" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>kcfg_keepabove</cstring> <cstring>kcfg_keepabove</cstring>
</property> </property>
@ -110,7 +110,7 @@
<string>Enable this option if you want the Yakuake window to keep on top of other windows even when it loses focus.</string> <string>Enable this option if you want the Yakuake window to keep on top of other windows even when it loses focus.</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>kcfg_focus</cstring> <cstring>kcfg_focus</cstring>
</property> </property>
@ -124,7 +124,7 @@
<string>Enable this option if you want the Yakuake window to stay open when it loses focus.</string> <string>Enable this option if you want the Yakuake window to stay open when it loses focus.</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="6" column="1" rowspan="1" colspan="2"> <widget class="TQCheckBox" row="6" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>kcfg_focusontoggle</cstring> <cstring>kcfg_focusontoggle</cstring>
</property> </property>
@ -138,7 +138,7 @@
<string>Enable this option if you want the Open/Retract shortcut to focus the Yakuake window when it is already open but lacks focus. Disable this option to have the Open/Retract shortcut retract the Yakuake window regardless of whether or not it has focus.</string> <string>Enable this option if you want the Open/Retract shortcut to focus the Yakuake window when it is already open but lacks focus. Disable this option to have the Open/Retract shortcut retract the Yakuake window regardless of whether or not it has focus.</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>kcfg_poll</cstring> <cstring>kcfg_poll</cstring>
</property> </property>
@ -154,7 +154,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>size_box</cstring> <cstring>size_box</cstring>
</property> </property>
@ -165,7 +165,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>width_label</cstring> <cstring>width_label</cstring>
</property> </property>
@ -173,7 +173,7 @@
<string>Width:</string> <string>Width:</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>height_label</cstring> <cstring>height_label</cstring>
</property> </property>
@ -181,7 +181,7 @@
<string>Height:</string> <string>Height:</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>speed_label</cstring> <cstring>speed_label</cstring>
</property> </property>
@ -189,7 +189,7 @@
<string>Speed:</string> <string>Speed:</string>
</property> </property>
</widget> </widget>
<widget class="QSlider" row="0" column="1"> <widget class="TQSlider" row="0" column="1">
<property name="name"> <property name="name">
<cstring>width_slider</cstring> <cstring>width_slider</cstring>
</property> </property>
@ -218,7 +218,7 @@
<number>1</number> <number>1</number>
</property> </property>
</widget> </widget>
<widget class="QSlider" row="1" column="1"> <widget class="TQSlider" row="1" column="1">
<property name="name"> <property name="name">
<cstring>height_slider</cstring> <cstring>height_slider</cstring>
</property> </property>
@ -247,7 +247,7 @@
<number>1</number> <number>1</number>
</property> </property>
</widget> </widget>
<widget class="QSlider" row="2" column="1"> <widget class="TQSlider" row="2" column="1">
<property name="name"> <property name="name">
<cstring>kcfg_steps</cstring> <cstring>kcfg_steps</cstring>
</property> </property>
@ -353,7 +353,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>position_box</cstring> <cstring>position_box</cstring>
</property> </property>
@ -364,15 +364,15 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout10</cstring> <cstring>tqlayout10</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>left_label</cstring> <cstring>left_label</cstring>
</property> </property>
@ -388,7 +388,7 @@
<string>Left</string> <string>Left</string>
</property> </property>
</widget> </widget>
<widget class="QSlider"> <widget class="TQSlider">
<property name="name"> <property name="name">
<cstring>kcfg_location</cstring> <cstring>kcfg_location</cstring>
</property> </property>
@ -408,7 +408,7 @@
<number>10</number> <number>10</number>
</property> </property>
</widget> </widget>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>right_label</cstring> <cstring>right_label</cstring>
</property> </property>
@ -426,15 +426,15 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout20</cstring> <cstring>tqlayout20</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>screen_label</cstring> <cstring>screen_label</cstring>
</property> </property>
@ -445,7 +445,7 @@
<string>Open on screen:</string> <string>Open on screen:</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox"> <widget class="TQComboBox">
<item> <item>
<property name="text"> <property name="text">
<string>At mouse location</string> <string>At mouse location</string>
@ -473,7 +473,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>210</width> <width>210</width>
<height>26</height> <height>26</height>
@ -494,7 +494,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -536,8 +536,8 @@
<tabstop>kcfg_location</tabstop> <tabstop>kcfg_location</tabstop>
<tabstop>kcfg_screen</tabstop> <tabstop>kcfg_screen</tabstop>
</tabstops> </tabstops>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

54
yakuake/src/image_button.cpp
Unescape View File

@ -15,13 +15,13 @@
#include "image_button.moc" #include "image_button.moc"
#include "settings.h" #include "settings.h"
#include <qwhatsthis.h> #include <tqwhatsthis.h>
#include <qtimer.h> #include <tqtimer.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
ImageButton::ImageButton(QWidget* parent, const char* name, bool translucency) : TranslucentWidget(parent, name, translucency) ImageButton::ImageButton(TQWidget* tqparent, const char* name, bool translucency) : TranslucentWidget(tqparent, name, translucency)
{ {
state = 0; state = 0;
toggle = false; toggle = false;
@ -55,83 +55,83 @@ void ImageButton::setToggled(bool enable)
else else
pressed = false; pressed = false;
repaint(); tqrepaint();
} }
} }
void ImageButton::setPopupMenu(QPopupMenu* menu) void ImageButton::setPopupMenu(TQPopupMenu* menu)
{ {
popup_menu = menu; popup_menu = menu;
popup_timer = new QTimer(this); popup_timer = new TQTimer(this);
connect(popup_timer, SIGNAL(timeout()), this, SLOT(showPopupMenu())); connect(popup_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showPopupMenu()));
} }
void ImageButton::showPopupMenu() void ImageButton::showPopupMenu()
{ {
popup_menu->exec(mapToGlobal(QPoint(0, height()))); popup_menu->exec(mapToGlobal(TQPoint(0, height())));
} }
void ImageButton::setUpPixmap(const QString& path, bool use_alpha_mask) void ImageButton::setUpPixmap(const TQString& path, bool use_alpha_tqmask)
{ {
up_pixmap.load(path); up_pixmap.load(path);
resize(up_pixmap.size()); resize(up_pixmap.size());
if (up_pixmap.hasAlphaChannel()) setMask(*up_pixmap.mask()); if (up_pixmap.hasAlphaChannel()) setMask(*up_pixmap.tqmask());
if (use_alpha_mask) if (use_alpha_tqmask)
setUseTranslucency(true); setUseTranslucency(true);
else else
setMask(QRegion(up_pixmap.rect())); setMask(TQRegion(up_pixmap.rect()));
} }
void ImageButton::setOverPixmap(const QString& path) void ImageButton::setOverPixmap(const TQString& path)
{ {
over_pixmap.load(path); over_pixmap.load(path);
} }
void ImageButton::setDownPixmap(const QString& path) void ImageButton::setDownPixmap(const TQString& path)
{ {
down_pixmap.load(path); down_pixmap.load(path);
} }
void ImageButton::enterEvent(QEvent*) void ImageButton::enterEvent(TQEvent*)
{ {
state = pressed ? 2 : 1; state = pressed ? 2 : 1;
repaint(); tqrepaint();
} }
void ImageButton::leaveEvent(QEvent*) void ImageButton::leaveEvent(TQEvent*)
{ {
state = 0; state = 0;
if (popup_timer) popup_timer->stop(); if (popup_timer) popup_timer->stop();
repaint(); tqrepaint();
} }
void ImageButton::mousePressEvent(QMouseEvent*) void ImageButton::mousePressEvent(TQMouseEvent*)
{ {
if (QWhatsThis::inWhatsThisMode()) return; if (TQWhatsThis::inWhatsThisMode()) return;
state = 2; state = 2;
if (popup_timer) popup_timer->stop(); if (popup_timer) popup_timer->stop();
repaint(); tqrepaint();
if (popup_menu) if (popup_menu)
{ {
if (delay_popup) if (delay_popup)
popup_timer->start(600, true); popup_timer->start(600, true);
else else
popup_menu->exec(mapToGlobal(QPoint(0, height()))); popup_menu->exec(mapToGlobal(TQPoint(0, height())));
} }
} }
void ImageButton::mouseReleaseEvent(QMouseEvent*) void ImageButton::mouseReleaseEvent(TQMouseEvent*)
{ {
if (QWhatsThis::inWhatsThisMode()) return; if (TQWhatsThis::inWhatsThisMode()) return;
// Don't process event if press and release didn't // Don't process event if press and release didn't
// occur within the button. // occur within the button.
@ -142,7 +142,7 @@ void ImageButton::mouseReleaseEvent(QMouseEvent*)
if (popup_timer) popup_timer->stop(); if (popup_timer) popup_timer->stop();
repaint(); tqrepaint();
if (toggle) if (toggle)
emit toggled(pressed); emit toggled(pressed);
@ -150,9 +150,9 @@ void ImageButton::mouseReleaseEvent(QMouseEvent*)
emit clicked(); emit clicked();
} }
void ImageButton::paintEvent(QPaintEvent*) void ImageButton::paintEvent(TQPaintEvent*)
{ {
QPainter painter(this); TQPainter painter(this);
erase(); erase();

51
yakuake/src/image_button.h
Unescape View File

@ -17,13 +17,13 @@
#include "translucent_widget.h" #include "translucent_widget.h"
#include <qurl.h> #include <tqurl.h>
#include <qcolor.h> #include <tqcolor.h>
#include <qpoint.h> #include <tqpoint.h>
#include <qbitmap.h> #include <tqbitmap.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qpainter.h> #include <tqpainter.h>
#include <qpopupmenu.h> #include <tqpopupmenu.h>
#include <krootpixmap.h> #include <krootpixmap.h>
@ -31,9 +31,10 @@
class ImageButton : public TranslucentWidget class ImageButton : public TranslucentWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit ImageButton(QWidget* parent = 0, const char* name = 0, bool translucency = false); explicit ImageButton(TQWidget* tqparent = 0, const char* name = 0, bool translucency = false);
~ImageButton(); ~ImageButton();
/* Creates a toggle button */ /* Creates a toggle button */
@ -41,13 +42,13 @@ class ImageButton : public TranslucentWidget
void setToggled(bool enable); void setToggled(bool enable);
/* Sets the configuration menu */ /* Sets the configuration menu */
void setPopupMenu(QPopupMenu* menu); void setPopupMenu(TQPopupMenu* menu);
void setDelayedPopup(bool delay) { delay_popup = delay; } void setDelayedPopup(bool delay) { delay_popup = delay; }
/* Sets the widget's pixmaps */ /* Sets the widget's pixmaps */
void setUpPixmap(const QString& path, bool use_alpha_mask = false); void setUpPixmap(const TQString& path, bool use_alpha_tqmask = false);
void setOverPixmap(const QString& path); void setOverPixmap(const TQString& path);
void setDownPixmap(const QString& path); void setDownPixmap(const TQString& path);
signals: signals:
@ -56,13 +57,13 @@ class ImageButton : public TranslucentWidget
protected: protected:
virtual void enterEvent(QEvent*); virtual void enterEvent(TQEvent*);
virtual void leaveEvent(QEvent*); virtual void leaveEvent(TQEvent*);
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(TQPaintEvent*);
virtual void mousePressEvent(QMouseEvent*); virtual void mousePressEvent(TQMouseEvent*);
virtual void mouseReleaseEvent(QMouseEvent*); virtual void mouseReleaseEvent(TQMouseEvent*);
private: private:
@ -71,21 +72,21 @@ class ImageButton : public TranslucentWidget
bool pressed; bool pressed;
bool delay_popup; bool delay_popup;
QTimer* popup_timer; TQTimer* popup_timer;
/* Widget's mask */ /* Widget's tqmask */
QRegion mask; TQRegion tqmask;
/* Widget's tip */ /* Widget's tip */
QString tooltip; TQString tooltip;
/* Widget's pixmaps */ /* Widget's pixmaps */
QPixmap up_pixmap; TQPixmap up_pixmap;
QPixmap over_pixmap; TQPixmap over_pixmap;
QPixmap down_pixmap; TQPixmap down_pixmap;
/* Widget's popup menu */ /* Widget's popup menu */
QPopupMenu* popup_menu; TQPopupMenu* popup_menu;
private slots: private slots:

298
yakuake/src/main_window.cpp
Unescape View File

@ -19,8 +19,8 @@
#include "first_run_dialog.h" #include "first_run_dialog.h"
#include "session.h" #include "session.h"
#include <qsignalmapper.h> #include <tqsignalmapper.h>
#include <qwhatsthis.h> #include <tqwhatsthis.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kaboutkde.h> #include <kaboutkde.h>
@ -30,9 +30,9 @@
#include <kwin.h> #include <kwin.h>
#include <dcopref.h> #include <dcopref.h>
MainWindow::MainWindow(QWidget * parent, const char * name) : MainWindow::MainWindow(TQWidget * tqparent, const char * name) :
DCOPObject("DCOPInterface"), DCOPObject("DCOPInterface"),
KMainWindow(parent, name, Qt::WStyle_Customize | Qt::WStyle_NoBorder), KMainWindow(tqparent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder),
step(0) step(0)
{ {
first_run_dialog = 0; first_run_dialog = 0;
@ -45,8 +45,8 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
KConfig config(CONFIG_FILE); KConfig config(CONFIG_FILE);
back_widget = new QWidget(this); back_widget = new TQWidget(this);
widgets_stack = new QWidgetStack(this); widgets_stack = new TQWidgetStack(this);
// Register with DCOP. // Register with DCOP.
if (!kapp->dcopClient()->isRegistered()) if (!kapp->dcopClient()->isRegistered())
@ -66,10 +66,10 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
Settings::setSkin("default"); Settings::setSkin("default");
// Initialize access key. // Initialize access key.
global_key = new KGlobalAccel(this); global_key = new KGlobalAccel(TQT_TQOBJECT(this));
global_key->insert("AccessKey", i18n("Open/Retract Yakuake"), global_key->insert("AccessKey", i18n("Open/Retract Yakuake"),
i18n("Slides the Yakuake window in and out"), i18n("Slides the Yakuake window in and out"),
Key_F12, 0, this, SLOT(slotToggleState())); Key_F12, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState()));
global_key->readSettings(&config); global_key->readSettings(&config);
global_key->updateConnections(); global_key->updateConnections();
@ -79,73 +79,73 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
// Initialize shortcuts. // Initialize shortcuts.
KAction* action; KAction* action;
KShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N); KShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N);
shortcut.append(KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N)); shortcut.append(KShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N));
action = new KAction(i18n("New Session"), SmallIcon("tab_new"), shortcut, action = new KAction(i18n("New Session"), SmallIcon("tab_new"), shortcut,
this, SLOT(slotAddSession()), TQT_TQOBJECT(this), TQT_SLOT(slotAddSession()),
actionCollection(), "add_tab"); actionCollection(), "add_tab");
action = new KAction(i18n("Two Terminals, Horizontal"), SmallIcon("tab_new"), action = new KAction(i18n("Two Terminals,Qt::Horizontal"), SmallIcon("tab_new"),
0, this, SLOT(slotAddSessionTwoVertical()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoVertical()),
actionCollection(), "add_tab_twohorizontal"); actionCollection(), "add_tab_twohorizontal");
action = new KAction(i18n("Two Terminals, Vertical"), SmallIcon("tab_new"), action = new KAction(i18n("Two Terminals,Qt::Vertical"), SmallIcon("tab_new"),
0, this, SLOT(slotAddSessionTwoHorizontal()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoHorizontal()),
actionCollection(), "add_tab_twovertical"); actionCollection(), "add_tab_twovertical");
action = new KAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"), action = new KAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"),
0, this, SLOT(slotAddSessionQuad()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionQuad()),
actionCollection(), "add_tab_quad"); actionCollection(), "add_tab_quad");
action = new KAction(i18n("Go to Next Terminal"), SmallIcon("next"), action = new KAction(i18n("Go to Next Terminal"), SmallIcon("next"),
"Ctrl+Shift+Up", this, SLOT(slotFocusNextSplit()), "Ctrl+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotFocusNextSplit()),
actionCollection(), "focus_next_terminal"); actionCollection(), "focus_next_terminal");
action = new KAction(i18n("Go to Previous Terminal"), SmallIcon("previous"), action = new KAction(i18n("Go to Previous Terminal"), SmallIcon("previous"),
"Ctrl+Shift+Down", this, SLOT(slotFocusPreviousSplit()), "Ctrl+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotFocusPreviousSplit()),
actionCollection(), "focus_previous_terminal"); actionCollection(), "focus_previous_terminal");
action = new KAction(i18n("Paste"), SmallIcon("editpaste"), SHIFT+Key_Insert, action = new KAction(i18n("Paste"), SmallIcon("editpaste"), SHIFT+Key_Insert,
this, SLOT(slotPasteClipboard()), TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()),
actionCollection(), "paste_clipboard"); actionCollection(), "paste_clipboard");
action = new KAction(i18n("Paste Selection"), SmallIcon("editpaste"), action = new KAction(i18n("Paste Selection"), SmallIcon("editpaste"),
CTRL+SHIFT+Key_Insert, this, SLOT(slotPasteSelection()), CTRL+SHIFT+Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()),
actionCollection(), "paste_selection"); actionCollection(), "paste_selection");
action = new KAction(i18n("Rename Session..."), SmallIcon("edit"), action = new KAction(i18n("Rename Session..."), SmallIcon("edit"),
"Alt+Ctrl+S", this, SLOT(slotInteractiveRename()), "Alt+Ctrl+S", TQT_TQOBJECT(this), TQT_SLOT(slotInteractiveRename()),
actionCollection(), "edit_name"); actionCollection(), "edit_name");
action = new KAction(i18n("Increase Width"), SmallIcon("viewmag+"), action = new KAction(i18n("Increase Width"), SmallIcon("viewmag+"),
"Alt+Shift+Right", this, SLOT(slotIncreaseSizeW()), "Alt+Shift+Right", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeW()),
actionCollection(), "increasew"); actionCollection(), "increasew");
action = new KAction(i18n("Decrease Width"), SmallIcon("viewmag-"), action = new KAction(i18n("Decrease Width"), SmallIcon("viewmag-"),
"Alt+Shift+Left", this, SLOT(slotDecreaseSizeW()), "Alt+Shift+Left", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeW()),
actionCollection(), "decreasew"); actionCollection(), "decreasew");
action = new KAction(i18n("Increase Height"), SmallIcon("viewmag+"), action = new KAction(i18n("Increase Height"), SmallIcon("viewmag+"),
"Alt+Shift+Down", this, SLOT(slotIncreaseSizeH()), "Alt+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeH()),
actionCollection(), "increaseh"); actionCollection(), "increaseh");
action = new KAction(i18n("Decrease Height"), SmallIcon("viewmag-"), action = new KAction(i18n("Decrease Height"), SmallIcon("viewmag-"),
"Alt+Shift+Up", this, SLOT(slotDecreaseSizeH()), "Alt+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeH()),
actionCollection(), "decreaseh"); actionCollection(), "decreaseh");
action = new KAction(i18n("Configure Global Shortcuts..."), action = new KAction(i18n("Configure Global Shortcuts..."),
SmallIcon("configure_shortcuts"), 0, SmallIcon("configure_shortcuts"), 0,
this, SLOT(slotSetAccessKey()), TQT_TQOBJECT(this), TQT_SLOT(slotSetAccessKey()),
actionCollection(), "global_shortcuts"); actionCollection(), "global_shortcuts");
action = new KAction(i18n("Quit"), SmallIcon("exit"), 0, this, action = new KAction(i18n("Quit"), SmallIcon("exit"), 0, TQT_TQOBJECT(this),
SLOT(close()), actionCollection(), "quit"); TQT_SLOT(close()), actionCollection(), "quit");
KStdAction::keyBindings(this, SLOT(slotSetControlKeys()), actionCollection()); KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotSetControlKeys()), actionCollection());
KStdAction::preferences(this, SLOT(slotOpenSettingsDialog()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOpenSettingsDialog()), actionCollection());
KStdAction::aboutApp(this, SLOT(slotOpenAboutApp()), actionCollection()); KStdAction::aboutApp(TQT_TQOBJECT(this), TQT_SLOT(slotOpenAboutApp()), actionCollection());
KStdAction::aboutKDE(this, SLOT(slotOpenAboutKDE()), actionCollection()); KStdAction::aboutKDE(TQT_TQOBJECT(this), TQT_SLOT(slotOpenAboutKDE()), actionCollection());
KStdAction::whatsThis(this, SLOT(whatsThis()), actionCollection()); KStdAction::whatsThis(TQT_TQOBJECT(this), TQT_SLOT(whatsThis()), actionCollection());
full_screen_action = KStdAction::fullScreen(this, SLOT(slotUpdateFullScreen()), actionCollection(), this); full_screen_action = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotUpdateFullScreen()), actionCollection(), this);
connect(full_screen_action, SIGNAL(toggled(bool)), this, SLOT(slotSetFullScreen(bool))); connect(full_screen_action, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFullScreen(bool)));
createMenu(); createMenu();
createSessionMenu(); createSessionMenu();
@ -153,47 +153,47 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
createTabsBar(); createTabsBar();
action = new KAction(i18n("Go to Next Session"), SmallIcon("next"), action = new KAction(i18n("Go to Next Session"), SmallIcon("next"),
"Shift+Right", tab_bar, SLOT(slotSelectNextItem()), "Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectNextItem()),
actionCollection(), "next_tab"); actionCollection(), "next_tab");
action = new KAction(i18n("Go to Previous Session"), SmallIcon("previous"), action = new KAction(i18n("Go to Previous Session"), SmallIcon("previous"),
"Shift+Left", tab_bar, SLOT(slotSelectPreviousItem()), "Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectPreviousItem()),
actionCollection(), "previous_tab"); actionCollection(), "previous_tab");
action = new KAction(i18n("Move Session Left"), SmallIcon("back"), action = new KAction(i18n("Move Session Left"), SmallIcon("back"),
"Ctrl+Shift+Left", tab_bar, SLOT(slotMoveItemLeft()), "Ctrl+Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemLeft()),
actionCollection(), "move_tab_left"); actionCollection(), "move_tab_left");
action = new KAction(i18n("Move Session Right"), SmallIcon("forward"), action = new KAction(i18n("Move Session Right"), SmallIcon("forward"),
"Ctrl+Shift+Right", tab_bar, SLOT(slotMoveItemRight()), "Ctrl+Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemRight()),
actionCollection(), "move_tab_right"); actionCollection(), "move_tab_right");
remove_tab_action = new KAction(i18n("Close Session"), SmallIcon("fileclose"), 0, remove_tab_action = new KAction(i18n("Close Session"), SmallIcon("fileclose"), 0,
this, 0, actionCollection(), "remove_tab"); TQT_TQOBJECT(this), 0, actionCollection(), "remove_tab");
connect(remove_tab_action, SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)), connect(remove_tab_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
this, SLOT(slotHandleRemoveSession(KAction::ActivationReason, Qt::ButtonState))); TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveSession(KAction::ActivationReason, TQt::ButtonState)));
split_horiz_action = new KAction(i18n("Split Terminal Horizontally"), SmallIcon("view_top_bottom"), split_horiz_action = new KAction(i18n("Split TerminalQt::Horizontally"), SmallIcon("view_top_bottom"),
CTRL+SHIFT+Key_T, this, 0, actionCollection(), "split_horizontally"); CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), 0, actionCollection(), "split_horizontally");
connect(split_horiz_action, SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)), connect(split_horiz_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
this, SLOT(slotHandleVerticalSplit(KAction::ActivationReason, Qt::ButtonState))); TQT_TQOBJECT(this), TQT_SLOT(slotHandleVerticalSplit(KAction::ActivationReason, TQt::ButtonState)));
split_vert_action = new KAction(i18n("Split Terminal Vertically"), SmallIcon("view_left_right"), split_vert_action = new KAction(i18n("Split TerminalQt::Vertically"), SmallIcon("view_left_right"),
CTRL+SHIFT+Key_L, this, 0, actionCollection(), "split_vertically"); CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), 0, actionCollection(), "split_vertically");
connect(split_vert_action, SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)), connect(split_vert_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
this, SLOT(slotHandleHorizontalSplit(KAction::ActivationReason, Qt::ButtonState))); TQT_TQOBJECT(this), TQT_SLOT(slotHandleHorizontalSplit(KAction::ActivationReason, TQt::ButtonState)));
remove_term_action = new KAction(i18n("Close Terminal"), SmallIcon("view_remove"), remove_term_action = new KAction(i18n("Close Terminal"), SmallIcon("view_remove"),
CTRL+SHIFT+Key_R, this, 0, actionCollection(), "remove_terminal"); CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), 0, actionCollection(), "remove_terminal");
connect(remove_term_action, SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)), connect(remove_term_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
this, SLOT(slotHandleRemoveTerminal(KAction::ActivationReason, Qt::ButtonState))); TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveTerminal(KAction::ActivationReason, TQt::ButtonState)));
QSignalMapper* tab_selection_mapper = new QSignalMapper(this); TQSignalMapper* tab_selection_mapper = new TQSignalMapper(TQT_TQOBJECT(this));
connect(tab_selection_mapper, SIGNAL(mapped(int)), this, SLOT(slotSelectTabPosition(int))); connect(tab_selection_mapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectTabPosition(int)));
for (uint i = 1; i <= 12; ++i) for (uint i = 1; i <= 12; ++i)
{ {
KAction* tab_selection_action = new KAction(i18n("Switch to Session %1").arg(i), 0, 0, KAction* tab_selection_action = new KAction(i18n("Switch to Session %1").tqarg(i), 0, 0,
tab_selection_mapper, SLOT(map()), actionCollection(), QString("go_to_tab_%1").arg(i).local8Bit()); tab_selection_mapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").tqarg(i).local8Bit());
tab_selection_mapper->setMapping(tab_selection_action, i-1); tab_selection_mapper->setMapping(tab_selection_action, i-1);
} }
@ -205,28 +205,28 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
// Add first session. // Add first session.
slotAddSession(); slotAddSession();
connect(kapp, SIGNAL(aboutToQuit()), this, SLOT(slotAboutToQuit())); connect(kapp, TQT_SIGNAL(aboutToQuit()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit()));
// No need for this if we're not going to use pseudo-translucency. // No need for this if we're not going to use pseudo-translucency.
if (use_translucency) if (use_translucency)
connect(kapp, SIGNAL(backgroundChanged(int)), this, SLOT(slotUpdateBackgroundState())); connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateBackgroundState()));
connect(tab_bar, SIGNAL(addItem()), this, SLOT(slotAddSession())); connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(addItem()), TQT_TQOBJECT(this), TQT_SLOT(slotAddSession()));
connect(tab_bar, SIGNAL(removeItem()), this, SLOT(slotRemoveSession())); connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(removeItem()), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSession()));
connect(tab_bar, SIGNAL(itemSelected(int)), this, SLOT(slotSelectSession(int))); connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(itemSelected(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectSession(int)));
connect(&desk_info, SIGNAL(workAreaChanged()), this, SLOT(slotUpdateSize())); connect(&desk_info, TQT_SIGNAL(workAreaChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSize()));
connect(&poller, SIGNAL(timeout()), this, SLOT(slotPollMouse())); connect(&poller, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotPollMouse()));
// Startup notification popup. // Startup notification popup.
if (Settings::popup() && !Settings::firstrun()) if (Settings::popup() && !Settings::firstrun())
showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(global_key->shortcut("AccessKey").toString())); showPopup(i18n("Application successfully started!\nPress %1 to use it...").tqarg(global_key->shortcut("AccessKey").toString()));
// First run dialog. // First run dialog.
if (Settings::firstrun()) if (Settings::firstrun())
{ {
QTimer::singleShot(0, this, SLOT(slotToggleState())); TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState()));
QTimer::singleShot(0, this, SLOT(slotOpenFirstRunDialog())); TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFirstRunDialog()));
} }
else if (Settings::poll()) else if (Settings::poll())
toggleMousePoll(true); toggleMousePoll(true);
@ -312,15 +312,15 @@ bool MainWindow::queryClose()
void MainWindow::updateWindowMask() void MainWindow::updateWindowMask()
{ {
QRegion mask = title_bar->getWidgetMask(); TQRegion tqmask = title_bar->getWidgetMask();
mask.translate(0, mask_height); tqmask.translate(0, tqmask_height);
mask += QRegion(0, 0, width(), mask_height); tqmask += TQRegion(0, 0, width(), tqmask_height);
setMask(mask); setMask(tqmask);
} }
void MainWindow::showPopup(const QString& text, int time) void MainWindow::showPopup(const TQString& text, int time)
{ {
/* Show a passive popup with the given text. */ /* Show a passive popup with the given text. */
@ -352,8 +352,8 @@ void MainWindow::slotAddSessionQuad()
void MainWindow::slotAddSession(Session::SessionType type) void MainWindow::slotAddSession(Session::SessionType type)
{ {
Session* session = new Session(widgets_stack, type); Session* session = new Session(widgets_stack, type);
connect(session, SIGNAL(destroyed(int)), this, SLOT(slotSessionDestroyed(int))); connect(session, TQT_SIGNAL(destroyed(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSessionDestroyed(int)));
connect(session, SIGNAL(titleChanged(const QString&)), this, SLOT(slotUpdateTitle(const QString&))); connect(session, TQT_SIGNAL(titleChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateTitle(const TQString&)));
widgets_stack->addWidget(session->widget()); widgets_stack->addWidget(session->widget());
sessions_stack.insert(session->id(), session); sessions_stack.insert(session->id(), session);
@ -377,7 +377,7 @@ void MainWindow::slotRemoveSession(int session_id)
sessions_stack[session_id]->deleteLater(); sessions_stack[session_id]->deleteLater();
} }
void MainWindow::slotHandleRemoveSession(KAction::ActivationReason reason, Qt::ButtonState /* state */) void MainWindow::slotHandleRemoveSession(KAction::ActivationReason reason, TQt::ButtonState /* state */)
{ {
if (reason == KAction::PopupMenuActivation if (reason == KAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1) && tab_bar->pressedPosition() != -1)
@ -408,7 +408,7 @@ void MainWindow::slotRemoveTerminal(int session_id, int terminal_id)
sessions_stack[session_id]->removeTerminal(terminal_id); sessions_stack[session_id]->removeTerminal(terminal_id);
} }
void MainWindow::slotRenameSession(int session_id, const QString& name) void MainWindow::slotRenameSession(int session_id, const TQString& name)
{ {
tab_bar->renameItem(session_id, name); tab_bar->renameItem(session_id, name);
} }
@ -436,19 +436,19 @@ int MainWindow::selectedTerminal()
return sessions_stack[selected_id]->activeTerminalId(); return sessions_stack[selected_id]->activeTerminalId();
} }
const QString MainWindow::sessionIdList() const TQString MainWindow::sessionIdList()
{ {
QValueList<int>::iterator it; TQValueList<int>::iterator it;
QValueList<int> key_list = sessions_stack.keys(); TQValueList<int> key_list = sessions_stack.keys();
QStringList id_list; TQStringList id_list;
for (it = key_list.begin(); it != key_list.end(); ++it) for (it = key_list.begin(); it != key_list.end(); ++it)
id_list << QString::number((*it)); id_list << TQString::number((*it));
return id_list.join(","); return id_list.join(",");
} }
const QString MainWindow::terminalIdList(int session_id) const TQString MainWindow::terminalIdList(int session_id)
{ {
if (!sessions_stack[session_id]) return 0; if (!sessions_stack[session_id]) return 0;
@ -486,50 +486,50 @@ void MainWindow::slotSelectTabPosition(int position)
tab_bar->selectPosition(position); tab_bar->selectPosition(position);
} }
const QString MainWindow::slotSessionName() const TQString MainWindow::slotSessionName()
{ {
return tab_bar->itemName(selected_id); return tab_bar->itemName(selected_id);
} }
const QString MainWindow::slotSessionName(int session_id) const TQString MainWindow::slotSessionName(int session_id)
{ {
if (!sessions_stack[session_id]) return 0; if (!sessions_stack[session_id]) return 0;
return tab_bar->itemName(session_id); return tab_bar->itemName(session_id);
} }
const QString MainWindow::slotSessionTitle() const TQString MainWindow::slotSessionTitle()
{ {
return sessions_stack[selected_id]->title(); return sessions_stack[selected_id]->title();
} }
const QString MainWindow::slotSessionTitle(int session_id) const TQString MainWindow::slotSessionTitle(int session_id)
{ {
if (!sessions_stack[session_id]) return 0; if (!sessions_stack[session_id]) return 0;
return sessions_stack[session_id]->title(); return sessions_stack[session_id]->title();
} }
const QString MainWindow::slotSessionTitle(int session_id, int terminal_id) const TQString MainWindow::slotSessionTitle(int session_id, int terminal_id)
{ {
if (!sessions_stack[session_id]) return 0; if (!sessions_stack[session_id]) return 0;
return sessions_stack[session_id]->title(terminal_id); return sessions_stack[session_id]->title(terminal_id);
} }
void MainWindow::slotSetSessionTitleText(const QString& title) void MainWindow::slotSetSessionTitleText(const TQString& title)
{ {
sessions_stack[selected_id]->setTitle(title); sessions_stack[selected_id]->setTitle(title);
} }
void MainWindow::slotSetSessionTitleText(int session_id, const QString& title) void MainWindow::slotSetSessionTitleText(int session_id, const TQString& title)
{ {
if (!sessions_stack[session_id]) return; if (!sessions_stack[session_id]) return;
sessions_stack[session_id]->setTitle(title); sessions_stack[session_id]->setTitle(title);
} }
void MainWindow::slotSetSessionTitleText(int session_id, int terminal_id, const QString& title) void MainWindow::slotSetSessionTitleText(int session_id, int terminal_id, const TQString& title)
{ {
if (!sessions_stack[session_id]) return; if (!sessions_stack[session_id]) return;
@ -574,19 +574,19 @@ void MainWindow::slotPasteSelection(int session_id, int terminal_id)
sessions_stack[session_id]->pasteSelection(terminal_id); sessions_stack[session_id]->pasteSelection(terminal_id);
} }
void MainWindow::slotRunCommandInSession(const QString& command) void MainWindow::slotRunCommandInSession(const TQString& command)
{ {
sessions_stack[selected_id]->runCommand(command); sessions_stack[selected_id]->runCommand(command);
} }
void MainWindow::slotRunCommandInSession(int session_id, const QString& command) void MainWindow::slotRunCommandInSession(int session_id, const TQString& command)
{ {
if (!sessions_stack[session_id]) return; if (!sessions_stack[session_id]) return;
sessions_stack[session_id]->runCommand(command); sessions_stack[session_id]->runCommand(command);
} }
void MainWindow::slotRunCommandInSession(int session_id, int terminal_id, const QString& command) void MainWindow::slotRunCommandInSession(int session_id, int terminal_id, const TQString& command)
{ {
if (!sessions_stack[session_id]) return; if (!sessions_stack[session_id]) return;
@ -650,7 +650,7 @@ void MainWindow::windowActivationChange(bool old_active)
slotToggleState(); slotToggleState();
} }
void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, Qt::ButtonState /* state */) void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, TQt::ButtonState /* state */)
{ {
if (reason == KAction::PopupMenuActivation if (reason == KAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1) && tab_bar->pressedPosition() != -1)
@ -662,7 +662,7 @@ void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, Qt:
slotSplitHorizontally(); slotSplitHorizontally();
} }
void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, Qt::ButtonState /* state */) void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, TQt::ButtonState /* state */)
{ {
if (reason == KAction::PopupMenuActivation if (reason == KAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1) && tab_bar->pressedPosition() != -1)
@ -675,7 +675,7 @@ void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, Qt::B
} }
void MainWindow::slotHandleRemoveTerminal(KAction::ActivationReason reason, Qt::ButtonState /* state */) void MainWindow::slotHandleRemoveTerminal(KAction::ActivationReason reason, TQt::ButtonState /* state */)
{ {
if (reason == KAction::PopupMenuActivation if (reason == KAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1) && tab_bar->pressedPosition() != -1)
@ -706,34 +706,34 @@ int MainWindow::getMouseScreen()
{ {
/* Gets the screen where the mouse pointer is located. */ /* Gets the screen where the mouse pointer is located. */
return QApplication::desktop()->screenNumber(QCursor::pos()); return TQApplication::desktop()->screenNumber(TQCursor::pos());
} }
QRect MainWindow::getDesktopGeometry() TQRect MainWindow::getDesktopGeometry()
{ {
/* Computes the desktop geometry. */ /* Computes the desktop tqgeometry. */
if (full_screen) if (full_screen)
{ {
if (!Settings::screen()) if (!Settings::screen())
return QApplication::desktop()->screenGeometry(getMouseScreen()); return TQApplication::desktop()->screenGeometry(getMouseScreen());
else else
return QApplication::desktop()->screenGeometry(Settings::screen()-1); return TQApplication::desktop()->screenGeometry(Settings::screen()-1);
} }
QRect result; TQRect result;
result = desk_info.workArea(); result = desk_info.workArea();
KConfigGroup group(KGlobal::config(), "Windows"); KConfigGroup group(KGlobal::config(), "Windows");
if (QApplication::desktop()->isVirtualDesktop() && if (TQApplication::desktop()->isVirtualDesktop() &&
group.readBoolEntry("XineramaEnabled", true) && group.readBoolEntry("XineramaEnabled", true) &&
group.readBoolEntry("XineramaPlacementEnabled", true)) group.readBoolEntry("XineramaPlacementEnabled", true))
{ {
if (!Settings::screen()) if (!Settings::screen())
return result.intersect(QApplication::desktop()->screenGeometry(getMouseScreen())); return result.intersect(TQApplication::desktop()->screenGeometry(getMouseScreen()));
else else
return result.intersect(QApplication::desktop()->screenGeometry(Settings::screen()-1)); return result.intersect(TQApplication::desktop()->screenGeometry(Settings::screen()-1));
} }
return result; return result;
@ -744,7 +744,7 @@ void MainWindow::createTabsBar()
/* Creates the tabs frame. */ /* Creates the tabs frame. */
tab_bar = new TabBar(this, "Session tab bar", use_translucency, Settings::skin()); tab_bar = new TabBar(this, "Session tab bar", use_translucency, Settings::skin());
connect(this, SIGNAL(updateBackground()), tab_bar, SIGNAL(updateBackground())); connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateBackground()), TQT_TQOBJECT(tab_bar), TQT_SIGNAL(updateBackground()));
tab_bar->setSessionMenu(session_menu); tab_bar->setSessionMenu(session_menu);
@ -779,21 +779,21 @@ void MainWindow::createMenu()
screen_menu = new KPopupMenu(menu); screen_menu = new KPopupMenu(menu);
if (QApplication::desktop()->numScreens() > 1) if (TQApplication::desktop()->numScreens() > 1)
{ {
menu->insertItem(i18n("Open on screen"), screen_menu); menu->insertItem(i18n("Open on screen"), screen_menu);
connect(screen_menu, SIGNAL(activated(int)), this, SLOT(slotSetScreen(int))); connect(screen_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetScreen(int)));
} }
width_menu = new KPopupMenu(menu); width_menu = new KPopupMenu(menu);
menu->insertItem(i18n("Width"), width_menu); menu->insertItem(i18n("Width"), width_menu);
connect(width_menu, SIGNAL(activated(int)), this, SLOT(slotSetWidth(int))); connect(width_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetWidth(int)));
height_menu = new KPopupMenu(menu); height_menu = new KPopupMenu(menu);
menu->insertItem(i18n("Height"), height_menu); menu->insertItem(i18n("Height"), height_menu);
connect(height_menu, SIGNAL(activated(int)), this, SLOT(slotSetHeight(int))); connect(height_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetHeight(int)));
menu->insertItem(i18n("Keep open on focus change"), this, SLOT(slotSetFocusPolicy()), 0, Focus); menu->insertItem(i18n("Keep open on focus change"), TQT_TQOBJECT(this), TQT_SLOT(slotSetFocusPolicy()), 0, Focus);
menu->insertTitle(i18n("Settings")); menu->insertTitle(i18n("Settings"));
@ -805,14 +805,14 @@ void MainWindow::createMenu()
void MainWindow::updateWidthMenu() void MainWindow::updateWidthMenu()
{ {
width_menu->clear(); width_menu->clear();
for (int i = 10; i <= 100; i += 10) width_menu->insertItem(QString::number(i) + '%', i); for (int i = 10; i <= 100; i += 10) width_menu->insertItem(TQString::number(i) + '%', i);
width_menu->setItemChecked(Settings::width(), true); width_menu->setItemChecked(Settings::width(), true);
} }
void MainWindow::updateHeightMenu() void MainWindow::updateHeightMenu()
{ {
height_menu->clear(); height_menu->clear();
for (int i = 10; i <= 100; i += 10) height_menu->insertItem(QString::number(i) + '%', i); for (int i = 10; i <= 100; i += 10) height_menu->insertItem(TQString::number(i) + '%', i);
height_menu->setItemChecked(Settings::height(), true); height_menu->setItemChecked(Settings::height(), true);
} }
@ -821,8 +821,8 @@ void MainWindow::updateScreenMenu()
screen_menu->clear(); screen_menu->clear();
screen_menu->insertItem(i18n("At mouse location"), 0); screen_menu->insertItem(i18n("At mouse location"), 0);
screen_menu->insertSeparator(); screen_menu->insertSeparator();
for (int i = 1; i <= QApplication::desktop()->numScreens(); i++) for (int i = 1; i <= TQApplication::desktop()->numScreens(); i++)
screen_menu->insertItem(i18n("Screen %1").arg(QString::number(i)), i); screen_menu->insertItem(i18n("Screen %1").tqarg(TQString::number(i)), i);
screen_menu->setItemChecked(Settings::screen(), true); screen_menu->setItemChecked(Settings::screen(), true);
} }
@ -836,7 +836,7 @@ void MainWindow::createSessionMenu()
actionCollection()->action("add_tab_quad")->plug(session_menu); actionCollection()->action("add_tab_quad")->plug(session_menu);
} }
void MainWindow::slotUpdateTitle(const QString& title) void MainWindow::slotUpdateTitle(const TQString& title)
{ {
title_bar->setTitleText(title); title_bar->setTitleText(title);
} }
@ -909,7 +909,7 @@ void MainWindow::slotToggleState()
if (timer.isActive()) if (timer.isActive())
return; return;
KWinModule kwin(this); KWinModule kwin(TQT_TQOBJECT(this));
if (state) if (state)
{ {
@ -922,7 +922,7 @@ void MainWindow::slotToggleState()
show(); show();
KWin::forceActiveWindow(winId()); KWin::forceActiveWindow(winId());
connect(&timer, SIGNAL(timeout()), this, SLOT(slotIncreaseHeight())); connect(&timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseHeight()));
initWindowProps(); initWindowProps();
timer.start(10, false); timer.start(10, false);
state = !state; state = !state;
@ -937,9 +937,9 @@ void MainWindow::slotToggleState()
return; return;
} }
else if (full_screen) else if (full_screen)
this->setWindowState( this->windowState() & ~Qt::WindowFullScreen); this->setWindowState( this->windowState() & ~TQt::WindowFullScreen);
connect(&timer, SIGNAL(timeout()), this, SLOT(slotDecreaseHeight())); connect(&timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseHeight()));
timer.start(10, false); timer.start(10, false);
state = !state; state = !state;
} }
@ -951,15 +951,15 @@ void MainWindow::slotIncreaseHeight()
int steps = (Settings::steps() == 0) ? 1 : Settings::steps(); int steps = (Settings::steps() == 0) ? 1 : Settings::steps();
mask_height = (step++ * max_height) / steps; tqmask_height = (step++ * max_height) / steps;
if (step >= steps) if (step >= steps)
{ {
step = steps; step = steps;
timer.stop(); timer.stop();
disconnect(&timer, SIGNAL(timeout()), 0, 0); disconnect(&timer, TQT_SIGNAL(timeout()), 0, 0);
mask_height = max_height; tqmask_height = max_height;
if (background_changed) if (background_changed)
{ {
@ -971,7 +971,7 @@ void MainWindow::slotIncreaseHeight()
} }
updateWindowMask(); updateWindowMask();
title_bar->move(0, mask_height); title_bar->move(0, tqmask_height);
} }
void MainWindow::slotDecreaseHeight() void MainWindow::slotDecreaseHeight()
@ -980,13 +980,13 @@ void MainWindow::slotDecreaseHeight()
int steps = (Settings::steps() == 0) ? 1 : Settings::steps(); int steps = (Settings::steps() == 0) ? 1 : Settings::steps();
mask_height = (--step * max_height) / steps; tqmask_height = (--step * max_height) / steps;
if (step <= 0) if (step <= 0)
{ {
step = 0; step = 0;
timer.stop(); timer.stop();
disconnect(&timer, SIGNAL(timeout()), 0, 0); disconnect(&timer, TQT_SIGNAL(timeout()), 0, 0);
hide(); hide();
@ -995,7 +995,7 @@ void MainWindow::slotDecreaseHeight()
} }
updateWindowMask(); updateWindowMask();
title_bar->move(0, mask_height); title_bar->move(0, tqmask_height);
} }
void MainWindow::slotInitSkin() void MainWindow::slotInitSkin()
@ -1006,7 +1006,7 @@ void MainWindow::slotInitSkin()
margin = config.readNumEntry("width", 0); margin = config.readNumEntry("width", 0);
back_widget->setBackgroundColor(QColor(config.readNumEntry("red", 0), back_widget->setBackgroundColor(TQColor(config.readNumEntry("red", 0),
config.readNumEntry("green", 0), config.readNumEntry("green", 0),
config.readNumEntry("blue", 0))); config.readNumEntry("blue", 0)));
} }
@ -1022,7 +1022,7 @@ void MainWindow::slotUpdateSize(int new_width, int new_height, int new_location)
/* Updates the window size. */ /* Updates the window size. */
int tmp_height; int tmp_height;
QRect desk_area; TQRect desk_area;
// Xinerama aware work area. // Xinerama aware work area.
desk_area = getDesktopGeometry(); desk_area = getDesktopGeometry();
@ -1047,12 +1047,12 @@ void MainWindow::slotUpdateSize(int new_width, int new_height, int new_location)
back_widget->setGeometry(0, 0, width(), height()); back_widget->setGeometry(0, 0, width(), height());
// Update the window mask. // Update the window tqmask.
mask_height = (isVisible()) ? max_height : 0; tqmask_height = (isVisible()) ? max_height : 0;
updateWindowMask(); updateWindowMask();
} }
void MainWindow::moveEvent(QMoveEvent* e) void MainWindow::moveEvent(TQMoveEvent* e)
{ {
// If the screen setting isn't to appear on the screen the // If the screen setting isn't to appear on the screen the
// mouse cursor is on, detect whether the screen number has // mouse cursor is on, detect whether the screen number has
@ -1062,9 +1062,9 @@ void MainWindow::moveEvent(QMoveEvent* e)
// set. // set.
if (Settings::screen() if (Settings::screen()
&& QApplication::desktop()->screenNumber(this) != (Settings::screen()-1)) && TQApplication::desktop()->screenNumber(this) != (Settings::screen()-1))
{ {
Settings::setScreen(QApplication::desktop()->screenNumber(this)+1); Settings::setScreen(TQApplication::desktop()->screenNumber(this)+1);
updateScreenMenu(); updateScreenMenu();
@ -1093,7 +1093,7 @@ void MainWindow::slotUpdateFullScreen()
if (full_screen_action->isChecked()) if (full_screen_action->isChecked())
showFullScreen(); showFullScreen();
else else
this->setWindowState( this->windowState() & ~Qt::WindowFullScreen); this->setWindowState( this->windowState() & ~TQt::WindowFullScreen);
} }
void MainWindow::slotSetFocusPolicy() void MainWindow::slotSetFocusPolicy()
@ -1205,16 +1205,16 @@ void MainWindow::slotOpenSettingsDialog()
GeneralSettings* general_settings = new GeneralSettings(settings_dialog, "General"); GeneralSettings* general_settings = new GeneralSettings(settings_dialog, "General");
settings_dialog->addPage(general_settings, i18n("General"), "package_settings"); settings_dialog->addPage(general_settings, i18n("General"), "package_settings");
connect(general_settings, SIGNAL(updateSize(int, int, int)), this, SLOT(slotUpdateSize(int, int, int))); connect(general_settings, TQT_SIGNAL(updateSize(int, int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSize(int, int, int)));
SkinSettings* skin_settings = new SkinSettings(settings_dialog, "Skins", use_translucency); SkinSettings* skin_settings = new SkinSettings(settings_dialog, "Skins", use_translucency);
settings_dialog->addPage(skin_settings, i18n("Skins"), "style"); settings_dialog->addPage(skin_settings, i18n("Skins"), "style");
connect(skin_settings, SIGNAL(settingsChanged()), settings_dialog, SIGNAL(settingsChanged())); connect(skin_settings, TQT_SIGNAL(settingsChanged()), settings_dialog, TQT_SIGNAL(settingsChanged()));
connect(settings_dialog, SIGNAL(closeClicked()), skin_settings, SLOT(slotResetSelection())); connect(settings_dialog, TQT_SIGNAL(closeClicked()), skin_settings, TQT_SLOT(slotResetSelection()));
connect(settings_dialog, SIGNAL(cancelClicked()), skin_settings, SLOT(slotResetSelection())); connect(settings_dialog, TQT_SIGNAL(cancelClicked()), skin_settings, TQT_SLOT(slotResetSelection()));
connect(settings_dialog, SIGNAL(settingsChanged()), this, SLOT(slotUpdateSettings())); connect(settings_dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSettings()));
connect(settings_dialog, SIGNAL(hidden()), this, SLOT(slotDialogFinished())); connect(settings_dialog, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
settings_dialog->show(); settings_dialog->show();
} }
@ -1226,13 +1226,13 @@ void MainWindow::slotOpenFirstRunDialog()
first_run_dialog = new KDialogBase(this, first_run_dialog = new KDialogBase(this,
"First Run Dialog", true, i18n("First Run"), "First Run Dialog", true, i18n("First Run"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true); KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
connect(first_run_dialog, SIGNAL(okClicked()), this, SLOT(slotFirstRunDialogOK())); connect(first_run_dialog, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstRunDialogOK()));
connect(first_run_dialog, SIGNAL(cancelClicked()), this, SLOT(slotFirstRunDialogCancel())); connect(first_run_dialog, TQT_SIGNAL(cancelClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstRunDialogCancel()));
connect(first_run_dialog, SIGNAL(closeClicked()), this, SLOT(slotFirstRunDialogCancel())); connect(first_run_dialog, TQT_SIGNAL(closeClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstRunDialogCancel()));
connect(first_run_dialog, SIGNAL(hidden()), this, SLOT(slotDialogFinished())); connect(first_run_dialog, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
FirstRunDialog* first_run_dialog_page = new FirstRunDialog(first_run_dialog); FirstRunDialog* first_run_dialog_page = new FirstRunDialog(first_run_dialog);
first_run_dialog_page->setMinimumSize(first_run_dialog_page->sizeHint()); first_run_dialog_page->setMinimumSize(first_run_dialog_page->tqsizeHint());
first_run_dialog_page->setShortcut(global_key->shortcut("AccessKey")); first_run_dialog_page->setShortcut(global_key->shortcut("AccessKey"));
first_run_dialog->setMainWidget(first_run_dialog_page); first_run_dialog->setMainWidget(first_run_dialog_page);
@ -1281,7 +1281,7 @@ void MainWindow::slotOpenAboutApp()
if (!about_app) if (!about_app)
{ {
about_app = new KAboutApplication(this, "About Yakuake"); about_app = new KAboutApplication(this, "About Yakuake");
connect(about_app, SIGNAL(hidden()), this, SLOT(slotDialogFinished())); connect(about_app, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
} }
if (full_screen) full_screen_action->activate(); if (full_screen) full_screen_action->activate();
@ -1297,7 +1297,7 @@ void MainWindow::slotOpenAboutKDE()
if (!about_kde) if (!about_kde)
{ {
about_kde = new KAboutKDE(this, "About KDE"); about_kde = new KAboutKDE(this, "About KDE");
connect(about_kde, SIGNAL(hidden()), this, SLOT(slotDialogFinished())); connect(about_kde, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
} }
if (full_screen) full_screen_action->activate(); if (full_screen) full_screen_action->activate();
@ -1319,7 +1319,7 @@ void MainWindow::slotDialogFinished()
void MainWindow::slotPollMouse() void MainWindow::slotPollMouse()
{ {
QPoint pos = QCursor::pos(); TQPoint pos = TQCursor::pos();
if (pos.y() == 0) if (pos.y() == 0)
{ {

73
yakuake/src/main_window.h
Unescape View File

@ -20,13 +20,13 @@
#include "dcop_interface.h" #include "dcop_interface.h"
#include "session.h" #include "session.h"
#include <qmap.h> #include <tqmap.h>
#include <qcolor.h> #include <tqcolor.h>
#include <qtimer.h> #include <tqtimer.h>
#include <qlayout.h> #include <tqlayout.h>
#include <qwidget.h> #include <tqwidget.h>
#include <qapplication.h> #include <tqapplication.h>
#include <qwidgetstack.h> #include <tqwidgetstack.h>
#include <kwin.h> #include <kwin.h>
#include <kaction.h> #include <kaction.h>
@ -51,23 +51,24 @@ class KAboutKDE;
class MainWindow : public KMainWindow, virtual public DCOPInterface class MainWindow : public KMainWindow, virtual public DCOPInterface
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit MainWindow(QWidget* parent = 0, const char* name = 0); explicit MainWindow(TQWidget* tqparent = 0, const char* name = 0);
~MainWindow(); ~MainWindow();
int selectedSession(); int selectedSession();
int selectedTerminal(); int selectedTerminal();
const QString sessionIdList(); const TQString sessionIdList();
const QString terminalIdList(int session_id); const TQString terminalIdList(int session_id);
int tabPositionForSessionId(int session_id); int tabPositionForSessionId(int session_id);
int sessionIdForTabPosition(int position); int sessionIdForTabPosition(int position);
void updateWindowMask(); void updateWindowMask();
void showPopup(const QString & text, int time = 5000); void showPopup(const TQString & text, int time = 5000);
public slots: public slots:
@ -91,19 +92,19 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
void slotSelectSession(int session_id); void slotSelectSession(int session_id);
void slotSelectTabPosition(int position); void slotSelectTabPosition(int position);
void slotRenameSession(int session_id, const QString& name); void slotRenameSession(int session_id, const TQString& name);
void slotInteractiveRename(); void slotInteractiveRename();
const QString slotSessionName(); const TQString slotSessionName();
const QString slotSessionName(int session_id); const TQString slotSessionName(int session_id);
const QString slotSessionTitle(); const TQString slotSessionTitle();
const QString slotSessionTitle(int session_id); const TQString slotSessionTitle(int session_id);
const QString slotSessionTitle(int session_id, int terminal_id); const TQString slotSessionTitle(int session_id, int terminal_id);
void slotSetSessionTitleText(const QString& title); void slotSetSessionTitleText(const TQString& title);
void slotSetSessionTitleText(int session_id, const QString& title); void slotSetSessionTitleText(int session_id, const TQString& title);
void slotSetSessionTitleText(int session_id, int terminal_id, const QString& title); void slotSetSessionTitleText(int session_id, int terminal_id, const TQString& title);
void slotPasteClipboard(); void slotPasteClipboard();
void slotPasteClipboard(int session_id); void slotPasteClipboard(int session_id);
@ -113,9 +114,9 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
void slotPasteSelection(int session_id); void slotPasteSelection(int session_id);
void slotPasteSelection(int session_id, int terminal_id); void slotPasteSelection(int session_id, int terminal_id);
void slotRunCommandInSession(const QString& command); void slotRunCommandInSession(const TQString& command);
void slotRunCommandInSession(int session_id, const QString& command); void slotRunCommandInSession(int session_id, const TQString& command);
void slotRunCommandInSession(int session_id, int terminal_id, const QString& command); void slotRunCommandInSession(int session_id, int terminal_id, const TQString& command);
void slotSplitHorizontally(); void slotSplitHorizontally();
void slotSplitHorizontally(int session_id); void slotSplitHorizontally(int session_id);
@ -137,7 +138,7 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
protected: protected:
virtual void windowActivationChange(bool old_active); virtual void windowActivationChange(bool old_active);
virtual void moveEvent(QMoveEvent* e); virtual void moveEvent(TQMoveEvent* e);
bool queryClose(); bool queryClose();
@ -154,7 +155,7 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
void initWindowProps(); void initWindowProps();
int getMouseScreen(); int getMouseScreen();
QRect getDesktopGeometry(); TQRect getDesktopGeometry();
bool full_screen; bool full_screen;
@ -166,14 +167,14 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
/* Maximum height value. */ /* Maximum height value. */
int max_height; int max_height;
int mask_height; int tqmask_height;
/* Application border. */ /* Application border. */
int margin; int margin;
/* Interface modification timer. */ /* Interface modification timer. */
QTimer timer; TQTimer timer;
QTimer poller; TQTimer poller;
/* Passive popup window. */ /* Passive popup window. */
KPassivePopup popup; KPassivePopup popup;
@ -192,15 +193,15 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
KGlobalAccel* global_key; KGlobalAccel* global_key;
/* Background widget. */ /* Background widget. */
QWidget* back_widget; TQWidget* back_widget;
TabBar* tab_bar; TabBar* tab_bar;
TitleBar* title_bar; TitleBar* title_bar;
/* Inner konsole. */ /* Inner konsole. */
int selected_id; int selected_id;
QWidgetStack* widgets_stack; TQWidgetStack* widgets_stack;
QMap<int, Session*> sessions_stack; TQMap<int, Session*> sessions_stack;
bool is_shutting_down; bool is_shutting_down;
bool background_changed; bool background_changed;
@ -221,15 +222,15 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
private slots: private slots:
void slotHandleRemoveSession(KAction::ActivationReason, Qt::ButtonState); void slotHandleRemoveSession(KAction::ActivationReason, TQt::ButtonState);
void slotHandleHorizontalSplit(KAction::ActivationReason, Qt::ButtonState); void slotHandleHorizontalSplit(KAction::ActivationReason, TQt::ButtonState);
void slotHandleVerticalSplit(KAction::ActivationReason, Qt::ButtonState); void slotHandleVerticalSplit(KAction::ActivationReason, TQt::ButtonState);
void slotHandleRemoveTerminal(KAction::ActivationReason, Qt::ButtonState); void slotHandleRemoveTerminal(KAction::ActivationReason, TQt::ButtonState);
void slotInitSkin(); void slotInitSkin();
void slotUpdateSize(); void slotUpdateSize();
void slotUpdateSize(int new_width, int new_height, int new_location); void slotUpdateSize(int new_width, int new_height, int new_location);
void slotUpdateTitle(const QString& title); void slotUpdateTitle(const TQString& title);
void slotIncreaseHeight(); void slotIncreaseHeight();
void slotDecreaseHeight(); void slotDecreaseHeight();

110
yakuake/src/session.cpp
Unescape View File

@ -16,14 +16,14 @@
#include "terminal_splitter.h" #include "terminal_splitter.h"
#include "terminal_focus_watcher.h" #include "terminal_focus_watcher.h"
#include <qobjectlist.h> #include <tqobjectlist.h>
#include <qclipboard.h> #include <tqclipboard.h>
#include <qtimer.h> #include <tqtimer.h>
int Session::available_session_id = 0; int Session::available_session_id = 0;
Session::Session(QWidget* parent, SessionType type, const char* name) : QObject(parent, name) Session::Session(TQWidget* tqparent, SessionType type, const char* name) : TQObject(tqparent, name)
{ {
session_id = available_session_id; session_id = available_session_id;
available_session_id++; available_session_id++;
@ -31,12 +31,12 @@ Session::Session(QWidget* parent, SessionType type, const char* name) : QObject(
active_terminal = NULL; active_terminal = NULL;
focus_watcher = new TerminalFocusWatcher(this); focus_watcher = new TerminalFocusWatcher(this);
connect(focus_watcher, SIGNAL(focusChanged()), this, SLOT(slotFocusChanged())); connect(focus_watcher, TQT_SIGNAL(focusChanged()), this, TQT_SLOT(slotFocusChanged()));
base_widget = new TerminalSplitter(TerminalSplitter::Horizontal, parent, "base"); base_widget = new TerminalSplitter(Qt::Horizontal, tqparent, "base");
connect(base_widget, SIGNAL(destroyed()), this, SLOT(slotLastTerminalClosed())); connect(base_widget, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLastTerminalClosed()));
setenv("DCOP_YAKUAKE_SESSION", QString::number(session_id).ascii(), 1); setenv("DCOP_YAKUAKE_SESSION", TQString::number(session_id).ascii(), 1);
createInitialSplits(type); createInitialSplits(type);
} }
@ -56,10 +56,10 @@ void Session::slotFocusChanged()
{ {
if (checkFocusWidget()) if (checkFocusWidget())
{ {
base_widget->setFocusProxy(base_widget->focusWidget()); base_widget->setFocusProxy(base_widget->tqfocusWidget());
active_terminal = base_widget->focusWidget(); active_terminal = base_widget->tqfocusWidget();
int terminal_id = terminal_ids[base_widget->focusWidget()]; int terminal_id = terminal_ids[base_widget->tqfocusWidget()];
slotTitleChange(base_widget->focusWidget(), slotTitleChange(base_widget->tqfocusWidget(),
terminals[terminal_id]->title()); terminals[terminal_id]->title());
} }
} }
@ -67,29 +67,29 @@ void Session::slotFocusChanged()
int Session::activeTerminalId() int Session::activeTerminalId()
{ {
if (checkFocusWidget()) if (checkFocusWidget())
return terminal_ids[base_widget->focusWidget()]; return terminal_ids[base_widget->tqfocusWidget()];
else else
return -1; return -1;
} }
const QString Session::terminalIdList() const TQString Session::terminalIdList()
{ {
QValueList<int>::iterator it; TQValueList<int>::iterator it;
QValueList<int> key_list = terminals.keys(); TQValueList<int> key_list = terminals.keys();
QStringList id_list; TQStringList id_list;
for (it = key_list.begin(); it != key_list.end(); ++it) for (it = key_list.begin(); it != key_list.end(); ++it)
id_list << QString::number((*it)); id_list << TQString::number((*it));
return id_list.join(","); return id_list.join(",");
} }
const QString Session::title() const TQString Session::title()
{ {
return session_title; return session_title;
} }
const QString Session::title(int terminal_id) const TQString Session::title(int terminal_id)
{ {
if (terminals[terminal_id]) if (terminals[terminal_id])
return terminals[terminal_id]->title(); return terminals[terminal_id]->title();
@ -97,7 +97,7 @@ const QString Session::title(int terminal_id)
return 0; return 0;
} }
void Session::setTitle(const QString& title) void Session::setTitle(const TQString& title)
{ {
if (active_terminal) if (active_terminal)
{ {
@ -106,7 +106,7 @@ void Session::setTitle(const QString& title)
} }
} }
void Session::setTitle(int terminal_id, const QString& title) void Session::setTitle(int terminal_id, const TQString& title)
{ {
if (terminals[terminal_id]) terminals[terminal_id]->setTitle(title); if (terminals[terminal_id]) terminals[terminal_id]->setTitle(title);
} }
@ -123,7 +123,7 @@ void Session::pasteClipboard()
void Session::pasteClipboard(int terminal_id) void Session::pasteClipboard(int terminal_id)
{ {
if (terminal_parts[terminal_id]) if (terminal_parts[terminal_id])
terminal_parts[terminal_id]->sendInput(QApplication::clipboard()->text(QClipboard::Clipboard)); terminal_parts[terminal_id]->sendInput(TQApplication::tqclipboard()->text(TQClipboard::Clipboard));
} }
void Session::pasteSelection() void Session::pasteSelection()
@ -138,10 +138,10 @@ void Session::pasteSelection()
void Session::pasteSelection(int terminal_id) void Session::pasteSelection(int terminal_id)
{ {
if (terminal_parts[terminal_id]) if (terminal_parts[terminal_id])
terminal_parts[terminal_id]->sendInput(QApplication::clipboard()->text(QClipboard::Selection)); terminal_parts[terminal_id]->sendInput(TQApplication::tqclipboard()->text(TQClipboard::Selection));
} }
void Session::runCommand(const QString& command) void Session::runCommand(const TQString& command)
{ {
if (active_terminal) if (active_terminal)
{ {
@ -150,7 +150,7 @@ void Session::runCommand(const QString& command)
} }
} }
void Session::runCommand(int terminal_id, const QString& command) void Session::runCommand(int terminal_id, const TQString& command)
{ {
if (terminal_parts[terminal_id]) if (terminal_parts[terminal_id])
terminal_parts[terminal_id]->sendInput(command + '\n'); terminal_parts[terminal_id]->sendInput(command + '\n');
@ -169,7 +169,7 @@ void Session::splitHorizontally()
void Session::splitHorizontally(int terminal_id) void Session::splitHorizontally(int terminal_id)
{ {
if (terminal_widgets[terminal_id]) if (terminal_widgets[terminal_id])
split(terminal_widgets[terminal_id], TerminalSplitter::Horizontal); split(terminal_widgets[terminal_id], Qt::Horizontal);
} }
void Session::splitVertically() void Session::splitVertically()
@ -184,7 +184,7 @@ void Session::splitVertically()
void Session::splitVertically(int terminal_id) void Session::splitVertically(int terminal_id)
{ {
if (terminal_widgets[terminal_id]) if (terminal_widgets[terminal_id])
split(terminal_widgets[terminal_id], TerminalSplitter::Vertical); split(terminal_widgets[terminal_id], Qt::Vertical);
} }
void Session::removeTerminal() void Session::removeTerminal()
@ -230,7 +230,7 @@ void Session::createInitialSplits(SessionType type)
Terminal* terminal = addTerminal(base_widget); Terminal* terminal = addTerminal(base_widget);
addTerminal(base_widget); addTerminal(base_widget);
QValueList<int> new_splitter_sizes; TQValueList<int> new_splitter_sizes;
new_splitter_sizes << (splitter_width / 2) << (splitter_width / 2); new_splitter_sizes << (splitter_width / 2) << (splitter_width / 2);
base_widget->setSizes(new_splitter_sizes); base_widget->setSizes(new_splitter_sizes);
@ -241,14 +241,14 @@ void Session::createInitialSplits(SessionType type)
case TwoVertical: case TwoVertical:
{ {
base_widget->setOrientation(TerminalSplitter::Vertical); base_widget->setOrientation(Qt::Vertical);
int splitter_height = base_widget->height(); int splitter_height = base_widget->height();
Terminal* terminal = addTerminal(base_widget); Terminal* terminal = addTerminal(base_widget);
addTerminal(base_widget); addTerminal(base_widget);
QValueList<int> new_splitter_sizes; TQValueList<int> new_splitter_sizes;
new_splitter_sizes << (splitter_height / 2) << (splitter_height / 2); new_splitter_sizes << (splitter_height / 2) << (splitter_height / 2);
base_widget->setSizes(new_splitter_sizes); base_widget->setSizes(new_splitter_sizes);
@ -263,13 +263,13 @@ void Session::createInitialSplits(SessionType type)
int splitter_height = base_widget->height(); int splitter_height = base_widget->height();
base_widget->setOrientation(TerminalSplitter::Vertical); base_widget->setOrientation(Qt::Vertical);
TerminalSplitter* upper_splitter = new TerminalSplitter(TerminalSplitter::Horizontal, base_widget); TerminalSplitter* upper_splitter = new TerminalSplitter(Qt::Horizontal, base_widget);
connect(upper_splitter, SIGNAL(destroyed()), this, SLOT(cleanup())); connect(upper_splitter, TQT_SIGNAL(destroyed()), this, TQT_SLOT(cleanup()));
TerminalSplitter* lower_splitter = new TerminalSplitter(TerminalSplitter::Horizontal, base_widget); TerminalSplitter* lower_splitter = new TerminalSplitter(Qt::Horizontal, base_widget);
connect(lower_splitter, SIGNAL(destroyed()), this, SLOT(cleanup())); connect(lower_splitter, TQT_SIGNAL(destroyed()), this, TQT_SLOT(cleanup()));
Terminal* terminal = addTerminal(upper_splitter); Terminal* terminal = addTerminal(upper_splitter);
addTerminal(upper_splitter); addTerminal(upper_splitter);
@ -277,7 +277,7 @@ void Session::createInitialSplits(SessionType type)
addTerminal(lower_splitter); addTerminal(lower_splitter);
addTerminal(lower_splitter); addTerminal(lower_splitter);
QValueList<int> new_splitter_sizes; TQValueList<int> new_splitter_sizes;
new_splitter_sizes << (splitter_height / 2) << (splitter_height / 2); new_splitter_sizes << (splitter_height / 2) << (splitter_height / 2);
base_widget->setSizes(new_splitter_sizes); base_widget->setSizes(new_splitter_sizes);
@ -300,12 +300,12 @@ void Session::createInitialSplits(SessionType type)
} }
} }
void Session::split(QWidget* active_terminal, Orientation o) void Session::split(TQWidget* active_terminal, Qt::Orientation o)
{ {
TerminalSplitter* splitter = static_cast<TerminalSplitter*>(active_terminal->parentWidget()); TerminalSplitter* splitter = static_cast<TerminalSplitter*>(active_terminal->tqparentWidget());
if (!splitter) return; if (!splitter) return;
// If the parent splitter of this terminal has only this one child, // If the tqparent splitter of this terminal has only this one child,
// add the new terminal to the same splitter, after resetting the // add the new terminal to the same splitter, after resetting the
// splitter orientation as needed. // splitter orientation as needed.
if (splitter->count() == 1) if (splitter->count() == 1)
@ -317,32 +317,32 @@ void Session::split(QWidget* active_terminal, Orientation o)
Terminal* terminal = addTerminal(splitter); Terminal* terminal = addTerminal(splitter);
QValueList<int> new_splitter_sizes; TQValueList<int> new_splitter_sizes;
new_splitter_sizes << (splitter_width / 2) << (splitter_width / 2); new_splitter_sizes << (splitter_width / 2) << (splitter_width / 2);
splitter->setSizes(new_splitter_sizes); splitter->setSizes(new_splitter_sizes);
terminal->widget()->show(); terminal->widget()->show();
} }
// If the parent splitter of this terminal already has two children, // If the tqparent splitter of this terminal already has two tqchildren,
// add a new splitter to it and reparent the terminal to the new // add a new splitter to it and reparent the terminal to the new
// splitter. // splitter.
else else
{ {
// Store the old splitter sizes to re-apply them later after the // Store the old splitter sizes to re-apply them later after the
// add-and-remove action is done screwing with the splitter. // add-and-remove action is done screwing with the splitter.
QValueList<int> splitter_sizes = splitter->sizes(); TQValueList<int> splitter_sizes = splitter->sizes();
TerminalSplitter* new_splitter = new TerminalSplitter(o, splitter); TerminalSplitter* new_splitter = new TerminalSplitter(o, splitter);
connect(new_splitter, SIGNAL(destroyed()), this, SLOT(cleanup())); connect(new_splitter, TQT_SIGNAL(destroyed()), this, TQT_SLOT(cleanup()));
if (splitter->isFirst(active_terminal)) splitter->moveToFirst(new_splitter); if (splitter->isFirst(active_terminal)) splitter->moveToFirst(new_splitter);
active_terminal->reparent(new_splitter, 0, QPoint(), true); active_terminal->reparent(new_splitter, 0, TQPoint(), true);
Terminal* terminal = addTerminal(new_splitter); Terminal* terminal = addTerminal(new_splitter);
splitter->setSizes(splitter_sizes); splitter->setSizes(splitter_sizes);
QValueList<int> new_splitter_sizes; TQValueList<int> new_splitter_sizes;
new_splitter_sizes << (splitter_sizes[1] / 2) << (splitter_sizes[1] / 2); new_splitter_sizes << (splitter_sizes[1] / 2) << (splitter_sizes[1] / 2);
new_splitter->setSizes(new_splitter_sizes); new_splitter->setSizes(new_splitter_sizes);
@ -351,9 +351,9 @@ void Session::split(QWidget* active_terminal, Orientation o)
} }
} }
Terminal* Session::addTerminal(QWidget* parent) Terminal* Session::addTerminal(TQWidget* tqparent)
{ {
Terminal* terminal = new Terminal(parent); Terminal* terminal = new Terminal(tqparent);
terminals.insert(terminal->id(), terminal); terminals.insert(terminal->id(), terminal);
terminal_ids.insert(terminal->widget(), terminal->id()); terminal_ids.insert(terminal->widget(), terminal->id());
@ -362,9 +362,9 @@ Terminal* Session::addTerminal(QWidget* parent)
terminal->widget()->installEventFilter(focus_watcher); terminal->widget()->installEventFilter(focus_watcher);
connect(terminal, SIGNAL(destroyed(int)), this, SLOT(cleanup(int))); connect(terminal, TQT_SIGNAL(destroyed(int)), this, TQT_SLOT(cleanup(int)));
connect(terminal, SIGNAL(titleChanged(QWidget*, const QString&)), connect(terminal, TQT_SIGNAL(titleChanged(TQWidget*, const TQString&)),
this, SLOT(slotTitleChange(QWidget*, const QString&))); this, TQT_SLOT(slotTitleChange(TQWidget*, const TQString&)));
active_terminal = terminal->widget(); active_terminal = terminal->widget();
base_widget->setFocusProxy(terminal->widget()); base_widget->setFocusProxy(terminal->widget());
@ -401,9 +401,9 @@ void Session::slotLastTerminalClosed()
deleteLater(); deleteLater();
} }
void Session::slotTitleChange(QWidget* w, const QString& title) void Session::slotTitleChange(TQWidget* w, const TQString& title)
{ {
if (w == base_widget->focusWidget()) if (w == base_widget->tqfocusWidget())
{ {
session_title = title; session_title = title;
emit titleChanged( session_title); emit titleChanged( session_title);
@ -412,8 +412,8 @@ void Session::slotTitleChange(QWidget* w, const QString& title)
bool Session::checkFocusWidget() bool Session::checkFocusWidget()
{ {
if (base_widget->focusWidget() if (base_widget->tqfocusWidget()
&& base_widget->focusWidget()->isA(QCString("TEWidget"))) && base_widget->tqfocusWidget()->isA(TQCString("TEWidget")))
{ {
return true; return true;
} }

45
yakuake/src/session.h
Unescape View File

@ -15,44 +15,45 @@
#include "terminal_splitter.h" #include "terminal_splitter.h"
#include <qobject.h> #include <tqobject.h>
#include <qwidget.h> #include <tqwidget.h>
class Terminal; class Terminal;
class TerminalInterface; class TerminalInterface;
class TerminalFocusWatcher; class TerminalFocusWatcher;
class Session : public QObject class Session : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
enum SessionType { Single, TwoHorizontal, TwoVertical, Quad }; enum SessionType { Single, TwoHorizontal, TwoVertical, Quad };
explicit Session(QWidget* parent = 0, SessionType type = Single, const char* name = 0); explicit Session(TQWidget* tqparent = 0, SessionType type = Single, const char* name = 0);
virtual ~Session(); virtual ~Session();
int id() { return session_id; } int id() { return session_id; }
QWidget* widget() { return base_widget; } TQWidget* widget() { return base_widget; }
int activeTerminalId(); int activeTerminalId();
const QString terminalIdList(); const TQString terminalIdList();
const QString title(); const TQString title();
const QString title(int terminal_id); const TQString title(int terminal_id);
void setTitle(const QString& title); void setTitle(const TQString& title);
void setTitle(int terminal_id, const QString& title); void setTitle(int terminal_id, const TQString& title);
void pasteClipboard(); void pasteClipboard();
void pasteClipboard(int terminal_id); void pasteClipboard(int terminal_id);
void pasteSelection(); void pasteSelection();
void pasteSelection(int terminal_id); void pasteSelection(int terminal_id);
void runCommand(const QString& command); void runCommand(const TQString& command);
void runCommand(int terminal_id, const QString& command); void runCommand(int terminal_id, const TQString& command);
void removeTerminal(); void removeTerminal();
void removeTerminal(int terminal_id); void removeTerminal(int terminal_id);
@ -68,33 +69,33 @@ class Session : public QObject
void focusNextSplit(); void focusNextSplit();
void focusPreviousSplit(); void focusPreviousSplit();
void slotTitleChange(QWidget* w, const QString& title); void slotTitleChange(TQWidget* w, const TQString& title);
signals: signals:
void destroyed(int id); void destroyed(int id);
void titleChanged(const QString&); void titleChanged(const TQString&);
private: private:
void createInitialSplits(SessionType); void createInitialSplits(SessionType);
void split(QWidget* active_terminal, Orientation o); void split(TQWidget* active_terminal, Qt::Orientation o);
Terminal* addTerminal(QWidget* parent); Terminal* addTerminal(TQWidget* tqparent);
bool checkFocusWidget(); bool checkFocusWidget();
static int available_session_id; static int available_session_id;
int session_id; int session_id;
QString session_title; TQString session_title;
QWidget* active_terminal; TQWidget* active_terminal;
TerminalSplitter* base_widget; TerminalSplitter* base_widget;
TerminalFocusWatcher* focus_watcher; TerminalFocusWatcher* focus_watcher;
QMap<int, Terminal*> terminals; TQMap<int, Terminal*> terminals;
QMap<QWidget*, int> terminal_ids; TQMap<TQWidget*, int> terminal_ids;
QMap<int, QWidget*> terminal_widgets; TQMap<int, TQWidget*> terminal_widgets;
QMap<int, TerminalInterface*> terminal_parts; TQMap<int, TerminalInterface*> terminal_parts;
private slots: private slots:

52
yakuake/src/skin_list_item.cpp
Unescape View File

@ -12,28 +12,28 @@
#include "skin_list_item.h" #include "skin_list_item.h"
#include <qsimplerichtext.h> #include <tqsimplerichtext.h>
#include <qrect.h> #include <tqrect.h>
#include <qpainter.h> #include <tqpainter.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qpalette.h> #include <tqpalette.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <klocale.h> #include <klocale.h>
SkinListItem::SkinListItem(KListView* parent, const QString& fancy_name, SkinListItem::SkinListItem(KListView* tqparent, const TQString& fancy_name,
const QString& author, const QPixmap& icon, const QString& name, const QString& dir) const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir)
: KListViewItem(parent, fancy_name) : KListViewItem(tqparent, fancy_name)
{ {
setName(name); setName(name);
setAuthor(author); setAuthor(author);
setDir(dir); setDir(dir);
QString fancy_author = i18n("by %1").arg(author); TQString fancy_author = i18n("by %1").tqarg(author);
QString text = QString("<qt><b>%1</b><br>%2</qt>").arg(fancy_name).arg(fancy_author); TQString text = TQString("<qt><b>%1</b><br>%2</qt>").tqarg(fancy_name).tqarg(fancy_author);
item_text = new QSimpleRichText(text, listView()->font()); item_text = new TQSimpleRichText(text, listView()->font());
item_text->adjustSize(); item_text->adjustSize();
setPixmap(0, icon); setPixmap(0, icon);
@ -44,32 +44,32 @@ SkinListItem::~SkinListItem()
{ {
} }
void SkinListItem::setName(const QString& name) void SkinListItem::setName(const TQString& name)
{ {
skin_name = name; skin_name = name;
} }
QString SkinListItem::name() TQString SkinListItem::name()
{ {
return skin_name; return skin_name;
} }
void SkinListItem::setAuthor(const QString& author) void SkinListItem::setAuthor(const TQString& author)
{ {
skin_author = author; skin_author = author;
} }
QString SkinListItem::author() TQString SkinListItem::author()
{ {
return skin_author; return skin_author;
} }
void SkinListItem::setDir(const QString& dir) void SkinListItem::setDir(const TQString& dir)
{ {
skin_dir = dir; skin_dir = dir;
} }
QString SkinListItem::dir() TQString SkinListItem::dir()
{ {
return skin_dir; return skin_dir;
} }
@ -88,18 +88,18 @@ void SkinListItem::setup()
setHeight(text_height); setHeight(text_height);
} }
void SkinListItem::paintCell(QPainter* p, const QColorGroup& /* cg */, int /* column */, int width, int /* align */) void SkinListItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /* column */, int width, int /* align */)
{ {
if (width <= 0) return; if (width <= 0) return;
QColor textColor = isSelected() ? KGlobalSettings::highlightedTextColor() : KGlobalSettings::textColor(); TQColor textColor = isSelected() ? KGlobalSettings::highlightedTextColor() : KGlobalSettings::textColor();
QColor background = isSelected() ? KGlobalSettings::highlightColor() : listView()->paletteBackgroundColor(); TQColor background = isSelected() ? KGlobalSettings::highlightColor() : listView()->paletteBackgroundColor();
QColorGroup colors; TQColorGroup colors;
colors.setColor(QColorGroup::Foreground, textColor); colors.setColor(TQColorGroup::Foreground, textColor);
colors.setColor(QColorGroup::Text, textColor); colors.setColor(TQColorGroup::Text, textColor);
colors.setColor(QColorGroup::Background, background); colors.setColor(TQColorGroup::Background, background);
colors.setColor(QColorGroup::Base, background); colors.setColor(TQColorGroup::Base, background);
p->fillRect(0, 0, width, height(), background); p->fillRect(0, 0, width, height(), background);
@ -111,5 +111,5 @@ void SkinListItem::paintCell(QPainter* p, const QColorGroup& /* cg */, int /* co
} }
item_text->setWidth(width); item_text->setWidth(width);
item_text->draw(p, MARGIN+32+MARGIN+MARGIN, MARGIN, QRect(0, 0, width-MARGIN-32-MARGIN, height()), colors); item_text->draw(p, MARGIN+32+MARGIN+MARGIN, MARGIN, TQRect(0, 0, width-MARGIN-32-MARGIN, height()), colors);
} }

28
yakuake/src/skin_list_item.h
Unescape View File

@ -20,33 +20,33 @@
#define MARGIN 3 #define MARGIN 3
class QSimpleRichText; class TQSimpleRichText;
class SkinListItem : public KListViewItem class SkinListItem : public KListViewItem
{ {
public: public:
explicit SkinListItem(KListView* parent, const QString& fancy_name, explicit SkinListItem(KListView* tqparent, const TQString& fancy_name,
const QString& author, const QPixmap& icon, const QString& name, const QString& dir); const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir);
~SkinListItem(); ~SkinListItem();
void setAuthor(const QString& author); void setAuthor(const TQString& author);
QString author(); TQString author();
void setName(const QString& name); void setName(const TQString& name);
QString name(); TQString name();
void setDir(const QString& dir); void setDir(const TQString& dir);
QString dir(); TQString dir();
void setup(); void setup();
void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align); void paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int align);
private: private:
QSimpleRichText* item_text; TQSimpleRichText* item_text;
QString skin_name; TQString skin_name;
QString skin_author; TQString skin_author;
QString skin_dir; TQString skin_dir;
}; };

120
yakuake/src/skin_settings.cpp
Unescape View File

@ -15,13 +15,13 @@
#include "skin_list_item.h" #include "skin_list_item.h"
#include "settings.h" #include "settings.h"
#include <qurl.h> #include <tqurl.h>
#include <qheader.h> #include <tqheader.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qlayout.h> #include <tqlayout.h>
#include <qpushbutton.h> #include <tqpushbutton.h>
#include <qlabel.h> #include <tqlabel.h>
#include <qfile.h> #include <tqfile.h>
#include <kapplication.h> #include <kapplication.h>
#include <kglobal.h> #include <kglobal.h>
@ -40,8 +40,8 @@
#include <unistd.h> // unlink() #include <unistd.h> // unlink()
SkinSettings::SkinSettings(QWidget* parent, const char* name, bool translucency) SkinSettings::SkinSettings(TQWidget* tqparent, const char* name, bool translucency)
: SkinSettingsUI(parent, name) : SkinSettingsUI(tqparent, name)
{ {
kcfg_skin->hide(); kcfg_skin->hide();
@ -51,8 +51,8 @@ SkinSettings::SkinSettings(QWidget* parent, const char* name, bool translucency)
kcfg_skinbgcolor->setEnabled(!translucency); kcfg_skinbgcolor->setEnabled(!translucency);
kcfg_skinbgcolor->setHidden(translucency); kcfg_skinbgcolor->setHidden(translucency);
skinbglayout->setEnabled(!translucency); skinbgtqlayout->setEnabled(!translucency);
skinbglayout->invalidate(); skinbgtqlayout->tqinvalidate();
skins_list->header()->hide(); skins_list->header()->hide();
skins_list->setSelectionModeExt(KListView::Single); skins_list->setSelectionModeExt(KListView::Single);
@ -63,11 +63,11 @@ SkinSettings::SkinSettings(QWidget* parent, const char* name, bool translucency)
skins_list->setDropVisualizer(false); skins_list->setDropVisualizer(false);
skins_list->setSortColumn(0); skins_list->setSortColumn(0);
connect(skins_list, SIGNAL(selectionChanged()), this, SLOT(slotUpdateRemoveButton())); connect(skins_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateRemoveButton()));
connect(skins_list, SIGNAL(selectionChanged()), this, SLOT(slotUpdateSkinSetting())); connect(skins_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateSkinSetting()));
connect(kcfg_skin, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateSelection(const QString&))); connect(kcfg_skin, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelection(const TQString&)));
connect(install_button, SIGNAL(clicked()), this, SLOT(slotInstallSkin())); connect(install_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallSkin()));
connect(remove_button, SIGNAL(clicked()), this, SLOT(slotRemoveSkin())); connect(remove_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveSkin()));
skins_dir = locateLocal("data", "yakuake/"); skins_dir = locateLocal("data", "yakuake/");
@ -80,7 +80,7 @@ SkinSettings::~SkinSettings()
{ {
} }
void SkinSettings::showEvent(QShowEvent* e) void SkinSettings::showEvent(TQShowEvent* e)
{ {
slotPopulate(); slotPopulate();
SkinSettingsUI::showEvent(e); SkinSettingsUI::showEvent(e);
@ -88,13 +88,13 @@ void SkinSettings::showEvent(QShowEvent* e)
void SkinSettings::slotPopulate() void SkinSettings::slotPopulate()
{ {
QStringList skins_dirs; TQStringList skins_dirs;
QStringList titles_dirs = KGlobal::dirs()->findAllResources("data","yakuake/*/title.skin"); TQStringList titles_dirs = KGlobal::dirs()->findAllResources("data","yakuake/*/title.skin");
QStringList tabs_dirs = KGlobal::dirs()->findAllResources("data","yakuake/*/tabs.skin"); TQStringList tabs_dirs = KGlobal::dirs()->findAllResources("data","yakuake/*/tabs.skin");
for (QStringList::Iterator it = titles_dirs.begin(); it != titles_dirs.end(); ++it) for (TQStringList::Iterator it = titles_dirs.begin(); it != titles_dirs.end(); ++it)
{ {
if (tabs_dirs.contains((*it).section('/', 0, -2) + "/tabs.skin")) if (tabs_dirs.tqcontains((*it).section('/', 0, -2) + "/tabs.skin"))
skins_dirs << (*it).section('/', 0, -2); skins_dirs << (*it).section('/', 0, -2);
} }
@ -102,30 +102,30 @@ void SkinSettings::slotPopulate()
{ {
skins_list->clear(); skins_list->clear();
for (QStringList::Iterator it = skins_dirs.begin(); it != skins_dirs.end(); ++it) for (TQStringList::Iterator it = skins_dirs.begin(); it != skins_dirs.end(); ++it)
{ {
QUrl titles_url = locate("appdata", (*it) + "/title.skin"); TQUrl titles_url = locate("appdata", (*it) + "/title.skin");
KConfig titles_config(titles_url.path()); KConfig titles_config(titles_url.path());
titles_config.setGroup("Description"); titles_config.setGroup("Description");
QString titles_name(titles_config.readEntry("Skin", "")); TQString titles_name(titles_config.readEntry("Skin", ""));
QString titles_author(titles_config.readEntry("Author", "")); TQString titles_author(titles_config.readEntry("Author", ""));
QString titles_icon_name(titles_config.readEntry("Icon", "")); TQString titles_icon_name(titles_config.readEntry("Icon", ""));
QUrl tabs_url = locate("appdata", (*it) + "/tabs.skin"); TQUrl tabs_url = locate("appdata", (*it) + "/tabs.skin");
KConfig tabs_config(tabs_url.path()); KConfig tabs_config(tabs_url.path());
tabs_config.setGroup("Description"); tabs_config.setGroup("Description");
QString tabs_name(tabs_config.readEntry("Skin", "")); TQString tabs_name(tabs_config.readEntry("Skin", ""));
QString tabs_author(tabs_config.readEntry("Author", "")); TQString tabs_author(tabs_config.readEntry("Author", ""));
QString tabs_icon_name(tabs_config.readEntry("Icon", "")); TQString tabs_icon_name(tabs_config.readEntry("Icon", ""));
QString skin_name = (*it).section('/', -1, -1); TQString skin_name = (*it).section('/', -1, -1);
QString skin_fancy_name = i18n("Unnamed"); TQString skin_fancy_name = i18n("Unnamed");
QString skin_author = i18n("Unknown"); TQString skin_author = i18n("Unknown");
QString skin_icon_name; TQString skin_icon_name;
QUrl skin_icon_url; TQUrl skin_icon_url;
QPixmap skin_icon; TQPixmap skin_icon;
if (!titles_name.isEmpty()) if (!titles_name.isEmpty())
skin_fancy_name = titles_name; skin_fancy_name = titles_name;
@ -150,7 +150,7 @@ void SkinSettings::slotPopulate()
bool exists = false; bool exists = false;
SkinListItem* item = 0; SkinListItem* item = 0;
QListViewItemIterator it2(skins_list); TQListViewItemIterator it2(skins_list);
while (it2.current()) while (it2.current())
{ {
@ -173,7 +173,7 @@ void SkinSettings::slotPopulate()
void SkinSettings::slotInstallSkin() void SkinSettings::slotInstallSkin()
{ {
KURL skin_url = KFileDialog::getOpenURL(QString(), KURL skin_url = KFileDialog::getOpenURL(TQString(),
i18n("*.tar.gz *.tar.bz2 *.tar *.zip|Yakuake Skins"), i18n("*.tar.gz *.tar.bz2 *.tar *.zip|Yakuake Skins"),
NULL, i18n("Select Skin Archive")); NULL, i18n("Select Skin Archive"));
@ -190,17 +190,17 @@ void SkinSettings::slotInstallSkin()
return; return;
} }
QDir skin_dir(install_skin_file); TQDir skin_dir(install_skin_file);
if (!skin_dir.exists()) if (!skin_dir.exists())
{ {
KIO::ListJob* job = KIO::listRecursive("tar:" + install_skin_file, false, false); KIO::ListJob* job = KIO::listRecursive("tar:" + install_skin_file, false, false);
connect(job, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), connect(job, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
this, SLOT(slotListSkinArchive(KIO::Job*, const KIO::UDSEntryList&))); this, TQT_SLOT(slotListSkinArchive(KIO::Job*, const KIO::UDSEntryList&)));
connect(job, SIGNAL(result(KIO::Job*)), connect(job, TQT_SIGNAL(result(KIO::Job*)),
this, SLOT(slotValidateSkinArchive(KIO::Job*))); this, TQT_SLOT(slotValidateSkinArchive(KIO::Job*)));
} }
else else
failInstall(i18n("The installer was given a directory, not a file.")); failInstall(i18n("The installer was given a directory, not a file."));
@ -230,8 +230,8 @@ void SkinSettings::slotValidateSkinArchive(KIO::Job* job)
{ {
install_skin_name = install_skin_file_list.first(); install_skin_name = install_skin_file_list.first();
if (install_skin_file_list.contains(QString(install_skin_name + "/title.skin")) if (install_skin_file_list.tqcontains(TQString(install_skin_name + "/title.skin"))
&& install_skin_file_list.contains(QString(install_skin_name + "/tabs.skin"))) && install_skin_file_list.tqcontains(TQString(install_skin_name + "/tabs.skin")))
{ {
checkForExistingSkin(); checkForExistingSkin();
} }
@ -239,7 +239,7 @@ void SkinSettings::slotValidateSkinArchive(KIO::Job* job)
failInstall(i18n("Unable to locate required files in the skin archive.\n\n The archive appears to be invalid.")); failInstall(i18n("Unable to locate required files in the skin archive.\n\n The archive appears to be invalid."));
} }
else else
failInstall(i18n("Unable to list the skin archive contents.") + QString("\n\n %1").arg(job->errorString())); failInstall(i18n("Unable to list the skin archive contents.") + TQString("\n\n %1").tqarg(job->errorString()));
} }
void SkinSettings::checkForExistingSkin() void SkinSettings::checkForExistingSkin()
@ -247,7 +247,7 @@ void SkinSettings::checkForExistingSkin()
bool exists = false; bool exists = false;
SkinListItem* item = 0; SkinListItem* item = 0;
QListViewItemIterator it(skins_list); TQListViewItemIterator it(skins_list);
while (it.current()) while (it.current())
{ {
@ -258,7 +258,7 @@ void SkinSettings::checkForExistingSkin()
if (exists) if (exists)
{ {
QFile skin(item->dir() + "/titles.skin"); TQFile skin(item->dir() + "/titles.skin");
if (!skin.open(IO_ReadOnly | IO_WriteOnly)) if (!skin.open(IO_ReadOnly | IO_WriteOnly))
{ {
@ -275,9 +275,9 @@ void SkinSettings::checkForExistingSkin()
if (remove == KMessageBox::Continue) if (remove == KMessageBox::Continue)
{ {
unlink(QFile::encodeName(item->dir())); unlink(TQFile::encodeName(item->dir()));
KIO::DeleteJob* job = KIO::del(KURL(item->dir()), false, false); KIO::DeleteJob* job = KIO::del(KURL(item->dir()), false, false);
connect(job, SIGNAL(result(KIO::Job*)), this, SLOT(slotInstallSkinArchive(KIO::Job*))); connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotInstallSkinArchive(KIO::Job*)));
} }
else else
cleanupAfterInstall(); cleanupAfterInstall();
@ -319,7 +319,7 @@ void SkinSettings::slotInstallSkinArchive(KIO::Job* delete_job)
failInstall(i18n("The skin archive file could not be opened.")); failInstall(i18n("The skin archive file could not be opened."));
} }
void SkinSettings::failInstall(const QString& error) void SkinSettings::failInstall(const TQString& error)
{ {
KMessageBox::error(0L, error, KMessageBox::error(0L, error,
i18n("Cannot Install Skin"), i18n("Cannot Install Skin"),
@ -332,8 +332,8 @@ void SkinSettings::failInstall(const QString& error)
void SkinSettings::cleanupAfterInstall() void SkinSettings::cleanupAfterInstall()
{ {
KIO::NetAccess::removeTempFile(install_skin_file); KIO::NetAccess::removeTempFile(install_skin_file);
install_skin_file = QString(); install_skin_file = TQString();
install_skin_name = QString(); install_skin_name = TQString();
install_skin_file_list.clear(); install_skin_file_list.clear();
} }
@ -347,15 +347,15 @@ void SkinSettings::slotRemoveSkin()
if (!selected_item) return; if (!selected_item) return;
int remove = KMessageBox::warningContinueCancel(0L, int remove = KMessageBox::warningContinueCancel(0L,
i18n("Do you want to remove \"%1\" by %2?").arg(selected_item->text(0)).arg(selected_item->author()), i18n("Do you want to remove \"%1\" by %2?").tqarg(selected_item->text(0)).tqarg(selected_item->author()),
i18n("Remove Skin"), i18n("Remove Skin"),
KStdGuiItem::del()); KStdGuiItem::del());
if (remove == KMessageBox::Continue) if (remove == KMessageBox::Continue)
{ {
unlink(QFile::encodeName(selected_item->dir())); unlink(TQFile::encodeName(selected_item->dir()));
KIO::DeleteJob* job = KIO::del(KURL(selected_item->dir()), false, false); KIO::DeleteJob* job = KIO::del(KURL(selected_item->dir()), false, false);
connect(job, SIGNAL(result(KIO::Job *)), this, SLOT(slotPopulate())); connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotPopulate()));
if (selected_item->name() == Settings::skin()) if (selected_item->name() == Settings::skin())
{ {
@ -386,7 +386,7 @@ void SkinSettings::slotUpdateRemoveButton()
return; return;
} }
QFile skin(selected_item->dir() + "/title.skin"); TQFile skin(selected_item->dir() + "/title.skin");
if (!skin.open(IO_ReadOnly | IO_WriteOnly)) if (!skin.open(IO_ReadOnly | IO_WriteOnly))
remove_button->setEnabled(false); remove_button->setEnabled(false);
@ -412,12 +412,12 @@ void SkinSettings::slotResetSelection()
selected = Settings::skin(); selected = Settings::skin();
} }
void SkinSettings::slotUpdateSelection(const QString& selection) void SkinSettings::slotUpdateSelection(const TQString& selection)
{ {
selected = selection; selected = selection;
SkinListItem* skin = 0; SkinListItem* skin = 0;
QListViewItemIterator it(skins_list); TQListViewItemIterator it(skins_list);
while (it.current()) while (it.current())
{ {

19
yakuake/src/skin_settings.h
Unescape View File

@ -22,9 +22,10 @@
class SkinSettings : public SkinSettingsUI class SkinSettings : public SkinSettingsUI
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit SkinSettings(QWidget* parent, const char* name=NULL, bool translucency = false); explicit SkinSettings(TQWidget* tqparent, const char* name=NULL, bool translucency = false);
~SkinSettings(); ~SkinSettings();
@ -37,20 +38,20 @@ class SkinSettings : public SkinSettingsUI
protected: protected:
void showEvent(QShowEvent* e); void showEvent(TQShowEvent* e);
private: private:
void checkForExistingSkin(); void checkForExistingSkin();
void failInstall(const QString& error); void failInstall(const TQString& error);
void cleanupAfterInstall(); void cleanupAfterInstall();
QString selected; TQString selected;
QString skins_dir; TQString skins_dir;
QString install_skin_file; TQString install_skin_file;
QString install_skin_name; TQString install_skin_name;
QStringList install_skin_file_list; TQStringList install_skin_file_list;
private slots: private slots:
@ -65,7 +66,7 @@ class SkinSettings : public SkinSettingsUI
void slotUpdateRemoveButton(); void slotUpdateRemoveButton();
void slotUpdateSkinSetting(); void slotUpdateSkinSetting();
void slotUpdateSelection(const QString&); void slotUpdateSelection(const TQString&);
}; };

18
yakuake/src/skin_settings_ui.ui
Unescape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>SkinSettingsUI</class> <class>SkinSettingsUI</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>SkinSettingsUI</cstring> <cstring>SkinSettingsUI</cstring>
</property> </property>
@ -24,7 +24,7 @@
<cstring>kcfg_skin</cstring> <cstring>kcfg_skin</cstring>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="2" column="1"> <widget class="TQPushButton" row="2" column="1">
<property name="name"> <property name="name">
<cstring>remove_button</cstring> <cstring>remove_button</cstring>
</property> </property>
@ -35,7 +35,7 @@
<string>Remove Skin</string> <string>Remove Skin</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="2" column="0"> <widget class="TQPushButton" row="2" column="0">
<property name="name"> <property name="name">
<cstring>install_button</cstring> <cstring>install_button</cstring>
</property> </property>
@ -43,15 +43,15 @@
<string>Install Skin...</string> <string>Install Skin...</string>
</property> </property>
</widget> </widget>
<widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>skinbglayout</cstring> <cstring>skinbgtqlayout</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>skinbgcolor_label</cstring> <cstring>skinbgcolor_label</cstring>
</property> </property>
@ -86,7 +86,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>290</width> <width>290</width>
<height>0</height> <height>0</height>
@ -115,8 +115,8 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>

60
yakuake/src/tab_bar.cpp
Unescape View File

@ -15,23 +15,23 @@
#include "tab_bar.moc" #include "tab_bar.moc"
#include "settings.h" #include "settings.h"
#include <qtooltip.h> #include <tqtooltip.h>
#include <qwhatsthis.h> #include <tqwhatsthis.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
TabBar::TabBar(QWidget* parent, const char* name, bool translucency, const QString & skin) TabBar::TabBar(TQWidget* tqparent, const char* name, bool translucency, const TQString & skin)
: TranslucentWidget(parent, name, translucency) : TranslucentWidget(tqparent, name, translucency)
{ {
loadSkin(skin); loadSkin(skin);
connect(plus_button, SIGNAL(clicked()), this, SIGNAL(addItem())); connect(plus_button, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(addItem()));
connect(minus_button, SIGNAL(clicked()), this, SIGNAL(removeItem())); connect(minus_button, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(removeItem()));
connect(tabs_widget, SIGNAL(itemSelected(int)), this, SIGNAL(itemSelected(int))); connect(tabs_widget, TQT_SIGNAL(itemSelected(int)), this, TQT_SIGNAL(itemSelected(int)));
connect(tabs_widget, SIGNAL(addItem()), this, SIGNAL(addItem())); connect(tabs_widget, TQT_SIGNAL(addItem()), this, TQT_SIGNAL(addItem()));
connect(this, SIGNAL(updateBackground()), this, SLOT(slotUpdateBackground())); connect(this, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(slotUpdateBackground()));
} }
TabBar::~TabBar() TabBar::~TabBar()
@ -63,12 +63,12 @@ int TabBar::removeItem(int session_id)
return tabs_widget->removeItem(session_id); return tabs_widget->removeItem(session_id);
} }
const QString TabBar::itemName(int session_id) const TQString TabBar::itemName(int session_id)
{ {
return tabs_widget->itemName(session_id); return tabs_widget->itemName(session_id);
} }
void TabBar::renameItem(int session_id, const QString& name) void TabBar::renameItem(int session_id, const TQString& name)
{ {
tabs_widget->renameItem(session_id, name); tabs_widget->renameItem(session_id, name);
} }
@ -118,9 +118,9 @@ void TabBar::slotMoveItemRight()
tabs_widget->moveItemRight(); tabs_widget->moveItemRight();
} }
void TabBar::paintEvent(QPaintEvent*) void TabBar::paintEvent(TQPaintEvent*)
{ {
QPainter painter(this); TQPainter painter(this);
erase(); erase();
@ -136,7 +136,7 @@ void TabBar::paintEvent(QPaintEvent*)
painter.end(); painter.end();
} }
void TabBar::resizeEvent(QResizeEvent*) void TabBar::resizeEvent(TQResizeEvent*)
{ {
plus_button->move(plus_position.x(), plus_position.y()); plus_button->move(plus_position.x(), plus_position.y());
minus_button->move(width() - minus_position.x(), minus_position.y()); minus_button->move(width() - minus_position.x(), minus_position.y());
@ -146,29 +146,29 @@ void TabBar::resizeEvent(QResizeEvent*)
tabs_widget->refreshBuffer(); tabs_widget->refreshBuffer();
} }
void TabBar::loadSkin(const QString& skin) void TabBar::loadSkin(const TQString& skin)
{ {
tabs_widget = new TabbedWidget(this, "Tabbed widget", useTranslucency()); tabs_widget = new TabbedWidget(this, "Tabbed widget", useTranslucency());
QWhatsThis::add(tabs_widget, i18n("The tab bar allows you to switch between sessions.")); TQWhatsThis::add(tabs_widget, i18n("The tab bar allows you to switch between sessions."));
connect(this, SIGNAL(updateBackground()), tabs_widget, SLOT(slotUpdateBackground())); connect(this, TQT_SIGNAL(updateBackground()), tabs_widget, TQT_SLOT(slotUpdateBackground()));
plus_button = new ImageButton(this, "Plus button", useTranslucency()); plus_button = new ImageButton(this, "Plus button", useTranslucency());
plus_button->setDelayedPopup(true); plus_button->setDelayedPopup(true);
QToolTip::add(plus_button, i18n("New Session")); TQToolTip::add(plus_button, i18n("New Session"));
QWhatsThis::add(plus_button, i18n("Adds a new session. Press and hold to select session type from menu.")); TQWhatsThis::add(plus_button, i18n("Adds a new session. Press and hold to select session type from menu."));
connect(this, SIGNAL(updateBackground()), plus_button, SLOT(slotUpdateBackground())); connect(this, TQT_SIGNAL(updateBackground()), plus_button, TQT_SLOT(slotUpdateBackground()));
minus_button = new ImageButton(this, "Minus button", useTranslucency()); minus_button = new ImageButton(this, "Minus button", useTranslucency());
QToolTip::add(minus_button, i18n("Close Session")); TQToolTip::add(minus_button, i18n("Close Session"));
QWhatsThis::add(minus_button, i18n("Closes the active session.")); TQWhatsThis::add(minus_button, i18n("Closes the active session."));
connect(this, SIGNAL(updateBackground()), minus_button, SLOT(slotUpdateBackground())); connect(this, TQT_SIGNAL(updateBackground()), minus_button, TQT_SLOT(slotUpdateBackground()));
setPixmaps(skin); setPixmaps(skin);
resize(width(), back_image.height()); resize(width(), back_image.height());
} }
void TabBar::reloadSkin(const QString& skin) void TabBar::reloadSkin(const TQString& skin)
{ {
setPixmaps(skin); setPixmaps(skin);
@ -180,15 +180,15 @@ void TabBar::reloadSkin(const QString& skin)
tabs_widget->move(tabs_position.x(), tabs_position.y()); tabs_widget->move(tabs_position.x(), tabs_position.y());
tabs_widget->resize(width() - 2 * tabs_position.x(), tabs_widget->height()); tabs_widget->resize(width() - 2 * tabs_position.x(), tabs_widget->height());
minus_button->repaint(); minus_button->tqrepaint();
plus_button->repaint(); plus_button->tqrepaint();
tabs_widget->refreshBuffer(); tabs_widget->refreshBuffer();
repaint(); tqrepaint();
} }
void TabBar::setPixmaps(const QString& skin) void TabBar::setPixmaps(const TQString& skin)
{ {
QUrl url(locate("appdata", skin + "/tabs.skin")); TQUrl url(locate("appdata", skin + "/tabs.skin"));
KConfig config(url.path()); KConfig config(url.path());
config.setGroup("Tabs"); config.setGroup("Tabs");
@ -196,7 +196,7 @@ void TabBar::setPixmaps(const QString& skin)
tabs_position.setX(config.readNumEntry("x", 20)); tabs_position.setX(config.readNumEntry("x", 20));
tabs_position.setY(config.readNumEntry("y", 0)); tabs_position.setY(config.readNumEntry("y", 0));
tabs_widget->setFontColor(QColor(config.readNumEntry("red", 255), tabs_widget->setFontColor(TQColor(config.readNumEntry("red", 255),
config.readNumEntry("green", 255), config.readNumEntry("green", 255),
config.readNumEntry("blue", 255))); config.readNumEntry("blue", 255)));

43
yakuake/src/tab_bar.h
Unescape View File

@ -19,11 +19,11 @@
#include "tabbed_widget.h" #include "tabbed_widget.h"
#include "translucent_widget.h" #include "translucent_widget.h"
#include <qurl.h> #include <tqurl.h>
#include <qcolor.h> #include <tqcolor.h>
#include <qpoint.h> #include <tqpoint.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qpainter.h> #include <tqpainter.h>
#include <kconfig.h> #include <kconfig.h>
#include <krootpixmap.h> #include <krootpixmap.h>
@ -33,10 +33,11 @@
class TabBar : public TranslucentWidget class TabBar : public TranslucentWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit TabBar(QWidget* parent = 0, const char* name = 0, explicit TabBar(TQWidget* tqparent = 0, const char* name = 0,
bool translucency = false, const QString& skin = "default"); bool translucency = false, const TQString& skin = "default");
~TabBar(); ~TabBar();
void setSessionMenu(KPopupMenu* menu); void setSessionMenu(KPopupMenu* menu);
@ -47,8 +48,8 @@ class TabBar : public TranslucentWidget
void addItem(int session_id); void addItem(int session_id);
int removeItem(int session_id); int removeItem(int session_id);
const QString itemName(int session_id); const TQString itemName(int session_id);
void renameItem(int session_id, const QString& name); void renameItem(int session_id, const TQString& name);
void interactiveRename(); void interactiveRename();
int tabPositionForSessionId(int session_id); int tabPositionForSessionId(int session_id);
@ -57,7 +58,7 @@ class TabBar : public TranslucentWidget
void selectItem(int session_id); void selectItem(int session_id);
void selectPosition(int position); void selectPosition(int position);
void reloadSkin(const QString& skin); void reloadSkin(const TQString& skin);
public slots: public slots:
@ -76,32 +77,32 @@ class TabBar : public TranslucentWidget
protected: protected:
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(TQPaintEvent*);
virtual void resizeEvent(QResizeEvent*); virtual void resizeEvent(TQResizeEvent*);
private: private:
void setPixmaps(const QString& skin); void setPixmaps(const TQString& skin);
void loadSkin(const QString& skin); void loadSkin(const TQString& skin);
/* Text properties */ /* Text properties */
QColor text_color; TQColor text_color;
/* Widget's pixmaps */ /* Widget's pixmaps */
QPixmap back_image; TQPixmap back_image;
QPixmap left_corner; TQPixmap left_corner;
QPixmap right_corner; TQPixmap right_corner;
/* Plus button */ /* Plus button */
QPoint plus_position; TQPoint plus_position;
ImageButton* plus_button; ImageButton* plus_button;
/* Minus button */ /* Minus button */
QPoint minus_position; TQPoint minus_position;
ImageButton* minus_button; ImageButton* minus_button;
/* Tabbed widget */ /* Tabbed widget */
QPoint tabs_position; TQPoint tabs_position;
TabbedWidget* tabs_widget; TabbedWidget* tabs_widget;
}; };

132
yakuake/src/tabbed_widget.cpp
Unescape View File

@ -15,8 +15,8 @@
#include "tabbed_widget.moc" #include "tabbed_widget.moc"
#include "settings.h" #include "settings.h"
#include <qcursor.h> #include <tqcursor.h>
#include <qwhatsthis.h> #include <tqwhatsthis.h>
#include <kaction.h> #include <kaction.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
@ -24,8 +24,8 @@
#include <kiconloader.h> #include <kiconloader.h>
TabbedWidget::TabbedWidget(QWidget* parent, const char* name, bool translucency) TabbedWidget::TabbedWidget(TQWidget* tqparent, const char* name, bool translucency)
: TranslucentWidget(parent, name, translucency) : TranslucentWidget(tqparent, name, translucency)
{ {
current_position = -1; current_position = -1;
pressed = false; pressed = false;
@ -36,16 +36,16 @@ TabbedWidget::TabbedWidget(QWidget* parent, const char* name, bool translucency)
if (root_pixmap) if (root_pixmap)
{ {
connect(root_pixmap, SIGNAL(backgroundUpdated(const QPixmap &)), this, SLOT(slotUpdateBuffer(const QPixmap &))); connect(root_pixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotUpdateBuffer(const TQPixmap &)));
root_pixmap->setCustomPainting(true); root_pixmap->setCustomPainting(true);
} }
inline_edit = new QLineEdit(this); inline_edit = new TQLineEdit(this);
inline_edit->hide(); inline_edit->hide();
connect(inline_edit, SIGNAL(returnPressed()), this, SLOT(slotRenameSelected())); connect(inline_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotRenameSelected()));
connect(inline_edit, SIGNAL(lostFocus()), inline_edit, SLOT(hide())); connect(inline_edit, TQT_SIGNAL(lostFocus()), inline_edit, TQT_SLOT(hide()));
connect(inline_edit, SIGNAL(lostFocus()), this, SLOT(slotResetEditedPosition())); connect(inline_edit, TQT_SIGNAL(lostFocus()), this, TQT_SLOT(slotResetEditedPosition()));
selected_font = font(); selected_font = font();
unselected_font = font(); unselected_font = font();
@ -68,26 +68,26 @@ void TabbedWidget::createContextMenu()
{ {
context_menu = new KPopupMenu(); context_menu = new KPopupMenu();
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("split_horizontally")->plug(context_menu); action("split_horizontally")->plug(context_menu);
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("split_vertically")->plug(context_menu); action("split_vertically")->plug(context_menu);
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("remove_terminal")->plug(context_menu); action("remove_terminal")->plug(context_menu);
context_menu->insertSeparator(); context_menu->insertSeparator();
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("move_tab_left")->plug(context_menu); action("move_tab_left")->plug(context_menu);
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("move_tab_right")->plug(context_menu); action("move_tab_right")->plug(context_menu);
context_menu->insertSeparator(); context_menu->insertSeparator();
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("edit_name")->plug(context_menu); action("edit_name")->plug(context_menu);
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("remove_tab")->plug(context_menu); action("remove_tab")->plug(context_menu);
} }
@ -101,14 +101,14 @@ void TabbedWidget::addItem(int session_id)
refreshBuffer(); refreshBuffer();
} }
QString TabbedWidget::defaultTabCaption(int id) TQString TabbedWidget::defaultTabCaption(int id)
{ {
return i18n("Shell", "Shell No. %n", id+1); return i18n("Shell", "Shell No. %n", id+1);
} }
QString TabbedWidget::lowestAvailableCaption() TQString TabbedWidget::lowestAvailableCaption()
{ {
QString newTitle = defaultTabCaption(0); TQString newTitle = defaultTabCaption(0);
bool nameOk; bool nameOk;
int count = 0; int count = 0;
@ -117,7 +117,7 @@ QString TabbedWidget::lowestAvailableCaption()
{ {
nameOk = true; nameOk = true;
QValueList<QString>::iterator it; TQValueList<TQString>::iterator it;
for (it = captions.begin(); it != captions.end(); ++it) for (it = captions.begin(); it != captions.end(); ++it)
{ {
@ -141,7 +141,7 @@ QString TabbedWidget::lowestAvailableCaption()
int TabbedWidget::removeItem(int session_id) int TabbedWidget::removeItem(int session_id)
{ {
uint position = items.findIndex(session_id); uint position = items.tqfindIndex(session_id);
items.remove(items.at(position)); items.remove(items.at(position));
areas.remove(areas.at(position)); areas.remove(areas.at(position));
@ -162,22 +162,22 @@ int TabbedWidget::removeItem(int session_id)
return current_position; return current_position;
} }
const QString TabbedWidget::itemName(int session_id) const TQString TabbedWidget::itemName(int session_id)
{ {
int position = items.findIndex(session_id); int position = items.tqfindIndex(session_id);
if (position == -1) return 0; if (position == -1) return 0;
return captions[position]; return captions[position];
} }
void TabbedWidget::renameItem(int session_id, const QString& namep) void TabbedWidget::renameItem(int session_id, const TQString& namep)
{ {
int position = items.findIndex(session_id); int position = items.tqfindIndex(session_id);
if (position == -1) return; if (position == -1) return;
QString name = namep.stripWhiteSpace(); TQString name = namep.stripWhiteSpace();
captions[position] = !name.isEmpty() ? name : captions[position]; captions[position] = !name.isEmpty() ? name : captions[position];
refreshBuffer(); refreshBuffer();
@ -210,7 +210,7 @@ void TabbedWidget::interactiveRename(int position)
inline_edit->setText(captions[position]); inline_edit->setText(captions[position]);
inline_edit->setGeometry(width, 0, areas[position], height()); inline_edit->setGeometry(width, 0, areas[position], height());
inline_edit->setAlignment(Qt::AlignHCenter); inline_edit->tqsetAlignment(TQt::AlignHCenter);
inline_edit->setFrame(false); inline_edit->setFrame(false);
inline_edit->selectAll(); inline_edit->selectAll();
inline_edit->setFocus(); inline_edit->setFocus();
@ -222,7 +222,7 @@ void TabbedWidget::slotRenameSelected()
{ {
if (edited_position >= 0 && edited_position < int(items.count())) if (edited_position >= 0 && edited_position < int(items.count()))
{ {
QString text = inline_edit->text().stripWhiteSpace(); TQString text = inline_edit->text().stripWhiteSpace();
captions[edited_position] = !text.isEmpty() ? text : captions[edited_position]; captions[edited_position] = !text.isEmpty() ? text : captions[edited_position];
inline_edit->hide(); inline_edit->hide();
@ -240,7 +240,7 @@ void TabbedWidget::slotResetEditedPosition()
int TabbedWidget::tabPositionForSessionId(int session_id) int TabbedWidget::tabPositionForSessionId(int session_id)
{ {
return items.findIndex(session_id); return items.tqfindIndex(session_id);
} }
int TabbedWidget::sessionIdForTabPosition(int position) int TabbedWidget::sessionIdForTabPosition(int position)
@ -253,7 +253,7 @@ int TabbedWidget::sessionIdForTabPosition(int position)
void TabbedWidget::selectItem(int session_id) void TabbedWidget::selectItem(int session_id)
{ {
int new_position = items.findIndex(session_id); int new_position = items.tqfindIndex(session_id);
if (new_position != -1) if (new_position != -1)
{ {
@ -315,10 +315,10 @@ void TabbedWidget::moveItemLeft(int position)
if (position > 0) if (position > 0)
{ {
int session_id = items[position]; int session_id = items[position];
QString caption = captions[position]; TQString caption = captions[position];
int neighbor_session_id = items[position-1]; int neighbor_session_id = items[position-1];
QString neighbor_caption = captions[position-1]; TQString neighbor_caption = captions[position-1];
items[position-1] = session_id; items[position-1] = session_id;
captions[position-1] = caption; captions[position-1] = caption;
@ -351,10 +351,10 @@ void TabbedWidget::moveItemRight(int position)
if (position < int(items.count()) - 1) if (position < int(items.count()) - 1)
{ {
int session_id = items[position]; int session_id = items[position];
QString caption = captions[position]; TQString caption = captions[position];
int neighbor_session_id = items[position+1]; int neighbor_session_id = items[position+1];
QString neighbor_caption = captions[position+1]; TQString neighbor_caption = captions[position+1];
items[position+1] = session_id; items[position+1] = session_id;
captions[position+1] = caption; captions[position+1] = caption;
@ -371,45 +371,45 @@ void TabbedWidget::moveItemRight(int position)
} }
} }
void TabbedWidget::setFontColor(const QColor & color) void TabbedWidget::setFontColor(const TQColor & color)
{ {
font_color = color; font_color = color;
} }
void TabbedWidget::setBackgroundPixmap(const QString & path) void TabbedWidget::setBackgroundPixmap(const TQString & path)
{ {
background_image.load(path); background_image.load(path);
resize(width(), background_image.height()); resize(width(), background_image.height());
repaint(); tqrepaint();
} }
void TabbedWidget::setSeparatorPixmap(const QString & path) void TabbedWidget::setSeparatorPixmap(const TQString & path)
{ {
separator_image.load(path); separator_image.load(path);
} }
void TabbedWidget::setUnselectedPixmap(const QString & path) void TabbedWidget::setUnselectedPixmap(const TQString & path)
{ {
unselected_image.load(path); unselected_image.load(path);
} }
void TabbedWidget::setSelectedPixmap(const QString & path) void TabbedWidget::setSelectedPixmap(const TQString & path)
{ {
selected_image.load(path); selected_image.load(path);
} }
void TabbedWidget::setSelectedLeftPixmap(const QString & path) void TabbedWidget::setSelectedLeftPixmap(const TQString & path)
{ {
selected_left_image.load(path); selected_left_image.load(path);
} }
void TabbedWidget::setSelectedRightPixmap(const QString & path) void TabbedWidget::setSelectedRightPixmap(const TQString & path)
{ {
selected_right_image.load(path); selected_right_image.load(path);
} }
void TabbedWidget::keyPressEvent(QKeyEvent* e) void TabbedWidget::keyPressEvent(TQKeyEvent* e)
{ {
if (e->key() == Key_Escape && inline_edit->isShown()) if (e->key() == Key_Escape && inline_edit->isShown())
{ {
@ -417,10 +417,10 @@ void TabbedWidget::keyPressEvent(QKeyEvent* e)
edited_position = -1; edited_position = -1;
} }
QWidget::keyPressEvent(e); TQWidget::keyPressEvent(e);
} }
void TabbedWidget::wheelEvent(QWheelEvent* e) void TabbedWidget::wheelEvent(TQWheelEvent* e)
{ {
if (e->delta() < 0) if (e->delta() < 0)
selectNextItem(); selectNextItem();
@ -428,9 +428,9 @@ void TabbedWidget::wheelEvent(QWheelEvent* e)
selectPreviousItem(); selectPreviousItem();
} }
void TabbedWidget::mousePressEvent(QMouseEvent* e) void TabbedWidget::mousePressEvent(TQMouseEvent* e)
{ {
if (QWhatsThis::inWhatsThisMode()) return; if (TQWhatsThis::inWhatsThisMode()) return;
int position; int position;
int width; int width;
@ -452,23 +452,23 @@ void TabbedWidget::mousePressEvent(QMouseEvent* e)
if (!context_menu) createContextMenu(); if (!context_menu) createContextMenu();
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("move_tab_left")->setEnabled((position - 1 > 0)); action("move_tab_left")->setEnabled((position - 1 > 0));
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("move_tab_right")->setEnabled((position - 1 < int(items.count()) - 1)); action("move_tab_right")->setEnabled((position - 1 < int(items.count()) - 1));
context_menu->exec(QCursor::pos()); context_menu->exec(TQCursor::pos());
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("move_tab_left")->setEnabled(true); action("move_tab_left")->setEnabled(true);
static_cast<KMainWindow*>(parent()->parent())->actionCollection()-> static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
action("move_tab_right")->setEnabled(true); action("move_tab_right")->setEnabled(true);
} }
} }
void TabbedWidget::mouseReleaseEvent(QMouseEvent* e) void TabbedWidget::mouseReleaseEvent(TQMouseEvent* e)
{ {
if (QWhatsThis::inWhatsThisMode()) return; if (TQWhatsThis::inWhatsThisMode()) return;
int position; int position;
int width; int width;
@ -494,9 +494,9 @@ void TabbedWidget::mouseReleaseEvent(QMouseEvent* e)
pressed = false; pressed = false;
} }
void TabbedWidget::mouseDoubleClickEvent(QMouseEvent* e) void TabbedWidget::mouseDoubleClickEvent(TQMouseEvent* e)
{ {
if (QWhatsThis::inWhatsThisMode()) return; if (TQWhatsThis::inWhatsThisMode()) return;
int position; int position;
int width; int width;
@ -517,14 +517,14 @@ void TabbedWidget::mouseDoubleClickEvent(QMouseEvent* e)
emit addItem(); emit addItem();
} }
void TabbedWidget::leaveEvent(QEvent* e) void TabbedWidget::leaveEvent(TQEvent* e)
{ {
pressed = false; pressed = false;
QWidget::leaveEvent(e); TQWidget::leaveEvent(e);
} }
void TabbedWidget::paintEvent(QPaintEvent*) void TabbedWidget::paintEvent(TQPaintEvent*)
{ {
bitBlt(this, 0, 0, &buffer_image); bitBlt(this, 0, 0, &buffer_image);
} }
@ -534,7 +534,7 @@ void TabbedWidget::refreshBuffer()
/* Refreshes the back buffer. */ /* Refreshes the back buffer. */
int x = 0; int x = 0;
QPainter painter; TQPainter painter;
buffer_image.resize(size()); buffer_image.resize(size());
painter.begin(&buffer_image); painter.begin(&buffer_image);
@ -551,15 +551,15 @@ void TabbedWidget::refreshBuffer()
painter.end(); painter.end();
repaint(); tqrepaint();
} }
const int TabbedWidget::drawButton(int position, QPainter& painter) const int TabbedWidget::drawButton(int position, TQPainter& painter)
{ {
/* Draws the tab buttons. */ /* Draws the tab buttons. */
static int x = 0; static int x = 0;
QPixmap tmp_pixmap; TQPixmap tmp_pixmap;
areas[position] = 0; areas[position] = 0;
x = (!position) ? 0 : x; x = (!position) ? 0 : x;
@ -580,7 +580,7 @@ const int TabbedWidget::drawButton(int position, QPainter& painter)
// Draw the main contents. // Draw the main contents.
int width; int width;
QFontMetrics metrics(painter.font()); TQFontMetrics metrics(painter.font());
width = metrics.width(captions[position]) + 10; width = metrics.width(captions[position]) + 10;
@ -588,7 +588,7 @@ const int TabbedWidget::drawButton(int position, QPainter& painter)
painter.drawTiledPixmap(x, 0, width, height(), tmp_pixmap); painter.drawTiledPixmap(x, 0, width, height(), tmp_pixmap);
painter.drawText(x, 0, width + 1, height() + 1, painter.drawText(x, 0, width + 1, height() + 1,
Qt::AlignHCenter | Qt::AlignVCenter, captions[position]); TQt::AlignHCenter | TQt::AlignVCenter, captions[position]);
areas[position] += width; areas[position] += width;
x += width; x += width;
@ -610,7 +610,7 @@ const int TabbedWidget::drawButton(int position, QPainter& painter)
return x; return x;
} }
void TabbedWidget::slotUpdateBuffer(const QPixmap& pixmap) void TabbedWidget::slotUpdateBuffer(const TQPixmap& pixmap)
{ {
desktop_image = pixmap; desktop_image = pixmap;

89
yakuake/src/tabbed_widget.h
Unescape View File

@ -17,14 +17,14 @@
#include "translucent_widget.h" #include "translucent_widget.h"
#include <qfont.h> #include <tqfont.h>
#include <qcolor.h> #include <tqcolor.h>
#include <qpoint.h> #include <tqpoint.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qpainter.h> #include <tqpainter.h>
#include <qlineedit.h> #include <tqlineedit.h>
#include <qvaluelist.h> #include <tqvaluelist.h>
#include <qfontmetrics.h> #include <tqfontmetrics.h>
#include <klocale.h> #include <klocale.h>
#include <krootpixmap.h> #include <krootpixmap.h>
@ -36,9 +36,10 @@ class KPopupMenu;
class TabbedWidget : public TranslucentWidget class TabbedWidget : public TranslucentWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit TabbedWidget(QWidget* parent = 0, const char* name = 0, bool translucency = false); explicit TabbedWidget(TQWidget* tqparent = 0, const char* name = 0, bool translucency = false);
~TabbedWidget(); ~TabbedWidget();
int pressedPosition(); int pressedPosition();
@ -62,21 +63,21 @@ class TabbedWidget : public TranslucentWidget
void moveItemRight(); void moveItemRight();
void moveItemRight(int position); void moveItemRight(int position);
const QString itemName(int session_id); const TQString itemName(int session_id);
void renameItem(int session_id, const QString& name); void renameItem(int session_id, const TQString& name);
void interactiveRename(); void interactiveRename();
void interactiveRename(int position); void interactiveRename(int position);
void setFontColor(const QColor& color); void setFontColor(const TQColor& color);
void setBackgroundPixmap(const QString& path); void setBackgroundPixmap(const TQString& path);
void setSeparatorPixmap(const QString& path); void setSeparatorPixmap(const TQString& path);
void setUnselectedPixmap(const QString& path); void setUnselectedPixmap(const TQString& path);
void setSelectedPixmap(const QString& path); void setSelectedPixmap(const TQString& path);
void setSelectedLeftPixmap(const QString& path); void setSelectedLeftPixmap(const TQString& path);
void setSelectedRightPixmap(const QString& path); void setSelectedRightPixmap(const TQString& path);
void refreshBuffer(); void refreshBuffer();
@ -87,23 +88,23 @@ class TabbedWidget : public TranslucentWidget
protected: protected:
virtual void keyPressEvent(QKeyEvent*); virtual void keyPressEvent(TQKeyEvent*);
virtual void wheelEvent(QWheelEvent*); virtual void wheelEvent(TQWheelEvent*);
virtual void mousePressEvent(QMouseEvent*); virtual void mousePressEvent(TQMouseEvent*);
virtual void mouseReleaseEvent(QMouseEvent*); virtual void mouseReleaseEvent(TQMouseEvent*);
virtual void mouseDoubleClickEvent(QMouseEvent*); virtual void mouseDoubleClickEvent(TQMouseEvent*);
virtual void leaveEvent(QEvent*); virtual void leaveEvent(TQEvent*);
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(TQPaintEvent*);
private: private:
void createContextMenu(); void createContextMenu();
const int drawButton(int position, QPainter& painter); const int drawButton(int position, TQPainter& painter);
QString defaultTabCaption(int session_id); TQString defaultTabCaption(int session_id);
QString lowestAvailableCaption(); TQString lowestAvailableCaption();
int current_position; int current_position;
bool pressed; bool pressed;
@ -111,38 +112,38 @@ class TabbedWidget : public TranslucentWidget
int edited_position; int edited_position;
/* Tabs properties */ /* Tabs properties */
QColor font_color; TQColor font_color;
QFont selected_font; TQFont selected_font;
QFont unselected_font; TQFont unselected_font;
/* Inline renaming */ /* Inline renaming */
QLineEdit* inline_edit; TQLineEdit* inline_edit;
/* Widget's pixmaps */ /* Widget's pixmaps */
QPixmap background_image; TQPixmap background_image;
QPixmap separator_image; TQPixmap separator_image;
QPixmap unselected_image; TQPixmap unselected_image;
QPixmap selected_image; TQPixmap selected_image;
QPixmap selected_left_image; TQPixmap selected_left_image;
QPixmap selected_right_image; TQPixmap selected_right_image;
/* Widget's appearance */ /* Widget's appearance */
QPixmap buffer_image; TQPixmap buffer_image;
QPixmap desktop_image; TQPixmap desktop_image;
/* Tabs value lists */ /* Tabs value lists */
QValueList<int> items; TQValueList<int> items;
QValueList<int> areas; TQValueList<int> areas;
QValueList<QString> captions; TQValueList<TQString> captions;
KPopupMenu* context_menu; KPopupMenu* context_menu;
private slots: private slots:
void slotRenameSelected(); void slotRenameSelected();
void slotUpdateBuffer(const QPixmap& pixmap); void slotUpdateBuffer(const TQPixmap& pixmap);
void slotResetEditedPosition(); void slotResetEditedPosition();
}; };

20
yakuake/src/terminal.cpp
Unescape View File

@ -17,12 +17,12 @@
int Terminal::available_terminal_id = 0; int Terminal::available_terminal_id = 0;
Terminal::Terminal(QWidget* parent, const char* name) : QObject(parent, name) Terminal::Terminal(TQWidget* tqparent, const char* name) : TQObject(tqparent, name)
{ {
terminal_id = available_terminal_id; terminal_id = available_terminal_id;
available_terminal_id++; available_terminal_id++;
setenv("DCOP_YAKUAKE_TERMINAL", QString::number(terminal_id).ascii(), 1); setenv("DCOP_YAKUAKE_TERMINAL", TQString::number(terminal_id).ascii(), 1);
putenv((char*)"COLORTERM="); // Trigger mc's color detection. putenv((char*)"COLORTERM="); // Trigger mc's color detection.
KLibFactory* factory = NULL; KLibFactory* factory = NULL;
@ -33,16 +33,16 @@ Terminal::Terminal(QWidget* parent, const char* name) : QObject(parent, name)
terminal_interface = NULL; terminal_interface = NULL;
if ((factory = KLibLoader::self()->factory("libkonsolepart")) != NULL) if ((factory = KLibLoader::self()->factory("libkonsolepart")) != NULL)
terminal_part = (KParts::Part *) (factory->create(parent)); terminal_part = (KParts::Part *) (factory->create(TQT_TQOBJECT(tqparent)));
if (terminal_part != NULL) if (terminal_part != NULL)
{ {
terminal_widget = terminal_part->widget(); terminal_widget = terminal_part->widget();
terminal_widget->setFocusPolicy(QWidget::WheelFocus); terminal_widget->setFocusPolicy(TQ_WheelFocus);
terminal_interface = (TerminalInterface *) (terminal_part->qt_cast("TerminalInterface")); terminal_interface = (TerminalInterface *) (terminal_part->qt_cast("TerminalInterface"));
connect(terminal_part, SIGNAL(destroyed()), this, SLOT(deleteLater())); connect(terminal_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteLater()));
connect(terminal_part, SIGNAL(setWindowCaption(const QString &)), this, SLOT(slotUpdateSessionTitle(const QString &))); connect(terminal_part, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(slotUpdateSessionTitle(const TQString &)));
} }
} }
@ -51,7 +51,7 @@ Terminal::~Terminal()
emit destroyed(terminal_id); emit destroyed(terminal_id);
} }
QWidget* Terminal::widget() TQWidget* Terminal::widget()
{ {
return terminal_widget; return terminal_widget;
} }
@ -61,17 +61,17 @@ TerminalInterface* Terminal::terminal()
return terminal_interface; return terminal_interface;
} }
const QString Terminal::title() const TQString Terminal::title()
{ {
return terminal_title; return terminal_title;
} }
void Terminal::setTitle(const QString& title) void Terminal::setTitle(const TQString& title)
{ {
slotUpdateSessionTitle(title); slotUpdateSessionTitle(title);
} }
void Terminal::slotUpdateSessionTitle(const QString& title) void Terminal::slotUpdateSessionTitle(const TQString& title)
{ {
terminal_title = title; terminal_title = title;

23
yakuake/src/terminal.h
Unescape View File

@ -17,35 +17,36 @@
#include <stdlib.h> #include <stdlib.h>
#include <qobject.h> #include <tqobject.h>
#include <qwidget.h> #include <tqwidget.h>
#include <klibloader.h> #include <klibloader.h>
#include <kparts/part.h> #include <kparts/part.h>
#include <kde_terminal_interface.h> #include <kde_terminal_interface.h>
class Terminal : public QObject class Terminal : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit Terminal(QWidget* parent = 0, const char* name = 0); explicit Terminal(TQWidget* tqparent = 0, const char* name = 0);
virtual ~Terminal(); virtual ~Terminal();
int id() { return terminal_id; } int id() { return terminal_id; }
QWidget* widget(); TQWidget* widget();
TerminalInterface* terminal(); TerminalInterface* terminal();
const QString title(); const TQString title();
void setTitle(const QString& title); void setTitle(const TQString& title);
signals: signals:
void destroyed(int); void destroyed(int);
void titleChanged(QWidget*, const QString&); void titleChanged(TQWidget*, const TQString&);
private: private:
@ -53,13 +54,13 @@ class Terminal : public QObject
int terminal_id; int terminal_id;
KParts::Part* terminal_part; KParts::Part* terminal_part;
QString terminal_title; TQString terminal_title;
QWidget* terminal_widget; TQWidget* terminal_widget;
TerminalInterface* terminal_interface; TerminalInterface* terminal_interface;
private slots: private slots:
void slotUpdateSessionTitle(const QString &); void slotUpdateSessionTitle(const TQString &);
}; };
#endif /* TERMINAL_H */ #endif /* TERMINAL_H */

8
yakuake/src/terminal_focus_watcher.cpp
Unescape View File

@ -14,8 +14,8 @@
#include "terminal_focus_watcher.moc" #include "terminal_focus_watcher.moc"
TerminalFocusWatcher::TerminalFocusWatcher(QObject* parent, const char* name) TerminalFocusWatcher::TerminalFocusWatcher(TQObject* tqparent, const char* name)
: QObject(parent, name) : TQObject(tqparent, name)
{ {
} }
@ -23,9 +23,9 @@ TerminalFocusWatcher::~TerminalFocusWatcher()
{ {
} }
bool TerminalFocusWatcher::eventFilter (QObject* /* watched */, QEvent* e) bool TerminalFocusWatcher::eventFilter (TQObject* /* watched */, TQEvent* e)
{ {
if (e->type() == QEvent::FocusIn) if (e->type() == TQEvent::FocusIn)
emit focusChanged(); emit focusChanged();
return false; return false;

9
yakuake/src/terminal_focus_watcher.h
Unescape View File

@ -14,18 +14,19 @@
#define TERMINAL_FOCUS_WATCHER_H #define TERMINAL_FOCUS_WATCHER_H
#include <qobject.h> #include <tqobject.h>
class TerminalFocusWatcher : public QObject class TerminalFocusWatcher : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit TerminalFocusWatcher(QObject* parent = 0, const char* name = 0); explicit TerminalFocusWatcher(TQObject* tqparent = 0, const char* name = 0);
virtual ~TerminalFocusWatcher(); virtual ~TerminalFocusWatcher();
virtual bool eventFilter (QObject* watched, QEvent* e); virtual bool eventFilter (TQObject* watched, TQEvent* e);
signals: signals:

30
yakuake/src/terminal_splitter.cpp
Unescape View File

@ -13,11 +13,11 @@
#include "terminal_splitter.h" #include "terminal_splitter.h"
#include "terminal_splitter.moc" #include "terminal_splitter.moc"
#include <qobjectlist.h> #include <tqobjectlist.h>
TerminalSplitter::TerminalSplitter(Orientation o, QWidget* parent, const char* name) TerminalSplitter::TerminalSplitter(Qt::Orientation o, TQWidget* tqparent, const char* name)
: QSplitter(o, parent, name) : TQSplitter(o, tqparent, name)
{ {
is_shutting_down = false; is_shutting_down = false;
} }
@ -47,7 +47,7 @@ void TerminalSplitter::focusLast()
if (terminalCount(true) == 1) if (terminalCount(true) == 1)
{ {
QWidget* w = static_cast<QWidget*>(child(0, QCString("TEWidget"), true)); TQWidget* w = TQT_TQWIDGET(child(0, TQCString("TEWidget"), true));
if (w) w->setFocus(); if (w) w->setFocus();
} }
else else
@ -64,15 +64,15 @@ int TerminalSplitter::count()
int TerminalSplitter::terminalCount(bool recursive) int TerminalSplitter::terminalCount(bool recursive)
{ {
return queryList(QCString("TEWidget"), 0, false, recursive)->count(); return queryList(TQCString("TEWidget"), 0, false, recursive)->count();
} }
int TerminalSplitter::splitterCount(bool recursive) int TerminalSplitter::splitterCount(bool recursive)
{ {
return queryList(QCString("TerminalSplitter"), 0, false, recursive)->count(); return queryList(TQCString("TerminalSplitter"), 0, false, recursive)->count();
} }
bool TerminalSplitter::isFirst(QWidget* w) bool TerminalSplitter::isFirst(TQWidget* w)
{ {
/* Return whether the widget w is the first in the splitter. */ /* Return whether the widget w is the first in the splitter. */
@ -86,14 +86,14 @@ void TerminalSplitter::recursiveCleanup()
{ {
/* Clean away empty splitters after a terminal was removed. */ /* Clean away empty splitters after a terminal was removed. */
QObjectList* list = queryList("TerminalSplitter", 0, false, false); TQObjectList* list = queryList("TerminalSplitter", 0, false, false);
QObjectListIt it(*list); TQObjectListIt it(*list);
QObject *obj; TQObject *obj;
while ((obj = it.current()) != 0) while ((obj = it.current()) != 0)
{ {
++it; ++it;
TerminalSplitter* splitter = static_cast<TerminalSplitter*>(obj); TerminalSplitter* splitter = static_cast<TerminalSplitter*>(TQT_TQWIDGET(obj));
splitter->recursiveCleanup(); splitter->recursiveCleanup();
} }
@ -102,20 +102,20 @@ void TerminalSplitter::recursiveCleanup()
else else
{ {
// Update minimum sizes. // Update minimum sizes.
if (orientation() == TerminalSplitter::Horizontal) if (orientation() == Qt::Horizontal)
{ {
int minimumWidth = (terminalCount() > 1) ? int minimumWidth = (terminalCount() > 1) ?
terminalCount()*150+handleWidth() : terminalCount()*150; terminalCount()*150+handleWidth() : terminalCount()*150;
setMinimumSize(QSize(minimumWidth, minimumHeight())); setMinimumSize(TQSize(minimumWidth, minimumHeight()));
} }
else if (orientation() == TerminalSplitter::Vertical) else if (orientation() == Qt::Vertical)
{ {
int minimumHeight = (terminalCount() > 1) ? int minimumHeight = (terminalCount() > 1) ?
terminalCount()*70+handleWidth() : terminalCount()*70; terminalCount()*70+handleWidth() : terminalCount()*70;
setMinimumSize(QSize(minimumWidth(), minimumHeight)); setMinimumSize(TQSize(minimumWidth(), minimumHeight));
} }
} }
} }

9
yakuake/src/terminal_splitter.h
Unescape View File

@ -14,15 +14,16 @@
#define TERMINAL_SPLITTER_H #define TERMINAL_SPLITTER_H
#include <qsplitter.h> #include <tqsplitter.h>
class TerminalSplitter : public QSplitter class TerminalSplitter : public TQSplitter
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit TerminalSplitter(Orientation o, QWidget* parent=0, const char* name=0); explicit TerminalSplitter(Qt::Orientation o, TQWidget* tqparent=0, const char* name=0);
~TerminalSplitter(); ~TerminalSplitter();
void focusNext(); void focusNext();
@ -33,7 +34,7 @@ class TerminalSplitter : public QSplitter
int terminalCount(bool recursive = false); int terminalCount(bool recursive = false);
int splitterCount(bool recursive = false); int splitterCount(bool recursive = false);
bool isFirst(QWidget * w); bool isFirst(TQWidget * w);
void recursiveCleanup(); void recursiveCleanup();

58
yakuake/src/title_bar.cpp
Unescape View File

@ -14,20 +14,20 @@
#include "title_bar.h" #include "title_bar.h"
#include "title_bar.moc" #include "title_bar.moc"
#include <qtooltip.h> #include <tqtooltip.h>
#include <qwhatsthis.h> #include <tqwhatsthis.h>
#include <klocale.h> #include <klocale.h>
TitleBar::TitleBar(QWidget * parent, const char * name, const QString & skin) : QWidget(parent, name) TitleBar::TitleBar(TQWidget * tqparent, const char * name, const TQString & skin) : TQWidget(tqparent, name)
{ {
QWhatsThis::add(this, i18n("The title bar displays the session title if available.")); TQWhatsThis::add(this, i18n("The title bar displays the session title if available."));
loadSkin(skin); loadSkin(skin);
connect(focus_button, SIGNAL(toggled(bool)), parent, SLOT(slotSetFocusPolicy(bool))); connect(focus_button, TQT_SIGNAL(toggled(bool)), tqparent, TQT_SLOT(slotSetFocusPolicy(bool)));
connect(quit_button, SIGNAL(clicked()), parent, SLOT(close())); connect(quit_button, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(close()));
} }
TitleBar::~TitleBar() TitleBar::~TitleBar()
@ -37,18 +37,18 @@ TitleBar::~TitleBar()
delete quit_button; delete quit_button;
} }
QRegion& TitleBar::getWidgetMask() TQRegion& TitleBar::getWidgetMask()
{ {
return mask; return tqmask;
} }
void TitleBar::setTitleText(const QString& title) void TitleBar::setTitleText(const TQString& title)
{ {
if (title == title_text) if (title == title_text)
return; return;
title_text = title; title_text = title;
repaint(); tqrepaint();
} }
void TitleBar::setFocusButtonEnabled(bool enable) void TitleBar::setFocusButtonEnabled(bool enable)
@ -61,10 +61,10 @@ void TitleBar::setConfigurationMenu(KPopupMenu* menu)
config_button->setPopupMenu(menu); config_button->setPopupMenu(menu);
} }
void TitleBar::paintEvent(QPaintEvent*) void TitleBar::paintEvent(TQPaintEvent*)
{ {
QPainter painter(this); TQPainter painter(this);
QFont font(painter.font()); TQFont font(painter.font());
painter.drawTiledPixmap(0, 0, width(), height(), back_image); painter.drawTiledPixmap(0, 0, width(), height(), back_image);
@ -72,7 +72,7 @@ void TitleBar::paintEvent(QPaintEvent*)
painter.drawPixmap(width() - right_corner.width(), 0, right_corner); painter.drawPixmap(width() - right_corner.width(), 0, right_corner);
// Add " - " divider between title and skin text. // Add " - " divider between title and skin text.
QString title_postfix(skin_text); TQString title_postfix(skin_text);
if (!title_postfix.isEmpty() && !title_text.isEmpty()) if (!title_postfix.isEmpty() && !title_text.isEmpty())
title_postfix.prepend(" - "); title_postfix.prepend(" - ");
@ -84,7 +84,7 @@ void TitleBar::paintEvent(QPaintEvent*)
painter.end(); painter.end();
} }
void TitleBar::resizeEvent(QResizeEvent *) void TitleBar::resizeEvent(TQResizeEvent *)
{ {
updateWidgetMask(); updateWidgetMask();
@ -93,24 +93,24 @@ void TitleBar::resizeEvent(QResizeEvent *)
quit_button->move(width() - quit_position.x(), quit_position.y()); quit_button->move(width() - quit_position.x(), quit_position.y());
} }
void TitleBar::loadSkin(const QString& skin) void TitleBar::loadSkin(const TQString& skin)
{ {
focus_button = new ImageButton(this, "Focus button"); focus_button = new ImageButton(this, "Focus button");
focus_button->setToggleButton(true); focus_button->setToggleButton(true);
QToolTip::add(focus_button, i18n("Keep open when focus is lost")); TQToolTip::add(focus_button, i18n("Keep open when focus is lost"));
config_button = new ImageButton(this, "Configuration button"); config_button = new ImageButton(this, "Configuration button");
QToolTip::add(config_button, i18n("Open Menu")); TQToolTip::add(config_button, i18n("Open Menu"));
quit_button = new ImageButton(this, "Quit button"); quit_button = new ImageButton(this, "Quit button");
QToolTip::add(quit_button, i18n("Quit")); TQToolTip::add(quit_button, i18n("Quit"));
setPixmaps(skin); setPixmaps(skin);
resize(width(), back_image.height()); resize(width(), back_image.height());
} }
void TitleBar::reloadSkin(const QString& skin) void TitleBar::reloadSkin(const TQString& skin)
{ {
setPixmaps(skin); setPixmaps(skin);
@ -122,14 +122,14 @@ void TitleBar::reloadSkin(const QString& skin)
updateWidgetMask(); updateWidgetMask();
repaint(); tqrepaint();
} }
void TitleBar::setPixmaps(const QString& skin) void TitleBar::setPixmaps(const TQString& skin)
{ {
/* Initialize the skin objects. */ /* Initialize the skin objects. */
QUrl url(locate("appdata", skin + "/title.skin")); TQUrl url(locate("appdata", skin + "/title.skin"));
KConfig config(url.path()); KConfig config(url.path());
// Load the text information. // Load the text information.
@ -181,12 +181,12 @@ void TitleBar::setPixmaps(const QString& skin)
void TitleBar::updateWidgetMask() void TitleBar::updateWidgetMask()
{ {
QRegion temp_mask; TQRegion temp_tqmask;
mask = QRegion(*left_corner.mask()); tqmask = TQRegion(*left_corner.tqmask());
mask += QRegion(QRect(QPoint(left_corner.width(), 0), QPoint(width() - right_corner.width() - 1, height() - 1))); tqmask += TQRegion(TQRect(TQPoint(left_corner.width(), 0), TQPoint(width() - right_corner.width() - 1, height() - 1)));
temp_mask = QRegion(*right_corner.mask()); temp_tqmask = TQRegion(*right_corner.tqmask());
temp_mask.translate(width() - right_corner.width(), 0); temp_tqmask.translate(width() - right_corner.width(), 0);
mask += temp_mask; tqmask += temp_tqmask;
} }

59
yakuake/src/title_bar.h
Unescape View File

@ -16,14 +16,14 @@
#include "image_button.h" #include "image_button.h"
#include <qurl.h> #include <tqurl.h>
#include <qcolor.h> #include <tqcolor.h>
#include <qpoint.h> #include <tqpoint.h>
#include <qbitmap.h> #include <tqbitmap.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qwidget.h> #include <tqwidget.h>
#include <qpainter.h> #include <tqpainter.h>
#include <qpushbutton.h> #include <tqpushbutton.h>
#include <kconfig.h> #include <kconfig.h>
@ -32,59 +32,60 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
class TitleBar : public QWidget class TitleBar : public TQWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit TitleBar(QWidget * parent = 0, const char * name = 0, const QString & skin = "default"); explicit TitleBar(TQWidget * tqparent = 0, const char * name = 0, const TQString & skin = "default");
~TitleBar(); ~TitleBar();
QRegion& getWidgetMask(); TQRegion& getWidgetMask();
void setTitleText(const QString& title); void setTitleText(const TQString& title);
void setFocusButtonEnabled(bool enable); void setFocusButtonEnabled(bool enable);
void setConfigurationMenu(KPopupMenu* menu); void setConfigurationMenu(KPopupMenu* menu);
void reloadSkin(const QString& skin); void reloadSkin(const TQString& skin);
protected: protected:
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(TQPaintEvent*);
virtual void resizeEvent(QResizeEvent*); virtual void resizeEvent(TQResizeEvent*);
private: private:
void setPixmaps(const QString& skin); void setPixmaps(const TQString& skin);
void loadSkin(const QString& skin); void loadSkin(const TQString& skin);
void updateWidgetMask(); void updateWidgetMask();
/* Widget's mask */ /* Widget's tqmask */
QRegion mask; TQRegion tqmask;
/* Text properties */ /* Text properties */
QString title_text; TQString title_text;
QString skin_text; TQString skin_text;
QColor text_color; TQColor text_color;
QPoint text_position; TQPoint text_position;
/* Widget's pixmaps */ /* Widget's pixmaps */
QPixmap back_image; TQPixmap back_image;
QPixmap left_corner; TQPixmap left_corner;
QPixmap right_corner; TQPixmap right_corner;
/* Quit button */ /* Quit button */
QPoint quit_position; TQPoint quit_position;
ImageButton* quit_button; ImageButton* quit_button;
/* Focus button */ /* Focus button */
QPoint focus_position; TQPoint focus_position;
ImageButton* focus_button; ImageButton* focus_button;
/* Configure button */ /* Configure button */
QPoint config_position; TQPoint config_position;
ImageButton* config_button; ImageButton* config_button;
}; };

4
yakuake/src/translucent_widget.cpp
Unescape View File

@ -16,7 +16,7 @@
#include <krootpixmap.h> #include <krootpixmap.h>
TranslucentWidget::TranslucentWidget(QWidget* parent, const char* name, bool translucency) : QWidget(parent, name) TranslucentWidget::TranslucentWidget(TQWidget* tqparent, const char* name, bool translucency) : TQWidget(tqparent, name)
{ {
use_translucency = translucency; use_translucency = translucency;
@ -40,5 +40,5 @@ void TranslucentWidget::slotUpdateBackground()
// This is wired up to KApplication::backgroundChanged and needed // This is wired up to KApplication::backgroundChanged and needed
// to kick KRootPixmap into updating the background again, which // to kick KRootPixmap into updating the background again, which
// it likes to forget after having been moved off-screen. // it likes to forget after having been moved off-screen.
if (root_pixmap) root_pixmap->repaint(true); if (root_pixmap) root_pixmap->tqrepaint(true);
} }

7
yakuake/src/translucent_widget.h
Unescape View File

@ -14,18 +14,19 @@
#define TRANSLUCENT_WIDGET_H #define TRANSLUCENT_WIDGET_H
#include <qwidget.h> #include <tqwidget.h>
class KRootPixmap; class KRootPixmap;
class TranslucentWidget : public QWidget class TranslucentWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
explicit TranslucentWidget(QWidget* parent = 0, const char* name = 0, bool translucency = false); explicit TranslucentWidget(TQWidget* tqparent = 0, const char* name = 0, bool translucency = false);
virtual ~TranslucentWidget(); virtual ~TranslucentWidget();

Write Preview
Loading…
Cancel
Save