diff options
Diffstat (limited to 'kalarm')
| -rw-r--r-- | kalarm/Changelog | 3 | ||||
| -rw-r--r-- | kalarm/alarmevent.cpp | 8 | ||||
| -rw-r--r-- | kalarm/functions.cpp | 14 | ||||
| -rw-r--r-- | kalarm/functions.h | 1 | ||||
| -rw-r--r-- | kalarm/kalarm.desktop | 1 | ||||
| -rw-r--r-- | kalarm/kalarm.tray.desktop | 3 | ||||
| -rw-r--r-- | kalarm/kalarmapp.cpp | 2 | ||||
| -rw-r--r-- | kalarm/kalarmd/kalarmd.autostart.desktop | 2 | ||||
| -rw-r--r-- | kalarm/kalarmd/kalarmd.desktop | 1 |
9 files changed, 6 insertions, 29 deletions
diff --git a/kalarm/Changelog b/kalarm/Changelog index 6c51c621e..a3a1c6590 100644 --- a/kalarm/Changelog +++ b/kalarm/Changelog @@ -1,6 +1,6 @@ KAlarm Change Log -=== Version 1.5.5 --- 21 January 2009 === +=== Version 1.5.5 --- 9 January 2009 === - Require a real double click to accept the selected template in pick list. - Make mouse wheel work, and fix highlighting, for left-hand time spinbox buttons in Plastik style. @@ -15,7 +15,6 @@ KAlarm Change Log - Ignore events in calendar without usable alarms, which prevents them getting stuck in the alarm list). - Prevent defer dialogue date being set outside the allowed range. -- Cancel screensaver when an alarm is displayed. === Version 1.5.4 (KDE 3.5.10) --- 18 August 2008 === - Show background colour selector for file display alarms. diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp index 8aa898922..34ce46a29 100644 --- a/kalarm/alarmevent.cpp +++ b/kalarm/alarmevent.cpp @@ -2427,7 +2427,7 @@ KARecurrence::Type KAEvent::checkRecur() const KARecurrence::Type type = mRecurrence->type(); switch (type) { - case KARecurrence::MINUTELY: // hourly + case KARecurrence::MINUTELY: // hourly case KARecurrence::DAILY: // daily case KARecurrence::WEEKLY: // weekly on multiple days of week case KARecurrence::MONTHLY_DAY: // monthly on multiple dates in month @@ -2776,7 +2776,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju if (types.count() > 0) alarm->setCustomProperty(APPNAME, TYPE_PROPERTY, types.join(",")); - if (pre_0_7 && alarm->repeatCount() > 0 && alarm->snoozeTime() > 0) + if (pre_0_7 && alarm->repeatCount() > 0 && alarm->snoozeTime().value() > 0) { // It's a KAlarm pre-0.7 calendar file. // Minutely recurrences were stored differently. @@ -3028,7 +3028,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju } } } - + if (pre_1_5_0) { /* @@ -3087,7 +3087,7 @@ bool KAEvent::convertRepetition(KCal::Event* event) for (Alarm::List::ConstIterator alit = alarms.begin(); alit != alarms.end(); ++alit) { Alarm* alarm = *alit; - if (alarm->repeatCount() > 0 && alarm->snoozeTime() > 0) + if (alarm->repeatCount() > 0 && alarm->snoozeTime().value() > 0) { if (!converted) { diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 45537e3d9..28f73499d 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -71,9 +71,6 @@ bool sendToKOrganizer(const KAEvent&); bool deleteFromKOrganizer(const TQString& eventID); bool runKOrganizer(); } -#ifdef HAVE_XTEST -void x11_cancelScreenSaver(); -#endif namespace KAlarm @@ -931,17 +928,6 @@ TQString stripAccel(const TQString& text) return out; } -/****************************************************************************** -* Cancel the screen saver, in case it is active. -* Only implemented if the X11 XTest extension is installed. -*/ -void cancelScreenSaver() -{ -#ifdef HAVE_XTEST - x11_cancelScreenSaver(); -#endif // HAVE_XTEST -} - } // namespace KAlarm diff --git a/kalarm/functions.h b/kalarm/functions.h index 762aecc6e..37041f6f2 100644 --- a/kalarm/functions.h +++ b/kalarm/functions.h @@ -108,7 +108,6 @@ UpdateStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool ena void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError, int nAlarms); void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms); -void cancelScreenSaver(); TQString stripAccel(const TQString&); int localeFirstDayOfWeek(); diff --git a/kalarm/kalarm.desktop b/kalarm/kalarm.desktop index da42c9113..8724fb64c 100644 --- a/kalarm/kalarm.desktop +++ b/kalarm/kalarm.desktop @@ -44,7 +44,6 @@ GenericName[hu]=Emlékeztetőkezelő GenericName[is]=Áminningakerfi GenericName[it]=Programmatore degli avvisi personali GenericName[ja]=個人アラームスケジューラ -GenericName[ka]=პერსონალური მაღვიძარას მგეგმავი GenericName[kk]=Дербес ескертулер жоспарлағышы GenericName[km]=កម្មវិធីកំណត់ម៉ោងរោទ៍ផ្ទាល់ខ្លួន GenericName[lt]=Asmeninių žinučių-priminimų planuoklis diff --git a/kalarm/kalarm.tray.desktop b/kalarm/kalarm.tray.desktop index d161dc67e..a15aa26bb 100644 --- a/kalarm/kalarm.tray.desktop +++ b/kalarm/kalarm.tray.desktop @@ -34,7 +34,7 @@ Comment[et]=Häirete ja meeldetuletuste ajakava: käivitamine süsteemse doki ik Comment[eu]=Alarma pertsonalen programatzailea: abiatu sistemaren bandejako ikono bezala Comment[fa]=زمانبند هشدار شخصی: آغاز به عنوان شمایل سینی سیستم Comment[fi]=Henkilökohtainen hälytysajastin: käynnistä paneelikuvake -Comment[fr]=Planificateur d'alarme personnel : démarre dans la boîte à miniatures +Comment[fr]=Planificateur d'alarme personnel : démarre dans la boîte à miniatures Comment[fy]=Persoanlike alarmplanner: begjinne yn it systeemfak Comment[gl]=Programador persoal de alarmas: iniciar como icona na bandexa do sistema Comment[he]=מתזמן הודעות תזכורת: הפעלה בתור סמל במגש המערכת @@ -43,7 +43,6 @@ Comment[hu]=Az emlékeztető üzenetek megjelenítőprogramja: indítás a panel Comment[is]=Áminningakerfi: ræsir sem táknmynd á spjaldinu Comment[it]=Programmatore personale degli avvisi: all'avvio si mette nel vassoio di sistema Comment[ja]=個人アラームスケジューラ: システムトレイアイコンで起動 -Comment[ka]=პესონალური მაღვიძარას მგეგმავი: სისტემურ პანელის ხატულად იწყება Comment[kk]=Дербес ескертулер жоспарлағышы: жүйелік сөреде орналасады Comment[km]=កម្មវិធីកំណត់ម៉ោងរោទ៍ផ្ទាល់ខ្លួន ៖ ចាប់ផ្ដើមជារូបតំណាងក្នុងថាសប្រព័ន្ធ Comment[lt]=Žinučių-priminimų planuoklis: paleisti kaip sisteminio dėklo ženkliuką diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index f4daec9c2..7607892db 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -1631,13 +1631,11 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule if (win) win->setRecreating(); // prevent post-alarm actions delete win; - KAlarm::cancelScreenSaver(); (new MessageWin(event, alarm, reschedule, allowDefer))->show(); } else { // Raise the existing message window and replay any sound - KAlarm::cancelScreenSaver(); win->repeat(alarm); // N.B. this reschedules the alarm } break; diff --git a/kalarm/kalarmd/kalarmd.autostart.desktop b/kalarm/kalarmd/kalarmd.autostart.desktop index de5add486..c2ea7d569 100644 --- a/kalarm/kalarmd/kalarmd.autostart.desktop +++ b/kalarm/kalarmd/kalarmd.autostart.desktop @@ -23,7 +23,6 @@ Name[hu]=KAlarm szolgáltatás Name[is]=KAlarm þjónn Name[it]=Demone degli avvisi Name[ja]=KAlarm デーモン -Name[ka]=KAlarm დემონი Name[kk]=KAlarm қызметі Name[km]=ដេមិន KAlarm Name[lt]=KAlarm tarnyba @@ -71,7 +70,6 @@ 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[ka]=KAlarm მაღვიძარას დემონის ავტოდაწყება შესვლისას Comment[kk]=KAlarm қызметі жүйеге кіргенде жегіледі Comment[km]=ចាប់ផ្ដើមដេមិនរោទ៍របស់ KAlarm ពេលចូល Comment[lt]=KOrganizer/KAlarm priminimų tarnybos automatinis paleidimas prisiregistruojant diff --git a/kalarm/kalarmd/kalarmd.desktop b/kalarm/kalarmd/kalarmd.desktop index 31d3a0fa7..6b4817182 100644 --- a/kalarm/kalarmd/kalarmd.desktop +++ b/kalarm/kalarmd/kalarmd.desktop @@ -23,7 +23,6 @@ Name[hu]=KAlarm szolgáltatás Name[is]=KAlarm þjónn Name[it]=Demone degli avvisi Name[ja]=KAlarm デーモン -Name[ka]=KAlarm დემონი Name[kk]=KAlarm қызметі Name[km]=ដេមិន KAlarm Name[lt]=KAlarm tarnyba |