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

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8ca8caba6f)
r14.1.x
Michele Calgaro 11 months ago
parent 2191a58bf7
commit 3f57e4b5a2
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File

106
src/kooldock.cpp
Unescape View File

@ -76,7 +76,7 @@ KoolDock::KoolDock(TQWidget* parent, const char* name) :
lockSetTab= false; // disables changing opened tab in preferences window
setupdlg = new SetupDialogPrg(); // create the setup dialog object.
connect(setupdlg, SIGNAL(apply()), SLOT(chkRestart()));
connect(setupdlg, TQ_SIGNAL(apply()), TQ_SLOT(chkRestart()));
perf = new TQTime();
reloadIcons = true;
@ -89,15 +89,15 @@ KoolDock::KoolDock(TQWidget* parent, const char* name) :
popup = new TDEPopupMenu;
advMenu = new TDEPopupMenu;
connect(popup, SIGNAL(aboutToShow()), SLOT(aboutToShow()));
connect(popup, SIGNAL(aboutToHide()), SLOT(aboutToHide()));
connect(appMenu, SIGNAL(aboutToShow()), SLOT(aboutToShow()));
connect(appMenu, SIGNAL(aboutToHide()), SLOT(aboutToHide()));
connect(deskpopup, SIGNAL(aboutToShow()), SLOT(menuShow()));
connect(appMenu, SIGNAL(highlighted(int)), this, SLOT(menuX(int)));
connect(godesk, SIGNAL(activated(int)), this, SLOT(goToDesktop(int)));
connect(tasklist, SIGNAL(activated(int)), this, SLOT(goToWindow(int)));
connect(deskpopup, SIGNAL(activated(int)), this, SLOT(sendToDesktop(int)));
connect(popup, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShow()));
connect(popup, TQ_SIGNAL(aboutToHide()), TQ_SLOT(aboutToHide()));
connect(appMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShow()));
connect(appMenu, TQ_SIGNAL(aboutToHide()), TQ_SLOT(aboutToHide()));
connect(deskpopup, TQ_SIGNAL(aboutToShow()), TQ_SLOT(menuShow()));
connect(appMenu, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuX(int)));
connect(godesk, TQ_SIGNAL(activated(int)), this, TQ_SLOT(goToDesktop(int)));
connect(tasklist, TQ_SIGNAL(activated(int)), this, TQ_SLOT(goToWindow(int)));
connect(deskpopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sendToDesktop(int)));
menuCount = 0;
init(); //initialization
}
@ -203,7 +203,7 @@ void KoolDock::trackTimerEnd()
}
if ((py + 2 >= dh) && (px > x0) && (px < x0 + w0)){
if (track2active == false) {
TQTimer::singleShot(hideTimer, this, SLOT(trackTimer2End()));
TQTimer::singleShot(hideTimer, this, TQ_SLOT(trackTimer2End()));
}
track2active = true;
}
@ -593,7 +593,7 @@ void KoolDock::paintEvent(TQPaintEvent *)
if (iOnClick == i) {
// Highlight the clicked icon
KPixmapEffect::fade(*currentIcon, ((float) 50) * 0.01, TQColor("#FFFFFF"));
TQTimer::singleShot(10 * 60, this, SLOT(unhighlight())); // Unhighlight the icon in 1 second
TQTimer::singleShot(10 * 60, this, TQ_SLOT(unhighlight())); // Unhighlight the icon in 1 second
}
// Notify animation
@ -905,20 +905,20 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
// Right button.
i = iClicked;
advMenu->clear();
advMenu->insertItem(SmallIconSet("go-up"), i18n("Keep &Above Others"), this, SLOT(toggleAlwaysOnTop()), 0, 1);
advMenu->insertItem(SmallIconSet("go-down"), i18n("Keep &Below Others"), this, SLOT(toggleKeptBelowOthers()), 0, 2);
advMenu->insertItem(SmallIconSet("view-fullscreen"), i18n("&Fullscreen"), this, SLOT(toggleFullScreen()), 0, 3);
advMenu->insertItem(SmallIconSet("go-up"), i18n("Keep &Above Others"), this, TQ_SLOT(toggleAlwaysOnTop()), 0, 1);
advMenu->insertItem(SmallIconSet("go-down"), i18n("Keep &Below Others"), this, TQ_SLOT(toggleKeptBelowOthers()), 0, 2);
advMenu->insertItem(SmallIconSet("view-fullscreen"), i18n("&Fullscreen"), this, TQ_SLOT(toggleFullScreen()), 0, 3);
// Main KoolDock popup menu
popup->clear();
popup->insertTitle(i18n("Main Menu"));
popup->insertItem(SmallIcon("configure"), i18n("Edit Quick Launch &Menu"), this, SLOT(edit()));
popup->insertItem(SmallIcon("pencil"), i18n("Edit &Preferences"), this, SLOT(editPref()));
popup->insertItem(SmallIcon("edit-redo"), i18n("&Reload configuration"), this, SLOT(restart()));
popup->insertItem(SmallIcon("configure"), i18n("Edit Quick Launch &Menu"), this, TQ_SLOT(edit()));
popup->insertItem(SmallIcon("pencil"), i18n("Edit &Preferences"), this, TQ_SLOT(editPref()));
popup->insertItem(SmallIcon("edit-redo"), i18n("&Reload configuration"), this, TQ_SLOT(restart()));
popup->insertSeparator();
popup->insertItem(SmallIcon("about_kde"), i18n("&About"), this, SLOT(about()));
popup->insertItem(SmallIcon("about_kde"), i18n("&About"), this, TQ_SLOT(about()));
popup->insertSeparator();
popup->insertItem(SmallIcon("system-log-out"), i18n("E&xit"), this, SLOT(endProg()));
popup->insertItem(SmallIcon("system-log-out"), i18n("E&xit"), this, TQ_SLOT(endProg()));
// End Main KoolDock Menu
if (fShowNav == 1) {
@ -960,8 +960,8 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
appMenu->clear();
appMenu->insertTitle(i18n("Item menu"));
iFilename = items.at(i)->getFilename();
appMenu->insertItem(SmallIcon("configure"), i18n("&Edit item"), this, SLOT(editItem()));
appMenu->insertItem(SmallIcon("window-close"), i18n("&Delete item"), this, SLOT(removeItem()));
appMenu->insertItem(SmallIcon("configure"), i18n("&Edit item"), this, TQ_SLOT(editItem()));
appMenu->insertItem(SmallIcon("window-close"), i18n("&Delete item"), this, TQ_SLOT(removeItem()));
appMenu->insertSeparator();
appMenu->insertItem(SmallIcon("forward"), "&KoolDock", popup);
appMenu->exec(TQCursor::pos());
@ -1014,7 +1014,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
if ((fMinimizedOnly == 0 || winfo.isMinimized()) && (fCurrent == 0 || winfo.isOnDesktop(KWin::currentDesktop()))) {
TDEPopupMenu *tmpMenu = new TDEPopupMenu;
createMenu(tmpMenu, &winfo);
connect(tmpMenu, SIGNAL(aboutToShow()), SLOT(menuShow()));
connect(tmpMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(menuShow()));
popups.append(tmpMenu);
appMenu->setItemParameter(appMenu->insertItem(*item->getIcon(iwBig2), item->getName(), tmpMenu), item->getId());
}
@ -1022,10 +1022,10 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
}
appMenu->insertSeparator();
appMenu->insertItem(SmallIcon("forward"), "&Move to Desktop", deskpopup);
appMenu->insertItem(i18n("Mi&nimize all"), this, SLOT(minAllApps()));
appMenu->insertItem(i18n("Ma&ximize all"), this, SLOT(maxAllApps()));
appMenu->insertItem(i18n("&Restore all"), this, SLOT(restAllApps()));
appMenu->insertItem(SmallIcon("window-close"), i18n("&Close all"), this, SLOT(closeAllApps()));
appMenu->insertItem(i18n("Mi&nimize all"), this, TQ_SLOT(minAllApps()));
appMenu->insertItem(i18n("Ma&ximize all"), this, TQ_SLOT(maxAllApps()));
appMenu->insertItem(i18n("&Restore all"), this, TQ_SLOT(restAllApps()));
appMenu->insertItem(SmallIcon("window-close"), i18n("&Close all"), this, TQ_SLOT(closeAllApps()));
}
else {
iGroup = false;
@ -1730,7 +1730,7 @@ void KoolDock::windowChanged(WId id, unsigned int properties)
item->anim(true);
if (onChangeTimer == NULL) {
onChangeTimer = new TQTimer(this);
connect(onChangeTimer, SIGNAL(timeout()), this, SLOT(onChangeTimerTicked()));
connect(onChangeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(onChangeTimerTicked()));
onChangeTimer->start(ON_CHANGE_ANIM_INTERVAL, false);
}
}
@ -2677,7 +2677,7 @@ void KoolDock::minApp()
KWin::iconifyWindow(cId, true);
}
hide();
TQTimer::singleShot(100, this, SLOT(refreshBackground()));
TQTimer::singleShot(100, this, TQ_SLOT(refreshBackground()));
}
void KoolDock::maxApp()
@ -2707,7 +2707,7 @@ void KoolDock::maxApp()
}
KWin::activateWindow(cId);
hide();
TQTimer::singleShot(100, this, SLOT(refreshBackground()));
TQTimer::singleShot(100, this, TQ_SLOT(refreshBackground()));
}
void KoolDock::restApp()
@ -2729,7 +2729,7 @@ void KoolDock::restApp()
KWin::deIconifyWindow(cId, true);
KWin::activateWindow(cId);
hide();
TQTimer::singleShot(100, this, SLOT(refreshBackground()));
TQTimer::singleShot(100, this, TQ_SLOT(refreshBackground()));
}
void KoolDock::minAllApps()
@ -2818,7 +2818,7 @@ void KoolDock::shadeApp()
KWin::setState(cId, NET::Shaded);
}
hide();
TQTimer::singleShot(100, this, SLOT(refreshBackground()));
TQTimer::singleShot(100, this, TQ_SLOT(refreshBackground()));
}
void KoolDock::activateApp()
@ -2844,7 +2844,7 @@ void KoolDock::activateApp()
}
KWin::activateWindow(cId);
hide();
TQTimer::singleShot(100, this, SLOT(refreshBackground()));
TQTimer::singleShot(100, this, TQ_SLOT(refreshBackground()));
}
void KoolDock::closeApp()
@ -3387,15 +3387,15 @@ void KoolDock::init()
// Show task bar
if (fShowTaskbar) {
connect(wm, SIGNAL(activeWindowChanged(WId)), SLOT(activeWindowChanged(WId)));
connect(wm, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(activeWindowChanged(WId)));
}
connect(wm, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)));
connect(wm, SIGNAL(windowRemoved(WId)), SLOT(windowRemoved(WId)));
connect(wm, SIGNAL(windowChanged(WId, unsigned int)), SLOT(windowChanged(WId, unsigned int)));
connect(wm, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)));
connect(wm, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(windowRemoved(WId)));
connect(wm, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(windowChanged(WId, unsigned int)));
if (fSystray) {
/* System Tray implementation (hope this works - Francisco) */
connect(wm, SIGNAL(systemTrayWindowAdded(WId)), SLOT(systemTrayWindowAdded(WId)));
connect(wm, SIGNAL(systemTrayWindowRemoved(WId)), SLOT(systemTrayWindowRemoved(WId)));
connect(wm, TQ_SIGNAL(systemTrayWindowAdded(WId)), TQ_SLOT(systemTrayWindowAdded(WId)));
connect(wm, TQ_SIGNAL(systemTrayWindowRemoved(WId)), TQ_SLOT(systemTrayWindowRemoved(WId)));
TQCString screenstr;
screenstr.setNum(tqt_xscreen());
@ -3409,14 +3409,14 @@ void KoolDock::init()
// Acquire system tray
XSetSelectionOwner(display, net_system_tray_selection, winId(), CurrentTime);
}
connect(wm, SIGNAL(numberOfDesktopsChanged(int)), SLOT(numberOfDesktopsChanged(int)));
connect(wm, SIGNAL(currentDesktopChanged(int)), SLOT(currentDesktopChanged(int)));
connect(wm, SIGNAL(workAreaChanged()), SLOT(workAreaChanged()));
connect(wm, TQ_SIGNAL(numberOfDesktopsChanged(int)), TQ_SLOT(numberOfDesktopsChanged(int)));
connect(wm, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(currentDesktopChanged(int)));
connect(wm, TQ_SIGNAL(workAreaChanged()), TQ_SLOT(workAreaChanged()));
// Pseudo-Transparency code
rootpix = new KRootPixmap(this);
rootpix->setCustomPainting(true);
connect(rootpix, SIGNAL(backgroundUpdated(const TQPixmap &)), SLOT(updateBackground(const TQPixmap &)));
connect(rootpix, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), TQ_SLOT(updateBackground(const TQPixmap &)));
rootpix->start();
debug(TQString("Items loaded: %1").arg(items.count()));
@ -3461,7 +3461,7 @@ void KoolDock::init()
// When the mouse pointer reaches the bottom of the screen, the bar should popup in a userdefined time (int hideTimer)
track2active = false;
trackTimer = new TQTimer(this);
connect(trackTimer, SIGNAL(timeout()), this, SLOT(trackTimerEnd()));
connect(trackTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(trackTimerEnd()));
ii_first = 0;
ii_last = items.count() - 1;
@ -3478,15 +3478,15 @@ void KoolDock::init()
aux = "";
mTimer = new TQTimer(this);
connect(mTimer, SIGNAL(timeout()), this, SLOT(mTimerEnd()));
connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mTimerEnd()));
_filterData = new KURIFilterData();
mkbigTimer = new TQTimer(this);
connect(mkbigTimer, SIGNAL(timeout()), this, SLOT(mkbigTimerDo()));
connect(mkbigTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mkbigTimerDo()));
mksmallTimer = new TQTimer(this);
connect(mksmallTimer, SIGNAL(timeout()), this, SLOT(mksmallTimerDo()));
connect(mksmallTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mksmallTimerDo()));
TQWMatrix m;
m.rotate(-90 * fOrientation);
@ -3779,32 +3779,32 @@ void KoolDock::createMenu(TDEPopupMenu* tmpMenu, KWin::WindowInfo* info)
tmpMenu->insertTitle(appTitle);
tmpMenu->insertItem(i18n("Ad&vanced"), advMenu);
menustate = tmpMenu->insertItem(SmallIcon("move"), i18n("&Move"), this, SLOT(moveApp()));
menustate = tmpMenu->insertItem(SmallIcon("move"), i18n("&Move"), this, TQ_SLOT(moveApp()));
tmpMenu->setItemEnabled(menustate, info->actionSupported(NET::ActionMove));
menustate = tmpMenu->insertItem(i18n("Re&size"), this, SLOT(resizeApp()));
menustate = tmpMenu->insertItem(i18n("Re&size"), this, TQ_SLOT(resizeApp()));
tmpMenu->setItemEnabled(menustate, info->actionSupported(NET::ActionMove));
menustate = tmpMenu->insertItem(i18n("Mi&nimize"), this, SLOT(minApp()));
menustate = tmpMenu->insertItem(i18n("Mi&nimize"), this, TQ_SLOT(minApp()));
if (info->isMinimized()) {
tmpMenu->setItemChecked(menustate, true);
}
tmpMenu->setItemEnabled(menustate, info->actionSupported(NET::ActionMinimize));
menustate = tmpMenu->insertItem(i18n("Ma&ximize"), this, SLOT(maxApp()));
menustate = tmpMenu->insertItem(i18n("Ma&ximize"), this, TQ_SLOT(maxApp()));
if ((info->state() & NET::Max) && !info->isMinimized()) {
tmpMenu->setItemChecked(menustate, true);
}
tmpMenu->setItemEnabled(menustate, info->actionSupported(NET::ActionMax));
menustate = tmpMenu->insertItem(i18n("&Shade"), this, SLOT(shadeApp()));
menustate = tmpMenu->insertItem(i18n("&Shade"), this, TQ_SLOT(shadeApp()));
if (info->state() & NET::Shaded) {
tmpMenu->setItemChecked(menustate, true);
}
tmpMenu->setItemEnabled(menustate, info->actionSupported(NET::ActionShade));
tmpMenu->insertItem(SmallIcon("forward"), i18n("&Move to Desktop"), deskpopup);
tmpMenu->insertSeparator();
tmpMenu->insertItem(SmallIcon("window-close"), i18n("&Close"), this, SLOT(closeApp()));
tmpMenu->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQ_SLOT(closeApp()));
}
void KoolDock::updTaskList()

10
src/setupdialogprg.cpp
Unescape View File

@ -39,7 +39,7 @@ SetupDialogPrg::SetupDialogPrg(TQWidget* parent, const char* name)
//Ignore list handlers
grabbing = 0;
gwm = new KWinModule();
connect(gwm, SIGNAL(activeWindowChanged(WId)), SLOT(activeWindowChanged(WId)));
connect(gwm, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(activeWindowChanged(WId)));
gwm->blockSignals(true);
in = ignoreBox->lineEdit();
// Remove useless buttons from widget
@ -62,7 +62,7 @@ SetupDialogPrg::SetupDialogPrg(TQWidget* parent, const char* name)
appdlg->terminal->setChecked(false);
appdlg->tclose->setChecked(false);
appdlg->tclose->setEnabled(false);
connect(appdlg, SIGNAL(apply()), SLOT(appRestart()));
connect(appdlg, TQ_SIGNAL(apply()), TQ_SLOT(appRestart()));
// Load the theme List
TDEStandardDirs sys;
@ -551,7 +551,7 @@ void SetupDialogPrg::applist_contextMenuRequested(TQIconViewItem* e,const TQPoin
fileName = e->text();
oldPos = e->index();
connect(setpos, SIGNAL(activated(int)), this, SLOT(setnewpos(int)));
connect(setpos, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setnewpos(int)));
// Load desktop data
KSimpleConfig* desktopfile;
@ -576,8 +576,8 @@ void SetupDialogPrg::applist_contextMenuRequested(TQIconViewItem* e,const TQPoin
popup->insertTitle(e->text());
popup->insertItem(i18n("Swap with"), setpos);
popup->insertItem(i18n("&Edit item"), this, SLOT(editItem()));
popup->insertItem(i18n("Remove"), this, SLOT(removeLauncher()));
popup->insertItem(i18n("&Edit item"), this, TQ_SLOT(editItem()));
popup->insertItem(i18n("Remove"), this, TQ_SLOT(removeLauncher()));
popup->exec(TQCursor::pos());
if (popup) {
delete popup;

Write Preview
Loading…
Cancel
Save