summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/alarmdialog.cpp12
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp11
-rw-r--r--korganizer/mainwindow.cpp13
3 files changed, 22 insertions, 14 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index ddb125a..18ce9da 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -251,8 +251,14 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
251 int h = minimumSizeHint().height() ; 251 int h = minimumSizeHint().height() ;
252 int dw = QApplication::desktop()->width(); 252 int dw = QApplication::desktop()->width();
253 int dh = QApplication::desktop()->height(); 253 int dh = QApplication::desktop()->height();
254 if ( w < 220 ) w = 220;
255 if ( h < 220 ) h = 220;
254 setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 256 setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
255 hide(); 257 showNormal();
258 setActiveWindow();
259 raise();
260 setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
261 //hide();
256 262
257#ifndef _WIN32_ 263#ifndef _WIN32_
258 if ( fd_led > 0 ) { 264 if ( fd_led > 0 ) {
@@ -269,10 +275,8 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
269 275
270void AlarmDialog::forceRepaint() 276void AlarmDialog::forceRepaint()
271{ 277{
272
273 showNormal();
274 setActiveWindow(); 278 setActiveWindow();
275 raise(); 279 repaint();
276 mSuspendSpin->setFocus(); 280 mSuspendSpin->setFocus();
277 playSoundTimer->start( 1000, true ); 281 playSoundTimer->start( 1000, true );
278 282
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index a0ac232..8ea8a73 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -67,6 +67,11 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
67 mPopUp->insertSeparator(); 67 mPopUp->insertSeparator();
68 mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) ); 68 mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
69 mTimerPopUp = new QPopupMenu( this ); 69 mTimerPopUp = new QPopupMenu( this );
70 QFont fon = mTimerPopUp->font();
71 int points = (fon.pointSize()*4)/3;
72 fon.setPointSize( points );
73 mTimerPopUp->setFont( fon );
74 mPopUp->setFont( fon );
70 mBeepPopUp = new QPopupMenu( this ); 75 mBeepPopUp = new QPopupMenu( this );
71 mSoundPopUp = new QPopupMenu( this ); 76 mSoundPopUp = new QPopupMenu( this );
72 mPausePopUp = new QPopupMenu( this ); 77 mPausePopUp = new QPopupMenu( this );
@@ -313,7 +318,7 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& )
313 execl ( tempfilename.latin1(), 0 ); 318 execl ( tempfilename.latin1(), 0 );
314 return; 319 return;
315 } 320 }
316 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); 321 QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
317 return; 322 return;
318 } 323 }
319 324
@@ -339,7 +344,7 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& )
339 mAlarmMessage = mess.mid( 9 ) ; 344 mAlarmMessage = mess.mid( 9 ) ;
340 } 345 }
341 346
342 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); 347 QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
343 startAlarm( mAlarmMessage, filename ); 348 startAlarm( mAlarmMessage, filename );
344 349
345} 350}
@@ -642,7 +647,7 @@ void SimpleAlarmDaemonImpl::newCountdown()
642} 647}
643void SimpleAlarmDaemonImpl::simulate() 648void SimpleAlarmDaemonImpl::simulate()
644{ 649{
645 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); 650 QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
646 QString filename = getenv("QPEDIR") ; 651 QString filename = getenv("QPEDIR") ;
647 filename += "/pics/kdepim/korganizer/koalarm.wav"; 652 filename += "/pics/kdepim/korganizer/koalarm.wav";
648 startAlarm("Alarm simulation", filename ); 653 startAlarm("Alarm simulation", filename );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 98d3e35..fb0b4ad 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -308,8 +308,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
308 mSyncManager->setBlockSave(false); 308 mSyncManager->setBlockSave(false);
309 mView->setSyncManager(mSyncManager); 309 mView->setSyncManager(mSyncManager);
310#ifndef DESKTOP_VERSION 310#ifndef DESKTOP_VERSION
311 iconToolBar->show(); 311 //iconToolBar->show();
312 qApp->processEvents(); 312 //qApp->processEvents();
313#endif 313#endif
314 //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); 314 //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
315 int vh = height() ; 315 int vh = height() ;
@@ -385,7 +385,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
385 if ( showWarning ) { 385 if ( showWarning ) {
386 KMessageBox::information( this, 386 KMessageBox::information( this,
387 "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); 387 "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
388 qApp->processEvents(); 388 //qApp->processEvents();
389 mView->dialogManager()->showSyncOptions(); 389 mView->dialogManager()->showSyncOptions();
390 } 390 }
391 391
@@ -442,11 +442,10 @@ void MainWindow::loadDataAfterStart()
442 connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); 442 connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
443 connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); 443 connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& )));
444 disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); 444 disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& )));
445 ((QPEApplication*) qApp)->showMainWidget( this );
445 if ( !mCStringMess.isEmpty() ) 446 if ( !mCStringMess.isEmpty() )
446 recieve( mCStringMess, mByteData ); 447 recieve( mCStringMess, mByteData );
447#endif 448#endif
448
449
450 QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); 449 QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
451} 450}
452 451
@@ -2044,8 +2043,8 @@ void MainWindow::save()
2044 if ( mSaveDelay < elapsed ) { 2043 if ( mSaveDelay < elapsed ) {
2045 qDebug("KO: Pending save after wakeup from suspend detected."); 2044 qDebug("KO: Pending save after wakeup from suspend detected.");
2046 qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed ); 2045 qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed );
2047 qDebug("KO: Restarting save timer to save in 15 sec."); 2046 qDebug("KO: Restarting save timer to save in 10 sec.");
2048 int msec = 15000; 2047 int msec = 10000;
2049 mSaveTimer.start( msec, true ); 2048 mSaveTimer.start( msec, true );
2050 mSaveTimerStart = QDateTime::currentDateTime(); 2049 mSaveTimerStart = QDateTime::currentDateTime();
2051 mSaveDelay = msec/1000; 2050 mSaveDelay = msec/1000;