diff options
Diffstat (limited to 'kicker/taskbar/taskcontainer.cpp')
-rw-r--r-- | kicker/taskbar/taskcontainer.cpp | 280 |
1 files changed, 155 insertions, 125 deletions
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index cc533f0b9..5a8464cd5 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -26,6 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> +#ifdef Q_OS_SOLARIS +#include <procfs.h> +#endif /* SunOS */ + #include <tqbitmap.h> #include <tqcolor.h> #include <tqcursor.h> @@ -45,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconloader.h> #include <kimageeffect.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <netwm.h> #include <fixx11h.h> @@ -62,8 +66,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskcontainer.h" #include "taskcontainer.moc" -#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) -#define READ_MERGED_TASBKAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x)) +#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) +#define READ_MERGED_TASKBAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x)) static Bool netwm_atoms_created = False; static Atom net_wm_pid = 0; @@ -96,6 +100,18 @@ static void create_atoms(Display *d) { } bool is_process_resumable(pid_t pid) { +#ifdef Q_OS_SOLARIS + TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid)); + if (procStatFile.open(IO_ReadOnly)) { + TQByteArray statRaw = procStatFile.readAll(); + lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data(); + + procStatFile.close(); + if( inf->pr_sname == 'T' ) { + return true; + } + } +#else /* default */ TQFile procStatFile(TQString("/proc/%1/stat").arg(pid)); if (procStatFile.open(IO_ReadOnly)) { TQByteArray statRaw = procStatFile.readAll(); @@ -107,13 +123,9 @@ bool is_process_resumable(pid_t pid) { if( state == "T" ) { return true; } - else { - return false; - } - } - else { - return false; } +#endif /* read process status */ + return false; } TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name) @@ -174,7 +186,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, Ta sid = m_startup->bin(); - connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update())); + connect(m_startup, TQ_SIGNAL(changed()), TQ_SLOT(update())); dragSwitchTimer.start(333, true); } @@ -192,16 +204,18 @@ void TaskContainer::init() if (!netwm_atoms_created) create_atoms(TQPaintDevice::x11AppDisplay()); + int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + setWFlags(TQt::WNoAutoErase); setBackgroundMode(NoBackground); - animBg = TQPixmap(16, 16); + animBg = TQPixmap(iconSize, iconSize); installEventFilter(KickerTip::the()); - connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired())); - connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe())); - connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired())); - connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow())); + connect(&animationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(animationTimerFired())); + connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(showMe())); + connect(&attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimerFired())); + connect(&m_paintEventCompressionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateNow())); } TaskContainer::~TaskContainer() @@ -221,8 +235,8 @@ void TaskContainer::showMe() animationTimer.start(100); emit showMe(this); - disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe())); - connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); + disconnect(&dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showMe())); + connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch())); } void TaskContainer::stopTimers() @@ -242,7 +256,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) return; } - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -265,7 +279,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) void TaskContainer::iconChanged() { - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -366,11 +380,11 @@ void TaskContainer::checkAttention(const Task::Ptr t) void TaskContainer::attentionTimerFired() { assert( attentionState != -1 ); - if (attentionState < READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations)*2) + if (attentionState < READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations)*2) { ++attentionState; } - else if (READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) < 1000) + else if (READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) < 1000) { attentionTimer.stop(); } @@ -390,9 +404,22 @@ TQSizePolicy TaskContainer::sizePolicy() const void TaskContainer::resizeEvent( TQResizeEvent * ) { - // calculate the icon rect - TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + recalculateIconRect(); +} + +void TaskContainer::recalculateIconRect() +{ + iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + + if(taskBar->showText()) + { + TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - iconSize) / 2, iconSize, iconSize), this ); + } + else + { + iconRect = TQStyle::visualRect( TQRect((width() - iconSize) / 2, (height() - iconSize) / 2, iconSize, iconSize), this ); + } } void TaskContainer::add(Task::Ptr task) @@ -415,9 +442,9 @@ void TaskContainer::add(Task::Ptr task) KickerTip::Client::updateKickerTip(); update(); - connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool))); - connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged())); - connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated())); + connect(task, TQ_SIGNAL(changed(bool)), TQ_SLOT(taskChanged(bool))); + connect(task, TQ_SIGNAL(iconChanged()), TQ_SLOT(iconChanged())); + connect(task, TQ_SIGNAL(activated()), TQ_SLOT(setLastActivated())); } void TaskContainer::remove(Task::Ptr task) @@ -581,13 +608,14 @@ void TaskContainer::drawButton(TQPainter *p) TQPixmap *pm((TQPixmap*)p->device()); TQPixmap pixmap; // icon Task::Ptr task = 0; - bool iconified = !READ_MERGED_TASBKAR_SETTING(showOnlyIconified); - bool halo = READ_MERGED_TASBKAR_SETTING(haloText); - bool alwaysDrawButtons = READ_MERGED_TASBKAR_SETTING(drawButtons); + bool iconified = !READ_MERGED_TASKBAR_SETTING(showOnlyIconified); + bool halo = READ_MERGED_TASKBAR_SETTING(haloText); + bool alwaysDrawButtons = READ_MERGED_TASKBAR_SETTING(drawButtons); bool drawButton = alwaysDrawButtons || (m_mouseOver && !halo && isEnabled() && - READ_MERGED_TASBKAR_SETTING(showButtonOnHover)); + READ_MERGED_TASKBAR_SETTING(showButtonOnHover)); TQFont font(TDEGlobalSettings::taskbarFont()); + recalculateIconRect(); // draw sunken if we contain the active task bool active = false; @@ -608,7 +636,7 @@ void TaskContainer::drawButton(TQPainter *p) if (task->demandsAttention()) { - demandsAttention = attentionState == READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) || + demandsAttention = attentionState == READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) || attentionState % 2 == 0; } } @@ -616,15 +644,15 @@ void TaskContainer::drawButton(TQPainter *p) font.setBold(active); TQColorGroup colors = palette().active(); - - if (READ_MERGED_TASBKAR_SETTING(useCustomColors)) + + if (READ_MERGED_TASKBAR_SETTING(useCustomColors)) { - colors.setColor( TQColorGroup::Button, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor)); - colors.setColor( TQColorGroup::Background, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor) ); - colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) ); - colors.setColor( TQColorGroup::Text, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) ); + colors.setColor( TQColorGroup::Button, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor)); + colors.setColor( TQColorGroup::Background, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor) ); + colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) ); + colors.setColor( TQColorGroup::Text, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) ); } - + if (demandsAttention) { if (!drawButton) @@ -638,7 +666,7 @@ void TaskContainer::drawButton(TQPainter *p) for (int i = 0; i < 2; ++i) { line = KickerLib::blendColors(line, colors.background()); - p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + p->setPen(TQPen(line, 1, TQt::SolidLine, TQt::RoundCap, TQt::RoundJoin)); r.addCoords(-1, -1, 1, 1); p->drawRect(r); } @@ -659,7 +687,7 @@ void TaskContainer::drawButton(TQPainter *p) // get the task icon if (task) { - pixmap = task->pixmap(); + pixmap = task->icon(iconSize, iconSize, true); } bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); @@ -671,13 +699,13 @@ void TaskContainer::drawButton(TQPainter *p) // draw button background if (drawButton) { - if (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, + if (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) { + style().drawPrimitive(TQStyle::PE_ButtonBevel, p, TQRect(1, 1, width()-3, height()-2), colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised); } else { - style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, + style().drawPrimitive(TQStyle::PE_ButtonTool, p, TQRect(1, 1, width()-2, height()-2), colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised); } @@ -690,21 +718,21 @@ void TaskContainer::drawButton(TQPainter *p) } TQString text = name(); // find text - int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0; + int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + iconSize + 2 : 0; // show icons if (taskBar->showIcons()) { if (pixmap.isNull() && m_startup) - pixmap = SmallIcon(m_startup->icon()); + pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize); if ( !pixmap.isNull() ) { - // make sure it is no larger than 16x16 - if ( pixmap.width() > 16 || pixmap.height() > 16 ) + // make sure it is no larger than icon size + if ( pixmap.width() > iconSize || pixmap.height() > iconSize ) { TQImage tmp = pixmap.convertToImage(); - pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) ); + pixmap.convertFromImage( tmp.smoothScale( iconSize, iconSize ) ); } // fade out the icon when minimized @@ -718,28 +746,36 @@ void TaskContainer::drawButton(TQPainter *p) } // modified overlay icon - if (taskBar->showText()) + static TQString modStr = "[" + i18n( "modified" ) + "]"; + int modStrPos = text.find( modStr ); + if (modStrPos >= 0) { - static TQString modStr = "[" + i18n( "modified" ) + "]"; - int modStrPos = text.find( modStr ); - if (modStrPos >= 0) + TQRect r; + TQPixmap modPixmap = SmallIcon("modified"); + if (iconified) { - // +1 because we include a space after the closing brace. - text.remove(modStrPos, modStr.length() + 1); - TQPixmap modPixmap = SmallIcon("modified"); + TDEIconEffect::semiTransparent(modPixmap); + } - // draw modified overlay - if (!modPixmap.isNull()) - { - TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - 16) / 2, 16, 16), this); - if (iconified) + if (taskBar->showText()) // has text + { + // +1 because we include a space after the closing brace. + text.remove(modStrPos, modStr.length() + 1); + + // draw modified overlay + if (!modPixmap.isNull()) { - TDEIconEffect::semiTransparent(modPixmap); + r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - iconSize) / 2, iconSize, iconSize), this); + textPos += iconSize + 2; } - p->drawPixmap(r, modPixmap); - textPos += 16 + 2; - } - } + } + else if (taskBar->showIcons()) // has only icon + { + r = TQRect(0, 0, iconSize / 2, iconSize / 2); + r.moveBottomRight(iconRect.bottomRight()); + } + + p->drawPixmap(r, modPixmap); } } @@ -765,9 +801,9 @@ void TaskContainer::drawButton(TQPainter *p) } else // hack for the dotNET style and others { - if (READ_MERGED_TASBKAR_SETTING(useCustomColors)) + if (READ_MERGED_TASKBAR_SETTING(useCustomColors)) { - textPen = TQPen(READ_MERGED_TASBKAR_SETTING(activeTaskTextColor)); + textPen = TQPen(READ_MERGED_TASKBAR_SETTING(activeTaskTextColor)); } else { @@ -775,7 +811,7 @@ void TaskContainer::drawButton(TQPainter *p) } } - int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0; + int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0; if (m_filteredTasks.count() > 1) { availableWidth -= 8; @@ -852,16 +888,16 @@ void TaskContainer::drawButton(TQPainter *p) } // draw popup arrow - if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()))) + if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()))) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft; switch (arrowType) { - case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: e = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: e = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Enabled; @@ -872,7 +908,7 @@ void TaskContainer::drawButton(TQPainter *p) flags |= TQStyle::Style_Down; } - style().tqdrawPrimitive(e, p, ar, colors, flags); + style().drawPrimitive(e, p, ar, colors, flags); } // draw mouse over frame in transparent mode @@ -979,7 +1015,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) return; } - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_dragStartPos = e->pos(); } @@ -994,15 +1030,15 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) // Other actions will be handled in mouseReleaseEvent switch (e->button()) { - case Qt::LeftButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton); + case TQt::LeftButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton); break; - case Qt::MidButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton); + case TQt::MidButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton); break; - case Qt::RightButton: + case TQt::RightButton: default: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton); + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton); break; } @@ -1018,14 +1054,14 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) { m_dragStartPos = TQPoint(); - if (!READ_MERGED_TASBKAR_SETTING(drawButtons)) + if (!READ_MERGED_TASKBAR_SETTING(drawButtons)) { setDown(false); } // This is to avoid the flicker caused by redrawing the // button as unpressed just before it's activated. - if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) + if (!rect().contains(e->pos())) { TQToolButton::mouseReleaseEvent(e); return; @@ -1035,15 +1071,15 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) switch (e->button()) { - case Qt::LeftButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton); + case TQt::LeftButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton); break; - case Qt::MidButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton); + case TQt::MidButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton); break; - case Qt::RightButton: + case TQt::RightButton: default: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton); + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton); break; } @@ -1061,7 +1097,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) } performAction( buttonAction ); - TQTimer::singleShot(0, this, TQT_SLOT(update())); + TQTimer::singleShot(0, this, TQ_SLOT(update())); } void TaskContainer::performAction(int action) @@ -1223,7 +1259,7 @@ void TaskContainer::popupMenu(int action) return; } - m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL); + m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL); } else { @@ -1274,22 +1310,22 @@ TQPopupMenu* TaskContainer::makeTaskMoveMenu() id = menu->insertItem(SmallIconSet("go-first"), i18n("Move to Beginning"), - this, TQT_SLOT(slotTaskMoveBeginning())); + this, TQ_SLOT(slotTaskMoveBeginning())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left)); id = menu->insertItem(SmallIconSet("back"), i18n("Move Left"), - this, TQT_SLOT(slotTaskMoveLeft())); + this, TQ_SLOT(slotTaskMoveLeft())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left)); id = menu->insertItem(SmallIconSet("forward"), i18n("Move Right"), - this, TQT_SLOT(slotTaskMoveRight())); + this, TQ_SLOT(slotTaskMoveRight())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right)); id = menu->insertItem(SmallIconSet("go-last"), i18n("Move to End"), - this, TQT_SLOT(slotTaskMoveEnd())); + this, TQ_SLOT(slotTaskMoveEnd())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right)); return menu; @@ -1328,11 +1364,6 @@ void TaskContainer::mouseMoveEvent( TQMouseEvent* e ) bool TaskContainer::startDrag(const TQPoint& pos) { - if (m_filteredTasks.count() != 1) - { - return false; - } - int delay = TDEGlobalSettings::dndEventDelay(); if ((m_dragStartPos - pos).manhattanLength() > delay) @@ -1375,7 +1406,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) if ( TQApplication::widgetAt( p, true ) == this ) { if (me->type() == TQEvent::MouseButtonPress && - me->button() == Qt::LeftButton) + me->button() == TQt::LeftButton) { m_dragStartPos = mapFromGlobal(p); } @@ -1393,10 +1424,10 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) { if (!m_dragStartPos.isNull()) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); TQPoint p(me->globalPos()); - if (me->state() & Qt::LeftButton && + if (me->state() & TQt::LeftButton && TQApplication::widgetAt(p, true) == this) { kdDebug() << "event move" << endl; @@ -1452,7 +1483,7 @@ void TaskContainer::dragEnterEvent( TQDragEnterEvent* e ) return; } - if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp))) + if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp))) { e->accept(); } @@ -1480,7 +1511,7 @@ void TaskContainer::dropEvent( TQDropEvent* e ) return; } - if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp))) + if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp))) { if (taskBar->taskMoveHandler(TaskMoveDestination::Position, TaskDrag::decode(e), TQWidget::mapTo(taskBar, e->pos()))) { e->accept(); @@ -1631,10 +1662,10 @@ void TaskContainer::updateFilteredTaskList() { Task::Ptr t = *it; if ((taskBar->showAllWindows() || t->isOnCurrentDesktop()) && - (!READ_MERGED_TASBKAR_SETTING(showOnlyIconified) || t->isIconified())) + (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified())) { pid_t pid = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Atom type_ret; int format_ret; unsigned long nitems_ret = 0, unused = 0; @@ -1652,15 +1683,15 @@ void TaskContainer::updateFilteredTaskList() if (pid < 0) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) { if (is_process_resumable(pid)) { - if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { + if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { t->publishIconGeometry( TQRect()); } else { @@ -1668,13 +1699,13 @@ void TaskContainer::updateFilteredTaskList() } } else { - if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { + if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { t->publishIconGeometry( TQRect()); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { m_filteredTasks.append(t); } else { @@ -1695,7 +1726,7 @@ void TaskContainer::updateFilteredTaskList() // sort container list by desktop if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1) { - TQValueVector<QPair<int, Task::Ptr> > sorted; + TQValueVector<TQPair<int, Task::Ptr> > sorted; sorted.resize(m_filteredTasks.count()); int i = 0; @@ -1710,7 +1741,7 @@ void TaskContainer::updateFilteredTaskList() qHeapSort(sorted); m_filteredTasks.clear(); - for (TQValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin(); + for (TQValueVector<TQPair<int, Task::Ptr> >::iterator it = sorted.begin(); it != sorted.end(); ++it) { @@ -1742,6 +1773,8 @@ void TaskContainer::settingsChanged() void TaskContainer::updateKickerTip(KickerTip::Data& data) { + int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + if (m_startup) { data.message = m_startup->text(); @@ -1749,7 +1782,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) data.subtext = i18n("Loading application ..."); data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Small, - TDEIcon::SizeMedium, + iconSize, TDEIcon::DefaultState, 0, true); return; @@ -1761,21 +1794,18 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) if (m_filteredTasks.count() > 0) { - if (READ_MERGED_TASBKAR_SETTING(showThumbnails) && + if (READ_MERGED_TASKBAR_SETTING(showThumbnails) && m_filteredTasks.count() == 1) { Task::Ptr t = m_filteredTasks.first(); - pixmap = t->thumbnail(READ_MERGED_TASBKAR_SETTING(thumbnailMaxDimension)); + pixmap = t->thumbnail(READ_MERGED_TASKBAR_SETTING(thumbnailMaxDimension)); } if (pixmap.isNull() && tasks.count()) { // try to load icon via net_wm - pixmap = KWin::icon(tasks.last()->window(), - TDEIcon::SizeMedium, - TDEIcon::SizeMedium, - true); + pixmap = KWin::icon(tasks.last()->window(), iconSize, iconSize, true); } // Collect all desktops the tasks are on. Sort naturally. @@ -1809,7 +1839,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } } - if (READ_MERGED_TASBKAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1) + if (READ_MERGED_TASKBAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1) { if (desktopMap.isEmpty()) { |