diff options
Diffstat (limited to 'katapult/katapult')
-rw-r--r-- | katapult/katapult/CMakeLists.txt | 5 | ||||
-rw-r--r-- | katapult/katapult/Makefile.am | 23 | ||||
-rw-r--r-- | katapult/katapult/katapult.cpp | 42 | ||||
-rw-r--r-- | katapult/katapult/katapult.desktop | 21 | ||||
-rw-r--r-- | katapult/katapult/katapult.h | 2 | ||||
-rw-r--r-- | katapult/katapult/katapultconfigdlg.cpp | 10 | ||||
-rw-r--r-- | katapult/katapult/katapultconfigdlg.h | 2 | ||||
-rw-r--r-- | katapult/katapult/katapultiface.h | 2 | ||||
-rw-r--r-- | katapult/katapult/katapultsettings.h | 2 | ||||
-rw-r--r-- | katapult/katapult/settings.cpp | 8 |
10 files changed, 34 insertions, 83 deletions
diff --git a/katapult/katapult/CMakeLists.txt b/katapult/katapult/CMakeLists.txt index 7a98783..20bf76b 100644 --- a/katapult/katapult/CMakeLists.txt +++ b/katapult/katapult/CMakeLists.txt @@ -43,7 +43,4 @@ tde_install_icons( ${PROJECT_NAME} ) ##### other data -install( - FILES ${PROJECT_NAME}.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} -) +tde_create_translated_desktop( ${PROJECT_NAME}.desktop ) diff --git a/katapult/katapult/Makefile.am b/katapult/katapult/Makefile.am deleted file mode 100644 index f4b63e8..0000000 --- a/katapult/katapult/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# set the include path for X, qt and KDE -INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes) - -# these are the headers for your project -noinst_HEADERS = katapult.h katapultsettings.h katapultconfigdlg.h \ - katapultiface.h - - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -KDE_ICON = katapult - -bin_PROGRAMS = katapult - -# the application source, library search path, and link libraries -katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \ - katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel -katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -katapult_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la - -# this is where the desktop file will go -xdg_apps_DATA = katapult.desktop diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 7c4a43b..6205c4b 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -62,16 +62,16 @@ Katapult::Katapult() settings = new KatapultSettings(); helpmenu = new KHelpMenu(this,TQString(),false); - connect(helpmenu, TQT_SIGNAL(showAboutApplication()),this, TQT_SLOT(showAboutDialog())); + connect(helpmenu, TQ_SIGNAL(showAboutApplication()),this, TQ_SLOT(showAboutDialog())); hideTimer = new TQTimer(this); - connect(hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher())); + connect(hideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideLauncher())); clearTimer = new TQTimer(this); - connect(clearTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(clearQuery())); + connect(clearTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearQuery())); - connect(settings, TQT_SIGNAL(catalogsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadCatalogPlugins())); - connect(settings, TQT_SIGNAL(displayChanged()), TQT_TQOBJECT(this), TQT_SLOT(initDisplay())); - connect(settings, TQT_SIGNAL(systrayChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateSystray())); + connect(settings, TQ_SIGNAL(catalogsChanged()), this, TQ_SLOT(loadCatalogPlugins())); + connect(settings, TQ_SIGNAL(displayChanged()), this, TQ_SLOT(initDisplay())); + connect(settings, TQ_SIGNAL(systrayChanged()), this, TQ_SLOT(updateSystray())); loadCatalogPlugins(); initDisplay(); @@ -111,16 +111,16 @@ void Katapult::initDisplay() } else { initAccel(display); setQuery(""); - connect(display, TQT_SIGNAL(keyReleased(TQKeyEvent *)), TQT_TQOBJECT(this), TQT_SLOT(keyReleased(TQKeyEvent *))); - connect(display, TQT_SIGNAL(focusOut()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher())); + connect(display, TQ_SIGNAL(keyReleased(TQKeyEvent *)), this, TQ_SLOT(keyReleased(TQKeyEvent *))); + connect(display, TQ_SIGNAL(focusOut()), this, TQ_SLOT(hideLauncher())); } } void Katapult::initAccel(TQWidget *parent) { - globalAccel = new TDEGlobalAccel(TQT_TQOBJECT(parent)); + globalAccel = new TDEGlobalAccel(parent); globalAccel->insert("show_katapult", i18n("Show Launcher"), i18n("Shows the Katapult launcher"), ALT+Key_Space, ALT+Key_Space, - TQT_TQOBJECT(this), TQT_SLOT(showLauncher())); + this, TQ_SLOT(showLauncher())); globalAccel->readSettings(); globalAccel->updateConnections(); @@ -129,23 +129,23 @@ void Katapult::initAccel(TQWidget *parent) contextMenu()->clear(); - new TDEAction(i18n("Execute"), "application-x-executable", Key_Return, TQT_TQOBJECT(this), TQT_SLOT(execute()), actions, "execute"); - new TDEAction(i18n("Clear"), "edit-clear", Key_Left, TQT_TQOBJECT(this), TQT_SLOT(clearQuery()), actions, "clear"); - new TDEAction(i18n("Close"), "window-close", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()), actions, "close"); - new TDEAction(i18n("Complete Query"), "next", Key_Right, TQT_TQOBJECT(this), TQT_SLOT(completeQuery()), actions, "complete_query"); - new TDEAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, TQT_TQOBJECT(this), TQT_SLOT(showContextMenu()), actions, "show_menu"); + new TDEAction(i18n("Execute"), "application-x-executable", Key_Return, this, TQ_SLOT(execute()), actions, "execute"); + new TDEAction(i18n("Clear"), "edit-clear", Key_Left, this, TQ_SLOT(clearQuery()), actions, "clear"); + new TDEAction(i18n("Close"), "window-close", Key_Escape, this, TQ_SLOT(hideLauncher()), actions, "close"); + new TDEAction(i18n("Complete Query"), "next", Key_Right, this, TQ_SLOT(completeQuery()), actions, "complete_query"); + new TDEAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, this, TQ_SLOT(showContextMenu()), actions, "show_menu"); - TDEAction *actGlobAccel = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showGlobalShortcutsDialog()), actions); + TDEAction *actGlobAccel = KStdAction::keyBindings(this, TQ_SLOT(showGlobalShortcutsDialog()), actions); actGlobAccel->setText(i18n("Configure &Global Shortcuts...")); actGlobAccel->plug((TQWidget *) contextMenu()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showShortcutsDialog()), actions)->plug((TQWidget *) contextMenu()); - KStdAction::preferences(settings, TQT_SLOT(configure()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::keyBindings(this, TQ_SLOT(showShortcutsDialog()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::preferences(settings, TQ_SLOT(configure()), actions)->plug((TQWidget *) contextMenu()); contextMenu()->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu()->insertSeparator(); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::quit(this, TQ_SLOT(close()), actions)->plug((TQWidget *) contextMenu()); actions->readShortcutSettings(); } @@ -218,7 +218,7 @@ void Katapult::setQuery(TQString _query) if(!bestMatch.isNull()) { TQPtrList<KatapultAction> itemActions = ActionRegistry::self()->actionsForItem(bestMatch.item()); action = itemActions.at(0); - connect(bestMatch.item(), TQT_SIGNAL(itemChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateDisplay())); + connect(bestMatch.item(), TQ_SIGNAL(itemChanged()), this, TQ_SLOT(updateDisplay())); } } if(!(allStatus & S_HasResults) && allStatus & S_Active) { @@ -353,7 +353,7 @@ void Katapult::keyReleased(TQKeyEvent *e) void Katapult::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) showLauncher(); else KSystemTray::mousePressEvent(e); diff --git a/katapult/katapult/katapult.desktop b/katapult/katapult/katapult.desktop index 1e2bf11..8ad244f 100644 --- a/katapult/katapult/katapult.desktop +++ b/katapult/katapult/katapult.desktop @@ -1,30 +1,9 @@ [Desktop Entry] Encoding=UTF-8 Name=Katapult -Name[uk]=Катапульта Exec=katapult Icon=katapult GenericName=TDE Launcher -GenericName[ar]=مقلع TDE -GenericName[bg]=Стартиране на TDE -GenericName[br]=Loc'her TDE -GenericName[da]=TDE-startværktøj -GenericName[de]=TDE-Starter -GenericName[el]=Εκτελεστής του TDE -GenericName[es]=Iniciador TDE -GenericName[et]=TDE käivitaja -GenericName[fr]=Lanceur pour TDE -GenericName[ga]=Tosaitheoir TDE -GenericName[gl]=Iniciador de aplicazóns para TDE -GenericName[it]=Avviatore per TDE -GenericName[ja]=TDE ランチャー -GenericName[nb]=TDE oppstarter -GenericName[nl]=TDE-starter -GenericName[pt]=Lançador do TDE -GenericName[pt_BR]=Lançador do TDE -GenericName[sv]=TDE-startverktyg -GenericName[tr]=TDE Başlatıcısı -GenericName[uk]=TDE пускач Terminal=false Type=Application Categories=Qt;TDE;System; diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h index 94ae078..173728f 100644 --- a/katapult/katapult/katapult.h +++ b/katapult/katapult/katapult.h @@ -48,7 +48,7 @@ class KatapultSettings; class Katapult : public KSystemTray, virtual public KatapultIface { - Q_OBJECT + TQ_OBJECT public: Katapult(); diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp index 2ca0fb7..ede7321 100644 --- a/katapult/katapult/katapultconfigdlg.cpp +++ b/katapult/katapult/katapultconfigdlg.cpp @@ -60,7 +60,7 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) case KatapultSettings::NR_HideDisplay: general->nrHideDisplay->setChecked(TRUE); break; default: general->nrClearQuery->setChecked(TRUE); break; } - connect(general->nrDoNothing, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(nrDoNothingToggled(bool))); + connect(general->nrDoNothing, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(nrDoNothingToggled(bool))); general->noResultsDelay->setEnabled(!general->nrDoNothing->isChecked()); // catalog settings @@ -98,10 +98,10 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) unfoldTreeList(TRUE); // connect signals - connect(catalogConf->catalogs, TQT_SIGNAL(added(TQListBoxItem *)), this, TQT_SLOT(activateCatalog(TQListBoxItem* ))); - connect(catalogConf->catalogs, TQT_SIGNAL(removed(TQListBoxItem *)), this, TQT_SLOT(deactivateCatalog(TQListBoxItem* ))); - connect(display->displayName, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activateDisplay(int))); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveSettings())); + connect(catalogConf->catalogs, TQ_SIGNAL(added(TQListBoxItem *)), this, TQ_SLOT(activateCatalog(TQListBoxItem* ))); + connect(catalogConf->catalogs, TQ_SIGNAL(removed(TQListBoxItem *)), this, TQ_SLOT(deactivateCatalog(TQListBoxItem* ))); + connect(display->displayName, TQ_SIGNAL(activated(int)), this, TQ_SLOT(activateDisplay(int))); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveSettings())); } KatapultConfigDlg::~KatapultConfigDlg() diff --git a/katapult/katapult/katapultconfigdlg.h b/katapult/katapult/katapultconfigdlg.h index 55e1a77..afb8362 100644 --- a/katapult/katapult/katapultconfigdlg.h +++ b/katapult/katapult/katapultconfigdlg.h @@ -37,7 +37,7 @@ class TQFrame; */ class KatapultConfigDlg : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: KatapultConfigDlg(KatapultSettings *settings); diff --git a/katapult/katapult/katapultiface.h b/katapult/katapult/katapultiface.h index 9a49702..f0665e8 100644 --- a/katapult/katapult/katapultiface.h +++ b/katapult/katapult/katapultiface.h @@ -17,8 +17,6 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -// -*- c++ -*- - #ifndef KATAPULTDCOPIFACE_H #define KATAPULTDCOPIFACE_H diff --git a/katapult/katapult/katapultsettings.h b/katapult/katapult/katapultsettings.h index f6e5257..f004c1a 100644 --- a/katapult/katapult/katapultsettings.h +++ b/katapult/katapult/katapultsettings.h @@ -34,7 +34,7 @@ class TQString; */ class KatapultSettings : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum NRAction { diff --git a/katapult/katapult/settings.cpp b/katapult/katapult/settings.cpp index 002aee6..062f52e 100644 --- a/katapult/katapult/settings.cpp +++ b/katapult/katapult/settings.cpp @@ -54,8 +54,8 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl buttonHelp = new TQPushButton( this, "buttonHelp" ); buttonHelp->setAutoDefault( TRUE ); Layout1->addWidget( buttonHelp ); - Qt::Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - Layout1->addItem(Qt::Horizontal_Spacing2 ); + TQt::Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + Layout1->addItem(TQt::Horizontal_Spacing2 ); buttonOk = new TQPushButton( this, "buttonOk" ); buttonOk->setAutoDefault( TRUE ); @@ -72,8 +72,8 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl clearWState( WState_Polished ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); } /* |