-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 10 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 7 |
4 files changed, 14 insertions, 6 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index cc8102c..5a27a10 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1365,17 +1365,17 @@ | |||
1365 | { "Try again tomorrow","Versuche morgen nochmal" }, | 1365 | { "Try again tomorrow","Versuche morgen nochmal" }, |
1366 | { "Disable backup","Schalte Backup ab" }, | 1366 | { "Disable backup","Schalte Backup ab" }, |
1367 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | 1367 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, |
1368 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | 1368 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, |
1369 | { "Choose action","Wähle Aktion" }, | 1369 | { "Choose action","Wähle Aktion" }, |
1370 | { "Comment for todo:","Kommentar zum Todo:" }, | 1370 | { "Comment for todo:","Kommentar zum Todo:" }, |
1371 | { "Stop+note","Stop+Notiz" }, | 1371 | { "Stop+note","Stop+Notiz" }, |
1372 | { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, | 1372 | { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, |
1373 | { "KO/Pi: Missing alarm notification!","KO/Pi: Benachrichtigung über verpasste Alarme!" }, | 1373 | { "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" }, |
1374 | { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" }, | 1374 | { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" }, |
1375 | { "","" }, | 1375 | { "","" }, |
1376 | { "","" }, | 1376 | { "","" }, |
1377 | { "","" }, | 1377 | { "","" }, |
1378 | { "","" }, | 1378 | { "","" }, |
1379 | { "","" }, | 1379 | { "","" }, |
1380 | { "","" }, | 1380 | { "","" }, |
1381 | { "","" }, \ No newline at end of file | 1381 | { "","" }, \ No newline at end of file |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5132f98..42166ab 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -206,16 +206,20 @@ MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Inciden | |||
206 | mText += tempText; | 206 | mText += tempText; |
207 | mText += "</td></tr>\n"; | 207 | mText += "</td></tr>\n"; |
208 | inc = getNextInc( start ); | 208 | inc = getNextInc( start ); |
209 | } | 209 | } |
210 | mText +="</table>"; | 210 | mText +="</table>"; |
211 | setText( mText ); | 211 | setText( mText ); |
212 | } | 212 | } |
213 | 213 | ||
214 | MissedAlarmTextBrowser::~MissedAlarmTextBrowser() | ||
215 | { | ||
216 | //qDebug("delete MissedAlarmTextBrowser::~MissedAlarmTextBrowser() "); | ||
217 | } | ||
214 | Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) | 218 | Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) |
215 | { | 219 | { |
216 | QDateTime dt ; | 220 | QDateTime dt ; |
217 | Incidence * retInc; | 221 | Incidence * retInc; |
218 | Incidence * inc = mAlarms.first(); | 222 | Incidence * inc = mAlarms.first(); |
219 | if ( inc == 0 ) | 223 | if ( inc == 0 ) |
220 | return 0; | 224 | return 0; |
221 | bool ok; | 225 | bool ok; |
@@ -639,24 +643,24 @@ void CalendarView::checkAlarms() | |||
639 | while ( inL ) { | 643 | while ( inL ) { |
640 | bool ok = false; | 644 | bool ok = false; |
641 | int offset = 0; | 645 | int offset = 0; |
642 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; | 646 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; |
643 | if ( ok ) { | 647 | if ( ok ) { |
644 | //qDebug("OK %s",next.toString().latin1()); | 648 | //qDebug("OK %s",next.toString().latin1()); |
645 | if ( next < QDateTime::currentDateTime() ) { | 649 | if ( next < QDateTime::currentDateTime() ) { |
646 | al.append( inL ); | 650 | al.append( inL ); |
647 | qDebug("found missed alarm: %s ", inL->summary().latin1() ); | 651 | //qDebug("found missed alarm: %s ", inL->summary().latin1() ); |
648 | } | 652 | } |
649 | } | 653 | } |
650 | inL = el.next(); | 654 | inL = el.next(); |
651 | } | 655 | } |
652 | if ( al.count() ) { | 656 | if ( al.count() ) { |
653 | QDialog* dia = new QDialog( this, "huhu", false ); | 657 | QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop ); |
654 | dia->setCaption( i18n("KO/Pi: Missing alarm notification!") ); | 658 | dia->setCaption( i18n("KO/Pi: Missing alarms!") ); |
655 | QVBoxLayout* lay = new QVBoxLayout( dia ); | 659 | QVBoxLayout* lay = new QVBoxLayout( dia ); |
656 | lay->setSpacing( 0 ); | 660 | lay->setSpacing( 0 ); |
657 | lay->setMargin( 0 ); | 661 | lay->setMargin( 0 ); |
658 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); | 662 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); |
659 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); | 663 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); |
660 | lay->addWidget( matb ); | 664 | lay->addWidget( matb ); |
661 | int si = 220; | 665 | int si = 220; |
662 | if ( QApplication::desktop()->width() > 470 ) | 666 | if ( QApplication::desktop()->width() > 470 ) |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 1eca905..084b6db 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -83,16 +83,17 @@ using namespace KCal; | |||
83 | 83 | ||
84 | #include <qtextbrowser.h> | 84 | #include <qtextbrowser.h> |
85 | #include <qtextcodec.h> | 85 | #include <qtextcodec.h> |
86 | 86 | ||
87 | class MissedAlarmTextBrowser : public QTextBrowser { | 87 | class MissedAlarmTextBrowser : public QTextBrowser { |
88 | Q_OBJECT | 88 | Q_OBJECT |
89 | public: | 89 | public: |
90 | MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start); | 90 | MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start); |
91 | ~MissedAlarmTextBrowser(); | ||
91 | void setSource(const QString & n); | 92 | void setSource(const QString & n); |
92 | 93 | ||
93 | private: | 94 | private: |
94 | Incidence * getNextInc(QDateTime start ); | 95 | Incidence * getNextInc(QDateTime start ); |
95 | QPtrList<Incidence> mAlarms; | 96 | QPtrList<Incidence> mAlarms; |
96 | signals: | 97 | signals: |
97 | void showIncidence( QString uid); | 98 | void showIncidence( QString uid); |
98 | }; | 99 | }; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 1320231..63053a5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -367,18 +367,21 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
367 | infrared = 0; | 367 | infrared = 0; |
368 | #endif | 368 | #endif |
369 | updateFilterToolbar(); | 369 | updateFilterToolbar(); |
370 | updateWeek( mView->startDate() ); | 370 | updateWeek( mView->startDate() ); |
371 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 371 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
372 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 372 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
373 | mBRdisabled = false; | 373 | mBRdisabled = false; |
374 | //toggleBeamReceive(); | 374 | //toggleBeamReceive(); |
375 | 375 | int tiint= 3000; | |
376 | QTimer::singleShot( 1000, mView, SLOT ( checkAlarms() )); | 376 | #ifndef DESKTOP_VERSION |
377 | tiint = 5000; | ||
378 | #endif | ||
379 | QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() )); | ||
377 | } | 380 | } |
378 | MainWindow::~MainWindow() | 381 | MainWindow::~MainWindow() |
379 | { | 382 | { |
380 | //qDebug("MainWindow::~MainWindow() "); | 383 | //qDebug("MainWindow::~MainWindow() "); |
381 | //save toolbar location | 384 | //save toolbar location |
382 | delete mCalendar; | 385 | delete mCalendar; |
383 | delete mSyncManager; | 386 | delete mSyncManager; |
384 | #ifndef DESKTOP_VERSION | 387 | #ifndef DESKTOP_VERSION |