From e654398e46e37abf457b2b1122ab898d2c51c49f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:43:15 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun/modules/systray/cmodule.cpp | 26 +++--- noatun/modules/systray/cmodule.h | 6 +- noatun/modules/systray/kitsystemtray.cpp | 18 ++-- noatun/modules/systray/kitsystemtray.h | 14 +-- noatun/modules/systray/systray.cpp | 156 +++++++++++++++---------------- noatun/modules/systray/systray.h | 20 ++-- 6 files changed, 120 insertions(+), 120 deletions(-) (limited to 'noatun/modules/systray') diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp index 4adf7e44..c0e04fd3 100644 --- a/noatun/modules/systray/cmodule.cpp +++ b/noatun/modules/systray/cmodule.cpp @@ -30,25 +30,25 @@ #include //#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -YHModule::YHModule(QObject *_parent) +YHModule::YHModule(TQObject *_parent) : CModule(i18n("System Tray Icon"), i18n("Configure System Tray Icon"), "bottom", _parent) { - QVBoxLayout *top = new QVBoxLayout(this); + TQVBoxLayout *top = new TQVBoxLayout(this); mWidget = new YHConfigWidget(this); top->addWidget(mWidget); @@ -58,9 +58,9 @@ YHModule::YHModule(QObject *_parent) mWidget->cmbModifier->insertItem(i18n("Ctrl"), YHConfig::Ctrl); mWidget->cmbModifier->setCurrentItem(YHConfig::None); - connect(mWidget->chkUsePopup, SIGNAL(toggled(bool)), this, SLOT(slotUsePopupToggled(bool))); - connect(mWidget->cmbModifier, SIGNAL(activated(int)), this, SLOT(slotModifierActivated(int))); - connect(mWidget->grpMwheel, SIGNAL(clicked(int)), this, SLOT(slotMwheelClicked(int))); + connect(mWidget->chkUsePopup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUsePopupToggled(bool))); + connect(mWidget->cmbModifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotModifierActivated(int))); + connect(mWidget->grpMwheel, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotMwheelClicked(int))); reopen(); } diff --git a/noatun/modules/systray/cmodule.h b/noatun/modules/systray/cmodule.h index fecc70e3..fd9cae2c 100644 --- a/noatun/modules/systray/cmodule.h +++ b/noatun/modules/systray/cmodule.h @@ -26,7 +26,7 @@ #ifndef CMODULE_H #define CMODULE_H -#include +#include #include class YHConfigWidget; @@ -35,7 +35,7 @@ class YHModule : public CModule { Q_OBJECT public: - YHModule(QObject *_parent); + YHModule(TQObject *_parent); virtual void save(); virtual void reopen(); @@ -44,7 +44,7 @@ Q_OBJECT private: YHConfigWidget *mWidget; - QMap mActionMap; + TQMap mActionMap; private slots: void slotUsePopupToggled(bool on); diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 5847d7da..8e42a3ed 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include "kitsystemtray.h" #include @@ -44,26 +44,26 @@ #include -KitSystemTray::KitSystemTray(const QString &contextMenu, KMainWindow *parent, const char *name) +KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name) : KSystemTray(parent, name) { setAlignment(AlignHCenter | AlignVCenter); menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent); - menu->insertTitle(SmallIcon("noatun"), QString::null, 0, 0); + menu->insertTitle(SmallIcon("noatun"), TQString::null, 0, 0); setAcceptDrops(true); } -void KitSystemTray::changeTitle(const QPixmap &pixmap, const QString &title) +void KitSystemTray::changeTitle(const TQPixmap &pixmap, const TQString &title) { menu->changeTitle(0, pixmap, title); } -void KitSystemTray::showEvent(QShowEvent *) +void KitSystemTray::showEvent(TQShowEvent *) { // empty } -void KitSystemTray::mousePressEvent(QMouseEvent *event) +void KitSystemTray::mousePressEvent(TQMouseEvent *event) { switch(event->button()) { @@ -82,12 +82,12 @@ void KitSystemTray::mousePressEvent(QMouseEvent *event) } } -void KitSystemTray::dragEnterEvent(QDragEnterEvent * event) +void KitSystemTray::dragEnterEvent(TQDragEnterEvent * event) { event->accept(KURLDrag::canDecode(event)); // accept uri drops only } -void KitSystemTray::dropEvent(QDropEvent * event) +void KitSystemTray::dropEvent(TQDropEvent * event) { KURL::List uris; if (KURLDrag::decode(event, uris)) @@ -98,7 +98,7 @@ void KitSystemTray::dropEvent(QDropEvent * event) } } -void KitSystemTray::wheelEvent(QWheelEvent *event) +void KitSystemTray::wheelEvent(TQWheelEvent *event) { YHConfig *c = YHConfig::self(); diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h index 2f640adb..d697ca95 100644 --- a/noatun/modules/systray/kitsystemtray.h +++ b/noatun/modules/systray/kitsystemtray.h @@ -39,14 +39,14 @@ class KitSystemTray : public KSystemTray Q_OBJECT public: - KitSystemTray(const QString &contextMenu, KMainWindow *parent, const char *name = 0); - void changeTitle(const QPixmap &, const QString &); + KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0); + void changeTitle(const TQPixmap &, const TQString &); protected: - virtual void showEvent(QShowEvent *); - virtual void mousePressEvent(QMouseEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dropEvent(QDropEvent *); - virtual void wheelEvent(QWheelEvent *e); + virtual void showEvent(TQShowEvent *); + virtual void mousePressEvent(TQMouseEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + virtual void dropEvent(TQDropEvent *); + virtual void wheelEvent(TQWheelEvent *e); KPopupMenu *menu; }; diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index c93080ca..2493bdbc 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -40,21 +40,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 @@ -72,15 +72,15 @@ const int COVER_MAXH = 128; class PassivePopup : public KPassivePopup { public: - PassivePopup(QWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {} + PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {} protected: - virtual void enterEvent(QEvent *) + virtual void enterEvent(TQEvent *) { setTimeout(3000000); // Make timeout damn near infinite } - virtual void leaveEvent(QEvent *) + virtual void leaveEvent(TQEvent *) { setTimeout(250); // Close quickly } @@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), removeCover(); // make sure any old temp cover is gone - KStdAction::quit(napp, SLOT(quit()), actionCollection()); - KStdAction::open(napp, SLOT(fileOpen()), actionCollection()); - KStdAction::preferences(napp, SLOT(preferences()), actionCollection()); + KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); + KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection()); NoatunStdAction::back(actionCollection(), "back"); NoatunStdAction::stop(actionCollection(), "stop"); NoatunStdAction::playpause(actionCollection(), "play"); @@ -117,18 +117,18 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), mTray = new KitSystemTray("tray", this); mTray->show(); - trayBase = renderIcon(BASEICON, QString::null); + trayBase = renderIcon(BASEICON, TQString::null); trayStatus = renderIcon(BASEICON, "player_stop"); mTray->changeTitle(*trayBase, i18n("Noatun")); showingTrayStatus = false; - mBlinkTimer = new QTimer(this); - connect(mBlinkTimer, SIGNAL(timeout()), this, SLOT(slotBlinkTimer())); + mBlinkTimer = new TQTimer(this); + connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer())); - connect(napp->player(), SIGNAL(playing()), this, SLOT(slotPlayPause())); - connect(napp->player(), SIGNAL(paused()), this, SLOT(slotPlayPause())); - connect(napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlayPause())); + connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPlayPause())); + connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); //napp->player()->handleButtons(); } @@ -146,7 +146,7 @@ NoatunSystray::~NoatunSystray() void NoatunSystray::init() { YHModule *cmod = new YHModule(this); - connect(cmod, SIGNAL(saved()), this, SLOT(slotLoadSettings())); + connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings())); slotLoadSettings(); } @@ -165,9 +165,9 @@ void NoatunSystray::slotLoadSettings() if(c->tip()) - QToolTip::add(mTray, tipText); + TQToolTip::add(mTray, tipText); else - QToolTip::remove(mTray); + TQToolTip::remove(mTray); if (!c->passivePopupCovers()) removeCover(); @@ -184,7 +184,7 @@ void NoatunSystray::slotLoadSettings() } -void NoatunSystray::closeEvent(QCloseEvent*) +void NoatunSystray::closeEvent(TQCloseEvent*) { //kdDebug(66666) << k_funcinfo << "Called." << endl; disconnect(napp->player(), 0, 0, 0); @@ -194,7 +194,7 @@ void NoatunSystray::closeEvent(QCloseEvent*) void NoatunSystray::slotPlayPause() { - QString status; + TQString status; if(napp->player()->isPaused()) { @@ -208,26 +208,26 @@ void NoatunSystray::slotPlayPause() } const PlaylistItem item = napp->player()->current(); - QString s; + TQString s; if(!item.isProperty("title")) { // No metadata - s = QString("%1").arg(item.title()); + s = TQString("%1").arg(item.title()); } else { - s = QString("

%1

").arg(item.property("title")); + s = TQString("

%1

").arg(item.property("title")); if(item.isProperty("author")) - s += QString("%1
").arg(item.property("author")); + s += TQString("%1
").arg(item.property("author")); if(item.isProperty("album")) { if(item.isProperty("date")) - s += QString("%1 (%2)
").arg(item.property("album")).arg(item.property("date")); + s += TQString("%1 (%2)
").arg(item.property("album")).arg(item.property("date")); else - s += QString("%1
").arg(item.property("album")); + s += TQString("%1
").arg(item.property("album")); } } @@ -235,18 +235,18 @@ void NoatunSystray::slotPlayPause() if (YHConfig::self()->passivePopupCovers()) updateCover(); - if(YHConfig::self()->passivePopupCovers() && QFile::exists(tmpCoverPath)) + if(YHConfig::self()->passivePopupCovers() && TQFile::exists(tmpCoverPath)) { // QT always adds an empty line after the table so we add en empty line before the // table to get equal spacing on top and bottom - setTipText(QString("
" \ + setTipText(TQString("
" \ "" \ "" \ "

%1

%2
").arg(status).arg(s).arg(tmpCoverPath)); } else { - setTipText(QString("

%1

%2
").arg(status).arg(s)); + setTipText(TQString("

%1

%2
").arg(status).arg(s)); } } @@ -256,12 +256,12 @@ void NoatunSystray::slotStopped() if(!napp->player()->current()) return; changeTray("player_stop"); - setTipText(QString("

%1

").arg(i18n("Noatun - Stopped"))); + setTipText(TQString("

%1

").arg(i18n("Noatun - Stopped"))); } -void NoatunSystray::changeTray(const QString &pm) +void NoatunSystray::changeTray(const TQString &pm) { delete trayStatus; trayStatus = renderIcon(BASEICON, pm); @@ -297,19 +297,19 @@ void NoatunSystray::slotBlinkTimer() void NoatunSystray::updateCover() { //kdDebug(66666) << k_funcinfo << endl; - QString dir = napp->player()->current().url().directory(); - QString cover; + TQString dir = napp->player()->current().url().directory(); + TQString cover; // TODO: Maybe make these filenames configurable? - if(QFile::exists(dir + "/folder.png")) + if(TQFile::exists(dir + "/folder.png")) cover = dir + "/folder.png"; - else if(QFile::exists(dir + "/.folder.png")) + else if(TQFile::exists(dir + "/.folder.png")) cover = dir + "/.folder.png"; - else if(QFile::exists(dir + "/cover.png")) + else if(TQFile::exists(dir + "/cover.png")) cover = dir + "/cover.png"; - else if(QFile::exists(dir + "/cover.jpg")) + else if(TQFile::exists(dir + "/cover.jpg")) cover = dir + "/cover.jpg"; - else if(QFile::exists(dir + "/cover.jpeg")) + else if(TQFile::exists(dir + "/cover.jpeg")) cover = dir + "/cover.jpeg"; else // no cover { @@ -318,9 +318,9 @@ void NoatunSystray::updateCover() return; } - QString title = napp->player()->current().title(); + TQString title = napp->player()->current().title(); - QImage previmg; + TQImage previmg; previmg.load(tmpCoverPath); if(previmg.text("Title") != title) @@ -328,13 +328,13 @@ void NoatunSystray::updateCover() /*kdDebug(66666) << k_funcinfo << "Creating new temp cover for '" << cover << "'" << endl;*/ - QImage src; - QImage tmpimg; + TQImage src; + TQImage tmpimg; if(src.load(cover)) { if(src.width() >= COVER_MAXW || src.height() >= COVER_MAXH) - tmpimg = src.scale(COVER_MAXW, COVER_MAXH, QImage::ScaleMin); + tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQImage::ScaleMin); else tmpimg = src; @@ -351,12 +351,12 @@ void NoatunSystray::updateCover() void NoatunSystray::removeCover() { - if(QFile::exists(tmpCoverPath)) + if(TQFile::exists(tmpCoverPath)) KIO::NetAccess::del(KURL(tmpCoverPath), this); } -void NoatunSystray::setTipText(const QString& text) +void NoatunSystray::setTipText(const TQString& text) { if(text == tipText) // save the planet, save cpu cycles ;) return; @@ -364,10 +364,10 @@ void NoatunSystray::setTipText(const QString& text) YHConfig *c = YHConfig::self(); if(c->passivePopup()) - QTimer::singleShot(0, this, SLOT(showPassivePopup())); + TQTimer::singleShot(0, this, TQT_SLOT(showPassivePopup())); if(c->tip()) - QToolTip::add(mTray, tipText); + TQToolTip::add(mTray, tipText); } @@ -379,12 +379,12 @@ void NoatunSystray::showPassivePopup() return; } - mPassivePopup->reparent(0L, QPoint(0,0)); + mPassivePopup->reparent(0L, TQPoint(0,0)); if (YHConfig::self()->passivePopupButtons() && !napp->player()->isStopped()) { - QVBox *widget = mPassivePopup->standardView(QString::null, tipText, QPixmap()); - QHBox *box = new QHBox(mPassivePopup, "popupbox"); + TQVBox *widget = mPassivePopup->standardView(TQString::null, tipText, TQPixmap()); + TQHBox *box = new TQHBox(mPassivePopup, "popupbox"); box->setSpacing(8); @@ -394,52 +394,52 @@ void NoatunSystray::showPassivePopup() NETRect frame, win; ni.kdeGeometry(frame, win); - QRect bounds = KGlobalSettings::desktopGeometry(QPoint(win.pos.x, win.pos.y)); + TQRect bounds = KGlobalSettings::desktopGeometry(TQPoint(win.pos.x, win.pos.y)); if(win.pos.x < bounds.center().x()) { // Buttons to the left - QVBox *buttonBox = new QVBox(box); + TQVBox *buttonBox = new TQVBox(box); buttonBox->setSpacing(3); - QPushButton *forwardButton = new QPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); + TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, SIGNAL(clicked()), action("forward"), SLOT(activate())); + connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); - QPushButton *backButton = new QPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); + TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, SIGNAL(clicked()), action("back"), SLOT(activate())); + connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); - QFrame *line = new QFrame(box); - line->setFrameShape(QFrame::VLine); + TQFrame *line = new TQFrame(box); + line->setFrameShape(TQFrame::VLine); - widget->reparent(box, QPoint(0, 0)); + widget->reparent(box, TQPoint(0, 0)); } else { // Buttons to the right - widget->reparent(box, QPoint(0, 0)); + widget->reparent(box, TQPoint(0, 0)); - QFrame *line = new QFrame(box); - line->setFrameShape(QFrame::VLine); + TQFrame *line = new TQFrame(box); + line->setFrameShape(TQFrame::VLine); - QVBox *buttonBox = new QVBox(box); + TQVBox *buttonBox = new TQVBox(box); buttonBox->setSpacing(3); - QPushButton *forwardButton = new QPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); + TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, SIGNAL(clicked()), action("forward"), SLOT(activate())); + connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); - QPushButton *backButton = new QPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); + TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, SIGNAL(clicked()), action("back"), SLOT(activate())); + connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); } mPassivePopup->setView(box); } else { - mPassivePopup->setView(QString::null, tipText); + mPassivePopup->setView(TQString::null, tipText); } mPassivePopup->setTimeout(YHConfig::self()->passivePopupTimeout()*1000); @@ -447,17 +447,17 @@ void NoatunSystray::showPassivePopup() } -QPixmap *NoatunSystray::renderIcon(const QString& baseIcon, const QString &overlayIcon) const +TQPixmap *NoatunSystray::renderIcon(const TQString& baseIcon, const TQString &overlayIcon) const { - QPixmap *base = new QPixmap(KSystemTray::loadIcon(baseIcon)); + TQPixmap *base = new TQPixmap(KSystemTray::loadIcon(baseIcon)); if(!(overlayIcon.isNull())) // otherwise leave the base as-is { - QPixmap overlay = KSystemTray::loadIcon(overlayIcon); + TQPixmap overlay = KSystemTray::loadIcon(overlayIcon); if(!overlay.isNull()) { // draw the overlay on top of it - QPainter p(base); + TQPainter p(base); p.drawPixmap(0, 0, overlay); } } diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h index f602c4e3..aa723eb5 100644 --- a/noatun/modules/systray/systray.h +++ b/noatun/modules/systray/systray.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include @@ -47,34 +47,34 @@ public: virtual void init(); protected: - virtual void closeEvent(QCloseEvent *); + virtual void closeEvent(TQCloseEvent *); public slots: void slotPlayPause(); void slotStopped(); private slots: - void changeTray(const QString &); + void changeTray(const TQString &); void slotLoadSettings(); void slotBlinkTimer(); void showPassivePopup(); - QPixmap *renderIcon(const QString &, const QString &) const; + TQPixmap *renderIcon(const TQString &, const TQString &) const; private: - void setTipText(const QString&); + void setTipText(const TQString&); void updateCover(); void removeCover(); private: KitSystemTray *mTray; - QTimer *mBlinkTimer; - QPixmap *trayStatus; - QPixmap *trayBase; + TQTimer *mBlinkTimer; + TQPixmap *trayStatus; + TQPixmap *trayBase; PassivePopup *mPassivePopup; bool showingTrayStatus; - QString tipText; - QString tmpCoverPath; + TQString tipText; + TQString tmpCoverPath; }; #endif -- cgit v1.2.1