diff options
Diffstat (limited to 'ksayit')
39 files changed, 340 insertions, 518 deletions
diff --git a/ksayit/CMakeL10n.txt b/ksayit/CMakeL10n.txt index b585ce4..0d6145b 100644 --- a/ksayit/CMakeL10n.txt +++ b/ksayit/CMakeL10n.txt @@ -1,3 +1,11 @@ ##### create translation templates ############## tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/ksayit-desktops/" + SOURCES + src/*.desktop + *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/ksayit/CMakeLists.txt b/ksayit/CMakeLists.txt new file mode 100644 index 0000000..3104aec --- /dev/null +++ b/ksayit/CMakeLists.txt @@ -0,0 +1,3 @@ +tde_conditional_add_subdirectory( BUILD_KSAYIT_FREEVERB Freeverb_plugin ) +add_subdirectory( KTTSD_Lib ) +add_subdirectory( src ) diff --git a/ksayit/Freeverb_plugin/CMakeLists.txt b/ksayit/Freeverb_plugin/CMakeLists.txt new file mode 100644 index 0000000..ed4a7cd --- /dev/null +++ b/ksayit/Freeverb_plugin/CMakeLists.txt @@ -0,0 +1,46 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/ksayit/src + ${ARTS_MODULES_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +##### libFreeverb_plugin (module) + +tde_add_library( libFreeverb_plugin MODULE AUTOMOC + + SOURCES + freeverb_setup.ui + freeverbsetupimpl.cpp + ksayitfreeverblib.cpp + LINK + tdecore-shared + tdeui-shared + ${ARTS_FREEVERB_PLUGIN_LIBRARIES} + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE ksayit_libFreeverb_service.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR ksayit-desktops +) + +tde_create_translated_desktop( + SOURCE ksayit_libFreeverb.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR ksayit-desktops +) diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui index 7cd1a02..c34a642 100644 --- a/ksayit/Freeverb_plugin/freeverb_setup.ui +++ b/ksayit/Freeverb_plugin/freeverb_setup.ui @@ -653,16 +653,16 @@ <slot>slotOKwasClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>sliderRoomChanged(int)</slot> <slot>sliderDampChanged(int)</slot> <slot>sliderWetChanged(int)</slot> <slot>sliderDryChanged(int)</slot> <slot>sliderWidthChanged(int)</slot> <slot>slotOKwasClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.h b/ksayit/Freeverb_plugin/freeverbsetupimpl.h index 6e2eab3..1831ad3 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.h +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.h @@ -32,7 +32,7 @@ */ class FreeverbSetupImpl : public Freeverb_Setup { - Q_OBJECT + TQ_OBJECT public: FreeverbSetupImpl(TQWidget *parent=0, const char *name=0, bool modal=true, TDEConfig *config=0); diff --git a/ksayit/Freeverb_plugin/kdeexportfix.h b/ksayit/Freeverb_plugin/kdeexportfix.h index 958dd20..8ec6f7b 100644 --- a/ksayit/Freeverb_plugin/kdeexportfix.h +++ b/ksayit/Freeverb_plugin/kdeexportfix.h @@ -1,5 +1,5 @@ /* - tdelibs < 3.3.2 had a bug in the KDE_EXPORT macro. This file fixes this + tdelibs < 3.3.2 had a bug in the TDE_EXPORT macro. This file fixes this by undefining it. ------------------- Copyright : (C) 2005 by Gary Cramblitt <garycramblitt@comcast.net> @@ -17,6 +17,6 @@ #include <tdeversion.h> #if TDE_VERSION < TDE_MAKE_VERSION (3,3,2) -#undef KDE_EXPORT -#define KDE_EXPORT +#undef TDE_EXPORT +#define TDE_EXPORT #endif diff --git a/ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop b/ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop index 9e42bef..15e51d9 100644 --- a/ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop +++ b/ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop @@ -1,52 +1,8 @@ [Desktop Entry] Name=Freeverb -Name[ne]=फ्रीभर्व -Name[vi]=Động từ tự do + Comment=A Freeverb Plugin for KSayIt -Comment[bg]=Приставка Freeverb за KTTSD -Comment[br]=Lugent Freeverb evit KSayIt -Comment[ca]=Un connector de Freeverb pel KSayit -Comment[cs]=Freeverb modul pro KSayIt -Comment[da]=Et Freeverb plugin for KSayIt -Comment[de]=Ein Freeverb-Modul für KSayIt -Comment[el]=Ένα πρόσθετο Freeverb για το KTTSD -Comment[es]=Complemento Freeverb para KSayIt -Comment[et]=KSayIt'i Freeverbi plugin -Comment[eu]=KSayIt-en Freeverb plugina -Comment[fa]=وصلۀ Freever برای KSaylt -Comment[fi]=Freeverb-liitännäinen KSayIt--ohjelmalle -Comment[fr]=Un module Freeverb pour KSayIt -Comment[ga]=Breiseán Freeverb le haghaidh KSayIt -Comment[gl]=Un Plugin de Freeverb para KSayIt -Comment[he]=תוסף Freeverb עבור KSayIt -Comment[hu]=Freeverb modul a KSayIt programhoz -Comment[is]=Freeverb íforrit fyrir KSayIt -Comment[it]=Un plugin per Freeverb per KTTSD -Comment[ja]=KSayIt 用 Freeverb プラグイン -Comment[ka]=KSayIt Freeverb მოდული -Comment[km]= កម្មវិធីជំនួយ Freeverb សម្រាប់ KSayIt -Comment[lt]=Freeverb priedas skirtas KSayIt -Comment[mk]=Freeverb-приклучок за Ksaylt -Comment[nb]=Et Freeverb programtillegg for KSayIt -Comment[nds]=En Freeverb-Moduul för KSayIt -Comment[ne]=के से इटका लागि एउटा फ्रिभर्व प्लगइन -Comment[nl]=Een Freeverb-plugin vor KSayIt -Comment[pa]=KSayIt ਲਈ ਮੁਕਤ-ਵਰਬ ਪਲੱਗਿੰਨ -Comment[pl]=Wtyczka Freeverb dla KSayIt -Comment[pt]='Plugin' de Reverberação para o KTTSD -Comment[pt_BR]=Plug-in do Freeverb para o KSayIt -Comment[ru]=Модуль Freeverb для KSayIt -Comment[sk]=Modul Freeverb pre PovedzTo -Comment[sl]=Vstavek Freeverb za KSayIt -Comment[sr]=Freeverb прикључак за KSayIt -Comment[sr@Latn]=Freeverb priključak za KSayIt -Comment[sv]=Freeverb-insticksprogram för Ksayit -Comment[tg]=Модули Freeverb барои KSayIt -Comment[tr]=Ksayit için Freeverb Eklentisi -Comment[uk]=Втулок Freeverb для KSayIt -Comment[vi]=Trình bổ sung "Động từ tự do" cho "Nói K" -Comment[zh_CN]=KSayIt 的 Freeverb 插件 -Comment[zh_TW]=KSayIt 的 Freeverb 外掛程式 -X-TDE-ServiceTypes=KSayIt/FXPlugin + Type=Service +X-TDE-ServiceTypes=KSayIt/FXPlugin X-TDE-Library=libFreeverb_plugin diff --git a/ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop b/ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop index 162baa5..c524094 100644 --- a/ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop +++ b/ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop @@ -1,48 +1,5 @@ [Desktop Entry] +Comment=A Freeverb Plugin for KSayIt + Type=ServiceType X-TDE-ServiceType=KSayIt/FXPlugin -Comment=A Freeverb Plugin for KSayIt -Comment[bg]=Приставка Freeverb за KTTSD -Comment[br]=Lugent Freeverb evit KSayIt -Comment[ca]=Un connector de Freeverb pel KSayit -Comment[cs]=Freeverb modul pro KSayIt -Comment[da]=Et Freeverb plugin for KSayIt -Comment[de]=Ein Freeverb-Modul für KSayIt -Comment[el]=Ένα πρόσθετο Freeverb για το KTTSD -Comment[es]=Complemento Freeverb para KSayIt -Comment[et]=KSayIt'i Freeverbi plugin -Comment[eu]=KSayIt-en Freeverb plugina -Comment[fa]=وصلۀ Freever برای KSaylt -Comment[fi]=Freeverb-liitännäinen KSayIt--ohjelmalle -Comment[fr]=Un module Freeverb pour KSayIt -Comment[ga]=Breiseán Freeverb le haghaidh KSayIt -Comment[gl]=Un Plugin de Freeverb para KSayIt -Comment[he]=תוסף Freeverb עבור KSayIt -Comment[hu]=Freeverb modul a KSayIt programhoz -Comment[is]=Freeverb íforrit fyrir KSayIt -Comment[it]=Un plugin per Freeverb per KTTSD -Comment[ja]=KSayIt 用 Freeverb プラグイン -Comment[ka]=KSayIt Freeverb მოდული -Comment[km]= កម្មវិធីជំនួយ Freeverb សម្រាប់ KSayIt -Comment[lt]=Freeverb priedas skirtas KSayIt -Comment[mk]=Freeverb-приклучок за Ksaylt -Comment[nb]=Et Freeverb programtillegg for KSayIt -Comment[nds]=En Freeverb-Moduul för KSayIt -Comment[ne]=के से इटका लागि एउटा फ्रिभर्व प्लगइन -Comment[nl]=Een Freeverb-plugin vor KSayIt -Comment[pa]=KSayIt ਲਈ ਮੁਕਤ-ਵਰਬ ਪਲੱਗਿੰਨ -Comment[pl]=Wtyczka Freeverb dla KSayIt -Comment[pt]='Plugin' de Reverberação para o KTTSD -Comment[pt_BR]=Plug-in do Freeverb para o KSayIt -Comment[ru]=Модуль Freeverb для KSayIt -Comment[sk]=Modul Freeverb pre PovedzTo -Comment[sl]=Vstavek Freeverb za KSayIt -Comment[sr]=Freeverb прикључак за KSayIt -Comment[sr@Latn]=Freeverb priključak za KSayIt -Comment[sv]=Freeverb-insticksprogram för Ksayit -Comment[tg]=Модули Freeverb барои KSayIt -Comment[tr]=Ksayit için Freeverb Eklentisi -Comment[uk]=Втулок Freeverb для KSayIt -Comment[vi]=Trình bổ sung "Động từ tự do" cho "Nói K" -Comment[zh_CN]=KSayIt 的 Freeverb 插件 -Comment[zh_TW]=KSayIt 的 Freeverb 外掛程式 diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp index 1141e68..40b6abd 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp @@ -17,7 +17,7 @@ // KDE includes #include <kdebug.h> #include <tdelocale.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <arts/artsmodules.h> // App specific includes @@ -65,7 +65,7 @@ TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name FreeverbPlugin::FreeverbPlugin(TQObject *parent, const char* name) //, TDEApplication *Appl) : FXPlugin(parent, name) //, m_Appl(Appl) { - m_config = new KSimpleConfig("ksayit_freeverbrc"); + m_config = new TDESimpleConfig("ksayit_freeverbrc"); } diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h index 65fe54c..afc2eca 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h @@ -17,16 +17,16 @@ #include <tqstringlist.h> // KDE includes -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <klibloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include "ksayit_fxplugin.h" class FreeverbPluginFactory : public KLibFactory { -Q_OBJECT +TQ_OBJECT public: // Consturctor @@ -36,7 +36,7 @@ public: virtual ~FreeverbPluginFactory(){ delete p_instance; }; TQObject* createObject(TQObject *parent=0, const char* name=0, - const char* className=TQOBJECT_OBJECT_NAME_STRING, + const char* className="TQObject", const TQStringList &args=TQStringList()); private: @@ -50,7 +50,7 @@ private: class FreeverbPlugin : public FXPlugin { -Q_OBJECT +TQ_OBJECT public: // Constructor @@ -88,7 +88,7 @@ public: private: TDEApplication *m_Appl; - KSimpleConfig *m_config; + TDESimpleConfig *m_config; }; diff --git a/ksayit/KTTSD_Lib/CMakeLists.txt b/ksayit/KTTSD_Lib/CMakeLists.txt new file mode 100644 index 0000000..511c22d --- /dev/null +++ b/ksayit/KTTSD_Lib/CMakeLists.txt @@ -0,0 +1,34 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/kspeechsink +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### KTTSD_Lib (shared) + +tde_add_library( KTTSD_Lib SHARED AUTOMOC + + SOURCES + KTTSDlibSetup.ui + kttsdlib.cpp + kttsdlibsetupimpl.cpp + kttsdlibtalker2.cpp + LINK + tdeui-shared + tdecore-shared + kspeech_stub-static + + VERSION 0.0.1 + + DESTINATION ${LIB_INSTALL_DIR} +) diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui index 395ad86..fc35ff5 100644 --- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui +++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui @@ -114,8 +114,8 @@ <slot>slotLaunchControlcenter()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotLaunchControlcenter()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksayit/KTTSD_Lib/kdeexportfix.h b/ksayit/KTTSD_Lib/kdeexportfix.h index 958dd20..8ec6f7b 100644 --- a/ksayit/KTTSD_Lib/kdeexportfix.h +++ b/ksayit/KTTSD_Lib/kdeexportfix.h @@ -1,5 +1,5 @@ /* - tdelibs < 3.3.2 had a bug in the KDE_EXPORT macro. This file fixes this + tdelibs < 3.3.2 had a bug in the TDE_EXPORT macro. This file fixes this by undefining it. ------------------- Copyright : (C) 2005 by Gary Cramblitt <garycramblitt@comcast.net> @@ -17,6 +17,6 @@ #include <tdeversion.h> #if TDE_VERSION < TDE_MAKE_VERSION (3,3,2) -#undef KDE_EXPORT -#define KDE_EXPORT +#undef TDE_EXPORT +#define TDE_EXPORT #endif diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index 32e66e4..0ee2fb4 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/ksayit/KTTSD_Lib/kttsdlib.cpp @@ -18,7 +18,7 @@ // KDE includes #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> // App specific includes @@ -32,12 +32,12 @@ KTTSDLib::KTTSDLib(TQObject *parent, const char *name, TDEApplication *Appl) { TDEGlobal::locale()->insertCatalogue("libKTTSD"); m_talker = new kttsdlibtalker2(static_cast<TQObject*>(this), "kttsdlibtalker"); - connect(m_talker, TQT_SIGNAL(signalTextFinished(const uint)), - this, TQT_SLOT(slotTextFinished(const uint)) ); - connect(m_talker, TQT_SIGNAL(signalTextStopped(const uint)), - this, TQT_SLOT(slotTextStopped(const uint)) ); - connect(m_talker, TQT_SIGNAL(signalTextStarted(const uint)), - this, TQT_SLOT(slotTextStarted(const uint)) ); + connect(m_talker, TQ_SIGNAL(signalTextFinished(const uint)), + this, TQ_SLOT(slotTextFinished(const uint)) ); + connect(m_talker, TQ_SIGNAL(signalTextStopped(const uint)), + this, TQ_SLOT(slotTextStopped(const uint)) ); + connect(m_talker, TQ_SIGNAL(signalTextStarted(const uint)), + this, TQ_SLOT(slotTextStarted(const uint)) ); // reset list of currently processed jobs while ( !jobList.empty() ){ @@ -46,10 +46,6 @@ KTTSDLib::KTTSDLib(TQObject *parent, const char *name, TDEApplication *Appl) // initialize the talker m_talker->KTTSD_init(m_Appl); - - // some presets - // m_config = new KSimpleConfig("ksayit_kttsdpluginrc"); - // m_usersetupimpl = NULL; } diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h index 73e7240..b2d2663 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.h +++ b/ksayit/KTTSD_Lib/kttsdlib.h @@ -21,7 +21,7 @@ using namespace std; #include <tqwidget.h> #include <tqframe.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "kdeexportfix.h" // KDE includes @@ -45,9 +45,9 @@ class kttsdlibtalker2; /** @author Robert Vogl */ -class KDE_EXPORT KTTSDLib : public TQObject +class TDE_EXPORT KTTSDLib : public TQObject { -Q_OBJECT +TQ_OBJECT signals: /** Emitted when the plugin has been finished speeking. diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp index 1dc4196..7228768 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp @@ -55,8 +55,8 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter() // invoke the Control Center Module TDEProcess *kcmproc = new TDEProcess(); - connect(kcmproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotKCMProcessExited(TDEProcess*)) ); + connect(kcmproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotKCMProcessExited(TDEProcess*)) ); (*kcmproc) << "tdecmshell"; (*kcmproc) << "kcmkttsd"; kcmproc->start(TDEProcess::NotifyOnExit); diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h index c2b4add..a0cd431 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h @@ -15,7 +15,7 @@ // TQt includes // KDE includes -#include <kprocess.h> +#include <tdeprocess.h> // App specific includes #include "KTTSDlibSetup.h" @@ -25,7 +25,7 @@ */ class KTTSDlibSetupImpl : public KTTSDlibSetup { -Q_OBJECT +TQ_OBJECT public: KTTSDlibSetupImpl(TQWidget *parent = 0, const char *name = 0); diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.h b/ksayit/KTTSD_Lib/kttsdlibtalker2.h index fe33161..641b26e 100644 --- a/ksayit/KTTSD_Lib/kttsdlibtalker2.h +++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.h @@ -28,7 +28,7 @@ */ class kttsdlibtalker2 : public TQObject, public KSpeech_stub, virtual public KSpeechSink { -Q_OBJECT +TQ_OBJECT signals: diff --git a/ksayit/ksayit.tdevelop b/ksayit/ksayit.tdevelop deleted file mode 100644 index 2d66eb5..0000000 --- a/ksayit/ksayit.tdevelop +++ /dev/null @@ -1,196 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Robert Vogl</author> - <email>voglrobe@web.de</email> - <version>0.8.3</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts> - <part>KDevCTags2</part> - <part>Unterstützung für Perforce (KDevelop)</part> - <part>Unterstützung für Subversion (KDevelop)</part> - <part>Unterstützung für CTags (KDevelop)</part> - <part>Unterstützung für CVSService (KDevelop)</part> - </ignoreparts> - <secondaryLanguages/> - </general> - <tdevautoproject> - <general> - <activetarget>KTTSD_Lib/libKTTSD_Lib.la</activetarget> - <useconfiguration>debug</useconfiguration> - </general> - <run> - <mainprogram>src/ksayit</mainprogram> - <directoryradio>executable</directoryradio> - <runarguments> - <ksayit/> - </runarguments> - <customdirectory>/</customdirectory> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>tdevgccoptions</ccompiler> - <cxxcompiler>tdevgppoptions</cxxcompiler> - <f77compiler>tdevg77options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full</configargs> - <builddir>debug</builddir> - <ccompiler>tdevgccoptions</ccompiler> - <cxxcompiler>tdevgppoptions</cxxcompiler> - <f77compiler>tdevg77options</f77compiler> - <cxxflags>-O0</cxxflags> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - <envvars/> - </debug> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - </make> - </tdevautoproject> - <tdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </tdevfileview> - <tdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - <toc>opengl</toc> - <toc>wxwindows_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - <projectdoc> - <userdocDir>html/</userdocDir> - <apidocDir>html/</apidocDir> - </projectdoc> - <ignoredoxygen/> - <ignorekdocs/> - <ignoredevhelp/> - </tdevdoctreeview> - <tdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </tdevdebugger> - <tdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </tdevfilecreate> - <tdevcppsupport> - <references/> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - </tdevcppsupport> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <tdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </tdevdocumentation> -</tdevelop> diff --git a/ksayit/src/CMakeLists.txt b/ksayit/src/CMakeLists.txt new file mode 100644 index 0000000..ecbaca8 --- /dev/null +++ b/ksayit/src/CMakeLists.txt @@ -0,0 +1,73 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/ksayit/KTTSD_Lib + ${KAYSAYIT_ARTS_INCLUDE} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### ksayit (executable) + +tde_add_executable( ksayit AUTOMOC + + SOURCES + DocTreeView.ui + fx_setup.ui + KSayItView.ui + doctreeviewimpl.cpp + effectstack.cpp + fxpluginhandler.cpp + fxsetupimpl.cpp + ksayit.skel + ksayitsystemtray.cpp + ksayitviewimpl.cpp + main.cpp + voicesetupdlg.cpp + ksayit.cpp + parasaxparser.cpp + saxhandler.cpp + ksayitbookmarkhandler.cpp + contextmenuhandler.cpp + docbookclasses.cpp + docbookgenerator.cpp + docbookparser.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + KTTSD_Lib-shared + ${KAYSAYIT_ARTS_LIBRARIES} + + DESTINATION ${BIN_INSTALL_DIR} +) + +##### icons + +tde_install_icons() + + +##### other data + +install( + FILES ksayitui.rc ContextMenus.xml + DESTINATION ${DATA_INSTALL_DIR}/ksayit +) + +tde_create_translated_desktop( + SOURCE ksayit.desktop + PO_DIR ksayit-desktops +) + +install( + FILES ksayit_fxplugin.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui index 166b9b6..d1240cd 100644 --- a/ksayit/src/DocTreeView.ui +++ b/ksayit/src/DocTreeView.ui @@ -121,8 +121,9 @@ </forwards> <includes> <include location="local" impldecl="in implementation">DocTreeView.ui.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>signalContentChanged(const TQString &)</signal> <signal>signalAllNodesProcessed()</signal> <signal>signalSetText(const TQString &)</signal> @@ -131,8 +132,8 @@ <signal>signalSetBookmarkFilename(const TQString&)</signal> <signal>signalChangeBookmarkFilename(const TQString &)</signal> <signal>signalDeleteBookmark(const TQString&, const TQString&)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotItemClicked( TQListViewItem * )</slot> <slot access="protected">slotRenameItem()</slot> <slot access="protected">slotDeleteItem()</slot> @@ -153,9 +154,6 @@ <slot access="protected">slotNewSection_4()</slot> <slot access="protected">slotNewSection_5()</slot> <slot>slotRightButtonPressed( TQListViewItem * i, const TQPoint &, int )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> </UI> diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui index 90d8332..876ca04 100644 --- a/ksayit/src/KSayItView.ui +++ b/ksayit/src/KSayItView.ui @@ -58,12 +58,12 @@ <tabstops> <tabstop>TextEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotCopyAvailable(bool)</slot> <slot>slotTextChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp index d6c5ddb..8b2000d 100644 --- a/ksayit/src/contextmenuhandler.cpp +++ b/ksayit/src/contextmenuhandler.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // App specific includes #include "Types.h" @@ -158,75 +158,75 @@ void ContextMenuHandler::initActions() // User defined actions renameItem = new TDEAction (i18n("Rename..."), 0, - m_DocTreeView, TQT_SLOT (slotRenameItem()), NULL ); + m_DocTreeView, TQ_SLOT (slotRenameItem()), NULL ); deleteItem = new TDEAction (i18n("Delete..."), 0, - m_DocTreeView, TQT_SLOT (slotDeleteItem()), NULL ); + m_DocTreeView, TQ_SLOT (slotDeleteItem()), NULL ); newBookInfo = new TDEAction ( i18n("Overview"), 0, - m_DocTreeView, TQT_SLOT (slotNewBookInfo()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewBookInfo()), NULL ); newChapter = new TDEAction ( i18n("Chapter"), 0, - m_DocTreeView, TQT_SLOT (slotNewChapter()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewChapter()), NULL ); newKeywordSet = new TDEAction ( i18n("Keywords"), 0, - m_DocTreeView, TQT_SLOT (slotNewKeywordSet()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewKeywordSet()), NULL ); newKeyword = new TDEAction ( i18n("Keyword"), 0, - m_DocTreeView, TQT_SLOT (slotNewKeyword()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewKeyword()), NULL ); newAbstract = new TDEAction ( i18n("Abstract"), 0, - m_DocTreeView, TQT_SLOT (slotNewAbstract()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewAbstract()), NULL ); newAuthorGroup = new TDEAction ( i18n("Authors"), 0, - m_DocTreeView, TQT_SLOT (slotNewAuthorGroup()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewAuthorGroup()), NULL ); newAuthor = new TDEAction ( i18n("Author"), 0, - m_DocTreeView, TQT_SLOT (slotNewAuthor()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewAuthor()), NULL ); newDate = new TDEAction ( i18n("Date"), 0, - m_DocTreeView, TQT_SLOT (slotNewDate()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewDate()), NULL ); newReleaseInfo = new TDEAction ( i18n("Release Info"), 0, - m_DocTreeView, TQT_SLOT (slotNewReleaseInfo()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewReleaseInfo()), NULL ); newTitle = new TDEAction ( i18n("Title"), 0, - m_DocTreeView, TQT_SLOT (slotNewTitle()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewTitle()), NULL ); newParagraph = new TDEAction ( i18n("Paragraph"), 0, - m_DocTreeView, TQT_SLOT (slotNewParagraph()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewParagraph()), NULL ); newSection_1 = new TDEAction ( i18n("Section Level 1"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_1()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_1()), NULL ); newSection_2 = new TDEAction ( i18n("Section Level 2"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_2()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_2()), NULL ); newSection_3 = new TDEAction ( i18n("Section Level 3"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_3()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_3()), NULL ); newSection_4 = new TDEAction ( i18n("Section Level 4"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_4()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_4()), NULL ); newSection_5 = new TDEAction ( i18n("Section Level 5"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_5()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_5()), NULL ); } @@ -293,7 +293,7 @@ bool ContextMenuHandler::parseXmlFile(const TQString &xmlID) ContextActionHandler handler(this); handler.setSearchID(xmlID); parser.setContentHandler( &handler ); - return parser.parse( TQT_TQIODEVICE(&xmlFile) ); + return parser.parse( &xmlFile ); } diff --git a/ksayit/src/contextmenuhandler.h b/ksayit/src/contextmenuhandler.h index 104b76c..17b9688 100644 --- a/ksayit/src/contextmenuhandler.h +++ b/ksayit/src/contextmenuhandler.h @@ -66,7 +66,7 @@ private: */ class ContextMenuHandler : public TQObject { -Q_OBJECT +TQ_OBJECT public: ContextMenuHandler(TQObject *parent = 0, const char *name = 0); diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp index f72a717..295098d 100644 --- a/ksayit/src/doctreeviewimpl.cpp +++ b/ksayit/src/doctreeviewimpl.cpp @@ -86,7 +86,7 @@ DocTreeViewImpl::~DocTreeViewImpl() void DocTreeViewImpl::enableContextMenus( bool enabled ) { if ( enabled ){ - m_contextmenuhandler = new ContextMenuHandler(TQT_TQOBJECT(this), "contextmenuhandler"); + m_contextmenuhandler = new ContextMenuHandler(this, "contextmenuhandler"); } else { if ( m_contextmenuhandler ) delete m_contextmenuhandler; @@ -927,7 +927,7 @@ void DocTreeViewImpl::slotNewDate() date->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); // get current date TQString today; - today = TDEGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true); + today = TDEGlobal::locale()->formatDate(TQDate::currentDate(TQt::LocalTime), true); date->setText( 1, today); date->setValue( KSayItGlobal::RAWDATA, today ); date->setValue( KSayItGlobal::RTFDATA, today ); diff --git a/ksayit/src/fx_setup.ui b/ksayit/src/fx_setup.ui index 4e9e975..f41944e 100644 --- a/ksayit/src/fx_setup.ui +++ b/ksayit/src/fx_setup.ui @@ -242,11 +242,11 @@ <slot>slotConfigureEffect(TQListBoxItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotAdd()</slot> <slot>slotRemove()</slot> <slot>slotRemoveAll()</slot> <slot>slotConfigureEffect(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp index 54e3cf1..7c44b12 100644 --- a/ksayit/src/fxpluginhandler.cpp +++ b/ksayit/src/fxpluginhandler.cpp @@ -125,7 +125,7 @@ void FXPluginHandler::readConfiguration() if ( factory ){ plugin.p = static_cast<FXPlugin*>( factory->create( (TQObject*)this, (plugin.name).latin1() ) ); if ( plugin.p ){ // Plugin found - plugin.p->setApplication( TDEApplication::kApplication() ); + plugin.p->setApplication( tdeApp ); plugin.description = plugin.p->getDescription_KS(); // append to list of active plugins m_lstActivePlugins.append( plugin.name ); @@ -158,7 +158,7 @@ void FXPluginHandler::showEffectGUI(const TQString &pname) if ( factory ){ plugin.p = static_cast<FXPlugin*>( factory->create( (TQObject*)this, (plugin.name).latin1() ) ); if ( plugin.p ){ // Plugin found - plugin.p->setApplication( TDEApplication::kApplication() ); + plugin.p->setApplication( tdeApp ); plugin.description = plugin.p->getDescription_KS(); // append to list of active plugins m_lstActivePlugins.append( plugin.name ); diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h index 92db2da..bffc6ef 100644 --- a/ksayit/src/fxpluginhandler.h +++ b/ksayit/src/fxpluginhandler.h @@ -46,7 +46,7 @@ typedef struct { class FXPluginHandler : public TQObject { -Q_OBJECT +TQ_OBJECT public: FXPluginHandler(TQObject *parent = 0, const char *name = 0, TDEConfig *config=0); diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h index 422368e..51286c9 100644 --- a/ksayit/src/fxsetupimpl.h +++ b/ksayit/src/fxsetupimpl.h @@ -36,7 +36,7 @@ class FXPluginHandler; *@author voglrobe */ class FX_SetupImpl : public FX_Setup { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index 8181a87..f55c056 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -38,7 +38,7 @@ #include <kedittoolbar.h> #include <kkeydialog.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // application specific includes #include "ksayit.h" @@ -69,8 +69,8 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, bkMenu = NULL; m_currentBookmarkFile = TQString(); - config=kapp->config(); - m_kttslib = new KTTSDLib(TQT_TQOBJECT(this), "KTTSD-Library", kapp); + config=tdeApp->config(); + m_kttslib = new KTTSDLib(this, "KTTSD-Library", tdeApp); initView(); initStatusBar(); @@ -83,32 +83,32 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, readOptions(); // connect TTS plugin handler to this object - connect(m_kttslib, TQT_SIGNAL(signalFinished()), - TQT_TQOBJECT(this), TQT_SLOT(slotTTSFinished()) ); + connect(m_kttslib, TQ_SIGNAL(signalFinished()), + this, TQ_SLOT(slotTTSFinished()) ); // only used if library thinks it has to call the preferences dialog. // e.g. when it detects a bad configuration. - connect(m_kttslib, TQT_SIGNAL(signalCallPreferences()), - TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) ); + connect(m_kttslib, TQ_SIGNAL(signalCallPreferences()), + this, TQ_SLOT(slotPreferences()) ); // init Clipboard cb = TQApplication::clipboard(); - connect(cb, TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotClipboardChanged()) ); + connect(cb, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardChanged()) ); // create SystemTray object tray = new KSayItSystemTray(this, "system_tray"); - connect(tray, TQT_SIGNAL(signalCallPreferences()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) ); - connect(tray, TQT_SIGNAL(signalSayActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotSayText()) ); - connect(tray, TQT_SIGNAL(signalSayClipboard()), TQT_TQOBJECT(this), TQT_SLOT(slotSayClipboard()) ); - connect(tray, TQT_SIGNAL(signalShutUpActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotStopActivated()) ); - connect(tray, TQT_SIGNAL(signalPauseActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotPauseActivated()) ); - connect(tray, TQT_SIGNAL(signalNextActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotNextSentenceActivated()) ); - connect(tray, TQT_SIGNAL(signalPrevActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()) ); + connect(tray, TQ_SIGNAL(signalCallPreferences()), this, TQ_SLOT(slotPreferences()) ); + connect(tray, TQ_SIGNAL(signalSayActivated()), this, TQ_SLOT(slotSayText()) ); + connect(tray, TQ_SIGNAL(signalSayClipboard()), this, TQ_SLOT(slotSayClipboard()) ); + connect(tray, TQ_SIGNAL(signalShutUpActivated()), this, TQ_SLOT(slotStopActivated()) ); + connect(tray, TQ_SIGNAL(signalPauseActivated()), this, TQ_SLOT(slotPauseActivated()) ); + connect(tray, TQ_SIGNAL(signalNextActivated()), this, TQ_SLOT(slotNextSentenceActivated()) ); + connect(tray, TQ_SIGNAL(signalPrevActivated()), this, TQ_SLOT(slotPrevSentenceActivated()) ); tray->show(); tray->setEnabled(true); // create the FX plugin handler - m_fxpluginhandler = new FXPluginHandler(TQT_TQOBJECT(this), "fxpluginhandler", config); + m_fxpluginhandler = new FXPluginHandler(this, "fxpluginhandler", config); m_fxpluginhandler->searchPlugins(); // create object for effectstack @@ -126,7 +126,7 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, KSayItApp::~KSayItApp() { - // delete kapp->mainWidget(); + // delete tdeApp->mainWidget(); delete m_kttslib; delete tray; delete m_fxpluginhandler; @@ -141,61 +141,61 @@ KSayItApp::~KSayItApp() void KSayItApp::initActions() { // Standard-Actions - open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - save = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - saveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotCloseMainWindow()), actionCollection()); - cut = KStdAction::cut(TQT_TQOBJECT(view), TQT_SLOT(slotCut()), actionCollection()); - copy = KStdAction::copy(TQT_TQOBJECT(view), TQT_SLOT(slotCopy()), actionCollection()); - paste = KStdAction::paste(TQT_TQOBJECT(view), TQT_SLOT(slotPaste()), actionCollection()); - preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbar()), actionCollection()); + open = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + save = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + saveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotCloseMainWindow()), actionCollection()); + cut = KStdAction::cut(view, TQ_SLOT(slotCut()), actionCollection()); + copy = KStdAction::copy(view, TQ_SLOT(slotCopy()), actionCollection()); + paste = KStdAction::paste(view, TQ_SLOT(slotPaste()), actionCollection()); + preferences = KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbar()), actionCollection()); KStdAction::showToolbar("mainToolBar", actionCollection()); - statusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()), actionCollection()); + statusBarAction = KStdAction::showStatusbar(this, TQ_SLOT(slotToggleStatusBar()), actionCollection()); // User defined actions say = new TDEAction (i18n("Say"), TQt::Key_F9, - TQT_TQOBJECT(this), TQT_SLOT (slotSayText()), + this, TQ_SLOT (slotSayText()), actionCollection(), "say_it"); pause = new TDEAction (i18n("Pause"), TQt::Key_Pause, - TQT_TQOBJECT(this), TQT_SLOT (slotPauseActivated()), + this, TQ_SLOT (slotPauseActivated()), actionCollection(), "pause"); shutup = new TDEAction (i18n("Shut Up"), TQt::Key_F10, - TQT_TQOBJECT(this), TQT_SLOT (slotStopActivated()), + this, TQ_SLOT (slotStopActivated()), actionCollection(), "shut_up"); next_sentence = new TDEAction (i18n("Next Sentence"), TQt::Key_Next, - TQT_TQOBJECT(this), TQT_SLOT (slotNextSentenceActivated()), + this, TQ_SLOT (slotNextSentenceActivated()), actionCollection(), "next_sentence"); prev_sentence = new TDEAction (i18n("Previous Sentence"), TQt::Key_Prior, - TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()), + this, TQ_SLOT(slotPrevSentenceActivated()), actionCollection(), "prev_sentence"); clear = new TDEAction (i18n("Clear"), TQt::Key_F12, - TQT_TQOBJECT(this), TQT_SLOT(slotClear()), + this, TQ_SLOT(slotClear()), actionCollection(), "clear"); edit = new TDEToggleAction( i18n("Edit Text"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotEditToggled()), + this, TQ_SLOT(slotEditToggled()), actionCollection(), "edittext"); @@ -325,14 +325,14 @@ void KSayItApp::initView() view->setMinimumSize(view->sizeHint()); setCentralWidget(view); // connections - connect( view, TQT_SIGNAL(signalEnableCopyCut(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotEnableCopyCut(bool))); - connect( view, TQT_SIGNAL(signalShowStatus(const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect( view, TQT_SIGNAL(signalSetCaption(const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetCaption(const TQString &))); - connect( view, TQT_SIGNAL(signalTextChanged(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotTextChanged(bool)) ); + connect( view, TQ_SIGNAL(signalEnableCopyCut(bool)), + this, TQ_SLOT(slotEnableCopyCut(bool))); + connect( view, TQ_SIGNAL(signalShowStatus(const TQString &)), + this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect( view, TQ_SIGNAL(signalSetCaption(const TQString &)), + this, TQ_SLOT(slotSetCaption(const TQString &))); + connect( view, TQ_SIGNAL(signalTextChanged(bool)), + this, TQ_SLOT(slotTextChanged(bool)) ); // DockWindow TQDockWindow *docview = new TQDockWindow(TQDockWindow::InDock, this, "docview"); @@ -344,22 +344,22 @@ void KSayItApp::initView() this->setDockEnabled(docview, TQt::DockTop, false); this->setDockEnabled(docview, TQt::DockBottom, false); this->moveDockWindow(docview, TQt::DockLeft); - connect( treeview, TQT_SIGNAL(signalContentChanged(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotTreeViewChanged(const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalSetText(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetText(const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalAllNodesProcessed()), - TQT_TQOBJECT(this), TQT_SLOT(slotSayNode()) ); - connect( treeview, TQT_SIGNAL(signalEnableTextedit(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotEnableTextedit(bool)) ); - connect( treeview, TQT_SIGNAL(signalNotifyBookmarkManager(const TQString&, const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotNotifyBookmarkHandler(const TQString&, const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalSetBookmarkFilename(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetBookmarkFilename(const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalChangeBookmarkFilename(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeBookmarkFilename(const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalDeleteBookmark(const TQString&, const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteBookmark(const TQString&, const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalContentChanged(const TQString&)), + this, TQ_SLOT(slotTreeViewChanged(const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalSetText(const TQString&)), + this, TQ_SLOT(slotSetText(const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalAllNodesProcessed()), + this, TQ_SLOT(slotSayNode()) ); + connect( treeview, TQ_SIGNAL(signalEnableTextedit(bool)), + this, TQ_SLOT(slotEnableTextedit(bool)) ); + connect( treeview, TQ_SIGNAL(signalNotifyBookmarkManager(const TQString&, const TQString&)), + this, TQ_SLOT(slotNotifyBookmarkHandler(const TQString&, const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalSetBookmarkFilename(const TQString&)), + this, TQ_SLOT(slotSetBookmarkFilename(const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalChangeBookmarkFilename(const TQString&)), + this, TQ_SLOT(slotChangeBookmarkFilename(const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalDeleteBookmark(const TQString&, const TQString&)), + this, TQ_SLOT(slotDeleteBookmark(const TQString&, const TQString&)) ); } @@ -425,7 +425,7 @@ ASYNC KSayItApp::dcopSayXmlFile(KURL url) ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KSayItApp::slotEditToggled() @@ -451,7 +451,7 @@ void KSayItApp::slotConfigureToolbar() { saveMainWindowSettings( config, "MainWindow" ); KEditToolbar dlg(actionCollection(), KSAYITUI); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); if (dlg.exec()) { createGUI(KSAYITUI); @@ -552,7 +552,7 @@ void KSayItApp::slotFileQuit() int really = KMessageBox::questionYesNo( this, i18n("Do you really want to quit?"), TQString(), KStdGuiItem::quit(), KStdGuiItem::cancel() ); if (really == KMessageBox::Yes){ slotSaveOptions(); - kapp->quit(); + tdeApp->quit(); } else { slotStatusMsg(i18n("Ready.")); } diff --git a/ksayit/src/ksayit.desktop b/ksayit/src/ksayit.desktop index 6a0fd4d..d958248 100644 --- a/ksayit/src/ksayit.desktop +++ b/ksayit/src/ksayit.desktop @@ -1,64 +1,11 @@ [Desktop Entry] +Name=KSayIt + +GenericName=Text-to-Speech Frontend + Type=Application Exec=ksayit -caption "%c" %i Icon=ksayit -X-DocPath=ksayit/index.html Terminal=false -Name=KSayIt -Name[hi]=के-से-इट -Name[mk]=KSaylt -Name[ne]=के से इट -Name[sk]=PovedzTo -Name[sv]=Ksayit -Name[tg]=KSayIt -Name[tr]=Ksayit -Name[vi]=Nói K -GenericName=Text-to-Speech Frontend -GenericName[bg]=Синтез на глас -GenericName[bs]=Program za izgovaranje teksta -GenericName[ca]=Frontal per text a veu -GenericName[cs]=Rozhraní hlasové syntézy -GenericName[da]=Forende for tekst-til-tale -GenericName[de]=Oberfläche für die Sprachausgabe -GenericName[el]=Μετατροπή κειμένου σε ομιλία -GenericName[es]=Interfaz de administración del sistema de texto a voz de TDE -GenericName[et]=Teksti kõneks muutmine -GenericName[eu]=Testutik hizketarako interfazea -GenericName[fa]=پایانۀ متن به گفتار -GenericName[fi]=Teksti puheeksi käyttöliittymä -GenericName[fr]=Interface pour la synthèse vocale -GenericName[ga]=Comhéadan Téacs-go-Caint -GenericName[gl]=Interface de Texto-para-Fala -GenericName[hu]=Szövegfelolvasó -GenericName[is]=Texti-í-tal myndrænt viðmót -GenericName[it]=Interfaccia di pronuncia -GenericName[ja]=テキスト読み上げフロントエンド -GenericName[ka]=ტექსტი-გახმოვანების ინტერფეისი -GenericName[km]=ផ្នែកខាងមុខអត្ថបទដែលត្រូវនិយាយ -GenericName[lt]=Teksto vertimo kalba naudotojo sąsaja -GenericName[mk]=Преден дел за текст-во-говор -GenericName[ms]=Antaramuka Teks-ke-Tutur -GenericName[mt]=Programm għal Test-għal-Vuċi -GenericName[nb]=Brukerflate for tekst til tale -GenericName[nds]=Böversiet för den Vörleser -GenericName[ne]=पाठ वाचक फ्रन्टइन्ड -GenericName[nl]=Tekst-tot-spraak-schil -GenericName[pa]=ਪਾਠ ਤੋਂ ਬੋਲੀ ਮੁੱਖ -GenericName[pl]=Program obsługujący syntezator mowy -GenericName[pt]=Interface de Texto para Fala -GenericName[pt_BR]=Interface para a Conversão de Texto para Fala -GenericName[ru]=Интерфейс к средствам синтеза речи -GenericName[sk]=Rozhranie text-na-reč -GenericName[sl]=Vmesnik »besedila v govor« -GenericName[sr]=Интерфејс за текст-у-говор -GenericName[sr@Latn]=Interfejs za tekst-u-govor -GenericName[sv]=Text-till-tal gränssnitt -GenericName[ta]=பேச்சில் இருந்து உரை முன்னணி -GenericName[tg]=Интерфейс барои таҳлили овоз -GenericName[th]=ฟร้อนเอนด์แปลงข้อความเป็นคำพูด -GenericName[tr]= Metinden Konuşmaya Önyüzü -GenericName[uk]=Інтерфейс синтезу мовлення з тексту -GenericName[vi]=Giao diện chuyển Văn bản thành Tiếng nói -GenericName[zh_CN]=文本到语音前端 -GenericName[zh_TW]=文字轉語音前端程式 +X-DocPath=ksayit/index.html Categories=Qt;TDE;Accessibility;Utility; diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h index 85788c9..d1f28af 100644 --- a/ksayit/src/ksayit.h +++ b/ksayit/src/ksayit.h @@ -67,7 +67,7 @@ class KSayItBookmarkHandler; */ class KSayItApp : public TDEMainWindow, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/ksayit/src/ksayit_fxplugin.h b/ksayit/src/ksayit_fxplugin.h index b9ef351..af4826d 100644 --- a/ksayit/src/ksayit_fxplugin.h +++ b/ksayit/src/ksayit_fxplugin.h @@ -29,13 +29,13 @@ using namespace Arts; * If you would like to implement a plugin, simply make a class * derived from FXPlugin, include 'ksayit_fxplugin.h' and reimplement all the * pure virtual functions provided herein. - * *Appl is a pointer to the main application as delivered by \p TDEApplication::kApplication(). + * *Appl is a pointer to the main application as delivered by \p tdeApp. * It can be used for any reason i.e. to install a TQt translator.\n \author Robert Vogl */ class FXPlugin : public TQObject { -// Q_OBJECT +// TQ_OBJECT public: FXPlugin(TQObject *parent=0, const char* name=0){}; diff --git a/ksayit/src/ksayit_ttsplugin.h b/ksayit/src/ksayit_ttsplugin.h index 2ce918a..717dcf9 100644 --- a/ksayit/src/ksayit_ttsplugin.h +++ b/ksayit/src/ksayit_ttsplugin.h @@ -36,7 +36,7 @@ * In addition you must implement two class factories:\n * \p createPlugin() returns a pointer to an instance of your class. * The Plugin Handler of KSayIt calls this function with a parameter pointing - * to the main application instance, as delivered by \p TDEApplication::kApplication(). + * to the main application instance, as delivered by \p tdeApp. * This pointer can be used for any reason i.e. to install a TQt translator.\n * An instance of your class should be deleted by use of \p destroyPlugin().\n * Example: diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp index 43452ca..dbc23fc 100644 --- a/ksayit/src/ksayitsystemtray.cpp +++ b/ksayit/src/ksayitsystemtray.cpp @@ -44,38 +44,38 @@ void KSayItSystemTray::initActions() { // Context-menu menu = this->contextMenu(); - help = new KHelpMenu(this, kapp->aboutData(), false, actionCollection()); + help = new KHelpMenu(this, tdeApp->aboutData(), false, actionCollection()); // Standard actions - settings = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection()); - help_about = KStdAction::aboutApp(help, TQT_SLOT(aboutApplication()), actionCollection()); - help_kde = KStdAction::aboutKDE(help, TQT_SLOT(aboutKDE()), actionCollection()); + settings = KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actionCollection()); + help_about = KStdAction::aboutApp(help, TQ_SLOT(aboutApplication()), actionCollection()); + help_kde = KStdAction::aboutKDE(help, TQ_SLOT(aboutKDE()), actionCollection()); // User defined actions say = new TDEAction(i18n("Say"), "media-playback-start", 0, - TQT_TQOBJECT(this), TQT_SLOT (slotSayActivated()), + this, TQ_SLOT (slotSayActivated()), actionCollection(), "say_it"); shutup = new TDEAction(i18n("Shut Up"), "media-playback-stop", 0, - TQT_TQOBJECT(this), TQT_SLOT (slotStopActivated()), + this, TQ_SLOT (slotStopActivated()), actionCollection(), "shut_up"); pause = new TDEAction (i18n("Pause"), "media-playback-pause", 0, - TQT_TQOBJECT(this), TQT_SLOT (slotPauseActivated()), + this, TQ_SLOT (slotPauseActivated()), actionCollection(), "pause"); next_sentence = new TDEAction (i18n("Next Sentence"), "2rightarrow", 0, - TQT_TQOBJECT(this), TQT_SLOT (slotNextSentenceActivated()), + this, TQ_SLOT (slotNextSentenceActivated()), actionCollection(), "next_sentence"); @@ -83,7 +83,7 @@ void KSayItSystemTray::initActions() prev_sentence = new TDEAction (i18n("Previous Sentence"), "2leftarrow", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()), + this, TQ_SLOT(slotPrevSentenceActivated()), actionCollection(), "prev_sentence"); @@ -253,7 +253,7 @@ void StateWAIT::setContext(KSayItSystemTray *caller) void StateWAIT::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==Qt::LeftButton){ // left Mouse-button pressed + if (e->button()==TQt::LeftButton){ // left Mouse-button pressed TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent) } else { mousePressEventCall(caller, e); // normal mouse-handling @@ -262,7 +262,7 @@ void StateWAIT::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) void StateWAIT::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==Qt::LeftButton){ // left Mouse-button released + if (e->button()==TQt::LeftButton){ // left Mouse-button released say(caller); } else { mouseReleaseEventCall(caller, e); // normal mouse-handling @@ -294,7 +294,7 @@ void StateSAY::setContext(KSayItSystemTray *caller) void StateSAY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==Qt::LeftButton){ // left Mouse-button pressed + if (e->button()==TQt::LeftButton){ // left Mouse-button pressed TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent) } else { mousePressEventCall(caller, e); // normal mouse-handling @@ -303,7 +303,7 @@ void StateSAY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) void StateSAY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==Qt::LeftButton){ // left Mouse-button released + if (e->button()==TQt::LeftButton){ // left Mouse-button released TQWidget::mouseReleaseEvent(e); // do nothing (see mouseReleaseEvent) } else { mouseReleaseEventCall(caller, e); // normal mouse-handling @@ -336,7 +336,7 @@ void StateCLIPEMPTY::setContext(KSayItSystemTray *caller) void StateCLIPEMPTY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==Qt::LeftButton){ // left Mouse-button pressed + if (e->button()==TQt::LeftButton){ // left Mouse-button pressed TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent) } else { mousePressEventCall(caller, e); // normal mouse-handling @@ -345,7 +345,7 @@ void StateCLIPEMPTY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) void StateCLIPEMPTY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==Qt::LeftButton){ // left Mouse-button released + if (e->button()==TQt::LeftButton){ // left Mouse-button released TQWidget::mouseReleaseEvent(e); // do nothing (see mouseReleaseEvent) } else { mouseReleaseEventCall(caller, e); // normal mouse-handling diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h index 02e35bd..05cc962 100644 --- a/ksayit/src/ksayitsystemtray.h +++ b/ksayit/src/ksayitsystemtray.h @@ -38,7 +38,7 @@ class State; *@author Robert Vogl */ class KSayItSystemTray : public KSystemTray { - Q_OBJECT + TQ_OBJECT friend class State; @@ -149,7 +149,7 @@ private: class State : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: State(); diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h index 745bd3a..d124996 100644 --- a/ksayit/src/ksayitviewimpl.h +++ b/ksayit/src/ksayitviewimpl.h @@ -32,7 +32,7 @@ */ class KSayItViewImpl : public KSayItView { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp index 6b1a270..d04aabc 100644 --- a/ksayit/src/voicesetupdlg.cpp +++ b/ksayit/src/voicesetupdlg.cpp @@ -51,7 +51,7 @@ VoiceSetupDlg::VoiceSetupDlg(TQWidget *parent, const char *name, const TQString { setIconListAllVisible(true); - connect (this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageChanged(TQWidget*))); + connect (this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageChanged(TQWidget*))); initVoicePage(); initFXPage(); @@ -83,9 +83,9 @@ void VoiceSetupDlg::initFXPage() FX_SetupImpl *fxDialog = new FX_SetupImpl(m_fxPage, "fxsetup", m_config, m_fxpluginhandler); fxLayout->addWidget(fxDialog); - connect( this, TQT_SIGNAL(signalOKWasClicked()), fxDialog, TQT_SLOT(slotSaveWasClicked()) ); - connect( this, TQT_SIGNAL(signalRemoveAllFX()), fxDialog, TQT_SLOT(slotRemoveAll()) ); - connect( this, TQT_SIGNAL(signalReloadFX()), fxDialog, TQT_SLOT(slotReload()) ); + connect( this, TQ_SIGNAL(signalOKWasClicked()), fxDialog, TQ_SLOT(slotSaveWasClicked()) ); + connect( this, TQ_SIGNAL(signalRemoveAllFX()), fxDialog, TQ_SLOT(slotRemoveAll()) ); + connect( this, TQ_SIGNAL(signalReloadFX()), fxDialog, TQ_SLOT(slotReload()) ); // Disable/enable FX-Setup depending on TTS-libs capability int status = m_kttslib->getStatus() & TTS::AUDIOFILE; diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h index f2ddc38..f200101 100644 --- a/ksayit/src/voicesetupdlg.h +++ b/ksayit/src/voicesetupdlg.h @@ -32,7 +32,7 @@ class KTTSDLib; *@author Robert Vogl */ class VoiceSetupDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: |