summaryrefslogtreecommitdiffstats
path: root/kalarm/kalarmd
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/kalarmd')
-rw-r--r--kalarm/kalarmd/CMakeLists.txt13
-rw-r--r--kalarm/kalarmd/adapp.cpp2
-rw-r--r--kalarm/kalarmd/adapp.h6
-rw-r--r--kalarm/kalarmd/adcalendar.cpp2
-rw-r--r--kalarm/kalarmd/adcalendar.h2
-rw-r--r--kalarm/kalarmd/adconfigdata.cpp2
-rw-r--r--kalarm/kalarmd/admain.cpp2
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp20
-rw-r--r--kalarm/kalarmd/alarmdaemon.h2
-rw-r--r--kalarm/kalarmd/kalarmd.autostart.desktop93
-rw-r--r--kalarm/kalarmd/kalarmd.desktop46
11 files changed, 34 insertions, 156 deletions
diff --git a/kalarm/kalarmd/CMakeLists.txt b/kalarm/kalarmd/CMakeLists.txt
index 9ca5fc36..aad30024 100644
--- a/kalarm/kalarmd/CMakeLists.txt
+++ b/kalarm/kalarmd/CMakeLists.txt
@@ -25,8 +25,17 @@ link_directories(
##### other data ################################
-install( FILES kalarmd.autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
-install( FILES kalarmd.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
+tde_create_translated_desktop(
+ SOURCE kalarmd.autostart.desktop
+ DESTINATION ${AUTOSTART_INSTALL_DIR}
+ PO_DIR kalarm-desktops
+)
+
+tde_create_translated_desktop(
+ SOURCE kalarmd.desktop
+ DESTINATION ${APPS_INSTALL_DIR}/.hidden
+ PO_DIR kalarm-desktops
+)
##### kalarmd (executable) ######################
diff --git a/kalarm/kalarmd/adapp.cpp b/kalarm/kalarmd/adapp.cpp
index 2c9e09dc..3d5f2298 100644
--- a/kalarm/kalarmd/adapp.cpp
+++ b/kalarm/kalarmd/adapp.cpp
@@ -30,7 +30,7 @@
AlarmDaemonApp::AlarmDaemonApp()
- : KUniqueApplication(false, false),
+ : TDEUniqueApplication(false, false),
mAd(0)
{
disableSessionManagement();
diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h
index 96b24d92..c4a4188d 100644
--- a/kalarm/kalarmd/adapp.h
+++ b/kalarm/kalarmd/adapp.h
@@ -23,14 +23,14 @@
#ifndef ADAPP_H
#define ADAPP_H
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
class AlarmDaemon;
-class AlarmDaemonApp : public KUniqueApplication
+class AlarmDaemonApp : public TDEUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
AlarmDaemonApp();
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index b1033eb0..699e9684 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -96,7 +96,7 @@ bool ADCalendar::loadFile(bool reset)
KURL dest;
dest.setPath(mTempFileName);
TDEIO::FileCopyJob* job = TDEIO::file_copy(url, dest, -1, true);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotDownloadJobResult(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotDownloadJobResult(TDEIO::Job*)));
}
return true;
}
diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h
index bbc96214..3ba59978 100644
--- a/kalarm/kalarmd/adcalendar.h
+++ b/kalarm/kalarmd/adcalendar.h
@@ -29,7 +29,7 @@ class ADCalendar;
// Alarm Daemon calendar access
class ADCalendar : public KCal::CalendarLocal
{
- Q_OBJECT
+ TQ_OBJECT
public:
typedef TQValueList<ADCalendar*>::ConstIterator ConstIterator;
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index b0f7850d..75179185 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -24,7 +24,7 @@
#include <tqstringlist.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include "adcalendar.h"
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp
index a5d9fd16..b1533e4a 100644
--- a/kalarm/kalarmd/admain.cpp
+++ b/kalarm/kalarmd/admain.cpp
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
- KUniqueApplication::addCmdLineOptions();
+ TDEUniqueApplication::addCmdLineOptions();
TDEStartupInfo::disableAutoAppStartedSending();
if (!AlarmDaemonApp::start())
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 573cac0d..8759c171 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -29,8 +29,8 @@
#include <tqdatetime.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
#include <tdeio/netaccess.h>
#include <dcopclient.h>
#include <tdeconfig.h>
@@ -89,7 +89,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
if (autostart)
{
bool done = false;
- DCOPClient* client = kapp->dcopClient();
+ DCOPClient* client = tdeApp->dcopClient();
if (client->isApplicationRegistered("ksmserver"))
{
TQByteArray callData;
@@ -98,7 +98,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
for (int i=0; !done && i<KALARM_AUTOSTART_TIMEOUT; ++i)
{
// Check if the session has been fully created/restored. If not, wait a little and try again
- if (!kapp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) ||
+ if (!tdeApp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) ||
replyType != "bool")
{
done = true; // In case of DCOP call error, just continue normally
@@ -119,7 +119,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
}
}
// Give some extra time to KAlarm to be fully restored, then proceed as usual
- TQTimer::singleShot(3000, this, TQT_SLOT(autostartKAlarm()));
+ TQTimer::singleShot(3000, this, TQ_SLOT(autostartKAlarm()));
}
}
}
@@ -168,7 +168,7 @@ void AlarmDaemon::startMonitoring()
{
// Set up the alarm timer
mAlarmTimer = new TQTimer(this);
- connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot()));
+ connect(mAlarmTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarmsSlot()));
setTimerStatus();
// Start monitoring calendar files.
@@ -216,7 +216,7 @@ void AlarmDaemon::reloadCal(ADCalendar* cal, bool reset)
{
cal->close();
if (!cal->setLoadedConnected())
- connect(cal, TQT_SIGNAL(loaded(ADCalendar*, bool)), TQT_SLOT(calendarLoaded(ADCalendar*, bool)));
+ connect(cal, TQ_SIGNAL(loaded(ADCalendar*, bool)), TQ_SLOT(calendarLoaded(ADCalendar*, bool)));
cal->loadFile(reset);
}
else if (reset)
@@ -512,12 +512,12 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
TQString id = TQString::fromLatin1("ad:") + eventID; // prefix to indicate that the notification if from the daemon
// Check if the client application is running and ready to receive notification
- bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
+ bool registered = tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
bool ready = registered;
if (registered)
{
// It's running, but check if it has created our DCOP interface yet
- QCStringList objects = kapp->dcopClient()->remoteObjects(appname);
+ QCStringList objects = tdeApp->dcopClient()->remoteObjects(appname);
if (objects.find(client->dcopObject()) == objects.end())
ready = false;
}
@@ -606,7 +606,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
if (!client)
return;
TQCString appname = client->appName();
- if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
+ if (tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
{
KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
: KAlarmd::CALENDAR_UNAVAILABLE;
diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h
index a3260a58..85509ebd 100644
--- a/kalarm/kalarmd/alarmdaemon.h
+++ b/kalarm/kalarmd/alarmdaemon.h
@@ -31,7 +31,7 @@ class ADCalendar;
class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0);
diff --git a/kalarm/kalarmd/kalarmd.autostart.desktop b/kalarm/kalarmd/kalarmd.autostart.desktop
index 8bb91706..5672c077 100644
--- a/kalarm/kalarmd/kalarmd.autostart.desktop
+++ b/kalarm/kalarmd/kalarmd.autostart.desktop
@@ -1,98 +1,11 @@
[Desktop Entry]
Name=KAlarm Daemon
-Name[af]=KAlarm Bediener
-Name[bg]=Демон на KAlarm
-Name[br]=Diaoul KAlarm
-Name[ca]=Dimoni KAlarm
-Name[cs]=KAlarm démon
-Name[da]=KAlarm Dæmon
-Name[de]=KAlarm Erinnerungsprogramm
-Name[el]=Δαίμονας KAlarm
-Name[eo]=KAlarm-demono
-Name[es]=Daemon de KAlarm
-Name[et]=KAlarmi häiredeemon
-Name[eu]=KAlarm deabrua
-Name[fa]=شبح KAlarm
-Name[fi]=Hälytyspalvelin
-Name[fr]=Démon d'alarme
-Name[ga]=Deamhan KAlarm
-Name[gl]=Daemon de KAlarm
-Name[he]=תהליך הרקע תזכורות
-Name[hu]=KAlarm szolgáltatás
-Name[is]=KAlarm þjónn
-Name[it]=Demone degli avvisi
-Name[ja]=KAlarm デーモン
-Name[kk]=KAlarm қызметі
-Name[km]=ដេមិន KAlarm
-Name[lt]=KAlarm tarnyba
-Name[mk]=Даемон за КАларм
-Name[ms]=Daemon KAlarm
-Name[nb]=KAlarm-nisse
-Name[nds]=KAlarm-Dämoon
-Name[ne]=केडीई संसूचक डेइमन
-Name[nn]=KAlarm-nisse
-Name[pl]=Demon alarmowy
-Name[pt]=Servidor do KAlarm
-Name[pt_BR]=Servidor do KAlarm
-Name[ru]=Служба уведомлений
-Name[sk]=KAlarm démon
-Name[sl]=Demon KAlarm
-Name[sr]=Демон KAlarm-а
-Name[sr@Latn]=Demon KAlarm-a
-Name[sv]=Alarmdemon
-Name[ta]=கேஅலாரம் டெமான்
-Name[tr]=KAlarm Servis Programı
-Name[uk]=Демон KAlarm
-Name[zh_CN]=KAlarm 进程
-Name[zh_TW]=KAlarm 守護程式
+
+Comment=KAlarm alarm daemon autostart at login
+
Exec=kalarmd --autostart
Icon=kalarm
Type=Application
-Comment=KAlarm alarm daemon autostart at login
-Comment[af]=Begin KAlarm bediener outomaties tydens aanteken
-Comment[bg]=Автоматично стартиране на процеса на алармата KAlarm при влизане в системата
-Comment[ca]=Dimoni d'inici automàtic de l'alarma KAlarm en connectar
-Comment[cs]=Automatické spouštění alarmovacího démona při startu
-Comment[da]=KAlarm-alarmdæmon autostart ved login
-Comment[de]=Autostart des KAlarm Erinnerungsprogramms von KOrganizer bei der Anmeldung
-Comment[el]=Αυτόματη εκκίνηση του δαίμονα KAlarm κατά τη σύνδεση
-Comment[es]=Inicio automático al ingresar del daemon de alarma de KAlarm
-Comment[et]=KAlarmi häiredeemoni automaatne käivitamine
-Comment[eu]=KAlarm alarma deabrua saioa hastean automatikoki abiatzen da
-Comment[fa]=آغاز خودکار هشدار KAlarm در ورود
-Comment[fi]=KOrganizer/KAlarm-hälytyspalvelimen automaattikäynnistys sisäänkirjautuessa
-Comment[fr]=Le démon d'alarme de KOrganizer et de KAlarm démarre automatiquement lors de la connexion
-Comment[fy]=KAlarm alarmdaemon automatysk begjinne by it oanmelden
-Comment[gl]=Autoinicio á entrada do daemon de KAlarm
-Comment[he]=הפעלה אוטומטית של תהליך הרקע תזכורות של KAlarm בעת ההפעלה
-Comment[hu]=A KAlarm emlékeztető szolgáltatás automatikus elindítása
-Comment[is]=Ræsa KAlarm áminningaþjónn sjálfkrafa við byrjun setu
-Comment[it]=Avvio automatico del demone degli avvisi
-Comment[ja]=KAlarm アラームデーモンのログイン時の自動起動
-Comment[kk]=KAlarm қызметі жүйеге кіргенде жегіледі
-Comment[km]=ចាប់ផ្ដើម​ដេមិន​រោទ៍​របស់ KAlarm ពេល​ចូល
-Comment[lt]=KOrganizer/KAlarm priminimų tarnybos automatinis paleidimas prisiregistruojant
-Comment[mk]=Даемон за аларми од КАларм - автом. старт при најава
-Comment[ms]= Automula daemon penggera KAlarm semasa log masuk
-Comment[nb]=start alarmnisse ved innlogging
-Comment[nds]=KAlarm-Dämoon bi't Anmellen automaatsch starten
-Comment[ne]=लगइनमा केडीई संसूचक संसूचक डेइमन स्वत: सुरुआत हुन्छ
-Comment[nl]=KAlarm alarmdaemon automatisch starten bij login
-Comment[nn]=Start alarmnisse ved innlogging
-Comment[pl]=Demon alarmu KOrganizera uruchamiany przy zalogowaniu
-Comment[pt]=Servidor de alarme do KAlarm auto-iniciado no arranque
-Comment[pt_BR]=Servidor de alarmes do KAlarm inicia automaticamente no login
-Comment[ru]=Служба уведомлений TDE
-Comment[sk]=Automatické spustenie kAlarm démona pri štarte
-Comment[sl]=Samodejni zagon alarmskega strežnika KAlarma ob zagonu
-Comment[sr]=Аутоматско покретање алармног демона KAlarm-а по пријављивању
-Comment[sr@Latn]=Automatsko pokretanje alarmnog demona KAlarm-a po prijavljivanju
-Comment[sv]=Kalarm-alarmdemon, automatisk start vid inloggning
-Comment[ta]=உள்நுழையும்போது கேஅலாரம் அலாரம் டெமான் தானாகவே துவங்கும்
-Comment[tr]=KAlarm alarm servis programı (açılışta başlar)
-Comment[uk]=Автозавантаження демона нагадувань KAlarm
-Comment[zh_CN]=登录时自动启动 KAlarm 定时守护进程
-Comment[zh_TW]=登入時自動啟動 KAlarm 鬧鐘守護程式
Terminal=false
NoDisplay=true
X-TDE-autostart-phase=2
diff --git a/kalarm/kalarmd/kalarmd.desktop b/kalarm/kalarmd/kalarmd.desktop
index 3da0eb33..edb210b6 100644
--- a/kalarm/kalarmd/kalarmd.desktop
+++ b/kalarm/kalarmd/kalarmd.desktop
@@ -1,50 +1,6 @@
[Desktop Entry]
Name=KAlarm Daemon
-Name[af]=KAlarm Bediener
-Name[bg]=Демон на KAlarm
-Name[br]=Diaoul KAlarm
-Name[ca]=Dimoni KAlarm
-Name[cs]=KAlarm démon
-Name[da]=KAlarm Dæmon
-Name[de]=KAlarm Erinnerungsprogramm
-Name[el]=Δαίμονας KAlarm
-Name[eo]=KAlarm-demono
-Name[es]=Daemon de KAlarm
-Name[et]=KAlarmi häiredeemon
-Name[eu]=KAlarm deabrua
-Name[fa]=شبح KAlarm
-Name[fi]=Hälytyspalvelin
-Name[fr]=Démon d'alarme
-Name[ga]=Deamhan KAlarm
-Name[gl]=Daemon de KAlarm
-Name[he]=תהליך הרקע תזכורות
-Name[hu]=KAlarm szolgáltatás
-Name[is]=KAlarm þjónn
-Name[it]=Demone degli avvisi
-Name[ja]=KAlarm デーモン
-Name[kk]=KAlarm қызметі
-Name[km]=ដេមិន KAlarm
-Name[lt]=KAlarm tarnyba
-Name[mk]=Даемон за КАларм
-Name[ms]=Daemon KAlarm
-Name[nb]=KAlarm-nisse
-Name[nds]=KAlarm-Dämoon
-Name[ne]=केडीई संसूचक डेइमन
-Name[nn]=KAlarm-nisse
-Name[pl]=Demon alarmowy
-Name[pt]=Servidor do KAlarm
-Name[pt_BR]=Servidor do KAlarm
-Name[ru]=Служба уведомлений
-Name[sk]=KAlarm démon
-Name[sl]=Demon KAlarm
-Name[sr]=Демон KAlarm-а
-Name[sr@Latn]=Demon KAlarm-a
-Name[sv]=Alarmdemon
-Name[ta]=கேஅலாரம் டெமான்
-Name[tr]=KAlarm Servis Programı
-Name[uk]=Демон KAlarm
-Name[zh_CN]=KAlarm 进程
-Name[zh_TW]=KAlarm 守護程式
+
Exec=kalarmd
Icon=kalarmd
Type=Application