summaryrefslogtreecommitdiffstats
path: root/kicker/taskmanager
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/taskmanager')
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp8
-rw-r--r--kicker/taskmanager/tasklmbmenu.h4
-rw-r--r--kicker/taskmanager/taskmanager.cpp36
-rw-r--r--kicker/taskmanager/taskmanager.h14
-rw-r--r--kicker/taskmanager/taskrmbmenu.cpp107
-rw-r--r--kicker/taskmanager/taskrmbmenu.h4
6 files changed, 90 insertions, 83 deletions
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 1be54ca8b..79c809e39 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -99,7 +99,7 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char *
setAcceptDrops(true); // Always enabled to activate task during drag&drop.
m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer");
- connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
+ connect(m_dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch()));
}
void TaskLMBMenu::fillMenu()
@@ -118,7 +118,7 @@ void TaskLMBMenu::fillMenu()
t->isIconified(),
t->demandsAttention());
int id = insertItem(TQIconSet(t->pixmap()), menuItem);
- connectItem(id, t, TQT_SLOT(activateRaiseOrIconify()));
+ connectItem(id, t, TQ_SLOT(activateRaiseOrIconify()));
setItemChecked(id, t->isActive());
if (t->demandsAttention())
@@ -131,7 +131,7 @@ void TaskLMBMenu::fillMenu()
if (m_attentionState)
{
m_attentionTimer = new TQTimer(this, "AttentionTimer");
- connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout()));
+ connect(m_attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimeout()));
m_attentionTimer->start(500, true);
}
}
@@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch()
void TaskLMBMenu::mousePressEvent( TQMouseEvent* e )
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_dragStartPos = e->pos();
}
diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h
index 7eedc115b..f0ff70afc 100644
--- a/kicker/taskmanager/tasklmbmenu.h
+++ b/kicker/taskmanager/tasklmbmenu.h
@@ -51,9 +51,9 @@ private:
/*****************************************************************************/
-class KDE_EXPORT TaskLMBMenu : public TQPopupMenu
+class TDE_EXPORT TaskLMBMenu : public TQPopupMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
TaskLMBMenu(const Task::List& list, TQWidget *parent = 0, const char *name = 0);
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 33df1ddd6..54bf6d919 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -61,16 +61,16 @@ TaskManager::TaskManager()
m_trackGeometry(false)
{
TDEGlobal::locale()->insertCatalogue("libtaskmanager");
- connect(m_winModule, TQT_SIGNAL(windowAdded(WId)),
- this, TQT_SLOT(windowAdded(WId)));
- connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)),
- this, TQT_SLOT(windowRemoved(WId)));
- connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)),
- this, TQT_SLOT(activeWindowChanged(WId)));
- connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)),
- this, TQT_SLOT(currentDesktopChanged(int)));
- connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)),
- this, TQT_SLOT(windowChanged(WId,unsigned int)));
+ connect(m_winModule, TQ_SIGNAL(windowAdded(WId)),
+ this, TQ_SLOT(windowAdded(WId)));
+ connect(m_winModule, TQ_SIGNAL(windowRemoved(WId)),
+ this, TQ_SLOT(windowRemoved(WId)));
+ connect(m_winModule, TQ_SIGNAL(activeWindowChanged(WId)),
+ this, TQ_SLOT(activeWindowChanged(WId)));
+ connect(m_winModule, TQ_SIGNAL(currentDesktopChanged(int)),
+ this, TQ_SLOT(currentDesktopChanged(int)));
+ connect(m_winModule, TQ_SIGNAL(windowChanged(WId,unsigned int)),
+ this, TQ_SLOT(windowChanged(WId,unsigned int)));
// register existing windows
const TQValueList<WId> windows = m_winModule->windows();
@@ -99,14 +99,14 @@ void TaskManager::configure_startup()
return;
_startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, this );
connect( _startup_info,
- TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
- TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+ TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+ TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
connect( _startup_info,
- TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
- TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+ TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+ TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
connect( _startup_info,
- TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
- TQT_SLOT( killStartup( const TDEStartupInfoId& )));
+ TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+ TQ_SLOT( killStartup( const TDEStartupInfoId& )));
c.setGroup( "TaskbarButtonSettings" );
_startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
}
@@ -1305,7 +1305,7 @@ void Task::updateThumbnail()
// by the thumbnail generation. This makes things much smoother
// on slower machines.
//
- TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop());
+ TQWidget *rootWin = tqApp->desktop();
TQRect geom = _info.geometry();
_grab = TQPixmap::grabWindow(rootWin->winId(),
geom.x(), geom.y(),
@@ -1313,7 +1313,7 @@ void Task::updateThumbnail()
if (!_grab.isNull())
{
- TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail()));
+ TQTimer::singleShot(200, this, TQ_SLOT(generateThumbnail()));
}
}
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 2753218c8..289c6af55 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -68,9 +68,9 @@ typedef TQValueList<WId> WindowList;
* @see TaskManager
* @see KWinModule
*/
-class KDE_EXPORT Task: public TQObject, public TDEShared
+class TDE_EXPORT Task: public TQObject, public TDEShared
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName )
TQ_PROPERTY( TQString iconicName READ iconicName )
TQ_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState )
@@ -483,7 +483,7 @@ private:
/**
* Provids a drag object for tasks across desktops.
*/
-class KDE_EXPORT TaskDrag : public TQStoredDrag
+class TDE_EXPORT TaskDrag : public TQStoredDrag
{
public:
/**
@@ -511,9 +511,9 @@ public:
*
* @see TaskManager
*/
-class KDE_EXPORT Startup: public TQObject, public TDEShared
+class TDE_EXPORT Startup: public TQObject, public TDEShared
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQString text READ text )
TQ_PROPERTY( TQString bin READ bin )
TQ_PROPERTY( TQString icon READ icon )
@@ -565,9 +565,9 @@ private:
* @see Startup
* @see KWinModule
*/
-class KDE_EXPORT TaskManager : public TQObject
+class TDE_EXPORT TaskManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( int currentDesktop READ currentDesktop )
TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops )
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index 58682196b..943160d26 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -78,7 +78,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
if (showAll)
{
id = insertItem(i18n("&To Current Desktop"),
- t, TQT_SLOT(toCurrentDesktop()));
+ t, TQ_SLOT(toCurrentDesktop()));
setItemEnabled( id, !t->isOnCurrentDesktop() );
}
@@ -88,21 +88,21 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
}
}
- id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move()));
+ id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQ_SLOT(move()));
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove));
- id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize()));
+ id = insertItem(i18n("Re&size"), t, TQ_SLOT(resize()));
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize));
- id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified()));
+ id = insertItem(i18n("Mi&nimize"), t, TQ_SLOT(toggleIconified()));
setItemChecked(id, t->isIconified());
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize));
- id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized()));
+ id = insertItem(i18n("Ma&ximize"), t, TQ_SLOT(toggleMaximized()));
setItemChecked(id, t->isMaximized());
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax));
- id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded()));
+ id = insertItem(i18n("&Shade"), t, TQ_SLOT(toggleShaded()));
setItemChecked(id, t->isShaded());
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade));
@@ -115,28 +115,28 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
insertSeparator();
}
- id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQT_SLOT(close()));
+ id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQ_SLOT(close()));
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose));
}
void TaskRMBMenu::fillMenu()
{
- int id;
- setCheckable( true );
+ int id;
+ setCheckable( true );
Task::List::iterator itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
- Task::Ptr t = (*it);
+ Task::Ptr t = (*it);
- id = insertItem( TQIconSet( t->pixmap() ),
- t->visibleNameWithState(),
- new TaskRMBMenu(t, this) );
- setItemChecked( id, t->isActive() );
- connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) );
- }
+ id = insertItem( TQIconSet( t->pixmap() ),
+ t->visibleNameWithState(),
+ new TaskRMBMenu(t, this) );
+ setItemChecked( id, t->isActive() );
+ connectItem( id, t, TQ_SLOT( activateRaiseOrIconify() ) );
+ }
- insertSeparator();
+ insertSeparator();
bool enable = false;
@@ -144,7 +144,7 @@ void TaskRMBMenu::fillMenu()
{
id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu());
- id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop()));
+ id = insertItem(i18n("All &to Current Desktop"), this, TQ_SLOT(slotAllToCurrentDesktop()));
Task::List::iterator itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
@@ -159,48 +159,55 @@ void TaskRMBMenu::fillMenu()
enable = false;
- id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) );
+ id = insertItem( i18n( "Mi&nimize All" ), this, TQ_SLOT( slotMinimizeAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
- if( !(*it)->isIconified() ) {
- enable = true;
- break;
- }
- }
- setItemEnabled( id, enable );
+ if( !(*it)->isIconified() ) {
+ enable = true;
+ break;
+ }
+ }
+ setItemEnabled( id, enable );
- enable = false;
+ enable = false;
- id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) );
+ id = insertItem( i18n( "Ma&ximize All" ), this, TQ_SLOT( slotMaximizeAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
if( !(*it)->isMaximized() ) {
- enable = true;
- break;
- }
- }
- setItemEnabled( id, enable );
+ enable = true;
+ break;
+ }
+ }
+ setItemEnabled( id, enable );
- enable = false;
+ enable = false;
- id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) );
+ id = insertItem( i18n( "&Restore All" ), this, TQ_SLOT( slotRestoreAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
- if( (*it)->isIconified() || (*it)->isMaximized() ) {
- enable = true;
- break;
- }
- }
- setItemEnabled( id, enable );
+ if( (*it)->isIconified() || (*it)->isMaximized() ) {
+ enable = true;
+ break;
+ }
+ }
+ setItemEnabled( id, enable );
+
+ insertSeparator();
+
+ enable = false;
- insertSeparator();
+ if (taskMoveMenu) {
+ taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE);
+ insertItem(i18n("Move Task Button"), taskMoveMenu);
- enable = false;
+ insertSeparator();
+ }
- insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) );
+ insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQ_SLOT( slotCloseAll() ) );
}
TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
@@ -212,17 +219,17 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
id = menu->insertItem(SmallIconSet("go-up"),
i18n("Keep &Above Others"),
- t, TQT_SLOT(toggleAlwaysOnTop()));
+ t, TQ_SLOT(toggleAlwaysOnTop()));
menu->setItemChecked(id, t->isAlwaysOnTop());
id = menu->insertItem(SmallIconSet("go-down"),
i18n("Keep &Below Others"),
- t, TQT_SLOT(toggleKeptBelowOthers()));
+ t, TQ_SLOT(toggleKeptBelowOthers()));
menu->setItemChecked(id, t->isKeptBelowOthers());
id = menu->insertItem(SmallIconSet("view-fullscreen"),
i18n("&Fullscreen"),
- t, TQT_SLOT(toggleFullScreen()));
+ t, TQ_SLOT(toggleFullScreen()));
menu->setItemChecked(id, t->isFullScreen());
if (KWin::allowedActionsSupported())
@@ -238,7 +245,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
TQPopupMenu* m = new TQPopupMenu( this );
m->setCheckable( true );
- int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) );
+ int id = m->insertItem( i18n("&All Desktops"), t, TQ_SLOT( toDesktop(int) ) );
m->setItemParameter( id, 0 ); // 0 means all desktops
m->setItemChecked( id, t->isOnAllDesktops() );
@@ -246,7 +253,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
- id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) );
+ id = m->insertItem( name, t, TQ_SLOT( toDesktop(int) ) );
m->setItemParameter( id, i );
m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i );
}
@@ -259,14 +266,14 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu()
TQPopupMenu* m = new TQPopupMenu( this );
m->setCheckable( true );
- int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) );
+ int id = m->insertItem( i18n("&All Desktops"), this, TQ_SLOT( slotAllToDesktop(int) ) );
m->setItemParameter( id, 0 ); // 0 means all desktops
m->insertSeparator();
for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
- id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) );
+ id = m->insertItem( name, this, TQ_SLOT( slotAllToDesktop(int) ) );
m->setItemParameter( id, i );
}
diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h
index 76b209ca7..b82d0338d 100644
--- a/kicker/taskmanager/taskrmbmenu.h
+++ b/kicker/taskmanager/taskrmbmenu.h
@@ -27,9 +27,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpopupmenu.h>
-class KDE_EXPORT TaskRMBMenu : public TQPopupMenu
+class TDE_EXPORT TaskRMBMenu : public TQPopupMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
TaskRMBMenu(const Task::List&, bool showAll = true, TQPopupMenu* moveMenu = NULL, TQWidget *parent = 0, const char *name = 0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 20:17:35 +0000