diff options
Diffstat (limited to 'amor')
| -rw-r--r-- | amor/CMakeL10n.txt | 6 | ||||
| -rw-r--r-- | amor/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | amor/amor.cpp | 48 | ||||
| -rw-r--r-- | amor/amor.desktop | 64 | ||||
| -rw-r--r-- | amor/amor.h | 4 | ||||
| -rw-r--r-- | amor/amorbubble.h | 2 | ||||
| -rw-r--r-- | amor/amordialog.cpp | 14 | ||||
| -rw-r--r-- | amor/amordialog.h | 2 | ||||
| -rw-r--r-- | amor/amorwidget.cpp | 4 | ||||
| -rw-r--r-- | amor/amorwidget.h | 2 | ||||
| -rw-r--r-- | amor/data/tips-en | 2 |
11 files changed, 46 insertions, 107 deletions
diff --git a/amor/CMakeL10n.txt b/amor/CMakeL10n.txt index 9a458e3..0aa3ea7 100644 --- a/amor/CMakeL10n.txt +++ b/amor/CMakeL10n.txt @@ -42,3 +42,9 @@ tde_l10n_create_template( CATALOG "amor" SOURCES "data/tips-en.tde_l10n" "." ) + +tde_l10n_create_template( + CATALOG "desktop_files/amor.desktop/" + SOURCES amor.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/amor/CMakeLists.txt b/amor/CMakeLists.txt index ad96cdc..1fb6280 100644 --- a/amor/CMakeLists.txt +++ b/amor/CMakeLists.txt @@ -50,7 +50,4 @@ tde_install_icons( amor ) ##### other data ################################ -install( FILES amor.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} -) - +tde_create_translated_desktop( amor.desktop ) diff --git a/amor/amor.cpp b/amor/amor.cpp index 2580794..c6de8af 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -136,37 +136,37 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject() mState = Normal; mWin = new KWinModule; - connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)), - this, TQT_SLOT(slotWindowActivate(WId))); - connect(mWin, TQT_SIGNAL(windowRemoved(WId)), - this, TQT_SLOT(slotWindowRemove(WId))); - connect(mWin, TQT_SIGNAL(stackingOrderChanged()), - this, TQT_SLOT(slotStackingChanged())); - connect(mWin, TQT_SIGNAL(windowChanged(WId, const unsigned long *)), - this, TQT_SLOT(slotWindowChange(WId, const unsigned long *))); - connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(slotDesktopChange(int))); + connect(mWin, TQ_SIGNAL(activeWindowChanged(WId)), + this, TQ_SLOT(slotWindowActivate(WId))); + connect(mWin, TQ_SIGNAL(windowRemoved(WId)), + this, TQ_SLOT(slotWindowRemove(WId))); + connect(mWin, TQ_SIGNAL(stackingOrderChanged()), + this, TQ_SLOT(slotStackingChanged())); + connect(mWin, TQ_SIGNAL(windowChanged(WId, const unsigned long *)), + this, TQ_SLOT(slotWindowChange(WId, const unsigned long *))); + connect(mWin, TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(slotDesktopChange(int))); mAmor = new AmorWidget(); - connect(mAmor, TQT_SIGNAL(mouseClicked(const TQPoint &)), - TQT_SLOT(slotMouseClicked(const TQPoint &))); - connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)), - TQT_SLOT(slotWidgetDragged(const TQPoint &, bool))); + connect(mAmor, TQ_SIGNAL(mouseClicked(const TQPoint &)), + TQ_SLOT(slotMouseClicked(const TQPoint &))); + connect(mAmor, TQ_SIGNAL(dragged(const TQPoint &, bool)), + TQ_SLOT(slotWidgetDragged(const TQPoint &, bool))); mAmor->resize(mTheme.maximumSize()); mTimer = new TQTimer(this); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); mStackTimer = new TQTimer(this); - connect(mStackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(restack())); + connect(mStackTimer, TQ_SIGNAL(timeout()), TQ_SLOT(restack())); mBubbleTimer = new TQTimer(this); - connect(mBubbleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBubbleTimeout())); + connect(mBubbleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBubbleTimeout())); time(&mActiveTime); mCursPos = TQCursor::pos(); mCursorTimer = new TQTimer(this); - connect(mCursorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCursorTimeout())); + connect(mCursorTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCursorTimeout())); mCursorTimer->start( 500 ); if (mWin->activeWindow()) @@ -610,10 +610,10 @@ void Amor::slotMouseClicked(const TQPoint &pos) TDEPopupMenu* helpMnu = help->menu(); mMenu = new TDEPopupMenu(); mMenu->insertTitle("Amor"); // I really don't want this i18n'ed - mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); + mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQ_SLOT(slotConfigure())); mMenu->insertSeparator(); mMenu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu); - mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQT_SLOT(quit())); + mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQ_SLOT(quit())); } mMenu->exec(pos); @@ -710,9 +710,9 @@ void Amor::slotConfigure() if (!mAmorDialog) { mAmorDialog = new AmorDialog(); - connect(mAmorDialog, TQT_SIGNAL(changed()), TQT_SLOT(slotConfigChanged())); - connect(mAmorDialog, TQT_SIGNAL(offsetChanged(int)), - TQT_SLOT(slotOffsetChanged(int))); + connect(mAmorDialog, TQ_SIGNAL(changed()), TQ_SLOT(slotConfigChanged())); + connect(mAmorDialog, TQ_SIGNAL(offsetChanged(int)), + TQ_SLOT(slotOffsetChanged(int))); } mAmorDialog->show(); @@ -1014,7 +1014,7 @@ AmorSessionWidget::AmorSessionWidget() { // the only function of this widget is to catch & forward the // saveYourself() signal from the session manager - connect(kapp, TQT_SIGNAL(saveYourself()), TQT_SLOT(wm_saveyourself())); + connect(kapp, TQ_SIGNAL(saveYourself()), TQ_SLOT(wm_saveyourself())); } void AmorSessionWidget::wm_saveyourself() diff --git a/amor/amor.desktop b/amor/amor.desktop index d018d59..e6e3221 100644 --- a/amor/amor.desktop +++ b/amor/amor.desktop @@ -1,74 +1,10 @@ [Desktop Entry] Name=AMOR -Name[af]=Amor -Name[ar]=برنامج AMOR -Name[bg]=Amor -Name[bn]=আমোর -Name[fi]=Amor -Name[fo]=Amor -Name[fr]=Amor -Name[hi]=एमोर -Name[pa]=ਅਮੋਰ -Name[sv]=Amor -Name[ta]= AMOR -Name[tr]=Amor -Name[zh_CN]=阿莫(AMOR) Exec=amor Icon=amor Type=Application X-DocPath=amor/index.html GenericName=On-Screen Creature -GenericName[be]=Экранная жывёла -GenericName[bg]=Усмивка за работното място -GenericName[bn]=পর্দায় বসবাসকারী জন্তু -GenericName[ca]=Criatura a la pantalla -GenericName[cs]=Příšerka na obrazovce -GenericName[cy]=Creadur Ar-Sgrin -GenericName[da]=Skabning på skærmen -GenericName[de]=Maskottchen für die Arbeitsfläche -GenericName[el]=Πλάσμα στην οθόνη -GenericName[eo]=Surekrana kreaĵo -GenericName[es]=Criatura de la pantalla -GenericName[et]=Elajas töölaual -GenericName[eu]=Pantailako gizakia -GenericName[fa]=ایجادکنندۀ روی پرده -GenericName[fi]=Näytönolento -GenericName[fr]=Créature sur l'écran -GenericName[ga]=Créatúr ar do scáileán -GenericName[gl]=Criatura no Escritório -GenericName[he]=יצור מסכי -GenericName[hr]=Kretura na zaslonu -GenericName[hu]=Animált figurák -GenericName[is]=Skjámyndataka -GenericName[it]=Creatura sullo schermo -GenericName[ja]=画面上の生物 -GenericName[km]=ការច្នៃប្រឌិតលើអេក្រង់ -GenericName[ko]=화면 위 생명체 -GenericName[lv]=Ekrāna dzīvnieks -GenericName[mk]=Креатура на екранот -GenericName[mt]=Annimal ta' fuq l-iskrin -GenericName[nb]=Vesen på skjermen -GenericName[nds]=Schriefdisch-Maskottje -GenericName[ne]=पर्दा क्रिएचर -GenericName[nl]=Schermvermaak -GenericName[nn]=Skjermvesen -GenericName[pa]=ਆਨ-ਸਕਰੀਨ ਲਵੋ -GenericName[pl]=Stworzenie ekranowe -GenericName[pt]=Criatura no Ecrã -GenericName[pt_BR]=Criatura na Tela -GenericName[ro]=Creatură pe ecran -GenericName[ru]=Экранные зверушки -GenericName[sk]=Stvorenie na obrazovke -GenericName[sl]=Zaslonska živalca -GenericName[sr]=Створење на екрану -GenericName[sr@Latn]=Stvorenje na ekranu -GenericName[sv]=Varelse på skärmen -GenericName[ta]=திரையில் உருவாக்கி -GenericName[tg]=Махлуқ дар экран -GenericName[tr]=Ekranda Gezinen Yaratık -GenericName[uk]=Екранна істота -GenericName[zh_CN]=屏幕涂鸦 -GenericName[zh_TW]=畫面擷取程式 Terminal=false X-DCOP-ServiceType=Unique Categories=Qt;TDE;Amusement; diff --git a/amor/amor.h b/amor/amor.h index 3e75183..b4a4abe 100644 --- a/amor/amor.h +++ b/amor/amor.h @@ -72,7 +72,7 @@ private: // class Amor : public TQObject, virtual public AmorIface { - Q_OBJECT + TQ_OBJECT public: Amor(); @@ -153,7 +153,7 @@ private: class AmorSessionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AmorSessionWidget(); diff --git a/amor/amorbubble.h b/amor/amorbubble.h index 3a99b7d..5006a0e 100644 --- a/amor/amorbubble.h +++ b/amor/amorbubble.h @@ -44,7 +44,7 @@ class TQTimer; // class AmorBubble : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AmorBubble(); diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp index 5abb0e3..9af3b47 100644 --- a/amor/amordialog.cpp +++ b/amor/amordialog.cpp @@ -57,7 +57,7 @@ AmorDialog::AmorDialog() TQLabel *label = new TQLabel(i18n("Theme:"), themeBox); mThemeListBox = new TQListBox(themeBox); - connect(mThemeListBox,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotHighlighted(int))); + connect(mThemeListBox,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotHighlighted(int))); mThemeListBox->setMinimumSize( fontMetrics().maxWidth()*20, fontMetrics().lineSpacing()*6 ); @@ -74,24 +74,24 @@ AmorDialog::AmorDialog() label = new TQLabel(i18n("Offset:"), offsetBox); TQSlider *slider = new TQSlider(-40, 40, 5, mConfig.mOffset, - Qt::Vertical, offsetBox); - connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotOffset(int))); + TQt::Vertical, offsetBox); + connect(slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotOffset(int))); // Always on top TQCheckBox *checkBox = new TQCheckBox(i18n("Always on top"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOnTop(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotOnTop(bool))); checkBox->setChecked(mConfig.mOnTop); checkBox = new TQCheckBox(i18n("Show random tips"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTips(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRandomTips(bool))); checkBox->setChecked(mConfig.mTips); // always keep this one after the connect, or the TQPtrList would not be grayed when it should checkBox = new TQCheckBox(i18n("Use a random character"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTheme(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRandomTheme(bool))); checkBox->setChecked(mConfig.mRandomTheme); checkBox = new TQCheckBox(i18n("Allow application tips"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotApplicationTips(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotApplicationTips(bool))); checkBox->setChecked(mConfig.mAppTips); readThemes(); diff --git a/amor/amordialog.h b/amor/amordialog.h index d2d2d0c..cfd6896 100644 --- a/amor/amordialog.h +++ b/amor/amordialog.h @@ -40,7 +40,7 @@ // class AmorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amor/amorwidget.cpp b/amor/amorwidget.cpp index 38dd0d3..c60cd5d 100644 --- a/amor/amorwidget.cpp +++ b/amor/amorwidget.cpp @@ -98,7 +98,7 @@ void AmorWidget::mousePressEvent(TQMouseEvent *me) // void AmorWidget::mouseMoveEvent(TQMouseEvent *me) { - if ( me->state() == Qt::LeftButton ) { + if ( me->state() == TQt::LeftButton ) { if ( !dragging && (clickPos-me->globalPos()).manhattanLength() > 3 ) dragging = true; if ( dragging ) { @@ -116,7 +116,7 @@ void AmorWidget::mouseReleaseEvent(TQMouseEvent *me) { if ( dragging ) emit dragged( me->globalPos() - clickPos, true ); - else if ( me->state() == Qt::RightButton ) + else if ( me->state() == TQt::RightButton ) emit mouseClicked(clickPos); clickPos = TQPoint(); diff --git a/amor/amorwidget.h b/amor/amorwidget.h index d5cdd88..9d4b5db 100644 --- a/amor/amorwidget.h +++ b/amor/amorwidget.h @@ -40,7 +40,7 @@ // class AmorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AmorWidget(); diff --git a/amor/data/tips-en b/amor/data/tips-en index c30aeb6..fd26dff 100644 --- a/amor/data/tips-en +++ b/amor/data/tips-en @@ -32,7 +32,7 @@ Ctrl+Alt+Esc can be used to kill an application that has stopped responding. % If you leave TDE applications open when you logout, they will be restarted automatically when you log back in. % -The KDE file manager is also a web browser and an FTP client. +The TDE file manager is also a web browser and an FTP client. % Applications can display messages and tips in an Amor bubble using the showMessage() and showTip() DCOP calls |