| -rw-r--r-- | core/launcher/runningappbar.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/launcher/runningappbar.cpp b/core/launcher/runningappbar.cpp index 298f671..b830d1b 100644 --- a/core/launcher/runningappbar.cpp +++ b/core/launcher/runningappbar.cpp @@ -19,48 +19,50 @@ ********************************************************************** */ #define QTOPIA_INTERNAL_PRELOADACCESS // For "kill" #include <sys/types.h> #include <signal.h> #include <qtimer.h> #include <qpopupmenu.h> #include <qmessagebox.h> #include <qpainter.h> #include "qprocess.h" #include <qpe/qpeapplication.h> #include <qpe/applnk.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/global.h> #include <qwindowsystem_qws.h> #include "runningappbar.h" RunningAppBar::RunningAppBar(QWidget* parent) : QFrame(parent), m_AppLnkSet(0L), m_SelectedAppIndex(-1) { + setBackgroundMode( PaletteBackground ); + m_AppLnkSet = new AppLnkSet( QPEApplication::qpeDir() + "apps" ); connect(qwsServer, SIGNAL(newChannel(const QString&)), this, SLOT(newQcopChannel(const QString&))); connect(qwsServer, SIGNAL(removedChannel(const QString&)), this, SLOT(removedQcopChannel(const QString&))); QCopChannel* channel = new QCopChannel( "QPE/System", this ); connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(received(const QCString&, const QByteArray&)) ); spacing = AppLnk::smallIconSize()+3; } RunningAppBar::~RunningAppBar() { } void RunningAppBar::newQcopChannel(const QString& channelName) { QString prefix("QPE/Application/"); if (channelName.startsWith(prefix)) { QString appName = channelName.mid(prefix.length()); // qDebug("App %s just connected!", appName.latin1()); const AppLnk* newGuy = m_AppLnkSet->findExec(appName); if (newGuy && !newGuy->isPreloaded()) { addTask(*newGuy); } } @@ -147,59 +149,59 @@ void RunningAppBar::mouseReleaseEvent(QMouseEvent *e) QString channel = QString("QPE/Application/") + m_AppList.at(m_SelectedAppIndex)->exec(); if (QCopChannel::isRegistered(channel.latin1())) { // qDebug("%s is running!", m_AppList.at(m_SelectedAppIndex)->exec().latin1()); QCopEnvelope e(channel.latin1(), "raise()"); // This class will delete itself after hearing from the app or the timer expiring (void)new AppMonitor(*m_AppList.at(m_SelectedAppIndex), *this); } else { removeTask(*m_AppList.at(m_SelectedAppIndex)); } m_SelectedAppIndex = -1; update(); } } void RunningAppBar::paintEvent( QPaintEvent * ) { QPainter p( this ); AppLnk *curApp; int x = 0; int y = (height() - AppLnk::smallIconSize()) / 2; int i = 0; - p.fillRect( 0, 0, width(), height(), colorGroup().background() ); + //p.fillRect( 0, 0, width(), height(), colorGroup().background() ); QListIterator<AppLnk> it(m_AppList); for (; it.current(); i++, ++it ) { if ( x + spacing <= width() ) { curApp = it.current(); if ( (int)i == m_SelectedAppIndex ) p.fillRect( x, y, spacing, curApp->pixmap().height()+1, colorGroup().highlight() ); else - p.eraseRect( x, y, spacing, curApp->pixmap().height()+1 ); + // p.eraseRect( x, y, spacing, curApp->pixmap().height()+1 ); p.drawPixmap( x, y, curApp->pixmap() ); x += spacing; } } } QSize RunningAppBar::sizeHint() const { return QSize( frameWidth(), AppLnk::smallIconSize()+frameWidth()*2+3 ); } const int AppMonitor::RAISE_TIMEOUT_MS = 500; AppMonitor::AppMonitor(const AppLnk& app, RunningAppBar& owner) : QObject(0L), m_Owner(owner), m_App(app), m_PsProc(0L), m_AppKillerBox(0L) { QCopChannel* channel = new QCopChannel( "QPE/System", this ); connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(received(const QCString&, const QByteArray&)) ); connect(&m_Timer, SIGNAL(timeout()), this, SLOT(timerExpired())); m_Timer.start(RAISE_TIMEOUT_MS, TRUE); } AppMonitor::~AppMonitor() { if (m_AppKillerBox) { |