diff --git a/src/appProp.ui b/src/appProp.ui index 38e732f..bdc111a 100644 --- a/src/appProp.ui +++ b/src/appProp.ui @@ -1,6 +1,6 @@ appProp - + appProp @@ -45,7 +45,7 @@ unnamed - + buttonCancel @@ -59,7 +59,7 @@ true - + buttonOk @@ -93,7 +93,7 @@ - + groupBox1 @@ -112,7 +112,7 @@ unnamed - + terminal @@ -120,7 +120,7 @@ Run From Terminal - + cuser @@ -128,7 +128,7 @@ Run as different User - + tclose @@ -136,14 +136,14 @@ Keep terminal open after exit - + user - + groupBox2 @@ -162,7 +162,7 @@ unnamed - + textLabel3 @@ -170,7 +170,7 @@ Don't forget to chose an icon. - + textLabel1 @@ -178,7 +178,7 @@ <b>Command</b> - + textLabel2 @@ -186,7 +186,7 @@ <b>Name</b> - + cmdfile @@ -205,12 +205,12 @@ Icon - + cmdname - + cmdpath diff --git a/src/apppropprg.cpp b/src/apppropprg.cpp index b806b67..ab20985 100644 --- a/src/apppropprg.cpp +++ b/src/apppropprg.cpp @@ -19,7 +19,7 @@ #include "appProp.h" #include "kooldock.h" -appPropPrg::appPropPrg(QWidget *parent, const char *name) +appPropPrg::appPropPrg(TQWidget *parent, const char *name) : appProp(parent, name) { @@ -32,10 +32,10 @@ appPropPrg::~appPropPrg() void appPropPrg::accept() { - QString icon; - QString desktop; - QString path; - QString puser; + TQString icon; + TQString desktop; + TQString path; + TQString puser; icon=iconbutton->icon(); desktop=cmdname->text(); @@ -70,14 +70,14 @@ void appPropPrg::accept() desktop.append(".desktop"); //To handle position - QString progPath = locateLocal("data", "kooldock"); - QDir dir(progPath + QString("/menu/")); - QString preffix; - QStringList fileList = dir.entryList("*.desktop"); + TQString progPath = locateLocal("data", "kooldock"); + TQDir dir(progPath + TQString("/menu/")); + TQString preffix; + TQStringList fileList = dir.entryList("*.desktop"); int pos=fileList.count(); - if(pos<10) preffix=QString("0%1_").arg(pos); - if(pos>=10) preffix=QString("%1_").arg(pos); + if(pos<10) preffix=TQString("0%1_").arg(pos); + if(pos>=10) preffix=TQString("%1_").arg(pos); desktop.prepend(preffix); //End handling position @@ -103,7 +103,7 @@ void appPropPrg::reject() this->hide(); } -void appPropPrg::closeEvent( QCloseEvent *e ) +void appPropPrg::closeEvent( TQCloseEvent *e ) { e->ignore(); reject(); @@ -111,9 +111,9 @@ void appPropPrg::closeEvent( QCloseEvent *e ) void appPropPrg::cmdfile_clicked() { - QString tmp; + TQString tmp; - QString fileToOpen=KFileDialog::getOpenFileName(QDir::currentDirPath(), "*.*", this, i18n("Open File")); + TQString fileToOpen=KFileDialog::getOpenFileName(TQDir::currentDirPath(), "*.*", this, i18n("Open File")); if (!fileToOpen.isEmpty()) { cmdpath->setText(fileToOpen); diff --git a/src/apppropprg.h b/src/apppropprg.h index a1ab103..74098fe 100644 --- a/src/apppropprg.h +++ b/src/apppropprg.h @@ -12,7 +12,7 @@ #ifndef APPPROPPRG_H #define APPPROPPRG_H -#include +#include #include "appProp.h" /** @@ -24,13 +24,13 @@ class appPropPrg : public appProp Q_OBJECT public: - appPropPrg(QWidget *parent = 0, const char *name = 0); + appPropPrg(TQWidget *parent = 0, const char *name = 0); ~appPropPrg(); - void addFile(const QString& filename, - const QString& iconname, - const QString& execname, - const QString& name, + void addFile(const TQString& filename, + const TQString& iconname, + const TQString& execname, + const TQString& name, bool notify); public slots: @@ -43,7 +43,7 @@ Q_OBJECT void apply(); protected: - void closeEvent( QCloseEvent* ); + void closeEvent( TQCloseEvent* ); }; #endif diff --git a/src/clip.cpp b/src/clip.cpp index de71d2b..979b278 100644 --- a/src/clip.cpp +++ b/src/clip.cpp @@ -1,17 +1,17 @@ #include "clip.h" -#include -#include -#include +#include +#include +#include #include #include #include #include -clip::clip(QWidget *parent, const char *name) : QWidget(parent, name, WStyle_Customize | WStyle_NoBorder | WNoAutoErase | WDestructiveClose | WMouseNoMask | WStyle_StaysOnTop) +clip::clip(TQWidget *parent, const char *name) : TQWidget(parent, name, WStyle_Customize | WStyle_NoBorder | WNoAutoErase | WDestructiveClose | WMouseNoMask | WStyle_StaysOnTop) { - info = new NETWinInfo( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMState); + info = new NETWinInfo( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMState); info->setDesktop( NETWinInfo::OnAllDesktops ); info->setState(NETWinInfo::SkipTaskbar | NETWinInfo::SkipPager, NETWinInfo::SkipTaskbar | NETWinInfo::SkipPager); @@ -34,13 +34,13 @@ void clip::clipDesktop(int p1,int p2,int p3,int p4,int p5,int p6,int p7,int p8,i KWin::setExtendedStrut(winId(), p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); } -void clip::paintEvent(QPaintEvent *) +void clip::paintEvent(TQPaintEvent *) { - QBitmap bm(size()); - QPainter mp; + TQBitmap bm(size()); + TQPainter mp; mp.begin(&bm, this); - mp.fillRect(rect(), Qt::black); + mp.fillRect(rect(), TQt::black); mp.end(); setMask(bm); diff --git a/src/clip.h b/src/clip.h index c14af10..cdfa473 100644 --- a/src/clip.h +++ b/src/clip.h @@ -5,16 +5,16 @@ #include #endif -#include +#include #include #include -class clip : public QWidget +class clip : public TQWidget { Q_OBJECT public: - clip(QWidget* parent=0, const char *name=0); + clip(TQWidget* parent=0, const char *name=0); virtual ~clip(); void clipDesktop(int,int,int,int,int,int,int,int,int,int,int,int); @@ -23,7 +23,7 @@ Q_OBJECT NETWinInfo *info; protected: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); }; #endif // CLIP_H_ diff --git a/src/item.cpp b/src/item.cpp index 809dd99..4dccc77 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -18,13 +18,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include "item.h" -Item::Item(const QString& iconName, const QString& cmd, const QString& name, int minSize, int maxSize) { +Item::Item(const TQString& iconName, const TQString& cmd, const TQString& name, int minSize, int maxSize) { iLoader = KGlobal::iconLoader(); command = cmd; this->name = name; @@ -36,7 +36,7 @@ Item::Item(const QString& iconName, const QString& cmd, const QString& name, int this->maxSize = maxSize; this->iconName = iconName; - QImage icon(iLoader->loadIcon(iconName, KIcon::NoGroup, 64).convertToImage()); + TQImage icon(iLoader->loadIcon(iconName, KIcon::NoGroup, 64).convertToImage()); if (minSize <= maxSize) { int count = maxSize - minSize + 1; @@ -47,7 +47,7 @@ Item::Item(const QString& iconName, const QString& cmd, const QString& name, int { if (i % SIZE_INC == 0) { - icons.append(new QPixmap(icon.smoothScale(minSize + i, minSize + i))); + icons.append(new TQPixmap(icon.smoothScale(minSize + i, minSize + i))); } } } @@ -57,10 +57,10 @@ Item::Item(const QString& iconName, const QString& cmd, const QString& name, int } -Item::Item(const QString& fileName, int minSize, int maxSize) +Item::Item(const TQString& fileName, int minSize, int maxSize) { - QString line; - QFile in(fileName); + TQString line; + TQFile in(fileName); in.open(IO_ReadOnly); mCount=0; mIndex=0; @@ -98,7 +98,7 @@ Item::Item(const QString& fileName, int minSize, int maxSize) mIndex=0; mMIndex=0; mClass=""; - QImage icon(iLoader->loadIcon(iconName, KIcon::NoGroup, 64).convertToImage()); + TQImage icon(iLoader->loadIcon(iconName, KIcon::NoGroup, 64).convertToImage()); if (minSize <= maxSize) { int count = maxSize - minSize + 1; @@ -109,7 +109,7 @@ Item::Item(const QString& fileName, int minSize, int maxSize) { if (i % SIZE_INC == 0) { - icons.append(new QPixmap(icon.smoothScale(minSize + i, minSize + i))); + icons.append(new TQPixmap(icon.smoothScale(minSize + i, minSize + i))); } } } @@ -118,7 +118,7 @@ Item::Item(const QString& fileName, int minSize, int maxSize) animed = FALSE; } -Item::Item(const QPixmap& iconBig, WId id, const QString& name, int minSize, int maxSize, bool wi) +Item::Item(const TQPixmap& iconBig, WId id, const TQString& name, int minSize, int maxSize, bool wi) { setId(id); this->name = name; @@ -130,7 +130,7 @@ Item::Item(const QPixmap& iconBig, WId id, const QString& name, int minSize, int this->maxSize = maxSize; command = ""; wIcon=wi; - QImage icon(iconBig.convertToImage()); + TQImage icon(iconBig.convertToImage()); if(minSize <= maxSize) { int count = maxSize - minSize + 1; @@ -142,10 +142,10 @@ Item::Item(const QPixmap& iconBig, WId id, const QString& name, int minSize, int if (i % SIZE_INC == 0) { if (wi) - {icons.append(new QPixmap(icon));} + {icons.append(new TQPixmap(icon));} else { - icons.append(new QPixmap(icon.scale(minSize + i, minSize + i))); + icons.append(new TQPixmap(icon.scale(minSize + i, minSize + i))); } //moothS } @@ -158,14 +158,14 @@ Item::~Item() { } -QPixmap* Item::getIcon(int size) +TQPixmap* Item::getIcon(int size) { if ((size >= minSize) && (size <= maxSize)) { int d = size - minSize; return(icons.at(d / SIZE_INC)); - //return(new QPixmap (icons.at(maxSize-minSize)->convertToImage().scale(size,size))); + //return(new TQPixmap (icons.at(maxSize-minSize)->convertToImage().scale(size,size))); } else { @@ -173,17 +173,17 @@ QPixmap* Item::getIcon(int size) } } -QString Item::getCommand() +TQString Item::getCommand() { return(command); } -QString Item::getName() +TQString Item::getName() { return(name); } -QCString Item::getClass() +TQCString Item::getClass() { return(mClass); } @@ -203,7 +203,7 @@ int Item::getMIndex() return(mMIndex); } -QString Item::getFilename() +TQString Item::getFilename() { return(filename); } @@ -220,10 +220,10 @@ void Item::setId(WId newId) id=newId; } -void Item::setIcon(const QPixmap& iconBig) +void Item::setIcon(const TQPixmap& iconBig) { icons.clear(); - QImage icon(iconBig.convertToImage()); + TQImage icon(iconBig.convertToImage()); int count = maxSize - minSize + 1; @@ -233,17 +233,17 @@ void Item::setIcon(const QPixmap& iconBig) { if (i % SIZE_INC == 0) { - icons.append(new QPixmap(icon.smoothScale(minSize + i, minSize + i))); + icons.append(new TQPixmap(icon.smoothScale(minSize + i, minSize + i))); } } } -void Item::setName(const QString& newName) +void Item::setName(const TQString& newName) { name = newName; } -void Item::setClass(const QCString& newClass) +void Item::setClass(const TQCString& newClass) { mClass = newClass; } diff --git a/src/item.h b/src/item.h index 2fcfd3a..2c56901 100644 --- a/src/item.h +++ b/src/item.h @@ -21,13 +21,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include const int MAX_LEN = 256; const int SIZE_INC = 1; @@ -35,34 +35,34 @@ const int SIZE_INC = 1; class Item { public: - Item(const QString& iconName, const QString& cmd, const QString& name, int minSize, int maxSize); - Item(const QString& fileName, int minSize, int maxSize); - Item(const QPixmap& iconBig, WId id, const QString& name, int minSize, int maxSize, bool wi =FALSE); + Item(const TQString& iconName, const TQString& cmd, const TQString& name, int minSize, int maxSize); + Item(const TQString& fileName, int minSize, int maxSize); + Item(const TQPixmap& iconBig, WId id, const TQString& name, int minSize, int maxSize, bool wi =FALSE); ~Item(); - void setIcon(const QPixmap& iconBig); + void setIcon(const TQPixmap& iconBig); - QPixmap* getIcon(int size); - QString getCommand(); - QString getName(); - QCString getClass(); + TQPixmap* getIcon(int size); + TQString getCommand(); + TQString getName(); + TQCString getClass(); int getCount(); int getIndex(); int getMIndex(); WId getId(); KWin::WindowInfo info; void setId(WId newId); - QString getFilename(); + TQString getFilename(); - void setName(const QString& newName); - void setClass(const QCString& newClass); + void setName(const TQString& newName); + void setClass(const TQCString& newClass); void setCount(int newCount); void setIndex(int newIndex); void setMIndex(int newIndex); bool animed; bool isAnimed(); void anim(bool param); - QPtrList icons; + TQPtrList icons; bool wIcon; private: @@ -70,14 +70,14 @@ class Item int minSize; int maxSize; - QString command; - QString name; - QCString mClass; + TQString command; + TQString name; + TQCString mClass; int mCount; int mIndex; int mMIndex; - QString iconName; - QString filename; + TQString iconName; + TQString filename; WId id; }; diff --git a/src/kooldock.cpp b/src/kooldock.cpp index fb9cc9c..1a362ef 100644 --- a/src/kooldock.cpp +++ b/src/kooldock.cpp @@ -19,21 +19,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include // for "renicing" the bar @@ -71,13 +71,13 @@ #endif #include #include -#include +#include -KoolDock::KoolDock(QWidget *parent, const char *name) : QWidget(parent, name, WStyle_Customize | WStyle_NoBorder | WNoAutoErase | WDestructiveClose | WStyle_StaysOnTop )//| WX11BypassWM) +KoolDock::KoolDock(TQWidget *parent, const char *name) : TQWidget(parent, name, WStyle_Customize | WStyle_NoBorder | WNoAutoErase | WDestructiveClose | WStyle_StaysOnTop )//| WX11BypassWM) { // Default configuration paths progPath = locateLocal("data", "kooldock"); - menuPath = progPath + QString("/menu/"); + menuPath = progPath + TQString("/menu/"); confFile = locateLocal("config", "kooldockrc"); noSet=false; @@ -85,7 +85,7 @@ KoolDock::KoolDock(QWidget *parent, const char *name) : QWidget(parent, name, WS setupdlg = new SetupDialogPrg(); // create the setup dialog object. connect (setupdlg, SIGNAL(apply()), SLOT(chkRestart())); - perf = new QTime(); + perf = new TQTime(); reloadIcons=TRUE; @@ -110,11 +110,11 @@ KoolDock::KoolDock(QWidget *parent, const char *name) : QWidget(parent, name, WS init1(); - QString welcomeMsg; + TQString welcomeMsg; if (fFirstRun) { // Show welcome dialog. - welcomeMsg = QString("
Welcome
It appears to be the first time you run KoolDock.
" + welcomeMsg = TQString("
Welcome
It appears to be the first time you run KoolDock.
" "By default the dock is hidden at the botton of the screen, move your mouse" " to the bottom edge of the screen and the dock will appear.
" "Right click on the dock for a menu that allows you to configure it
" @@ -146,8 +146,8 @@ KoolDock::~KoolDock() void KoolDock::mTimerEnd() { if (menuCount>0) return; - QPoint pointer; - pointer = QCursor::pos(); + TQPoint pointer; + pointer = TQCursor::pos(); lastXPos=pointer.x()-rx; lastYPos=pointer.y()-ry; int px,py,pw,ph,pt; @@ -175,7 +175,7 @@ void KoolDock::mTimerEnd() } else { - debug(QString("mTimer1Leave: %1 %2 %3 %4 %5 %6").arg(pointer.x()).arg(pointer.y()).arg(dh-h).arg(ry).arg(rx).arg(x+w)); + debug(TQString("mTimer1Leave: %1 %2 %3 %4 %5 %6").arg(pointer.x()).arg(pointer.y()).arg(dh-h).arg(ry).arg(rx).arg(x+w)); onleaveEvent(NULL); } } @@ -189,7 +189,7 @@ void KoolDock::mTimerEnd() } else { - debug(QString("mTimer2EnterEv: %1 %2").arg(pointer.x()-rx).arg(pointer.y()-ry)); + debug(TQString("mTimer2EnterEv: %1 %2").arg(pointer.x()-rx).arg(pointer.y()-ry)); if (mpx>=firstX && mpx<=firstX+tmpw) { enterEvent(NULL); @@ -200,7 +200,7 @@ void KoolDock::mTimerEnd() { if (fExpanded) { - debug(QString("mTimer2Leave")); + debug(TQString("mTimer2Leave")); onleaveEvent(NULL); } } @@ -212,8 +212,8 @@ void KoolDock::mTimerEnd() void KoolDock::trackTimerEnd() { - QPoint pointer; - pointer = QCursor::pos(); + TQPoint pointer; + pointer = TQCursor::pos(); int px, py; if ((fOrientation & 1) == 1) { @@ -228,15 +228,15 @@ void KoolDock::trackTimerEnd() if ((fOrientation & 2) == 2) py = dh-py; if (py+2 >= dh && px > x0 && px < x0+w0) { - if(track2active==FALSE) QTimer::singleShot( hideTimer, this, SLOT(trackTimer2End()) ); + if(track2active==FALSE) TQTimer::singleShot( hideTimer, this, SLOT(trackTimer2End()) ); track2active=true; } } void KoolDock::trackTimer2End() { - QPoint pointer; - pointer = QCursor::pos(); + TQPoint pointer; + pointer = TQCursor::pos(); int px, py; if ((fOrientation & 1) == 1) { @@ -257,7 +257,7 @@ void KoolDock::trackTimer2End() trackTimer->stop(); getBottomBG(); if(h1 > h0) getTopBG(); - debug(QString("tracktimer: grabWindow(%1, %2, %3, %4)").arg(x1).arg(dh - h1).arg(w1).arg(h1)); + debug(TQString("tracktimer: grabWindow(%1, %2, %3, %4)").arg(x1).arg(dh - h1).arg(w1).arg(h1)); move2( x, dh - h); resize2(w, h); Ybase = iwBig2; @@ -266,24 +266,24 @@ void KoolDock::trackTimer2End() track2active=FALSE; } -void KoolDock::paintEvent(QPaintEvent *) +void KoolDock::paintEvent(TQPaintEvent *) { // Draw backgound, icons, and all that stuff over the widget. - QPainter p; + TQPainter p; if (initialization && ptPart==5) return; p.begin (&offscr,this); int i; int ii; - debug(QString("painting")); + debug(TQString("painting")); // draw background (new engine) int bgY; - QImage TempBG; - QPixmap TempScaledLeft; - //QPixmap TempScaledCenter; - QPixmap TempScaledRight; + TQImage TempBG; + TQPixmap TempScaledLeft; + //TQPixmap TempScaledCenter; + TQPixmap TempScaledRight; int p1,p2,p3,p4=0,p5=0,p6,p7,p8,p9,p10,pt; if (wisAnimed()) { - KPixmapEffect::fade(*currentIcon, ((float) animValue )*0.01, QColor("#FFFFFF")); + KPixmapEffect::fade(*currentIcon, ((float) animValue )*0.01, TQColor("#FFFFFF")); } //Lets apply an effect to the active window in TaskBar if(item->getId()==wm->activeWindow() && item->getId()!=0) { - KPixmapEffect::fade(*currentIcon, ((float)60)*0.01, QColor("#FFFFFF")); + KPixmapEffect::fade(*currentIcon, ((float)60)*0.01, TQColor("#FFFFFF")); } // End drawing icon effects @@ -595,9 +595,9 @@ void KoolDock::paintEvent(QPaintEvent *) if ((fOrientation & 2)==2) p2=-Ybase; } if ((fOrientation & 1)==1) - {p.fillRect (QRect(p2, p1, p4, p3), QBrush(sepColor));} + {p.fillRect (TQRect(p2, p1, p4, p3), TQBrush(sepColor));} else - {p.fillRect (QRect(p1, p2, p3, p4), QBrush(sepColor));} + {p.fillRect (TQRect(p1, p2, p3, p4), TQBrush(sepColor));} } } if((fSystray==1) && (numSystray>0)) @@ -620,28 +620,28 @@ void KoolDock::paintEvent(QPaintEvent *) if ((fOrientation & 2)==2) p2=-Ybase; } if ((fOrientation &1)==1) - {p.fillRect (QRect(p2, p1, p4, p3), QBrush(sepColor));} + {p.fillRect (TQRect(p2, p1, p4, p3), TQBrush(sepColor));} else - {p.fillRect (QRect(p1, p2, p3, p4), QBrush(sepColor));} + {p.fillRect (TQRect(p1, p2, p3, p4), TQBrush(sepColor));} } } p.end(); // Finally update the widget if ((fOrientation & 1)==1) - {bitBlt(this, 0, 0, &offscr, 0, 0, h1, dh, Qt::CopyROP);} + {bitBlt(this, 0, 0, &offscr, 0, 0, h1, dh, TQt::CopyROP);} else - {bitBlt(this, 0, 0, &offscr, 0, 0, dw, h1, Qt::CopyROP);} + {bitBlt(this, 0, 0, &offscr, 0, 0, dw, h1, TQt::CopyROP);} //return; //Preparing mask - QBitmap bm(size(),true); - QPainter mp; + TQBitmap bm(size(),true); + TQPainter mp; mp.begin(&bm, this); - mp.setPen( Qt::black ); - mp.fillRect(rect(), Qt::black); - mp.fillRect(QRect(0, 0, 1, 1), Qt::white); + mp.setPen( TQt::black ); + mp.fillRect(rect(), TQt::black); + mp.fillRect(TQRect(0, 0, 1, 1), TQt::white); p1=0; p2=0; if (!fLeftImg.isEmpty()) @@ -655,22 +655,22 @@ void KoolDock::paintEvent(QPaintEvent *) if (p3<0) p3=0; if (p5+p3>dw) p5=dw-p3; if ((fOrientation & 1)==1) - {p6++;mp.fillRect(QRect(p4, p3, p6, p5), Qt::white);} + {p6++;mp.fillRect(TQRect(p4, p3, p6, p5), TQt::white);} else - {mp.fillRect(QRect(p3, p4, p5, p6), Qt::white);} + {mp.fillRect(TQRect(p3, p4, p5, p6), TQt::white);} if ((fOrientation & 2)==2) - {mp.fillRect(QRect(rw-1, rh-1, 1, 1), Qt::black);} + {mp.fillRect(TQRect(rw-1, rh-1, 1, 1), TQt::black);} else { if ((fOrientation & 1)==1) - {mp.fillRect(QRect(0, rh-1, 1, 1), Qt::black);} + {mp.fillRect(TQRect(0, rh-1, 1, 1), TQt::black);} else - {mp.fillRect(QRect(rw-1, 0, 1, 1), Qt::black);} + {mp.fillRect(TQRect(rw-1, 0, 1, 1), TQt::black);} } if (initialization) { - mp.fillRect(rect(), Qt::black); - mp.fillRect(QRect(0, 0, 1, 1), Qt::white); + mp.fillRect(rect(), TQt::black); + mp.fillRect(TQRect(0, 0, 1, 1), TQt::white); } mp.end(); setMask(bm); @@ -684,7 +684,7 @@ void KoolDock::unhighlight() paintEvent(NULL);; } -void KoolDock::mousePressEvent( QMouseEvent *e) +void KoolDock::mousePressEvent( TQMouseEvent *e) { mPress (e->x(), e->y(), e->button()); } @@ -708,7 +708,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) mx = mx+Offset; iClicked=itemFromPoint(mx); - if (srcButton == Qt::LeftButton) + if (srcButton == TQt::LeftButton) { i=iClicked; @@ -726,7 +726,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) paintEvent(NULL); // run the app - debug(QString("clicked: %1").arg(items.at(i)->getName())); + debug(TQString("clicked: %1").arg(items.at(i)->getName())); if (items.at(i)->getName() == "KMenu") { // show K Menu @@ -752,8 +752,8 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) KWin::WindowInfo info; KWin::WindowInfo winfo; info = KWin::windowInfo(id,0,NET::WM2WindowClass); - QString name = info.visibleName(); - QCString cls = info.windowClassClass(); + TQString name = info.visibleName(); + TQCString cls = info.windowClassClass(); if(i>=((int)items.count()-numSystray)) { @@ -761,9 +761,9 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) KWin::deIconifyWindow(id); kdDebug(0) << "Systray: " << id << " Name: " << name << " Estado: " << info.state() << endl; - //QMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); + //TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - //QApplication::sendEvent(, &me); + //TQApplication::sendEvent(, &me); } else { @@ -836,7 +836,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) if(fHidden == 1 && fHideOnClick == 1) onleaveEvent(NULL); // it's configurable } } - else if(srcButton == Qt::RightButton) + else if(srcButton == TQt::RightButton) { // Right button. i = iClicked; @@ -863,15 +863,15 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) godesk->clear(); for(int index=0; indexinsertItem(SmallIcon("forward"), tmp, index+1); if(KWin::currentDesktop()==(index+1)) godesk->setItemEnabled(menustate, false); } //End godesk Menu //Append Navigation Menu (godesk+Time) - QDateTime timeEntry=QDateTime::currentDateTime(); - QString tmp=i18n("Navigation: Desktop %1").arg(KWin::currentDesktop()); + TQDateTime timeEntry=TQDateTime::currentDateTime(); + TQString tmp=i18n("Navigation: Desktop %1").arg(KWin::currentDesktop()); popup->insertTitle(tmp); popup->insertItem(SmallIcon("forward"), i18n("&Go to Desktop"), godesk); popup->insertItem(SmallIcon("forward"), i18n("&Task List"), tasklist); @@ -894,7 +894,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) if (i==0 && fShowKMenu) { // if user right clicked on the K menu, show the configuration menu. - popup->exec(QCursor::pos()); + popup->exec(TQCursor::pos()); } else { @@ -906,7 +906,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) appMenu->insertItem(SmallIcon("fileclose"), i18n("&Delete item"), this, SLOT(removeItem())); appMenu->insertSeparator(); appMenu->insertItem(SmallIcon("forward"), "&KoolDock", popup); - appMenu->exec(QCursor::pos()); + appMenu->exec(TQCursor::pos()); } } } @@ -922,7 +922,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) //Begin Move to Desktop Menu deskpopup->clear(); - QString tmp=i18n("All desktops"); + TQString tmp=i18n("All desktops"); menustate=deskpopup->insertItem(SmallIcon("forward"), tmp, 0); tmp=i18n("Current Desktop &%1").arg(KWin::currentDesktop()); menustate=deskpopup->insertItem(SmallIcon("forward"), tmp, KWin::currentDesktop()); @@ -938,7 +938,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) { if((i+1)!=KWin::currentDesktop()) { - QString tmpd=i18n("Desktop &%1").arg(i+1); + TQString tmpd=i18n("Desktop &%1").arg(i+1); menustate=deskpopup->insertItem(SmallIcon("forward"), tmpd, i+1); } } @@ -958,7 +958,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) if (fGrouping && items.at(iClicked)->getCount()>0) { iGroup=true; - QCString cls = winfo.windowClassClass(); + TQCString cls = winfo.windowClassClass(); popups.clear(); for (j=0, item = witems.at(0); item; j++, item = witems.next()) { @@ -989,7 +989,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) } appMenu->insertSeparator(); appMenu->insertItem(SmallIcon("forward"), "KoolDock", popup); - appMenu->exec(QCursor::pos()); + appMenu->exec(TQCursor::pos()); iGroup=false; } } @@ -997,7 +997,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton) else { // Show the configuration popup menu if the user clicked on another place. - popup->exec(QCursor::pos()); + popup->exec(TQCursor::pos()); } deskpopup->clear(); godesk->clear(); @@ -1138,8 +1138,8 @@ void KoolDock::mMoveEvent( int ex, int ey) // get the name of the item at the mouse position if (!mksmallTimer->isActive() && !mkbigTimer->isActive()) { - QPoint pointer; - pointer = QCursor::pos(); + TQPoint pointer; + pointer = TQCursor::pos(); if (i < MAX_ICONS+1) { if (((int)i >= 0) && (i < items.count())) @@ -1199,7 +1199,7 @@ void KoolDock::mMoveEvent( int ex, int ey) //Mouse Wheel now switches desktops (away from user desktop+1, towards user desktop-1) //-Francisco -void KoolDock::wheelEvent(QWheelEvent *e) +void KoolDock::wheelEvent(TQWheelEvent *e) { if(e->delta()==120 && (KWin::currentDesktop()stop(); last_mx=-1; - debug(QString("Stopped mkbigTimer")); + debug(TQString("Stopped mkbigTimer")); if (zoomTicksB>=neededTicksB && fSpeed) { //performace check @@ -1254,7 +1254,7 @@ void KoolDock::mkbigTimerDo() iy = (iDist - iwSmall) / 2; funcH = iwBig - iwSmall; if (fHidden == 1) Ybase = iwBig2*(fzoomSpeed-zoomVal)/fzoomSpeed; - mMoveEvent(QWidget::mapFromGlobal ( QCursor::pos() ).x(), QWidget::mapFromGlobal ( QCursor::pos() ).y()); + mMoveEvent(TQWidget::mapFromGlobal ( TQCursor::pos() ).x(), TQWidget::mapFromGlobal ( TQCursor::pos() ).y()); paintEvent(NULL); } @@ -1287,7 +1287,7 @@ void KoolDock::mksmallTimerstop() mksmallTimer->stop(); xosdw->move2(0,rdh); fExpanded=FALSE; - debug(QString("Stopped mksmallTimer")); + debug(TQString("Stopped mksmallTimer")); if (!initialization) {if (fHidden==0) {mTimer->changeInterval(250);} else {mTimer->stop();}} @@ -1335,7 +1335,7 @@ void KoolDock::mksmallTimerstop() if (initialization) pTest(); } -void KoolDock::enterEvent(QEvent *) +void KoolDock::enterEvent(TQEvent *) { if (fExpanded==TRUE && !mksmallTimer->isActive() || mkbigTimer->isActive()) return; if (fStayBelow==1 && fHidden==0) setDockAbove(); @@ -1372,7 +1372,7 @@ void KoolDock::enterEvent(QEvent *) mkbigTimer->start(zoomStep, FALSE); } -void KoolDock::onleaveEvent(QEvent *) +void KoolDock::onleaveEvent(TQEvent *) { if (menuCount>0) return; if (mksmallTimer->isActive()==TRUE) return; @@ -1380,8 +1380,8 @@ void KoolDock::onleaveEvent(QEvent *) zoomTicksS=0; perf->start(); debug("onleaveEvent"); - lastXPos = QWidget::mapFromGlobal ( QCursor::pos() ).x(); - lastYPos = QWidget::mapFromGlobal ( QCursor::pos() ).y(); + lastXPos = TQWidget::mapFromGlobal ( TQCursor::pos() ).x(); + lastYPos = TQWidget::mapFromGlobal ( TQCursor::pos() ).y(); if (mkbigTimer->isActive()) { mkbigTimer->stop(); @@ -1407,19 +1407,19 @@ void KoolDock::edit() } -void KoolDock::run(const QString& command) +void KoolDock::run(const TQString& command) { - QString exec; + TQString exec; kapp->propagateSessionManager(); _filterData->setData( command.stripWhiteSpace() ); - QStringList filters; + TQStringList filters; filters << "kurisearchfilter" << "kshorturifilter"; KURIFilter::self()->filterURI( *(_filterData), filters ); - QString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url()); + TQString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url()); // Nothing interesting. Quit! if(cmd.isEmpty()) { @@ -1437,7 +1437,7 @@ void KoolDock::run(const QString& command) { if (useList) { - KApplication::startServiceByDesktopPath (command, lstDrop, &QString(0) ,&QCString(0) ,0 , "" ,true); + KApplication::startServiceByDesktopPath (command, lstDrop, &TQString(0) ,&TQCString(0) ,0 , "" ,true); } else { @@ -1498,7 +1498,7 @@ void KoolDock::addWindows() if(fShowTaskbar) { KWin::WindowInfo info; - QValueList::ConstIterator it; + TQValueList::ConstIterator it; int i; Item *item; @@ -1552,8 +1552,8 @@ void KoolDock::workAreaChanged() int mdw,mdh,mdt; if (xinerama==0) { - mdw=QApplication::desktop()->width(); - mdh = QApplication::desktop()->height(); + mdw=TQApplication::desktop()->width(); + mdh = TQApplication::desktop()->height(); } else { @@ -1593,7 +1593,7 @@ void KoolDock::windowAdded(WId id) if (!fShowTaskbar) return; KWin::WindowInfo info; info = KWin::windowInfo(id); - QString name = info.name(); + TQString name = info.name(); if (name == "kooldock xosd window") { debug("Not adding OSD window to taskbar."); @@ -1605,7 +1605,7 @@ void KoolDock::windowAdded(WId id) return; } - debug(QString("windowAdded(%1)").arg(name)); + debug(TQString("windowAdded(%1)").arg(name)); if (addwTask(id)) addToTaskList(id); addTask(id); @@ -1623,11 +1623,11 @@ void KoolDock::windowRemoved(WId id) if (!fShowTaskbar) return; unsigned int i; Item *item; - debug(QString("windowRemoved(%1)").arg(id)); + debug(TQString("windowRemoved(%1)").arg(id)); KWin::WindowInfo info; info = KWin::windowInfo(id); - QString name = info.name(); + TQString name = info.name(); if (name == "kooldock xosd window") { @@ -1692,13 +1692,13 @@ void KoolDock::windowChanged(WId id, unsigned int properties) #endif if ((fShowNotification) && (id != wm->activeWindow())) { - debug(QString("windowChanged (inactive window changed)")); + debug(TQString("windowChanged (inactive window changed)")); // An inactive window's title changed // notify user item->anim(TRUE); if(onChangeTimer == NULL) { - onChangeTimer = new QTimer(this); + onChangeTimer = new TQTimer(this); connect( onChangeTimer, SIGNAL(timeout()), this, SLOT(onChangeTimerTicked())); onChangeTimer->start( ON_CHANGE_ANIM_INTERVAL, FALSE ); } @@ -1735,14 +1735,14 @@ void KoolDock::systemTrayWindowAdded(WId id) { KWin::WindowInfo info; info = KWin::windowInfo(id); - QString name = info.visibleName(); + TQString name = info.visibleName(); if (ignored(info.name()) == false) { - QPixmap pix = KWin::icon(id, iwBig2, iwBig2, TRUE); + TQPixmap pix = KWin::icon(id, iwBig2, iwBig2, TRUE); numSystray++; items.append(new Item(pix, id, name, iwSmall, iwBig2)); - debug(QString("addSystem Tray(%1)").arg(info.visibleName())); + debug(TQString("addSystem Tray(%1)").arg(info.visibleName())); doUpdateGeometry(); } } @@ -1824,7 +1824,7 @@ void KoolDock::doUpdateGeometry() move2( x, dh - h ); } - //if ((fOrientation & 1)==1) {offscr = QPixmap(h1, w1);} else {offscr = QPixmap(w1, h1);} + //if ((fOrientation & 1)==1) {offscr = TQPixmap(h1, w1);} else {offscr = TQPixmap(w1, h1);} ii_first = 0; ii_last = items.count() - 1; @@ -1852,8 +1852,8 @@ void KoolDock::doUpdateGeometry() { move(0,rdh); } - debug(QString("w1: %1").arg(w1)); - debug(QString("x1: %1").arg(x1)); + debug(TQString("w1: %1").arg(w1)); + debug(TQString("x1: %1").arg(x1)); if (fExpanded) {last_mx=-10; mMoveEvent(lastXPos,lastYPos);} oldfirstX=x; oldtmpw=w; @@ -1870,7 +1870,7 @@ bool KoolDock::rmTask(WId id, int iFound) bool hasfound; hasfound=false; miFound=iFound; - QCString cls; + TQCString cls; if (miFound==-1) { @@ -1900,7 +1900,7 @@ bool KoolDock::rmTask(WId id, int iFound) if (cls==item->getClass()) { int cnt=item->getCount(); - //KMessageBox::information(0,QString("%1").arg(cnt)); + //KMessageBox::information(0,TQString("%1").arg(cnt)); fitem->setCount(0); if (cnt==0) { @@ -1970,8 +1970,8 @@ bool KoolDock::addTask(WId id, int iFound) KWin::WindowInfo info; info = KWin::windowInfo(id,0,NET::WM2WindowClass); const int SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask; - QString name = info.visibleName(); - QCString cls = info.windowClassClass(); + TQString name = info.visibleName(); + TQCString cls = info.windowClassClass(); if (info.windowType(SUPPORTED_WINDOW_TYPES) == NET::Normal || info.windowType(SUPPORTED_WINDOW_TYPES) == NET::Override || info.windowType(SUPPORTED_WINDOW_TYPES) == NET::Dialog || info.windowType(SUPPORTED_WINDOW_TYPES) == NET::Unknown) { if (info.isMinimized() || fMinimizedOnly==0) @@ -2011,10 +2011,10 @@ bool KoolDock::addTask(WId id, int iFound) } } } - QPixmap pix; + TQPixmap pix; items.insert(items.count()-numSystray, new Item(pix, id, name, iwSmall, iwBig2, TRUE)); items.at(items.count()-1)->setClass(cls); - debug(QString("addTask(%1)").arg(info.visibleName())); + debug(TQString("addTask(%1)").arg(info.visibleName())); return true; } } @@ -2029,8 +2029,8 @@ bool KoolDock::addwTask(WId id) KWin::WindowInfo info; info = KWin::windowInfo(id,0,NET::WM2WindowClass); const int SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask; - QString name = info.visibleName(); - QCString cls = info.windowClassClass(); + TQString name = info.visibleName(); + TQCString cls = info.windowClassClass(); if (info.windowType(SUPPORTED_WINDOW_TYPES) == NET::Normal || info.windowType(SUPPORTED_WINDOW_TYPES) == NET::Override || info.windowType(SUPPORTED_WINDOW_TYPES) == NET::Dialog || info.windowType(SUPPORTED_WINDOW_TYPES) == NET::Unknown) { @@ -2038,7 +2038,7 @@ bool KoolDock::addwTask(WId id) { if (ignored(info.name()) == false) { - QPixmap pix = KWin::icon(id, iwBig2, iwBig2, TRUE); + TQPixmap pix = KWin::icon(id, iwBig2, iwBig2, TRUE); witems.append(new Item(pix, id, name, iwSmall, iwBig2)); witems.at(witems.count()-1)->setClass(cls); witems.at(witems.count()-1)->setIndex(witems.count()-1); @@ -2065,7 +2065,7 @@ void KoolDock::loadConf() xosdSize = config->readNumEntry("xosdSize", 17); xosdShadowOffset = config->readNumEntry("xosdShadowOffset", 2); fShowBorders = config->readNumEntry("ShowBorders", 0); - borderColor = QColor(config->readEntry("BorderColor", "#b1c4de")); + borderColor = TQColor(config->readEntry("BorderColor", "#b1c4de")); iwSmall = config->readNumEntry("SmallIconSize", 32); iwBig = config->readNumEntry("BigIconSize", 90); fAmount = config->readNumEntry("BigIconAmount", 5); @@ -2083,8 +2083,8 @@ void KoolDock::loadConf() { dockOpacity = 100; } - bgColor = QColor(config->readEntry("BackgroundColor", "#ccccff")); - sepColor = QColor(config->readEntry("SeparatorColor", "#000000")); + bgColor = TQColor(config->readEntry("BackgroundColor", "#ccccff")); + sepColor = TQColor(config->readEntry("SeparatorColor", "#000000")); fPriority = config->readNumEntry("Priority", 3); fMouseTimer = config->readNumEntry("MouseTimer", 25); fClipping = config->readNumEntry("Clipping", 0); @@ -2136,8 +2136,8 @@ void KoolDock::loadConf() scaleMax = config->readBoolEntry("scaleMax", FALSE); fFirstRun = config->readBoolEntry("FirstRun", TRUE); xinerama = config->readNumEntry("Xinerama", 0); - leftRes=config->readNumEntry("leftRes", QApplication::desktop()->width()); - XinDesiredHeight=config->readNumEntry("XinDesiredHeight", QApplication::desktop()->height()); + leftRes=config->readNumEntry("leftRes", TQApplication::desktop()->width()); + XinDesiredHeight=config->readNumEntry("XinDesiredHeight", TQApplication::desktop()->height()); XinPreviousWidth=config->readNumEntry("XinPreviousWidth", 0); hideTimer = config->readNumEntry("hideTimer", 125); Solid = config->readNumEntry("Solid", 1); @@ -2182,10 +2182,10 @@ void KoolDock::loadConf() void KoolDock::loadIgnore() { - QString line; + TQString line; // read the ignorelist into 'ignoreList' - QFile in(QString(progPath + "/ignorelist.conf")); + TQFile in(TQString(progPath + "/ignorelist.conf")); //clear de ignoreList and the KEditListBox (ignoreBox) ignoreList.clear(); @@ -2368,8 +2368,8 @@ void KoolDock::editPref() setupdlg->SHeight->setEnabled(false); setupdlg->PWidth->setEnabled(false); setupdlg->xrma->setChecked(false); - setupdlg->SleftRes->setValue(QApplication::desktop()->width()); - setupdlg->SHeight->setValue(QApplication::desktop()->height()); + setupdlg->SleftRes->setValue(TQApplication::desktop()->width()); + setupdlg->SHeight->setValue(TQApplication::desktop()->height()); } setupdlg->nav->setChecked(fShowNav==1); setupdlg->chkSshot->setChecked(fShowShot); @@ -2401,15 +2401,15 @@ void KoolDock::editPref() void KoolDock::loadMenu() { - QDir homeDir = QDir::home(); + TQDir homeDir = TQDir::home(); if (homeDir.exists(menuPath)) { - QDir dir(menuPath); + TQDir dir(menuPath); //First we make sure every index is correct! //Lets update the launchers index - QString preffix; - QStringList fileListRemove=dir.entryList("*.desktop"); - QStringList fileListRemove2=fileListRemove; + TQString preffix; + TQStringList fileListRemove=dir.entryList("*.desktop"); + TQStringList fileListRemove2=fileListRemove; //Not really sure why I couldn't do this within the other for, something like fileListRemove[i].remove(0,2).prepend(preffix), but hell it works for(unsigned int i=0; i=10) preffix=QString("%1").arg(i); + if(i<10) preffix=TQString("0%1").arg(i); + if(i>=10) preffix=TQString("%1").arg(i); - dir.rename(fileListRemove[i], QString("%1%2").arg(preffix).arg(fileListRemove2[i])); + dir.rename(fileListRemove[i], TQString("%1%2").arg(preffix).arg(fileListRemove2[i])); } //End updating launchers index - QStringList fileList = dir.entryList( "*.desktop"); + TQStringList fileList = dir.entryList( "*.desktop"); if(!fileList.isEmpty()) { - for ( QStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) + for ( TQStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { if ( ((*it) != ".") && ((*it) != "..") ) { @@ -2442,19 +2442,19 @@ void KoolDock::loadMenu() else { debug("Config directory doesn't exits"); - QDir progPathDir(progPath); + TQDir progPathDir(progPath); progPathDir.mkdir(progPath); - QDir menuPathDir(menuPath); + TQDir menuPathDir(menuPath); menuPathDir.mkdir(menuPath); debug("Created item directory"); // create initial entries. - addFile(QString("00_konqueror.desktop"), QString("konqueror"), QString("kfmclient openProfile webbrowsing"), QString("Konqueror Web Browser"), true, false, false, false, QString("na")); - addFile(QString("01_home.desktop"), QString("kfm_home"), QString("kfmclient openProfile filemanagement"), QString("Home directory"), true, false, false, false, QString("na")); - addFile(QString("02_kmail.desktop"), QString("kmail"), QString("kmail"), QString("KMail"), true, false, false, false, QString("na")); - addFile(QString("03_kate.desktop"), QString("kate"), QString("kate"), QString("Kate"), true, false, false, false, QString("na")); - addFile(QString("04_konsole.desktop"), QString("konsole"), QString("konsole"), QString("Konsole"), true, false, false, false, QString("na")); - addFile(QString("05_kcontrol.desktop"), QString("kcontrol"), QString("kcontrol"), QString("Control Center"), true, false, false, false, QString("na")); + addFile(TQString("00_konqueror.desktop"), TQString("konqueror"), TQString("kfmclient openProfile webbrowsing"), TQString("Konqueror Web Browser"), true, false, false, false, TQString("na")); + addFile(TQString("01_home.desktop"), TQString("kfm_home"), TQString("kfmclient openProfile filemanagement"), TQString("Home directory"), true, false, false, false, TQString("na")); + addFile(TQString("02_kmail.desktop"), TQString("kmail"), TQString("kmail"), TQString("KMail"), true, false, false, false, TQString("na")); + addFile(TQString("03_kate.desktop"), TQString("kate"), TQString("kate"), TQString("Kate"), true, false, false, false, TQString("na")); + addFile(TQString("04_konsole.desktop"), TQString("konsole"), TQString("konsole"), TQString("Konsole"), true, false, false, false, TQString("na")); + addFile(TQString("05_kcontrol.desktop"), TQString("kcontrol"), TQString("kcontrol"), TQString("Control Center"), true, false, false, false, TQString("na")); loadMenu(); } @@ -2486,20 +2486,20 @@ void KoolDock::onChangeTimerTicked() } -void KoolDock::updateBackground(const QPixmap& pix) +void KoolDock::updateBackground(const TQPixmap& pix) { if (pix.width()==1 && pix.height()==1) { if (fHidden == 0) { - if ((fOrientation & 1)==1) {bottomBg = QPixmap(h1, dw);} else {bottomBg = QPixmap(dw, h1);} + if ((fOrientation & 1)==1) {bottomBg = TQPixmap(h1, dw);} else {bottomBg = TQPixmap(dw, h1);} bottomBg.fill (pix.convertToImage().pixel(0,0)); } if (dockOpacity > 0) {bitBlt(&bottomBgf,0,0,&bottomBg);KPixmapEffect::fade(bottomBgf, ((float)dockOpacity)*0.01, bgColor);} } else { - if (fHidden == 0) bottomBg = QPixmap(pix); + if (fHidden == 0) bottomBg = TQPixmap(pix); if (dockOpacity > 0) {bitBlt(&bottomBgf,0,0,&bottomBg);KPixmapEffect::fade(bottomBgf, ((float)dockOpacity)*0.01, bgColor);} } uw=w; @@ -2556,9 +2556,9 @@ void KoolDock::moveApp() KWin::WindowInfo info=KWin::windowInfo(cId); activateApp(); - QCursor::setPos(info.geometry().center()); + TQCursor::setPos(info.geometry().center()); - NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); + NETRootInfo ri(tqt_xdisplay(), NET::WMMoveResize); ri.moveResizeRequest(cId, info.geometry().center().x(), info.geometry().center().y(), NET::Move); } @@ -2567,9 +2567,9 @@ void KoolDock::resizeApp() KWin::WindowInfo info=KWin::windowInfo(cId); activateApp(); - QCursor::setPos(info.geometry().bottomRight()); + TQCursor::setPos(info.geometry().bottomRight()); - NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); + NETRootInfo ri(tqt_xdisplay(), NET::WMMoveResize); ri.moveResizeRequest(cId, info.geometry().bottomRight().x(), info.geometry().bottomRight().y(), NET::BottomRight); } @@ -2578,8 +2578,8 @@ void KoolDock::minApp() { Item *item; int i; - QPixmap shot; - QImage tmpImg; + TQPixmap shot; + TQImage tmpImg; KWin::WindowInfo info=KWin::windowInfo(cId); if (info.isMinimized()) @@ -2604,7 +2604,7 @@ void KoolDock::minApp() if(item->getId() == cId) { // take the screenshot - shot = QPixmap::grabWindow(cId); + shot = TQPixmap::grabWindow(cId); // scale the screenshot tmpImg = shot.convertToImage(); tmpImg.scale(iwBig2, iwBig2); @@ -2618,7 +2618,7 @@ void KoolDock::minApp() KWin::iconifyWindow(cId, true); } hide(); - QTimer::singleShot( 100, this, SLOT(refreshBackground()) ); + TQTimer::singleShot( 100, this, SLOT(refreshBackground()) ); } @@ -2656,7 +2656,7 @@ void KoolDock::maxApp() } KWin::activateWindow(cId); hide(); - QTimer::singleShot( 100, this, SLOT(refreshBackground()) ); + TQTimer::singleShot( 100, this, SLOT(refreshBackground()) ); } void KoolDock::restApp() @@ -2681,7 +2681,7 @@ void KoolDock::restApp() KWin::deIconifyWindow(cId, true); KWin::activateWindow(cId); hide(); - QTimer::singleShot( 100, this, SLOT(refreshBackground()) ); + TQTimer::singleShot( 100, this, SLOT(refreshBackground()) ); } void KoolDock::minAllApps() @@ -2689,7 +2689,7 @@ void KoolDock::minAllApps() int i; Item *item; KWin::WindowInfo info=KWin::windowInfo(cId,0,NET::WM2WindowClass); - QCString cls=info.windowClassClass(); + TQCString cls=info.windowClassClass(); for (i=0, item = witems.at(0); item; i++, item = witems.next()) { if (!item->info.isMinimized()) @@ -2711,7 +2711,7 @@ void KoolDock::maxAllApps() int i; Item *item; KWin::WindowInfo info=KWin::windowInfo(cId,0,NET::WM2WindowClass); - QCString cls=info.windowClassClass(); + TQCString cls=info.windowClassClass(); for (i=0, item = witems.at(0); item; i++, item = witems.next()) { if (!(item->info.state() & NET::Max) || item->info.isMinimized()) @@ -2733,7 +2733,7 @@ void KoolDock::restAllApps() int i; Item *item; KWin::WindowInfo info=KWin::windowInfo(cId,0,NET::WM2WindowClass); - QCString cls=info.windowClassClass(); + TQCString cls=info.windowClassClass(); for (i=0, item = witems.at(0); item; i++, item = witems.next()) { if (item->info.state() & NET::Max || item->info.isMinimized()) @@ -2761,14 +2761,14 @@ void KoolDock::closeAllApps() int i; Item *item; KWin::WindowInfo info=KWin::windowInfo(cId,0,NET::WM2WindowClass); - QCString cls=info.windowClassClass(); + TQCString cls=info.windowClassClass(); for (i=0, item = witems.at(0); item; i++, item = witems.next()) { if ((fMinimizedOnly==0 || item->info.isMinimized()) || (fCurrent==0 || item->info.isOnDesktop(info.desktop()))) { if (cls==item->getClass()) { - NETRootInfo app(qt_xdisplay(), NET::CloseWindow); + NETRootInfo app(tqt_xdisplay(), NET::CloseWindow); app.closeWindowRequest(item->getId()); } } @@ -2789,7 +2789,7 @@ void KoolDock::shadeApp() } hide(); - QTimer::singleShot( 100, this, SLOT(refreshBackground()) ); + TQTimer::singleShot( 100, this, SLOT(refreshBackground()) ); } void KoolDock::activateApp() @@ -2817,20 +2817,20 @@ void KoolDock::activateApp() if (info.isMinimized()) KWin::deIconifyWindow(cId, true); KWin::activateWindow(cId); hide(); - QTimer::singleShot( 100, this, SLOT(refreshBackground()) ); + TQTimer::singleShot( 100, this, SLOT(refreshBackground()) ); } void KoolDock::closeApp() { - NETRootInfo app(qt_xdisplay(), NET::CloseWindow); + NETRootInfo app(tqt_xdisplay(), NET::CloseWindow); app.closeWindowRequest(cId); - debug(QString("Closed: %1").arg(cId)); + debug(TQString("Closed: %1").arg(cId)); } void KoolDock::editItem() { - run(QString("kfmclient openProperties ") + iFilename); + run(TQString("kfmclient openProperties ") + iFilename); } @@ -2842,7 +2842,7 @@ void KoolDock::sendToDesktop(int desktop) int i; Item *item; KWin::WindowInfo info=KWin::windowInfo(cId,0,NET::WM2WindowClass); - QCString cls=info.windowClassClass(); + TQCString cls=info.windowClassClass(); for (i=0, item = witems.at(0); item; i++, item = witems.next()) { if ((fMinimizedOnly==0 || item->info.isMinimized()) || (fCurrent==0 || item->info.isOnDesktop(info.desktop()))) @@ -2874,29 +2874,29 @@ void KoolDock::goToWindow(int win) void KoolDock::removeItem() { - QFile::remove(iFilename); + TQFile::remove(iFilename); restart(); } -void KoolDock::addFile(const QString& filename, - const QString& iconname, - const QString& execname, - const QString& name, +void KoolDock::addFile(const TQString& filename, + const TQString& iconname, + const TQString& execname, + const TQString& name, bool notify, bool terminal, bool tclose, bool cuser, - QString puser) + TQString puser) { - QString progPath = locateLocal("data", "kooldock"); - QString menuPath = progPath + QString("/menu/"); - QString confFile = locateLocal("config", "kooldockrc"); + TQString progPath = locateLocal("data", "kooldock"); + TQString menuPath = progPath + TQString("/menu/"); + TQString confFile = locateLocal("config", "kooldockrc"); - QFile out(QString(menuPath + filename)); + TQFile out(TQString(menuPath + filename)); if (out.open(IO_WriteOnly)) { - QTextStream out_s(&out); + TQTextStream out_s(&out); out_s << "[Desktop Entry]" << endl; out_s << "Comment=" << endl; out_s << "Encoding=UTF-8" << endl; @@ -2951,7 +2951,7 @@ void KoolDock::addFile(const QString& filename, } -bool KoolDock::ignored(const QString& appname) +bool KoolDock::ignored(const TQString& appname) { if(ignoreList.count()>0) { @@ -2967,14 +2967,14 @@ bool KoolDock::ignored(const QString& appname) #ifdef _ENABLE_DEBUG -void KoolDock::debug(QString message) +void KoolDock::debug(TQString message) { // debugging function (show messages to stdout) kdDebug(0) << "DEBUG: " << message << endl; } #endif #ifndef _ENABLE_DEBUG -void KoolDock::debug(QString) +void KoolDock::debug(TQString) { } #endif @@ -2998,7 +2998,7 @@ void KoolDock::endProg() void KoolDock::restart() { - QString cmd; + TQString cmd; cmd = mainPath + " &"; kdDebug(0) << "mainPath: " << mainPath << endl; debug("Restarting..."); @@ -3063,12 +3063,12 @@ void KoolDock::chkRestart() } -void KoolDock::setMainPath(const QString& path) +void KoolDock::setMainPath(const TQString& path) { mainPath = path; } -void KoolDock::setArgs(const QString& params) +void KoolDock::setArgs(const TQString& params) { args = params; if (args=="-options" || args=="-o") editPref(); @@ -3141,8 +3141,8 @@ void KoolDock::getBottomBG() pt=p3; p3=p4; p4=pt; } if (xinerama==1) p1+=XinPreviousWidth; - bottomBg = QPixmap::grabWindow(qt_xrootwin(), p1, p2, p3, p4); - //bottomBg = QPixmap::grabWindow(qt_xrootwin(), x1, dh - h1, w1, h1); + bottomBg = TQPixmap::grabWindow(tqt_xrootwin(), p1, p2, p3, p4); + //bottomBg = TQPixmap::grabWindow(tqt_xrootwin(), x1, dh - h1, w1, h1); } void KoolDock::getTopBG() @@ -3158,8 +3158,8 @@ void KoolDock::getTopBG() pt=p3; p3=p4; p4=pt; } if (xinerama==1) p1+=XinPreviousWidth; - topBg = QPixmap::grabWindow(qt_xrootwin(), p1, p2, p3, p4); - //topBg = QPixmap::grabWindow(qt_xrootwin(), x1, dh - h1, w1, h1 - h0); + topBg = TQPixmap::grabWindow(tqt_xrootwin(), p1, p2, p3, p4); + //topBg = TQPixmap::grabWindow(tqt_xrootwin(), x1, dh - h1, w1, h1 - h0); } void KoolDock::setDesktopIconsArea(int left, int top, int width, int height) @@ -3172,10 +3172,10 @@ void KoolDock::setDesktopIconsArea(int left, int top, int width, int height) } for (int i = 0; i < KWin::numberOfDesktops(); i++) { - QByteArray data; - QDataStream args(data, IO_WriteOnly); + TQByteArray data; + TQDataStream args(data, IO_WriteOnly); args << left << top << width << height << i; - client->send("kdesktop", "KDesktopIface", "desktopIconsAreaChanged(QRect, int)", data); + client->send("kdesktop", "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", data); } } @@ -3248,7 +3248,7 @@ void KoolDock::init1() if (fPriority > 19) fPriority = DEF_PRIORITY; if (fPriority < 0) fPriority = DEF_PRIORITY; setpriority(0, 0, fPriority); - debug(QString("Priority: %1").arg(fPriority)); + debug(TQString("Priority: %1").arg(fPriority)); iwBig2 = iwBig; @@ -3289,12 +3289,12 @@ void KoolDock::init1() } // Create the "xosd" widget xosdw = new xosd(); - rdh=QApplication::desktop()->height(); + rdh=TQApplication::desktop()->height(); xosdw->move(0,rdh); wm = new KWinModule(); - info = new NETWinInfo( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMState); + info = new NETWinInfo( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMState); info->setDesktop( NETWinInfo::OnAllDesktops ); info->setState(NETWinInfo::SkipTaskbar | NETWinInfo::SkipPager, NETWinInfo::SkipTaskbar | NETWinInfo::SkipPager); setBackgroundMode(NoBackground); @@ -3328,11 +3328,11 @@ void KoolDock::init1() connect(wm, SIGNAL(systemTrayWindowAdded(WId)), SLOT(systemTrayWindowAdded(WId))); connect(wm, SIGNAL(systemTrayWindowRemoved(WId)), SLOT(systemTrayWindowRemoved(WId))); - QCString screenstr; - screenstr.setNum(qt_xscreen()); - QCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr; + TQCString screenstr; + screenstr.setNum(tqt_xscreen()); + TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr; - Display *display = qt_xdisplay(); + Display *display = tqt_xdisplay(); net_system_tray_selection = XInternAtom(display, trayatom, false); net_system_tray_opcode = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", false); @@ -3340,7 +3340,7 @@ void KoolDock::init1() // Acquire system tray XSetSelectionOwner(display, net_system_tray_selection, winId(), CurrentTime); - //WId root = qt_xrootwin(); + //WId root = tqt_xrootwin(); if (XGetSelectionOwner (display, net_system_tray_selection) == winId()) { @@ -3366,16 +3366,16 @@ void KoolDock::init1() // Pseudo-Transparency code rootpix = new KRootPixmap(this); rootpix->setCustomPainting(TRUE); - connect(rootpix, SIGNAL(backgroundUpdated (const QPixmap &)), SLOT(updateBackground(const QPixmap &))); + connect(rootpix, SIGNAL(backgroundUpdated (const TQPixmap &)), SLOT(updateBackground(const TQPixmap &))); rootpix->start(); - debug(QString("Items loaded: %1").arg(items.count())); + debug(TQString("Items loaded: %1").arg(items.count())); //Simple work around to support xinerama (user defined) if(xinerama==0) { - dw=QApplication::desktop()->width(); - dh = QApplication::desktop()->height(); + dw=TQApplication::desktop()->width(); + dh = TQApplication::desktop()->height(); } else { @@ -3406,7 +3406,7 @@ void KoolDock::init1() } if (fOrientation==2 || fOrientation==1) { - QString tmpstr; + TQString tmpstr; tmpstr=fLeftImg; fLeftImg=fRightImg; fRightImg=tmpstr; @@ -3422,7 +3422,7 @@ void KoolDock::init1() // When the mouse pointer reaches the bottom of the screen, the bar should popup in a userdefined time (int hideTimer) track2active=FALSE; - trackTimer = new QTimer(this); + trackTimer = new TQTimer(this); connect(trackTimer, SIGNAL(timeout()), this, SLOT(trackTimerEnd())); ii_first = 0; @@ -3439,18 +3439,18 @@ void KoolDock::init1() nom = ""; aux = ""; - mTimer = new QTimer(this); + mTimer = new TQTimer(this); connect(mTimer, SIGNAL(timeout()), this, SLOT(mTimerEnd())); _filterData = new KURIFilterData(); - mkbigTimer = new QTimer(this); + mkbigTimer = new TQTimer(this); connect(mkbigTimer, SIGNAL(timeout()), this, SLOT(mkbigTimerDo())); - mksmallTimer = new QTimer(this); + mksmallTimer = new TQTimer(this); connect(mksmallTimer, SIGNAL(timeout()), this, SLOT(mksmallTimerDo())); - QWMatrix m; + TQWMatrix m; m.rotate( -90*fOrientation ); if (!fLeftImg.isEmpty()) { @@ -3475,7 +3475,7 @@ void KoolDock::init1() debug("Kooldock has started"); doUpdateGeometry(); - if ((fOrientation & 1)==1) {offscr = QPixmap(h1, dw); bottomBgf = QPixmap(h1, dw);} else {offscr = QPixmap(dw, h1); bottomBgf = QPixmap(dw, h1);} + if ((fOrientation & 1)==1) {offscr = TQPixmap(h1, dw); bottomBgf = TQPixmap(h1, dw);} else {offscr = TQPixmap(dw, h1); bottomBgf = TQPixmap(dw, h1);} soffset = iwSmall/2 + func2(abs(1-funcW)) + func2(abs(iDist+1-funcW)) + func2(abs(2*iDist+1-funcW)) + func2(abs(3*iDist +1-funcW))/2 - ((int)((iwBig - iwSmall)*0.6*fAmount) + iSpace*2)/2 - 4*iwSmall - (int)((3*iDist+1-funcW)*(func(0) + func(iDist) - 2*iwSmall)/(2*iDist))+1; eoffset=(int)((iwBig2-iwSmall)*fAmount/100); @@ -3573,9 +3573,9 @@ void KoolDock::refreshBackground() paintEvent(NULL); } -void KoolDock::dragMoveEvent(QDragMoveEvent* event) +void KoolDock::dragMoveEvent(TQDragMoveEvent* event) { - if (mouseOnLauncher && QTextDrag::canDecode(event)) + if (mouseOnLauncher && TQTextDrag::canDecode(event)) { event->accept(); } @@ -3585,21 +3585,21 @@ void KoolDock::dragMoveEvent(QDragMoveEvent* event) } } -void KoolDock::dropEvent(QDropEvent* event) +void KoolDock::dropEvent(TQDropEvent* event) { - QString strDrop; - QPoint pointer; - pointer = QCursor::pos(); + TQString strDrop; + TQPoint pointer; + pointer = TQCursor::pos(); int px, py; px = pointer.x()-pos().x(); py = pointer.y()-pos().y(); - QTextDrag::decode(event, strDrop); - lstDrop=QStringList::split(QString("\n"),strDrop,false); + TQTextDrag::decode(event, strDrop); + lstDrop=TQStringList::split(TQString("\n"),strDrop,false); useList=true; - mPress (px, py, Qt::LeftButton); + mPress (px, py, TQt::LeftButton); useList=false; } @@ -3608,7 +3608,7 @@ void KoolDock::movetoback(WId id) int i; Item *item; int ic=-1,jc; - QCString cls; + TQCString cls; //find clicked item in witems list for (i=0, item = witems.at(0); item; i++, item = witems.next()) @@ -3669,7 +3669,7 @@ void KoolDock::aboutToHide() void KoolDock::createMenu(KPopupMenu* tmpMenu, KWin::WindowInfo * info) { - QString appTitle; + TQString appTitle; int menustate; appTitle = info->visibleName(); appTitle.truncate(30); @@ -3726,13 +3726,13 @@ void KoolDock::updTaskList() } KWin::WindowInfo info; - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it=wm->windows().begin(); it != wm->windows().end(); ++it) { tmpinfo=KWin::windowInfo(*it); const int SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask; - QString name = tmpinfo.visibleName(); + TQString name = tmpinfo.visibleName(); if (tmpinfo.windowType(SUPPORTED_WINDOW_TYPES) == NET::Normal || tmpinfo.windowType(SUPPORTED_WINDOW_TYPES) == NET::Override || tmpinfo.windowType(SUPPORTED_WINDOW_TYPES) == NET::Dialog || tmpinfo.windowType(SUPPORTED_WINDOW_TYPES) == NET::Unknown) { @@ -3777,7 +3777,7 @@ void KoolDock::addToTaskList(WId id) rIndex = tmpinfo.desktop(); const int SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask; - QString name = tmpinfo.visibleName(); + TQString name = tmpinfo.visibleName(); if (tmpinfo.windowType(SUPPORTED_WINDOW_TYPES) == NET::Normal || tmpinfo.windowType(SUPPORTED_WINDOW_TYPES) == NET::Override || tmpinfo.windowType(SUPPORTED_WINDOW_TYPES) == NET::Dialog || tmpinfo.windowType(SUPPORTED_WINDOW_TYPES) == NET::Unknown) { diff --git a/src/kooldock.h b/src/kooldock.h index a129a6f..ac523f1 100644 --- a/src/kooldock.h +++ b/src/kooldock.h @@ -30,14 +30,14 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include "item.h" #include "xosd.h" @@ -59,22 +59,22 @@ const int SPACE_W = 1; // space between quick launchers and tasks (the seperator const int ON_CHANGE_ANIM_INTERVAL = 50; // animation's interval /** KoolDock is the base class of the project */ -class KoolDock : public QWidget +class KoolDock : public TQWidget { Q_OBJECT public: /** construtor */ - KoolDock(QWidget* parent=0, const char *name=0); + KoolDock(TQWidget* parent=0, const char *name=0); /** destructor */ ~KoolDock(); - //static bool writeIgnoreList(QString text); - void setMainPath(const QString& path); - void setArgs(const QString& param); + //static bool writeIgnoreList(TQString text); + void setMainPath(const TQString& path); + void setArgs(const TQString& param); clip *clipw; private: - QTime *perf; + TQTime *perf; // configuration variables int fShowTaskbar; // show-taskbar flag int fMinimizedOnly; // show only minimized icons flag @@ -90,7 +90,7 @@ class KoolDock : public QWidget int zoomTicksB, zoomTicksS; //counts timer ticks int neededTicksB,neededTicksS; //sets how many ticks is necessary to calculate new speed bool fSpeed; - QColor borderColor; + TQColor borderColor; int fHidden; // hidden dockbar int fStayBelow; int fOrientation; //bottom/left/top/right @@ -112,7 +112,7 @@ class KoolDock : public QWidget int fCurrent; //whether to only show windows on current desktop int oldDesktop; //number of previous desktop bool firstTime; //to control certain things - QString curTheme; //for the background theme (to preserve changes) + TQString curTheme; //for the background theme (to preserve changes) int leftRes; //Left monitor resolution int XinDesiredHeight; int XinPreviousWidth; @@ -125,24 +125,24 @@ class KoolDock : public QWidget int ptPart; bool mouseOnLauncher; - QStringList lstDrop; + TQStringList lstDrop; bool useList; Atom net_system_tray_selection; Atom net_system_tray_opcode; - QString fLeftImg; - QString fRightImg; - QString fCenterImg; + TQString fLeftImg; + TQString fRightImg; + TQString fCenterImg; bool fNWideBg; bool scaleMax; - QPixmap LeftImg; - QPixmap RightImg; - QPixmap CenterImg; - QPixmap TempScaledCenter; - QPixmap TestPix; - QImage TestIm; + TQPixmap LeftImg; + TQPixmap RightImg; + TQPixmap CenterImg; + TQPixmap TempScaledCenter; + TQPixmap TestPix; + TQImage TestIm; unsigned int oLeft, oRight; @@ -155,22 +155,22 @@ class KoolDock : public QWidget int lastX; int dockOpacity; - QColor bgColor; + TQColor bgColor; - QColor sepColor; // separator bar's color + TQColor sepColor; // separator bar's color int Ybase; // normal variables - QString progPath; - QString menuPath; - QString confFile; - QString iFilename; // right clicked item filename - QString mainPath; - QString args; + TQString progPath; + TQString menuPath; + TQString confFile; + TQString iFilename; // right clicked item filename + TQString mainPath; + TQString args; - QStringList ignoreList; + TQStringList ignoreList; NETWinInfo *info; @@ -192,29 +192,29 @@ class KoolDock : public QWidget int last_mx; int last_ncx; - QPtrList items;//currently visible items - QPtrList witems;//all windows on all desktops + TQPtrList items;//currently visible items + TQPtrList witems;//all windows on all desktops int iSize[MAX_ICONS + 1];//icon sizes int cx[MAX_ICONS + 1];//positions of small icons int cur_cx[MAX_ICONS + 1];//positions of visible icons - QPixmap offscr;//drawing buffer + TQPixmap offscr;//drawing buffer KRootPixmap *rootpix; KPixmap bottomBg; KPixmap bottomBgf; - QPixmap topBg; + TQPixmap topBg; KAboutDialog *aboutDlg; - QTimer *mkbigTimer; //zoom animation timers - QTimer *mksmallTimer; - QTimer *mTimer; //mouse move emulator (can't use normal event instead) - QTimer *onChangeTimer; // used when a window has changed and we need to notify user - QTimer *trackTimer; //checks whether mouse touches screen edge + TQTimer *mkbigTimer; //zoom animation timers + TQTimer *mksmallTimer; + TQTimer *mTimer; //mouse move emulator (can't use normal event instead) + TQTimer *onChangeTimer; // used when a window has changed and we need to notify user + TQTimer *trackTimer; //checks whether mouse touches screen edge int animStep; // animation step, not in use yet int iOnClick; // index of the quick launcher being clicked WId cId; // id of the application (used in the right click menu over the taskbar) - QString cClass; + TQString cClass; WId CurrentFocus; int onChangeAnimStep; KPopupMenu *deskpopup; @@ -225,24 +225,24 @@ class KoolDock : public QWidget KPopupMenu *advMenu; int menuCount, currMenu; bool allApps; - QPtrList popups; + TQPtrList popups; bool iGroup; int dIndex, nDesks; - QPtrList desks; + TQPtrList desks; bool fExpanded; bool track2active; /*Xosd Section */ - QString nom; - QString aux; + TQString nom; + TQString aux; //xosd *osd; int xosd_st; int showNames; int fCleaner; int xosdShadowOffset; - QString xosdFont; - QString xosdColor; - QString xosdShadowColor; + TQString xosdFont; + TQString xosdColor; + TQString xosdShadowColor; bool xosdBold; bool xosdItalic; int xosdSize; @@ -251,7 +251,7 @@ class KoolDock : public QWidget int animValue; int animState; - void run(const QString& cmd); + void run(const TQString& cmd); int func(int x); int func2(int x); void doUpdateGeometry(); @@ -279,16 +279,16 @@ class KoolDock : public QWidget void init2(); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent( QMouseEvent * ); + void paintEvent(TQPaintEvent *); + void mousePressEvent( TQMouseEvent * ); void mMoveEvent( int ex, int ey); void mPress( int mx, int my, ButtonState srcButton); - void wheelEvent(QWheelEvent *); - void enterEvent(QEvent*); - void onleaveEvent(QEvent*); + void wheelEvent(TQWheelEvent *); + void enterEvent(TQEvent*); + void onleaveEvent(TQEvent*); void mksmallTimerstop(); - void dragMoveEvent(QDragMoveEvent* event); - void dropEvent(QDropEvent* event); + void dragMoveEvent(TQDragMoveEvent* event); + void dropEvent(TQDropEvent* event); public slots: void edit(); @@ -301,7 +301,7 @@ class KoolDock : public QWidget void workAreaChanged(); void currentDesktopChanged(int); void onChangeTimerTicked(); - void updateBackground(const QPixmap&); + void updateBackground(const TQPixmap&); void moveApp(); void resizeApp(); void minApp(); @@ -329,22 +329,22 @@ class KoolDock : public QWidget void toggleKeptBelowOthers(); void toggleFullScreen(); - static void addFile(const QString& filename, - const QString& iconname, - const QString& execname, - const QString& name, + static void addFile(const TQString& filename, + const TQString& iconname, + const TQString& execname, + const TQString& name, bool notify = true, bool terminal = false, bool tclose = false, bool cuser = false, - QString = "na"); - bool ignored(const QString& appname); + TQString = "na"); + bool ignored(const TQString& appname); #ifdef _ENABLE_DEBUG - static void debug(QString message); + static void debug(TQString message); #endif #ifndef _ENABLE_DEBUG - static void debug(QString); + static void debug(TQString); #endif void mkbigTimerDo(); void mksmallTimerDo(); diff --git a/src/main.cpp b/src/main.cpp index 95f901a..e899348 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,7 +29,7 @@ #include "kooldock.h" #define KOOLDOCK_VERSION "0.4.7" -QString argv0; +TQString argv0; #ifndef _ENABLE_DEBUG extern "C" @@ -57,7 +57,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - argv0=QString("%1").arg(argv[0]); + argv0=TQString("%1").arg(argv[0]); KAboutData aboutData( "kooldock", I18N_NOOP("KoolDock"), KOOLDOCK_VERSION, description, KAboutData::License_GPL, @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) #ifndef _ENABLE_DEBUG KUniqueApplication::addCmdLineOptions(); #endif - if (QString("%1").arg(argv[1])=="-kill" || QString("%1").arg(argv[1])=="-k") + if (TQString("%1").arg(argv[1])=="-kill" || TQString("%1").arg(argv[1])=="-k") { system("killall kooldock"); exit(0); @@ -109,6 +109,6 @@ int main(int argc, char *argv[]) #endif kooldock->setMainPath(argv0); - kooldock->setArgs(QString("%1").arg(argv[1])); + kooldock->setArgs(TQString("%1").arg(argv[1])); return a.exec(); } diff --git a/src/setupdialog.ui b/src/setupdialog.ui index f23cbaf..cf7388c 100644 --- a/src/setupdialog.ui +++ b/src/setupdialog.ui @@ -1,6 +1,6 @@ SetupDialog - + SetupDialog @@ -49,7 +49,7 @@ unnamed - + buttonCancel @@ -63,7 +63,7 @@ true - + buttonOk @@ -80,7 +80,7 @@ true - + toReloadIcons @@ -94,7 +94,7 @@ checkBox11 - + systray @@ -122,11 +122,11 @@ Enables KoolDock System Tray Support; it can be used instead of kicker's systray applet (its VERY experimental; do not use it unless you intend to help me get this working :P ) - + tabWidget - + Widget2 @@ -137,7 +137,7 @@ unnamed - + groupBox3 @@ -198,7 +198,7 @@ Horizontal - + chk1 @@ -212,7 +212,7 @@ Start KoolDock hidden; if the mouse is not over KoolDock it will hide - + chk5 @@ -223,7 +223,7 @@ Enables KoolDock taskbar; it can be used instead of Kicker's taskbar - + chk6 @@ -234,7 +234,7 @@ Window icon in KoolDock's taskbar will blink when something happens on the given application - + chkGrouping @@ -245,7 +245,7 @@ Enables grouping similar task icons into one icon. - + chk7 @@ -256,7 +256,7 @@ Shows the KDE Menu in KoolDock's launcher. - + Steppy @@ -267,7 +267,7 @@ Makes the scrolling not smooth, but automatically centered on current icon. - + nav @@ -278,7 +278,7 @@ Adds a clock into the Main Menu and a virtual desktop navigator. - + chkUseKBFX @@ -289,7 +289,7 @@ Makes that KoolDock don't use KMenu, but uses alternative KBFX menu (widget is necessary). - + cbMinimizedOnly @@ -300,7 +300,7 @@ That makes kooldock shows only the minimized application icons, and hides the other. - + chkSshot @@ -311,7 +311,7 @@ When a window is minimized a screenshot of the application will be use as an icon in KoolDock's Taskbar. - + currentDesk @@ -322,7 +322,7 @@ Only show in KoolDock's taskbar windows in the current desktop - + hideOnClick @@ -344,7 +344,7 @@ Hide KoolDock after clicking on a Launcher or Window icon. - + cbStayBelow @@ -359,7 +359,7 @@ - + TabPage @@ -370,7 +370,7 @@ unnamed - + groupBox10 @@ -381,7 +381,7 @@ unnamed - + textLabel1_4 @@ -394,7 +394,7 @@ xosdFont - + textLabel1_2 @@ -402,7 +402,7 @@ Shadow offset: - + spinBox2 @@ -413,7 +413,7 @@ 0 - + textLabel1 @@ -426,7 +426,7 @@ kColorCombo1 - + xosdSize @@ -437,7 +437,7 @@ 1 - + textLabel1_2_2 @@ -450,7 +450,7 @@ kColorCombo_shadow - + textLabel1_8 @@ -472,7 +472,7 @@ Horizontal - + cbCleaner @@ -480,7 +480,7 @@ Cleaner text (bigger memory and CPU usage) - + frame3 @@ -505,7 +505,7 @@ unnamed - + xosdBold @@ -533,7 +533,7 @@ - + chk2 @@ -561,7 +561,7 @@ - + xosdItalic @@ -595,7 +595,7 @@ - + TabPage @@ -606,7 +606,7 @@ unnamed - + groupBox9 @@ -617,7 +617,7 @@ unnamed - + textLabel2 @@ -625,12 +625,12 @@ Small icon size: - + iwSmall - + textLabel2_2 @@ -638,7 +638,7 @@ Big icon size: - + iwBig @@ -646,7 +646,7 @@ 160 - + textLabel1_13 @@ -662,7 +662,7 @@ Amount of big icons: - + fAmount @@ -676,7 +676,7 @@ This box determines amout of zoomed icons. - + textLabel1_6 @@ -684,7 +684,7 @@ Space between icons - + sbSpace @@ -693,7 +693,7 @@ - + TabPage @@ -704,7 +704,7 @@ unnamed - + textLabel1_3 @@ -720,7 +720,7 @@ Drag an application to add it or - + buttonadd @@ -761,7 +761,7 @@ Drag and Drop here any executable or desktop file for which you want an entry in KoolDock's Launcher - + mLeft @@ -780,7 +780,7 @@ Moves selected item left - + mRight @@ -816,7 +816,7 @@ - + textLabel1_5 @@ -834,7 +834,7 @@ - + TabPage @@ -845,7 +845,7 @@ unnamed - + grabWin @@ -856,7 +856,7 @@ Click here to start grabbing windows names; click Add for each window you click on - + textLabel1_7 @@ -890,7 +890,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + TabPage @@ -901,7 +901,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + chkSolid @@ -923,7 +923,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + textLabel1_3_2_2 @@ -936,7 +936,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". kColorCombo3 - + textLabel1_3_3 @@ -944,7 +944,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Dock opacity: - + textLabel1_3_2 @@ -957,7 +957,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". kColorCombo2 - + chk4 @@ -968,7 +968,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". When using a Solid Background you may tell KoolDock to draw its borders (rectangle) - + spinBox1 @@ -984,7 +984,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + groupBox6 @@ -1031,7 +1031,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". The separator is a line drawed between KoolDock's Launcher and Taskbar - + textLabel1_3_2_2_2 @@ -1049,7 +1049,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + chkImg @@ -1077,7 +1077,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + nWideBg @@ -1088,7 +1088,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Mkaes that the background ends don't go over the screen edges. - + textLabel1_9 @@ -1104,7 +1104,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Background Theme: - + theme @@ -1117,7 +1117,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + buttonGroup2_2 @@ -1160,7 +1160,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + opScale1 @@ -1193,7 +1193,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + opScale2 @@ -1232,7 +1232,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + TabPage @@ -1243,7 +1243,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + groupBox5 @@ -1262,7 +1262,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + textLabel1_11 @@ -1270,7 +1270,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Window position on edge (%): - + percentPos @@ -1287,7 +1287,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Determines the position of expanded KoolDock's window on the selected screen edge. - + xrma @@ -1315,7 +1315,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Horizontal - + textLabel1_10 @@ -1323,7 +1323,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Desired Monitor Width - + textLabel1_12 @@ -1331,7 +1331,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Desired Monitor Height - + SleftRes @@ -1348,7 +1348,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Width of monitor on which KoolDock should be shown. - + SHeight @@ -1362,7 +1362,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Height of monitor on which kooldock should be shown. - + PWidth @@ -1373,7 +1373,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Sum of widths of monitors before the desired one. - + textLabel2_4 @@ -1381,7 +1381,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Previous Monitors Width - + textLabel2_5 @@ -1389,7 +1389,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Window position: - + buttonGroup2 @@ -1428,7 +1428,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + op3 @@ -1450,7 +1450,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Makes that KoolDock's window will appear on left screen edge. - + op1 @@ -1506,7 +1506,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + op2 @@ -1528,7 +1528,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Makes that KoolDock's window will appear on top screen edge. - + op0 @@ -1590,7 +1590,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + TabPage @@ -1601,7 +1601,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + groupBox7 @@ -1612,7 +1612,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + textLabel2_3 @@ -1620,7 +1620,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Priority (0=max, 19=min) - + Priority @@ -1636,7 +1636,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + groupBox8 @@ -1647,7 +1647,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + chClipping @@ -1658,7 +1658,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Makes desktop smaller that maximized windows don't cover KoolDock's window. - + chClipIcons @@ -1671,7 +1671,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + groupBox6_2 @@ -1682,7 +1682,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". unnamed - + sejtanwodbycie @@ -1690,7 +1690,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Zooming speed (ms) - + zoomSpeed @@ -1722,7 +1722,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Determines the speen of zooming animation - + textLabel1_6_2 @@ -1730,7 +1730,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Show after - + hideTimer @@ -1744,7 +1744,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". Time before showing KoolDock if mouse reaches bottom of the screen - + chkSpeed @@ -1777,7 +1777,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". - + btnApply @@ -1798,9 +1798,9 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". applist - dropped(QDropEvent*,const QValueList<QIconDragItem>&) + dropped(TQDropEvent*,const TQValueList<TQIconDragItem>&) SetupDialog - applist_dropped(QDropEvent*,const QValueList<QIconDragItem>&) + applist_dropped(TQDropEvent*,const TQValueList<TQIconDragItem>&) buttonadd @@ -1828,9 +1828,9 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". applist - contextMenuRequested(QIconViewItem*,const QPoint&) + contextMenuRequested(TQIconViewItem*,const TQPoint&) SetupDialog - applist_contextMenuRequested(QIconViewItem*,const QPoint&) + applist_contextMenuRequested(TQIconViewItem*,const TQPoint&) mLeft @@ -1846,9 +1846,9 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". applist - clicked(QIconViewItem*,const QPoint&) + clicked(TQIconViewItem*,const TQPoint&) SetupDialog - applist_clicked(QIconViewItem*,const QPoint&) + applist_clicked(TQIconViewItem*,const TQPoint&) xrma @@ -1951,8 +1951,8 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". SelectLeftClicked() SelectCenterClicked() SelectRightClicked() - applist_dropped( QDropEvent *, const QValueList<QIconDragItem> & ) - applist_clicked( QIconViewItem *, const QPoint & ) + applist_dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) + applist_clicked( TQIconViewItem *, const TQPoint & ) buttonadd_clicked() chk1_toggled( bool ) chkHidden( bool ) @@ -1962,9 +1962,9 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel". chkFont() chkTask() grabWin_clicked() - applist_contextMenuRequested( QIconViewItem *, const QPoint & ) + applist_contextMenuRequested( TQIconViewItem *, const TQPoint & ) xrma_clicked() - groupBox7_destroyed( QObject * ) + groupBox7_destroyed( TQObject * ) left() right() configApply() diff --git a/src/setupdialogprg.cpp b/src/setupdialogprg.cpp index e2b9c39..1723af1 100644 --- a/src/setupdialogprg.cpp +++ b/src/setupdialogprg.cpp @@ -19,13 +19,13 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "setupdialog.h" #include "setupdialogprg.h" @@ -33,7 +33,7 @@ #include "appProp.h" #include "kooldock.h" -SetupDialogPrg::SetupDialogPrg(QWidget *parent, const char *name) +SetupDialogPrg::SetupDialogPrg(TQWidget *parent, const char *name) : SetupDialog(parent, name) { //Ignore list handlers @@ -51,7 +51,7 @@ SetupDialogPrg::SetupDialogPrg(QWidget *parent, const char *name) // some configuration variables progPath = locateLocal("data", "kooldock"); - menuPath = progPath + QString("/menu/"); + menuPath = progPath + TQString("/menu/"); KConfig *config = KGlobal::config(); config->setGroup("kooldock"); @@ -66,12 +66,12 @@ SetupDialogPrg::SetupDialogPrg(QWidget *parent, const char *name) //Lets load the theme List KStandardDirs sys; - QStringList bgPath = sys.findDirs("data", "kooldock/backgrounds"); + TQStringList bgPath = sys.findDirs("data", "kooldock/backgrounds"); for(unsigned int i=0; iinsertItem(theme_tmp[j]); } } @@ -235,13 +235,13 @@ void SetupDialogPrg::configApply() { //Lets find exactly where the selected theme is KStandardDirs sys; - QString theme_dir="kooldock/backgrounds/"+theme->currentText(); - QStringList bgPath = sys.findDirs("data", theme_dir); + TQString theme_dir="kooldock/backgrounds/"+theme->currentText(); + TQStringList bgPath = sys.findDirs("data", theme_dir); //Lets set the images and write the config - QString LeftImg=(QString)bgPath[0]+"background-left.png"; - QString CenterImg=(QString)bgPath[0]+"background-center.png"; - QString RightImg=(QString)bgPath[0]+"background-right.png"; + TQString LeftImg=(TQString)bgPath[0]+"background-left.png"; + TQString CenterImg=(TQString)bgPath[0]+"background-center.png"; + TQString RightImg=(TQString)bgPath[0]+"background-right.png"; // background image enabled config->writeEntry("Solid", 0); @@ -267,15 +267,15 @@ void SetupDialogPrg::configApply() config->sync(); // write ignore list to file - QString progPath = locateLocal("data", "kooldock"); - QString menuPath = progPath + QString("/menu/"); - filepath = QString(progPath + "/ignorelist.conf"); + TQString progPath = locateLocal("data", "kooldock"); + TQString menuPath = progPath + TQString("/menu/"); + filepath = TQString(progPath + "/ignorelist.conf"); if(ignoreBox->count()>0) { - QFile out(filepath); + TQFile out(filepath); if (out.open(IO_WriteOnly)) { - QTextStream out_s(&out); + TQTextStream out_s(&out); for(int i=0; icount(); i++) { out_s << ignoreBox->text(i) << "\n"; @@ -285,7 +285,7 @@ void SetupDialogPrg::configApply() } else { - QFile::remove(filepath); + TQFile::remove(filepath); } emit apply(); } @@ -299,7 +299,7 @@ void SetupDialogPrg::configCancel() this->hide(); } -void SetupDialogPrg::closeEvent( QCloseEvent *e ) +void SetupDialogPrg::closeEvent( TQCloseEvent *e ) { e->ignore(); configCancel(); @@ -371,14 +371,14 @@ void SetupDialogPrg::chkHidden() cbStayBelow->setEnabled(!tmp); } -void SetupDialogPrg::applist_dropped(QDropEvent*e,const QValueList&) +void SetupDialogPrg::applist_dropped(TQDropEvent*e,const TQValueList&) { KIconLoader icon_obj; - QStringList lst; - QString name; + TQStringList lst; + TQString name; int pos; - QUriDrag::decodeLocalFiles(e, lst); + TQUriDrag::decodeLocalFiles(e, lst); name=lst[0]; //Lets see if it is a desktop file @@ -421,18 +421,18 @@ void SetupDialogPrg::removeLauncher() { if(fileName!=NULL) { - QString question=i18n("Do you want to remove ") + fileName + QString("?"); + TQString question=i18n("Do you want to remove ") + fileName + TQString("?"); int remove = KMessageBox::questionYesNo(0, question, i18n("Remove Launcher")); if(remove!=KMessageBox::Yes) return; KSimpleConfig *desktopfile; - QDir homeDir = QDir::home(); + TQDir homeDir = TQDir::home(); if (homeDir.exists(progPath)) { - QDir dir(menuPath); - QStringList fileListRemove; + TQDir dir(menuPath); + TQStringList fileListRemove; fileListRemove = dir.entryList("*.desktop"); - for ( QStringList::Iterator it = fileListRemove.begin(); it != fileListRemove.end(); ++it ) + for ( TQStringList::Iterator it = fileListRemove.begin(); it != fileListRemove.end(); ++it ) { if ( ((*it) != ".") && ((*it) != "..") ) { @@ -442,15 +442,15 @@ void SetupDialogPrg::removeLauncher() { kdDebug(0) << "Removing " << menuPath + (*it) << endl; delete(desktopfile); - if(QFile::remove(menuPath+(*it))==TRUE) + if(TQFile::remove(menuPath+(*it))==TRUE) { kdDebug(0) << "Item removed!" << endl; //Lets update the launchers index - QString preffix; + TQString preffix; fileListRemove.clear(); fileListRemove=dir.entryList("*.desktop"); - QStringList fileListRemove2=fileListRemove; + TQStringList fileListRemove2=fileListRemove; //Not really sure why I couldn't do this within the other for, something like fileListRemove[i].remove(0,2).prepend(preffix), but hell it works for(unsigned int i=0; i=10) preffix=QString("%1").arg(i); + if(i<10) preffix=TQString("0%1").arg(i); + if(i>=10) preffix=TQString("%1").arg(i); - dir.rename(fileListRemove[i], QString("%1%2").arg(preffix).arg(fileListRemove2[i])); + dir.rename(fileListRemove[i], TQString("%1%2").arg(preffix).arg(fileListRemove2[i])); } //End updating @@ -507,7 +507,7 @@ void SetupDialogPrg::activeWindowChanged(WId id) { KWin::WindowInfo winfo; winfo=KWin::windowInfo(id); - QString ninfo=winfo.visibleName(); + TQString ninfo=winfo.visibleName(); if(ninfo!=caption()) { @@ -523,7 +523,7 @@ void SetupDialogPrg::buttonadd_clicked() appdlg->show(); } -void SetupDialogPrg::showEvent(QShowEvent *) +void SetupDialogPrg::showEvent(TQShowEvent *) { //Here we fill the applist appFill(); @@ -534,23 +534,23 @@ void SetupDialogPrg::appFill() // fill the application list. KSimpleConfig *desktopfile; - QDir homeDir = QDir::home(); + TQDir homeDir = TQDir::home(); KIconLoader icon_obj; - QPixmap pixm; + TQPixmap pixm; if(homeDir.exists(progPath)) { - QDir dir(menuPath); + TQDir dir(menuPath); fileList.clear(); fileList = dir.entryList("*.desktop"); - for ( QStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) + for ( TQStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { if ( ((*it) != ".") && ((*it) != "..") ) { desktopfile = new KSimpleConfig( menuPath + (*it), TRUE); desktopfile->setGroup("Desktop Entry"); - QPixmap pixm=icon_obj.loadIcon(desktopfile->readEntry("Icon") ,KIcon::Desktop,0,KIcon::DefaultState,0L,false); + TQPixmap pixm=icon_obj.loadIcon(desktopfile->readEntry("Icon") ,KIcon::Desktop,0,KIcon::DefaultState,0L,false); new KIconViewItem(applist, desktopfile->readEntry("Name"), pixm); delete(desktopfile); } @@ -558,7 +558,7 @@ void SetupDialogPrg::appFill() } } -void SetupDialogPrg::hideEvent ( QHideEvent * ) +void SetupDialogPrg::hideEvent ( TQHideEvent * ) { // the application list is erased here. appClear(); @@ -579,14 +579,14 @@ void SetupDialogPrg::right() if (oldPos!=-1 && oldPos < (int)fileList.count()-1) {setnewpos(oldPos+1); oldPos++;iconsChanged();} } -void SetupDialogPrg::applist_clicked(QIconViewItem *e, const QPoint&) +void SetupDialogPrg::applist_clicked(TQIconViewItem *e, const TQPoint&) { if(e!=NULL) {oldPos=e->index();} else {oldPos=-1;} } -void SetupDialogPrg::applist_contextMenuRequested(QIconViewItem *e,const QPoint&) +void SetupDialogPrg::applist_contextMenuRequested(TQIconViewItem *e,const TQPoint&) { if(e!=NULL) { @@ -600,17 +600,17 @@ void SetupDialogPrg::applist_contextMenuRequested(QIconViewItem *e,const QPoint& //Load desktop data KSimpleConfig *desktopfile; - QDir dir(menuPath); + TQDir dir(menuPath); fileList.clear(); fileList = dir.entryList("*.desktop"); int i=0; - for ( QStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) + for ( TQStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { if ( ((*it) != ".") && ((*it) != "..") ) { desktopfile = new KSimpleConfig( menuPath + (*it), TRUE); desktopfile->setGroup("Desktop Entry"); - int menustate=setpos->insertItem(QString("%1").arg(desktopfile->readEntry("Name")),i); + int menustate=setpos->insertItem(TQString("%1").arg(desktopfile->readEntry("Name")),i); if(i==oldPos) {setpos->setItemEnabled(menustate, false);filepath=menuPath + (*it);} delete(desktopfile); i++; @@ -622,7 +622,7 @@ void SetupDialogPrg::applist_contextMenuRequested(QIconViewItem *e,const QPoint& popup->insertItem(i18n("Swap with"), setpos); popup->insertItem(i18n("&Edit item"), this, SLOT(editItem())); popup->insertItem(i18n("Remove"), this, SLOT(removeLauncher())); - popup->exec(QCursor::pos()); + popup->exec(TQCursor::pos()); if(popup) delete(popup); if(setpos) delete(setpos); } @@ -639,15 +639,15 @@ void SetupDialogPrg::editItem() void SetupDialogPrg::setnewpos(int newpos) { - kdDebug(0) << "New pos " << QString("0%1").arg(newpos) << "requested for: " << fileName<< endl; + kdDebug(0) << "New pos " << TQString("0%1").arg(newpos) << "requested for: " << fileName<< endl; if(newpos==oldPos) return; //Nothing to be done computeNewPos(newpos); } void SetupDialogPrg::computeNewPos(int pos) { - QString preffix, preffix2; - QDir dir(menuPath); + TQString preffix, preffix2; + TQDir dir(menuPath); fileList.clear(); fileList = dir.entryList("*.desktop"); @@ -659,18 +659,18 @@ void SetupDialogPrg::computeNewPos(int pos) } //Preffix for old position - if(oldPos<10) preffix=QString("0%1").arg(oldPos); - if(oldPos>=10) preffix=QString("%1").arg(oldPos); + if(oldPos<10) preffix=TQString("0%1").arg(oldPos); + if(oldPos>=10) preffix=TQString("%1").arg(oldPos); //Preffix for new position - if(pos<10) preffix2=QString("0%1").arg(pos); - if(pos>=10) preffix2=QString("%1").arg(pos); + if(pos<10) preffix2=TQString("0%1").arg(pos); + if(pos>=10) preffix2=TQString("%1").arg(pos); kdDebug(0) << "Old Position: " << oldPos << endl; kdDebug(0) << "New Position: " << pos << endl; - dir.rename(QString("%1%2").arg(preffix).arg(fileList[oldPos]), QString("%1%2").arg(preffix2).arg(fileList[oldPos])); - dir.rename(QString("%1%2").arg(preffix2).arg(fileList[pos]), QString("%1%2").arg(preffix).arg(fileList[pos])); + dir.rename(TQString("%1%2").arg(preffix).arg(fileList[oldPos]), TQString("%1%2").arg(preffix2).arg(fileList[oldPos])); + dir.rename(TQString("%1%2").arg(preffix2).arg(fileList[pos]), TQString("%1%2").arg(preffix).arg(fileList[pos])); appClear(); appFill(); diff --git a/src/setupdialogprg.h b/src/setupdialogprg.h index 5539c5a..2defbba 100644 --- a/src/setupdialogprg.h +++ b/src/setupdialogprg.h @@ -16,16 +16,16 @@ #include "apppropprg.h" // QT includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // KDE includes #include @@ -48,20 +48,20 @@ class SetupDialogPrg : public SetupDialog { Q_OBJECT public: - SetupDialogPrg(QWidget *parent = 0, const char *name = 0); + SetupDialogPrg(TQWidget *parent = 0, const char *name = 0); ~SetupDialogPrg(); appProp *appdlg; - QString progPath; - QString menuPath; + TQString progPath; + TQString menuPath; KWinModule *gwm; KLineEdit *in; - QPushButton *up; - QPushButton *down; + TQPushButton *up; + TQPushButton *down; int grabbing; int oldPos; - QString fileName; - QStringList fileList; - QString filepath; + TQString fileName; + TQStringList fileList; + TQString filepath; public slots: void editItem(); @@ -74,15 +74,15 @@ Q_OBJECT void chkSolidSlot(); void chkFont(); void chkTask(); - void applist_dropped(QDropEvent*,const QValueList&); + void applist_dropped(TQDropEvent*,const TQValueList&); void buttonadd_clicked(); - void applist_clicked(QIconViewItem *, const QPoint&); + void applist_clicked(TQIconViewItem *, const TQPoint&); void appRestart(); void appFill(); void appClear(); void grabWin_clicked(); void activeWindowChanged(WId id); - void applist_contextMenuRequested(QIconViewItem*,const QPoint&); + void applist_contextMenuRequested(TQIconViewItem*,const TQPoint&); void removeLauncher(); void setnewpos(int); void xrma_clicked(); @@ -95,8 +95,8 @@ Q_OBJECT void computeNewPos(int); protected: - void closeEvent( QCloseEvent* ); - void showEvent ( QShowEvent * ); - void hideEvent ( QHideEvent * ); + void closeEvent( TQCloseEvent* ); + void showEvent ( TQShowEvent * ); + void hideEvent ( TQHideEvent * ); }; #endif diff --git a/src/xosd.cpp b/src/xosd.cpp index 45d0799..fbedc63 100644 --- a/src/xosd.cpp +++ b/src/xosd.cpp @@ -1,12 +1,12 @@ #include "xosd.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include #include #include @@ -15,9 +15,9 @@ #include #include -xosd::xosd(QWidget *parent, const char *name) : QWidget(parent, name, WStyle_Customize | WRepaintNoErase | WStyle_NoBorder | WDestructiveClose | WResizeNoErase | WMouseNoMask | WStyle_StaysOnTop | WX11BypassWM) +xosd::xosd(TQWidget *parent, const char *name) : TQWidget(parent, name, WStyle_Customize | WRepaintNoErase | WStyle_NoBorder | WDestructiveClose | WResizeNoErase | WMouseNoMask | WStyle_StaysOnTop | WX11BypassWM) { - info = new NETWinInfo( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMState); + info = new NETWinInfo( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMState); info->setDesktop( NETWinInfo::OnAllDesktops ); hide(); KWin::setState(winId(), NET::SkipTaskbar | NET::SkipPager); @@ -28,12 +28,12 @@ xosd::~xosd() { } -void xosd::setColor(const QString& color) +void xosd::setColor(const TQString& color) { fontColor=color; } -void xosd::setShadowColor(const QString& color) +void xosd::setShadowColor(const TQString& color) { shadowColor=color; } @@ -46,12 +46,12 @@ void xosd::setOrientation(int orientation, int w, int mh) if (fCleaner==1) { //font is set, so program can get its height to prepare background buffer - QFontMetrics *metrics = new QFontMetrics(f); + TQFontMetrics *metrics = new TQFontMetrics(f); h = metrics->height(); - bgBuffer = QPixmap(dw, h); - maskBuffer = QPixmap(dw, h, true); - bgBuffer = QPixmap::grabWindow(qt_xrootwin(), 0, 0, dw, h); + bgBuffer = TQPixmap(dw, h); + maskBuffer = TQPixmap(dw, h, true); + bgBuffer = TQPixmap::grabWindow(tqt_xrootwin(), 0, 0, dw, h); lastX=0; lastY=0; } @@ -69,15 +69,15 @@ void xosd::setShadowOffset(int off) shadowOffset=off; } -void xosd::setText(const QString& t) +void xosd::setText(const TQString& t) { - //setMask(QRegion(0,0,0,0)); + //setMask(TQRegion(0,0,0,0)); // NOTICE: it appears that with WX11BypassWM, resize() doesn't flick the widget anymore :) // so, setMask() is no more needed. // -- Matias resize(0,0); text = t; - QFontMetrics *metrics = new QFontMetrics(f); + TQFontMetrics *metrics = new TQFontMetrics(f); w = metrics->width(text); w = w + shadowOffset + 5; // 5 pixels more h = metrics->height(); @@ -85,7 +85,7 @@ void xosd::setText(const QString& t) update(); } -void xosd::setFont(const QString& font) +void xosd::setFont(const TQString& font) { f.setFamily(font); } @@ -108,26 +108,26 @@ void xosd::setSize(int size) /*int xosd::w() { - QFontMetrics *metrics = new QFontMetrics(f); + TQFontMetrics *metrics = new TQFontMetrics(f); return (metrics->width(text) + shadowOffset + 5); } int xosd::h() { - QFontMetrics *metrics = new QFontMetrics(f); + TQFontMetrics *metrics = new TQFontMetrics(f); return metrics->height(); }*/ -void xosd::paintEvent(QPaintEvent *) +void xosd::paintEvent(TQPaintEvent *) { int i, j; resize(w,h); - QPixmap pm(size()); - QBitmap bm(size()); - QPainter p; + TQPixmap pm(size()); + TQBitmap bm(size()); + TQPainter p; //Drawing text p.begin(&pm, this); @@ -139,15 +139,15 @@ void xosd::paintEvent(QPaintEvent *) else { //One colour background - work faster - p.fillRect (rect(), QColor(shadowColor)); + p.fillRect (rect(), TQColor(shadowColor)); } - p.setPen( QColor(shadowColor) ); + p.setPen( TQColor(shadowColor) ); p.setFont(f); p.drawText(shadowOffset, yOffset + shadowOffset, text, AlignCenter); // draw shadow text // now, draw normal text - p.setPen( QColor(fontColor) ); + p.setPen( TQColor(fontColor) ); p.drawText(1, yOffset, text, AlignCenter); // draw front text @@ -156,8 +156,8 @@ void xosd::paintEvent(QPaintEvent *) //Drawing mask p.begin(&bm, this); // now we must draw the text with black color for making the mask - p.setPen( Qt::white ); - p.fillRect (rect(), Qt::black); + p.setPen( TQt::white ); + p.fillRect (rect(), TQt::black); p.setFont(f); for (i=-fCleaner;i<=fCleaner;i++) { @@ -183,33 +183,33 @@ void xosd::move2(int x, int y) { if (fCleaner==1) { - QPixmap tmpBuffer; + TQPixmap tmpBuffer; //window is not hidden if (y!=rdh) { - tmpBuffer = QPixmap::grabWindow(qt_xrootwin(), 0, y, dw, h); + tmpBuffer = TQPixmap::grabWindow(tqt_xrootwin(), 0, y, dw, h); if (lastY!=rdh) { //fill background covered with the text with cached version if (fOrientation==0 ) //horizontal { - bitBlt(&tmpBuffer, lastX, 0, &maskBuffer, 0, 0, w, h, Qt::AndROP);//copying part, which hides only the text - bitBlt(&bgBuffer, lastX, 0, &maskBuffer, 0, 0, w, h, Qt::NotAndROP);//so the background won't be covered by - bitBlt(&tmpBuffer, lastX, 0, &bgBuffer, lastX, 0, w, h, Qt::OrROP);//currently visible text. + bitBlt(&tmpBuffer, lastX, 0, &maskBuffer, 0, 0, w, h, TQt::AndROP);//copying part, which hides only the text + bitBlt(&bgBuffer, lastX, 0, &maskBuffer, 0, 0, w, h, TQt::NotAndROP);//so the background won't be covered by + bitBlt(&tmpBuffer, lastX, 0, &bgBuffer, lastX, 0, w, h, TQt::OrROP);//currently visible text. } if (fOrientation==1) //vertical { if (ylastY) { - bitBlt(&tmpBuffer, lastX, lastY-y, &maskBuffer, 0, 0, w, h, Qt::AndROP); - bitBlt(&bgBuffer, lastX, 0, &maskBuffer, 0, 0, w, h, Qt::NotAndROP); - bitBlt(&tmpBuffer, lastX, lastY-y, &bgBuffer, lastX, 0, w, h, Qt::OrROP); + bitBlt(&tmpBuffer, lastX, lastY-y, &maskBuffer, 0, 0, w, h, TQt::AndROP); + bitBlt(&bgBuffer, lastX, 0, &maskBuffer, 0, 0, w, h, TQt::NotAndROP); + bitBlt(&tmpBuffer, lastX, lastY-y, &bgBuffer, lastX, 0, w, h, TQt::OrROP); } if (y>lastY && (y-lastY) #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -class xosd : public QWidget +class xosd : public TQWidget { Q_OBJECT public: - xosd(QWidget* parent=0, const char *name=0); + xosd(TQWidget* parent=0, const char *name=0); virtual ~xosd(); - void setText(const QString& t); - void setFont(const QString& font); + void setText(const TQString& t); + void setFont(const TQString& font); void setItalic(); void setBold(); void setSize(int size); - void setColor(const QString& color); - void setShadowColor(const QString& color); + void setColor(const TQString& color); + void setShadowColor(const TQString& color); void setShadowOffset(int off); void move2(int x, int y); void setOrientation(int orientation, int w, int mh); @@ -36,23 +36,23 @@ Q_OBJECT int w, h; int fontSize; int fontStyle; - QString fontFamily; + TQString fontFamily; private: NETWinInfo *info; - QString text; - QFont f; - QString fontColor; - QString shadowColor; + TQString text; + TQFont f; + TQString fontColor; + TQString shadowColor; int shadowOffset; int fOrientation; - QPixmap bgBuffer; + TQPixmap bgBuffer; int dw, rdh; int lastX, lastY; int fCleaner; - QPixmap maskBuffer; + TQPixmap maskBuffer; protected: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); }; #endif // XOSD_H_